mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-03 07:43:54 -06:00
xen-hvm: reorganize xen-hvm and move common function to xen-hvm-common
This patch does following: 1. creates arch_handle_ioreq() and arch_xen_set_memory(). This is done in preparation for moving most of xen-hvm code to an arch-neutral location, move the x86-specific portion of xen_set_memory to arch_xen_set_memory. Also, move handle_vmport_ioreq to arch_handle_ioreq. 2. Pure code movement: move common functions to hw/xen/xen-hvm-common.c Extract common functionalities from hw/i386/xen/xen-hvm.c and move them to hw/xen/xen-hvm-common.c. These common functions are useful for creating an IOREQ server. xen_hvm_init_pc() contains the architecture independent code for creating and mapping a IOREQ server, connecting memory and IO listeners, initializing a xen bus and registering backends. Moved this common xen code to a new function xen_register_ioreq() which can be used by both x86 and ARM machines. Following functions are moved to hw/xen/xen-hvm-common.c: xen_vcpu_eport(), xen_vcpu_ioreq(), xen_ram_alloc(), xen_set_memory(), xen_region_add(), xen_region_del(), xen_io_add(), xen_io_del(), xen_device_realize(), xen_device_unrealize(), cpu_get_ioreq_from_shared_memory(), cpu_get_ioreq(), do_inp(), do_outp(), rw_phys_req_item(), read_phys_req_item(), write_phys_req_item(), cpu_ioreq_pio(), cpu_ioreq_move(), cpu_ioreq_config(), handle_ioreq(), handle_buffered_iopage(), handle_buffered_io(), cpu_handle_ioreq(), xen_main_loop_prepare(), xen_hvm_change_state_handler(), xen_exit_notifier(), xen_map_ioreq_server(), destroy_hvm_domain() and xen_shutdown_fatal_error() 3. Removed static type from below functions: 1. xen_region_add() 2. xen_region_del() 3. xen_io_add() 4. xen_io_del() 5. xen_device_realize() 6. xen_device_unrealize() 7. xen_hvm_change_state_handler() 8. cpu_ioreq_pio() 9. xen_exit_notifier() 4. Replace TARGET_PAGE_SIZE with XC_PAGE_SIZE to match the page side with Xen. Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com> Signed-off-by: Stefano Stabellini <stefano.stabellini@amd.com> Acked-by: Stefano Stabellini <sstabellini@kernel.org>
This commit is contained in:
parent
9269b9d188
commit
f17068c1c7
8 changed files with 1057 additions and 971 deletions
11
include/hw/i386/xen_arch_hvm.h
Normal file
11
include/hw/i386/xen_arch_hvm.h
Normal file
|
@ -0,0 +1,11 @@
|
|||
#ifndef HW_XEN_ARCH_I386_HVM_H
|
||||
#define HW_XEN_ARCH_I386_HVM_H
|
||||
|
||||
#include <xen/hvm/ioreq.h>
|
||||
#include "hw/xen/xen-hvm-common.h"
|
||||
|
||||
void arch_handle_ioreq(XenIOState *state, ioreq_t *req);
|
||||
void arch_xen_set_memory(XenIOState *state,
|
||||
MemoryRegionSection *section,
|
||||
bool add);
|
||||
#endif
|
3
include/hw/xen/arch_hvm.h
Normal file
3
include/hw/xen/arch_hvm.h
Normal file
|
@ -0,0 +1,3 @@
|
|||
#if defined(TARGET_I386) || defined(TARGET_X86_64)
|
||||
#include "hw/i386/xen_arch_hvm.h"
|
||||
#endif
|
99
include/hw/xen/xen-hvm-common.h
Normal file
99
include/hw/xen/xen-hvm-common.h
Normal file
|
@ -0,0 +1,99 @@
|
|||
#ifndef HW_XEN_HVM_COMMON_H
|
||||
#define HW_XEN_HVM_COMMON_H
|
||||
|
||||
#include "qemu/osdep.h"
|
||||
#include "qemu/units.h"
|
||||
|
||||
#include "cpu.h"
|
||||
#include "hw/pci/pci.h"
|
||||
#include "hw/hw.h"
|
||||
#include "hw/xen/xen_native.h"
|
||||
#include "hw/xen/xen-legacy-backend.h"
|
||||
#include "sysemu/runstate.h"
|
||||
#include "sysemu/sysemu.h"
|
||||
#include "sysemu/xen.h"
|
||||
#include "sysemu/xen-mapcache.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include <xen/hvm/ioreq.h>
|
||||
|
||||
extern MemoryRegion ram_memory;
|
||||
extern MemoryListener xen_io_listener;
|
||||
extern DeviceListener xen_device_listener;
|
||||
|
||||
//#define DEBUG_XEN_HVM
|
||||
|
||||
#ifdef DEBUG_XEN_HVM
|
||||
#define DPRINTF(fmt, ...) \
|
||||
do { fprintf(stderr, "xen: " fmt, ## __VA_ARGS__); } while (0)
|
||||
#else
|
||||
#define DPRINTF(fmt, ...) \
|
||||
do { } while (0)
|
||||
#endif
|
||||
|
||||
static inline uint32_t xen_vcpu_eport(shared_iopage_t *shared_page, int i)
|
||||
{
|
||||
return shared_page->vcpu_ioreq[i].vp_eport;
|
||||
}
|
||||
static inline ioreq_t *xen_vcpu_ioreq(shared_iopage_t *shared_page, int vcpu)
|
||||
{
|
||||
return &shared_page->vcpu_ioreq[vcpu];
|
||||
}
|
||||
|
||||
#define BUFFER_IO_MAX_DELAY 100
|
||||
|
||||
typedef struct XenPhysmap {
|
||||
hwaddr start_addr;
|
||||
ram_addr_t size;
|
||||
const char *name;
|
||||
hwaddr phys_offset;
|
||||
|
||||
QLIST_ENTRY(XenPhysmap) list;
|
||||
} XenPhysmap;
|
||||
|
||||
typedef struct XenPciDevice {
|
||||
PCIDevice *pci_dev;
|
||||
uint32_t sbdf;
|
||||
QLIST_ENTRY(XenPciDevice) entry;
|
||||
} XenPciDevice;
|
||||
|
||||
typedef struct XenIOState {
|
||||
ioservid_t ioservid;
|
||||
shared_iopage_t *shared_page;
|
||||
buffered_iopage_t *buffered_io_page;
|
||||
xenforeignmemory_resource_handle *fres;
|
||||
QEMUTimer *buffered_io_timer;
|
||||
CPUState **cpu_by_vcpu_id;
|
||||
/* the evtchn port for polling the notification, */
|
||||
evtchn_port_t *ioreq_local_port;
|
||||
/* evtchn remote and local ports for buffered io */
|
||||
evtchn_port_t bufioreq_remote_port;
|
||||
evtchn_port_t bufioreq_local_port;
|
||||
/* the evtchn fd for polling */
|
||||
xenevtchn_handle *xce_handle;
|
||||
/* which vcpu we are serving */
|
||||
int send_vcpu;
|
||||
|
||||
struct xs_handle *xenstore;
|
||||
MemoryListener memory_listener;
|
||||
MemoryListener io_listener;
|
||||
QLIST_HEAD(, XenPciDevice) dev_list;
|
||||
DeviceListener device_listener;
|
||||
|
||||
Notifier exit;
|
||||
} XenIOState;
|
||||
|
||||
void xen_exit_notifier(Notifier *n, void *data);
|
||||
|
||||
void xen_region_add(MemoryListener *listener, MemoryRegionSection *section);
|
||||
void xen_region_del(MemoryListener *listener, MemoryRegionSection *section);
|
||||
void xen_io_add(MemoryListener *listener, MemoryRegionSection *section);
|
||||
void xen_io_del(MemoryListener *listener, MemoryRegionSection *section);
|
||||
void xen_device_realize(DeviceListener *listener, DeviceState *dev);
|
||||
void xen_device_unrealize(DeviceListener *listener, DeviceState *dev);
|
||||
|
||||
void xen_hvm_change_state_handler(void *opaque, bool running, RunState rstate);
|
||||
void xen_register_ioreq(XenIOState *state, unsigned int max_cpus,
|
||||
MemoryListener xen_memory_listener);
|
||||
|
||||
void cpu_ioreq_pio(ioreq_t *req);
|
||||
#endif /* HW_XEN_HVM_COMMON_H */
|
Loading…
Add table
Add a link
Reference in a new issue