]> rtime.felk.cvut.cz Git - lisovros/qemu_apohw.git/commitdiff
kvmvapic: Disable if there is insufficient memory
authorJan Kiszka <jan.kiszka@siemens.com>
Tue, 14 Aug 2012 11:43:12 +0000 (13:43 +0200)
committerMarcelo Tosatti <mtosatti@redhat.com>
Tue, 14 Aug 2012 22:23:17 +0000 (19:23 -0300)
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>
hw/apic_common.c

index 58e63b00da5821130bea2dd0ca7ca2cce71ffd99..371f95d909f4ee1edf514e3121a07bb239273cb6 100644 (file)
@@ -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;