diff options
| author | Igor Mammedov <imammedo@redhat.com> | 2014-06-02 15:25:09 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2014-06-19 16:41:48 +0300 |
| commit | a0cc8856e8722188583901665c7d9e5ddc752fc0 (patch) | |
| tree | 7d701e81e165ae71171b3085a877a03d09e38c30 | |
| parent | 619d11e4631000f20318dec90b87f314272bfa4a (diff) | |
| download | qemu-a0cc8856e8722188583901665c7d9e5ddc752fc0.zip qemu-a0cc8856e8722188583901665c7d9e5ddc752fc0.tar.gz qemu-a0cc8856e8722188583901665c7d9e5ddc752fc0.tar.bz2 | |
pc: exit QEMU if number of slots more than supported 256
... which is imposed by current naming scheme of ACPI memory devices.
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>
| -rw-r--r-- | hw/i386/pc.c | 6 | ||||
| -rw-r--r-- | include/hw/acpi/acpi.h | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 6cdcb00..366e799 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1230,6 +1230,12 @@ FWCfgState *pc_memory_init(MemoryRegion *system_memory, ram_addr_t hotplug_mem_size = machine->maxram_size - ram_size; + if (machine->ram_slots > ACPI_MAX_RAM_SLOTS) { + error_report("unsupported amount of memory slots: %"PRIu64, + machine->ram_slots); + exit(EXIT_FAILURE); + } + pcms->hotplug_memory_base = ROUND_UP(0x100000000ULL + above_4g_mem_size, 1ULL << 30); diff --git a/include/hw/acpi/acpi.h b/include/hw/acpi/acpi.h index a9fae9d..e93de6c 100644 --- a/include/hw/acpi/acpi.h +++ b/include/hw/acpi/acpi.h @@ -26,6 +26,12 @@ #include "exec/memory.h" #include "hw/irq.h" +/* + * current device naming scheme supports + * only upto 256 memory devices + */ +#define ACPI_MAX_RAM_SLOTS 256 + /* from linux include/acpi/actype.h */ /* Default ACPI register widths */ |