Merge branch 'develop' into develop_qemu_2.7

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

diff --cc Makefile.target
Simple merge

diff --cc cpus.c
Simple merge

diff --cc tizen/src/emul_state.c
index 8e6b7ea,adb0b37..5ecf70d
--- 1/tizen/src/emul_state.c
--- 2/tizen/src/emul_state.c
+++ b/tizen/src/emul_state.c
@@@ -546,13 -546,10 +546,10 @@@ bool is_netclient_tap_attached(void
      int queues, i;
  
      queues = qemu_find_net_clients_except(NULL, ncs,
 -                                          NET_CLIENT_OPTIONS_KIND_NIC,
 +                                          NET_CLIENT_DRIVER_NIC,
                                            MAX_QUEUE_NUM);
      for (i = 0; i < queues; ++i) {
-         if (ncs[i]->info->type == NET_CLIENT_DRIVER_TAP &&
-                 (ncs[i]->peer->info->type == NET_CLIENT_DRIVER_NIC ||
-                 // for legacy -net option.
-                  ncs[i]->peer->info->type == NET_CLIENT_DRIVER_HUBPORT)) {
 -        if (ncs[i]->info->type == NET_CLIENT_OPTIONS_KIND_TAP) {
++        if (ncs[i]->info->type == NET_CLIENT_DRIVER_TAP) {
              return true;
          }
      }

diff --cc vl.c
index e85078a,2b9a29c..4eee2b9
--- 1/vl.c
--- 2/vl.c
+++ b/vl.c
@@@ -4841,11 -4884,16 +4844,22 @@@ int main(int argc, char **argv, char **
      tpm_cleanup();
  #endif
  
 +    /* vhost-user must be cleaned up before chardevs.  */
 +    net_cleanup();
 +    audio_cleanup();
 +    monitor_cleanup();
 +    qemu_chr_cleanup();
 +
+ #if defined(CONFIG_MARU) && defined(CONFIG_QT)
+     switch (display_type) {
+     case DT_MARU_QT_ONSCREEN:
+     case DT_MARU_QT_OFFSCREEN:
+         maru_qt5_display_fini();
+         break;
+     default:
+         break;
+     }
+ #endif
+ 
      return 0;
  }