4:06 a.m.
This introduce a new API virDomainUndefineFlags to control the
domain undefine process, as the existed API virDomainUndefine
doesn't support flags.
Currently only flag VIR_DOMAIN_UNDEFINE_MANAGED_STATE is supported.
If the domain has a managed state file, including
VIR_DOMAIN_UNDEFINE_MANAGED_STATE in @flags will also remove that
file, and omitting the flag will cause undefine process to fail.
This patch also changes the behavior of virDomainUndefine, if the
domain has a managed state file, the undefine will be refused.
---
include/libvirt/libvirt.h.in | 10 +++++++
src/driver.h | 4 +++
src/libvirt.c | 56 +++++++++++++++++++++++++++++++++++++++++-
src/libvirt_public.syms | 5 +++
4 files changed, 74 insertions(+), 1 deletions(-)
diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in
index d5a7105..c69a48e 100644
--- a/include/libvirt/libvirt.h.in
+++ b/include/libvirt/libvirt.h.in
@@ -1200,6 +1200,16 @@ int virDomainMemoryPeek (virDomainPtr dom,
virDomainPtr virDomainDefineXML (virConnectPtr conn,
const char *xml);
int virDomainUndefine (virDomainPtr domain);
+
+typedef enum {
+ VIR_DOMAIN_UNDEFINE_MANAGED_STATE = 1,
+
+ /* Future undefine control flags should come here. */
+} virDomainUndefineFlagsValues;
+
+
+int virDomainUndefineFlags (virDomainPtr domain,
+ unsigned int flags);
int virConnectNumOfDefinedDomains (virConnectPtr conn);
int virConnectListDefinedDomains (virConnectPtr conn,
char **const names,
diff --git a/src/driver.h b/src/driver.h
index 70ea4c2..0c3bcfc 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -219,6 +219,9 @@ typedef virDomainPtr
typedef int
(*virDrvDomainUndefine) (virDomainPtr dom);
typedef int
+ (*virDrvDomainUndefineFlags) (virDomainPtr dom,
+ unsigned int flags);
+typedef int
(*virDrvDomainSetVcpus) (virDomainPtr domain,
unsigned int nvcpus);
typedef int
@@ -732,6 +735,7 @@ struct _virDriver {
virDrvDomainCreateWithFlags domainCreateWithFlags;
virDrvDomainDefineXML domainDefineXML;
virDrvDomainUndefine domainUndefine;
+ virDrvDomainUndefineFlags domainUndefineFlags;
virDrvDomainAttachDevice domainAttachDevice;
virDrvDomainAttachDeviceFlags domainAttachDeviceFlags;
virDrvDomainDetachDevice domainDetachDevice;
diff --git a/src/libvirt.c b/src/libvirt.c
index 7e70caa..3e1a0ff 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -6376,7 +6376,11 @@ error:
* virDomainUndefine:
* @domain: pointer to a defined domain
*
- * Undefine a domain but does not stop it if it is running
+ * Undefine the configuration for an inactive domain.
+ *
+ * If the domain has a managed state file (see
+ * virDomainHasManagedSaveImage()), then the undefine will fail. See
+ * virDomainUndefineFlags() for more control.
*
* Returns 0 in case of success, -1 in case of error
*/
@@ -6415,6 +6419,56 @@ error:
}
/**
+ * virDomainUndefineFlags:
+ * @domain: pointer to a defined domain
+ * @flags: bitwise-or of supported virDomainUndefineFlagsValues
+ *
+ * Undefine the configuration for an inactive domain.
+ *
+ * If the domain has a managed state file (see virDomainHasManagedSaveImage()),
+ * then including VIR_DOMAIN_UNDEFINE_MANAGED_STATE in @flags will also remove
+ * that file, and omitting the flag will cause the undefine process to fail.
+ *
+ * Returns 0 in case of success, -1 in case of error
+ */
+int
+virDomainUndefineFlags(virDomainPtr domain,
+ unsigned int flags)
+{
+ virConnectPtr conn;
+
+ VIR_DOMAIN_DEBUG(domain, "flags=%x", flags);
+
+ virResetLastError();
+
+ if (!VIR_IS_CONNECTED_DOMAIN(domain)) {
+ virLibDomainError(VIR_ERR_INVALID_DOMAIN, __FUNCTION__);
+ virDispatchError(NULL);
+ return -1;
+ }
+ conn = domain->conn;
+ if (conn->flags & VIR_CONNECT_RO) {
+ virLibDomainError(VIR_ERR_OPERATION_DENIED, __FUNCTION__);
+ goto error;
+ }
+
+ if (conn->driver->domainUndefineFlags) {
+ int ret;
+ ret = conn->driver->domainUndefineFlags (domain, flags);
+ if (ret < 0)
+ goto error;
+ return ret;
+ }
+
+ virLibConnError(VIR_ERR_NO_SUPPORT, __FUNCTION__);
+
+error:
+ virDispatchError(domain->conn);
+ return -1;
+}
+
+
+/**
* virConnectNumOfDefinedDomains:
* @conn: pointer to the hypervisor connection
*
diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms
index 5f2541a..5cc480e 100644
--- a/src/libvirt_public.syms
+++ b/src/libvirt_public.syms
@@ -466,4 +466,9 @@ LIBVIRT_0.9.3 {
virNodeGetMemoryStats;
} LIBVIRT_0.9.2;
+LIBVIRT_0.9.4 {
+ global:
+ virDomainUndefineFlags;
+} LIBVIRT_0.9.3;
+
# .... define new API here using predicted next version number ....
--
1.7.6