diff options
| author | SeokYeon Hwang <syeon.hwang@samsung.com> | 2016-01-04 19:28:26 +0900 |
|---|---|---|
| committer | SeokYeon Hwang <syeon.hwang@samsung.com> | 2016-01-05 21:15:21 +0900 |
| commit | 346ee8b1ee5cccd871ba7bc2c0a78c4e98d88748 (patch) | |
| tree | f47ecdfe195bcb018ea1483cdefa24748bf31fd8 /tizen/src/ui/menu | |
| parent | 67a8399cae344e2261475fb054914385624f19a5 (diff) | |
| download | qemu-346ee8b1ee5cccd871ba7bc2c0a78c4e98d88748.tar.gz qemu-346ee8b1ee5cccd871ba7bc2c0a78c4e98d88748.tar.bz2 qemu-346ee8b1ee5cccd871ba7bc2c0a78c4e98d88748.zip | |
emulator: clean-up emulator network initialization
Do port forwarding and base port initialization at once.
Some emul_state getters/setters are refined.
"sdb.c" is "net_helper.c" now and it use new_debug_channel.
Change-Id: I0659b35e231a8f60bd3707a2d04b09213a9cb830
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Signed-off-by: Jinhyung Choi <jinh0.choi@samsung.com>
Diffstat (limited to 'tizen/src/ui/menu')
| -rw-r--r-- | tizen/src/ui/menu/contextmenu.cpp | 3 | ||||
| -rw-r--r-- | tizen/src/ui/menu/contextmenu.h | 1 | ||||
| -rw-r--r-- | tizen/src/ui/menu/screenshotdialog.cpp | 2 | ||||
| -rw-r--r-- | tizen/src/ui/menu/shellopener.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/tizen/src/ui/menu/contextmenu.cpp b/tizen/src/ui/menu/contextmenu.cpp index 307b600bf7..5f8a5ae4e4 100644 --- a/tizen/src/ui/menu/contextmenu.cpp +++ b/tizen/src/ui/menu/contextmenu.cpp @@ -45,6 +45,7 @@ void qemu_system_reset_request(void); #define MENU_ACTION_REBOOT 1 void send_shutdown_request(int action); +#include "util/net_helper.h" #include "util/osutil.h" #include "util/device_hotplug.h" #include "util/ui_operations.h" @@ -76,7 +77,7 @@ ContextMenu::ContextMenu(QWidget *parent) : QMenu(parent) this->controllerMapper = NULL; vmName = this->parent->getUiInfo()->getVmName() + " : " - + QString::number(get_device_serial_number()); + + QString::number(get_vm_device_serial_number()); /* for SDB shell */ shellOpener = new ShellOpener(); diff --git a/tizen/src/ui/menu/contextmenu.h b/tizen/src/ui/menu/contextmenu.h index 3c2181eda7..bae1553eb7 100644 --- a/tizen/src/ui/menu/contextmenu.h +++ b/tizen/src/ui/menu/contextmenu.h @@ -46,7 +46,6 @@ class MainWindow; extern "C" { #include "emul_state.h" -#include "util/sdb.h" } #define CLOSE_POWER_KEY_INTERVAL 1200 /* milli-seconds */ diff --git a/tizen/src/ui/menu/screenshotdialog.cpp b/tizen/src/ui/menu/screenshotdialog.cpp index 36f393b17a..b41798c905 100644 --- a/tizen/src/ui/menu/screenshotdialog.cpp +++ b/tizen/src/ui/menu/screenshotdialog.cpp @@ -53,7 +53,7 @@ ScreenShotDialog::ScreenShotDialog(QWidget *parent) : setWindowTitle(QString(SCREENSHOT_TITLE) + " - " + win->getUiInfo()->getVmName() + " : " + - QString::number(get_device_serial_number())); + QString::number(get_vm_device_serial_number())); setWindowIcon(QIcon(":/icons/screen_shot.png")); dialogLayout = new QGridLayout(this); diff --git a/tizen/src/ui/menu/shellopener.cpp b/tizen/src/ui/menu/shellopener.cpp index 76ebb50e4b..c4f52492f6 100644 --- a/tizen/src/ui/menu/shellopener.cpp +++ b/tizen/src/ui/menu/shellopener.cpp @@ -57,7 +57,7 @@ void ShellOpener::openShell(QString title) QString command; QStringList arguments; - QString sdbPort = QString::number(get_device_serial_number()); + QString sdbPort = QString::number(get_vm_device_serial_number()); QString sdbSerialName; if (is_netclient_tap_attached()) { sdbSerialName = QString(get_emul_guest_ip()); |