From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32964) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WrSHd-0003xD-ON for qemu-devel@nongnu.org; Mon, 02 Jun 2014 09:28:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WrSHY-000824-DU for qemu-devel@nongnu.org; Mon, 02 Jun 2014 09:28:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:62308) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WrSHY-00081f-6Q for qemu-devel@nongnu.org; Mon, 02 Jun 2014 09:28:08 -0400 From: Igor Mammedov Date: Mon, 2 Jun 2014 15:25:11 +0200 Message-Id: <1401715529-636-16-git-send-email-imammedo@redhat.com> In-Reply-To: <1401715529-636-1-git-send-email-imammedo@redhat.com> References: <1401715529-636-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH v4 15/33] pc: exit QEMU if compat machine doesn't support memory hotlpug List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: lcapitulino@redhat.com, aliguori@amazon.com, mst@redhat.com ... if user attempts to start it with memory hotplug enabled. Signed-off-by: Igor Mammedov Acked-by: Peter Crosthwaite --- hw/i386/pc.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 5be7b33..af68c99 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1229,6 +1229,16 @@ FWCfgState *pc_memory_init(MemoryRegion *system_memory, e820_add_entry(0x100000000ULL, above_4g_mem_size, E820_RAM); } + if (!guest_info->has_reserved_memory && + (machine->ram_slots || + (machine->maxram_size > ram_size))) { + MachineClass *mc = MACHINE_GET_CLASS(machine); + + error_report("\"-memory 'slots|maxmem'\" is not supported by: %s", + mc->name); + exit(EXIT_FAILURE); + } + /* initialize hotplug memory address space */ if (guest_info->has_reserved_memory && (ram_size < machine->maxram_size)) { -- 1.7.1