From: Igor Mammedov <imammedo@redhat.com>
To: qemu-devel@nongnu.org
Cc: pbonzini@redhat.com, mst@redhat.com
Subject: [Qemu-devel] [PATCH 03/11] pc: check if KVM has enough memory slots for DIMM devices
Date: Fri, 31 Oct 2014 16:38:34 +0000 [thread overview]
Message-ID: <1414773522-7756-4-git-send-email-imammedo@redhat.com> (raw)
In-Reply-To: <1414773522-7756-1-git-send-email-imammedo@redhat.com>
check amount of available KVM memory slots after all
devices were initialized and exit with error if
there isn't enough free memory slots for DIMMs.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
hw/i386/pc.c | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index f6dfd9b..41d91fb 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1125,6 +1125,36 @@ PcGuestInfo *pc_guest_info_init(ram_addr_t below_4g_mem_size,
return guest_info;
}
+static int pc_dimm_count(Object *obj, void *opaque)
+{
+ int *count = opaque;
+
+ if (object_dynamic_cast(obj, TYPE_PC_DIMM)) {
+ (*count)++;
+ }
+
+ object_child_foreach(obj, pc_dimm_count, opaque);
+ return 0;
+}
+
+static void pc_kvm_slot_check(Notifier *notifier, void *data)
+{
+ MachineState *ms = MACHINE(qdev_get_machine());
+ int free_slots = kvm_free_slot_count(ms);
+ int used_ram_slots = 0;
+
+ pc_dimm_count(OBJECT(ms), &used_ram_slots);
+ if ((ms->ram_slots - used_ram_slots) > free_slots) {
+ error_report("KVM doesn't support more than %d memory slots",
+ kvm_free_slot_count(ms));
+ exit(EXIT_FAILURE);
+ }
+}
+
+static Notifier kvm_slot_check_on_machine_done = {
+ .notify = pc_kvm_slot_check
+ };
+
/* setup pci memory address space mapping into system address space */
void pc_pci_as_mapping_init(Object *owner, MemoryRegion *system_memory,
MemoryRegion *pci_address_space)
@@ -1269,6 +1299,8 @@ FWCfgState *pc_memory_init(MachineState *machine,
"hotplug-memory", hotplug_mem_size);
memory_region_add_subregion(system_memory, pcms->hotplug_memory_base,
&pcms->hotplug_memory);
+
+ qemu_add_machine_init_done_notifier(&kvm_slot_check_on_machine_done);
}
/* Initialize PC system firmware */
--
1.8.3.1
next prev parent reply other threads:[~2014-10-31 16:39 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-31 16:38 [Qemu-devel] [PATCH 00/11] pc: kvm: memory hotplug fixes Igor Mammedov
2014-10-31 16:38 ` [Qemu-devel] [PATCH 01/11] pc: kvm: check if KVM has free memory slots to avoid abort() Igor Mammedov
2014-11-03 11:52 ` Paolo Bonzini
2014-11-04 14:51 ` Marcel Apfelbaum
2014-11-04 16:06 ` [Qemu-devel] [PATCH v2 " Igor Mammedov
2014-10-31 16:38 ` [Qemu-devel] [PATCH 02/11] kvm: provide API to query amount of memory slots supported by KVM Igor Mammedov
2014-10-31 16:38 ` Igor Mammedov [this message]
2014-11-03 11:51 ` [Qemu-devel] [PATCH 03/11] pc: check if KVM has enough memory slots for DIMM devices Paolo Bonzini
2014-11-03 17:00 ` Igor Mammedov
2014-11-03 17:32 ` Paolo Bonzini
2014-11-03 19:11 ` Igor Mammedov
2014-11-04 8:45 ` Paolo Bonzini
2014-11-04 15:39 ` Igor Mammedov
2014-11-04 15:42 ` Paolo Bonzini
2014-11-04 16:14 ` Igor Mammedov
2014-11-07 16:37 ` Paolo Bonzini
2014-10-31 16:38 ` [Qemu-devel] [PATCH 04/11] pc: make pc_dimm_plug() more readble Igor Mammedov
2014-10-31 16:38 ` [Qemu-devel] [PATCH 05/11] pc: limit DIMM address and size to page aligned values Igor Mammedov
2014-10-31 16:38 ` [Qemu-devel] [PATCH 06/11] memory: expose alignment used for allocating RAM as MemoryRegion API Igor Mammedov
2014-10-31 16:38 ` [Qemu-devel] [PATCH 07/11] pc: add pc_init_pci_2_1() and pc_compat_2_1() Igor Mammedov
2014-10-31 16:38 ` [Qemu-devel] [PATCH 08/11] pc: align DIMM's address/size by backend's alignment value Igor Mammedov
2014-11-03 17:48 ` Andrey Korolyov
2014-11-03 18:01 ` Michael S. Tsirkin
2014-11-03 19:30 ` [Qemu-devel] [PATCH 8/11] fixup! " Igor Mammedov
2014-10-31 16:38 ` [Qemu-devel] [PATCH 09/11] pc: pc-dimm: use backend alignment during address auto allocation Igor Mammedov
2014-10-31 16:38 ` [Qemu-devel] [PATCH 10/11] pc: explicitly check maxmem limit when adding DIMM Igor Mammedov
2014-11-06 14:16 ` [Qemu-devel] [PATCH 10/11] fixup! " Igor Mammedov
2014-10-31 16:38 ` [Qemu-devel] [PATCH 11/11] pc: count in 1Gb hugepage alignment when sizing hotplug-memory container Igor Mammedov
2014-11-04 16:10 ` [Qemu-devel] [PATCH v2 " Igor Mammedov
2014-11-02 10:36 ` [Qemu-devel] [PATCH 00/11] pc: kvm: memory hotplug fixes Michael S. Tsirkin
2014-11-03 11:52 ` Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1414773522-7756-4-git-send-email-imammedo@redhat.com \
--to=imammedo@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).