On Thu, Jun 09, 2011 at 16:06:48 +0200, Michal Privoznik wrote:

...

--- src/libvirt_private.syms | 1 + src/util/util.c | 24 ++++++++++++++++++++++++ src/util/util.h | 2 ++ 3 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index e6ab870..2415a89 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1027,6 +1027,7 @@ virStrToLong_ul; virStrToLong_ull; virStrcpy; virStrncpy; +virTimeMs; virTimestamp; virVasprintf;

diff --git a/src/util/util.c b/src/util/util.c index e221abe..d758cf9 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -3117,6 +3117,30 @@ virTimestamp(void) return timestamp; }

+#define timeval_to_ms(tv) (((tv).tv_sec * 1000ull) + ((tv).tv_usec / 1000)) What about making this in util.h so we can have only one definition and

On 07.06.2011 15:01, Jiri Denemark wrote: then cleanup src/qemu/qemu_domain.c:48, src/qemu/qemu_driver.c:116, src/qemu/qemu_migration.c:49?

Nope, one of the reasons for virTimeMs is to get rid of timeval_to_ms usage in those files (which is done by patch 2/6).

...

--- a/src/util/util.h +++ b/src/util/util.h @@ -286,6 +286,8 @@ int virBuildPathInternal(char **path, ...) ATTRIBUTE_SENTINEL;

char *virTimestamp(void);

+int virTimeMs(unsigned long long *ms); I'd add ATTRIBUTE_NONNULL(1); here.

Added and pushed, thanks. Jirka

On Mon, Jun 13, 2011 at 16:15:39 +0800, Daniel Veillard wrote:

On Tue, Jun 07, 2011 at 03:01:56PM +0200, Jiri Denemark wrote: ...

...

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index f7eaa1c..5d7494b 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -852,13 +849,9 @@ qemuMigrationUpdateJobStatus(struct qemud_driver *driver, return -1; }

- if (gettimeofday(&now, NULL) < 0) { - priv->jobInfo.type = VIR_DOMAIN_JOB_FAILED; - virReportSystemError(errno, "%s", - _("cannot get time of day")); + if (virTimeMs(&priv->jobInfo.timeElapsed) < 0) return -1; - } - priv->jobInfo.timeElapsed = timeval_to_ms(now) - priv->jobStart; + priv->jobInfo.timeElapsed -= priv->jobStart;

switch (status) { case QEMU_MONITOR_MIGRATION_STATUS_INACTIVE:

Actually this chunk was wrong since it didn't set priv->jobInfo.type = VIR_DOMAIN_JOB_FAILED if virTimeMs failed. So I fixed it

ACK, this cleans things up on top of previous patch and looks correct

and pushed. Thanks, Jirka

Hi Jiri, I don't see the libvirt_virDomainGetControlInfo implementation in libvirt-override.c. $ nm -D python/.libs/libvirtmod.so | grep virDomainGetControlInfo (empty) Is the python binding postponed to a future patch? -- Federico On Tue, Jun 7, 2011 at 3:01 PM, Jiri Denemark <jdenemar@redhat.com> wrote:

The API can be used to query current state of an interface to VMM used to control a domain. In QEMU world this translates into monitor connection. ---  include/libvirt/libvirt.h.in    |   40 ++++++++++++++++++++++++++++++++  python/generator.py             |    1 +  python/libvirt-override-api.xml |    6 +++++  src/driver.h                    |    5 ++++  src/libvirt.c                   |   48 +++++++++++++++++++++++++++++++++++++++  src/libvirt_public.syms         |    5 ++++  6 files changed, 105 insertions(+), 0 deletions(-)

diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index df213f1..1454ca0 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -141,6 +141,43 @@ typedef enum {     VIR_DOMAIN_CRASHED_UNKNOWN = 0,     /* crashed for unknown reason */  } virDomainCrashedReason;

+ +/** + * virDomainControlState: + * + * Current state of a control interface to the domain. + */ +typedef enum { +    VIR_DOMAIN_CONTROL_OK = 0,       /* operational, ready to accept commands */ +    VIR_DOMAIN_CONTROL_JOB = 1,      /* background job is running (can be +                                        monitored by virDomainGetJobInfo); only +                                        limited set of commands may be allowed */ +    VIR_DOMAIN_CONTROL_OCCUPIED = 2, /* occupied by a running command */ +    VIR_DOMAIN_CONTROL_ERROR = 3,    /* unusable, domain cannot be fully operated */ +} virDomainControlState; + +/** + * virDomainControlInfo: + * + * Structure filled in by virDomainGetControlInfo and providing details about + * current state of control interface to a domain. + */ +typedef struct _virDomainControlInfo virDomainControlInfo; +struct _virDomainControlInfo { +    unsigned int state;     /* control state, one of virDomainControlState */ +    unsigned int details;   /* state details, currently 0 */ +    unsigned long long stateTime; /* for how long (in msec) control interface +                                     has been in current state (except for OK +                                     and ERROR states) */ +}; + +/** + * virDomainControlInfoPtr: + * + * Pointer to virDomainControlInfo structure. + */ +typedef virDomainControlInfo *virDomainControlInfoPtr; +  /**  * virDomainModificationImpact:  * @@ -781,6 +818,9 @@ int                     virDomainGetState       (virDomainPtr domain,                                                  int *state,                                                  int *reason,                                                  unsigned int flags); +int                     virDomainGetControlInfo (virDomainPtr domain, +                                                 virDomainControlInfoPtr info, +                                                 unsigned int flags);

 /*  * Return scheduler type in effect 'sedf', 'credit', 'linux' diff --git a/python/generator.py b/python/generator.py index 7c38fdd..4e3e9fa 100755 --- a/python/generator.py +++ b/python/generator.py @@ -306,6 +306,7 @@ skip_impl = (     'virGetLastError',     'virDomainGetInfo',     'virDomainGetState', +    'virDomainGetControlInfo',     'virDomainGetBlockInfo',     'virDomainGetJobInfo',     'virNodeGetInfo', diff --git a/python/libvirt-override-api.xml b/python/libvirt-override-api.xml index ec08e69..01207d6 100644 --- a/python/libvirt-override-api.xml +++ b/python/libvirt-override-api.xml @@ -54,6 +54,12 @@       <arg name='domain' type='virDomainPtr' info='a domain object'/>       <arg name='flags' type='unsigned int' info='additional flags'/>     </function> +    <function name='virDomainGetControlInfo' file='python'> +      <info>Extract details about current state of control interface to a domain.</info> +      <return type='int *' info='the list of information or None in case of error'/> +      <arg name='domain' type='virDomainPtr' info='a domain object'/> +      <arg name='flags' type='unsigned int' info='additional flags'/> +    </function>     <function name='virDomainGetBlockInfo' file='python'>       <info>Extract information about a domain block device size</info>       <return type='int *' info='the list of information or None in case of error'/> diff --git a/src/driver.h b/src/driver.h index 5df798a..ca49b08 100644 --- a/src/driver.h +++ b/src/driver.h @@ -171,6 +171,10 @@ typedef int                                          int *reason,                                          unsigned int flags);  typedef int +        (*virDrvDomainGetControlInfo)   (virDomainPtr domain, +                                         virDomainControlInfoPtr info, +                                         unsigned int flags); +typedef int         (*virDrvDomainSave)            (virDomainPtr domain,                                          const char *to);  typedef int @@ -663,6 +667,7 @@ struct _virDriver {     virDrvDomainGetBlkioParameters domainGetBlkioParameters;     virDrvDomainGetInfo                domainGetInfo;     virDrvDomainGetState       domainGetState; +    virDrvDomainGetControlInfo  domainGetControlInfo;     virDrvDomainSave           domainSave;     virDrvDomainRestore                domainRestore;     virDrvDomainCoreDump        domainCoreDump; diff --git a/src/libvirt.c b/src/libvirt.c index 18c4e08..81dd879 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -3261,6 +3261,54 @@ error:  }

 /** + * virDomainGetControlInfo: + * @domain: a domain object + * @info: pointer to a virDomainControlInfo structure allocated by the user + * @flags: additional flags, 0 for now + * + * Extract details about current state of control interface to a domain. + * + * Returns 0 in case of success and -1 in case of failure. + */ +int +virDomainGetControlInfo(virDomainPtr domain, +                        virDomainControlInfoPtr info, +                        unsigned int flags) +{ +    virConnectPtr conn; + +    VIR_DOMAIN_DEBUG(domain, "info=%p", info); + +    virResetLastError(); + +    if (!VIR_IS_CONNECTED_DOMAIN(domain)) { +        virLibDomainError(VIR_ERR_INVALID_DOMAIN, __FUNCTION__); +        virDispatchError(NULL); +        return -1; +    } + +    if (!info) { +        virLibDomainError(VIR_ERR_INVALID_ARG, __FUNCTION__); +        goto error; +    } + +    conn = domain->conn; +    if (conn->driver->domainGetControlInfo) { +        int ret; +        ret = conn->driver->domainGetControlInfo(domain, info, flags); +        if (ret < 0) +            goto error; +        return ret; +    } + +    virLibConnError(VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: +    virDispatchError(domain->conn); +    return -1; +} + +/**  * virDomainGetXMLDesc:  * @domain: a domain object  * @flags: an OR'ed set of virDomainXMLFlags diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms index 4d4299a..0e55097 100644 --- a/src/libvirt_public.syms +++ b/src/libvirt_public.syms @@ -450,4 +450,9 @@ LIBVIRT_0.9.2 {         virInterfaceChangeRollback;  } LIBVIRT_0.9.0;

+LIBVIRT_0.9.3 { +    global: +        virDomainGetControlInfo; +} LIBVIRT_0.9.2; +  # .... define new API here using predicted next version number .... -- 1.7.5.3

-- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list

On Tue, Jun 07, 2011 at 03:01:57PM +0200, Jiri Denemark wrote:

The API can be used to query current state of an interface to VMM used to control a domain. In QEMU world this translates into monitor connection. [...] diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index df213f1..1454ca0 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -141,6 +141,43 @@ typedef enum { VIR_DOMAIN_CRASHED_UNKNOWN = 0, /* crashed for unknown reason */ } virDomainCrashedReason;

+ +/** + * virDomainControlState: + * + * Current state of a control interface to the domain. + */ +typedef enum { + VIR_DOMAIN_CONTROL_OK = 0, /* operational, ready to accept commands */ + VIR_DOMAIN_CONTROL_JOB = 1, /* background job is running (can be + monitored by virDomainGetJobInfo); only + limited set of commands may be allowed */ + VIR_DOMAIN_CONTROL_OCCUPIED = 2, /* occupied by a running command */ + VIR_DOMAIN_CONTROL_ERROR = 3, /* unusable, domain cannot be fully operated */ +} virDomainControlState; + +/** + * virDomainControlInfo: + * + * Structure filled in by virDomainGetControlInfo and providing details about + * current state of control interface to a domain. + */ +typedef struct _virDomainControlInfo virDomainControlInfo; +struct _virDomainControlInfo { + unsigned int state; /* control state, one of virDomainControlState */ + unsigned int details; /* state details, currently 0 */ + unsigned long long stateTime; /* for how long (in msec) control interface + has been in current state (except for OK + and ERROR states) */ +}; + +/** + * virDomainControlInfoPtr: + * + * Pointer to virDomainControlInfo structure. + */ +typedef virDomainControlInfo *virDomainControlInfoPtr; + /** * virDomainModificationImpact: * @@ -781,6 +818,9 @@ int virDomainGetState (virDomainPtr domain, int *state, int *reason, unsigned int flags); +int virDomainGetControlInfo (virDomainPtr domain, + virDomainControlInfoPtr info, + unsigned int flags);

that's really the "meat" of that patchset, it looks fine, ACK from me but since you intent a v2 don't commit right now :-) Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel@veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

On Mon, Jun 13, 2011 at 12:13:15PM +0200, Jiri Denemark wrote:

The API can be used to query current state of an interface to VMM used to control a domain. In QEMU world this translates into monitor connection. --- Notes: Version 2: - really implement python binding

[...]

diff --git a/python/generator.py b/python/generator.py index 7c38fdd..4e3e9fa 100755 --- a/python/generator.py +++ b/python/generator.py @@ -306,6 +306,7 @@ skip_impl = ( 'virGetLastError', 'virDomainGetInfo', 'virDomainGetState', + 'virDomainGetControlInfo', 'virDomainGetBlockInfo', 'virDomainGetJobInfo', 'virNodeGetInfo', diff --git a/python/libvirt-override-api.xml b/python/libvirt-override-api.xml index ec08e69..01207d6 100644 --- a/python/libvirt-override-api.xml +++ b/python/libvirt-override-api.xml @@ -54,6 +54,12 @@ <arg name='domain' type='virDomainPtr' info='a domain object'/> <arg name='flags' type='unsigned int' info='additional flags'/> </function> + <function name='virDomainGetControlInfo' file='python'> + <info>Extract details about current state of control interface to a domain.</info> + <return type='int *' info='the list of information or None in case of error'/> + <arg name='domain' type='virDomainPtr' info='a domain object'/> + <arg name='flags' type='unsigned int' info='additional flags'/> + </function> <function name='virDomainGetBlockInfo' file='python'> <info>Extract information about a domain block device size</info> <return type='int *' info='the list of information or None in case of error'/> diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 974decb..c6a1d4f 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -1100,6 +1100,32 @@ libvirt_virDomainGetState(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) }

static PyObject * +libvirt_virDomainGetControlInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { + PyObject *py_retval; + int c_retval; + virDomainPtr domain; + PyObject *pyobj_domain; + virDomainControlInfo info; + unsigned int flags; + + if (!PyArg_ParseTuple(args, (char *)"Oi:virDomainGetControlInfo", + &pyobj_domain, &flags)) + return NULL; + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + LIBVIRT_BEGIN_ALLOW_THREADS; + c_retval = virDomainGetControlInfo(domain, &info, flags); + LIBVIRT_END_ALLOW_THREADS; + if (c_retval < 0) + return VIR_PY_NONE; + py_retval = PyList_New(3); + PyList_SetItem(py_retval, 0, libvirt_intWrap(info.state)); + PyList_SetItem(py_retval, 1, libvirt_intWrap(info.details)); + PyList_SetItem(py_retval, 2, libvirt_longlongWrap(info.stateTime)); + return py_retval; +} + +static PyObject * libvirt_virDomainGetBlockInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { PyObject *py_retval; int c_retval; @@ -3555,6 +3581,7 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virConnectDomainEventDeregisterAny", libvirt_virConnectDomainEventDeregisterAny, METH_VARARGS, NULL}, {(char *) "virDomainGetInfo", libvirt_virDomainGetInfo, METH_VARARGS, NULL}, {(char *) "virDomainGetState", libvirt_virDomainGetState, METH_VARARGS, NULL}, + {(char *) "virDomainGetControlInfo", libvirt_virDomainGetControlInfo, METH_VARARGS, NULL}, {(char *) "virDomainGetBlockInfo", libvirt_virDomainGetBlockInfo, METH_VARARGS, NULL}, {(char *) "virNodeGetInfo", libvirt_virNodeGetInfo, METH_VARARGS, NULL}, {(char *) "virDomainGetUUID", libvirt_virDomainGetUUID, METH_VARARGS, NULL},

Okay, ACK for the python side addition, could you just make 100% sure that the VIR_DOMAIN_CONTROL_... values are correctly grabbed by the the generator and put in the final libvirt.py ? thanks, Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel@veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

On Tue, Jun 07, 2011 at 03:01:58PM +0200, Jiri Denemark wrote:

--- daemon/remote_generator.pl | 20 ++++++++++++++------ src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 14 +++++++++++++- src/remote_protocol-structs | 9 +++++++++ 4 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/daemon/remote_generator.pl b/daemon/remote_generator.pl index 632972c..8881d6c 100755 --- a/daemon/remote_generator.pl +++ b/daemon/remote_generator.pl @@ -668,9 +668,13 @@ elsif ($opt_b) { my $struct_name = $call->{ProcName}; $struct_name =~ s/Get//;

- if ($call->{ProcName} eq "DomainGetBlockInfo") { - # SPECIAL: virDomainGetBlockInfo has flags parameter after - # the struct parameter in its signature + if ($call->{ProcName} eq "DomainGetBlockInfo" || + $call->{ProcName} eq "DomainGetControlInfo") { + # SPECIAL: virDomainGetBlockInfo and virDomainGetControlInfo + # have flags parameter after the struct parameter in + # its signature + # FIXME: this doesn't sound special at all; flags parameter is + # almost always the last one; anything else is special my $flags = pop(@args_list); push(@args_list, "&tmp"); push(@args_list, $flags); @@ -1203,9 +1207,13 @@ elsif ($opt_k) { my $struct_name = $call->{ProcName}; $struct_name =~ s/Get//;

- if ($call->{ProcName} eq "DomainGetBlockInfo") { - # SPECIAL: virDomainGetBlockInfo has flags parameter after - # the struct parameter in its signature + if ($call->{ProcName} eq "DomainGetBlockInfo" || + $call->{ProcName} eq "DomainGetControlInfo") { + # SPECIAL: virDomainGetBlockInfo and virDomainGetControlInfo + # have flags parameter after the struct parameter in + # its signature + # FIXME: this doesn't sound special at all; flags parameter is + # almost always the last one; anything else is special $last_arg = pop(@args_list); }

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 8335a1a..f1c6674 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -6251,6 +6251,7 @@ static virDriver remote_driver = { .domainGetBlkioParameters = remoteDomainGetBlkioParameters, /* 0.9.0 */ .domainGetInfo = remoteDomainGetInfo, /* 0.3.0 */ .domainGetState = remoteDomainGetState, /* 0.9.2 */ + .domainGetControlInfo = remoteDomainGetControlInfo, /* 0.9.3 */ .domainSave = remoteDomainSave, /* 0.3.0 */ .domainRestore = remoteDomainRestore, /* 0.3.0 */ .domainCoreDump = remoteDomainCoreDump, /* 0.3.0 */ diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index c9b8cff..7e8ad6d 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -2035,6 +2035,17 @@ struct remote_domain_event_control_error_msg { remote_nonnull_domain dom; };

+struct remote_domain_get_control_info_args { + remote_nonnull_domain dom; + unsigned int flags; +}; + +struct remote_domain_get_control_info_ret { + unsigned int state; + unsigned int details; + unsigned hyper stateTime; +}; + /*----- Protocol. -----*/

/* Define the program number, protocol version and procedure numbers here. */ @@ -2297,7 +2308,8 @@ enum remote_procedure { REMOTE_PROC_INTERFACE_CHANGE_COMMIT = 221, /* autogen autogen */ REMOTE_PROC_INTERFACE_CHANGE_ROLLBACK = 222, /* autogen autogen */ REMOTE_PROC_DOMAIN_GET_SCHEDULER_PARAMETERS_FLAGS = 223, /* skipgen autogen */ - REMOTE_PROC_DOMAIN_EVENT_CONTROL_ERROR = 224 /* skipgen skipgen */ + REMOTE_PROC_DOMAIN_EVENT_CONTROL_ERROR = 224, /* skipgen skipgen */ + REMOTE_PROC_DOMAIN_GET_CONTROL_INFO = 225 /* autogen autogen */

/* * Notice how the entries are grouped in sets of 10 ? diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index 1d90dd5..18511be 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -1542,6 +1542,15 @@ struct remote_domain_migrate_confirm3_args { struct remote_domain_event_control_error_msg { remote_nonnull_domain dom; }; +struct remote_domain_get_control_info_args { + remote_nonnull_domain dom; + u_int flags; +}; +struct remote_domain_get_control_info_ret { + u_int state; + u_int details; + uint64_t stateTime; +}; struct remote_message_header { u_int prog; u_int vers;

ACK, Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel@veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

On Tue, Jun 07, 2011 at 03:01:59PM +0200, Jiri Denemark wrote:

--- src/qemu/qemu_domain.c | 4 +++ src/qemu/qemu_domain.h | 2 + src/qemu/qemu_driver.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_process.c | 3 ++ 4 files changed, 70 insertions(+), 0 deletions(-)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 5f18ad3..06d2a5e 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -609,6 +609,7 @@ void qemuDomainObjEnterMonitor(virDomainObjPtr obj)

qemuMonitorLock(priv->mon); qemuMonitorRef(priv->mon); + virTimeMs(&priv->monStart); virDomainObjUnlock(obj); }

@@ -629,6 +630,7 @@ void qemuDomainObjExitMonitor(virDomainObjPtr obj)

virDomainObjLock(obj);

+ priv->monStart = 0; if (refs == 0) { priv->mon = NULL; } @@ -650,6 +652,7 @@ void qemuDomainObjEnterMonitorWithDriver(struct qemud_driver *driver,

qemuMonitorLock(priv->mon); qemuMonitorRef(priv->mon); + virTimeMs(&priv->monStart); virDomainObjUnlock(obj); qemuDriverUnlock(driver); } @@ -674,6 +677,7 @@ void qemuDomainObjExitMonitorWithDriver(struct qemud_driver *driver, qemuDriverLock(driver); virDomainObjLock(obj);

+ priv->monStart = 0; if (refs == 0) { priv->mon = NULL; }

Hum ... can we double-check that we can only enter and exit the monitor from those 4 entry points, for example in case of error. Having a small error leading to a miscategorization of the monitor being unresponsive would be a serious regression.

diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index bacf5b5..3d041fc 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -79,6 +79,8 @@ struct _qemuDomainObjPrivate { qemuMonitorPtr mon; virDomainChrSourceDefPtr monConfig; int monJSON; + bool monError; + unsigned long long monStart; bool gotShutdown;

next step would probably to measure how long monitor commands take but that's beyond GetControlInfo reach :-) [...]

--- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -166,6 +166,7 @@ qemuProcessHandleMonitorError(qemuMonitorPtr mon ATTRIBUTE_UNUSED, qemuDriverLock(driver); virDomainObjLock(vm);

+ ((qemuDomainObjPrivatePtr) vm->privateData)->monError = true; event = virDomainEventControlErrorNewFromObj(vm); if (event) qemuDomainEventQueue(driver, event); @@ -2255,6 +2256,8 @@ int qemuProcessStart(virConnectPtr conn, #endif priv->monJSON = 0;

+ priv->monError = false; + priv->monStart = 0; priv->gotShutdown = false;

if ((ret = virFileDeletePid(driver->stateDir, vm->def->name)) != 0) {

Okay, looks fine, ACK, Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel@veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

On Tue, Jun 07, 2011 at 03:02:00PM +0200, Jiri Denemark wrote:

--- tools/virsh.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 7 +++++ 2 files changed, 73 insertions(+), 0 deletions(-)

diff --git a/tools/virsh.c b/tools/virsh.c index d98be1c..2c81cf4 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -350,6 +350,7 @@ static void vshDebug(vshControl *ctl, int level, const char *format, ...) static int vshDomainState(vshControl *ctl, virDomainPtr dom, int *reason); static const char *vshDomainStateToString(int state); static const char *vshDomainStateReasonToString(int state, int reason); +static const char *vshDomainControlStateToString(int state); static const char *vshDomainVcpuStateToString(int state); static bool vshConnectionUsability(vshControl *ctl, virConnectPtr conn);

@@ -976,6 +977,53 @@ cleanup: return ret; }

+/* + * "domcontrol" command + */ +static const vshCmdInfo info_domcontrol[] = { + {"help", N_("domain control interface state")}, + {"desc", N_("Returns state of a control interface to the domain.")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_domcontrol[] = { + {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, + {NULL, 0, 0, NULL} +}; + +static bool +cmdDomControl(vshControl *ctl, const vshCmd *cmd) +{ + virDomainPtr dom; + bool ret = true; + virDomainControlInfo info; + + if (!vshConnectionUsability(ctl, ctl->conn)) + return false; + + if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) + return false; + + if (virDomainGetControlInfo(dom, &info, 0) < 0) { + ret = false; + goto cleanup; + } + + if (info.state != VIR_DOMAIN_CONTROL_OK && + info.state != VIR_DOMAIN_CONTROL_ERROR) { + vshPrint(ctl, "%s (%0.3fs)\n", + _(vshDomainControlStateToString(info.state)), + info.stateTime / 1000.0); + } else { + vshPrint(ctl, "%s\n", + _(vshDomainControlStateToString(info.state))); + } + +cleanup: + virDomainFree(dom); + return ret; +} + /* "domblkstat" command */ static const vshCmdInfo info_domblkstat[] = { @@ -11107,6 +11155,7 @@ static const vshCmdDef domManagementCmds[] = { static const vshCmdDef domMonitoringCmds[] = { {"domblkinfo", cmdDomblkinfo, opts_domblkinfo, info_domblkinfo, 0}, {"domblkstat", cmdDomblkstat, opts_domblkstat, info_domblkstat, 0}, + {"domcontrol", cmdDomControl, opts_domcontrol, info_domcontrol, 0}, {"domifstat", cmdDomIfstat, opts_domifstat, info_domifstat, 0}, {"dominfo", cmdDominfo, opts_dominfo, info_dominfo, 0}, {"dommemstat", cmdDomMemStat, opts_dommemstat, info_dommemstat, 0}, @@ -12621,6 +12670,23 @@ vshDomainStateReasonToString(int state, int reason) }

static const char * +vshDomainControlStateToString(int state) +{ + switch ((virDomainControlState) state) { + case VIR_DOMAIN_CONTROL_OK: + return N_("ok"); + case VIR_DOMAIN_CONTROL_JOB: + return N_("background job"); + case VIR_DOMAIN_CONTROL_OCCUPIED: + return N_("occupied"); + case VIR_DOMAIN_CONTROL_ERROR: + return N_("error"); + } + + return N_("unknown"); +} + +static const char * vshDomainVcpuStateToString(int state) { switch (state) { diff --git a/tools/virsh.pod b/tools/virsh.pod index 7ed3003..3f55422 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -437,6 +437,13 @@ Convert a domain Id (or UUID) to domain name Returns state about a domain. I<--reason> tells virsh to also print reason for the state.

+=item B<domcontrol> I<domain-id> + +Returns state of an interface to VMM used to control a domain. This +translates into monitor connection in QEMu world. For states other

that's "QEmu" I think, and that could be QMP or the monitor, so I'm not sure we should try to give details about one specific implementation :-)

+than "ok" or "error" the command also prints number of seconds elapsed +since the control interface entered its current state. + =item B<domxml-from-native> I<format> I<config>

Convert the file I<config> in the native guest configuration format

ACK otherwise, Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel@veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/