From f8c8b36d960c5151f517314e2542a7433f18cdb0 Mon Sep 17 00:00:00 2001 From: "syeon.hwang" Date: Thu, 1 Nov 2012 15:41:13 +0900 Subject: [PATCH] board: Do not load "kvmvapic" to avoid crash on HAXM. Do not load "kvmvapic" to avoid crash on HAXM. Signed-off-by: SeokYeon Hwang --- hw/apic_common.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/apic_common.c b/hw/apic_common.c index 371f95d909..4db9e8339c 100644 --- 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); -- 2.34.1