physmem: Remove trace events from trace-root.h
v3 cover physmem: Remove trace events from trace-root.h
Trivial housekeeping patches.
Philippe Mathieu-Daudé (2):
physmem: Remove unused "exec/translate-all.h"
physmem: Remove trace events from trace-root.h
softmmu/physmem.c | 3 +-- softmmu/trace-events | 5 +++++ trace-events | 5 ----- 3 files changed, 6 insertions(+), 7 deletions(-)
Signature · 1 line
2.38.1
PATCH v3 1/2 physmem: Remove unused "exec/translate-all.h"
--- softmmu/physmem.c | 1 - 1 file changed, 1 deletion(-)
softmmu/physmem.c +0 -1
@@ -58,7 +58,6 @@#include "qemu/rcu_queue.h" #include "qemu/main-loop.h" -#include "exec/translate-all.h" #include "sysemu/replay.h" #include "exec/memory-internal.h"
Signature · 1 line
2.38.1
Re: [PATCH-for-8.0 v3 1/2] physmem: Remove unused "exec/translate-all.h"
Quoted 11 lines · Philippe Mathieu-Daudé
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- softmmu/physmem.c | 1 - 1 file changed, 1 deletion(-)softmmu/physmem.c +0
-0
softmmu/physmem.c
Quoted 8 lines
softmmu/physmem.c +0
-2@@ -58,7 +58,6 @@#include "qemu/rcu_queue.h" #include "qemu/main-loop.h" -#include "exec/translate-all.h" #include "sysemu/replay.h" #include "exec/memory-internal.h" --
physmem.c has a call to tb_check_watchpoint(), which is declared in translate-all.h -- where does it get the prototype from if the header isn't included any more ?
thanks
-- PMM
Re: [PATCH-for-8.0 v3 1/2] physmem: Remove unused "exec/translate-all.h"
Quoted 18 lines · Peter Maydell
Quoted 17 lines · Philippe Mathieu-Daudé
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- softmmu/physmem.c | 1 - 1 file changed, 1 deletion(-)softmmu/physmem.c +0
-1@@ -58,7 +58,6 @@#include "qemu/rcu_queue.h" #include "qemu/main-loop.h" -#include "exec/translate-all.h" #include "sysemu/replay.h"
Quoted 6 lines
softmmu/physmem.c
Quoted 2 lines
softmmu/physmem.c +0
-1#include "exec/memory-internal.h" --
physmem.chas a call totb_check_watchpoint(), which is declared intranslate-all.h-- where does it get the prototype from if the header isn't included any more ?
Oops indeed, sorry.
PATCH v3 2/2 physmem: Remove trace events from trace-root.h
In reply to Philippe Mathieu-DaudéMissed in d9f24bf572 ("exec: split out non-softmmu-specific parts").
--- softmmu/physmem.c | 2 +- softmmu/trace-events | 5 +++++ trace-events | 5 ----- 3 files changed, 6 insertions(+), 6 deletions(-)
softmmu/physmem.c +1 -1
@@ -50,7 +50,7 @@#include "sysemu/hostmem.h" #include "sysemu/hw_accel.h" #include "sysemu/xen-mapcache.h" -#include "trace/trace-root.h" +#include "trace.h" #ifdef CONFIG_FALLOCATE_PUNCH_HOLE #include <linux/falloc.h>
softmmu/trace-events +5 -0
@@ -21,6 +21,11 @@ flatview_destroy(void *view, void *root) "%p (root %p)" flatview_destroy_rcu(void *view, void *root) "%p (root %p)" global_dirty_changed(unsigned int bitmask) "bitmask 0x%"PRIx32 +# physmem.c +find_ram_offset(uint64_t size, uint64_t offset) "size: 0x%" PRIx64 " @ 0x%" PRIx64 +find_ram_offset_loop(uint64_t size, uint64_t candidate, uint64_t offset, uint64_t next, uint64_t mingap) "trying size: 0x%" PRIx64 " @ 0x%" PRIx64 ", offset: 0x%" PRIx64" next: 0x%" PRIx64 " mingap: 0x%" PRIx64 +ram_block_discard_range(const char *rbname, void *hva, size_t length, bool need_madvise, bool need_fallocate, int ret) "%s@%p + 0x%zx: madvise: %d fallocate: %d ret: %d" + # softmmu.c vm_stop_flush_all(int ret) "ret %d"
trace-events +0 -5
@@ -37,11 +37,6 @@ dma_complete(void *dbs, int ret, void *cb) "dbs=%p ret=%d cb=%p" dma_blk_cb(void *dbs, int ret) "dbs=%p ret=%d" dma_map_wait(void *dbs) "dbs=%p" -# exec.c -find_ram_offset(uint64_t size, uint64_t offset) "size: 0x%" PRIx64 " @ 0x%" PRIx64 -find_ram_offset_loop(uint64_t size, uint64_t candidate, uint64_t offset, uint64_t next, uint64_t mingap) "trying size: 0x%" PRIx64 " @ 0x%" PRIx64 ", offset: 0x%" PRIx64" next: 0x%" PRIx64 " mingap: 0x%" PRIx64 -ram_block_discard_range(const char *rbname, void *hva, size_t length, bool need_madvise, bool need_fallocate, int ret) "%s@%p + 0x%zx: madvise: %d fallocate: %d ret: %d" - # job.c job_state_transition(void *job, int ret, const char *legal, const char *s0, const char *s1) "job %p (ret: %d) attempting %s transition (%s-->%s)" job_apply_verb(void *job, const char *state, const char *verb, const char *legal) "job %p in state %s; applying verb %s (%s)"
Signature · 1 line
2.38.1