From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55752) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XkFE6-0006Rm-0B for qemu-devel@nongnu.org; Fri, 31 Oct 2014 12:39:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XkFDz-0002fe-SU for qemu-devel@nongnu.org; Fri, 31 Oct 2014 12:39:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36695) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XkFDz-0002fV-Kc for qemu-devel@nongnu.org; Fri, 31 Oct 2014 12:38:55 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s9VGctx9018713 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Fri, 31 Oct 2014 12:38:55 -0400 From: Igor Mammedov Date: Fri, 31 Oct 2014 16:38:34 +0000 Message-Id: <1414773522-7756-4-git-send-email-imammedo@redhat.com> In-Reply-To: <1414773522-7756-1-git-send-email-imammedo@redhat.com> References: <1414773522-7756-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH 03/11] pc: check if KVM has enough memory slots for DIMM devices List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, mst@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 --- 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