diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2012-08-14 13:43:12 +0200 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2012-08-14 19:23:17 -0300 |
| commit | a9605e0317c7a6d5e68f3a3b6708c8ef1096f4bc (patch) | |
| tree | 604f2b364d360c639eadb0bbc0528db418d66f0f | |
| parent | 050a46065de8e3d4ee5a04f5598d666f63d34800 (diff) | |
| download | qemu-a9605e0317c7a6d5e68f3a3b6708c8ef1096f4bc.tar.gz | |
kvmvapic: Disable if there is insufficient memory
We need at least 1M of RAM to map the option ROM. Otherwise, we will
corrupt host memory or even crash:
$ qemu-system-x86_64 -nodefaults --enable-kvm -vnc :0 -m 640k
Segmentation fault (core dumped)
Reported-and-tested-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| -rw-r--r-- | hw/apic_common.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/apic_common.c b/hw/apic_common.c index 58e63b00da..371f95d909 100644 --- a/hw/apic_common.c +++ b/hw/apic_common.c @@ -299,7 +299,9 @@ static int apic_init_common(SysBusDevice *dev) sysbus_init_mmio(dev, &s->io_memory); - if (!vapic && s->vapic_control & VAPIC_ENABLE_MASK) { + /* Note: We need at least 1M to map the VAPIC option ROM */ + if (!vapic && s->vapic_control & VAPIC_ENABLE_MASK && + ram_size >= 1024 * 1024) { vapic = sysbus_create_simple("kvmvapic", -1, NULL); } s->vapic = vapic; |