Commit 93d43e7e authored by Anthony Xu's avatar Anthony Xu Committed by Stefano Stabellini
Browse files

move xen-hvm.c to hw/i386/xen/ 



move xen-hvm.c to hw/i386/xen/

Signed-off -by: default avatarAnthony Xu <anthony.xu@intel.com>
Reviewed-by: default avatarStefano Stabellini <sstabellini@kernel.org>
parent 56e2cd24

Makefile.target

+1 −2
Original line number Diff line number Diff line
@@ -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)

hw/i386/xen/Makefile.objs

+1 −1
Original line number Diff line number Diff line 
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

hw/i386/xen/trace-events

+11 −0
Original line number Diff line number Diff line
@@ -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"

xen-hvm.c→hw/i386/xen/xen-hvm.c

+1 −1
Original line number Diff line number Diff line
@@ -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>

stubs/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -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