diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2015-11-13 12:32:19 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-12-17 17:33:48 +0100 |
| commit | 13829020556e1571c78802dd4b12e0fbb6c49904 (patch) | |
| tree | ac75bc125a06c91317873c13d6f35d732c7a80a6 | |
| parent | c30f0d182f82d51ca5de79814860e5942e257b59 (diff) | |
user: introduce "-d page"
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | bsd-user/main.c | 4 | ||||
| -rw-r--r-- | include/qemu/log.h | 1 | ||||
| -rw-r--r-- | linux-user/elfload.c | 8 | ||||
| -rw-r--r-- | linux-user/main.c | 4 | ||||
| -rw-r--r-- | qemu-log.c | 2 |
5 files changed, 11 insertions, 8 deletions
diff --git a/bsd-user/main.c b/bsd-user/main.c index adf2de0d90..1ecaeb50e5 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -938,7 +938,7 @@ int main(int argc, char **argv) unsigned long tmp; if (fscanf(fp, "%lu", &tmp) == 1) { 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); } @@ -955,7 +955,7 @@ int main(int argc, char **argv) free(target_environ); - if (qemu_log_enabled()) { + if (qemu_loglevel_mask(CPU_LOG_PAGE)) { qemu_log("guest_base 0x%lx\n", guest_base); log_page_dump(); diff --git a/include/qemu/log.h b/include/qemu/log.h index 964ab9dae8..d837d90e77 100644 --- a/include/qemu/log.h +++ b/include/qemu/log.h @@ -48,6 +48,7 @@ static inline bool qemu_log_separate(void) #define LOG_GUEST_ERROR (1 << 11) #define CPU_LOG_MMU (1 << 12) #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 */ diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 8b17c0e94b..b90be1288b 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -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; } @@ -1784,9 +1784,9 @@ static void probe_guest_base(const char *image_name, } guest_base = real_start - loaddr; - qemu_log("Relocating guest address space from 0x" - TARGET_ABI_FMT_lx " to 0x%lx\n", - loaddr, real_start); + qemu_log_mask(CPU_LOG_PAGE, "Relocating guest address space from 0x" + TARGET_ABI_FMT_lx " to 0x%lx\n", + loaddr, real_start); } return; diff --git a/linux-user/main.c b/linux-user/main.c index a04e91eb76..678372245d 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -4241,7 +4241,7 @@ int main(int argc, char **argv, char **envp) unsigned long tmp; if (fscanf(fp, "%lu", &tmp) == 1) { 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); } @@ -4300,7 +4300,7 @@ int main(int argc, char **argv, char **envp) free(target_environ); - if (qemu_log_enabled()) { + if (qemu_loglevel_mask(CPU_LOG_PAGE)) { qemu_log("guest_base 0x%lx\n", guest_base); log_page_dump(); diff --git a/qemu-log.c b/qemu-log.c index 7cb01a802b..901b93087d 100644 --- a/qemu-log.c +++ b/qemu-log.c @@ -117,6 +117,8 @@ const QEMULogItem qemu_log_items[] = { { LOG_GUEST_ERROR, "guest_errors", "log when the guest OS does something invalid (eg accessing a\n" "non-existent register)" }, + { CPU_LOG_PAGE, "page", + "dump pages at beginning of user mode emulation" }, { CPU_LOG_TB_NOCHAIN, "nochain", "do not chain compiled TBs so that \"exec\" and \"cpu\" show\n" "complete traces" }, |