board: Do not load "kvmvapic" to avoid crash on HAXM.

Do not load "kvmvapic" to avoid crash on HAXM.

Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

diff --git a/hw/apic_common.c b/hw/apic_common.c
index 371f95d909f4ee1edf514e3121a07bb239273cb6..4db9e8339cec354820fea3a8dd2de5617446e413 100644 (file)
--- a/hw/apic_common.c
+++ b/hw/apic_common.c
@@ -299,11 +299,13 @@ static int apic_init_common(SysBusDevice *dev)
 
     sysbus_init_mmio(dev, &s->io_memory);
 
+    #ifndef CONFIG_MARU
     /* 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);
     }
+    #endif
     s->vapic = vapic;
     if (apic_report_tpr_access && info->enable_tpr_reporting) {
         info->enable_tpr_reporting(s, true);