wip

Change-Id: I502f335c10cf5cb285cb39844b7d507b5fc9014d

diff --git a/hmp.c b/hmp.c
index e11933523ab3acfdf008f775b4a575887f3407f3..d1e9dba67486d6f1db4e40511c33ea186df85413 100644 (file)
--- a/hmp.c
+++ b/hmp.c
@@ -1126,7 +1126,6 @@ void hmp_set_link(Monitor *mon, const QDict *qdict)
     hmp_handle_error(mon, &err);
 }
 
-#if defined(CONFIG_MARU)
 void hmp_get_link(Monitor *mon, const QDict *qdict)
 {
     const char *name = qdict_get_str(qdict, "name");
@@ -1141,7 +1140,6 @@ void hmp_get_link(Monitor *mon, const QDict *qdict)
     monitor_printf(mon, "%s\n", info->is_up ? "on": "off");
     g_free(info);
 }
-#endif
 
 void hmp_block_passwd(Monitor *mon, const QDict *qdict)
 {

diff --git a/hmp.h b/hmp.h
index 8d7c0a71af691fe4ccadb10a9d75137bbc98099c..808c81f0e0e5006b8fe3dc30c79a0370f0a4e39f 100644 (file)
--- a/hmp.h
+++ b/hmp.h
@@ -55,9 +55,7 @@ void hmp_cont(Monitor *mon, const QDict *qdict);
 void hmp_system_wakeup(Monitor *mon, const QDict *qdict);
 void hmp_nmi(Monitor *mon, const QDict *qdict);
 void hmp_set_link(Monitor *mon, const QDict *qdict);
-#if defined(CONFIG_MARU)
 void hmp_get_link(Monitor *mon, const QDict *qdict);
-#endif
 void hmp_block_passwd(Monitor *mon, const QDict *qdict);
 void hmp_balloon(Monitor *mon, const QDict *qdict);
 void hmp_block_resize(Monitor *mon, const QDict *qdict);

diff --git a/include/ui/egl-helpers.h b/include/ui/egl-helpers.h
index 03fcf4bba2663256681fd8ef6075c2732525e819..5836800cd98e0c3faf1e2883289a645b8c036ac1 100644 (file)
--- a/include/ui/egl-helpers.h
+++ b/include/ui/egl-helpers.h
@@ -4,6 +4,7 @@
 #include <epoxy/gl.h>
 #include <epoxy/egl.h>
 #include <gbm.h>
+#define Window EGLNativeWindowType
 
 extern EGLDisplay *qemu_egl_display;
 extern EGLConfig qemu_egl_config;

diff --git a/net/net.c b/net/net.c
index 5c0897d323b002222299fb58926b6794b290e0b3..8311803f394e31a911a319eceacc21f2b6536f97 100644 (file)
--- a/net/net.c
+++ b/net/net.c
@@ -1433,7 +1433,6 @@ static void net_vm_change_state_handler(void *opaque, int running,
     }
 }
 
-#if defined(CONFIG_MARU)
 LinkInfo *qmp_get_link(const char *name, Error **errp)
 {
     NetClientState *ncs[MAX_QUEUE_NUM];
@@ -1456,7 +1455,6 @@ LinkInfo *qmp_get_link(const char *name, Error **errp)
     }
     return info;
 }
-#endif
 
 void net_cleanup(void)
 {

diff --git a/net/tap.c b/net/tap.c
index 57cfe1a30cac309e15c009d41d13aec66eb7b72c..17ed60e1c0f6710f7d6b54cd0237c72d3f6ee246 100644 (file)
--- a/net/tap.c
+++ b/net/tap.c
@@ -475,9 +475,11 @@ static void launch_script(const char *setup_script, const char *ifname,
 #endif
         *parg++ = (char *)setup_script;
         *parg++ = (char *)ifname;
+#if defined(CONFIG_MARU)
         if (host_ifname) {
             *parg++ = (char *)host_ifname;
         }
+#endif
         *parg = NULL;
 
 #if defined(CONFIG_MARU)

diff --git a/tizen/emulator_configure.sh b/tizen/emulator_configure.sh
index aebfa088447d5d62152764049208aee3b646c3d1..3870e5dfad981d3021bfa00430025e4f9bb78781 100755 (executable)
--- a/tizen/emulator_configure.sh
+++ b/tizen/emulator_configure.sh
@@ -148,6 +148,7 @@ CONFIGURE_APPEND="
  --disable-spice
  --disable-curses
  --disable-xen
+ --enable-virglrenderer
  $CONFIGURE_APPEND"
 
 CONFIGURE_APPEND_WIN="