qemu: Move struct qemuDomainDiskInfo to qemu_domain.h

(cherry picked from commit 5f963d89b1220460fadb1bf6fc347d26b311c1b2)

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 54d7bd74f3be0bc839321c24f3494415a0551bad..ada4a17ed2876014a2501824bce19fecaa444b59 100644 (file)
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -238,6 +238,13 @@ struct _qemuDomainDiskPrivate {
     bool migrating; /* the disk is being migrated */
 };
 
+struct qemuDomainDiskInfo {
+    bool removable;
+    bool locked;
+    bool tray_open;
+    int io_status;
+};
+
 typedef enum {
     QEMU_PROCESS_EVENT_WATCHDOG = 0,
     QEMU_PROCESS_EVENT_GUESTPANIC,

diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index 1be0beeb25b60e7ed6a9d5418add539d2792fdbd..cb917c26be72743900eea99016e1629d5f1e8dbe 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"