OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

user: introduce "-d page" 

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2015-11-13 12:32:19 +01:00
parent c30f0d182f
commit 1382902055
5 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bsd-user/main.c
View File

@ -938,7 +938,7 @@ int main(int argc, char **argv)
unsigned long tmp; unsigned long tmp;
if (fscanf(fp, "%lu", &tmp) == 1) { if (fscanf(fp, "%lu", &tmp) == 1) {
mmap_min_addr = tmp; mmap_min_addr = tmp;
qemu_log("host mmap_min_addr=0x%lx\n", mmap_min_addr); qemu_log_mask(CPU_LOG_PAGE, "host mmap_min_addr=0x%lx\n", mmap_min_addr);
} }
fclose(fp); fclose(fp);
} }
@ -955,7 +955,7 @@ int main(int argc, char **argv)
free(target_environ); free(target_environ);
if (qemu_log_enabled()) { if (qemu_loglevel_mask(CPU_LOG_PAGE)) {
qemu_log("guest_base 0x%lx\n", guest_base); qemu_log("guest_base 0x%lx\n", guest_base);
log_page_dump(); log_page_dump();

1
include/qemu/log.h
View File

@ -48,6 +48,7 @@ static inline bool qemu_log_separate(void)
#define LOG_GUEST_ERROR (1 << 11) #define LOG_GUEST_ERROR (1 << 11)
#define CPU_LOG_MMU (1 << 12) #define CPU_LOG_MMU (1 << 12)
#define CPU_LOG_TB_NOCHAIN (1 << 13) #define CPU_LOG_TB_NOCHAIN (1 << 13)
#define CPU_LOG_PAGE (1 << 14)
/* Returns true if a bit is set in the current loglevel mask /* Returns true if a bit is set in the current loglevel mask
*/ */

8
linux-user/elfload.c
View File

@ -1743,7 +1743,7 @@ unsigned long init_guest_space(unsigned long host_start,
} }
} }
qemu_log("Reserved 0x%lx bytes of guest address space\n", host_size); qemu_log_mask(CPU_LOG_PAGE, "Reserved 0x%lx bytes of guest address space\n", host_size);
return real_start; return real_start;
} }
@ -1784,9 +1784,9 @@ static void probe_guest_base(const char *image_name,
} }
guest_base = real_start - loaddr; guest_base = real_start - loaddr;
qemu_log("Relocating guest address space from 0x" qemu_log_mask(CPU_LOG_PAGE, "Relocating guest address space from 0x"
TARGET_ABI_FMT_lx " to 0x%lx\n", TARGET_ABI_FMT_lx " to 0x%lx\n",
loaddr, real_start); loaddr, real_start);
} }
return; return;

4
linux-user/main.c
View File

@ -4241,7 +4241,7 @@ int main(int argc, char **argv, char **envp)
unsigned long tmp; unsigned long tmp;
if (fscanf(fp, "%lu", &tmp) == 1) { if (fscanf(fp, "%lu", &tmp) == 1) {
mmap_min_addr = tmp; mmap_min_addr = tmp;
qemu_log("host mmap_min_addr=0x%lx\n", mmap_min_addr); qemu_log_mask(CPU_LOG_PAGE, "host mmap_min_addr=0x%lx\n", mmap_min_addr);
} }
fclose(fp); fclose(fp);
} }
@ -4300,7 +4300,7 @@ int main(int argc, char **argv, char **envp)
free(target_environ); free(target_environ);
if (qemu_log_enabled()) { if (qemu_loglevel_mask(CPU_LOG_PAGE)) {
qemu_log("guest_base 0x%lx\n", guest_base); qemu_log("guest_base 0x%lx\n", guest_base);
log_page_dump(); log_page_dump();

2
qemu-log.c
View File

@ -117,6 +117,8 @@ const QEMULogItem qemu_log_items[] = {
{ LOG_GUEST_ERROR, "guest_errors", { LOG_GUEST_ERROR, "guest_errors",
"log when the guest OS does something invalid (eg accessing a\n" "log when the guest OS does something invalid (eg accessing a\n"
"non-existent register)" }, "non-existent register)" },
{ CPU_LOG_PAGE, "page",
"dump pages at beginning of user mode emulation" },
{ CPU_LOG_TB_NOCHAIN, "nochain", { CPU_LOG_TB_NOCHAIN, "nochain",
"do not chain compiled TBs so that \"exec\" and \"cpu\" show\n" "do not chain compiled TBs so that \"exec\" and \"cpu\" show\n"
"complete traces" }, "complete traces" },