4:03 a.m.
Add new public api for 'reset'.
It can reset domain immediately without any guest shutdown.
Signed-off-by: Xu He Jie <xuhj(a)linux.vnet.ibm.com>
---
include/libvirt/libvirt.h.in | 2 +
src/driver.h | 3 ++
src/libvirt.c | 44 ++++++++++++++++++++++++++++++++++++++++++
src/libvirt_public.syms | 5 ++++
4 files changed, 54 insertions(+), 0 deletions(-)
diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in
index 39155a6..3d60023 100644
--- a/include/libvirt/libvirt.h.in
+++ b/include/libvirt/libvirt.h.in
@@ -1031,6 +1031,8 @@ virDomainPtr virDomainLookupByUUIDString
(virConnectPtr conn,
int virDomainShutdown (virDomainPtr domain);
int virDomainReboot (virDomainPtr domain,
unsigned int flags);
+int virDomainReset (virDomainPtr domain);
+
int virDomainDestroy (virDomainPtr domain);
int virDomainDestroyFlags (virDomainPtr domain,
unsigned int flags);
diff --git a/src/driver.h b/src/driver.h
index 3792003..fd0d3a1 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -124,6 +124,8 @@ typedef int
(*virDrvDomainReboot) (virDomainPtr domain,
unsigned int flags);
typedef int
+ (*virDrvDomainReset) (virDomainPtr domain);
+typedef int
(*virDrvDomainDestroy) (virDomainPtr domain);
typedef int
(*virDrvDomainDestroyFlags) (virDomainPtr domain,
@@ -755,6 +757,7 @@ struct _virDriver {
virDrvDomainResume domainResume;
virDrvDomainShutdown domainShutdown;
virDrvDomainReboot domainReboot;
+ virDrvDomainReset domainReset;
virDrvDomainDestroy domainDestroy;
virDrvDomainDestroyFlags domainDestroyFlags;
virDrvDomainGetOSType domainGetOSType;
diff --git a/src/libvirt.c b/src/libvirt.c
index 8f94b11..3c5cd5e 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -3017,6 +3017,50 @@ error:
}
/**
+ * virDomainReset:
+ * @domain: a domain object
+ *
+ * Reset a domain immediately without any guest shutdown
+ *
+ * Returns 0 in case of success and -1 in case of failure.
+ */
+int
+virDomainReset(virDomainPtr domain)
+{
+ virConnectPtr conn;
+
+ VIR_DOMAIN_DEBUG(domain);
+
+ virResetLastError();
+
+ if (!VIR_IS_CONNECTED_DOMAIN(domain)) {
+ virLibDomainError(VIR_ERR_INVALID_DOMAIN, __FUNCTION__);
+ virDispatchError(NULL);
+ return -1;
+ }
+ if (domain->conn->flags & VIR_CONNECT_RO) {
+ virLibDomainError(VIR_ERR_OPERATION_DENIED, __FUNCTION__);
+ goto error;
+ }
+
+ conn = domain->conn;
+
+ if (conn->driver->domainReset) {
+ int ret;
+ ret = conn->driver->domainReset (domain);
+ if (ret < 0)
+ goto error;
+ return ret;
+ }
+
+ virLibConnError(VIR_ERR_NO_SUPPORT, __FUNCTION__);
+
+error:
+ virDispatchError(domain->conn);
+ return -1;
+}
+
+/**
* virDomainGetName:
* @domain: a domain object
*
diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms
index 8a6d55a..dffa33f 100644
--- a/src/libvirt_public.syms
+++ b/src/libvirt_public.syms
@@ -489,4 +489,9 @@ LIBVIRT_0.9.5 {
virDomainSnapshotGetName;
} LIBVIRT_0.9.4;
+LIBVIRT_0.9.7 {
+ global:
+ virDomainReset;
+} LIBVIRT_0.9.5;
+
# .... define new API here using predicted next version number ....
--
1.7.4.1
4:04 a.m.
New subject: [libvirt] [PATCH 2/4] qemu: Implement 'reset' for qemu driver
Signed-off-by: Xu He Jie <xuhj(a)linux.vnet.ibm.com>
---
src/qemu/qemu_driver.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 46 insertions(+), 0 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 0d0bea2..dc719ac 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -1595,6 +1595,51 @@ cleanup:
}
+static int qemuDomainReset(virDomainPtr dom) {
+ struct qemud_driver *driver = dom->conn->privateData;
+ virDomainObjPtr vm;
+ int ret = -1;
+ qemuDomainObjPrivatePtr priv;
+
+ qemuDriverLock(driver);
+ vm = virDomainFindByUUID(&driver->domains, dom->uuid);
+ qemuDriverUnlock(driver);
+
+ if (!vm) {
+ char uuidstr[VIR_UUID_STRING_BUFLEN];
+ virUUIDFormat(dom->uuid, uuidstr);
+ qemuReportError(VIR_ERR_NO_DOMAIN,
+ _("no domain with matching uuid '%s'"),
uuidstr);
+ goto cleanup;
+ }
+
+ if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0)
+ goto cleanup;
+
+ if (!virDomainObjIsActive(vm)) {
+ qemuReportError(VIR_ERR_OPERATION_INVALID,
+ "%s", _("domain is not running"));
+ goto endjob;
+ }
+
+ priv = vm->privateData;
+ qemuDomainObjEnterMonitor(driver, vm);
+ ret = qemuMonitorSystemReset(priv->mon);
+ qemuDomainObjExitMonitor(driver, vm);
+
+ priv->fakeReboot = false;
+
+endjob:
+ if (qemuDomainObjEndJob(driver, vm) == 0)
+ vm = NULL;
+
+cleanup:
+ if (vm)
+ virDomainObjUnlock(vm);
+ return ret;
+}
+
+
/* Count how many snapshots in a set have external disk snapshots. */
static void
qemuDomainSnapshotCountExternal(void *payload,
@@ -10335,6 +10380,7 @@ static virDriver qemuDriver = {
.domainResume = qemudDomainResume, /* 0.2.0 */
.domainShutdown = qemuDomainShutdown, /* 0.2.0 */
.domainReboot = qemuDomainReboot, /* 0.9.3 */
+ .domainReset = qemuDomainReset, /* 0.9.7 */
.domainDestroy = qemuDomainDestroy, /* 0.2.0 */
.domainDestroyFlags = qemuDomainDestroyFlags, /* 0.9.4 */
.domainGetOSType = qemudDomainGetOSType, /* 0.2.2 */
--
1.7.4.1
4:05 a.m.
New subject: [libvirt] [PATCH 3/4] remote: Implement 'reset' for remote driver
Signed-off-by: Xu He Jie <xuhj(a)linux.vnet.ibm.com>
---
src/remote/remote_driver.c | 1 +
src/remote/remote_protocol.x | 7 ++++++-
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 1217d94..372341c 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -4313,6 +4313,7 @@ static virDriver remote_driver = {
.domainResume = remoteDomainResume, /* 0.3.0 */
.domainShutdown = remoteDomainShutdown, /* 0.3.0 */
.domainReboot = remoteDomainReboot, /* 0.3.0 */
+ .domainReset = remoteDomainReset, /* 0.3.0 */
.domainDestroy = remoteDomainDestroy, /* 0.3.0 */
.domainDestroyFlags = remoteDomainDestroyFlags, /* 0.9.4 */
.domainGetOSType = remoteDomainGetOSType, /* 0.3.0 */
diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
index 455e324..ee84b51 100644
--- a/src/remote/remote_protocol.x
+++ b/src/remote/remote_protocol.x
@@ -688,6 +688,10 @@ struct remote_domain_reboot_args {
unsigned int flags;
};
+struct remote_domain_reset_args {
+ remote_nonnull_domain dom;
+};
+
struct remote_domain_destroy_args {
remote_nonnull_domain dom;
};
@@ -2509,7 +2513,8 @@ enum remote_procedure {
REMOTE_PROC_DOMAIN_EVENT_BLOCK_JOB = 241, /* skipgen skipgen */
REMOTE_PROC_DOMAIN_MIGRATE_GET_MAX_SPEED = 242, /* autogen autogen */
- REMOTE_PROC_DOMAIN_BLOCK_STATS_FLAGS = 243 /* skipgen skipgen */
+ REMOTE_PROC_DOMAIN_BLOCK_STATS_FLAGS = 243, /* skipgen skipgen */
+ REMOTE_PROC_DOMAIN_RESET = 244 /* autogen autogen */
/*
* Notice how the entries are grouped in sets of 10 ?
--
1.7.4.1
9:51 a.m.
New subject: [libvirt] [PATCH 3/4] remote: Implement 'reset' for remote driver
On 28.09.2011 11:05, Xu He Jie wrote:
Signed-off-by: Xu He Jie <xuhj(a)linux.vnet.ibm.com>
---
src/remote/remote_driver.c | 1 +
src/remote/remote_protocol.x | 7 ++++++-
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 1217d94..372341c 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -4313,6 +4313,7 @@ static virDriver remote_driver = {
.domainResume = remoteDomainResume, /* 0.3.0 */
.domainShutdown = remoteDomainShutdown, /* 0.3.0 */
.domainReboot = remoteDomainReboot, /* 0.3.0 */
+ .domainReset = remoteDomainReset, /* 0.3.0 */
One small nit, the number in comment means the version when
corresponding API was introduced. So please change this to 0.9.7
Michal
4:06 a.m.
New subject: [libvirt] [PATCH 4/4] virsh: Add 'reset' command for virsh
Signed-off-by: Xu He Jie <xuhj(a)linux.vnet.ibm.com>
---
tools/virsh.c | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 insertions(+), 0 deletions(-)
diff --git a/tools/virsh.c b/tools/virsh.c
index 13be03b..13b10cd 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -3188,6 +3188,44 @@ cmdReboot(vshControl *ctl, const vshCmd *cmd)
}
/*
+ * "reset" command
+ */
+static const vshCmdInfo info_reset[] = {
+ {"help", N_("reset a domain")},
+ {"desc", N_("Reset the target domain immediately without any guest
shutdown.")},
+ {NULL, NULL}
+};
+
+static const vshCmdOptDef opts_reset[] = {
+ {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or
uuid")},
+ {NULL, 0, 0, NULL}
+};
+
+static bool
+cmdReset(vshControl *ctl, const vshCmd *cmd)
+{
+ virDomainPtr dom;
+ bool ret = true;
+ const char *name;
+
+ if (!vshConnectionUsability(ctl, ctl->conn))
+ return false;
+
+ if (!(dom = vshCommandOptDomain(ctl, cmd, &name)))
+ return false;
+
+ if (virDomainReset(dom) == 0) {
+ vshPrint(ctl, _("Domain %s is being reseted\n"), name);
+ } else {
+ vshError(ctl, _("Failed to reset domain %s"), name);
+ ret = false;
+ }
+
+ virDomainFree(dom);
+ return ret;
+}
+
+/*
* "destroy" command
*/
static const vshCmdInfo info_destroy[] = {
@@ -13574,6 +13612,7 @@ static const vshCmdDef domManagementCmds[] = {
{"migrate-getspeed", cmdMigrateGetMaxSpeed,
opts_migrate_getspeed, info_migrate_getspeed, 0},
{"reboot", cmdReboot, opts_reboot, info_reboot, 0},
+ {"reset", cmdReset, opts_reset, info_reset, 0},
{"restore", cmdRestore, opts_restore, info_restore, 0},
{"resume", cmdResume, opts_resume, info_resume, 0},
{"save", cmdSave, opts_save, info_save, 0},
--
1.7.4.1
9:49 a.m.
New subject: [libvirt] [PATCH 4/4] virsh: Add 'reset' command for virsh
On 28.09.2011 11:06, Xu He Jie wrote:
Signed-off-by: Xu He Jie <xuhj(a)linux.vnet.ibm.com>
---
tools/virsh.c | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 insertions(+), 0 deletions(-)
I think this needs to be documented in man-page as well.
Michal
9:35 p.m.
New subject: [libvirt] [PATCH 4/4] virsh: Add 'reset' command for virsh
On 2011年09月28日 22:49, Michal Privoznik wrote:
On 28.09.2011 11:06, Xu He Jie wrote:
> Signed-off-by: Xu He Jie<xuhj(a)linux.vnet.ibm.com>
> ---
> tools/virsh.c | 39 +++++++++++++++++++++++++++++++++++++++
> 1 files changed, 39 insertions(+), 0 deletions(-)
I think this needs to be documented in man-page as well.
Michal
Thanks!
4:46 a.m.
On Wed, Sep 28, 2011 at 05:03:05PM +0800, Xu He Jie wrote:
Add new public api for 'reset'.
It can reset domain immediately without any guest shutdown.
Signed-off-by: Xu He Jie <xuhj(a)linux.vnet.ibm.com>
---
include/libvirt/libvirt.h.in | 2 +
src/driver.h | 3 ++
src/libvirt.c | 44 ++++++++++++++++++++++++++++++++++++++++++
src/libvirt_public.syms | 5 ++++
4 files changed, 54 insertions(+), 0 deletions(-)
diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in
index 39155a6..3d60023 100644
--- a/include/libvirt/libvirt.h.in
+++ b/include/libvirt/libvirt.h.in
@@ -1031,6 +1031,8 @@ virDomainPtr virDomainLookupByUUIDString
(virConnectPtr conn,
int virDomainShutdown (virDomainPtr domain);
int virDomainReboot (virDomainPtr domain,
unsigned int flags);
+int virDomainReset (virDomainPtr domain);
+
I would add flags even if unused yet
int virDomainDestroy (virDomainPtr
domain);
int virDomainDestroyFlags (virDomainPtr domain,
unsigned int flags);
diff --git a/src/driver.h b/src/driver.h
index 3792003..fd0d3a1 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -124,6 +124,8 @@ typedef int
(*virDrvDomainReboot) (virDomainPtr domain,
unsigned int flags);
typedef int
+ (*virDrvDomainReset) (virDomainPtr domain);
+typedef int
(*virDrvDomainDestroy) (virDomainPtr domain);
typedef int
(*virDrvDomainDestroyFlags) (virDomainPtr domain,
@@ -755,6 +757,7 @@ struct _virDriver {
virDrvDomainResume domainResume;
virDrvDomainShutdown domainShutdown;
virDrvDomainReboot domainReboot;
+ virDrvDomainReset domainReset;
virDrvDomainDestroy domainDestroy;
virDrvDomainDestroyFlags domainDestroyFlags;
virDrvDomainGetOSType domainGetOSType;
diff --git a/src/libvirt.c b/src/libvirt.c
index 8f94b11..3c5cd5e 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -3017,6 +3017,50 @@ error:
}
/**
+ * virDomainReset:
+ * @domain: a domain object
+ *
+ * Reset a domain immediately without any guest shutdown
Hum, so the goal of the reset operation is that it resets the
domain. That's a bit light in terms of semantic. What does that
mean actually ?
Does that emulate the power reset of a button on a machine, i.e.
all hardware see the RST line set and reinitialize their internal state
?
If yes the obvious danger of this operation about loss of data should be
made very clear.
+ * Returns 0 in case of success and -1 in case of failure.
+ */
+int
+virDomainReset(virDomainPtr domain)
Daniel
--
Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/
daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/
http://veillard.com/ | virtualization library http://libvirt.org/
9:34 p.m.
On 2011年09月28日 17:46, Daniel Veillard wrote:
On Wed, Sep 28, 2011 at 05:03:05PM +0800, Xu He Jie wrote:
> Add new public api for 'reset'.
> It can reset domain immediately without any guest shutdown.
>
> Signed-off-by: Xu He Jie<xuhj(a)linux.vnet.ibm.com>
> ---
> include/libvirt/libvirt.h.in | 2 +
> src/driver.h | 3 ++
> src/libvirt.c | 44 ++++++++++++++++++++++++++++++++++++++++++
> src/libvirt_public.syms | 5 ++++
> 4 files changed, 54 insertions(+), 0 deletions(-)
>
> diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in
> index 39155a6..3d60023 100644
> --- a/include/libvirt/libvirt.h.in
> +++ b/include/libvirt/libvirt.h.in
> @@ -1031,6 +1031,8 @@ virDomainPtr virDomainLookupByUUIDString
(virConnectPtr conn,
> int virDomainShutdown (virDomainPtr domain);
> int virDomainReboot (virDomainPtr domain,
> unsigned int flags);
> +int virDomainReset (virDomainPtr domain);
> +
I would add flags even if unused yet
ok.
> int virDomainDestroy (virDomainPtr
domain);
> int virDomainDestroyFlags (virDomainPtr domain,
> unsigned int flags);
> diff --git a/src/driver.h b/src/driver.h
> index 3792003..fd0d3a1 100644
> --- a/src/driver.h
> +++ b/src/driver.h
> @@ -124,6 +124,8 @@ typedef int
> (*virDrvDomainReboot) (virDomainPtr domain,
> unsigned int flags);
> typedef int
> + (*virDrvDomainReset) (virDomainPtr domain);
> +typedef int
> (*virDrvDomainDestroy) (virDomainPtr domain);
> typedef int
> (*virDrvDomainDestroyFlags) (virDomainPtr domain,
> @@ -755,6 +757,7 @@ struct _virDriver {
> virDrvDomainResume domainResume;
> virDrvDomainShutdown domainShutdown;
> virDrvDomainReboot domainReboot;
> + virDrvDomainReset domainReset;
> virDrvDomainDestroy domainDestroy;
> virDrvDomainDestroyFlags domainDestroyFlags;
> virDrvDomainGetOSType domainGetOSType;
> diff --git a/src/libvirt.c b/src/libvirt.c
> index 8f94b11..3c5cd5e 100644
> --- a/src/libvirt.c
> +++ b/src/libvirt.c
> @@ -3017,6 +3017,50 @@ error:
> }
>
> /**
> + * virDomainReset:
> + * @domain: a domain object
> + *
> + * Reset a domain immediately without any guest shutdown
Hum, so the goal of the reset operation is that it resets the
domain. That's a bit light in terms of semantic. What does that
mean actually ?
Does that emulate the power reset of a button on a machine, i.e.
all hardware see the RST line set and reinitialize their internal state
?
If yes the obvious danger of this operation about loss of data should be
made very clear.
Yes, It is danger of this operation. I can add clearer comment
in here and virsh's help description.
> + * Returns 0 in case of success and -1 in case of failure.
> + */
> +int
> +virDomainReset(virDomainPtr domain)
Daniel
Thanks!
2:28 p.m.
yes, I have try reset and reboot.
reset can work. But after reset a domain, start VNC to connect the
domain, the cursor does not move with the mouse move.
but reboot the domain, the domain can run normally.
And then I run qemu directly to reset a domain, the mouse cursor is also
abnormal.
On 09/28/2011 05:03 PM, Xu He Jie wrote:
Add new public api for 'reset'.
It can reset domain immediately without any guest shutdown.
Signed-off-by: Xu He Jie<xuhj(a)linux.vnet.ibm.com>
---
include/libvirt/libvirt.h.in | 2 +
src/driver.h | 3 ++
src/libvirt.c | 44 ++++++++++++++++++++++++++++++++++++++++++
src/libvirt_public.syms | 5 ++++
4 files changed, 54 insertions(+), 0 deletions(-)
diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in
index 39155a6..3d60023 100644
--- a/include/libvirt/libvirt.h.in
+++ b/include/libvirt/libvirt.h.in
@@ -1031,6 +1031,8 @@ virDomainPtr virDomainLookupByUUIDString
(virConnectPtr conn,
int virDomainShutdown (virDomainPtr domain);
int virDomainReboot (virDomainPtr domain,
unsigned int flags);
+int virDomainReset (virDomainPtr domain);
+
int virDomainDestroy (virDomainPtr domain);
int virDomainDestroyFlags (virDomainPtr domain,
unsigned int flags);
diff --git a/src/driver.h b/src/driver.h
index 3792003..fd0d3a1 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -124,6 +124,8 @@ typedef int
(*virDrvDomainReboot) (virDomainPtr domain,
unsigned int flags);
typedef int
+ (*virDrvDomainReset) (virDomainPtr domain);
+typedef int
(*virDrvDomainDestroy) (virDomainPtr domain);
typedef int
(*virDrvDomainDestroyFlags) (virDomainPtr domain,
@@ -755,6 +757,7 @@ struct _virDriver {
virDrvDomainResume domainResume;
virDrvDomainShutdown domainShutdown;
virDrvDomainReboot domainReboot;
+ virDrvDomainReset domainReset;
virDrvDomainDestroy domainDestroy;
virDrvDomainDestroyFlags domainDestroyFlags;
virDrvDomainGetOSType domainGetOSType;
diff --git a/src/libvirt.c b/src/libvirt.c
index 8f94b11..3c5cd5e 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -3017,6 +3017,50 @@ error:
}
/**
+ * virDomainReset:
+ * @domain: a domain object
+ *
+ * Reset a domain immediately without any guest shutdown
+ *
+ * Returns 0 in case of success and -1 in case of failure.
+ */
+int
+virDomainReset(virDomainPtr domain)
+{
+ virConnectPtr conn;
+
+ VIR_DOMAIN_DEBUG(domain);
+
+ virResetLastError();
+
+ if (!VIR_IS_CONNECTED_DOMAIN(domain)) {
+ virLibDomainError(VIR_ERR_INVALID_DOMAIN, __FUNCTION__);
+ virDispatchError(NULL);
+ return -1;
+ }
+ if (domain->conn->flags& VIR_CONNECT_RO) {
+ virLibDomainError(VIR_ERR_OPERATION_DENIED, __FUNCTION__);
+ goto error;
+ }
+
+ conn = domain->conn;
+
+ if (conn->driver->domainReset) {
+ int ret;
+ ret = conn->driver->domainReset (domain);
+ if (ret< 0)
+ goto error;
+ return ret;
+ }
+
+ virLibConnError(VIR_ERR_NO_SUPPORT, __FUNCTION__);
+
+error:
+ virDispatchError(domain->conn);
+ return -1;
+}
+
+/**
* virDomainGetName:
* @domain: a domain object
*
diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms
index 8a6d55a..dffa33f 100644
--- a/src/libvirt_public.syms
+++ b/src/libvirt_public.syms
@@ -489,4 +489,9 @@ LIBVIRT_0.9.5 {
virDomainSnapshotGetName;
} LIBVIRT_0.9.4;
+LIBVIRT_0.9.7 {
+ global:
+ virDomainReset;
+} LIBVIRT_0.9.5;
+
# .... define new API here using predicted next version number ....
4803
days inactive
4804
days old
9 comments
4 participants
participants (4)
-
Daniel Veillard -
Michal Privoznik -
Sheldon -
Xu He Jie