From: syeon.hwang <syeon.hwang@samsung.com>
Date: Thu, 11 Oct 2012 06:01:44 +0000 (+0900)
Subject: build: fix build break on macos
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~1405^2~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=06204d1e57afae480b709ed7d7b0398bc527d5c2;p=sdk%2Femulator%2Fqemu.git

build: fix build break on macos
---

diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c
index 929c28edb9..e22e354d86 100644
--- a/hw/acpi_piix4.c
+++ b/hw/acpi_piix4.c
@@ -434,7 +434,7 @@ i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base,
     PCIDevice *dev;
     PIIX4PMState *s;
 
-#if defined(CONFIG_MARU) && defined(__x86_64__)
+#if 0 //#if defined(CONFIG_MARU) && defined(__x86_64__)
     dev = pci_create(bus, devfn, "MARU_PM");
 #else
     dev = pci_create(bus, devfn, "PIIX4_PM");
@@ -487,7 +487,7 @@ static void piix4_pm_class_init(ObjectClass *klass, void *data)
 }
 
 static TypeInfo piix4_pm_info = {
-#if defined(CONFIG_MARU) && defined(__x86_64__)
+#if 0 //#if defined(CONFIG_MARU) && defined(__x86_64__)
     .name          = "MARU_PM",
 #else
     .name          = "PIIX4_PM",
diff --git a/tizen/emulator_configure.sh b/tizen/emulator_configure.sh
index 46e7cc47ee..9654efd7b4 100755
--- a/tizen/emulator_configure.sh
+++ b/tizen/emulator_configure.sh
@@ -71,6 +71,8 @@ echo "##### QEMU configure for emulator"
  --enable-maru \
  --enable-hax \
  --disable-vnc \
+ --disable-cocoa \
+ --disable-gl \
  --disable-sdl $1
 ;;
 esac
diff --git a/vl.c b/vl.c
index c469f547ec..c561ba4f7c 100644
--- a/vl.c
+++ b/vl.c
@@ -3445,7 +3445,7 @@ int main(int argc, char **argv, char **envp)
             case QEMU_OPTION_enable_hax:
 #ifdef CONFIG_HAX_BACKEND
                 olist = qemu_find_opts("machine");
-                qemu_opts_reset(olist);
+                //qemu_opts_reset(olist);
                 hax_disable(0);
                 //qemu_opts_parse(olist, "accel=hax", 0);
 #else