Skip to content

Commit

Permalink
pc: exit QEMU if compat machine doesn't support memory hotlpug
Browse files Browse the repository at this point in the history
... if user attempts to start it with memory hotplug enabled.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Acked-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
  • Loading branch information
Igor Mammedov authored and mstsirkin committed Jun 19, 2014
1 parent de268e1 commit ca8336f
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions hw/i386/pc.c
Expand Up @@ -1225,6 +1225,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)) {
Expand Down

0 comments on commit ca8336f

Please sign in to comment.