On Wed, Apr 05, 2017 at 04:21:30PM -0700, Anthony Xu wrote: > move xen-hvm.c to hw/i386/xen/ > > > Signed-off -by: Anthony Xu <anthony...@intel.com> > > > > --- > Makefile.target | 3 +-- > hw/i386/xen/Makefile.objs | 2 +- > hw/i386/xen/trace-events | 11 +++++++++++ > xen-hvm.c => hw/i386/xen/xen-hvm.c | 2 +- > stubs/Makefile.objs | 1 + > xen-hvm-stub.c => stubs/xen-hvm.c | 0 > trace-events | 11 ----------- > 7 files changed, 15 insertions(+), 15 deletions(-) > rename xen-hvm.c => hw/i386/xen/xen-hvm.c (99%) > rename xen-hvm-stub.c => stubs/xen-hvm.c (100%)
Reviewed-By: Sahid Orentino Ferdjaoui <sahid.ferdja...@redhat.com> > > diff --git a/Makefile.target b/Makefile.target > index 48c027f..d5ff0c7 100644 > --- a/Makefile.target > +++ b/Makefile.target > @@ -150,8 +150,7 @@ obj-y += migration/ram.o migration/savevm.o > LIBS := $(libs_softmmu) $(LIBS) > > # xen support > -obj-$(CONFIG_XEN_I386) += xen-hvm.o xen-mapcache.o > -obj-$(call lnot,$(CONFIG_XEN_I386)) += xen-hvm-stub.o > +obj-$(CONFIG_XEN_I386) += xen-mapcache.o > > # Hardware support > ifeq ($(TARGET_NAME), sparc64) > diff --git a/hw/i386/xen/Makefile.objs b/hw/i386/xen/Makefile.objs > index 801a68d..daf4f53 100644 > --- a/hw/i386/xen/Makefile.objs > +++ b/hw/i386/xen/Makefile.objs > @@ -1 +1 @@ > -obj-y += xen_platform.o xen_apic.o xen_pvdevice.o > +obj-y += xen_platform.o xen_apic.o xen_pvdevice.o xen-hvm.o Refers to the file moved /xen-hvm.c to /hw/i386/xen/xen-hvm.c > diff --git a/hw/i386/xen/trace-events b/hw/i386/xen/trace-events > index 321fe60..f25d622 100644 > --- a/hw/i386/xen/trace-events > +++ b/hw/i386/xen/trace-events > @@ -4,3 +4,14 @@ xen_platform_log(char *s) "xen platform: %s" > # hw/i386/xen/xen_pvdevice.c > xen_pv_mmio_read(uint64_t addr) "WARNING: read from Xen PV Device MMIO space > (address %"PRIx64")" > xen_pv_mmio_write(uint64_t addr) "WARNING: write to Xen PV Device MMIO space > (address %"PRIx64")" > + > +# xen-hvm.c > +xen_ram_alloc(unsigned long ram_addr, unsigned long size) "requested: %#lx, > size %#lx" > +xen_client_set_memory(uint64_t start_addr, unsigned long size, bool > log_dirty) "%#"PRIx64" size %#lx, log_dirty %i" > +handle_ioreq(void *req, uint32_t type, uint32_t dir, uint32_t df, uint32_t > data_is_ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) > "I/O=%p type=%d dir=%d df=%d ptr=%d port=%#"PRIx64" data=%#"PRIx64" count=%d > size=%d" > +handle_ioreq_read(void *req, uint32_t type, uint32_t df, uint32_t > data_is_ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) > "I/O=%p read type=%d df=%d ptr=%d port=%#"PRIx64" data=%#"PRIx64" count=%d > size=%d" > +handle_ioreq_write(void *req, uint32_t type, uint32_t df, uint32_t > data_is_ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) > "I/O=%p write type=%d df=%d ptr=%d port=%#"PRIx64" data=%#"PRIx64" count=%d > size=%d" > +cpu_ioreq_pio(void *req, uint32_t dir, uint32_t df, uint32_t data_is_ptr, > uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=%p pio > dir=%d df=%d ptr=%d port=%#"PRIx64" data=%#"PRIx64" count=%d size=%d" > +cpu_ioreq_pio_read_reg(void *req, uint64_t data, uint64_t addr, uint32_t > size) "I/O=%p pio read reg data=%#"PRIx64" port=%#"PRIx64" size=%d" > +cpu_ioreq_pio_write_reg(void *req, uint64_t data, uint64_t addr, uint32_t > size) "I/O=%p pio write reg data=%#"PRIx64" port=%#"PRIx64" size=%d" > +cpu_ioreq_move(void *req, uint32_t dir, uint32_t df, uint32_t data_is_ptr, > uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=%p copy > dir=%d df=%d ptr=%d port=%#"PRIx64" data=%#"PRIx64" count=%d size=%d" comming from /trace-events > diff --git a/xen-hvm.c b/hw/i386/xen/xen-hvm.c > similarity index 99% > rename from xen-hvm.c > rename to hw/i386/xen/xen-hvm.c > index 5043beb..0892361 100644 > --- a/xen-hvm.c > +++ b/hw/i386/xen/xen-hvm.c > @@ -22,7 +22,7 @@ > #include "qemu/error-report.h" > #include "qemu/range.h" > #include "sysemu/xen-mapcache.h" > -#include "trace-root.h" > +#include "trace.h" > #include "exec/address-spaces.h" > > #include <xen/hvm/ioreq.h> > diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs > index 6c80613..f5b47bf 100644 > --- a/stubs/Makefile.objs > +++ b/stubs/Makefile.objs > @@ -38,3 +38,4 @@ stub-obj-y += target-get-monitor-def.o > stub-obj-y += pc_madt_cpu_entry.o > stub-obj-y += vmgenid.o > stub-obj-y += xen-common.o > +stub-obj-y += xen-hvm.o Refers to the file moved /xen-hvm-stub.c to /hw/i386/stubs/xen-hvm.c > diff --git a/xen-hvm-stub.c b/stubs/xen-hvm.c > similarity index 100% > rename from xen-hvm-stub.c > rename to stubs/xen-hvm.c > diff --git a/trace-events b/trace-events > index b07a09b..4e14487 100644 > --- a/trace-events > +++ b/trace-events > @@ -48,17 +48,6 @@ spice_vmc_register_interface(void *scd) "spice vmc > registered interface %p" > spice_vmc_unregister_interface(void *scd) "spice vmc unregistered interface > %p" > spice_vmc_event(int event) "spice vmc event %d" > > -# xen-hvm.c > -xen_ram_alloc(unsigned long ram_addr, unsigned long size) "requested: %#lx, > size %#lx" > -xen_client_set_memory(uint64_t start_addr, unsigned long size, bool > log_dirty) "%#"PRIx64" size %#lx, log_dirty %i" > -handle_ioreq(void *req, uint32_t type, uint32_t dir, uint32_t df, uint32_t > data_is_ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) > "I/O=%p type=%d dir=%d df=%d ptr=%d port=%#"PRIx64" data=%#"PRIx64" count=%d > size=%d" > -handle_ioreq_read(void *req, uint32_t type, uint32_t df, uint32_t > data_is_ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) > "I/O=%p read type=%d df=%d ptr=%d port=%#"PRIx64" data=%#"PRIx64" count=%d > size=%d" > -handle_ioreq_write(void *req, uint32_t type, uint32_t df, uint32_t > data_is_ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) > "I/O=%p write type=%d df=%d ptr=%d port=%#"PRIx64" data=%#"PRIx64" count=%d > size=%d" > -cpu_ioreq_pio(void *req, uint32_t dir, uint32_t df, uint32_t data_is_ptr, > uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=%p pio > dir=%d df=%d ptr=%d port=%#"PRIx64" data=%#"PRIx64" count=%d size=%d" > -cpu_ioreq_pio_read_reg(void *req, uint64_t data, uint64_t addr, uint32_t > size) "I/O=%p pio read reg data=%#"PRIx64" port=%#"PRIx64" size=%d" > -cpu_ioreq_pio_write_reg(void *req, uint64_t data, uint64_t addr, uint32_t > size) "I/O=%p pio write reg data=%#"PRIx64" port=%#"PRIx64" size=%d" > -cpu_ioreq_move(void *req, uint32_t dir, uint32_t df, uint32_t data_is_ptr, > uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=%p copy > dir=%d df=%d ptr=%d port=%#"PRIx64" data=%#"PRIx64" count=%d size=%d" > - > # xen-mapcache.c > xen_map_cache(uint64_t phys_addr) "want %#"PRIx64 > xen_remap_bucket(uint64_t index) "index %#"PRIx64 > -- > 1.8.3.1 >