| Message ID | 20210201112905.545144-4-f4bug@amsat.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | hw/xen: Introduce XEN_FV/XEN_PV Kconfig | expand |
On 2/1/21 12:29 PM, Philippe Mathieu-Daudé wrote: > xen-mapcache.c contains accelerator related routines, > not particular to the X86 HVM machine. Move this file > to accel/xen/ (adapting the buildsys machinery). > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > meson.build | 3 +++ > accel/xen/trace.h | 1 + > {hw/i386 => accel}/xen/xen-mapcache.c | 0 > hw/i386/xen/xen-hvm.c | 1 - > accel/xen/meson.build | 5 ++++- > accel/xen/trace-events | 10 ++++++++++ > hw/i386/xen/meson.build | 1 - > hw/i386/xen/trace-events | 6 ------ > 8 files changed, 18 insertions(+), 9 deletions(-) > create mode 100644 accel/xen/trace.h > rename {hw/i386 => accel}/xen/xen-mapcache.c (100%) > create mode 100644 accel/xen/trace-events ... > diff --git a/accel/xen/trace-events b/accel/xen/trace-events > new file mode 100644 > index 00000000000..30bf4f42283 > --- /dev/null > +++ b/accel/xen/trace-events > @@ -0,0 +1,10 @@ > +# See docs/devel/tracing.txt for syntax documentation. > + > +# xen-hvm.c > +xen_ram_alloc(unsigned long ram_addr, unsigned long size) "requested: 0x%lx, size 0x%lx" Self-Nack, this should not be here ^ > + > +# xen-mapcache.c > +xen_map_cache(uint64_t phys_addr) "want 0x%"PRIx64 > +xen_remap_bucket(uint64_t index) "index 0x%"PRIx64 > +xen_map_cache_return(void* ptr) "%p"
diff --git a/meson.build b/meson.build index 97a577a7743..f2e778f22cd 100644 --- a/meson.build +++ b/meson.build @@ -1706,6 +1706,9 @@ 'crypto', 'monitor', ] +if 'CONFIG_XEN' in accelerators + trace_events_subdirs += [ 'accel/xen' ] +endif if have_user trace_events_subdirs += [ 'linux-user' ] endif diff --git a/accel/xen/trace.h b/accel/xen/trace.h new file mode 100644 index 00000000000..f6be599b187 --- /dev/null +++ b/accel/xen/trace.h @@ -0,0 +1 @@ +#include "trace/trace-accel_xen.h" diff --git a/hw/i386/xen/xen-mapcache.c b/accel/xen/xen-mapcache.c similarity index 100% rename from hw/i386/xen/xen-mapcache.c rename to accel/xen/xen-mapcache.c diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c index 68821d90f52..7156ab13329 100644 --- a/hw/i386/xen/xen-hvm.c +++ b/hw/i386/xen/xen-hvm.c @@ -31,7 +31,6 @@ #include "sysemu/runstate.h" #include "sysemu/sysemu.h" #include "sysemu/xen.h" -#include "sysemu/xen-mapcache.h" #include "trace.h" #include "exec/address-spaces.h" diff --git a/accel/xen/meson.build b/accel/xen/meson.build index 002bdb03c62..45671e4bdbf 100644 --- a/accel/xen/meson.build +++ b/accel/xen/meson.build @@ -1 +1,4 @@ -specific_ss.add(when: 'CONFIG_XEN', if_true: files('xen-all.c')) +specific_ss.add(when: 'CONFIG_XEN', if_true: files( + 'xen-all.c', + 'xen-mapcache.c', +)) diff --git a/accel/xen/trace-events b/accel/xen/trace-events new file mode 100644 index 00000000000..30bf4f42283 --- /dev/null +++ b/accel/xen/trace-events @@ -0,0 +1,10 @@ +# See docs/devel/tracing.txt for syntax documentation. + +# xen-hvm.c +xen_ram_alloc(unsigned long ram_addr, unsigned long size) "requested: 0x%lx, size 0x%lx" + +# xen-mapcache.c +xen_map_cache(uint64_t phys_addr) "want 0x%"PRIx64 +xen_remap_bucket(uint64_t index) "index 0x%"PRIx64 +xen_map_cache_return(void* ptr) "%p" + diff --git a/hw/i386/xen/meson.build b/hw/i386/xen/meson.build index be84130300c..2fcc46e6ca1 100644 --- a/hw/i386/xen/meson.build +++ b/hw/i386/xen/meson.build @@ -1,6 +1,5 @@ i386_ss.add(when: 'CONFIG_XEN', if_true: files( 'xen-hvm.c', - 'xen-mapcache.c', 'xen_apic.c', 'xen_platform.c', 'xen_pvdevice.c', diff --git a/hw/i386/xen/trace-events b/hw/i386/xen/trace-events index ca3a4948baa..f1b36d164d9 100644 --- a/hw/i386/xen/trace-events +++ b/hw/i386/xen/trace-events @@ -20,9 +20,3 @@ cpu_ioreq_move(void *req, uint32_t dir, uint32_t df, uint32_t data_is_ptr, uint6 xen_map_resource_ioreq(uint32_t id, void *addr) "id: %u addr: %p" cpu_ioreq_config_read(void *req, uint32_t sbdf, uint32_t reg, uint32_t size, uint32_t data) "I/O=%p sbdf=0x%x reg=%u size=%u data=0x%x" cpu_ioreq_config_write(void *req, uint32_t sbdf, uint32_t reg, uint32_t size, uint32_t data) "I/O=%p sbdf=0x%x reg=%u size=%u data=0x%x" - -# xen-mapcache.c -xen_map_cache(uint64_t phys_addr) "want 0x%"PRIx64 -xen_remap_bucket(uint64_t index) "index 0x%"PRIx64 -xen_map_cache_return(void* ptr) "%p" -
xen-mapcache.c contains accelerator related routines, not particular to the X86 HVM machine. Move this file to accel/xen/ (adapting the buildsys machinery). Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- meson.build | 3 +++ accel/xen/trace.h | 1 + {hw/i386 => accel}/xen/xen-mapcache.c | 0 hw/i386/xen/xen-hvm.c | 1 - accel/xen/meson.build | 5 ++++- accel/xen/trace-events | 10 ++++++++++ hw/i386/xen/meson.build | 1 - hw/i386/xen/trace-events | 6 ------ 8 files changed, 18 insertions(+), 9 deletions(-) create mode 100644 accel/xen/trace.h rename {hw/i386 => accel}/xen/xen-mapcache.c (100%) create mode 100644 accel/xen/trace-events