* [PATCH v2 1/5] xen: drop support for Xen 4.1 and older.
2016-02-10 11:06 [Qemu-devel] [PATCH v2 0/5] Drop support for Xen 4.1 and older from qemu-xen Ian Campbell
@ 2016-02-10 11:07 ` Ian Campbell
2016-02-10 11:07 ` [Qemu-devel] " Ian Campbell
` (8 subsequent siblings)
9 siblings, 0 replies; 17+ messages in thread
From: Ian Campbell @ 2016-02-10 11:07 UTC (permalink / raw)
To: stefano.stabellini, qemu-devel; +Cc: Ian Campbell, xen-devel
Xen 4.2 become unsupported upstream in 09/2015 (see
http://wiki.xen.org/wiki/Xen_Release_Features). However as far as the
interfaces provided by the toolstack libraries go 4.2 and 4.3 are
indistinguishable.
Therefore drop support for Xen 4.1 and earlier which removes a whole
pile of compatibility code which makes future work (to use stable
library interfaces provided by upstream) more difficult. In particular
all supported versions now use a pointer as a libxc handle (4.1 and
earlier used an integer, resulting in various shim layers).
Also Xen 4.2 was the first version of Xen to formally support upstream
QEMU (as a preview) so that makes sense as a cut-off now.
This change drops all the configure-y and resulting ifdefs in a mostly
mechanical way. A follow up will refactor wrappers which are now
unused.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
v2: Don't claim to support 4.1 for another 89 years in the commit
message.
Tweak message in configure.
---
configure | 101 +-----------------------------
hw/i386/xen/xen_apic.c | 4 --
include/hw/xen/xen.h | 4 --
include/hw/xen/xen_common.h | 146 ++------------------------------------------
xen-hvm.c | 19 ------
5 files changed, 7 insertions(+), 267 deletions(-)
diff --git a/configure b/configure
index d4411a1..16c7956 100755
--- a/configure
+++ b/configure
@@ -2111,100 +2111,10 @@ EOF
xen_ctrl_version=420
xen=yes
- elif
- cat > $TMPC <<EOF &&
-#include <xenctrl.h>
-#include <xs.h>
-#include <stdint.h>
-#include <xen/hvm/hvm_info_table.h>
-#if !defined(HVM_MAX_VCPUS)
-# error HVM_MAX_VCPUS not defined
-#endif
-int main(void) {
- xs_daemon_open();
- xc_interface_open(0, 0, 0);
- xc_hvm_set_mem_type(0, 0, HVMMEM_ram_ro, 0, 0);
- xc_gnttab_open(NULL, 0);
- xc_domain_add_to_physmap(0, 0, XENMAPSPACE_gmfn, 0, 0);
- return 0;
-}
-EOF
- compile_prog "" "$xen_libs"
- then
- xen_ctrl_version=410
- xen=yes
-
- # Xen 4.0.0
- elif
- cat > $TMPC <<EOF &&
-#include <xenctrl.h>
-#include <xs.h>
-#include <stdint.h>
-#include <xen/hvm/hvm_info_table.h>
-#if !defined(HVM_MAX_VCPUS)
-# error HVM_MAX_VCPUS not defined
-#endif
-int main(void) {
- struct xen_add_to_physmap xatp = {
- .domid = 0, .space = XENMAPSPACE_gmfn, .idx = 0, .gpfn = 0,
- };
- xs_daemon_open();
- xc_interface_open();
- xc_gnttab_open();
- xc_hvm_set_mem_type(0, 0, HVMMEM_ram_ro, 0, 0);
- xc_memory_op(0, XENMEM_add_to_physmap, &xatp);
- return 0;
-}
-EOF
- compile_prog "" "$xen_libs"
- then
- xen_ctrl_version=400
- xen=yes
-
- # Xen 3.4.0
- elif
- cat > $TMPC <<EOF &&
-#include <xenctrl.h>
-#include <xs.h>
-int main(void) {
- struct xen_add_to_physmap xatp = {
- .domid = 0, .space = XENMAPSPACE_gmfn, .idx = 0, .gpfn = 0,
- };
- xs_daemon_open();
- xc_interface_open();
- xc_gnttab_open();
- xc_hvm_set_mem_type(0, 0, HVMMEM_ram_ro, 0, 0);
- xc_memory_op(0, XENMEM_add_to_physmap, &xatp);
- return 0;
-}
-EOF
- compile_prog "" "$xen_libs"
- then
- xen_ctrl_version=340
- xen=yes
-
- # Xen 3.3.0
- elif
- cat > $TMPC <<EOF &&
-#include <xenctrl.h>
-#include <xs.h>
-int main(void) {
- xs_daemon_open();
- xc_interface_open();
- xc_gnttab_open();
- xc_hvm_set_mem_type(0, 0, HVMMEM_ram_ro, 0, 0);
- return 0;
-}
-EOF
- compile_prog "" "$xen_libs"
- then
- xen_ctrl_version=330
- xen=yes
-
- # Xen version unsupported
else
if test "$xen" = "yes" ; then
- feature_not_found "xen (unsupported version)" "Install supported xen (e.g. 4.0, 3.4, 3.3)"
+ feature_not_found "xen (unsupported version)" \
+ "Install a supported xen (xen 4.2 or newer)"
fi
xen=no
fi
@@ -2218,15 +2128,10 @@ EOF
fi
if test "$xen_pci_passthrough" != "no"; then
- if test "$xen" = "yes" && test "$linux" = "yes" &&
- test "$xen_ctrl_version" -ge 340; then
+ if test "$xen" = "yes" && test "$linux" = "yes"; then
xen_pci_passthrough=yes
else
if test "$xen_pci_passthrough" = "yes"; then
- if test "$xen_ctrl_version" -lt 340; then
- error_exit "User requested feature Xen PCI Passthrough" \
- "This feature does not work with Xen 3.3"
- fi
error_exit "User requested feature Xen PCI Passthrough" \
" but this feature requires /sys from Linux"
fi
diff --git a/hw/i386/xen/xen_apic.c b/hw/i386/xen/xen_apic.c
index 5128146..2b8d709 100644
--- a/hw/i386/xen/xen_apic.c
+++ b/hw/i386/xen/xen_apic.c
@@ -44,11 +44,7 @@ static void xen_apic_realize(DeviceState *dev, Error **errp)
s->vapic_control = 0;
memory_region_init_io(&s->io_memory, OBJECT(s), &xen_apic_io_ops, s,
"xen-apic-msi", APIC_SPACE_SIZE);
-
-#if defined(CONFIG_XEN_CTRL_INTERFACE_VERSION) \
- && CONFIG_XEN_CTRL_INTERFACE_VERSION >= 420
msi_supported = true;
-#endif
}
static void xen_apic_set_base(APICCommonState *s, uint64_t val)
diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h
index c577354..df33481 100644
--- a/include/hw/xen/xen.h
+++ b/include/hw/xen/xen.h
@@ -48,8 +48,4 @@ void xen_modified_memory(ram_addr_t start, ram_addr_t length);
void xen_register_framebuffer(struct MemoryRegion *mr);
-#if defined(CONFIG_XEN) && CONFIG_XEN_CTRL_INTERFACE_VERSION < 400
-# define HVM_MAX_VCPUS 32
-#endif
-
#endif /* QEMU_HW_XEN_H */
diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h
index 0d83891..3a5b537 100644
--- a/include/hw/xen/xen_common.h
+++ b/include/hw/xen/xen_common.h
@@ -16,11 +16,7 @@
#undef XC_WANT_COMPAT_MAP_FOREIGN_API
#include <xenctrl.h>
-#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 420
-# include <xs.h>
-#else
-# include <xenstore.h>
-#endif
+#include <xenstore.h>
#include <xen/io/xenbus.h>
#include "hw/hw.h"
@@ -30,129 +26,11 @@
#include "trace.h"
/*
- * We don't support Xen prior to 3.3.0.
+ * We don't support Xen prior to 4.2.0.
*/
-/* Xen before 4.0 */
-#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 400
-static inline void *xc_map_foreign_bulk(int xc_handle, uint32_t dom, int prot,
- xen_pfn_t *arr, int *err,
- unsigned int num)
-{
- return xc_map_foreign_batch(xc_handle, dom, prot, arr, num);
-}
-#endif
-
-
-/* Xen before 4.1 */
-#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 410
-
-typedef int XenXC;
-typedef int xenevtchn_handle;
-typedef int xengnttab_handle;
-typedef int xenforeignmemory_handle;
-
-# define XC_INTERFACE_FMT "%i"
-# define XC_HANDLER_INITIAL_VALUE -1
-
-static inline xenevtchn_handle *xenevtchn_open(void *logger,
- unsigned int open_flags)
-{
- xenevtchn_handle *h = malloc(sizeof(*h));
- if (!h) {
- return NULL;
- }
- *h = xc_evtchn_open();
- if (*h == -1) {
- free(h);
- h = NULL;
- }
- return h;
-}
-static inline int xenevtchn_close(xenevtchn_handle *h)
-{
- int rc = xc_evtchn_close(*h);
- free(h);
- return rc;
-}
-#define xenevtchn_fd(h) xc_evtchn_fd(*h)
-#define xenevtchn_pending(h) xc_evtchn_pending(*h)
-#define xenevtchn_notify(h, p) xc_evtchn_notify(*h, p)
-#define xenevtchn_bind_interdomain(h, d, p) xc_evtchn_bind_interdomain(*h, d, p)
-#define xenevtchn_unmask(h, p) xc_evtchn_unmask(*h, p)
-#define xenevtchn_unbind(h, p) xc_evtchn_unmask(*h, p)
-
-static inline xengnttab_handle *xengnttab_open(void *logger,
- unsigned int open_flags)
-{
- xengnttab_handle *h = malloc(sizeof(*h));
- if (!h) {
- return NULL;
- }
- *h = xc_gnttab_open();
- if (*h == -1) {
- free(h);
- h = NULL;
- }
- return h;
-}
-static inline int xengnttab_close(xengnttab_handle *h)
-{
- int rc = xc_gnttab_close(*h);
- free(h);
- return rc;
-}
-#define xengnttab_set_max_grants(h, n) xc_gnttab_set_max_grants(*h, n)
-#define xengnttab_map_grant_ref(h, d, r, p) xc_gnttab_map_grant_ref(*h, d, r, p)
-#define xengnttab_map_grant_refs(h, c, d, r, p) \
- xc_gnttab_map_grant_refs(*h, c, d, r, p)
-#define xengnttab_unmap(h, a, n) xc_gnttab_munmap(*h, a, n)
-
-static inline XenXC xen_xc_interface_open(void *logger, void *dombuild_logger,
- unsigned int open_flags)
-{
- return xc_interface_open();
-}
-
-/* See below for xenforeignmemory_* APIs */
-
-static inline int xc_domain_populate_physmap_exact
- (XenXC xc_handle, uint32_t domid, unsigned long nr_extents,
- unsigned int extent_order, unsigned int mem_flags, xen_pfn_t *extent_start)
-{
- return xc_domain_memory_populate_physmap
- (xc_handle, domid, nr_extents, extent_order, mem_flags, extent_start);
-}
-
-static inline int xc_domain_add_to_physmap(int xc_handle, uint32_t domid,
- unsigned int space, unsigned long idx,
- xen_pfn_t gpfn)
-{
- struct xen_add_to_physmap xatp = {
- .domid = domid,
- .space = space,
- .idx = idx,
- .gpfn = gpfn,
- };
-
- return xc_memory_op(xc_handle, XENMEM_add_to_physmap, &xatp);
-}
-
-static inline struct xs_handle *xs_open(unsigned long flags)
-{
- return xs_daemon_open();
-}
-
-static inline void xs_close(struct xs_handle *xsh)
-{
- if (xsh != NULL) {
- xs_daemon_close(xsh);
- }
-}
-
-
-/* Xen 4.1 thru 4.6 */
-#elif CONFIG_XEN_CTRL_INTERFACE_VERSION < 471
+/* Xen 4.2 thru 4.6 */
+#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 471
typedef xc_interface *XenXC;
typedef xc_interface *xenforeignmemory_handle;
@@ -205,27 +83,11 @@ static inline XenXC xen_xc_interface_open(void *logger, void *dombuild_logger,
}
#endif
-/* Xen before 4.2 */
-#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 420
-static inline int xen_xc_hvm_inject_msi(XenXC xen_xc, domid_t dom,
- uint64_t addr, uint32_t data)
-{
- return -ENOSYS;
-}
-/* The followings are only to compile op_discard related code on older
- * Xen releases. */
-#define BLKIF_OP_DISCARD 5
-struct blkif_request_discard {
- uint64_t nr_sectors;
- uint64_t sector_number;
-};
-#else
static inline int xen_xc_hvm_inject_msi(XenXC xen_xc, domid_t dom,
uint64_t addr, uint32_t data)
{
return xc_hvm_inject_msi(xen_xc, dom, addr, data);
}
-#endif
void destroy_hvm_domain(bool reboot);
diff --git a/xen-hvm.c b/xen-hvm.c
index 6861c51..8350ca2 100644
--- a/xen-hvm.c
+++ b/xen-hvm.c
@@ -316,7 +316,6 @@ static hwaddr xen_phys_offset_to_gaddr(hwaddr start_addr,
return start_addr;
}
-#if CONFIG_XEN_CTRL_INTERFACE_VERSION >= 340
static int xen_add_to_physmap(XenIOState *state,
hwaddr start_addr,
ram_addr_t size,
@@ -451,24 +450,6 @@ static int xen_remove_from_physmap(XenIOState *state,
return 0;
}
-#else
-static int xen_add_to_physmap(XenIOState *state,
- hwaddr start_addr,
- ram_addr_t size,
- MemoryRegion *mr,
- hwaddr offset_within_region)
-{
- return -ENOSYS;
-}
-
-static int xen_remove_from_physmap(XenIOState *state,
- hwaddr start_addr,
- ram_addr_t size)
-{
- return -ENOSYS;
-}
-#endif
-
static void xen_set_memory(struct MemoryListener *listener,
MemoryRegionSection *section,
bool add)
--
2.1.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* [Qemu-devel] [PATCH v2 1/5] xen: drop support for Xen 4.1 and older.
2016-02-10 11:06 [Qemu-devel] [PATCH v2 0/5] Drop support for Xen 4.1 and older from qemu-xen Ian Campbell
2016-02-10 11:07 ` [PATCH v2 1/5] xen: drop support for Xen 4.1 and older Ian Campbell
@ 2016-02-10 11:07 ` Ian Campbell
2016-02-10 11:57 ` Stefano Stabellini
2016-02-10 11:57 ` Stefano Stabellini
2016-02-10 11:07 ` Ian Campbell
` (7 subsequent siblings)
9 siblings, 2 replies; 17+ messages in thread
From: Ian Campbell @ 2016-02-10 11:07 UTC (permalink / raw)
To: stefano.stabellini, qemu-devel; +Cc: Ian Campbell, xen-devel
Xen 4.2 become unsupported upstream in 09/2015 (see
http://wiki.xen.org/wiki/Xen_Release_Features). However as far as the
interfaces provided by the toolstack libraries go 4.2 and 4.3 are
indistinguishable.
Therefore drop support for Xen 4.1 and earlier which removes a whole
pile of compatibility code which makes future work (to use stable
library interfaces provided by upstream) more difficult. In particular
all supported versions now use a pointer as a libxc handle (4.1 and
earlier used an integer, resulting in various shim layers).
Also Xen 4.2 was the first version of Xen to formally support upstream
QEMU (as a preview) so that makes sense as a cut-off now.
This change drops all the configure-y and resulting ifdefs in a mostly
mechanical way. A follow up will refactor wrappers which are now
unused.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
v2: Don't claim to support 4.1 for another 89 years in the commit
message.
Tweak message in configure.
---
configure | 101 +-----------------------------
hw/i386/xen/xen_apic.c | 4 --
include/hw/xen/xen.h | 4 --
include/hw/xen/xen_common.h | 146 ++------------------------------------------
xen-hvm.c | 19 ------
5 files changed, 7 insertions(+), 267 deletions(-)
diff --git a/configure b/configure
index d4411a1..16c7956 100755
--- a/configure
+++ b/configure
@@ -2111,100 +2111,10 @@ EOF
xen_ctrl_version=420
xen=yes
- elif
- cat > $TMPC <<EOF &&
-#include <xenctrl.h>
-#include <xs.h>
-#include <stdint.h>
-#include <xen/hvm/hvm_info_table.h>
-#if !defined(HVM_MAX_VCPUS)
-# error HVM_MAX_VCPUS not defined
-#endif
-int main(void) {
- xs_daemon_open();
- xc_interface_open(0, 0, 0);
- xc_hvm_set_mem_type(0, 0, HVMMEM_ram_ro, 0, 0);
- xc_gnttab_open(NULL, 0);
- xc_domain_add_to_physmap(0, 0, XENMAPSPACE_gmfn, 0, 0);
- return 0;
-}
-EOF
- compile_prog "" "$xen_libs"
- then
- xen_ctrl_version=410
- xen=yes
-
- # Xen 4.0.0
- elif
- cat > $TMPC <<EOF &&
-#include <xenctrl.h>
-#include <xs.h>
-#include <stdint.h>
-#include <xen/hvm/hvm_info_table.h>
-#if !defined(HVM_MAX_VCPUS)
-# error HVM_MAX_VCPUS not defined
-#endif
-int main(void) {
- struct xen_add_to_physmap xatp = {
- .domid = 0, .space = XENMAPSPACE_gmfn, .idx = 0, .gpfn = 0,
- };
- xs_daemon_open();
- xc_interface_open();
- xc_gnttab_open();
- xc_hvm_set_mem_type(0, 0, HVMMEM_ram_ro, 0, 0);
- xc_memory_op(0, XENMEM_add_to_physmap, &xatp);
- return 0;
-}
-EOF
- compile_prog "" "$xen_libs"
- then
- xen_ctrl_version=400
- xen=yes
-
- # Xen 3.4.0
- elif
- cat > $TMPC <<EOF &&
-#include <xenctrl.h>
-#include <xs.h>
-int main(void) {
- struct xen_add_to_physmap xatp = {
- .domid = 0, .space = XENMAPSPACE_gmfn, .idx = 0, .gpfn = 0,
- };
- xs_daemon_open();
- xc_interface_open();
- xc_gnttab_open();
- xc_hvm_set_mem_type(0, 0, HVMMEM_ram_ro, 0, 0);
- xc_memory_op(0, XENMEM_add_to_physmap, &xatp);
- return 0;
-}
-EOF
- compile_prog "" "$xen_libs"
- then
- xen_ctrl_version=340
- xen=yes
-
- # Xen 3.3.0
- elif
- cat > $TMPC <<EOF &&
-#include <xenctrl.h>
-#include <xs.h>
-int main(void) {
- xs_daemon_open();
- xc_interface_open();
- xc_gnttab_open();
- xc_hvm_set_mem_type(0, 0, HVMMEM_ram_ro, 0, 0);
- return 0;
-}
-EOF
- compile_prog "" "$xen_libs"
- then
- xen_ctrl_version=330
- xen=yes
-
- # Xen version unsupported
else
if test "$xen" = "yes" ; then
- feature_not_found "xen (unsupported version)" "Install supported xen (e.g. 4.0, 3.4, 3.3)"
+ feature_not_found "xen (unsupported version)" \
+ "Install a supported xen (xen 4.2 or newer)"
fi
xen=no
fi
@@ -2218,15 +2128,10 @@ EOF
fi
if test "$xen_pci_passthrough" != "no"; then
- if test "$xen" = "yes" && test "$linux" = "yes" &&
- test "$xen_ctrl_version" -ge 340; then
+ if test "$xen" = "yes" && test "$linux" = "yes"; then
xen_pci_passthrough=yes
else
if test "$xen_pci_passthrough" = "yes"; then
- if test "$xen_ctrl_version" -lt 340; then
- error_exit "User requested feature Xen PCI Passthrough" \
- "This feature does not work with Xen 3.3"
- fi
error_exit "User requested feature Xen PCI Passthrough" \
" but this feature requires /sys from Linux"
fi
diff --git a/hw/i386/xen/xen_apic.c b/hw/i386/xen/xen_apic.c
index 5128146..2b8d709 100644
--- a/hw/i386/xen/xen_apic.c
+++ b/hw/i386/xen/xen_apic.c
@@ -44,11 +44,7 @@ static void xen_apic_realize(DeviceState *dev, Error **errp)
s->vapic_control = 0;
memory_region_init_io(&s->io_memory, OBJECT(s), &xen_apic_io_ops, s,
"xen-apic-msi", APIC_SPACE_SIZE);
-
-#if defined(CONFIG_XEN_CTRL_INTERFACE_VERSION) \
- && CONFIG_XEN_CTRL_INTERFACE_VERSION >= 420
msi_supported = true;
-#endif
}
static void xen_apic_set_base(APICCommonState *s, uint64_t val)
diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h
index c577354..df33481 100644
--- a/include/hw/xen/xen.h
+++ b/include/hw/xen/xen.h
@@ -48,8 +48,4 @@ void xen_modified_memory(ram_addr_t start, ram_addr_t length);
void xen_register_framebuffer(struct MemoryRegion *mr);
-#if defined(CONFIG_XEN) && CONFIG_XEN_CTRL_INTERFACE_VERSION < 400
-# define HVM_MAX_VCPUS 32
-#endif
-
#endif /* QEMU_HW_XEN_H */
diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h
index 0d83891..3a5b537 100644
--- a/include/hw/xen/xen_common.h
+++ b/include/hw/xen/xen_common.h
@@ -16,11 +16,7 @@
#undef XC_WANT_COMPAT_MAP_FOREIGN_API
#include <xenctrl.h>
-#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 420
-# include <xs.h>
-#else
-# include <xenstore.h>
-#endif
+#include <xenstore.h>
#include <xen/io/xenbus.h>
#include "hw/hw.h"
@@ -30,129 +26,11 @@
#include "trace.h"
/*
- * We don't support Xen prior to 3.3.0.
+ * We don't support Xen prior to 4.2.0.
*/
-/* Xen before 4.0 */
-#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 400
-static inline void *xc_map_foreign_bulk(int xc_handle, uint32_t dom, int prot,
- xen_pfn_t *arr, int *err,
- unsigned int num)
-{
- return xc_map_foreign_batch(xc_handle, dom, prot, arr, num);
-}
-#endif
-
-
-/* Xen before 4.1 */
-#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 410
-
-typedef int XenXC;
-typedef int xenevtchn_handle;
-typedef int xengnttab_handle;
-typedef int xenforeignmemory_handle;
-
-# define XC_INTERFACE_FMT "%i"
-# define XC_HANDLER_INITIAL_VALUE -1
-
-static inline xenevtchn_handle *xenevtchn_open(void *logger,
- unsigned int open_flags)
-{
- xenevtchn_handle *h = malloc(sizeof(*h));
- if (!h) {
- return NULL;
- }
- *h = xc_evtchn_open();
- if (*h == -1) {
- free(h);
- h = NULL;
- }
- return h;
-}
-static inline int xenevtchn_close(xenevtchn_handle *h)
-{
- int rc = xc_evtchn_close(*h);
- free(h);
- return rc;
-}
-#define xenevtchn_fd(h) xc_evtchn_fd(*h)
-#define xenevtchn_pending(h) xc_evtchn_pending(*h)
-#define xenevtchn_notify(h, p) xc_evtchn_notify(*h, p)
-#define xenevtchn_bind_interdomain(h, d, p) xc_evtchn_bind_interdomain(*h, d, p)
-#define xenevtchn_unmask(h, p) xc_evtchn_unmask(*h, p)
-#define xenevtchn_unbind(h, p) xc_evtchn_unmask(*h, p)
-
-static inline xengnttab_handle *xengnttab_open(void *logger,
- unsigned int open_flags)
-{
- xengnttab_handle *h = malloc(sizeof(*h));
- if (!h) {
- return NULL;
- }
- *h = xc_gnttab_open();
- if (*h == -1) {
- free(h);
- h = NULL;
- }
- return h;
-}
-static inline int xengnttab_close(xengnttab_handle *h)
-{
- int rc = xc_gnttab_close(*h);
- free(h);
- return rc;
-}
-#define xengnttab_set_max_grants(h, n) xc_gnttab_set_max_grants(*h, n)
-#define xengnttab_map_grant_ref(h, d, r, p) xc_gnttab_map_grant_ref(*h, d, r, p)
-#define xengnttab_map_grant_refs(h, c, d, r, p) \
- xc_gnttab_map_grant_refs(*h, c, d, r, p)
-#define xengnttab_unmap(h, a, n) xc_gnttab_munmap(*h, a, n)
-
-static inline XenXC xen_xc_interface_open(void *logger, void *dombuild_logger,
- unsigned int open_flags)
-{
- return xc_interface_open();
-}
-
-/* See below for xenforeignmemory_* APIs */
-
-static inline int xc_domain_populate_physmap_exact
- (XenXC xc_handle, uint32_t domid, unsigned long nr_extents,
- unsigned int extent_order, unsigned int mem_flags, xen_pfn_t *extent_start)
-{
- return xc_domain_memory_populate_physmap
- (xc_handle, domid, nr_extents, extent_order, mem_flags, extent_start);
-}
-
-static inline int xc_domain_add_to_physmap(int xc_handle, uint32_t domid,
- unsigned int space, unsigned long idx,
- xen_pfn_t gpfn)
-{
- struct xen_add_to_physmap xatp = {
- .domid = domid,
- .space = space,
- .idx = idx,
- .gpfn = gpfn,
- };
-
- return xc_memory_op(xc_handle, XENMEM_add_to_physmap, &xatp);
-}
-
-static inline struct xs_handle *xs_open(unsigned long flags)
-{
- return xs_daemon_open();
-}
-
-static inline void xs_close(struct xs_handle *xsh)
-{
- if (xsh != NULL) {
- xs_daemon_close(xsh);
- }
-}
-
-
-/* Xen 4.1 thru 4.6 */
-#elif CONFIG_XEN_CTRL_INTERFACE_VERSION < 471
+/* Xen 4.2 thru 4.6 */
+#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 471
typedef xc_interface *XenXC;
typedef xc_interface *xenforeignmemory_handle;
@@ -205,27 +83,11 @@ static inline XenXC xen_xc_interface_open(void *logger, void *dombuild_logger,
}
#endif
-/* Xen before 4.2 */
-#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 420
-static inline int xen_xc_hvm_inject_msi(XenXC xen_xc, domid_t dom,
- uint64_t addr, uint32_t data)
-{
- return -ENOSYS;
-}
-/* The followings are only to compile op_discard related code on older
- * Xen releases. */
-#define BLKIF_OP_DISCARD 5
-struct blkif_request_discard {
- uint64_t nr_sectors;
- uint64_t sector_number;
-};
-#else
static inline int xen_xc_hvm_inject_msi(XenXC xen_xc, domid_t dom,
uint64_t addr, uint32_t data)
{
return xc_hvm_inject_msi(xen_xc, dom, addr, data);
}
-#endif
void destroy_hvm_domain(bool reboot);
diff --git a/xen-hvm.c b/xen-hvm.c
index 6861c51..8350ca2 100644
--- a/xen-hvm.c
+++ b/xen-hvm.c
@@ -316,7 +316,6 @@ static hwaddr xen_phys_offset_to_gaddr(hwaddr start_addr,
return start_addr;
}
-#if CONFIG_XEN_CTRL_INTERFACE_VERSION >= 340
static int xen_add_to_physmap(XenIOState *state,
hwaddr start_addr,
ram_addr_t size,
@@ -451,24 +450,6 @@ static int xen_remove_from_physmap(XenIOState *state,
return 0;
}
-#else
-static int xen_add_to_physmap(XenIOState *state,
- hwaddr start_addr,
- ram_addr_t size,
- MemoryRegion *mr,
- hwaddr offset_within_region)
-{
- return -ENOSYS;
-}
-
-static int xen_remove_from_physmap(XenIOState *state,
- hwaddr start_addr,
- ram_addr_t size)
-{
- return -ENOSYS;
-}
-#endif
-
static void xen_set_memory(struct MemoryListener *listener,
MemoryRegionSection *section,
bool add)
--
2.1.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* Re: [Qemu-devel] [PATCH v2 1/5] xen: drop support for Xen 4.1 and older.
2016-02-10 11:07 ` [Qemu-devel] " Ian Campbell
@ 2016-02-10 11:57 ` Stefano Stabellini
2016-02-10 11:57 ` Stefano Stabellini
1 sibling, 0 replies; 17+ messages in thread
From: Stefano Stabellini @ 2016-02-10 11:57 UTC (permalink / raw)
To: Ian Campbell; +Cc: xen-devel, qemu-devel, stefano.stabellini
On Wed, 10 Feb 2016, Ian Campbell wrote:
> Xen 4.2 become unsupported upstream in 09/2015 (see
> http://wiki.xen.org/wiki/Xen_Release_Features). However as far as the
> interfaces provided by the toolstack libraries go 4.2 and 4.3 are
> indistinguishable.
>
> Therefore drop support for Xen 4.1 and earlier which removes a whole
> pile of compatibility code which makes future work (to use stable
> library interfaces provided by upstream) more difficult. In particular
> all supported versions now use a pointer as a libxc handle (4.1 and
> earlier used an integer, resulting in various shim layers).
>
> Also Xen 4.2 was the first version of Xen to formally support upstream
> QEMU (as a preview) so that makes sense as a cut-off now.
>
> This change drops all the configure-y and resulting ifdefs in a mostly
> mechanical way. A follow up will refactor wrappers which are now
> unused.
>
> Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> v2: Don't claim to support 4.1 for another 89 years in the commit
> message.
> Tweak message in configure.
> ---
> configure | 101 +-----------------------------
> hw/i386/xen/xen_apic.c | 4 --
> include/hw/xen/xen.h | 4 --
> include/hw/xen/xen_common.h | 146 ++------------------------------------------
> xen-hvm.c | 19 ------
> 5 files changed, 7 insertions(+), 267 deletions(-)
>
> diff --git a/configure b/configure
> index d4411a1..16c7956 100755
> --- a/configure
> +++ b/configure
> @@ -2111,100 +2111,10 @@ EOF
> xen_ctrl_version=420
> xen=yes
>
> - elif
> - cat > $TMPC <<EOF &&
> -#include <xenctrl.h>
> -#include <xs.h>
> -#include <stdint.h>
> -#include <xen/hvm/hvm_info_table.h>
> -#if !defined(HVM_MAX_VCPUS)
> -# error HVM_MAX_VCPUS not defined
> -#endif
> -int main(void) {
> - xs_daemon_open();
> - xc_interface_open(0, 0, 0);
> - xc_hvm_set_mem_type(0, 0, HVMMEM_ram_ro, 0, 0);
> - xc_gnttab_open(NULL, 0);
> - xc_domain_add_to_physmap(0, 0, XENMAPSPACE_gmfn, 0, 0);
> - return 0;
> -}
> -EOF
> - compile_prog "" "$xen_libs"
> - then
> - xen_ctrl_version=410
> - xen=yes
> -
> - # Xen 4.0.0
> - elif
> - cat > $TMPC <<EOF &&
> -#include <xenctrl.h>
> -#include <xs.h>
> -#include <stdint.h>
> -#include <xen/hvm/hvm_info_table.h>
> -#if !defined(HVM_MAX_VCPUS)
> -# error HVM_MAX_VCPUS not defined
> -#endif
> -int main(void) {
> - struct xen_add_to_physmap xatp = {
> - .domid = 0, .space = XENMAPSPACE_gmfn, .idx = 0, .gpfn = 0,
> - };
> - xs_daemon_open();
> - xc_interface_open();
> - xc_gnttab_open();
> - xc_hvm_set_mem_type(0, 0, HVMMEM_ram_ro, 0, 0);
> - xc_memory_op(0, XENMEM_add_to_physmap, &xatp);
> - return 0;
> -}
> -EOF
> - compile_prog "" "$xen_libs"
> - then
> - xen_ctrl_version=400
> - xen=yes
> -
> - # Xen 3.4.0
> - elif
> - cat > $TMPC <<EOF &&
> -#include <xenctrl.h>
> -#include <xs.h>
> -int main(void) {
> - struct xen_add_to_physmap xatp = {
> - .domid = 0, .space = XENMAPSPACE_gmfn, .idx = 0, .gpfn = 0,
> - };
> - xs_daemon_open();
> - xc_interface_open();
> - xc_gnttab_open();
> - xc_hvm_set_mem_type(0, 0, HVMMEM_ram_ro, 0, 0);
> - xc_memory_op(0, XENMEM_add_to_physmap, &xatp);
> - return 0;
> -}
> -EOF
> - compile_prog "" "$xen_libs"
> - then
> - xen_ctrl_version=340
> - xen=yes
> -
> - # Xen 3.3.0
> - elif
> - cat > $TMPC <<EOF &&
> -#include <xenctrl.h>
> -#include <xs.h>
> -int main(void) {
> - xs_daemon_open();
> - xc_interface_open();
> - xc_gnttab_open();
> - xc_hvm_set_mem_type(0, 0, HVMMEM_ram_ro, 0, 0);
> - return 0;
> -}
> -EOF
> - compile_prog "" "$xen_libs"
> - then
> - xen_ctrl_version=330
> - xen=yes
> -
> - # Xen version unsupported
> else
> if test "$xen" = "yes" ; then
> - feature_not_found "xen (unsupported version)" "Install supported xen (e.g. 4.0, 3.4, 3.3)"
> + feature_not_found "xen (unsupported version)" \
> + "Install a supported xen (xen 4.2 or newer)"
> fi
> xen=no
> fi
> @@ -2218,15 +2128,10 @@ EOF
> fi
>
> if test "$xen_pci_passthrough" != "no"; then
> - if test "$xen" = "yes" && test "$linux" = "yes" &&
> - test "$xen_ctrl_version" -ge 340; then
> + if test "$xen" = "yes" && test "$linux" = "yes"; then
> xen_pci_passthrough=yes
> else
> if test "$xen_pci_passthrough" = "yes"; then
> - if test "$xen_ctrl_version" -lt 340; then
> - error_exit "User requested feature Xen PCI Passthrough" \
> - "This feature does not work with Xen 3.3"
> - fi
> error_exit "User requested feature Xen PCI Passthrough" \
> " but this feature requires /sys from Linux"
> fi
> diff --git a/hw/i386/xen/xen_apic.c b/hw/i386/xen/xen_apic.c
> index 5128146..2b8d709 100644
> --- a/hw/i386/xen/xen_apic.c
> +++ b/hw/i386/xen/xen_apic.c
> @@ -44,11 +44,7 @@ static void xen_apic_realize(DeviceState *dev, Error **errp)
> s->vapic_control = 0;
> memory_region_init_io(&s->io_memory, OBJECT(s), &xen_apic_io_ops, s,
> "xen-apic-msi", APIC_SPACE_SIZE);
> -
> -#if defined(CONFIG_XEN_CTRL_INTERFACE_VERSION) \
> - && CONFIG_XEN_CTRL_INTERFACE_VERSION >= 420
> msi_supported = true;
> -#endif
> }
>
> static void xen_apic_set_base(APICCommonState *s, uint64_t val)
> diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h
> index c577354..df33481 100644
> --- a/include/hw/xen/xen.h
> +++ b/include/hw/xen/xen.h
> @@ -48,8 +48,4 @@ void xen_modified_memory(ram_addr_t start, ram_addr_t length);
>
> void xen_register_framebuffer(struct MemoryRegion *mr);
>
> -#if defined(CONFIG_XEN) && CONFIG_XEN_CTRL_INTERFACE_VERSION < 400
> -# define HVM_MAX_VCPUS 32
> -#endif
> -
> #endif /* QEMU_HW_XEN_H */
> diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h
> index 0d83891..3a5b537 100644
> --- a/include/hw/xen/xen_common.h
> +++ b/include/hw/xen/xen_common.h
> @@ -16,11 +16,7 @@
> #undef XC_WANT_COMPAT_MAP_FOREIGN_API
>
> #include <xenctrl.h>
> -#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 420
> -# include <xs.h>
> -#else
> -# include <xenstore.h>
> -#endif
> +#include <xenstore.h>
> #include <xen/io/xenbus.h>
>
> #include "hw/hw.h"
> @@ -30,129 +26,11 @@
> #include "trace.h"
>
> /*
> - * We don't support Xen prior to 3.3.0.
> + * We don't support Xen prior to 4.2.0.
> */
>
> -/* Xen before 4.0 */
> -#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 400
> -static inline void *xc_map_foreign_bulk(int xc_handle, uint32_t dom, int prot,
> - xen_pfn_t *arr, int *err,
> - unsigned int num)
> -{
> - return xc_map_foreign_batch(xc_handle, dom, prot, arr, num);
> -}
> -#endif
> -
> -
> -/* Xen before 4.1 */
> -#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 410
> -
> -typedef int XenXC;
> -typedef int xenevtchn_handle;
> -typedef int xengnttab_handle;
> -typedef int xenforeignmemory_handle;
> -
> -# define XC_INTERFACE_FMT "%i"
> -# define XC_HANDLER_INITIAL_VALUE -1
> -
> -static inline xenevtchn_handle *xenevtchn_open(void *logger,
> - unsigned int open_flags)
> -{
> - xenevtchn_handle *h = malloc(sizeof(*h));
> - if (!h) {
> - return NULL;
> - }
> - *h = xc_evtchn_open();
> - if (*h == -1) {
> - free(h);
> - h = NULL;
> - }
> - return h;
> -}
> -static inline int xenevtchn_close(xenevtchn_handle *h)
> -{
> - int rc = xc_evtchn_close(*h);
> - free(h);
> - return rc;
> -}
> -#define xenevtchn_fd(h) xc_evtchn_fd(*h)
> -#define xenevtchn_pending(h) xc_evtchn_pending(*h)
> -#define xenevtchn_notify(h, p) xc_evtchn_notify(*h, p)
> -#define xenevtchn_bind_interdomain(h, d, p) xc_evtchn_bind_interdomain(*h, d, p)
> -#define xenevtchn_unmask(h, p) xc_evtchn_unmask(*h, p)
> -#define xenevtchn_unbind(h, p) xc_evtchn_unmask(*h, p)
> -
> -static inline xengnttab_handle *xengnttab_open(void *logger,
> - unsigned int open_flags)
> -{
> - xengnttab_handle *h = malloc(sizeof(*h));
> - if (!h) {
> - return NULL;
> - }
> - *h = xc_gnttab_open();
> - if (*h == -1) {
> - free(h);
> - h = NULL;
> - }
> - return h;
> -}
> -static inline int xengnttab_close(xengnttab_handle *h)
> -{
> - int rc = xc_gnttab_close(*h);
> - free(h);
> - return rc;
> -}
> -#define xengnttab_set_max_grants(h, n) xc_gnttab_set_max_grants(*h, n)
> -#define xengnttab_map_grant_ref(h, d, r, p) xc_gnttab_map_grant_ref(*h, d, r, p)
> -#define xengnttab_map_grant_refs(h, c, d, r, p) \
> - xc_gnttab_map_grant_refs(*h, c, d, r, p)
> -#define xengnttab_unmap(h, a, n) xc_gnttab_munmap(*h, a, n)
> -
> -static inline XenXC xen_xc_interface_open(void *logger, void *dombuild_logger,
> - unsigned int open_flags)
> -{
> - return xc_interface_open();
> -}
> -
> -/* See below for xenforeignmemory_* APIs */
> -
> -static inline int xc_domain_populate_physmap_exact
> - (XenXC xc_handle, uint32_t domid, unsigned long nr_extents,
> - unsigned int extent_order, unsigned int mem_flags, xen_pfn_t *extent_start)
> -{
> - return xc_domain_memory_populate_physmap
> - (xc_handle, domid, nr_extents, extent_order, mem_flags, extent_start);
> -}
> -
> -static inline int xc_domain_add_to_physmap(int xc_handle, uint32_t domid,
> - unsigned int space, unsigned long idx,
> - xen_pfn_t gpfn)
> -{
> - struct xen_add_to_physmap xatp = {
> - .domid = domid,
> - .space = space,
> - .idx = idx,
> - .gpfn = gpfn,
> - };
> -
> - return xc_memory_op(xc_handle, XENMEM_add_to_physmap, &xatp);
> -}
> -
> -static inline struct xs_handle *xs_open(unsigned long flags)
> -{
> - return xs_daemon_open();
> -}
> -
> -static inline void xs_close(struct xs_handle *xsh)
> -{
> - if (xsh != NULL) {
> - xs_daemon_close(xsh);
> - }
> -}
> -
> -
> -/* Xen 4.1 thru 4.6 */
> -#elif CONFIG_XEN_CTRL_INTERFACE_VERSION < 471
> +/* Xen 4.2 thru 4.6 */
> +#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 471
>
> typedef xc_interface *XenXC;
> typedef xc_interface *xenforeignmemory_handle;
> @@ -205,27 +83,11 @@ static inline XenXC xen_xc_interface_open(void *logger, void *dombuild_logger,
> }
> #endif
>
> -/* Xen before 4.2 */
> -#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 420
> -static inline int xen_xc_hvm_inject_msi(XenXC xen_xc, domid_t dom,
> - uint64_t addr, uint32_t data)
> -{
> - return -ENOSYS;
> -}
> -/* The followings are only to compile op_discard related code on older
> - * Xen releases. */
> -#define BLKIF_OP_DISCARD 5
> -struct blkif_request_discard {
> - uint64_t nr_sectors;
> - uint64_t sector_number;
> -};
> -#else
> static inline int xen_xc_hvm_inject_msi(XenXC xen_xc, domid_t dom,
> uint64_t addr, uint32_t data)
> {
> return xc_hvm_inject_msi(xen_xc, dom, addr, data);
> }
> -#endif
>
> void destroy_hvm_domain(bool reboot);
>
> diff --git a/xen-hvm.c b/xen-hvm.c
> index 6861c51..8350ca2 100644
> --- a/xen-hvm.c
> +++ b/xen-hvm.c
> @@ -316,7 +316,6 @@ static hwaddr xen_phys_offset_to_gaddr(hwaddr start_addr,
> return start_addr;
> }
>
> -#if CONFIG_XEN_CTRL_INTERFACE_VERSION >= 340
> static int xen_add_to_physmap(XenIOState *state,
> hwaddr start_addr,
> ram_addr_t size,
> @@ -451,24 +450,6 @@ static int xen_remove_from_physmap(XenIOState *state,
> return 0;
> }
>
> -#else
> -static int xen_add_to_physmap(XenIOState *state,
> - hwaddr start_addr,
> - ram_addr_t size,
> - MemoryRegion *mr,
> - hwaddr offset_within_region)
> -{
> - return -ENOSYS;
> -}
> -
> -static int xen_remove_from_physmap(XenIOState *state,
> - hwaddr start_addr,
> - ram_addr_t size)
> -{
> - return -ENOSYS;
> -}
> -#endif
> -
> static void xen_set_memory(struct MemoryListener *listener,
> MemoryRegionSection *section,
> bool add)
> --
> 2.1.4
>
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PATCH v2 1/5] xen: drop support for Xen 4.1 and older.
2016-02-10 11:07 ` [Qemu-devel] " Ian Campbell
2016-02-10 11:57 ` Stefano Stabellini
@ 2016-02-10 11:57 ` Stefano Stabellini
1 sibling, 0 replies; 17+ messages in thread
From: Stefano Stabellini @ 2016-02-10 11:57 UTC (permalink / raw)
To: Ian Campbell; +Cc: xen-devel, qemu-devel, stefano.stabellini
On Wed, 10 Feb 2016, Ian Campbell wrote:
> Xen 4.2 become unsupported upstream in 09/2015 (see
> http://wiki.xen.org/wiki/Xen_Release_Features). However as far as the
> interfaces provided by the toolstack libraries go 4.2 and 4.3 are
> indistinguishable.
>
> Therefore drop support for Xen 4.1 and earlier which removes a whole
> pile of compatibility code which makes future work (to use stable
> library interfaces provided by upstream) more difficult. In particular
> all supported versions now use a pointer as a libxc handle (4.1 and
> earlier used an integer, resulting in various shim layers).
>
> Also Xen 4.2 was the first version of Xen to formally support upstream
> QEMU (as a preview) so that makes sense as a cut-off now.
>
> This change drops all the configure-y and resulting ifdefs in a mostly
> mechanical way. A follow up will refactor wrappers which are now
> unused.
>
> Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> v2: Don't claim to support 4.1 for another 89 years in the commit
> message.
> Tweak message in configure.
> ---
> configure | 101 +-----------------------------
> hw/i386/xen/xen_apic.c | 4 --
> include/hw/xen/xen.h | 4 --
> include/hw/xen/xen_common.h | 146 ++------------------------------------------
> xen-hvm.c | 19 ------
> 5 files changed, 7 insertions(+), 267 deletions(-)
>
> diff --git a/configure b/configure
> index d4411a1..16c7956 100755
> --- a/configure
> +++ b/configure
> @@ -2111,100 +2111,10 @@ EOF
> xen_ctrl_version=420
> xen=yes
>
> - elif
> - cat > $TMPC <<EOF &&
> -#include <xenctrl.h>
> -#include <xs.h>
> -#include <stdint.h>
> -#include <xen/hvm/hvm_info_table.h>
> -#if !defined(HVM_MAX_VCPUS)
> -# error HVM_MAX_VCPUS not defined
> -#endif
> -int main(void) {
> - xs_daemon_open();
> - xc_interface_open(0, 0, 0);
> - xc_hvm_set_mem_type(0, 0, HVMMEM_ram_ro, 0, 0);
> - xc_gnttab_open(NULL, 0);
> - xc_domain_add_to_physmap(0, 0, XENMAPSPACE_gmfn, 0, 0);
> - return 0;
> -}
> -EOF
> - compile_prog "" "$xen_libs"
> - then
> - xen_ctrl_version=410
> - xen=yes
> -
> - # Xen 4.0.0
> - elif
> - cat > $TMPC <<EOF &&
> -#include <xenctrl.h>
> -#include <xs.h>
> -#include <stdint.h>
> -#include <xen/hvm/hvm_info_table.h>
> -#if !defined(HVM_MAX_VCPUS)
> -# error HVM_MAX_VCPUS not defined
> -#endif
> -int main(void) {
> - struct xen_add_to_physmap xatp = {
> - .domid = 0, .space = XENMAPSPACE_gmfn, .idx = 0, .gpfn = 0,
> - };
> - xs_daemon_open();
> - xc_interface_open();
> - xc_gnttab_open();
> - xc_hvm_set_mem_type(0, 0, HVMMEM_ram_ro, 0, 0);
> - xc_memory_op(0, XENMEM_add_to_physmap, &xatp);
> - return 0;
> -}
> -EOF
> - compile_prog "" "$xen_libs"
> - then
> - xen_ctrl_version=400
> - xen=yes
> -
> - # Xen 3.4.0
> - elif
> - cat > $TMPC <<EOF &&
> -#include <xenctrl.h>
> -#include <xs.h>
> -int main(void) {
> - struct xen_add_to_physmap xatp = {
> - .domid = 0, .space = XENMAPSPACE_gmfn, .idx = 0, .gpfn = 0,
> - };
> - xs_daemon_open();
> - xc_interface_open();
> - xc_gnttab_open();
> - xc_hvm_set_mem_type(0, 0, HVMMEM_ram_ro, 0, 0);
> - xc_memory_op(0, XENMEM_add_to_physmap, &xatp);
> - return 0;
> -}
> -EOF
> - compile_prog "" "$xen_libs"
> - then
> - xen_ctrl_version=340
> - xen=yes
> -
> - # Xen 3.3.0
> - elif
> - cat > $TMPC <<EOF &&
> -#include <xenctrl.h>
> -#include <xs.h>
> -int main(void) {
> - xs_daemon_open();
> - xc_interface_open();
> - xc_gnttab_open();
> - xc_hvm_set_mem_type(0, 0, HVMMEM_ram_ro, 0, 0);
> - return 0;
> -}
> -EOF
> - compile_prog "" "$xen_libs"
> - then
> - xen_ctrl_version=330
> - xen=yes
> -
> - # Xen version unsupported
> else
> if test "$xen" = "yes" ; then
> - feature_not_found "xen (unsupported version)" "Install supported xen (e.g. 4.0, 3.4, 3.3)"
> + feature_not_found "xen (unsupported version)" \
> + "Install a supported xen (xen 4.2 or newer)"
> fi
> xen=no
> fi
> @@ -2218,15 +2128,10 @@ EOF
> fi
>
> if test "$xen_pci_passthrough" != "no"; then
> - if test "$xen" = "yes" && test "$linux" = "yes" &&
> - test "$xen_ctrl_version" -ge 340; then
> + if test "$xen" = "yes" && test "$linux" = "yes"; then
> xen_pci_passthrough=yes
> else
> if test "$xen_pci_passthrough" = "yes"; then
> - if test "$xen_ctrl_version" -lt 340; then
> - error_exit "User requested feature Xen PCI Passthrough" \
> - "This feature does not work with Xen 3.3"
> - fi
> error_exit "User requested feature Xen PCI Passthrough" \
> " but this feature requires /sys from Linux"
> fi
> diff --git a/hw/i386/xen/xen_apic.c b/hw/i386/xen/xen_apic.c
> index 5128146..2b8d709 100644
> --- a/hw/i386/xen/xen_apic.c
> +++ b/hw/i386/xen/xen_apic.c
> @@ -44,11 +44,7 @@ static void xen_apic_realize(DeviceState *dev, Error **errp)
> s->vapic_control = 0;
> memory_region_init_io(&s->io_memory, OBJECT(s), &xen_apic_io_ops, s,
> "xen-apic-msi", APIC_SPACE_SIZE);
> -
> -#if defined(CONFIG_XEN_CTRL_INTERFACE_VERSION) \
> - && CONFIG_XEN_CTRL_INTERFACE_VERSION >= 420
> msi_supported = true;
> -#endif
> }
>
> static void xen_apic_set_base(APICCommonState *s, uint64_t val)
> diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h
> index c577354..df33481 100644
> --- a/include/hw/xen/xen.h
> +++ b/include/hw/xen/xen.h
> @@ -48,8 +48,4 @@ void xen_modified_memory(ram_addr_t start, ram_addr_t length);
>
> void xen_register_framebuffer(struct MemoryRegion *mr);
>
> -#if defined(CONFIG_XEN) && CONFIG_XEN_CTRL_INTERFACE_VERSION < 400
> -# define HVM_MAX_VCPUS 32
> -#endif
> -
> #endif /* QEMU_HW_XEN_H */
> diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h
> index 0d83891..3a5b537 100644
> --- a/include/hw/xen/xen_common.h
> +++ b/include/hw/xen/xen_common.h
> @@ -16,11 +16,7 @@
> #undef XC_WANT_COMPAT_MAP_FOREIGN_API
>
> #include <xenctrl.h>
> -#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 420
> -# include <xs.h>
> -#else
> -# include <xenstore.h>
> -#endif
> +#include <xenstore.h>
> #include <xen/io/xenbus.h>
>
> #include "hw/hw.h"
> @@ -30,129 +26,11 @@
> #include "trace.h"
>
> /*
> - * We don't support Xen prior to 3.3.0.
> + * We don't support Xen prior to 4.2.0.
> */
>
> -/* Xen before 4.0 */
> -#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 400
> -static inline void *xc_map_foreign_bulk(int xc_handle, uint32_t dom, int prot,
> - xen_pfn_t *arr, int *err,
> - unsigned int num)
> -{
> - return xc_map_foreign_batch(xc_handle, dom, prot, arr, num);
> -}
> -#endif
> -
> -
> -/* Xen before 4.1 */
> -#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 410
> -
> -typedef int XenXC;
> -typedef int xenevtchn_handle;
> -typedef int xengnttab_handle;
> -typedef int xenforeignmemory_handle;
> -
> -# define XC_INTERFACE_FMT "%i"
> -# define XC_HANDLER_INITIAL_VALUE -1
> -
> -static inline xenevtchn_handle *xenevtchn_open(void *logger,
> - unsigned int open_flags)
> -{
> - xenevtchn_handle *h = malloc(sizeof(*h));
> - if (!h) {
> - return NULL;
> - }
> - *h = xc_evtchn_open();
> - if (*h == -1) {
> - free(h);
> - h = NULL;
> - }
> - return h;
> -}
> -static inline int xenevtchn_close(xenevtchn_handle *h)
> -{
> - int rc = xc_evtchn_close(*h);
> - free(h);
> - return rc;
> -}
> -#define xenevtchn_fd(h) xc_evtchn_fd(*h)
> -#define xenevtchn_pending(h) xc_evtchn_pending(*h)
> -#define xenevtchn_notify(h, p) xc_evtchn_notify(*h, p)
> -#define xenevtchn_bind_interdomain(h, d, p) xc_evtchn_bind_interdomain(*h, d, p)
> -#define xenevtchn_unmask(h, p) xc_evtchn_unmask(*h, p)
> -#define xenevtchn_unbind(h, p) xc_evtchn_unmask(*h, p)
> -
> -static inline xengnttab_handle *xengnttab_open(void *logger,
> - unsigned int open_flags)
> -{
> - xengnttab_handle *h = malloc(sizeof(*h));
> - if (!h) {
> - return NULL;
> - }
> - *h = xc_gnttab_open();
> - if (*h == -1) {
> - free(h);
> - h = NULL;
> - }
> - return h;
> -}
> -static inline int xengnttab_close(xengnttab_handle *h)
> -{
> - int rc = xc_gnttab_close(*h);
> - free(h);
> - return rc;
> -}
> -#define xengnttab_set_max_grants(h, n) xc_gnttab_set_max_grants(*h, n)
> -#define xengnttab_map_grant_ref(h, d, r, p) xc_gnttab_map_grant_ref(*h, d, r, p)
> -#define xengnttab_map_grant_refs(h, c, d, r, p) \
> - xc_gnttab_map_grant_refs(*h, c, d, r, p)
> -#define xengnttab_unmap(h, a, n) xc_gnttab_munmap(*h, a, n)
> -
> -static inline XenXC xen_xc_interface_open(void *logger, void *dombuild_logger,
> - unsigned int open_flags)
> -{
> - return xc_interface_open();
> -}
> -
> -/* See below for xenforeignmemory_* APIs */
> -
> -static inline int xc_domain_populate_physmap_exact
> - (XenXC xc_handle, uint32_t domid, unsigned long nr_extents,
> - unsigned int extent_order, unsigned int mem_flags, xen_pfn_t *extent_start)
> -{
> - return xc_domain_memory_populate_physmap
> - (xc_handle, domid, nr_extents, extent_order, mem_flags, extent_start);
> -}
> -
> -static inline int xc_domain_add_to_physmap(int xc_handle, uint32_t domid,
> - unsigned int space, unsigned long idx,
> - xen_pfn_t gpfn)
> -{
> - struct xen_add_to_physmap xatp = {
> - .domid = domid,
> - .space = space,
> - .idx = idx,
> - .gpfn = gpfn,
> - };
> -
> - return xc_memory_op(xc_handle, XENMEM_add_to_physmap, &xatp);
> -}
> -
> -static inline struct xs_handle *xs_open(unsigned long flags)
> -{
> - return xs_daemon_open();
> -}
> -
> -static inline void xs_close(struct xs_handle *xsh)
> -{
> - if (xsh != NULL) {
> - xs_daemon_close(xsh);
> - }
> -}
> -
> -
> -/* Xen 4.1 thru 4.6 */
> -#elif CONFIG_XEN_CTRL_INTERFACE_VERSION < 471
> +/* Xen 4.2 thru 4.6 */
> +#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 471
>
> typedef xc_interface *XenXC;
> typedef xc_interface *xenforeignmemory_handle;
> @@ -205,27 +83,11 @@ static inline XenXC xen_xc_interface_open(void *logger, void *dombuild_logger,
> }
> #endif
>
> -/* Xen before 4.2 */
> -#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 420
> -static inline int xen_xc_hvm_inject_msi(XenXC xen_xc, domid_t dom,
> - uint64_t addr, uint32_t data)
> -{
> - return -ENOSYS;
> -}
> -/* The followings are only to compile op_discard related code on older
> - * Xen releases. */
> -#define BLKIF_OP_DISCARD 5
> -struct blkif_request_discard {
> - uint64_t nr_sectors;
> - uint64_t sector_number;
> -};
> -#else
> static inline int xen_xc_hvm_inject_msi(XenXC xen_xc, domid_t dom,
> uint64_t addr, uint32_t data)
> {
> return xc_hvm_inject_msi(xen_xc, dom, addr, data);
> }
> -#endif
>
> void destroy_hvm_domain(bool reboot);
>
> diff --git a/xen-hvm.c b/xen-hvm.c
> index 6861c51..8350ca2 100644
> --- a/xen-hvm.c
> +++ b/xen-hvm.c
> @@ -316,7 +316,6 @@ static hwaddr xen_phys_offset_to_gaddr(hwaddr start_addr,
> return start_addr;
> }
>
> -#if CONFIG_XEN_CTRL_INTERFACE_VERSION >= 340
> static int xen_add_to_physmap(XenIOState *state,
> hwaddr start_addr,
> ram_addr_t size,
> @@ -451,24 +450,6 @@ static int xen_remove_from_physmap(XenIOState *state,
> return 0;
> }
>
> -#else
> -static int xen_add_to_physmap(XenIOState *state,
> - hwaddr start_addr,
> - ram_addr_t size,
> - MemoryRegion *mr,
> - hwaddr offset_within_region)
> -{
> - return -ENOSYS;
> -}
> -
> -static int xen_remove_from_physmap(XenIOState *state,
> - hwaddr start_addr,
> - ram_addr_t size)
> -{
> - return -ENOSYS;
> -}
> -#endif
> -
> static void xen_set_memory(struct MemoryListener *listener,
> MemoryRegionSection *section,
> bool add)
> --
> 2.1.4
>
^ permalink raw reply [flat|nested] 17+ messages in thread
* [Qemu-devel] [PATCH v2 2/5] xen: drop xen_xc_hvm_inject_msi wrapper
2016-02-10 11:06 [Qemu-devel] [PATCH v2 0/5] Drop support for Xen 4.1 and older from qemu-xen Ian Campbell
@ 2016-02-10 11:07 ` Ian Campbell
2016-02-10 11:07 ` [Qemu-devel] " Ian Campbell
` (8 subsequent siblings)
9 siblings, 0 replies; 17+ messages in thread
From: Ian Campbell @ 2016-02-10 11:07 UTC (permalink / raw)
To: stefano.stabellini, qemu-devel; +Cc: Ian Campbell, xen-devel
The xc version is now always present.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---
include/hw/xen/xen_common.h | 6 ------
xen-hvm.c | 2 +-
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h
index 3a5b537..ec3ca56 100644
--- a/include/hw/xen/xen_common.h
+++ b/include/hw/xen/xen_common.h
@@ -83,12 +83,6 @@ static inline XenXC xen_xc_interface_open(void *logger, void *dombuild_logger,
}
#endif
-static inline int xen_xc_hvm_inject_msi(XenXC xen_xc, domid_t dom,
- uint64_t addr, uint32_t data)
-{
- return xc_hvm_inject_msi(xen_xc, dom, addr, data);
-}
-
void destroy_hvm_domain(bool reboot);
/* shutdown/destroy current domain because of an error */
diff --git a/xen-hvm.c b/xen-hvm.c
index 8350ca2..918cabc 100644
--- a/xen-hvm.c
+++ b/xen-hvm.c
@@ -169,7 +169,7 @@ int xen_is_pirq_msi(uint32_t msi_data)
void xen_hvm_inject_msi(uint64_t addr, uint32_t data)
{
- xen_xc_hvm_inject_msi(xen_xc, xen_domid, addr, data);
+ xc_hvm_inject_msi(xen_xc, xen_domid, addr, data);
}
static void xen_suspend_notifier(Notifier *notifier, void *data)
--
2.1.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH v2 2/5] xen: drop xen_xc_hvm_inject_msi wrapper
@ 2016-02-10 11:07 ` Ian Campbell
0 siblings, 0 replies; 17+ messages in thread
From: Ian Campbell @ 2016-02-10 11:07 UTC (permalink / raw)
To: stefano.stabellini, qemu-devel; +Cc: Ian Campbell, xen-devel
The xc version is now always present.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---
include/hw/xen/xen_common.h | 6 ------
xen-hvm.c | 2 +-
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h
index 3a5b537..ec3ca56 100644
--- a/include/hw/xen/xen_common.h
+++ b/include/hw/xen/xen_common.h
@@ -83,12 +83,6 @@ static inline XenXC xen_xc_interface_open(void *logger, void *dombuild_logger,
}
#endif
-static inline int xen_xc_hvm_inject_msi(XenXC xen_xc, domid_t dom,
- uint64_t addr, uint32_t data)
-{
- return xc_hvm_inject_msi(xen_xc, dom, addr, data);
-}
-
void destroy_hvm_domain(bool reboot);
/* shutdown/destroy current domain because of an error */
diff --git a/xen-hvm.c b/xen-hvm.c
index 8350ca2..918cabc 100644
--- a/xen-hvm.c
+++ b/xen-hvm.c
@@ -169,7 +169,7 @@ int xen_is_pirq_msi(uint32_t msi_data)
void xen_hvm_inject_msi(uint64_t addr, uint32_t data)
{
- xen_xc_hvm_inject_msi(xen_xc, xen_domid, addr, data);
+ xc_hvm_inject_msi(xen_xc, xen_domid, addr, data);
}
static void xen_suspend_notifier(Notifier *notifier, void *data)
--
2.1.4
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [Qemu-devel] [PATCH v2 3/5] xen: drop XenXC and associated interface wrappers
2016-02-10 11:06 [Qemu-devel] [PATCH v2 0/5] Drop support for Xen 4.1 and older from qemu-xen Ian Campbell
@ 2016-02-10 11:07 ` Ian Campbell
2016-02-10 11:07 ` [Qemu-devel] " Ian Campbell
` (8 subsequent siblings)
9 siblings, 0 replies; 17+ messages in thread
From: Ian Campbell @ 2016-02-10 11:07 UTC (permalink / raw)
To: stefano.stabellini, qemu-devel; +Cc: Ian Campbell, xen-devel
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>
---
v2: Mention xenforeignmemory changes in commit message.
---
hw/xen/xen_backend.c | 4 +--
include/hw/xen/xen_backend.h | 2 +-
include/hw/xen/xen_common.h | 82 +++++++++++++++++---------------------------
xen-common.c | 4 +--
xen-hvm.c | 16 ++++-----
5 files changed, 44 insertions(+), 64 deletions(-)
diff --git a/hw/xen/xen_backend.c b/hw/xen/xen_backend.c
index ef7843f..60575ad 100644
--- a/hw/xen/xen_backend.c
+++ b/hw/xen/xen_backend.c
@@ -36,7 +36,7 @@
/* ------------------------------------------------------------- */
/* public */
-XenXC xen_xc = XC_HANDLER_INITIAL_VALUE;
+xc_interface *xen_xc = NULL;
xenforeignmemory_handle *xen_fmem = NULL;
struct xs_handle *xenstore = NULL;
const char *xen_protocol;
@@ -710,7 +710,7 @@ int xen_be_init(void)
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 */
goto err;
}
diff --git a/include/hw/xen/xen_backend.h b/include/hw/xen/xen_backend.h
index e0d52ee..c839eeb 100644
--- a/include/hw/xen/xen_backend.h
+++ b/include/hw/xen/xen_backend.h
@@ -56,7 +56,7 @@ struct XenDevice {
/* ------------------------------------------------------------- */
/* variables */
-extern XenXC xen_xc;
+extern xc_interface *xen_xc;
extern xenforeignmemory_handle *xen_fmem;
extern struct xs_handle *xenstore;
extern const char *xen_protocol;
diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h
index ec3ca56..254ef14 100644
--- a/include/hw/xen/xen_common.h
+++ b/include/hw/xen/xen_common.h
@@ -32,14 +32,10 @@
/* Xen 4.2 thru 4.6 */
#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_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_close(h) xc_evtchn_close(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) \
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 */
#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 <xengnttab.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
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);
#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)
{
int rc;
@@ -101,7 +81,7 @@ static inline int xen_get_vmport_regs_pfn(XenXC xc, domid_t dom,
return rc;
}
#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)
{
return -ENOSYS;
@@ -128,54 +108,54 @@ static inline int xen_get_vmport_regs_pfn(XenXC xc, domid_t dom,
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,
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,
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,
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,
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,
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,
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)
{
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)
{
}
-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,
xen_pfn_t *ioreq_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;
}
-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,
bool enable)
{
@@ -222,7 +202,7 @@ static inline int xen_set_ioreq_server_state(XenXC xc, domid_t dom,
/* Xen 4.5 */
#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,
MemoryRegionSection *section)
{
@@ -235,7 +215,7 @@ static inline void xen_map_memory_section(XenXC xc, domid_t dom,
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,
MemoryRegionSection *section)
{
@@ -248,7 +228,7 @@ static inline void xen_unmap_memory_section(XenXC xc, domid_t dom,
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,
MemoryRegionSection *section)
{
@@ -261,7 +241,7 @@ static inline void xen_map_io_section(XenXC xc, domid_t dom,
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,
MemoryRegionSection *section)
{
@@ -274,7 +254,7 @@ static inline void xen_unmap_io_section(XenXC xc, domid_t dom,
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,
PCIDevice *pci_dev)
{
@@ -286,7 +266,7 @@ static inline void xen_map_pcidev(XenXC xc, domid_t dom,
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,
PCIDevice *pci_dev)
{
@@ -298,7 +278,7 @@ static inline void xen_unmap_pcidev(XenXC xc, domid_t dom,
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)
{
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;
}
-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)
{
trace_xen_ioreq_server_destroy(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,
xen_pfn_t *ioreq_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);
}
-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,
bool enable)
{
@@ -340,7 +320,7 @@ static inline int xen_set_ioreq_server_state(XenXC xc, domid_t dom,
#endif
#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 long idx,
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);
}
#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 long idx,
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
#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,
uint32_t *pdomid)
{
return xc_domain_create(xc, ssidref, handle, flags, pdomid);
}
#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,
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
-#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,
const xen_pfn_t arr[/*pages*/],
int err[/*pages*/])
{
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
- 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)
diff --git a/xen-common.c b/xen-common.c
index 4860b2e..e641ad1 100644
--- a/xen-common.c
+++ b/xen-common.c
@@ -114,8 +114,8 @@ static void xen_change_state_handler(void *opaque, int running,
static int xen_init(MachineState *ms)
{
- xen_xc = xen_xc_interface_open(0, 0, 0);
- if (xen_xc == XC_HANDLER_INITIAL_VALUE) {
+ xen_xc = xc_interface_open(0, 0, 0);
+ if (xen_xc == NULL) {
xen_be_printf(NULL, 0, "can't open xen interface\n");
return -1;
}
diff --git a/xen-hvm.c b/xen-hvm.c
index 918cabc..fbe0e3a 100644
--- a/xen-hvm.c
+++ b/xen-hvm.c
@@ -1224,7 +1224,7 @@ void xen_hvm_init(PCMachineState *pcms, MemoryRegion **ram_memory)
&ioreq_pfn, &bufioreq_pfn,
&bufioreq_evtchn);
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);
goto err;
}
@@ -1237,7 +1237,7 @@ void xen_hvm_init(PCMachineState *pcms, MemoryRegion **ram_memory)
PROT_READ|PROT_WRITE,
1, &ioreq_pfn, 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);
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,
1, &ioreq_pfn, NULL);
if (state->shared_vmport_page == NULL) {
- error_report("map shared vmport IO page returned error %d handle="
- XC_INTERFACE_FMT, errno, xen_xc);
+ error_report("map shared vmport IO page returned error %d handle=%p",
+ errno, xen_xc);
goto err;
}
} 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);
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);
goto err;
}
@@ -1333,11 +1333,11 @@ err:
void destroy_hvm_domain(bool reboot)
{
- XenXC xc_handle;
+ xc_interface *xc_handle;
int sts;
- xc_handle = xen_xc_interface_open(0, 0, 0);
- if (xc_handle == XC_HANDLER_INITIAL_VALUE) {
+ xc_handle = xc_interface_open(0, 0, 0);
+ if (xc_handle == NULL) {
fprintf(stderr, "Cannot acquire xenctrl handle\n");
} else {
sts = xc_domain_shutdown(xc_handle, xen_domid,
--
2.1.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH v2 3/5] xen: drop XenXC and associated interface wrappers
@ 2016-02-10 11:07 ` Ian Campbell
0 siblings, 0 replies; 17+ messages in thread
From: Ian Campbell @ 2016-02-10 11:07 UTC (permalink / raw)
To: stefano.stabellini, qemu-devel; +Cc: Ian Campbell, xen-devel
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>
---
v2: Mention xenforeignmemory changes in commit message.
---
hw/xen/xen_backend.c | 4 +--
include/hw/xen/xen_backend.h | 2 +-
include/hw/xen/xen_common.h | 82 +++++++++++++++++---------------------------
xen-common.c | 4 +--
xen-hvm.c | 16 ++++-----
5 files changed, 44 insertions(+), 64 deletions(-)
diff --git a/hw/xen/xen_backend.c b/hw/xen/xen_backend.c
index ef7843f..60575ad 100644
--- a/hw/xen/xen_backend.c
+++ b/hw/xen/xen_backend.c
@@ -36,7 +36,7 @@
/* ------------------------------------------------------------- */
/* public */
-XenXC xen_xc = XC_HANDLER_INITIAL_VALUE;
+xc_interface *xen_xc = NULL;
xenforeignmemory_handle *xen_fmem = NULL;
struct xs_handle *xenstore = NULL;
const char *xen_protocol;
@@ -710,7 +710,7 @@ int xen_be_init(void)
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 */
goto err;
}
diff --git a/include/hw/xen/xen_backend.h b/include/hw/xen/xen_backend.h
index e0d52ee..c839eeb 100644
--- a/include/hw/xen/xen_backend.h
+++ b/include/hw/xen/xen_backend.h
@@ -56,7 +56,7 @@ struct XenDevice {
/* ------------------------------------------------------------- */
/* variables */
-extern XenXC xen_xc;
+extern xc_interface *xen_xc;
extern xenforeignmemory_handle *xen_fmem;
extern struct xs_handle *xenstore;
extern const char *xen_protocol;
diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h
index ec3ca56..254ef14 100644
--- a/include/hw/xen/xen_common.h
+++ b/include/hw/xen/xen_common.h
@@ -32,14 +32,10 @@
/* Xen 4.2 thru 4.6 */
#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_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_close(h) xc_evtchn_close(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) \
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 */
#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 <xengnttab.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
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);
#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)
{
int rc;
@@ -101,7 +81,7 @@ static inline int xen_get_vmport_regs_pfn(XenXC xc, domid_t dom,
return rc;
}
#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)
{
return -ENOSYS;
@@ -128,54 +108,54 @@ static inline int xen_get_vmport_regs_pfn(XenXC xc, domid_t dom,
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,
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,
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,
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,
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,
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,
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)
{
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)
{
}
-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,
xen_pfn_t *ioreq_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;
}
-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,
bool enable)
{
@@ -222,7 +202,7 @@ static inline int xen_set_ioreq_server_state(XenXC xc, domid_t dom,
/* Xen 4.5 */
#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,
MemoryRegionSection *section)
{
@@ -235,7 +215,7 @@ static inline void xen_map_memory_section(XenXC xc, domid_t dom,
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,
MemoryRegionSection *section)
{
@@ -248,7 +228,7 @@ static inline void xen_unmap_memory_section(XenXC xc, domid_t dom,
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,
MemoryRegionSection *section)
{
@@ -261,7 +241,7 @@ static inline void xen_map_io_section(XenXC xc, domid_t dom,
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,
MemoryRegionSection *section)
{
@@ -274,7 +254,7 @@ static inline void xen_unmap_io_section(XenXC xc, domid_t dom,
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,
PCIDevice *pci_dev)
{
@@ -286,7 +266,7 @@ static inline void xen_map_pcidev(XenXC xc, domid_t dom,
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,
PCIDevice *pci_dev)
{
@@ -298,7 +278,7 @@ static inline void xen_unmap_pcidev(XenXC xc, domid_t dom,
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)
{
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;
}
-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)
{
trace_xen_ioreq_server_destroy(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,
xen_pfn_t *ioreq_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);
}
-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,
bool enable)
{
@@ -340,7 +320,7 @@ static inline int xen_set_ioreq_server_state(XenXC xc, domid_t dom,
#endif
#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 long idx,
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);
}
#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 long idx,
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
#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,
uint32_t *pdomid)
{
return xc_domain_create(xc, ssidref, handle, flags, pdomid);
}
#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,
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
-#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,
const xen_pfn_t arr[/*pages*/],
int err[/*pages*/])
{
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
- 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)
diff --git a/xen-common.c b/xen-common.c
index 4860b2e..e641ad1 100644
--- a/xen-common.c
+++ b/xen-common.c
@@ -114,8 +114,8 @@ static void xen_change_state_handler(void *opaque, int running,
static int xen_init(MachineState *ms)
{
- xen_xc = xen_xc_interface_open(0, 0, 0);
- if (xen_xc == XC_HANDLER_INITIAL_VALUE) {
+ xen_xc = xc_interface_open(0, 0, 0);
+ if (xen_xc == NULL) {
xen_be_printf(NULL, 0, "can't open xen interface\n");
return -1;
}
diff --git a/xen-hvm.c b/xen-hvm.c
index 918cabc..fbe0e3a 100644
--- a/xen-hvm.c
+++ b/xen-hvm.c
@@ -1224,7 +1224,7 @@ void xen_hvm_init(PCMachineState *pcms, MemoryRegion **ram_memory)
&ioreq_pfn, &bufioreq_pfn,
&bufioreq_evtchn);
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);
goto err;
}
@@ -1237,7 +1237,7 @@ void xen_hvm_init(PCMachineState *pcms, MemoryRegion **ram_memory)
PROT_READ|PROT_WRITE,
1, &ioreq_pfn, 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);
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,
1, &ioreq_pfn, NULL);
if (state->shared_vmport_page == NULL) {
- error_report("map shared vmport IO page returned error %d handle="
- XC_INTERFACE_FMT, errno, xen_xc);
+ error_report("map shared vmport IO page returned error %d handle=%p",
+ errno, xen_xc);
goto err;
}
} 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);
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);
goto err;
}
@@ -1333,11 +1333,11 @@ err:
void destroy_hvm_domain(bool reboot)
{
- XenXC xc_handle;
+ xc_interface *xc_handle;
int sts;
- xc_handle = xen_xc_interface_open(0, 0, 0);
- if (xc_handle == XC_HANDLER_INITIAL_VALUE) {
+ xc_handle = xc_interface_open(0, 0, 0);
+ if (xc_handle == NULL) {
fprintf(stderr, "Cannot acquire xenctrl handle\n");
} else {
sts = xc_domain_shutdown(xc_handle, xen_domid,
--
2.1.4
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [Qemu-devel] [PATCH v2 4/5] xen: move xenforeignmemory compat layer into common place
2016-02-10 11:06 [Qemu-devel] [PATCH v2 0/5] Drop support for Xen 4.1 and older from qemu-xen Ian Campbell
` (3 preceding siblings ...)
2016-02-10 11:07 ` Ian Campbell
@ 2016-02-10 11:07 ` Ian Campbell
2016-02-10 11:07 ` Ian Campbell
` (4 subsequent siblings)
9 siblings, 0 replies; 17+ messages in thread
From: Ian Campbell @ 2016-02-10 11:07 UTC (permalink / raw)
To: stefano.stabellini, qemu-devel; +Cc: Ian Campbell, xen-devel
Now that we no longer support Xen 4.2 and earlier only the <470 case
needs this so it can live with all the others.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---
include/hw/xen/xen_common.h | 34 ++++++++++++++--------------------
1 file changed, 14 insertions(+), 20 deletions(-)
diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h
index 254ef14..7a3cce0 100644
--- a/include/hw/xen/xen_common.h
+++ b/include/hw/xen/xen_common.h
@@ -53,7 +53,20 @@ typedef xc_gnttab xengnttab_handle;
#define xengnttab_map_grant_refs(h, c, d, r, p) \
xc_gnttab_map_grant_refs(h, c, d, r, p)
-/* See below for xenforeignmemory_* APIs */
+#define xenforeignmemory_open(l, f) xen_xc
+
+static inline void *xenforeignmemory_map(xc_interface *h, uint32_t dom,
+ int prot, size_t pages,
+ const xen_pfn_t arr[/*pages*/],
+ int err[/*pages*/])
+{
+ if (err)
+ return xc_map_foreign_bulk(h, dom, prot, arr, err, pages);
+ else
+ return xc_map_foreign_pages(h, dom, prot, arr, pages);
+}
+
+#define xenforeignmemory_unmap(h, p, s) munmap(p, s * XC_PAGE_SIZE)
#else /* CONFIG_XEN_CTRL_INTERFACE_VERSION >= 471 */
@@ -359,23 +372,4 @@ static inline int xen_domain_create(xc_interface *xc, uint32_t ssidref,
#endif
#endif
-#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 471
-
-#define xenforeignmemory_open(l, f) xen_xc
-
-static inline void *xenforeignmemory_map(xc_interface *h, uint32_t dom,
- int prot, size_t pages,
- const xen_pfn_t arr[/*pages*/],
- int err[/*pages*/])
-{
- if (err)
- return xc_map_foreign_bulk(h, dom, prot, arr, err, pages);
- else
- return xc_map_foreign_pages(h, dom, prot, arr, pages);
-}
-
-#define xenforeignmemory_unmap(h, p, s) munmap(p, s * XC_PAGE_SIZE)
-
-#endif
-
#endif /* QEMU_HW_XEN_COMMON_H */
--
2.1.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH v2 4/5] xen: move xenforeignmemory compat layer into common place
2016-02-10 11:06 [Qemu-devel] [PATCH v2 0/5] Drop support for Xen 4.1 and older from qemu-xen Ian Campbell
` (4 preceding siblings ...)
2016-02-10 11:07 ` [Qemu-devel] [PATCH v2 4/5] xen: move xenforeignmemory compat layer into common place Ian Campbell
@ 2016-02-10 11:07 ` Ian Campbell
2016-02-10 11:07 ` [Qemu-devel] [PATCH v2 5/5] xen: Drop __XEN_LATEST_INTERFACE_VERSION__ checks from prior to Xen 4.2 Ian Campbell
` (3 subsequent siblings)
9 siblings, 0 replies; 17+ messages in thread
From: Ian Campbell @ 2016-02-10 11:07 UTC (permalink / raw)
To: stefano.stabellini, qemu-devel; +Cc: Ian Campbell, xen-devel
Now that we no longer support Xen 4.2 and earlier only the <470 case
needs this so it can live with all the others.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---
include/hw/xen/xen_common.h | 34 ++++++++++++++--------------------
1 file changed, 14 insertions(+), 20 deletions(-)
diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h
index 254ef14..7a3cce0 100644
--- a/include/hw/xen/xen_common.h
+++ b/include/hw/xen/xen_common.h
@@ -53,7 +53,20 @@ typedef xc_gnttab xengnttab_handle;
#define xengnttab_map_grant_refs(h, c, d, r, p) \
xc_gnttab_map_grant_refs(h, c, d, r, p)
-/* See below for xenforeignmemory_* APIs */
+#define xenforeignmemory_open(l, f) xen_xc
+
+static inline void *xenforeignmemory_map(xc_interface *h, uint32_t dom,
+ int prot, size_t pages,
+ const xen_pfn_t arr[/*pages*/],
+ int err[/*pages*/])
+{
+ if (err)
+ return xc_map_foreign_bulk(h, dom, prot, arr, err, pages);
+ else
+ return xc_map_foreign_pages(h, dom, prot, arr, pages);
+}
+
+#define xenforeignmemory_unmap(h, p, s) munmap(p, s * XC_PAGE_SIZE)
#else /* CONFIG_XEN_CTRL_INTERFACE_VERSION >= 471 */
@@ -359,23 +372,4 @@ static inline int xen_domain_create(xc_interface *xc, uint32_t ssidref,
#endif
#endif
-#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 471
-
-#define xenforeignmemory_open(l, f) xen_xc
-
-static inline void *xenforeignmemory_map(xc_interface *h, uint32_t dom,
- int prot, size_t pages,
- const xen_pfn_t arr[/*pages*/],
- int err[/*pages*/])
-{
- if (err)
- return xc_map_foreign_bulk(h, dom, prot, arr, err, pages);
- else
- return xc_map_foreign_pages(h, dom, prot, arr, pages);
-}
-
-#define xenforeignmemory_unmap(h, p, s) munmap(p, s * XC_PAGE_SIZE)
-
-#endif
-
#endif /* QEMU_HW_XEN_COMMON_H */
--
2.1.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* [Qemu-devel] [PATCH v2 5/5] xen: Drop __XEN_LATEST_INTERFACE_VERSION__ checks from prior to Xen 4.2
2016-02-10 11:06 [Qemu-devel] [PATCH v2 0/5] Drop support for Xen 4.1 and older from qemu-xen Ian Campbell
` (5 preceding siblings ...)
2016-02-10 11:07 ` Ian Campbell
@ 2016-02-10 11:07 ` Ian Campbell
2016-02-10 11:59 ` Stefano Stabellini
2016-02-10 11:59 ` Stefano Stabellini
2016-02-10 11:07 ` Ian Campbell
` (2 subsequent siblings)
9 siblings, 2 replies; 17+ messages in thread
From: Ian Campbell @ 2016-02-10 11:07 UTC (permalink / raw)
To: stefano.stabellini, qemu-devel; +Cc: Ian Campbell, xen-devel
We assume (and check for in configure) 4.2 or later now. In reality
all of the removed checks are for far older versions.
FMT_ioreq_size is no longer needed.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
v2: Drop FMT_ioreq_size too
---
hw/display/xenfb.c | 7 -------
xen-hvm.c | 19 ++-----------------
2 files changed, 2 insertions(+), 24 deletions(-)
diff --git a/hw/display/xenfb.c b/hw/display/xenfb.c
index a533c3d..40b096a 100644
--- a/hw/display/xenfb.c
+++ b/hw/display/xenfb.c
@@ -241,9 +241,7 @@ static int xenfb_send_motion(struct XenInput *xenfb,
event.type = XENKBD_TYPE_MOTION;
event.motion.rel_x = rel_x;
event.motion.rel_y = rel_y;
-#if __XEN_LATEST_INTERFACE_VERSION__ >= 0x00030207
event.motion.rel_z = rel_z;
-#endif
return xenfb_kbd_event(xenfb, &event);
}
@@ -258,12 +256,7 @@ static int xenfb_send_position(struct XenInput *xenfb,
event.type = XENKBD_TYPE_POS;
event.pos.abs_x = abs_x;
event.pos.abs_y = abs_y;
-#if __XEN_LATEST_INTERFACE_VERSION__ == 0x00030207
- event.pos.abs_z = z;
-#endif
-#if __XEN_LATEST_INTERFACE_VERSION__ >= 0x00030208
event.pos.rel_z = z;
-#endif
return xenfb_kbd_event(xenfb, &event);
}
diff --git a/xen-hvm.c b/xen-hvm.c
index fbe0e3a..039680a 100644
--- a/xen-hvm.c
+++ b/xen-hvm.c
@@ -67,17 +67,6 @@ struct shared_vmport_iopage {
typedef struct shared_vmport_iopage shared_vmport_iopage_t;
#endif
-#if __XEN_LATEST_INTERFACE_VERSION__ < 0x0003020a
-static inline uint32_t xen_vcpu_eport(shared_iopage_t *shared_page, int i)
-{
- return shared_page->vcpu_iodata[i].vp_eport;
-}
-static inline ioreq_t *xen_vcpu_ioreq(shared_iopage_t *shared_page, int vcpu)
-{
- return &shared_page->vcpu_iodata[vcpu].vp_ioreq;
-}
-# define FMT_ioreq_size PRIx64
-#else
static inline uint32_t xen_vcpu_eport(shared_iopage_t *shared_page, int i)
{
return shared_page->vcpu_ioreq[i].vp_eport;
@@ -86,8 +75,6 @@ static inline ioreq_t *xen_vcpu_ioreq(shared_iopage_t *shared_page, int vcpu)
{
return &shared_page->vcpu_ioreq[vcpu];
}
-# define FMT_ioreq_size "u"
-#endif
#define BUFFER_IO_MAX_DELAY 100
@@ -688,7 +675,7 @@ static ioreq_t *cpu_get_ioreq_from_shared_memory(XenIOState *state, int vcpu)
if (req->state != STATE_IOREQ_READY) {
DPRINTF("I/O request not ready: "
"%x, ptr: %x, port: %"PRIx64", "
- "data: %"PRIx64", count: %" FMT_ioreq_size ", size: %" FMT_ioreq_size "\n",
+ "data: %"PRIx64", count: %u, size: %u\n",
req->state, req->data_is_ptr, req->addr,
req->data, req->count, req->size);
return NULL;
@@ -1050,9 +1037,7 @@ static void cpu_handle_ioreq(void *opaque)
if (req->state != STATE_IOREQ_INPROCESS) {
fprintf(stderr, "Badness in I/O request ... not in service?!: "
"%x, ptr: %x, port: %"PRIx64", "
- "data: %"PRIx64", count: %" FMT_ioreq_size
- ", size: %" FMT_ioreq_size
- ", type: %"FMT_ioreq_size"\n",
+ "data: %"PRIx64", count: %u, size: %u, type: %u\n",
req->state, req->data_is_ptr, req->addr,
req->data, req->count, req->size, req->type);
destroy_hvm_domain(false);
--
2.1.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* Re: [Qemu-devel] [PATCH v2 5/5] xen: Drop __XEN_LATEST_INTERFACE_VERSION__ checks from prior to Xen 4.2
2016-02-10 11:07 ` [Qemu-devel] [PATCH v2 5/5] xen: Drop __XEN_LATEST_INTERFACE_VERSION__ checks from prior to Xen 4.2 Ian Campbell
@ 2016-02-10 11:59 ` Stefano Stabellini
2016-02-10 11:59 ` Stefano Stabellini
1 sibling, 0 replies; 17+ messages in thread
From: Stefano Stabellini @ 2016-02-10 11:59 UTC (permalink / raw)
To: Ian Campbell; +Cc: xen-devel, qemu-devel, stefano.stabellini
On Wed, 10 Feb 2016, Ian Campbell wrote:
> We assume (and check for in configure) 4.2 or later now. In reality
> all of the removed checks are for far older versions.
>
> FMT_ioreq_size is no longer needed.
>
> Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> v2: Drop FMT_ioreq_size too
> ---
> hw/display/xenfb.c | 7 -------
> xen-hvm.c | 19 ++-----------------
> 2 files changed, 2 insertions(+), 24 deletions(-)
>
> diff --git a/hw/display/xenfb.c b/hw/display/xenfb.c
> index a533c3d..40b096a 100644
> --- a/hw/display/xenfb.c
> +++ b/hw/display/xenfb.c
> @@ -241,9 +241,7 @@ static int xenfb_send_motion(struct XenInput *xenfb,
> event.type = XENKBD_TYPE_MOTION;
> event.motion.rel_x = rel_x;
> event.motion.rel_y = rel_y;
> -#if __XEN_LATEST_INTERFACE_VERSION__ >= 0x00030207
> event.motion.rel_z = rel_z;
> -#endif
>
> return xenfb_kbd_event(xenfb, &event);
> }
> @@ -258,12 +256,7 @@ static int xenfb_send_position(struct XenInput *xenfb,
> event.type = XENKBD_TYPE_POS;
> event.pos.abs_x = abs_x;
> event.pos.abs_y = abs_y;
> -#if __XEN_LATEST_INTERFACE_VERSION__ == 0x00030207
> - event.pos.abs_z = z;
> -#endif
> -#if __XEN_LATEST_INTERFACE_VERSION__ >= 0x00030208
> event.pos.rel_z = z;
> -#endif
>
> return xenfb_kbd_event(xenfb, &event);
> }
> diff --git a/xen-hvm.c b/xen-hvm.c
> index fbe0e3a..039680a 100644
> --- a/xen-hvm.c
> +++ b/xen-hvm.c
> @@ -67,17 +67,6 @@ struct shared_vmport_iopage {
> typedef struct shared_vmport_iopage shared_vmport_iopage_t;
> #endif
>
> -#if __XEN_LATEST_INTERFACE_VERSION__ < 0x0003020a
> -static inline uint32_t xen_vcpu_eport(shared_iopage_t *shared_page, int i)
> -{
> - return shared_page->vcpu_iodata[i].vp_eport;
> -}
> -static inline ioreq_t *xen_vcpu_ioreq(shared_iopage_t *shared_page, int vcpu)
> -{
> - return &shared_page->vcpu_iodata[vcpu].vp_ioreq;
> -}
> -# define FMT_ioreq_size PRIx64
> -#else
> static inline uint32_t xen_vcpu_eport(shared_iopage_t *shared_page, int i)
> {
> return shared_page->vcpu_ioreq[i].vp_eport;
> @@ -86,8 +75,6 @@ static inline ioreq_t *xen_vcpu_ioreq(shared_iopage_t *shared_page, int vcpu)
> {
> return &shared_page->vcpu_ioreq[vcpu];
> }
> -# define FMT_ioreq_size "u"
> -#endif
>
> #define BUFFER_IO_MAX_DELAY 100
>
> @@ -688,7 +675,7 @@ static ioreq_t *cpu_get_ioreq_from_shared_memory(XenIOState *state, int vcpu)
> if (req->state != STATE_IOREQ_READY) {
> DPRINTF("I/O request not ready: "
> "%x, ptr: %x, port: %"PRIx64", "
> - "data: %"PRIx64", count: %" FMT_ioreq_size ", size: %" FMT_ioreq_size "\n",
> + "data: %"PRIx64", count: %u, size: %u\n",
> req->state, req->data_is_ptr, req->addr,
> req->data, req->count, req->size);
> return NULL;
> @@ -1050,9 +1037,7 @@ static void cpu_handle_ioreq(void *opaque)
> if (req->state != STATE_IOREQ_INPROCESS) {
> fprintf(stderr, "Badness in I/O request ... not in service?!: "
> "%x, ptr: %x, port: %"PRIx64", "
> - "data: %"PRIx64", count: %" FMT_ioreq_size
> - ", size: %" FMT_ioreq_size
> - ", type: %"FMT_ioreq_size"\n",
> + "data: %"PRIx64", count: %u, size: %u, type: %u\n",
> req->state, req->data_is_ptr, req->addr,
> req->data, req->count, req->size, req->type);
> destroy_hvm_domain(false);
> --
> 2.1.4
>
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PATCH v2 5/5] xen: Drop __XEN_LATEST_INTERFACE_VERSION__ checks from prior to Xen 4.2
2016-02-10 11:07 ` [Qemu-devel] [PATCH v2 5/5] xen: Drop __XEN_LATEST_INTERFACE_VERSION__ checks from prior to Xen 4.2 Ian Campbell
2016-02-10 11:59 ` Stefano Stabellini
@ 2016-02-10 11:59 ` Stefano Stabellini
1 sibling, 0 replies; 17+ messages in thread
From: Stefano Stabellini @ 2016-02-10 11:59 UTC (permalink / raw)
To: Ian Campbell; +Cc: xen-devel, qemu-devel, stefano.stabellini
On Wed, 10 Feb 2016, Ian Campbell wrote:
> We assume (and check for in configure) 4.2 or later now. In reality
> all of the removed checks are for far older versions.
>
> FMT_ioreq_size is no longer needed.
>
> Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> v2: Drop FMT_ioreq_size too
> ---
> hw/display/xenfb.c | 7 -------
> xen-hvm.c | 19 ++-----------------
> 2 files changed, 2 insertions(+), 24 deletions(-)
>
> diff --git a/hw/display/xenfb.c b/hw/display/xenfb.c
> index a533c3d..40b096a 100644
> --- a/hw/display/xenfb.c
> +++ b/hw/display/xenfb.c
> @@ -241,9 +241,7 @@ static int xenfb_send_motion(struct XenInput *xenfb,
> event.type = XENKBD_TYPE_MOTION;
> event.motion.rel_x = rel_x;
> event.motion.rel_y = rel_y;
> -#if __XEN_LATEST_INTERFACE_VERSION__ >= 0x00030207
> event.motion.rel_z = rel_z;
> -#endif
>
> return xenfb_kbd_event(xenfb, &event);
> }
> @@ -258,12 +256,7 @@ static int xenfb_send_position(struct XenInput *xenfb,
> event.type = XENKBD_TYPE_POS;
> event.pos.abs_x = abs_x;
> event.pos.abs_y = abs_y;
> -#if __XEN_LATEST_INTERFACE_VERSION__ == 0x00030207
> - event.pos.abs_z = z;
> -#endif
> -#if __XEN_LATEST_INTERFACE_VERSION__ >= 0x00030208
> event.pos.rel_z = z;
> -#endif
>
> return xenfb_kbd_event(xenfb, &event);
> }
> diff --git a/xen-hvm.c b/xen-hvm.c
> index fbe0e3a..039680a 100644
> --- a/xen-hvm.c
> +++ b/xen-hvm.c
> @@ -67,17 +67,6 @@ struct shared_vmport_iopage {
> typedef struct shared_vmport_iopage shared_vmport_iopage_t;
> #endif
>
> -#if __XEN_LATEST_INTERFACE_VERSION__ < 0x0003020a
> -static inline uint32_t xen_vcpu_eport(shared_iopage_t *shared_page, int i)
> -{
> - return shared_page->vcpu_iodata[i].vp_eport;
> -}
> -static inline ioreq_t *xen_vcpu_ioreq(shared_iopage_t *shared_page, int vcpu)
> -{
> - return &shared_page->vcpu_iodata[vcpu].vp_ioreq;
> -}
> -# define FMT_ioreq_size PRIx64
> -#else
> static inline uint32_t xen_vcpu_eport(shared_iopage_t *shared_page, int i)
> {
> return shared_page->vcpu_ioreq[i].vp_eport;
> @@ -86,8 +75,6 @@ static inline ioreq_t *xen_vcpu_ioreq(shared_iopage_t *shared_page, int vcpu)
> {
> return &shared_page->vcpu_ioreq[vcpu];
> }
> -# define FMT_ioreq_size "u"
> -#endif
>
> #define BUFFER_IO_MAX_DELAY 100
>
> @@ -688,7 +675,7 @@ static ioreq_t *cpu_get_ioreq_from_shared_memory(XenIOState *state, int vcpu)
> if (req->state != STATE_IOREQ_READY) {
> DPRINTF("I/O request not ready: "
> "%x, ptr: %x, port: %"PRIx64", "
> - "data: %"PRIx64", count: %" FMT_ioreq_size ", size: %" FMT_ioreq_size "\n",
> + "data: %"PRIx64", count: %u, size: %u\n",
> req->state, req->data_is_ptr, req->addr,
> req->data, req->count, req->size);
> return NULL;
> @@ -1050,9 +1037,7 @@ static void cpu_handle_ioreq(void *opaque)
> if (req->state != STATE_IOREQ_INPROCESS) {
> fprintf(stderr, "Badness in I/O request ... not in service?!: "
> "%x, ptr: %x, port: %"PRIx64", "
> - "data: %"PRIx64", count: %" FMT_ioreq_size
> - ", size: %" FMT_ioreq_size
> - ", type: %"FMT_ioreq_size"\n",
> + "data: %"PRIx64", count: %u, size: %u, type: %u\n",
> req->state, req->data_is_ptr, req->addr,
> req->data, req->count, req->size, req->type);
> destroy_hvm_domain(false);
> --
> 2.1.4
>
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH v2 5/5] xen: Drop __XEN_LATEST_INTERFACE_VERSION__ checks from prior to Xen 4.2
2016-02-10 11:06 [Qemu-devel] [PATCH v2 0/5] Drop support for Xen 4.1 and older from qemu-xen Ian Campbell
` (6 preceding siblings ...)
2016-02-10 11:07 ` [Qemu-devel] [PATCH v2 5/5] xen: Drop __XEN_LATEST_INTERFACE_VERSION__ checks from prior to Xen 4.2 Ian Campbell
@ 2016-02-10 11:07 ` Ian Campbell
2016-02-10 12:07 ` [Qemu-devel] [PATCH v2 0/5] Drop support for Xen 4.1 and older from qemu-xen Stefano Stabellini
2016-02-10 12:07 ` Stefano Stabellini
9 siblings, 0 replies; 17+ messages in thread
From: Ian Campbell @ 2016-02-10 11:07 UTC (permalink / raw)
To: stefano.stabellini, qemu-devel; +Cc: Ian Campbell, xen-devel
We assume (and check for in configure) 4.2 or later now. In reality
all of the removed checks are for far older versions.
FMT_ioreq_size is no longer needed.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
v2: Drop FMT_ioreq_size too
---
hw/display/xenfb.c | 7 -------
xen-hvm.c | 19 ++-----------------
2 files changed, 2 insertions(+), 24 deletions(-)
diff --git a/hw/display/xenfb.c b/hw/display/xenfb.c
index a533c3d..40b096a 100644
--- a/hw/display/xenfb.c
+++ b/hw/display/xenfb.c
@@ -241,9 +241,7 @@ static int xenfb_send_motion(struct XenInput *xenfb,
event.type = XENKBD_TYPE_MOTION;
event.motion.rel_x = rel_x;
event.motion.rel_y = rel_y;
-#if __XEN_LATEST_INTERFACE_VERSION__ >= 0x00030207
event.motion.rel_z = rel_z;
-#endif
return xenfb_kbd_event(xenfb, &event);
}
@@ -258,12 +256,7 @@ static int xenfb_send_position(struct XenInput *xenfb,
event.type = XENKBD_TYPE_POS;
event.pos.abs_x = abs_x;
event.pos.abs_y = abs_y;
-#if __XEN_LATEST_INTERFACE_VERSION__ == 0x00030207
- event.pos.abs_z = z;
-#endif
-#if __XEN_LATEST_INTERFACE_VERSION__ >= 0x00030208
event.pos.rel_z = z;
-#endif
return xenfb_kbd_event(xenfb, &event);
}
diff --git a/xen-hvm.c b/xen-hvm.c
index fbe0e3a..039680a 100644
--- a/xen-hvm.c
+++ b/xen-hvm.c
@@ -67,17 +67,6 @@ struct shared_vmport_iopage {
typedef struct shared_vmport_iopage shared_vmport_iopage_t;
#endif
-#if __XEN_LATEST_INTERFACE_VERSION__ < 0x0003020a
-static inline uint32_t xen_vcpu_eport(shared_iopage_t *shared_page, int i)
-{
- return shared_page->vcpu_iodata[i].vp_eport;
-}
-static inline ioreq_t *xen_vcpu_ioreq(shared_iopage_t *shared_page, int vcpu)
-{
- return &shared_page->vcpu_iodata[vcpu].vp_ioreq;
-}
-# define FMT_ioreq_size PRIx64
-#else
static inline uint32_t xen_vcpu_eport(shared_iopage_t *shared_page, int i)
{
return shared_page->vcpu_ioreq[i].vp_eport;
@@ -86,8 +75,6 @@ static inline ioreq_t *xen_vcpu_ioreq(shared_iopage_t *shared_page, int vcpu)
{
return &shared_page->vcpu_ioreq[vcpu];
}
-# define FMT_ioreq_size "u"
-#endif
#define BUFFER_IO_MAX_DELAY 100
@@ -688,7 +675,7 @@ static ioreq_t *cpu_get_ioreq_from_shared_memory(XenIOState *state, int vcpu)
if (req->state != STATE_IOREQ_READY) {
DPRINTF("I/O request not ready: "
"%x, ptr: %x, port: %"PRIx64", "
- "data: %"PRIx64", count: %" FMT_ioreq_size ", size: %" FMT_ioreq_size "\n",
+ "data: %"PRIx64", count: %u, size: %u\n",
req->state, req->data_is_ptr, req->addr,
req->data, req->count, req->size);
return NULL;
@@ -1050,9 +1037,7 @@ static void cpu_handle_ioreq(void *opaque)
if (req->state != STATE_IOREQ_INPROCESS) {
fprintf(stderr, "Badness in I/O request ... not in service?!: "
"%x, ptr: %x, port: %"PRIx64", "
- "data: %"PRIx64", count: %" FMT_ioreq_size
- ", size: %" FMT_ioreq_size
- ", type: %"FMT_ioreq_size"\n",
+ "data: %"PRIx64", count: %u, size: %u, type: %u\n",
req->state, req->data_is_ptr, req->addr,
req->data, req->count, req->size, req->type);
destroy_hvm_domain(false);
--
2.1.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* Re: [Qemu-devel] [PATCH v2 0/5] Drop support for Xen 4.1 and older from qemu-xen
2016-02-10 11:06 [Qemu-devel] [PATCH v2 0/5] Drop support for Xen 4.1 and older from qemu-xen Ian Campbell
` (7 preceding siblings ...)
2016-02-10 11:07 ` Ian Campbell
@ 2016-02-10 12:07 ` Stefano Stabellini
2016-02-10 12:07 ` Stefano Stabellini
9 siblings, 0 replies; 17+ messages in thread
From: Stefano Stabellini @ 2016-02-10 12:07 UTC (permalink / raw)
To: Ian Campbell; +Cc: xen-devel, qemu-devel, stefano.stabellini
[-- Attachment #1: Type: text/plain, Size: 1037 bytes --]
On Wed, 10 Feb 2016, Ian Campbell wrote:
> This is most easily explained by the commit log of the first patch:
>
> Xen 4.2 become unsupported upstream in 09/2015 (see
> http://wiki.xen.org/wiki/Xen_Release_Features). However as far as the
> interfaces provided by the toolstack libraries go 4.2 and 4.3 are
> indistinguishable.
>
> Therefore drop support for Xen 4.1 and earlier which removes a whole
> pile of compatibility code which makes future work (to use stable
> library interfaces provided by upstream) more difficult. In particular
> all supported versions now use a pointer as a libxc handle (4.1 and
> earlier used an integer, resulting in various shim layers).
>
> Also Xen 4.2 was the first version of Xen to formally support upstream
> QEMU (as a preview) so that makes sense as a cut-off now.
>
> The rest of the patches are just further cleanups which become possible.
I committed this series to my "next" branch.
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PATCH v2 0/5] Drop support for Xen 4.1 and older from qemu-xen
2016-02-10 11:06 [Qemu-devel] [PATCH v2 0/5] Drop support for Xen 4.1 and older from qemu-xen Ian Campbell
` (8 preceding siblings ...)
2016-02-10 12:07 ` [Qemu-devel] [PATCH v2 0/5] Drop support for Xen 4.1 and older from qemu-xen Stefano Stabellini
@ 2016-02-10 12:07 ` Stefano Stabellini
9 siblings, 0 replies; 17+ messages in thread
From: Stefano Stabellini @ 2016-02-10 12:07 UTC (permalink / raw)
To: Ian Campbell; +Cc: xen-devel, qemu-devel, stefano.stabellini
[-- Attachment #1: Type: text/plain, Size: 1054 bytes --]
On Wed, 10 Feb 2016, Ian Campbell wrote:
> This is most easily explained by the commit log of the first patch:
>
> Xen 4.2 become unsupported upstream in 09/2015 (see
> http://wiki.xen.org/wiki/Xen_Release_Features). However as far as the
> interfaces provided by the toolstack libraries go 4.2 and 4.3 are
> indistinguishable.
>
> Therefore drop support for Xen 4.1 and earlier which removes a whole
> pile of compatibility code which makes future work (to use stable
> library interfaces provided by upstream) more difficult. In particular
> all supported versions now use a pointer as a libxc handle (4.1 and
> earlier used an integer, resulting in various shim layers).
>
> Also Xen 4.2 was the first version of Xen to formally support upstream
> QEMU (as a preview) so that makes sense as a cut-off now.
>
> The rest of the patches are just further cleanups which become possible.
I committed this series to my "next" branch.
[-- Attachment #2: Type: text/plain, Size: 126 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 17+ messages in thread