From 29a414cec2d750ad8354be618ac46a417810a556 Mon Sep 17 00:00:00 2001 From: Kitae Kim Date: Thu, 1 Nov 2012 20:42:09 +0900 Subject: [PATCH] [Title] emulator-manager : launch command for arm emulator was incorrect. [Desc.] skin-args and qemu-args were duplicated and other qemu options were not suitable for arm emulator. [Issue] N/A --- package/changelog | 4 +++ package/pkginfo.manifest | 2 +- src/org/tizen/emulator/manager/vms/Launcher.java | 43 ++++++++---------------- 3 files changed, 19 insertions(+), 30 deletions(-) diff --git a/package/changelog b/package/changelog index d341f23..021ef37 100644 --- a/package/changelog +++ b/package/changelog @@ -1,3 +1,7 @@ +*1.3.50 +- Modify launch command for arm emulator. +- Skin-args and qemu-args were duplicated and other options were not suitable for arm emulator. +== Kitae Kim 2012-11-01 *1.3.49 - add 'select skin path' menu. - modify console mode. diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest index 1462b84..823ab2c 100644 --- a/package/pkginfo.manifest +++ b/package/pkginfo.manifest @@ -1,5 +1,5 @@ Source: emulator-manager -Version: 1.3.49 +Version: 1.3.50 Maintainer: Yeong-Kyoon Lee Package: emulator-manager diff --git a/src/org/tizen/emulator/manager/vms/Launcher.java b/src/org/tizen/emulator/manager/vms/Launcher.java index ff6b6af..3862703 100644 --- a/src/org/tizen/emulator/manager/vms/Launcher.java +++ b/src/org/tizen/emulator/manager/vms/Launcher.java @@ -280,32 +280,27 @@ public class Launcher { cmd.add("-drive"); cmd.add("file=" + property.getConfiguration().getBaseInformation().getDiskImage().getSwapDiskImage().getValue() + ",if=virtio,index=2"); } - } else { // ARM part of cmd - if (path == null || path.isEmpty()) { - cmd.add(fio.getBinPath() + File.separator + binary); - } else { - this.binPath = path; - cmd.add(binPath + File.separator + binary); + + /* append HW virtualization option if supports */ + if (hwVirtualization != null) { + cmd.add(hwVirtualization); } - cmd.add("--skin-args"); - cmd.add("width=" + width); - cmd.add("height=" + height); - if (skinPath != null) { - cmd.add("skin.path=" + skinPath); + // add hw gl acceleration + if (property.getConfiguration().getUsability().isHwGLAcceleration()) { + cmd.add("-enable-gl"); } - cmd.add("--qemu-args"); + } else { // ARM part of cmd cmd.add("-drive"); - //cmd.add("file=" + EmulatorVMs.getInstance().getVMsBaseDirectory() + File.separator + property.getArch().toString() + File.separator + property.getName() + File.separator +"emulimg-" + property.getName() + ".x86,if=virtio"); - cmd.add("file=" + property.getConfiguration().getBaseInformation().getDiskImage().getCurrentDiskImage().getValue()+ ",id=virtio-blk"); + cmd.add("file=" + property.getConfiguration().getBaseInformation().getDiskImage().getCurrentDiskImage().getValue()+ ",id=virtio-blk,if=none"); cmd.add( "-device"); - cmd.add("virtio-blk,drive=virtio-blk"); + cmd.add("virtio-blk,drive=virtio-blk,transport=virtio-mmio.0"); cmd.add("-netdev"); cmd.add("user,id=virtio-net"); cmd.add("-device"); - cmd.add("virtio-net,netdev=virtio-net"); + cmd.add("virtio-net,netdev=virtio-net,transport=virtio-mmio.1"); cmd.add("-append"); - cmd.add("console=ttySAC2,115200 video=s3cfb:" + cmd.add("yagl= 0 console=ttySAC2,115200 video=s3cfb:" + width + "x" + height @@ -327,22 +322,12 @@ public class Launcher { cmd.add("-soundhw"); cmd.add("all"); cmd.add("-usb"); - cmd.add("-device"); - cmd.add("virtio-touchscreen-pci"); + cmd.add("-usbdevice"); + cmd.add("maru-touchscreen"); cmd.add("-kernel"); cmd.add(fio.getKernelPath() + File.separator+ "bzImage." + property.getArch().toString()); } - /* append HW virtualization option if supports */ - if (hwVirtualization != null) { - cmd.add(hwVirtualization); - } - - // add hw gl acceleration - if (property.getConfiguration().getUsability().isHwGLAcceleration()) { - cmd.add("-enable-gl"); - } - //if (EmulatorManager.getInstance().getManagerMode().equals(ManagerModeType.INHOUSE_MODE)) { TouchType touchType = property.getConfiguration().getDevice().getTouch(); if (touchType != null) { -- 2.7.4