xx: reduce dependencies on xen_common.h

Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>

diff --git a/hw/i386/xen/xen-mapcache.c b/hw/i386/xen/xen-mapcache.c
index a2f93096e7a3750817c15211c1b9bc0ee015fb76..e86731b2e2d1d919bb1a7a4b6058112ff83a02d6 100644 (file)
--- a/hw/i386/xen/xen-mapcache.c
+++ b/hw/i386/xen/xen-mapcache.c
@@ -14,7 +14,7 @@
 
 #include <sys/resource.h>
 
-#include "hw/xen/xen-legacy-backend.h"
+#include "hw/xen/xen_common.h"
 #include "qemu/bitmap.h"
 
 #include "sysemu/runstate.h"

diff --git a/hw/xen/xen-legacy-backend.c b/hw/xen/xen-legacy-backend.c
index 1ed1d4a3431a1d2774e0fb3e611a69528c10c4f2..41015468e26f499d02657ad92f9ebe15315cc8da 100644 (file)
--- a/hw/xen/xen-legacy-backend.c
+++ b/hw/xen/xen-legacy-backend.c
@@ -616,7 +616,7 @@ int xen_be_init(void)
         return -1;
     }
 
-    if (xen_xc == NULL || xen_fmem == NULL) {
+    if (xen_evtchn_ops == NULL || xen_gnttab_ops == NULL) {
         /* Check if xen_init() have been called */
         goto err;
     }

diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h
index 82347e76a4751abeee677f5d13a7ae785a4947d8..c0a7871e7dafe305f3779711a7ae1737fe439102 100644 (file)
--- a/include/hw/xen/xen.h
+++ b/include/hw/xen/xen.h
@@ -17,6 +17,10 @@ enum xen_mode {
     XEN_EMULATE,
 };
 
+#define XC_PAGE_SHIFT           12
+#define XC_PAGE_SIZE            (1UL << XC_PAGE_SHIFT)
+#define XC_PAGE_MASK            (~(XC_PAGE_SIZE-1))
+
 extern uint32_t xen_domid;
 extern enum xen_mode xen_mode;
 extern bool xen_domid_restrict;

diff --git a/include/hw/xen/xen_backend_ops.h b/include/hw/xen/xen_backend_ops.h
index 83238d334c1e03bcc8936cfd3534154960ba909e..aacfe65ef9a1dab95643df6ef48bc563dbe981a1 100644 (file)
--- a/include/hw/xen/xen_backend_ops.h
+++ b/include/hw/xen/xen_backend_ops.h
@@ -30,6 +30,7 @@ typedef struct xenevtchn_handle xenevtchn_handle;
 typedef int xenevtchn_port_or_error_t;
 typedef uint32_t evtchn_port_t;
 typedef uint16_t domid_t;
+typedef uint32_t grant_ref_t;
 
 struct evtchn_backend_ops {
     xenevtchn_handle *(*open)(void);

diff --git a/include/hw/xen/xen_pvdev.h b/include/hw/xen/xen_pvdev.h
index 68ae77f2e85b83542b070bb5cabccfa6068b75c2..c7a8a5ceec629f41453d56960dbc809cc70811e9 100644 (file)
--- a/include/hw/xen/xen_pvdev.h
+++ b/include/hw/xen/xen_pvdev.h
@@ -1,8 +1,17 @@
 #ifndef QEMU_HW_XEN_PVDEV_H
 #define QEMU_HW_XEN_PVDEV_H
 
+#include "qemu/iov.h"
 #include "hw/xen/xen_backend_ops.h"
-#include "hw/xen/xen_common.h"
+#include "hw/xen/xen.h"
+#include "hw/qdev-core.h"
+#include "hw/xen/interface/io/xenbus.h"
+#include "hw/xen/interface/io/ring.h"
+#include <xenstore.h>
+
+#include "hw/pci/pci.h"
+
+#include <xenctrl.h>
 
 /* ------------------------------------------------------------- */