From: GiWoong Kim Date: Fri, 4 Sep 2015 11:27:34 +0000 (+0900) Subject: menu: add a kernel file information to VM info of Detailed Info Dialog X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.2~40^2~146 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=394eab11f88eadca868cc34de581d34903c0e59d;p=sdk%2Femulator%2Fqemu.git menu: add a kernel file information to VM info of Detailed Info Dialog Change-Id: Ia530c89469565475275c12b831d6bc9203cef10a Signed-off-by: GiWoong Kim --- diff --git a/tizen/src/emul_state.c b/tizen/src/emul_state.c index e092bfd002..79812166f8 100644 --- a/tizen/src/emul_state.c +++ b/tizen/src/emul_state.c @@ -520,6 +520,12 @@ const char *get_swap_image_file(void) return ""; } +// kernel file +const char *get_kernel_file(void) +{ + return qemu_opt_get(qemu_get_machine_opts(), "kernel"); +} + // http proxy static const char *http_proxy_addr = NULL; diff --git a/tizen/src/emul_state.h b/tizen/src/emul_state.h index 211d134aa0..065eca502e 100644 --- a/tizen/src/emul_state.h +++ b/tizen/src/emul_state.h @@ -183,6 +183,7 @@ char const *get_log_redirect_file(void); char const *get_kernel_log_redirect_file(void); const char *get_drive_image_file(void); const char *get_swap_image_file(void); +const char *get_kernel_file(void); const char *get_http_proxy_addr(void); const char *get_vm_name(void); const char *get_profile_name(void); diff --git a/tizen/src/ui/menu/detailedinfodialog.cpp b/tizen/src/ui/menu/detailedinfodialog.cpp index 930af41a88..72f1eb822b 100644 --- a/tizen/src/ui/menu/detailedinfodialog.cpp +++ b/tizen/src/ui/menu/detailedinfodialog.cpp @@ -153,6 +153,12 @@ QTableWidget *DetailedInfoDialog::createVmInfoTable() swap_image_file, swap_image_file); } + QString kernel_file(QString::fromLocal8Bit(get_kernel_file())); + if (kernel_file.isEmpty() == false) { + insertTableRow(vmInfo, QString(DETAILED_INFO_KERNEL_FILE), + kernel_file, kernel_file); + } + QString log_redirect_file(QString::fromLocal8Bit(get_log_redirect_file())); if (log_redirect_file.isEmpty() == false) { insertTableRow(vmInfo, QString(DETAILED_INFO_EMUL_LOG_FILE), @@ -352,7 +358,8 @@ void DetailedInfoDialog::slotCellOpen(int nRow, int nCol) item->text().compare(DETAILED_INFO_EMUL_LOG_FILE) == 0 || item->text().compare(DETAILED_INFO_KERNEL_LOG_FILE) == 0 || item->text().compare(DETAILED_INFO_DRIVE_IMAGE_FILE) == 0 || - item->text().compare(DETAILED_INFO_SWAP_IMAGE_FILE) == 0) { + item->text().compare(DETAILED_INFO_SWAP_IMAGE_FILE) == 0 || + item->text().compare(DETAILED_INFO_KERNEL_FILE) == 0) { /* get path item */ item = vmInfoTable->item(nRow, nCol); diff --git a/tizen/src/ui/resource/ui_strings.h b/tizen/src/ui/resource/ui_strings.h index 115fee755e..22c4eb8962 100644 --- a/tizen/src/ui/resource/ui_strings.h +++ b/tizen/src/ui/resource/ui_strings.h @@ -98,6 +98,7 @@ #define DETAILED_INFO_GPU_VT "GPU Virtualization" #define DETAILED_INFO_DRIVE_IMAGE_FILE "Target Image File" #define DETAILED_INFO_SWAP_IMAGE_FILE "Swap Image File" +#define DETAILED_INFO_KERNEL_FILE "Kernel File" #define DETAILED_INFO_EMUL_LOG_FILE "Emulator Log File" #define DETAILED_INFO_KERNEL_LOG_FILE "Kernel Log File" #define DETAILED_INFO_TELNET_PORT "Logging Telnet Port"