[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/16] xen: move xc_interface compatibility fallback
From: |
Ian Jackson |
Subject: |
[Qemu-devel] [PATCH 07/16] xen: move xc_interface compatibility fallback further up the file |
Date: |
Thu, 19 Apr 2018 17:45:10 +0100 |
We are going to want to use the dummy xendevicemodel_handle type in
new stub functions in the CONFIG_XEN_CTRL_INTERFACE_VERSION < 41000
section. So we need to provide that definition, or (as applicable)
include the appropriate header, earlier in the file.
(Ideally the newer compatibility layers would be at the bottom of the
file, so that they can naturally benefit from the compatibility layers
for earlier version. But that's rather too much for this series.)
No functional change.
Signed-off-by: Ian Jackson <address@hidden>
Acked-by: Anthony PERARD <address@hidden>
Acked-by: Stefano Stabellini <address@hidden>
---
v2: New patch in v2 of the series
---
include/hw/xen/xen_common.h | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h
index 1766bb9..60c4ebb 100644
--- a/include/hw/xen/xen_common.h
+++ b/include/hw/xen/xen_common.h
@@ -78,6 +78,17 @@ static inline void *xenforeignmemory_map(xc_interface *h,
uint32_t dom,
extern xenforeignmemory_handle *xen_fmem;
+#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 40900
+
+typedef xc_interface xendevicemodel_handle;
+
+#else /* CONFIG_XEN_CTRL_INTERFACE_VERSION >= 40900 */
+
+#undef XC_WANT_COMPAT_DEVICEMODEL_API
+#include <xendevicemodel.h>
+
+#endif
+
#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 41000
#define XEN_COMPAT_PHYSMAP
@@ -105,8 +116,6 @@ static inline int xentoolcore_restrict_all(domid_t domid)
#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 40900
-typedef xc_interface xendevicemodel_handle;
-
static inline xendevicemodel_handle *xendevicemodel_open(
struct xentoollog_logger *logger, unsigned int open_flags)
{
@@ -228,11 +237,6 @@ static inline int xendevicemodel_set_mem_type(
return xc_hvm_set_mem_type(dmod, domid, mem_type, first_pfn, nr);
}
-#else /* CONFIG_XEN_CTRL_INTERFACE_VERSION >= 40900 */
-
-#undef XC_WANT_COMPAT_DEVICEMODEL_API
-#include <xendevicemodel.h>
-
#endif
extern xendevicemodel_handle *xen_dmod;
--
2.1.4
- [Qemu-devel] [PATCH v7 00/16] xen: xen-domid-restrict improvements, Ian Jackson, 2018/04/19
- [Qemu-devel] [PATCH 01/16] checkpatch: Add xendevicemodel_handle to the list of types, Ian Jackson, 2018/04/19
- [Qemu-devel] [PATCH 03/16] xen: link against xentoolcore, Ian Jackson, 2018/04/19
- [Qemu-devel] [PATCH 06/16] xen: destroy_hvm_domain: Move reason into a variable, Ian Jackson, 2018/04/19
- [Qemu-devel] [PATCH 08/16] xen: destroy_hvm_domain: Try xendevicemodel_shutdown, Ian Jackson, 2018/04/19
- [Qemu-devel] [PATCH 13/16] xen: Expect xenstore write to fail when restricted, Ian Jackson, 2018/04/19
- [Qemu-devel] [PATCH 05/16] xen: defer call to xen_restrict until just before os_setup_post, Ian Jackson, 2018/04/19
- [Qemu-devel] [PATCH 04/16] xen: restrict: use xentoolcore_restrict_all, Ian Jackson, 2018/04/19
- [Qemu-devel] [PATCH 07/16] xen: move xc_interface compatibility fallback further up the file,
Ian Jackson <=
- [Qemu-devel] [PATCH 09/16] os-posix: cleanup: Replace fprintfs with error_report in change_process_uid, Ian Jackson, 2018/04/19
- [Qemu-devel] [PATCH 14/16] os-posix: cleanup: Replace fprintf with error_report in remaining call sites, Ian Jackson, 2018/04/19
- [Qemu-devel] [PATCH 10/16] os-posix: Provide new -runas <uid>:<gid> facility, Ian Jackson, 2018/04/19
- [Qemu-devel] [PATCH 11/16] xen: Use newly added dmops for mapping VGA memory, Ian Jackson, 2018/04/19
- [Qemu-devel] [PATCH 02/16] AccelClass: Introduce accel_setup_post, Ian Jackson, 2018/04/19
- [Qemu-devel] [PATCH 12/16] xen: Remove now-obsolete xen_xc_domain_add_to_physmap, Ian Jackson, 2018/04/19