[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 29/45] user: introduce "-d page"
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 29/45] user: introduce "-d page" |
Date: |
Thu, 17 Dec 2015 18:46:25 +0100 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
bsd-user/main.c | 4 ++--
include/qemu/log.h | 1 +
linux-user/elfload.c | 8 ++++----
linux-user/main.c | 4 ++--
qemu-log.c | 2 ++
5 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/bsd-user/main.c b/bsd-user/main.c
index adf2de0..1ecaeb5 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 964ab9d..d837d90 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 8b17c0e..b90be12 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 a04e91e..6783722 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 7cb01a8..901b930 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" },
--
2.5.0
- [Qemu-devel] [PULL 17/45] target-i386/kvm: Hyper-V SynIC timers MSR's support, (continued)
- [Qemu-devel] [PULL 17/45] target-i386/kvm: Hyper-V SynIC timers MSR's support, Paolo Bonzini, 2015/12/17
- [Qemu-devel] [PULL 20/45] qemu-char: append opt to stop truncation of serial file, Paolo Bonzini, 2015/12/17
- [Qemu-devel] [PULL 19/45] kvm: x86: add support for KVM_CAP_SPLIT_IRQCHIP, Paolo Bonzini, 2015/12/17
- [Qemu-devel] [PULL 23/45] cris: avoid "naked" qemu_log, Paolo Bonzini, 2015/12/17
- [Qemu-devel] [PULL 22/45] alpha: convert "naked" qemu_log to tracepoint, Paolo Bonzini, 2015/12/17
- [Qemu-devel] [PULL 24/45] microblaze: avoid "naked" qemu_log, Paolo Bonzini, 2015/12/17
- [Qemu-devel] [PULL 21/45] qemu-log: introduce qemu_log_separate, Paolo Bonzini, 2015/12/17
- [Qemu-devel] [PULL 27/45] tricore: avoid "naked" qemu_log, Paolo Bonzini, 2015/12/17
- [Qemu-devel] [PULL 25/45] s390x: avoid "naked" qemu_log, Paolo Bonzini, 2015/12/17
- [Qemu-devel] [PULL 26/45] ppc: cleanup logging, Paolo Bonzini, 2015/12/17
- [Qemu-devel] [PULL 29/45] user: introduce "-d page",
Paolo Bonzini <=
- [Qemu-devel] [PULL 32/45] exec: always call qemu_get_ram_ptr within rcu_read_lock, Paolo Bonzini, 2015/12/17
- [Qemu-devel] [PULL 34/45] memory: reorder MemoryRegion fields, Paolo Bonzini, 2015/12/17
- [Qemu-devel] [PULL 31/45] linux-user: convert DEBUG_SIGNAL logging to tracepoints, Paolo Bonzini, 2015/12/17
- [Qemu-devel] [PULL 30/45] linux-user: avoid "naked" qemu_log, Paolo Bonzini, 2015/12/17
- [Qemu-devel] [PULL 28/45] xtensa: avoid "naked" qemu_log, Paolo Bonzini, 2015/12/17
- [Qemu-devel] [PULL 35/45] memory: avoid unnecessary object_ref/unref, Paolo Bonzini, 2015/12/17
- [Qemu-devel] [PULL 40/45] rcu: optimize rcu_read_lock, Paolo Bonzini, 2015/12/17
- [Qemu-devel] [PULL 37/45] memory: extract first iteration of address_space_read and address_space_write, Paolo Bonzini, 2015/12/17
- [Qemu-devel] [PULL 41/45] target-i386: kvm: clear unusable segments' flags in migration, Paolo Bonzini, 2015/12/17
- [Qemu-devel] [PULL 43/45] scsi: always call notifier on async cancellation, Paolo Bonzini, 2015/12/17