From: syeon.hwang <syeon.hwang@samsung.com>
Date: Thu, 1 Nov 2012 06:41:13 +0000 (+0900)
Subject: board: Do not load "kvmvapic" to avoid crash on HAXM.
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~1383
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f8c8b36d960c5151f517314e2542a7433f18cdb0;p=sdk%2Femulator%2Fqemu.git

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 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);