From 1217baf274ec55bceb1f140111aaf2480a018bf0 Mon Sep 17 00:00:00 2001 From: Vasiliev Ivan Date: Fri, 7 Apr 2017 14:44:48 +0300 Subject: [PATCH] Minor fixes here and there --- configure | 10 +-- monitor.c | 5 +- plugins/plugins_src/syscall_lin.c | 5 -- plugins/plugins_src/syscall_win.c | 103 ++---------------------------- 4 files changed, 11 insertions(+), 112 deletions(-) diff --git a/configure b/configure index 8f746fa4827b..1212c8ebc8da 100755 --- a/configure +++ b/configure @@ -860,9 +860,9 @@ for opt do ;; --block-drv-ro-whitelist=*) block_drv_ro_whitelist=$(echo "$optarg" | sed -e 's/,/ /g') ;; - --enable-plugin) plugin="yes" + --enable-plugins) plugin="yes" ;; - --disable-plugin) plugin="no" + --disable-plugins) plugin="no" ;; --enable-debug-tcg) debug_tcg="yes" ;; @@ -1309,9 +1309,9 @@ Advanced options (experts only): --bindir=PATH install binaries in PATH --libdir=PATH install libraries in PATH --sysconfdir=PATH install config in PATH$confsuffix - --libexecdir=PATH install TCG plugins in PATH" - --enable-plugin enable plugin support" - --disable-plugin disable plugin support (default)" + --libexecdir=PATH install plugins in PATH" + --enable-plugins enable plugin support" + --disable-plugins disable plugin support (default)" --localstatedir=PATH install local state in PATH (set at runtime on win32) --with-confsuffix=SUFFIX suffix for QEMU data inside datadir/libdir/sysconfdir [$confsuffix] --enable-debug enable common debug build options diff --git a/monitor.c b/monitor.c index ad09de375540..fae5954fd624 100644 --- a/monitor.c +++ b/monitor.c @@ -2570,8 +2570,7 @@ const mon_cmd_t *monitor_parse_command(Monitor *mon, cmd = search_dispatch_table(table, cmdname); if (!cmd) { - monitor_printf(mon, "unknown command: '%.*s'\n", - (int)(p - *cmdp), *cmdp); + *cmdp = p; return NULL; } @@ -2972,8 +2971,8 @@ static void handle_hmp_command(Monitor *mon, const char *cmdline) cmdline = start; cmd = plugin_parse_command(mon, &cmdline); end = cmdline; - if (!cmd) #endif + if (!cmd) { monitor_printf(mon, "unknown command: '%.*s'\n", (int)(end - start), start); return; diff --git a/plugins/plugins_src/syscall_lin.c b/plugins/plugins_src/syscall_lin.c index ddb33ff5da2d..c813e6f8c873 100644 --- a/plugins/plugins_src/syscall_lin.c +++ b/plugins/plugins_src/syscall_lin.c @@ -14,7 +14,6 @@ #include "guest_string.h" static FILE *syscallfile; -static FILE *log; void printf_log(const char *format, ...) @@ -167,10 +166,6 @@ Parameters_c *syscall_close_os(CPUArchState *env) int syscall_init_log(void) { - log = fopen("log_sys_ret.log", "w"); - if (!log) - printf("Can\'t read file %s\n", "log_sys_ret.log"); - const char *fname = "syscall.log"; syscallfile = fopen(fname, "w"); if (!syscallfile) { diff --git a/plugins/plugins_src/syscall_win.c b/plugins/plugins_src/syscall_win.c index 42e9a82f0114..2caaa432c066 100644 --- a/plugins/plugins_src/syscall_win.c +++ b/plugins/plugins_src/syscall_win.c @@ -142,38 +142,7 @@ Parameters_oc *syscall_open_os(CPUArchState *env) printf_log("\t\t\tObjectName 0x%x\n", ldl_p(&data_struct[8])); { addr = ldl_p(&data_struct[8]); - /*uint8_t data_oname[8]; - cpu_memory_rw_debug(first_cpu, addr, data_oname, sizeof(data_oname), 0); - printf_log("\t\t\t\tLength 0x%x\n", lduw_p(data_oname)); - printf_log("\t\t\t\tMaximumLength 0x%x\n", lduw_p(&data_oname[2])); - printf_log("\t\t\t\tpBuffer 0x%x\n", ldl_p(&data_oname[4])); - { - uint32_t addr = ldl_p(&data_oname[4]); - if (addr) - { - uint16_t len = lduw_p(data_oname); - uint16_t buf[len / 2]; - cpu_memory_rw_debug(first_cpu, addr, (uint8_t*)buf, sizeof(buf), 0); - printf_log("\t\t\t\t\tname: "); - char name[len / 2 + 1]; - int j = 0; - params->name = g_malloc(len / 2 + 1); - for (i = 0; i < len / 2; i++) - { - printf_log("%lc", buf[i]); - if (buf[i] == '\\') - j = 0; - else - name[j++] = buf[i]; - params->name[i] = buf[i]; - } - name[j] = 0; - params->name[i] = 0; - printf_log("\n\t\t\t\t\tname = %s\n", name); - } - } - */ - //printf_log("\t\t\t\t\t"); + if (addr) params->name = printf_unicode_string(addr); } @@ -193,7 +162,6 @@ Parameters_oc *syscall_create_os(CPUArchState *env) { Parameters_oc *params = g_malloc0(sizeof(Parameters_oc)); - //fprintf(log, "syscall CREATE\n"); uint8_t data[44]; write_prolog(env, data, sizeof(data)); printf_log("\tNtCreateFile addr_arg = 0x"TARGET_FMT_lx"\n", env->regs[R_EDX] + 8); @@ -223,39 +191,7 @@ Parameters_oc *syscall_create_os(CPUArchState *env) printf_log("\t\t\tObjectName 0x%x\n", ldl_p(&data_struct[8])); { addr = ldl_p(&data_struct[8]); - /* - uint8_t data_oname[8]; - cpu_memory_rw_debug(first_cpu, addr, data_oname, sizeof(data_oname), 0); - printf_log("\t\t\t\tLength 0x%x\n", lduw_p(data_oname)); - printf_log("\t\t\t\tMaximumLength 0x%x\n", lduw_p(&data_oname[2])); - printf_log("\t\t\t\tpBuffer 0x%x\n", ldl_p(&data_oname[4])); - { - uint32_t addr = ldl_p(&data_oname[4]); - if (addr) - { - uint16_t len = lduw_p(data_oname); - uint16_t buf[len / 2]; - cpu_memory_rw_debug(first_cpu, addr, (uint8_t*)buf, sizeof(buf), 0); - printf_log("\t\t\t\t\tname: "); - char name[len / 2 + 1]; - int j = 0; - params->name = g_malloc(len / 2 + 1); - for (i = 0; i < len / 2; i++) - { - printf_log("%lc", buf[i]); - if (buf[i] == '\\') - j = 0; - else - name[j++] = buf[i]; - params->name[i] = buf[i]; - } - name[j] = 0; - params->name[i] = 0; - printf_log("\n\t\t\t\t\tname = %s\n", name); - } - } - */ - //printf_log("\t\t\t\t\t"); + if (addr) params->name = printf_unicode_string(addr); } @@ -343,7 +279,6 @@ Parameters_rw *syscall_write_os(CPUArchState *env) Parameters_c *syscall_close_os(CPUArchState *env) { Parameters_c *params = g_malloc0(sizeof(Parameters_c)); - //fprintf(log, "syscall CLOSE\n"); uint8_t data[4]; write_prolog(env, data, sizeof(data)); printf_log("\tNtClose addr_arg = 0x"TARGET_FMT_lx"\n", env->regs[R_EDX] + 8); @@ -357,7 +292,6 @@ Parameters_cs *syscall_create_section_os(CPUArchState *env) { Parameters_cs *params = g_malloc0(sizeof(Parameters_cs)); - //fprintf(log, "syscall CREATE_SECTION\n"); uint8_t data[44]; write_prolog(env, data, sizeof(data)); printf_log("\tNtCreateSection addr_arg = 0x"TARGET_FMT_lx"\n", env->regs[R_EDX] + 8); @@ -384,28 +318,7 @@ Parameters_cs *syscall_create_section_os(CPUArchState *env) printf_log("\t\t\tObjectName 0x%x\n", ldl_p(&data_struct[8])); { addr = ldl_p(&data_struct[8]); - /*uint8_t data_oname[8]; - cpu_memory_rw_debug(first_cpu, addr, data_oname, sizeof(data_oname), 0); - printf_log("\t\t\t\tLength 0x%x\n", lduw_p(data_oname)); - printf_log("\t\t\t\tMaximumLength 0x%x\n", lduw_p(&data_oname[2])); - printf_log("\t\t\t\tpBuffer 0x%x\n", ldl_p(&data_oname[4])); - { - uint32_t addr = ldl_p(&data_oname[4]); - if (addr) - { - uint16_t len = lduw_p(data_oname); - uint16_t buf[len / 2]; - cpu_memory_rw_debug(first_cpu, addr, (uint8_t*)buf, sizeof(buf), 0); - printf_log("\t\t\t\t\tname: "); - for (i = 0; i < len / 2; i++) - { - printf_log("%lc", buf[i]); - } - printf_log("\n"); - } - } - */ - //printf_log("\t\t\t\t"); + if (addr) params->name = printf_unicode_string(addr); } @@ -434,9 +347,7 @@ Parameters_map *syscall_map_view_of_section_os(CPUArchState *env) printf_log("\t\tProcessHandle 0x%x\n", ldl_p(&data[4])); printf_log("\t\t*BaseAddress 0x%x\n", ldl_p(&data[8])); params->pBaseAddress = ldl_p(&data[8]); - //uint8_t data2[4]; - //cpu_memory_rw_debug(first_cpu, params->pBaseAddress, data2, 4, 0); - //printf_log("\t\tBaseAddress 0x%x\n", ldl_p(data2)); + printf_log("\t\tZeroBits 0x%x\n", ldl_p(&data[12])); printf_log("\t\tCommitSize 0x%x\n", ldl_p(&data[16])); printf_log("\t\tpSectionOffset 0x%x\n", ldl_p(&data[20])); @@ -447,7 +358,6 @@ Parameters_map *syscall_map_view_of_section_os(CPUArchState *env) uint8_t data[4]; cpu_memory_rw_debug(first_cpu, params->viewSize, data, 4, 0); uint32_t viewSize = ldl_p(data); - //params->viewSize = ldl_p(data); printf_log("!!view size: 0x%x\n", viewSize); } printf_log("\t\tInheritDisposition 0x%x\n", ldl_p(&data[28])); @@ -507,7 +417,6 @@ Parameters_os *syscall_open_section_os(CPUArchState *env) printf_log("\t\t\tObjectName 0x%x\n", ldl_p(&data_struct[8])); { addr = ldl_p(&data_struct[8]); - //printf_log("\t\t\t\t"); if (addr) params->name = printf_unicode_string(addr); } @@ -577,10 +486,6 @@ Parameters_do *syscall_duplicate_object_os(CPUArchState *env) int syscall_init_log(void) { - //log = fopen("log_sys_ret.log", "w"); - //if (!log) - // printf("Can\'t read file %s\n", "log_sys_ret.log"); - const char *fname = "syscall.log"; syscallfile = fopen(fname, "w"); if (!syscallfile) {