ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xen: drop XenXC and associated interface wrappers 

Now that 4.2 and earlier are no longer supported "xc_interface *" is
always the right type for the xc interface handle.

With this we can also simplify the handling of the xenforeignmemory
compatibility wrapper by making xenforeignmemory_handle ==
xc_interface, instead of an xc_interface* and remove various uses of &
and *h.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
This commit is contained in:
Ian Campbell 2016-02-10 11:07:03 +00:00 committed by Stefano Stabellini
parent 2ac9f6d4b1
commit 81daba5880
5 changed files with 44 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/xen/xen_backend.c
View File

@ -36,7 +36,7 @@
/* ------------------------------------------------------------- */ /* ------------------------------------------------------------- */
/* public */ /* public */
XenXC xen_xc = XC_HANDLER_INITIAL_VALUE; xc_interface *xen_xc = NULL;
xenforeignmemory_handle *xen_fmem = NULL; xenforeignmemory_handle *xen_fmem = NULL;
struct xs_handle *xenstore = NULL; struct xs_handle *xenstore = NULL;
const char *xen_protocol; const char *xen_protocol;
@ -710,7 +710,7 @@ int xen_be_init(void)
qemu_set_fd_handler(xs_fileno(xenstore), xenstore_update, NULL, NULL); qemu_set_fd_handler(xs_fileno(xenstore), xenstore_update, NULL, NULL);
if (xen_xc == XC_HANDLER_INITIAL_VALUE || xen_fmem == NULL) { if (xen_xc == NULL || xen_fmem == NULL) {
/* Check if xen_init() have been called */ /* Check if xen_init() have been called */
goto err; goto err;
} }

2
include/hw/xen/xen_backend.h
View File

@ -56,7 +56,7 @@ struct XenDevice {
/* ------------------------------------------------------------- */ /* ------------------------------------------------------------- */
/* variables */ /* variables */
extern XenXC xen_xc; extern xc_interface *xen_xc;
extern xenforeignmemory_handle *xen_fmem; extern xenforeignmemory_handle *xen_fmem;
extern struct xs_handle *xenstore; extern struct xs_handle *xenstore;
extern const char *xen_protocol; extern const char *xen_protocol;

82
include/hw/xen/xen_common.h
View File

@ -32,14 +32,10 @@
/* Xen 4.2 thru 4.6 */ /* Xen 4.2 thru 4.6 */
#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 471 #if CONFIG_XEN_CTRL_INTERFACE_VERSION < 471
typedef xc_interface *XenXC; typedef xc_interface xenforeignmemory_handle;
typedef xc_interface *xenforeignmemory_handle;
typedef xc_evtchn xenevtchn_handle; typedef xc_evtchn xenevtchn_handle;
typedef xc_gnttab xengnttab_handle; typedef xc_gnttab xengnttab_handle;
# define XC_INTERFACE_FMT "%p"
# define XC_HANDLER_INITIAL_VALUE NULL
#define xenevtchn_open(l, f) xc_evtchn_open(l, f); #define xenevtchn_open(l, f) xc_evtchn_open(l, f);
#define xenevtchn_close(h) xc_evtchn_close(h) #define xenevtchn_close(h) xc_evtchn_close(h)
#define xenevtchn_fd(h) xc_evtchn_fd(h) #define xenevtchn_fd(h) xc_evtchn_fd(h)
@ -57,30 +53,14 @@ typedef xc_gnttab xengnttab_handle;
#define xengnttab_map_grant_refs(h, c, d, r, p) \ #define xengnttab_map_grant_refs(h, c, d, r, p) \
xc_gnttab_map_grant_refs(h, c, d, r, p) xc_gnttab_map_grant_refs(h, c, d, r, p)
static inline XenXC xen_xc_interface_open(void *logger, void *dombuild_logger,
unsigned int open_flags)
{
return xc_interface_open(logger, dombuild_logger, open_flags);
}
/* See below for xenforeignmemory_* APIs */ /* See below for xenforeignmemory_* APIs */
#else /* CONFIG_XEN_CTRL_INTERFACE_VERSION >= 471 */ #else /* CONFIG_XEN_CTRL_INTERFACE_VERSION >= 471 */
typedef xc_interface *XenXC;
# define XC_INTERFACE_FMT "%p"
# define XC_HANDLER_INITIAL_VALUE NULL
#include <xenevtchn.h> #include <xenevtchn.h>
#include <xengnttab.h> #include <xengnttab.h>
#include <xenforeignmemory.h> #include <xenforeignmemory.h>
static inline XenXC xen_xc_interface_open(void *logger, void *dombuild_logger,
unsigned int open_flags)
{
return xc_interface_open(logger, dombuild_logger, open_flags);
}
#endif #endif
void destroy_hvm_domain(bool reboot); void destroy_hvm_domain(bool reboot);
@ -89,7 +69,7 @@ void destroy_hvm_domain(bool reboot);
void xen_shutdown_fatal_error(const char *fmt, ...) GCC_FMT_ATTR(1, 2); void xen_shutdown_fatal_error(const char *fmt, ...) GCC_FMT_ATTR(1, 2);
#ifdef HVM_PARAM_VMPORT_REGS_PFN #ifdef HVM_PARAM_VMPORT_REGS_PFN
static inline int xen_get_vmport_regs_pfn(XenXC xc, domid_t dom, static inline int xen_get_vmport_regs_pfn(xc_interface *xc, domid_t dom,
xen_pfn_t *vmport_regs_pfn) xen_pfn_t *vmport_regs_pfn)
{ {
int rc; int rc;
@ -101,7 +81,7 @@ static inline int xen_get_vmport_regs_pfn(XenXC xc, domid_t dom,
return rc; return rc;
} }
#else #else
static inline int xen_get_vmport_regs_pfn(XenXC xc, domid_t dom, static inline int xen_get_vmport_regs_pfn(xc_interface *xc, domid_t dom,
xen_pfn_t *vmport_regs_pfn) xen_pfn_t *vmport_regs_pfn)
{ {
return -ENOSYS; return -ENOSYS;
@ -128,54 +108,54 @@ static inline int xen_get_vmport_regs_pfn(XenXC xc, domid_t dom,
typedef uint16_t ioservid_t; typedef uint16_t ioservid_t;
static inline void xen_map_memory_section(XenXC xc, domid_t dom, static inline void xen_map_memory_section(xc_interface *xc, domid_t dom,
ioservid_t ioservid, ioservid_t ioservid,
MemoryRegionSection *section) MemoryRegionSection *section)
{ {
} }
static inline void xen_unmap_memory_section(XenXC xc, domid_t dom, static inline void xen_unmap_memory_section(xc_interface *xc, domid_t dom,
ioservid_t ioservid, ioservid_t ioservid,
MemoryRegionSection *section) MemoryRegionSection *section)
{ {
} }
static inline void xen_map_io_section(XenXC xc, domid_t dom, static inline void xen_map_io_section(xc_interface *xc, domid_t dom,
ioservid_t ioservid, ioservid_t ioservid,
MemoryRegionSection *section) MemoryRegionSection *section)
{ {
} }
static inline void xen_unmap_io_section(XenXC xc, domid_t dom, static inline void xen_unmap_io_section(xc_interface *xc, domid_t dom,
ioservid_t ioservid, ioservid_t ioservid,
MemoryRegionSection *section) MemoryRegionSection *section)
{ {
} }
static inline void xen_map_pcidev(XenXC xc, domid_t dom, static inline void xen_map_pcidev(xc_interface *xc, domid_t dom,
ioservid_t ioservid, ioservid_t ioservid,
PCIDevice *pci_dev) PCIDevice *pci_dev)
{ {
} }
static inline void xen_unmap_pcidev(XenXC xc, domid_t dom, static inline void xen_unmap_pcidev(xc_interface *xc, domid_t dom,
ioservid_t ioservid, ioservid_t ioservid,
PCIDevice *pci_dev) PCIDevice *pci_dev)
{ {
} }
static inline int xen_create_ioreq_server(XenXC xc, domid_t dom, static inline int xen_create_ioreq_server(xc_interface *xc, domid_t dom,
ioservid_t *ioservid) ioservid_t *ioservid)
{ {
return 0; return 0;
} }
static inline void xen_destroy_ioreq_server(XenXC xc, domid_t dom, static inline void xen_destroy_ioreq_server(xc_interface *xc, domid_t dom,
ioservid_t ioservid) ioservid_t ioservid)
{ {
} }
static inline int xen_get_ioreq_server_info(XenXC xc, domid_t dom, static inline int xen_get_ioreq_server_info(xc_interface *xc, domid_t dom,
ioservid_t ioservid, ioservid_t ioservid,
xen_pfn_t *ioreq_pfn, xen_pfn_t *ioreq_pfn,
xen_pfn_t *bufioreq_pfn, xen_pfn_t *bufioreq_pfn,
@ -212,7 +192,7 @@ static inline int xen_get_ioreq_server_info(XenXC xc, domid_t dom,
return 0; return 0;
} }
static inline int xen_set_ioreq_server_state(XenXC xc, domid_t dom, static inline int xen_set_ioreq_server_state(xc_interface *xc, domid_t dom,
ioservid_t ioservid, ioservid_t ioservid,
bool enable) bool enable)
{ {
@ -222,7 +202,7 @@ static inline int xen_set_ioreq_server_state(XenXC xc, domid_t dom,
/* Xen 4.5 */ /* Xen 4.5 */
#else #else
static inline void xen_map_memory_section(XenXC xc, domid_t dom, static inline void xen_map_memory_section(xc_interface *xc, domid_t dom,
ioservid_t ioservid, ioservid_t ioservid,
MemoryRegionSection *section) MemoryRegionSection *section)
{ {
@ -235,7 +215,7 @@ static inline void xen_map_memory_section(XenXC xc, domid_t dom,
start_addr, end_addr); start_addr, end_addr);
} }
static inline void xen_unmap_memory_section(XenXC xc, domid_t dom, static inline void xen_unmap_memory_section(xc_interface *xc, domid_t dom,
ioservid_t ioservid, ioservid_t ioservid,
MemoryRegionSection *section) MemoryRegionSection *section)
{ {
@ -248,7 +228,7 @@ static inline void xen_unmap_memory_section(XenXC xc, domid_t dom,
start_addr, end_addr); start_addr, end_addr);
} }
static inline void xen_map_io_section(XenXC xc, domid_t dom, static inline void xen_map_io_section(xc_interface *xc, domid_t dom,
ioservid_t ioservid, ioservid_t ioservid,
MemoryRegionSection *section) MemoryRegionSection *section)
{ {
@ -261,7 +241,7 @@ static inline void xen_map_io_section(XenXC xc, domid_t dom,
start_addr, end_addr); start_addr, end_addr);
} }
static inline void xen_unmap_io_section(XenXC xc, domid_t dom, static inline void xen_unmap_io_section(xc_interface *xc, domid_t dom,
ioservid_t ioservid, ioservid_t ioservid,
MemoryRegionSection *section) MemoryRegionSection *section)
{ {
@ -274,7 +254,7 @@ static inline void xen_unmap_io_section(XenXC xc, domid_t dom,
start_addr, end_addr); start_addr, end_addr);
} }
static inline void xen_map_pcidev(XenXC xc, domid_t dom, static inline void xen_map_pcidev(xc_interface *xc, domid_t dom,
ioservid_t ioservid, ioservid_t ioservid,
PCIDevice *pci_dev) PCIDevice *pci_dev)
{ {
@ -286,7 +266,7 @@ static inline void xen_map_pcidev(XenXC xc, domid_t dom,
PCI_FUNC(pci_dev->devfn)); PCI_FUNC(pci_dev->devfn));
} }
static inline void xen_unmap_pcidev(XenXC xc, domid_t dom, static inline void xen_unmap_pcidev(xc_interface *xc, domid_t dom,
ioservid_t ioservid, ioservid_t ioservid,
PCIDevice *pci_dev) PCIDevice *pci_dev)
{ {
@ -298,7 +278,7 @@ static inline void xen_unmap_pcidev(XenXC xc, domid_t dom,
PCI_FUNC(pci_dev->devfn)); PCI_FUNC(pci_dev->devfn));
} }
static inline int xen_create_ioreq_server(XenXC xc, domid_t dom, static inline int xen_create_ioreq_server(xc_interface *xc, domid_t dom,
ioservid_t *ioservid) ioservid_t *ioservid)
{ {
int rc = xc_hvm_create_ioreq_server(xc, dom, HVM_IOREQSRV_BUFIOREQ_ATOMIC, int rc = xc_hvm_create_ioreq_server(xc, dom, HVM_IOREQSRV_BUFIOREQ_ATOMIC,
@ -311,14 +291,14 @@ static inline int xen_create_ioreq_server(XenXC xc, domid_t dom,
return rc; return rc;
} }
static inline void xen_destroy_ioreq_server(XenXC xc, domid_t dom, static inline void xen_destroy_ioreq_server(xc_interface *xc, domid_t dom,
ioservid_t ioservid) ioservid_t ioservid)
{ {
trace_xen_ioreq_server_destroy(ioservid); trace_xen_ioreq_server_destroy(ioservid);
xc_hvm_destroy_ioreq_server(xc, dom, ioservid); xc_hvm_destroy_ioreq_server(xc, dom, ioservid);
} }
static inline int xen_get_ioreq_server_info(XenXC xc, domid_t dom, static inline int xen_get_ioreq_server_info(xc_interface *xc, domid_t dom,
ioservid_t ioservid, ioservid_t ioservid,
xen_pfn_t *ioreq_pfn, xen_pfn_t *ioreq_pfn,
xen_pfn_t *bufioreq_pfn, xen_pfn_t *bufioreq_pfn,
@ -329,7 +309,7 @@ static inline int xen_get_ioreq_server_info(XenXC xc, domid_t dom,
bufioreq_evtchn); bufioreq_evtchn);
} }
static inline int xen_set_ioreq_server_state(XenXC xc, domid_t dom, static inline int xen_set_ioreq_server_state(xc_interface *xc, domid_t dom,
ioservid_t ioservid, ioservid_t ioservid,
bool enable) bool enable)
{ {
@ -340,7 +320,7 @@ static inline int xen_set_ioreq_server_state(XenXC xc, domid_t dom,
#endif #endif
#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 460 #if CONFIG_XEN_CTRL_INTERFACE_VERSION < 460
static inline int xen_xc_domain_add_to_physmap(XenXC xch, uint32_t domid, static inline int xen_xc_domain_add_to_physmap(xc_interface *xch, uint32_t domid,
unsigned int space, unsigned int space,
unsigned long idx, unsigned long idx,
xen_pfn_t gpfn) xen_pfn_t gpfn)
@ -348,7 +328,7 @@ static inline int xen_xc_domain_add_to_physmap(XenXC xch, uint32_t domid,
return xc_domain_add_to_physmap(xch, domid, space, idx, gpfn); return xc_domain_add_to_physmap(xch, domid, space, idx, gpfn);
} }
#else #else
static inline int xen_xc_domain_add_to_physmap(XenXC xch, uint32_t domid, static inline int xen_xc_domain_add_to_physmap(xc_interface *xch, uint32_t domid,
unsigned int space, unsigned int space,
unsigned long idx, unsigned long idx,
xen_pfn_t gpfn) xen_pfn_t gpfn)
@ -363,14 +343,14 @@ static inline int xen_xc_domain_add_to_physmap(XenXC xch, uint32_t domid,
#ifdef CONFIG_XEN_PV_DOMAIN_BUILD #ifdef CONFIG_XEN_PV_DOMAIN_BUILD
#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 470 #if CONFIG_XEN_CTRL_INTERFACE_VERSION < 470
static inline int xen_domain_create(XenXC xc, uint32_t ssidref, static inline int xen_domain_create(xc_interface *xc, uint32_t ssidref,
xen_domain_handle_t handle, uint32_t flags, xen_domain_handle_t handle, uint32_t flags,
uint32_t *pdomid) uint32_t *pdomid)
{ {
return xc_domain_create(xc, ssidref, handle, flags, pdomid); return xc_domain_create(xc, ssidref, handle, flags, pdomid);
} }
#else #else
static inline int xen_domain_create(XenXC xc, uint32_t ssidref, static inline int xen_domain_create(xc_interface *xc, uint32_t ssidref,
xen_domain_handle_t handle, uint32_t flags, xen_domain_handle_t handle, uint32_t flags,
uint32_t *pdomid) uint32_t *pdomid)
{ {
@ -381,17 +361,17 @@ static inline int xen_domain_create(XenXC xc, uint32_t ssidref,
#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 471 #if CONFIG_XEN_CTRL_INTERFACE_VERSION < 471
#define xenforeignmemory_open(l, f) &xen_xc #define xenforeignmemory_open(l, f) xen_xc
static inline void *xenforeignmemory_map(XenXC *h, uint32_t dom, static inline void *xenforeignmemory_map(xc_interface *h, uint32_t dom,
int prot, size_t pages, int prot, size_t pages,
const xen_pfn_t arr[/*pages*/], const xen_pfn_t arr[/*pages*/],
int err[/*pages*/]) int err[/*pages*/])
{ {
if (err) if (err)
return xc_map_foreign_bulk(*h, dom, prot, arr, err, pages); return xc_map_foreign_bulk(h, dom, prot, arr, err, pages);
else else
return xc_map_foreign_pages(*h, dom, prot, arr, pages); return xc_map_foreign_pages(h, dom, prot, arr, pages);
} }
#define xenforeignmemory_unmap(h, p, s) munmap(p, s * XC_PAGE_SIZE) #define xenforeignmemory_unmap(h, p, s) munmap(p, s * XC_PAGE_SIZE)

4
xen-common.c
View File

@ -114,8 +114,8 @@ static void xen_change_state_handler(void *opaque, int running,
static int xen_init(MachineState *ms) static int xen_init(MachineState *ms)
{ {
xen_xc = xen_xc_interface_open(0, 0, 0); xen_xc = xc_interface_open(0, 0, 0);
if (xen_xc == XC_HANDLER_INITIAL_VALUE) { if (xen_xc == NULL) {
xen_be_printf(NULL, 0, "can't open xen interface\n"); xen_be_printf(NULL, 0, "can't open xen interface\n");
return -1; return -1;
} }

16
xen-hvm.c
View File

@ -1224,7 +1224,7 @@ void xen_hvm_init(PCMachineState *pcms, MemoryRegion **ram_memory)
&ioreq_pfn, &bufioreq_pfn, &ioreq_pfn, &bufioreq_pfn,
&bufioreq_evtchn); &bufioreq_evtchn);
if (rc < 0) { if (rc < 0) {
error_report("failed to get ioreq server info: error %d handle=" XC_INTERFACE_FMT, error_report("failed to get ioreq server info: error %d handle=%p",
errno, xen_xc); errno, xen_xc);
goto err; goto err;
} }
@ -1237,7 +1237,7 @@ void xen_hvm_init(PCMachineState *pcms, MemoryRegion **ram_memory)
PROT_READ|PROT_WRITE, PROT_READ|PROT_WRITE,
1, &ioreq_pfn, NULL); 1, &ioreq_pfn, NULL);
if (state->shared_page == NULL) { if (state->shared_page == NULL) {
error_report("map shared IO page returned error %d handle=" XC_INTERFACE_FMT, error_report("map shared IO page returned error %d handle=%p",
errno, xen_xc); errno, xen_xc);
goto err; goto err;
} }
@ -1249,8 +1249,8 @@ void xen_hvm_init(PCMachineState *pcms, MemoryRegion **ram_memory)
xenforeignmemory_map(xen_fmem, xen_domid, PROT_READ|PROT_WRITE, xenforeignmemory_map(xen_fmem, xen_domid, PROT_READ|PROT_WRITE,
1, &ioreq_pfn, NULL); 1, &ioreq_pfn, NULL);
if (state->shared_vmport_page == NULL) { if (state->shared_vmport_page == NULL) {
error_report("map shared vmport IO page returned error %d handle=" error_report("map shared vmport IO page returned error %d handle=%p",
XC_INTERFACE_FMT, errno, xen_xc); errno, xen_xc);
goto err; goto err;
} }
} else if (rc != -ENOSYS) { } else if (rc != -ENOSYS) {
@ -1272,7 +1272,7 @@ void xen_hvm_init(PCMachineState *pcms, MemoryRegion **ram_memory)
rc = xen_set_ioreq_server_state(xen_xc, xen_domid, state->ioservid, true); rc = xen_set_ioreq_server_state(xen_xc, xen_domid, state->ioservid, true);
if (rc < 0) { if (rc < 0) {
error_report("failed to enable ioreq server info: error %d handle=" XC_INTERFACE_FMT, error_report("failed to enable ioreq server info: error %d handle=%p",
errno, xen_xc); errno, xen_xc);
goto err; goto err;
} }
@ -1333,11 +1333,11 @@ err:
void destroy_hvm_domain(bool reboot) void destroy_hvm_domain(bool reboot)
{ {
XenXC xc_handle; xc_interface *xc_handle;
int sts; int sts;
xc_handle = xen_xc_interface_open(0, 0, 0); xc_handle = xc_interface_open(0, 0, 0);
if (xc_handle == XC_HANDLER_INITIAL_VALUE) { if (xc_handle == NULL) {
fprintf(stderr, "Cannot acquire xenctrl handle\n"); fprintf(stderr, "Cannot acquire xenctrl handle\n");
} else { } else {
sts = xc_domain_shutdown(xc_handle, xen_domid, sts = xc_domain_shutdown(xc_handle, xen_domid,