Merge branch 'tizen_2.4_develop' into tizen_3.0_develop

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

diff --cc configure
index a11567f,132efdf..308412e
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -4620,7 -4354,7 +4620,6 @@@ check_libav() 
  }
  
  set_libav_config() {
--
        if [ "$libav" = "yes" ]; then
                if [ "$exists_libav" = "no" ]; then
                        feature_not_found "$libav_package"

diff --cc package/3.0-emulator-qemu-x86.install.macos-64
index d2794ca,1cd7292..9d875ff
--- 1/package/3.0-emulator-qemu-x86.install.macos-64
--- 2/package/2.4-emulator-qemu-x86.install.macos-64
+++ b/package/3.0-emulator-qemu-x86.install.macos-64
@@@ -3,12 -3,11 +3,11 @@@
  TIZEN_SDK_INSTALL_PATH="`echo $INSTALLED_PATH`"
  OLD_SHMMAXSIZE=`sysctl -n kern.sysv.shmmax`
  SYSCTL_FILE=sysctl.conf
- TMP_DIR=~/.installmanager
  COCOASUDO_PATH=$TIZEN_SDK_INSTALL_PATH/tools/emulator/bin
 -TIZEN_BIN_PATH=$TIZEN_SDK_INSTALL_PATH/platforms/tizen-2.4/common/emulator/bin
 -TIZEN_PLATFORM_ETC_PATH=$TIZEN_SDK_INSTALL_PATH/platforms/tizen-2.4/common/emulator/etc
 +TIZEN_BIN_PATH=$TIZEN_SDK_INSTALL_PATH/platforms/tizen-3.0/common/emulator/bin
 +TIZEN_PLATFORM_ETC_PATH=$TIZEN_SDK_INSTALL_PATH/platforms/tizen-3.0/common/emulator/etc
  TIZEN_TOOL_ETC_PATH=$TIZEN_SDK_INSTALL_PATH/tools/emulator/etc
- TMP_FILE=$TMP_DIR/emulator-install.sh
+ TMP_FILE=emulator-install.sh
  NEW_SHMMAXSIZE=83886080
  
  if [ -z "$TIZEN_SDK_INSTALL_PATH" ]

diff --cc package/changelog
index 4b0fb8a,ea96865..f97b45a
--- 1/package/changelog
--- 2/package/changelog
+++ b/package/changelog
@@@ -1,11 -1,12 +1,16 @@@
+ * 2.2.67
+ - allocate "DriveInfo" to delete the "BlockBackend" automatically
++- fix wrong condition
++- bug fix of second sdcard attach
+ == Chulho Song <ch81.song@samsung.com> 2015-09-30
  * 2.2.66
 -- bug fix of second sdcard attach
 -== haken Kim <haken.kim@samsung.com> 2015-09-24
 +- virtio: change device id name
 +- emul_state: change display resolution fallback
 +== Minkee Lee <minkee.lee@samsung.com> 2015-10-08
  * 2.2.65
 -- fix wrong condition
 -== GiWoong Kim <giwoong.kim@samsung.com> 2015-09-10
 +- YaGL: Removed a deprecated attribute
 +- Merge branch 'tizen_2.4_develop' into tizen_3.0_develop
 +== GiWoong Kim <giwoong.kim@samsung.com> 2015-09-30
  * 2.2.64
  - fix failing launching multiple VM
  == Munkyu Im <munkyu.im@samsung.com> 2015-09-08

diff --cc package/pkginfo.manifest
index 2b6ea52,232254f..d097be1
--- 1/package/pkginfo.manifest
--- 2/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@@ -1,82 -1,82 +1,82 @@@
- Version: 2.2.66
- Maintainer: Sangho Park <sangho.p@samsung.com>
+ Version: 2.2.67
 -Maintainer: Sangho Park <sangho.p@samsung.com>
++Maintainer: SeokYeon Hwang <syeon.hwang@samsung.com>
  Source: emulator
  
 -Package: 2.4-emulator-qemu-common
 +Package: 3.0-emulator-qemu-common
  OS: ubuntu-32
  Build-host-os: ubuntu-32
  Description: Common binaries for Tizen Emulator
- C-Prerequisites : libsdl1.2debian
  
 -Package: 2.4-emulator-qemu-common
 +Package: 3.0-emulator-qemu-common
  OS: ubuntu-64
  Build-host-os: ubuntu-64
  Description: Common binaries for Tizen Emulator
- C-Prerequisites : libsdl1.2debian
  
 -Package: 2.4-emulator-qemu-common
 +Package: 3.0-emulator-qemu-common
  OS: windows-32, windows-64
 -Build-host-os: windows-32
 +Build-host-os: ubuntu-64
  Description: Common binaries for Tizen Emulator
  
 -Package: 2.4-emulator-qemu-common
 +Package: 3.0-emulator-qemu-common
  OS: macos-64
  Build-host-os: macos-64
  Description: Common binaries for Tizen Emulator
  
 -Package: 2.4-emulator-qemu-x86
 +Package: 3.0-emulator-qemu-x86
  OS: ubuntu-32
  Build-host-os: ubuntu-32
 -Build-dependency: 2.4-emulator-lib-dev [ ubuntu-32 ], emulator-spice-server-dev [ ubuntu-32 ], 2.4-libav-dev [ ubuntu-32 ]
 -Install-dependency: 2.4-emulator-kernel-x86 [ ubuntu-32 ], emulator-spice-server [ ubuntu-32 ], 2.4-libav [ ubuntu-32 ]
 +Build-dependency: 3.0-emulator-lib-dev [ ubuntu-32 ], emulator-spice-server-dev [ ubuntu-32 ], 3.0-libav-dev [ ubuntu-32 ]
 +Install-dependency: 3.0-emulator-kernel-x86 [ ubuntu-32 ], emulator-spice-server [ ubuntu-32 ], 3.0-libav [ ubuntu-32 ]
+ C-Prerequisites: libsdl1.2debian, libglib2.0-0, acl, zlib1g, libpixman-1-0, bridge-utils, openvpn
  Description: Tizen x86 Emulator
  
 -#Package: 2.4-emulator-qemu-arm
 +#Package: 3.0-emulator-qemu-arm
  #OS: ubuntu-32
  #Build-host-os: ubuntu-32
 -#Install-dependency: 2.4-emulator-kernel-arm [ ubuntu-32 ]
 +#Install-dependency: 3.0-emulator-kernel-arm [ ubuntu-32 ]
  #Description: Tizen ARM Emulator
  #
 -Package: 2.4-emulator-qemu-x86
 +Package: 3.0-emulator-qemu-x86
  OS: ubuntu-64
  Build-host-os: ubuntu-64
 -Build-dependency: 2.4-emulator-lib-dev [ ubuntu-64 ], emulator-spice-server-dev [ ubuntu-64 ], 2.4-libav-dev [ ubuntu-64]
 -Install-dependency: 2.4-emulator-kernel-x86 [ ubuntu-64 ], emulator-spice-server [ ubuntu-64 ], 2.4-libav [ ubuntu-64 ]
 +Build-dependency: 3.0-emulator-lib-dev [ ubuntu-64 ], emulator-spice-server-dev [ ubuntu-64 ], 3.0-libav-dev [ ubuntu-64]
 +Install-dependency: 3.0-emulator-kernel-x86 [ ubuntu-64 ], emulator-spice-server [ ubuntu-64 ], 3.0-libav [ ubuntu-64 ]
+ C-Prerequisites: libsdl1.2debian, libglib2.0-0, acl, zlib1g, libpixman-1-0, bridge-utils, openvpn
  Description: Tizen x86 Emulator
  
 -#Package: 2.4-emulator-qemu-arm
 +#Package: 3.0-emulator-qemu-arm
  #OS: ubuntu-64
  #Build-host-os: ubuntu-64
 -#Build-dependency: 2.4-emulator-lib [ ubuntu-64 ]
 -#Install-dependency: 2.4-emulator-kernel-arm [ ubuntu-64 ]
 +#Build-dependency: 3.0-emulator-lib [ ubuntu-64 ]
 +#Install-dependency: 3.0-emulator-kernel-arm [ ubuntu-64 ]
  #Description: Tizen ARM Emulator
  #
 -Package: 2.4-emulator-qemu-x86
 +Package: 3.0-emulator-qemu-x86
  OS: windows-32, windows-64
 -Build-host-os: windows-32
 -Build-dependency: 2.4-emulator-lib-dev [ windows-32 ], 2.4-libav-dev [ windows-32 ]
 -Install-dependency: 2.4-emulator-kernel-x86, 2.4-libav
 +Build-host-os: ubuntu-64
 +Build-dependency: 3.0-emulator-lib-dev [ windows-32 ], 3.0-libav-dev [ windows-32 ]
 +Install-dependency: 3.0-emulator-kernel-x86, 3.0-libav
  Description: Tizen x86 Emulator
  
 -#Package: 2.4-emulator-qemu-arm
 +#Package: 3.0-emulator-qemu-arm
  #OS: windows-32, windows-64
 -#Build-host-os: windows-32
 -#Build-dependency: 2.4-emulator-lib-dev [ windows-32 ]
 -#Install-dependency: 2.4-emulator-kernel-arm [ windows-32 ]
 +#Build-host-os: ubuntu-64
 +#Build-dependency: 3.0-emulator-lib-dev [ windows-32 ]
 +#Install-dependency: 3.0-emulator-kernel-arm [ windows-32 ]
  #Description: Tizen ARM Emulator
  #
 -Package: 2.4-emulator-qemu-x86
 +Package: 3.0-emulator-qemu-x86
  OS: macos-64
  Build-host-os: macos-64
 -Build-dependency: 2.4-emulator-lib-dev [ macos-64 ], 2.4-libav-dev [ macos-64 ]
 -Install-dependency: cocoasudo [ macos-64 ], 2.4-emulator-kernel-x86 [ macos-64 ], 2.4-libav [ macos-64 ], tuntaposx [ macos-64 ]
 +Build-dependency: 3.0-emulator-lib-dev [ macos-64 ], 3.0-libav-dev [ macos-64 ]
 +Install-dependency: cocoasudo [ macos-64 ], 3.0-emulator-kernel-x86 [ macos-64 ], 3.0-libav [ macos-64 ], tuntaposx [ macos-64 ]
  Description: Tizen x86 Emulator
  
 -#Package: 2.4-emulator-qemu-arm
 +#Package: 3.0-emulator-qemu-arm
  #OS: macos-64
  #Build-host-os: macos-64
 -#Build-dependency: 2.4-emulator-lib [ macos-64 ]
 -#Install-dependency: 2.4-emulator-kernel-arm [ macos-64 ]
 +#Build-dependency: 3.0-emulator-lib [ macos-64 ]
 +#Install-dependency: 3.0-emulator-kernel-arm [ macos-64 ]
  #Description: Tizen ARM Emulator
  #
  

diff --cc tizen/Makefile
Simple merge

diff --cc tizen/emulator_configure.sh
index 3dbf358,d7b21b0..cc81358
--- 1/tizen/emulator_configure.sh
--- 2/tizen/emulator_configure.sh
+++ b/tizen/emulator_configure.sh
@@@ -105,22 -103,16 +105,23 @@@ f
  # append common options
  CONFIGURE_APPEND="
   --target-list=$EMUL_TARGET_LIST
 + --enable-maru
   --enable-yagl
   --enable-curl
 - --disable-gtk
 - --disable-quorum
   --enable-vigs
 - --enable-maru
 + --enable-qt
   --enable-libav
   --enable-libpng
 - --enable-qt
 - --enable-java-ui
++ --enable-virtfs
 + --disable-bzip2
 + --disable-lzo
 + --disable-snappy
 + --disable-gnutls
 + --disable-gtk
 + --disable-vnc
 + --disable-spice
 + --disable-curses
 + --disable-xen
   $CONFIGURE_APPEND"
  
  # append platform specific options
@@@ -130,9 -122,11 +131,8 @@@ CONFIGURE_APPEND=
   --enable-werror
   --extra-ldflags=-Wl,--export-dynamic
   --audio-drv-list=alsa
 - --disable-vnc
 - --disable-pie
 - --enable-virtfs
 - --disable-xen
   --enable-sdl
-  --enable-virtfs
 + --enable-kvm
   $CONFIGURE_APPEND
  "
  ;;
@@@ -140,47 -134,47 +140,44 @@@ CROSS_MINGW*
  CONFIGURE_APPEND="
   --cross-prefix=$CROSS_PREFIX
   --enable-werror
 + --extra-cflags=-static-libgcc
 + --extra-cflags=-static-libstdc++
   --extra-ldflags=-Wl,--large-address-aware
   --extra-ldflags=-Wl,--export-all-symbols
 - --audio-drv-list=winwave
 - --enable-hax
 - --enable-virtfs
 - --disable-vnc
 + --audio-drv-list=dsound
   --enable-sdl
-  --enable-virtfs
 + --enable-hax
   $CONFIGURE_APPEND
  "
  ;;
  MINGW*)
  CONFIGURE_APPEND="
   --cc=gcc
 + --cxx=g++
   --enable-werror
 - --extra-cflags=-Wno-error=format
 - --extra-cflags=-Wno-error=format-extra-args
 - --extra-cflags=-Wno-error=redundant-decls
 + --extra-cflags=-static-libgcc
 + --extra-cflags=-static-libstdc++
   --extra-ldflags=-Wl,--large-address-aware
   --extra-ldflags=-Wl,--export-all-symbols
 - --audio-drv-list=winwave
 - --enable-hax
 - --enable-virtfs
 - --disable-vnc
 + --audio-drv-list=dsound
   --enable-sdl
-  --enable-virtfs
 + --enable-hax
   $CONFIGURE_APPEND
  "
  ;;
  Darwin*)
  CONFIGURE_APPEND="
 - --enable-werror
   --cc=clang
   --cxx=clang
 - --extra-cflags=-mmacosx-version-min=10.4
 + --enable-werror
 + --extra-cflags=-mmacosx-version-min=10.7
 + --extra-cflags=-Wno-error=deprecated-declarations
   --extra-ldflags=-lstdc++
   --audio-drv-list=coreaudio
 - --enable-shm
 - --enable-hax
   --enable-virtfs
 - --disable-vnc
 - --disable-cocoa
   --disable-sdl
-  --enable-virtfs
 + --disable-cocoa
 + --enable-hax
   $CONFIGURE_APPEND
  "
  # FIXME: "-export_dynamic" causes error on old version clang

diff --cc tizen/src/util/device_hotplug.c
index 926023c,d32235d..0619594
--- 1/tizen/src/util/device_hotplug.c
--- 2/tizen/src/util/device_hotplug.c
+++ b/tizen/src/util/device_hotplug.c
@@@ -106,8 -116,13 +108,12 @@@ static bool do_sdcard_attach(const cha
      qdict_put(qdict_options, "id", qstring_from_str(sdcard_device_id));
      qdict_put(qdict, "options", qdict_options);
  
 -    qmp_marshal_input_blockdev_add(default_mon, qdict, NULL);
 +    qmp_marshal_input_blockdev_add(qdict, NULL, &error_abort);
  
+     dinfo = g_malloc0(sizeof(*dinfo));
+     dinfo->type = IF_VIRTIO;
+     blk_set_legacy_dinfo(blk_by_name(sdcard_device_id), dinfo);
+ 
      QDECREF(qdict);
  
      qdict = qdict_new();