Move it to qemu_domain.c and rename it to qemuDomainObjFromDomain. This
will allow reusing it after splitting out checkpoint code from
qemu_driver.c.
Signed-off-by: Peter Krempa
---
src/qemu/qemu_domain.c | 31 +
src/qemu/qemu_domain.h | 1 +
src/qemu/qemu_driver.c | 303 +++--
3 files changed, 169 insertions(+), 166 deletions(-)
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 2aa2164953..e8e895d9aa 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -119,6 +119,37 @@ VIR_ENUM_IMPL(qemuDomainNamespace,
"mount",
);
+
+/**
+ * qemuDomainObjFromDomain:
+ * @domain: Domain pointer that has to be looked up
+ *
+ * This function looks up @domain and returns the appropriate virDomainObjPtr
+ * that has to be released by calling virDomainObjEndAPI().
+ *
+ * Returns the domain object with incremented reference counter which is locked
+ * on success, NULL otherwise.
+ */
+virDomainObjPtr
+qemuDomainObjFromDomain(virDomainPtr domain)
+{
+virDomainObjPtr vm;
+virQEMUDriverPtr driver = domain->conn->privateData;
+char uuidstr[VIR_UUID_STRING_BUFLEN];
+
+vm = virDomainObjListFindByUUID(driver->domains, domain->uuid);
+if (!vm) {
+virUUIDFormat(domain->uuid, uuidstr);
+virReportError(VIR_ERR_NO_DOMAIN,
+ _("no domain with matching uuid '%s' (%s)"),
+ uuidstr, domain->name);
+return NULL;
+}
+
+return vm;
+}
+
+
struct _qemuDomainLogContext {
virObject parent;
diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index 6c490bd9d8..c740bb955a 100644
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -593,6 +593,7 @@ struct _qemuDomainXmlNsDef {
char **capsdel;
};
+virDomainObjPtr qemuDomainObjFromDomain(virDomainPtr domain);
qemuDomainSaveCookiePtr qemuDomainSaveCookieNew(virDomainObjPtr vm);
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 0c65414a1a..b2d42affe3 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -161,42 +161,13 @@ static int qemuARPGetInterfaces(virDomainObjPtr vm,
static virQEMUDriverPtr qemu_driver;
-/**
- * qemuDomObjFromDomain:
- * @domain: Domain pointer that has to be looked up
- *
- * This function looks up @domain and returns the appropriate virDomainObjPtr
- * that has to be released by calling virDomainObjEndAPI().
- *
- * Returns the domain object with incremented reference counter which is locked
- * on success, NULL otherwise.
- */
-static virDomainObjPtr
-qemuDomObjFromDomain(virDomainPtr domain)
-{
-virDomainObjPtr vm;
-virQEMUDriverPtr driver = domain->conn->privateData;
-char uuidstr[VIR_UUID_STRING_BUFLEN];
-
-vm = virDomainObjListFindByUUID(driver->domains, domain->uuid);
-if (!vm) {
-virUUIDFormat(domain->uuid, uuidstr);
-virReportError(VIR_ERR_NO_DOMAIN,
- _("no domain with matching uuid '%s' (%s)"),
- uuidstr, domain->name);
-return NULL;
-}
-
-return vm;
-}
-
/* Looks up the domain object from snapshot and unlocks the
* driver. The returned domain object is locked and ref'd and the
* caller must call virDomainObjEndAPI() on it. */
static virDomainObjPtr
qemuDomObjFromSnapshot(virDomainSnapshotPtr snapshot)
{
-return qemuDomObjFromDomain(snapshot->domain);
+return qemuDomainObjFromDomain(snapshot->domain);
}
@@ -230,7 +201,7 @@ qemuSnapObjFromSnapshot(virDomainObjPtr vm,
static virDomainObjPtr
qemuDomObjFromCheckpoint(virDomainCheckpointPtr checkpoint)
{
-return qemuDomObjFromDomain(checkpoint->domain);
+return qemuDomainObjFromDomain(checkpoint->domain);
}
@@ -1742,7 +1713,7 @@ static int qemuDomainIsActive(virDomainPtr dom)
virDomainObjPtr obj;
int ret = -1;
-if (!(obj = qemuDomObjFromDomain(dom)))
+if (!(obj = qemuDomainObjFromDomain(dom)))
goto cleanup;
if (virDomainIsActiveEnsureACL(dom->conn, obj->def) < 0)
@@ -1760,7 +1731,7 @@ static int qemuDomainIsPersistent(virDomainPtr dom)
virDomainObjPtr obj;
int ret = -1;
-if (!(obj = qemuDomObjFromDomain(dom)))
+if (!(obj = qemuDomainObjFromDomain(dom)))
goto cleanup;
if (virDomainIsPersistentEnsureACL(dom->conn, obj->def) < 0)
@@ -1778,7 +1749,7 @@ static int qemuDomainIsUpdated(virDomainPtr dom)
virDomainObjPtr obj;
int ret = -1;
-if (!(obj = qemuDomObjFromDomain(dom)))
+if (!(obj = qemuDomainObjFromDomain(dom)))
goto cleanup;
if (virDomainIsUpdatedEnsureACL(dom->conn, obj->def) < 0)
@@ -1958,7 +1929,7 @@ static int qemuDomainSuspend(virDomainPtr dom)
int state;
virQEMUDriverConfigPtr cfg = NULL;
-if (!(vm = qemuDomObjFromDomain(dom)))
+if (!(vm = qemuDomainObjFromDomain(dom)))
return -1;
if (virDomainSuspendEnsureACL(dom->conn, vm->def) < 0)
@@ -2013,7 +1984,7 @@ static int qemuDomainResume(virDomainPtr dom)
