- Devel - libvirt List Archives

[libvirt] [PATCH] libssh2_transport: Add docs to remote.html
by Peter Krempa 24 Aug '12

24 Aug '12

Describe the existence of the transport driver and document the configurable options. --- docs/remote.html.in | 52 +++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 47 insertions(+), 5 deletions(-) diff --git a/docs/remote.html.in b/docs/remote.html.in index e6af4c2..40696b9 100644 --- a/docs/remote.html.in +++ b/docs/remote.html.in @@ -136,8 +136,14 @@ Remote libvirt supports a range of transports: <dd> Unencrypted TCP/IP socket. Not recommended for production use, this is normally disabled, but an administrator can enable it for testing or use over a trusted network. - The standard port is 16509. - </dd> + The standard port is 16509. </dd> + <dt> libssh2 </dt> + <dd> Transport over the SSH protocol using + <a href="http://libssh2.org/" title="libssh2 homepage">libssh2</a> instead +of the OpenSSH binary. This transport uses the libvirt authentication callback for +all ssh authentication calls and therefore supports keyboard-interactive authentication +even with graphical management applications. As with the classic ssh transport +netcat is required on the remote side.</dd> </dl> <p> The default transport, if no other is specified, is <code>tls</code>. @@ -182,6 +188,9 @@ Connect to a libvirtd daemon offering unencrypted TCP/IP connections on localhost port 5000 and use the test driver with default settings. </li> +<li><code>qemu+libssh2://user@host/system?known_hosts=/home/user/.ssh/known_hosts</code><br/> — +Connect to a remote host using a ssh connection with the libssh2 driver +and use a different known_hosts file.</li> </ul> <h4> <a name="Remote_URI_parameters">Extra parameters</a> @@ -237,7 +246,7 @@ Note that parameter values must be <td> <code>socket</code> </td> - <td> unix, ssh </td> + <td> unix, ssh, libssh2 </td> <td> The path to the Unix domain socket, which overrides the compiled-in default. For ssh transport, this is passed to @@ -252,7 +261,7 @@ Note that parameter values must be <td> <code>netcat</code> </td> - <td> ssh </td> + <td> ssh, libssh2 </td> <td> The name of the netcat command on the remote machine. The default is <code>nc</code>. For ssh transport, libvirt @@ -277,7 +286,7 @@ Note that parameter values must be <td> <code>keyfile</code> </td> - <td> ssh </td> + <td> ssh, libssh2 </td> <td> The name of the private key file to use to authentication to the remote machine. If this option is not used the default keys are used. @@ -341,6 +350,39 @@ Note that parameter values must be <td colspan="2"/> <td> Example: <code>pkipath=/tmp/pki/client</code> </td> </tr> + <tr> + <td> + <code>known_hosts</code> + </td> + <td> libssh2 </td> + <td> + Path to the known_hosts file to verify the host key agains. LibSSH2 + supports OpenSSH-style known_hosts files, although it does not support + all key types, so using files created by the OpenSSH binary may result + into truncating the known_hosts file. It's recommended to use the default + known_hosts file is located in libvirt's client local configuration + directory e.g.: ~/.config/libvirt/known_hosts. Note: Use absolute paths. +</td> + </tr> + <tr> + <td colspan="2"/> + <td> Example: <code>known_hosts=/root/.ssh/known_hosts</code> </td> + </tr> + <tr> + <td> + <code>sshauth</code> + </td> + <td> libssh2 </td> + <td> + A comma separated list of authentication methods to use. Default (is + "agent,privkey,keyboard-interactive". The order of the methods is perserved. + Some methods may require additional parameters. +</td> + </tr> + <tr> + <td colspan="2"/> + <td> Example: <code>sshauth=privkey,agent</code> </td> + </tr> </table> <h3> <a name="Remote_certificates">Generating TLS certificates</a> -- 1.7.12

2 2

[libvirt] How to solve this problem---libvirtError: this function is not supported by the connection driver: virNWFilterDefineXML
by Zhihong Wang 24 Aug '12

24 Aug '12

Dear all: I am trying to deploy openstack on xen hypervisor.Since XenSever or XCP is not available on our customized virtulization platform. We decide to use libvirt on xen as a middleware operating the xen hypervisor. But when I try to boot a instance , xen failed to response and I find the error in my nova.log as follows: 2012-08-24 09:17:25 ERROR nova.compute.manager [req-4b60e9a9-680c-457b-bf93-b71fb6230245 562096602c5e41748dd568d5db0f7553 6bd4a2580bcd4bef890d7ba4da82e925] [instance: 3645be21-9b5b-4718-9c9f-f6ba3588f7b4] Instance failed to spawn 2012-08-24 09:17:25 TRACE nova.compute.manager [instance: 3645be21-9b5b-4718-9c9f-f6ba3588f7b4] Traceback (most recent call last): 2012-08-24 09:17:25 TRACE nova.compute.manager [instance: 3645be21-9b5b-4718-9c9f-f6ba3588f7b4] File "/usr/lib/python2.6/site-packages/nova-2012.1-py2.6.egg/nova/compute/manager.py", line 592, in _spawn 2012-08-24 09:17:25 TRACE nova.compute.manager [instance: 3645be21-9b5b-4718-9c9f-f6ba3588f7b4] self._legacy_nw_info(network_info), block_device_info) 2012-08-24 09:17:25 TRACE nova.compute.manager [instance: 3645be21-9b5b-4718-9c9f-f6ba3588f7b4] File "/usr/lib/python2.6/site-packages/nova-2012.1-py2.6.egg/nova/exception.py", line 114, in wrapped 2012-08-24 09:17:25 TRACE nova.compute.manager [instance: 3645be21-9b5b-4718-9c9f-f6ba3588f7b4] return f(*args, **kw) 2012-08-24 09:17:25 TRACE nova.compute.manager [instance: 3645be21-9b5b-4718-9c9f-f6ba3588f7b4] File "/usr/lib/python2.6/site-packages/nova-2012.1-py2.6.egg/nova/virt/libvirt/connection.py", line 899, in spawn 2012-08-24 09:17:25 TRACE nova.compute.manager [instance: 3645be21-9b5b-4718-9c9f-f6ba3588f7b4] self.firewall_driver.setup_basic_filtering(instance, network_info) 2012-08-24 09:17:25 TRACE nova.compute.manager [instance: 3645be21-9b5b-4718-9c9f-f6ba3588f7b4] File "/usr/lib/python2.6/site-packages/nova-2012.1-py2.6.egg/nova/virt/libvirt/firewall.py", line 231, in setup_basic_filtering 2012-08-24 09:17:25 TRACE nova.compute.manager [instance: 3645be21-9b5b-4718-9c9f-f6ba3588f7b4] self.nwfilter.setup_basic_filtering(instance, network_info) 2012-08-24 09:17:25 TRACE nova.compute.manager [instance: 3645be21-9b5b-4718-9c9f-f6ba3588f7b4] File "/usr/lib/python2.6/site-packages/nova-2012.1-py2.6.egg/nova/virt/libvirt/firewall.py", line 102, in setup_basic_filtering 2012-08-24 09:17:25 TRACE nova.compute.manager [instance: 3645be21-9b5b-4718-9c9f-f6ba3588f7b4] self._ensure_static_filters() 2012-08-24 09:17:25 TRACE nova.compute.manager [instance: 3645be21-9b5b-4718-9c9f-f6ba3588f7b4] File "/usr/lib/python2.6/site-packages/nova-2012.1-py2.6.egg/nova/virt/libvirt/firewall.py", line 130, in _ensure_static_filters 2012-08-24 09:17:25 TRACE nova.compute.manager [instance: 3645be21-9b5b-4718-9c9f-f6ba3588f7b4] 'allow-dhcp-server'])) 2012-08-24 09:17:25 TRACE nova.compute.manager [instance: 3645be21-9b5b-4718-9c9f-f6ba3588f7b4] File "/usr/lib/python2.6/site-packages/nova-2012.1-py2.6.egg/nova/virt/libvirt/firewall.py", line 150, in _define_filter 2012-08-24 09:17:25 TRACE nova.compute.manager [instance: 3645be21-9b5b-4718-9c9f-f6ba3588f7b4] tpool.execute(self._conn.nwfilterDefineXML, xml) 2012-08-24 09:17:25 TRACE nova.compute.manager [instance: 3645be21-9b5b-4718-9c9f-f6ba3588f7b4] File "/usr/lib/python2.6/site-packages/eventlet/tpool.py", line 76, in tworker 2012-08-24 09:17:25 TRACE nova.compute.manager [instance: 3645be21-9b5b-4718-9c9f-f6ba3588f7b4] rv = meth(*args,**kwargs) 2012-08-24 09:17:25 TRACE nova.compute.manager [instance: 3645be21-9b5b-4718-9c9f-f6ba3588f7b4] File "/usr/lib64/python2.6/site-packages/libvirt.py", line 2628, in nwfilterDefineXML 2012-08-24 09:17:25 TRACE nova.compute.manager [instance: 3645be21-9b5b-4718-9c9f-f6ba3588f7b4] if ret is None:raise libvirtError('virNWFilterDefineXML() failed', conn=self) 2012-08-24 09:17:25 TRACE nova.compute.manager [instance: 3645be21-9b5b-4718-9c9f-f6ba3588f7b4] libvirtError: this function is not supported by the connection driver: virNWFilterDefineXML 2012-08-24 09:17:25 TRACE nova.compute.manager [instance: 3645be21-9b5b-4718-9c9f-f6ba3588f7b4] It seems that libvirt doesn't support virNWFilterDefineXML on xen,Is there any good solutions? Or how much work should be done to add this function to libvirt? I would take it into consideration seriously if I could fix this problem

2 1

[libvirt] [PATCH] openvz: check the exitstatus of vzlist
by Laine Stump 24 Aug '12

24 Aug '12

I noticed this while auditing all calls to virCommandRun that request an exit status from virCommandRun. Two functions in the openvz driver openvzDomainGetBarrierLimit openvzDomainSetBarrierLimit request an exit status from virCommandRun (thus assuring that virCommandRun won't log any errors just due to a non-0 exit status), but then fail to examine that exit status. This could result in the functions believing that the call to "vzlist" was successful, even though it may have encountered an error. --- src/openvz/openvz_driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 8257ed5..a1d3b42 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -1707,7 +1707,7 @@ openvzDomainGetBarrierLimit(virDomainPtr domain, virCommandSetOutputBuffer(cmd, &output); virCommandAddArgFormat(cmd, "-o%s.b,%s.l", param, param); virCommandAddArg(cmd, domain->name); - if (virCommandRun(cmd, &status)) { + if (virCommandRun(cmd, &status) < 0 || status != 0) { virReportError(VIR_ERR_OPERATION_FAILED, _("Failed to get %s for %s: %d"), param, domain->name, status); @@ -1758,7 +1758,7 @@ openvzDomainSetBarrierLimit(virDomainPtr domain, virCommandAddArgFormat(cmd, "--%s", param); virCommandAddArgFormat(cmd, "%llu:%llu", barrier, limit); virCommandAddArg(cmd, "--save"); - if (virCommandRun(cmd, &status)) { + if (virCommandRun(cmd, &status) < 0 || status != 0) { virReportError(VIR_ERR_OPERATION_FAILED, _("Failed to set %s for %s: %d"), param, domain->name, status); -- 1.7.11.4

2 2

[libvirt] [PATCH] nwfilter: don't log error if firewalld is disabled
by Laine Stump 24 Aug '12

24 Aug '12

The original patch to support firewalld in nwfilter wasn't personally checking the exit status of firewall-cmd, but was instead sending NULL in the *exitstatus arg, which meant that virCommandWait would log an error just for the exit status being non-0 (and a "more scary than useful" error at that). We don't want to treat this as an error, though, just as a reason to use standard (ip|eb)tables commands instead of firewall-cmd. This patch modifies the virCommandRun in the nwfilter code to request status back from the caller. This avoids virCommandWait logging an error message, and allows the caller to do as it likes after examining the status. --- src/nwfilter/nwfilter_ebiptables_driver.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index b008879..8f7a453 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -4140,6 +4140,7 @@ ebiptablesDriverInitWithFirewallD(void) virBuffer buf = VIR_BUFFER_INITIALIZER; char *firewall_cmd_path; char *output = NULL; + int status; int ret = -1; if (!virNWFilterDriverIsWatchingFirewallD()) @@ -4155,8 +4156,8 @@ ebiptablesDriverInitWithFirewallD(void) "%s", CMD_STOPONERR(1)); - if (ebiptablesExecCLI(&buf, NULL, &output) == 0 && - strlen(output) == 0) { + if (ebiptablesExecCLI(&buf, &status, &output) == 0 && + status == 0) { VIR_DEBUG("Using firewall-cmd in nwfilter_ebiptables_driver."); ignore_value(virAsprintf(&ebtables_cmd_path, -- 1.7.11.4

2 3

[libvirt] Guest log getting written in cache directory rather /var/log/libvirt/qemu
by Richa Marwaha 23 Aug '12

23 Aug '12

Hi Everyone I am running libvirt with selinux driver under unprivileged user and the Guest.log file is not written into /var/log/libvirt/qemu/Guest.log but remains in Home Directory/.cache/libvirt/qemu/log/Guest.log. Does anyone know why its not writing to the required log location. Thanks Regards, Richa Marwaha LTC Security Email address:rmarwah@us.ibm.com

2 4

[libvirt] [PATCH] network: fix virtual network bridge delay setting
by Laine Stump 23 Aug '12

23 Aug '12

libvirt's network config documents that a bridge's STP "forward delay" (called "delay" in the XML) should be specified in seconds, but virNetDevBridgeSetSTPDelay() assumes that it is given a delay in milliseconds (although the comment at the top of the function incorrectly says "seconds". This fixes the comment, and converts the delay to milliseconds before calling virNetDevBridgeSetSTPDelay(). --- (Fortunately the default delay (and what most people set) is 0) src/network/bridge_driver.c | 6 +++++- src/util/virnetdevbridge.c | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 59b2c10..53eebed 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1826,8 +1826,12 @@ networkStartNetworkVirtual(struct network_driver *driver, } /* Set bridge options */ + + /* delay is configured in seconds, but virNetDevBridgeSetSTPDelay + * expects milliseconds + */ if (virNetDevBridgeSetSTPDelay(network->def->bridge, - network->def->delay) < 0) + network->def->delay * 1000) < 0) goto err1; if (virNetDevBridgeSetSTP(network->def->bridge, diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c index a616d8e..7b11bee 100644 --- a/src/util/virnetdevbridge.c +++ b/src/util/virnetdevbridge.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 Red Hat, Inc. + * Copyright (C) 2007-2012 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -378,7 +378,7 @@ int virNetDevBridgeRemovePort(const char *brname, /** * virNetDevBridgeSetSTPDelay: * @brname: the bridge name - * @delay: delay in seconds + * @delay: delay in milliseconds * * Set the bridge forward delay * -- 1.7.11.4

2 2

[libvirt] [PATCH v4 0/3] Per-guest S3/S4 configuration
by Martin Kletzander 23 Aug '12

23 Aug '12

There is a way to tell qemu how (not) to advertise S3/S4 ACPI sleep state capability to the guest OS. This series includes the capability to set this in the XML and also covers all the handling from qemu point of view including checking for the support, parameter parsing, command building, checking before sending the signals through guest agent and also tests and documentation. -- v4: - Changed attributes to elements - Merged documentation with XML extension - Fixed error reporting and other tweaks Michal pointed out v3: - Option names are change according to Eric and Doug - Added docs (formatdomain) v2: - Modified the patch to reflect danpb's notes (according to qemu people the setting the disable_s[34] parameter to 0/1 ensures that the states will be enabled/disabled respectively) *** BLURB HERE *** Martin Kletzander (3): Add per-guest S3/S4 state configuration qemu: Add support for S3/S4 state configuration tests: Add tests for qemu S3/S4 state configuration docs/formatdomain.html.in | 24 +++++++++ docs/schemas/domaincommon.rng | 39 ++++++++++++++ src/conf/domain_conf.c | 52 +++++++++++++++++- src/conf/domain_conf.h | 15 ++++++ src/libvirt_private.syms | 2 + src/qemu/qemu_capabilities.c | 7 +++ src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 62 ++++++++++++++++++++++ src/qemu/qemu_driver.c | 17 ++++++ tests/qemuargv2xmltest.c | 3 ++ .../qemuxml2argv-misc-disable-s3.args | 4 ++ .../qemuxml2argv-misc-disable-s3.xml | 29 ++++++++++ .../qemuxml2argv-misc-disable-suspends.args | 4 ++ .../qemuxml2argv-misc-disable-suspends.xml | 30 +++++++++++ .../qemuxml2argv-misc-enable-s4.args | 4 ++ .../qemuxml2argv-misc-enable-s4.xml | 29 ++++++++++ tests/qemuxml2argvtest.c | 4 ++ tests/qemuxml2xmltest.c | 3 ++ 18 files changed, 329 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.xml -- 1.7.12

3 9

[libvirt] [PATCH] qemu: forbid suspend if already pmsuspended
by Michal Privoznik 23 Aug '12

23 Aug '12

If a domain is pmsuspended then virsh suspend will succeed. Beside obvious flaw, virsh resume will report success and change domain state to running which is another mistake. Therefore we must forbid any attempts for suspend and resume when pmsuspended. --- src/libvirt.c | 4 ++++ src/qemu/qemu_driver.c | 18 ++++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index e0ac391..b034ed6 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -2329,6 +2329,8 @@ virDomainRef(virDomainPtr domain) * hypervisor level will stay allocated. Use virDomainResume() to reactivate * the domain. * This function may require privileged access. + * Moreover, suspend may not be supported if domain is in some + * special state like VIR_DOMAIN_PMSUSPENDED. * * Returns 0 in case of success and -1 in case of failure. */ @@ -2375,6 +2377,8 @@ error: * Resume a suspended domain, the process is restarted from the state where * it was frozen by calling virDomainSuspend(). * This function may require privileged access + * Moreover, resume may not be supported if domain is in some + * special state like VIR_DOMAIN_PMSUSPENDED. * * Returns 0 in case of success and -1 in case of failure. */ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 8c7b34d..256fa71 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1572,6 +1572,7 @@ static int qemudDomainSuspend(virDomainPtr dom) { qemuDomainObjPrivatePtr priv; virDomainPausedReason reason; int eventDetail; + int state; qemuDriverLock(driver); vm = virDomainFindByUUID(&driver->domains, dom->uuid); @@ -1607,7 +1608,13 @@ static int qemudDomainSuspend(virDomainPtr dom) { "%s", _("domain is not running")); goto endjob; } - if (virDomainObjGetState(vm, NULL) != VIR_DOMAIN_PAUSED) { + + state = virDomainObjGetState(vm, NULL); + if (state == VIR_DOMAIN_PMSUSPENDED) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain is pmsuspended")); + goto endjob; + } else if (state != VIR_DOMAIN_PAUSED) { if (qemuProcessStopCPUs(driver, vm, reason, QEMU_ASYNC_JOB_NONE) < 0) { goto endjob; } @@ -1639,6 +1646,7 @@ static int qemudDomainResume(virDomainPtr dom) { virDomainObjPtr vm; int ret = -1; virDomainEventPtr event = NULL; + int state; qemuDriverLock(driver); vm = virDomainFindByUUID(&driver->domains, dom->uuid); @@ -1659,7 +1667,13 @@ static int qemudDomainResume(virDomainPtr dom) { "%s", _("domain is not running")); goto endjob; } - if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_PAUSED) { + + state = virDomainObjGetState(vm, NULL); + if (state == VIR_DOMAIN_PMSUSPENDED) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain is pmsuspended")); + goto endjob; + } else if (state == VIR_DOMAIN_PAUSED) { if (qemuProcessStartCPUs(driver, vm, dom->conn, VIR_DOMAIN_RUNNING_UNPAUSED, QEMU_ASYNC_JOB_NONE) < 0) { -- 1.7.8.6

2 2

[libvirt] [PATCH] qemu-agent: available in 0.10.0
by Eric Blake 23 Aug '12

23 Aug '12

The recent virDomainQemuAgentCommand addition is part of 0.10.0; also, grouping all libvirt-qemu.so callbacks together makes them easier to identify. * src/libvirt_qemu.syms: Fix release symbol. * src/qemu/qemu_driver.c (qemuDriver): Likewise. * src/remote/remote_driver.c (remote_driver): Likewise. * src/driver.h (_virDriver): Group qemu-specific callbacks. --- Pushing under the trivial rule. src/driver.h | 2 +- src/libvirt_qemu.syms | 2 +- src/qemu/qemu_driver.c | 2 +- src/remote/remote_driver.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/driver.h b/src/driver.h index ccb01dc..e88ab28 100644 --- a/src/driver.h +++ b/src/driver.h @@ -1043,6 +1043,7 @@ struct _virDriver { virDrvDomainSnapshotDelete domainSnapshotDelete; virDrvDomainQemuMonitorCommand qemuDomainMonitorCommand; virDrvDomainQemuAttach qemuDomainAttach; + virDrvDomainQemuAgentCommand qemuDomainArbitraryAgentCommand; virDrvDomainOpenConsole domainOpenConsole; virDrvDomainOpenGraphics domainOpenGraphics; virDrvDomainInjectNMI domainInjectNMI; @@ -1067,7 +1068,6 @@ struct _virDriver { virDrvDomainGetDiskErrors domainGetDiskErrors; virDrvDomainSetMetadata domainSetMetadata; virDrvDomainGetMetadata domainGetMetadata; - virDrvDomainQemuAgentCommand qemuDomainArbitraryAgentCommand; }; typedef int diff --git a/src/libvirt_qemu.syms b/src/libvirt_qemu.syms index 6e11509..f968d91 100644 --- a/src/libvirt_qemu.syms +++ b/src/libvirt_qemu.syms @@ -20,7 +20,7 @@ LIBVIRT_QEMU_0.9.4 { virDomainQemuAttach; } LIBVIRT_QEMU_0.8.3; -LIBVIRT_QEMU_0.10.1 { +LIBVIRT_QEMU_0.10.0 { global: virDomainQemuAgentCommand; } LIBVIRT_QEMU_0.9.4; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 3948bef..baeb03b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14013,6 +14013,7 @@ static virDriver qemuDriver = { .domainSnapshotDelete = qemuDomainSnapshotDelete, /* 0.8.0 */ .qemuDomainMonitorCommand = qemuDomainMonitorCommand, /* 0.8.3 */ .qemuDomainAttach = qemuDomainAttach, /* 0.9.4 */ + .qemuDomainArbitraryAgentCommand = qemuDrvDomainAgentCommand, /* 0.10.0 */ .domainOpenConsole = qemuDomainOpenConsole, /* 0.8.6 */ .domainOpenGraphics = qemuDomainOpenGraphics, /* 0.9.7 */ .domainInjectNMI = qemuDomainInjectNMI, /* 0.9.2 */ @@ -14042,7 +14043,6 @@ static virDriver qemuDriver = { .domainPMSuspendForDuration = qemuDomainPMSuspendForDuration, /* 0.9.11 */ .domainPMWakeup = qemuDomainPMWakeup, /* 0.9.11 */ .domainGetCPUStats = qemuDomainGetCPUStats, /* 0.9.11 */ - .qemuDomainArbitraryAgentCommand = qemuDrvDomainAgentCommand, /* 0.10.1 */ }; diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index f0484a7..cf1f079 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -5530,6 +5530,7 @@ static virDriver remote_driver = { .domainSnapshotDelete = remoteDomainSnapshotDelete, /* 0.8.0 */ .qemuDomainMonitorCommand = remoteQemuDomainMonitorCommand, /* 0.8.3 */ .qemuDomainAttach = qemuDomainAttach, /* 0.9.4 */ + .qemuDomainArbitraryAgentCommand = qemuDomainAgentCommand, /* 0.10.0 */ .domainOpenConsole = remoteDomainOpenConsole, /* 0.8.6 */ .domainOpenGraphics = remoteDomainOpenGraphics, /* 0.9.7 */ .domainInjectNMI = remoteDomainInjectNMI, /* 0.9.2 */ @@ -5557,7 +5558,6 @@ static virDriver remote_driver = { .domainSetMetadata = remoteDomainSetMetadata, /* 0.9.10 */ .domainGetMetadata = remoteDomainGetMetadata, /* 0.9.10 */ .domainGetHostname = remoteDomainGetHostname, /* 0.10.0 */ - .qemuDomainArbitraryAgentCommand = qemuDomainAgentCommand, /* 0.10.1 */ }; static virNetworkDriver network_driver = { -- 1.7.11.4

1 0

[libvirt] [PATCH v4 0/7] support guest agent general command
by MATSUDA, Daiki 23 Aug '12

23 Aug '12

Hi. All. I rewrote the patched for git head tree, adding some code. And @timeout must be following VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK(-2) : does not block and wait forever. VIR_DOMAIN_QEMU_AGENT_COMMAND_DEFAULT(-1) : use default time for waiting VIR_DOMAIN_QEMU_AGENT_COMMAND_NOWIAT(0) : does not wait and out soon positive value : wait for pointed seconds. And I also add VIR_DOMAIN_QEMU_AGENT_COMMAND_MIN for not writing static value. In addition, I added the some options for virsh command qemu-agent-command --block : it means taht @timeout is VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK. --async : it means taht @timeout is VIR_DOMAIN_QEMU_AGENT_COMMAND_NOWIAT. --timeout @seconds : @seconds must be positive value and it means that @timeout is positive value case. These upper options are exclusive. If no options are given, it means taht @timeout is IR_DOMAIN_QEMU_AGENT_COMMAND_DEFAULT. virsh # help qemu-agent-command NAME qemu-agent-command - QEMU Guest Agent Command SYNOPSIS qemu-agent-command <domain> [--timeout <number>] [--async] [--block] {[--cmd] <string>}... DESCRIPTION Run an arbitrary qemu guest agent command; use at your own risk OPTIONS [--domain] <string> domain name, id or uuid --timeout <number> timeout seconds. must be positive. --async execute command without waiting for timeout --block execute command without timeout [--cmd] <string> command virsh # qemu-agent-command RHEL58_64 '{"execute":"guest-info"}' {"return":{"version":"1.1.50","supported_commands":[{"enabled":true,"name":"guest-network-get-interfaces"},{"enabled":true,"name":"guest-suspend-hybrid"},{"enabled":true,"name":"guest-suspend-ram"},{"enabled":true,"name":"guest-suspend-disk"},{"enabled":true,"name":"guest-fsfreeze-thaw"},{"enabled":true,"name":"guest-fsfreeze-freeze"},{"enabled":true,"name":"guest-fsfreeze-status"},{"enabled":true,"name":"guest-file-flush"},{"enabled":true,"name":"guest-file-seek"},{"enabled":true,"name":"guest-file-write"},{"enabled":true,"name":"guest-file-read"},{"enabled":true,"name":"guest-file-close"},{"enabled":true,"name":"guest-file-open"},{"enabled":true,"name":"guest-shutdown"},{"enabled":true,"name":"guest-info"},{"enabled":true,"name":"guest-ping"},{"enabled":true,"name":"guest-sync"},{"enabled":true,"name":"guest-sync-delimited"}]}} virsh # qemu-agent-command --block RHEL58_64 '{"execute":"guest-sync","arguments":{"id":123}}' {"return":123}

4 11