[libvirt] [PATCH 03/10] Move QEMU domain object struct into qemu_conf.h
Allow QEMU driver files access to qemuDomainObjPrivate struct
* src/qemu/qemu_conf.h: Add qemuDomainObjPrivate struct
* src/qemu/qemu_driver.c: Remove qemuDomainObjPrivate struct
---
src/qemu/qemu_driver.c | 45 ---------------------------------------------
1 files changed, 0 insertions(+), 45 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index e1a1179..0489a7a 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -100,51 +100,6 @@
#define timeval_to_ms(tv) (((tv).tv_sec * 1000ull) + ((tv).tv_usec / 1000))
-/* Only 1 job is allowed at any time
- * A job includes *all* monitor commands, even those just querying
- * information, not merely actions */
-enum qemuDomainJob {
- QEMU_JOB_NONE = 0, /* Always set to 0 for easy if (jobActive) conditions */
- QEMU_JOB_UNSPECIFIED,
- QEMU_JOB_MIGRATION_OUT,
- QEMU_JOB_MIGRATION_IN,
- QEMU_JOB_SAVE,
- QEMU_JOB_DUMP,
-};
-
-enum qemuDomainJobSignals {
- QEMU_JOB_SIGNAL_CANCEL = 1 << 0, /* Request job cancellation */
- QEMU_JOB_SIGNAL_SUSPEND = 1 << 1, /* Request VM suspend to finish live
migration offline */
- QEMU_JOB_SIGNAL_MIGRATE_DOWNTIME = 1 << 2, /* Request migration downtime change
*/
-};
-
-struct qemuDomainJobSignalsData {
- unsigned long long migrateDowntime; /* Data for QEMU_JOB_SIGNAL_MIGRATE_DOWNTIME */
-};
-
-typedef struct _qemuDomainObjPrivate qemuDomainObjPrivate;
-typedef qemuDomainObjPrivate *qemuDomainObjPrivatePtr;
-struct _qemuDomainObjPrivate {
- virCond jobCond; /* Use in conjunction with main virDomainObjPtr lock */
- enum qemuDomainJob jobActive; /* Currently running job */
- unsigned int jobSignals; /* Signals for running job */
- struct qemuDomainJobSignalsData jobSignalsData; /* Signal specific data */
- virDomainJobInfo jobInfo;
- unsigned long long jobStart;
-
- qemuMonitorPtr mon;
- virDomainChrDefPtr monConfig;
- int monJSON;
- int monitor_warned;
- bool gotShutdown;
-
- int nvcpupids;
- int *vcpupids;
-
- qemuDomainPCIAddressSetPtr pciaddrs;
- int persistentAddrs;
-};
-
struct watchdogEvent
{
virDomainObjPtr vm;
--
1.7.2.3