[libvirt] [PATCH 1/7] qemu: Move struct qemuDomainDiskInfo to qemu_domain.h

[Peter Krempa]

---
 src/qemu/qemu_conf.h        | 7 -------
 src/qemu/qemu_domain.h      | 7 +++++++
 tests/qemumonitorjsontest.c | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
index a714b84..1fdef70 100644
--- a/src/qemu/qemu_conf.h
+++ b/src/qemu/qemu_conf.h
@@ -287,13 +287,6 @@ virCapsPtr virQEMUDriverCreateCapabilities(virQEMUDriverPtr driver);
 virCapsPtr virQEMUDriverGetCapabilities(virQEMUDriverPtr driver,
                                         bool refresh);

-struct qemuDomainDiskInfo {
-    bool removable;
-    bool locked;
-    bool tray_open;
-    int io_status;
-};
-
 typedef struct _qemuSharedDeviceEntry qemuSharedDeviceEntry;
 typedef qemuSharedDeviceEntry *qemuSharedDeviceEntryPtr;

diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index f99f0bb..e29df07 100644
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -304,6 +304,13 @@ struct _qemuDomainDiskPrivate {
 # define QEMU_DOMAIN_HOSTDEV_PRIVATE(hostdev)	\
     ((qemuDomainHostdevPrivatePtr) (hostdev)->privateData)

+struct qemuDomainDiskInfo {
+    bool removable;
+    bool locked;
+    bool tray_open;
+    int io_status;
+};
+
 typedef struct _qemuDomainHostdevPrivate qemuDomainHostdevPrivate;
 typedef qemuDomainHostdevPrivate *qemuDomainHostdevPrivatePtr;
 struct _qemuDomainHostdevPrivate {
diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index 829de90..229ccac 100644
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -22,7 +22,7 @@
 #include "testutils.h"
 #include "testutilsqemu.h"
 #include "qemumonitortestutils.h"
-#include "qemu/qemu_conf.h"
+#include "qemu/qemu_domain.h"
 #include "qemu/qemu_monitor_json.h"
 #include "virthread.h"
 #include "virerror.h"
-- 
2.8.2