qemu: Move struct qemuDomainDiskInfo to qemu_domain.h

diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
index a714b84c9707615c7a2b87db9ff85eaf45ad3e0f..1fdef70859910f8f8f19bfeac1855c509dc9dbb9 100644 (file)
--- 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 f99f0bb5358e46ba9c87619aa257e19757155c48..e29df0712401de4ce65534318b8468770b84024f 100644 (file)
--- 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 829de909f6fde2952356dbe6074802030e3d04c6..229ccac504ac262a912a66a4f2a2e5502a7d3c6e 100644 (file)
--- 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"