- Devel - libvirt List Archives

[libvirt] [PATCH 0/3] Consolidate shell escape functions
by Guido Günther 18 Oct '11

18 Oct '11

The attached patches use virBufferEscapeShell in virsh's virCmd and eliminate qemuMonitorEscapeShell so we have only one function that does the shell escaping. Cheers, -- Guido Guido Günther (3): virBufferEscapeShell: Emit quotes for the empty string Use virBufferEscapeShell in cmdEcho qemu: replace qemuMonitorEscapeShell by virBufferEscapeShell src/qemu/qemu_monitor.c | 49 ++++------------------------------------------ src/qemu/qemu_monitor.h | 1 - src/util/buf.c | 15 +++++++++---- tools/virsh.c | 39 +++++++++++++++++-------------------- 4 files changed, 33 insertions(+), 71 deletions(-) -- 1.7.6.3

1 0

[libvirt] [PATCH libvirt-snmp 0/3] fix problems found by coverity
by Laine Stump 18 Oct '11

18 Oct '11

These three problems were found by coverity during the run documented here: https://bugzilla.redhat.com/show_bug.cgi?id=732015 The three fixes are all very simple, but sufficiently unrelated (other than the method used for finding them) to warrant separate patches.

2 4

[libvirt] [PATCH] Allow for URI aliases when connecting to libvirt
by Daniel P. Berrange 18 Oct '11

18 Oct '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> I finally got fed up of typing URIs when using virsh.... This adds support for a libvirt client configuration file either /etc/libvirt/libvirt.conf for privileged clients, or $HOME/.libvirt/libvirt.conf for unprivileged clients. It allows one parameter uri_aliases = [ "hail=qemu+ssh://root@hail.cloud.example.com/system", "sleet=qemu+ssh://root@sleet.cloud.example.com/system", ] Any call to virConnectOpen with a non-NULL URI will first attempt to match against the uri_aliases list. An application can disable this by using VIR_CONNECT_NO_ALIASES * docs/uri.html.in: Document URI aliases * include/libvirt/libvirt.h.in: Add VIR_CONNECT_NO_ALIASES * libvirt.spec.in, mingw32-libvirt.spec.in: Add /etc/libvirt/libvirt.conf * src/Makefile.am: Install default config file * src/libvirt.c: Add support for URI aliases * src/remote/remote_driver.c: Don't try to handle URIs with no scheme and which clearly are not paths * src/util/conf.c: Don't raise error on virConfFree(NULL) * src/xen/xen_driver.c: Don't raise error on URIs with no scheme --- docs/uri.html.in | 101 ++++++++++++++------------- include/libvirt/libvirt.h.in | 3 +- libvirt.spec.in | 1 + mingw32-libvirt.spec.in | 2 + src/Makefile.am | 2 +- src/libvirt.c | 157 ++++++++++++++++++++++++++++++++++++++---- src/libvirt.conf | 13 ++++ src/remote/remote_driver.c | 5 ++ src/util/conf.c | 6 +- src/xen/xen_driver.c | 12 +--- 10 files changed, 223 insertions(+), 79 deletions(-) create mode 100644 src/libvirt.conf diff --git a/docs/uri.html.in b/docs/uri.html.in index e6326b2..5cc4dbf 100644 --- a/docs/uri.html.in +++ b/docs/uri.html.in @@ -2,6 +2,8 @@ <html> <body> <h1 >Connection URIs</h1> + + <ul id="toc"></ul> <p> Since libvirt supports many different kinds of virtualization (often referred to as "drivers" or "hypervisors"), we need a @@ -13,41 +15,44 @@ machine over the network. To this end, libvirt uses URIs as used on the Web and as defined in <a href="http://www.ietf.org/rfc/rfc2396.txt">RFC 2396</a>. This page documents libvirt URIs. </p> - <ul> - <li> - <a href="#URI_libvirt">Specifying URIs to libvirt</a> - </li> - <li> - <a href="#URI_virsh">Specifying URIs to virsh, virt-manager and virt-install</a> - </li> - <li> - <a href="#URI_xen">xen:/// URI</a> - </li> - <li> - <a href="#URI_qemu">qemu:///... QEMU and KVM URIs</a> - </li> - <li> - <a href="#URI_remote">Remote URIs</a> - </li> - <li> - <a href="#URI_test">test:///... Test URIs</a> - </li> - <li> - <a href="#URI_legacy">Other & legacy URI formats</a> - </li> - </ul> - <h3> - <a name="URI_libvirt">Specifying URIs to libvirt</a> - </h3> + <h2><a name="URI_libvirt">Specifying URIs to libvirt</a></h2> + <p> The URI is passed as the <code>name</code> parameter to <a href="html/libvirt-libvirt.html#virConnectOpen"><code>virConnectOpen</code></a> or <a href="html/libvirt-libvirt.html#virConnectOpenReadOnly"><code>virConnectOpenReadOnly</code></a>. For example: </p> <pre> virConnectPtr conn = virConnectOpenReadOnly (<b>"test:///default"</b>); </pre> - <h3> + <h2> + <a name="URI_config">Configuring URI aliases</a> + </h2> + + <p> +To simplify live for administrators, it is possible to setup URI aliases in a +libvirt client configuration file. The configuration file is <code>/etc/libvirt/libvirt.conf</code> +for the root user, or <code>$HOME/.libvirt/libvirt.conf</code> for any unprivileged user. +In this file, the following syntax can be used to setup aliases + </p> + +<pre> +uri_aliases = [ + "hail=qemu+ssh://root@hail.cloud.example.com/system", + "sleet=qemu+ssh://root@sleet.cloud.example.com/system", +] +</pre> + +<p> + A URI alias should be a string made up from the characters + <code>a-Z, 0-9, _, -</code>. Following the <code>=</code> + can be any libvirt URI string, including arbitrary URI parameters. + URI aliases will apply to any application opening a libvirt + connection, unless it has explicitly passed the <code>VIR_CONNECT_NO_ALIASES</code> + parameter to <code>virConnectOpenAuth</code>. +</p> + + <h2> <a name="URI_virsh">Specifying URIs to virsh, virt-manager and virt-install</a> - </h3> + </h2> <p> In virsh use the <code>-c</code> or <code>--connect</code> option: </p> @@ -76,9 +81,9 @@ In virt-install use the <code>--connect=</code><i>URI</i> option: <pre> virt-install <b>--connect=test:///default</b> <i>[other options]</i> </pre> - <h3> + <h2> <a name="URI_xen">xen:/// URI</a> - </h3> + </h2> <p> <i>This section describes a feature which is new in libvirt > 0.2.3. For libvirt ≤ 0.2.3 use <a href="#URI_legacy_xen"><code>"xen"</code></a>.</i> @@ -87,9 +92,9 @@ virt-install <b>--connect=test:///default</b> <i>[other options]</i> To access a Xen hypervisor running on the local machine use the URI <code>xen:///</code>. </p> - <h3> + <h2> <a name="URI_qemu">qemu:///... QEMU and KVM URIs</a> - </h3> + </h2> <p> To use QEMU support in libvirt you must be running the <code>libvirtd</code> daemon (named <code>libvirt_qemud</code> @@ -119,9 +124,9 @@ KVM URIs are identical. You select between qemu, qemu accelerated and KVM guests in the <a href="format.html#KVM1">guest XML as described here</a>. </p> - <h3> + <h2> <a name="URI_remote">Remote URIs</a> - </h3> + </h2> <p> Remote URIs are formed by taking ordinary local URIs and adding a hostname and/or transport name. As a special case, using a URI @@ -182,9 +187,9 @@ We refer you to <a href="remote.html#Remote_URI_reference">the libvirt remote URI reference</a> and <a href="remote.html">full documentation for libvirt remote support</a>. </p> - <h3> + <h2> <a name="URI_test">test:///... Test URIs</a> - </h3> + </h2> <p> The test driver is a dummy hypervisor for test purposes. The URIs supported are: @@ -196,12 +201,12 @@ host definitions built into the driver. </li> a set of host definitions held in the named file. </li> </ul> - <h3> + <h2> <a name="URI_legacy">Other & legacy URI formats</a> - </h3> - <h4> + </h2> + <h3> <a name="URI_NULL">NULL and empty string URIs</a> - </h4> + </h3> <p> Libvirt allows you to pass a <code>NULL</code> pointer to <code>virConnectOpen*</code>. Empty string (<code>""</code>) acts in @@ -223,9 +228,9 @@ the user to type a URI in directly (if that is appropriate). If your application wishes to connect specifically to a Xen hypervisor, then for future proofing it should choose a full <a href="#URI_xen"><code>xen:///</code> URI</a>. </p> - <h4> + <h3> <a name="URI_file">File paths (xend-unix-server)</a> - </h4> + </h3> <p> If XenD is running and configured in <code>/etc/xen/xend-config.sxp</code>: </p> @@ -240,9 +245,9 @@ using a file URI such as: <pre> virsh -c ///var/run/xend/xend-socket </pre> - <h4> + <h3> <a name="URI_http">Legacy: <code>http://...</code> (xend-http-server)</a> - </h4> + </h3> <p> If XenD is running and configured in <code>/etc/xen/xend-config.sxp</code>: @@ -276,17 +281,17 @@ Notes: libvirt, only the old-style sexpr interface known in the Xen documentation as "unix server" or "http server".</li> </ol> - <h4> + <h3> <a name="URI_legacy_xen">Legacy: <code>"xen"</code></a> - </h4> + </h3> <p> Another legacy URI is to specify name as the string <code>"xen"</code>. This will continue to refer to the Xen hypervisor. However you should prefer a full <a href="#URI_xen"><code>xen:///</code> URI</a> in all future code. </p> - <h4> + <h3> <a name="URI_legacy_proxy">Legacy: Xen proxy</a> - </h4> + </h3> <p> Libvirt continues to support connections to a separately running Xen proxy daemon. This provides a way to allow non-root users to make a diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index c991dfc..6bb27c7 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -843,7 +843,8 @@ typedef virNodeMemoryStats *virNodeMemoryStatsPtr; * Flags when opening a connection to a hypervisor */ typedef enum { - VIR_CONNECT_RO = 1, /* A readonly connection */ + VIR_CONNECT_RO = (1 << 0), /* A readonly connection */ + VIR_CONNECT_NO_ALIASES = (1 << 1), /* Don't try to resolve URI aliases */ } virConnectFlags; diff --git a/libvirt.spec.in b/libvirt.spec.in index 7c63710..d6f4564 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1085,6 +1085,7 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sysctl.d/libvirtd %defattr(-, root, root) %doc AUTHORS ChangeLog.gz NEWS README COPYING.LIB TODO +%config(noreplace) %{_sysconfdir}/libvirt/libvirt.conf %{_mandir}/man1/virsh.1* %{_mandir}/man1/virt-xml-validate.1* %{_mandir}/man1/virt-pki-validate.1* diff --git a/mingw32-libvirt.spec.in b/mingw32-libvirt.spec.in index f651d11..f5e0d05 100644 --- a/mingw32-libvirt.spec.in +++ b/mingw32-libvirt.spec.in @@ -83,6 +83,8 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) +%config(noreplace) %{_mingw32_sysconfdir}/libvirt/libvirt.conf + %{_mingw32_bindir}/libvirt-0.dll %{_mingw32_bindir}/virsh.exe %{_mingw32_bindir}/virt-xml-validate diff --git a/src/Makefile.am b/src/Makefile.am index 302d395..fccc54d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -39,7 +39,7 @@ moddir = $(libdir)/libvirt/connection-driver mod_LTLIBRARIES = confdir = $(sysconfdir)/libvirt -conf_DATA = +conf_DATA = libvirt.conf augeasdir = $(datadir)/augeas/lenses augeas_DATA = diff --git a/src/libvirt.c b/src/libvirt.c index f07c720..c285e31 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -40,6 +40,7 @@ #include "memory.h" #include "configmake.h" #include "intprops.h" +#include "conf.h" #include "rpc/virnettlscontext.h" #ifndef WITH_DRIVER_MODULES @@ -968,6 +969,125 @@ error: return -1; } +static char * +virConnectConfigFile(void) +{ + char *path; + if (geteuid() == 0) { + if (virAsprintf(&path, "%s/libvirt/libvirt.conf", + SYSCONFDIR) < 0) + goto no_memory; + } else { + char *userdir = virGetUserDirectory(geteuid()); + if (!userdir) + goto error; + + if (virAsprintf(&path, "%s/.libvirt/libvirt.conf", + userdir) < 0) + goto no_memory; + } + + return path; + +no_memory: + virReportOOMError(); +error: + return NULL; +} + +static int +virConnectOpenFindURIAliasMatch(virConfValuePtr value, const char *alias, char **uri) +{ + virConfValuePtr entry; + if (value->type != VIR_CONF_LIST) { + virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Expected a list for 'uri_aliases' config parameter")); + return -1; + } + + entry = value->list; + while (entry) { + char *offset; + size_t safe; + + if (entry->type != VIR_CONF_STRING) { + virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Expected a string for 'uri_aliases' config parameter list entry")); + return -1; + } + + if (!(offset = strchr(entry->str, '='))) { + virLibConnError(VIR_ERR_INTERNAL_ERROR, + _("Malformed 'uri_aliases' config entry '%s', expected 'alias=uri://host/path'"), + entry->str); + return -1; + } + + safe = strspn(entry->str, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_-"); + if (safe < (offset - entry->str)) { + virLibConnError(VIR_ERR_INTERNAL_ERROR, + _("Malformed 'uri_aliases' config entry '%s', aliases may only container 'a-Z, 0-9, _, -'"), + entry->str); + return -1; + } + + if (STREQLEN(entry->str, alias, offset-entry->str)) { + VIR_DEBUG("Resolved alias '%s' to '%s'", + alias, offset+1); + if (!(*uri = strdup(offset+1))) { + virReportOOMError(); + return -1; + } + return 0; + } + + entry = entry->next; + } + + VIR_DEBUG("No alias found for '%s', passing through to drivers", + alias); + return 0; +} + +static int +virConnectOpenResolveURIAlias(const char *alias, char **uri) +{ + char *config = NULL; + int ret = -1; + virConfPtr conf = NULL; + virConfValuePtr value = NULL; + + *uri = NULL; + + /* Short circuit to avoid doing URI alias resolution + * when it clearly isn't an alias */ + if (strchr(alias, '/') || + strchr(alias, ':')) + return 0; + + if (!(config = virConnectConfigFile())) + goto cleanup; + + if (!virFileExists(config)) { + ret = 0; + goto cleanup; + } + + VIR_DEBUG("Loading config file '%s'", config); + if (!(conf = virConfReadFile(config, 0))) + goto cleanup; + + if ((value = virConfGetValue(conf, "uri_aliases"))) + ret = virConnectOpenFindURIAliasMatch(value, alias, uri); + else + ret = 0; + +cleanup: + virConfFree(conf); + VIR_FREE(config); + return ret; +} + static virConnectPtr do_open (const char *name, virConnectAuthPtr auth, @@ -998,6 +1118,7 @@ do_open (const char *name, } if (name) { + char *alias = NULL; /* Convert xen -> xen:/// for back compat */ if (STRCASEEQ(name, "xen")) name = "xen:///"; @@ -1008,26 +1129,34 @@ do_open (const char *name, if (STREQ (name, "xen://")) name = "xen:///"; - ret->uri = xmlParseURI (name); + if (!(flags & VIR_CONNECT_NO_ALIASES) && + virConnectOpenResolveURIAlias(name, &alias) < 0) + goto failed; + + ret->uri = xmlParseURI (alias ? alias : name); if (!ret->uri) { virLibConnError(VIR_ERR_INVALID_ARG, - _("could not parse connection URI")); + _("could not parse connection URI %s"), + alias ? alias : name); + VIR_FREE(alias); goto failed; } VIR_DEBUG("name \"%s\" to URI components:\n" - " scheme %s\n" - " opaque %s\n" - " authority %s\n" - " server %s\n" - " user %s\n" - " port %d\n" - " path %s\n", - name, - NULLSTR(ret->uri->scheme), NULLSTR(ret->uri->opaque), - NULLSTR(ret->uri->authority), NULLSTR(ret->uri->server), - NULLSTR(ret->uri->user), ret->uri->port, - NULLSTR(ret->uri->path)); + " scheme %s\n" + " opaque %s\n" + " authority %s\n" + " server %s\n" + " user %s\n" + " port %d\n" + " path %s\n", + alias ? alias : name, + NULLSTR(ret->uri->scheme), NULLSTR(ret->uri->opaque), + NULLSTR(ret->uri->authority), NULLSTR(ret->uri->server), + NULLSTR(ret->uri->user), ret->uri->port, + NULLSTR(ret->uri->path)); + + VIR_FREE(alias); } else { VIR_DEBUG("no name, allowing driver auto-select"); } diff --git a/src/libvirt.conf b/src/libvirt.conf new file mode 100644 index 0000000..ffe8c21 --- /dev/null +++ b/src/libvirt.conf @@ -0,0 +1,13 @@ + +# +# This can be used to setup URI aliases for frequently +# used connection URIs. Aliases may contain only the +# characters a-Z, 0-9, _, -. +# +# Following the '=' may be any valid libvirt connection +# URI, including arbitrary parameters + +#uri_aliases = [ +# "hail=qemu+ssh://root@hail.cloud.example.com/system", +# "sleet=qemu+ssh://root@sleet.cloud.example.com/system", +#] diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 4dc6974..1dea327 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -313,6 +313,11 @@ doRemoteOpen (virConnectPtr conn, if (conn->uri) { if (!conn->uri->scheme) { /* This is the ///var/lib/xen/xend-socket local path style */ + if (!conn->uri->path) + return VIR_DRV_OPEN_DECLINED; + if (conn->uri->path[0] != '/') + return VIR_DRV_OPEN_DECLINED; + transport = trans_unix; } else { transport_str = get_transport_from_scheme (conn->uri->scheme); diff --git a/src/util/conf.c b/src/util/conf.c index 00045b5..c8dcc7f 100644 --- a/src/util/conf.c +++ b/src/util/conf.c @@ -808,10 +808,8 @@ int virConfFree(virConfPtr conf) { virConfEntryPtr tmp; - if (conf == NULL) { - virConfError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); - return(-1); - } + if (conf == NULL) + return 0; tmp = conf->entries; while (tmp) { diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index 9c96fca..0a2267d 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -296,17 +296,7 @@ xenUnifiedOpen (virConnectPtr conn, virConnectAuthPtr auth, unsigned int flags) conn->uri->server) return VIR_DRV_OPEN_DECLINED; } else { - /* Special case URI for Xen driver only: - * - * Treat a plain path as a Xen UNIX socket path, and give - * error unless path is absolute - */ - if (!conn->uri->path || conn->uri->path[0] != '/') { - xenUnifiedError(VIR_ERR_INTERNAL_ERROR, - _("unexpected Xen URI path '%s', try ///var/lib/xen/xend-socket"), - NULLSTR(conn->uri->path)); - return VIR_DRV_OPEN_ERROR; - } + return VIR_DRV_OPEN_DECLINED; } } -- 1.7.6.4

2 2

[libvirt] [PATCH] Add AHCI support to qemu driver
by Jim Fehlig 18 Oct '11

18 Oct '11

Tested with multiple AHCI controllers and multiple disks attached to a controller. E.g., <disk type='file' device='disk'> <driver name='qemu' type='raw'/> <source file='/var/lib/libvirt/images/test/disk0.raw'/> <target dev='sda' bus='sata'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> <disk type='file' device='disk'> <driver name='qemu' type='raw'/> <source file='/var/lib/libvirt/images/test/disk1.raw'/> <target dev='sdb' bus='sata'/> <address type='drive' controller='0' bus='0' unit='1'/> </disk> <disk type='file' device='disk'> <driver name='qemu' type='raw'/> <source file='/var/lib/libvirt/images/test/disk2.raw'/> <target dev='sdc' bus='sata'/> <address type='drive' controller='1' bus='0' unit='0'/> </disk> <controller type='sata' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> </controller> <controller type='sata' index='1'> <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> </controller> --- docs/formatdomain.html.in | 9 +++-- docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 14 +++++++++ src/qemu/qemu_capabilities.c | 3 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 30 ++++++++++++++++---- .../qemuxml2argv-disk-sata-device.args | 6 ++++ .../qemuxml2argv-disk-sata-device.xml | 25 ++++++++++++++++ tests/qemuxml2argvtest.c | 3 ++ 9 files changed, 82 insertions(+), 10 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 3087d01..b6a0c66 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -972,11 +972,12 @@ as a device ordering hint. The optional <code>bus</code> attribute specifies the type of disk device to emulate; possible values are driver specific, with typical values being - "ide", "scsi", "virtio", "xen" or "usb". If omitted, the bus type is - inferred from the style of the device name. eg, a device named 'sda' - will typically be exported using a SCSI bus. + "ide", "scsi", "virtio", "xen", "usb" or "sata". If omitted, the bus + type is inferred from the style of the device name. eg, a device named + 'sda' will typically be exported using a SCSI bus. <span class="since">Since 0.0.3; <code>bus</code> attribute since 0.4.3; - "usb" attribute value since after 0.4.4</span></dd> + "usb" attribute value since after 0.4.4; "sata" attribute value since + 0.9.7</span></dd> <dt><code>driver</code></dt> <dd> The optional driver element allows specifying further details diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index be98be0..675d55d 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -790,6 +790,7 @@ <value>xen</value> <value>usb</value> <value>uml</value> + <value>sata</value> </choice> </attribute> </optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index a918679..6a7f296 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2157,6 +2157,15 @@ virDomainDiskDefAssignAddress(virCapsPtr caps, virDomainDiskDefPtr def) def->info.addr.drive.unit = (idx % 2); break; + case VIR_DOMAIN_DISK_BUS_SATA: + /* For SATA we define the default mapping to be 6 units + * per bus, 1 bus per controller, many controllers */ + def->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE; + def->info.addr.drive.controller = idx / 6; + def->info.addr.drive.bus = 0; + def->info.addr.drive.unit = idx % 6; + break; + case VIR_DOMAIN_DISK_BUS_FDC: /* For FDC we define the default mapping to be 2 units * per bus, 1 bus per controller, many controllers */ @@ -8675,6 +8684,11 @@ int virDomainDefAddImplicitControllers(virDomainDefPtr def) VIR_DOMAIN_DISK_BUS_IDE) < 0) return -1; + if (virDomainDefAddDiskControllersForType(def, + VIR_DOMAIN_CONTROLLER_TYPE_SATA, + VIR_DOMAIN_DISK_BUS_SATA) < 0) + return -1; + if (virDomainDefMaybeAddVirtioSerialController(def) < 0) return -1; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 8e20e3f..7122756 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -139,6 +139,7 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "no-shutdown", "cache-unsafe", /* 75 */ + "ich9-ahci", ); struct qemu_feature_flags { @@ -1241,6 +1242,8 @@ qemuCapsParseDeviceStr(const char *str, virBitmapPtr flags) qemuCapsSet(flags, QEMU_CAPS_USB_REDIR); if (strstr(str, "name \"usb-hub\"")) qemuCapsSet(flags, QEMU_CAPS_USB_HUB); + if (strstr(str, "name \"ich9-ahci\"")) + qemuCapsSet(flags, QEMU_CAPS_ICH9_AHCI); /* Prefer -chardev spicevmc (detected earlier) over -device spicevmc */ if (!qemuCapsGet(flags, QEMU_CAPS_CHARDEV_SPICEVMC) && diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index ae3de90..1e23451 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -113,6 +113,7 @@ enum qemuCapsFlags { QEMU_CAPS_NO_SHUTDOWN = 74, /* usable -no-shutdown */ QEMU_CAPS_DRIVE_CACHE_UNSAFE = 75, /* Is cache=unsafe supported? */ + QEMU_CAPS_ICH9_AHCI = 76, /* -device ich9-ahci */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 9174a5f..6d6e67d 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1702,6 +1702,12 @@ qemuBuildDriveDevStr(virDomainDiskDefPtr disk, disk->info.addr.drive.bus, disk->info.addr.drive.unit); break; + case VIR_DOMAIN_DISK_BUS_SATA: + virBufferAddLit(&opt, "ide-drive"); + virBufferAsprintf(&opt, ",bus=ahci%d.%d", + disk->info.addr.drive.controller, + disk->info.addr.drive.unit); + break; case VIR_DOMAIN_DISK_BUS_VIRTIO: virBufferAddLit(&opt, "virtio-blk-pci"); qemuBuildIoEventFdStr(&opt, disk->ioeventfd, qemuCaps); @@ -1902,6 +1908,10 @@ qemuBuildControllerDevStr(virDomainControllerDefPtr def, virBufferAsprintf(&buf, "usb-ccid,id=ccid%d", def->idx); break; + case VIR_DOMAIN_CONTROLLER_TYPE_SATA: + virBufferAsprintf(&buf, "ahci,id=ahci%d", def->idx); + break; + case VIR_DOMAIN_CONTROLLER_TYPE_USB: if (qemuBuildUSBControllerDevStr(def, qemuCaps, &buf) == -1) goto error; @@ -3683,14 +3693,22 @@ qemuBuildCommandLine(virConnectPtr conn, cont->type == VIR_DOMAIN_CONTROLLER_TYPE_FDC) continue; - /* QEMU doesn't implement a SATA driver */ + /* Only recent QEMU implements a SATA (AHCI) controller */ if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_SATA) { - qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, - "%s", _("SATA is not supported with this QEMU binary")); - goto error; - } + if (!qemuCapsGet(qemuCaps, QEMU_CAPS_ICH9_AHCI)) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, + "%s", _("SATA is not supported with this QEMU binary")); + goto error; + } else { + char *devstr; - if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_USB && + virCommandAddArg(cmd, "-device"); + if (!(devstr = qemuBuildControllerDevStr(cont, qemuCaps, NULL))) + goto error; + + virCommandAddArg(cmd, devstr); + } + } else if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_USB && def->controllers[i]->model == -1 && !qemuCapsGet(qemuCaps, QEMU_CAPS_PIIX3_USB_UHCI)) { if (usblegacy) { diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.args new file mode 100644 index 0000000..9908da6 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.args @@ -0,0 +1,6 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ +pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -monitor \ +unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -device ahci,id=ahci0,\ +bus=pci.0,addr=0x3 -drive file=/dev/HostVG/QEMUGuest1,if=none,\ +id=drive-sata0-0-0 -device ide-drive,bus=ahci0.0,drive=drive-sata0-0-0,\ +id=sata0-0-0 -usb -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.xml new file mode 100644 index 0000000..68a14f2 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.xml @@ -0,0 +1,25 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219136</memory> + <currentMemory>219136</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='sda' bus='sata'/> + <address type='drive' controller='0' bus='0' unit='0'/> + </disk> + <controller type='sata' index='0'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 9e174b3..f298d37 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -359,6 +359,9 @@ mymain(void) QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG); DO_TEST("disk-scsi-device-auto", false, QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG); + DO_TEST("disk-sata-device", false, + QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, + QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_ICH9_AHCI); DO_TEST("disk-aio", false, QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_AIO, QEMU_CAPS_DRIVE_CACHE_V2, QEMU_CAPS_DRIVE_FORMAT); -- 1.7.5.4

4 9

[libvirt] [RFC] Use libssh2 for ssh transport instead of forking ssh process.
by Peter Krempa 18 Oct '11

18 Oct '11

The current state of the ssh transport involves starting the ssh client process (command ssh) that communicates using pipes and a socked with the libvirt client. Thereafter it behaves as a standard virNetSocket. This configuration has some drawbacks, but changing the ssh transport to libssh2 could break some users configurations. My concern is, that someone might be using advanced configurations of ssh done via the ssh config file, and removing this "old" way to do it would break it. Libssh2 does not use any configuration files, but is configured using the API. The URI scheme we are using now allows to specify configuration of the transport layer using parameters. In my opinion, this would be a nice way how to set configs on a per-connection basis, but would not take into account default configurations the users are familiar with, while using ssh. Advantages of using libssh2: - no need to spawn external process and comunicate through pipes (with all scheduling benefits) - multi platform support (should provide ssh support on m$ windows) - allow to configure transport connection using the uri - use auth callbacks to query for passwords/passphrases (no ssh-askpass) - control over error messages - nicely integrates with virNetSocket, as open socket must be provided to libssh2 to work on. Disadvantages: - break configurations for users that use advanced ssh configurations in the ssh client config file Possible implementation options: 1.) Add libssh2 support as a new transport option ( qemu+libssh2://user@host/system ) 2.) Use libssh2 as the default ssh transport provider and move old ssh stuff to a new transport option ( qemu+cmdssh://user@host/system, or similar) 3.) Drop old ssh completly and get mauled by users :/ 4.) Leave it in current state. 5.) Add the choice on compile time. I think, that the most favourable option is 2.) as it retains the old way for users that have configured it to work for them, and adding some letters to the uri would be less painfull for them and at the same time prefers the new api for new configurations as the default. Option 1) includes the risk, that tie change to the new api would be ignored, as nearly everybody would not care about changing their URIs even if it would not break anything. The two other options (not counting leaving it as-is) are really bad in my opinion. I'd like to have your opinions on changing the ssh transport provider. Thanks. Peter

3 2

[libvirt] [PATCH] virBufferEscapeShell: Fix escaping of single quotes.
by Guido Günther 18 Oct '11

18 Oct '11

When checking if we need to escape a single quote we were looking at the character after the quote instead of at the quote itself. --- src/util/buf.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/buf.c b/src/util/buf.c index 7dd9852..2d9499a 100644 --- a/src/util/buf.c +++ b/src/util/buf.c @@ -524,13 +524,13 @@ virBufferEscapeShell(virBufferPtr buf, const char *str) *out++ = '\''; while (*cur != 0) { - *out++ = *cur++; if (*cur == '\'') { + *out++ = '\''; /* Replace literal ' with a close ', a \', and a open ' */ *out++ = '\\'; *out++ = '\''; - *out++ = '\''; } + *out++ = *cur++; } *out++ = '\''; *out = 0; -- 1.7.6.3

2 2

[libvirt] Compiler warnings
by Alex Jia 18 Oct '11

18 Oct '11

Hi all, I meet the following compiler warnings today: ...... CC libvirt_util_la-buf.lo util/buf.c: In function 'virBufferEscape': util/buf.c:430: warning: logical '&&' with non-zero constant will always evaluate as true [-Wlogical-op] CC libvirt_util_la-command.lo ...... CC libvirt_lxc-buf.o util/buf.c: In function 'virBufferEscape': util/buf.c:430: warning: logical '&&' with non-zero constant will always evaluate as true [-Wlogical-op] CC libvirt_lxc-command.o ...... Has anybody the same experience? Thanks, Alex

4 13

[libvirt] [PATCH] compile: Add a missing function 'pciDeviceListFind' to libvirt_private.syms
by Xu He Jie 18 Oct '11

18 Oct '11

compile error: ../src/.libs/libvirt_driver_qemu.a(libvirt_driver_qemu_la-qemu_hostdev.o): In function `qemuPrepareHostdevPCIDevices': /home/soulxu/data/work-code/libvirt/src/qemu/qemu_hostdev.c:183: undefined reference to `pciDeviceListFind' /home/soulxu/data/work-code/libvirt/src/qemu/qemu_hostdev.c:230: undefined reference to `pciDeviceListFind' ../src/.libs/libvirt_driver_qemu.a(libvirt_driver_qemu_la-qemu_hostdev.o): In function `qemuGetActivePciHostDeviceList': /home/soulxu/data/work-code/libvirt/src/qemu/qemu_hostdev.c:102: undefined reference to `pciDeviceListFind' ../src/.libs/libvirt_driver_qemu.a(libvirt_driver_qemu_la-qemu_hostdev.o): In function `qemuDomainReAttachHostdevDevices': /home/soulxu/data/work-code/libvirt/src/qemu/qemu_hostdev.c:370: undefined reference to `pciDeviceListFind' Signed-off-by: Xu He Jie <xuhj(a)linux.vnet.ibm.com> --- src/libvirt_private.syms | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 1e03e33..61f4dc4 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -892,6 +892,7 @@ pciDeviceListFree; pciDeviceListGet; pciDeviceListNew; pciDeviceListSteal; +pciDeviceListFind; pciDeviceNetName; pciDeviceReAttachInit; pciDeviceSetManaged; -- 1.7.4.1

3 3

[libvirt] [PATCH] qemu: Relax -no-shutdown check to [0.14.0, 0.15.0]
by Jiri Denemark 18 Oct '11

18 Oct '11

The patch that fixes SIGTERM handling with -no-shutdown was taken into 0.15.1 stable release of qemu. --- src/qemu/qemu_capabilities.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 8f16a49..2f55000 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1018,9 +1018,9 @@ qemuCapsComputeCmdFlags(const char *help, /* Do not use -no-shutdown if qemu doesn't support it or SIGTERM handling * is most likely buggy when used with -no-shutdown (which applies for qemu - * 0.14.* and <0.15.50) + * 0.14.* and 0.15.0) */ - if (strstr(help, "-no-shutdown") && (version < 14000 || version >= 15050)) + if (strstr(help, "-no-shutdown") && (version < 14000 || version > 15000)) qemuCapsSet(flags, QEMU_CAPS_NO_SHUTDOWN); /* -- 1.7.7

2 2

[libvirt] [PATCH] Fix VPATH build
by Jiri Denemark 18 Oct '11

18 Oct '11

probes.h is generated in build directory; setting a dependency on probes.h from source directory doesn't work well in VPATH builds. Caused by commit 1afcfbdda0cac112faa61f74ec943e46aa43f2f5 --- src/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 510e5ef..87d91ed 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -191,7 +191,7 @@ REMOTE_DRIVER_GENERATED = \ # The remote RPC driver needs probes.h if WITH_DTRACE -REMOTE_DRIVER_GENERATED += $(srcdir)/probes.h +REMOTE_DRIVER_GENERATED += probes.h endif REMOTE_PROTOCOL = $(srcdir)/remote/remote_protocol.x -- 1.7.7

2 2

[libvirt] [PATCH] qemu: Honor the original properties of PCI device when detaching
by Osier Yang 18 Oct '11

18 Oct '11

This patch fixes two problems: 1) The device will be reattached to host even if it's not managed, as there is a "pciDeviceSetManaged". 2) The device won't be reattached to host with original driver properly. As it doesn't honor the device original properties which are maintained by driver->activePciHostdevs. --- src/qemu/qemu_hotplug.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index bfa524b..f3f0060 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1956,6 +1956,7 @@ int qemuDomainDetachHostPciDevice(struct qemud_driver *driver, qemuDomainObjPrivatePtr priv = vm->privateData; int i, ret; pciDevice *pci; + pciDevice *activePci; for (i = 0 ; i < vm->def->nhostdevs ; i++) { if (vm->def->hostdevs[i]->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS || @@ -2015,16 +2016,15 @@ int qemuDomainDetachHostPciDevice(struct qemud_driver *driver, detach->source.subsys.u.pci.bus, detach->source.subsys.u.pci.slot, detach->source.subsys.u.pci.function); - if (!pci) - ret = -1; - else { - pciDeviceSetManaged(pci, detach->managed); - pciDeviceListDel(driver->activePciHostdevs, pci); - if (pciResetDevice(pci, driver->activePciHostdevs, NULL) < 0) + if (pci) { + activePci = pciDeviceListSteal(driver->activePciHostdevs, pci); + if (pciResetDevice(activePci, driver->activePciHostdevs, NULL) < 0) ret = -1; - pciDeviceReAttachInit(pci); - qemuReattachPciDevice(pci, driver); + qemuReattachPciDevice(activePci, driver); pciFreeDevice(pci); + pciFreeDevice(activePci); + } else { + ret = -1; } if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE) && -- 1.7.6

2 2

[libvirt] [PATCH] qemu: Do not wait if the PCI device is not managed when reattaching
by Osier Yang 18 Oct '11

18 Oct '11

Waiting for qemu-kvm cleaning up the PCI bar(s) mapping with long time while the device is not managed is just waste of time. --- src/qemu/qemu_hostdev.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c index c65f6f5..1fb373e 100644 --- a/src/qemu/qemu_hostdev.c +++ b/src/qemu/qemu_hostdev.c @@ -322,19 +322,20 @@ void qemuReattachPciDevice(pciDevice *dev, struct qemud_driver *driver) { int retries = 100; + if (!pciDeviceGetManaged(dev)) + return; + while (pciWaitForDeviceCleanup(dev, "kvm_assigned_device") && retries) { usleep(100*1000); retries--; } - if (pciDeviceGetManaged(dev)) { - if (pciReAttachDevice(dev, driver->activePciHostdevs) < 0) { - virErrorPtr err = virGetLastError(); - VIR_ERROR(_("Failed to re-attach PCI device: %s"), - err ? err->message : _("unknown error")); - virResetError(err); - } + if (pciReAttachDevice(dev, driver->activePciHostdevs) < 0) { + virErrorPtr err = virGetLastError(); + VIR_ERROR(_("Failed to re-attach PCI device: %s"), + err ? err->message : _("unknown error")); + virResetError(err); } } -- 1.7.6

2 2

[libvirt] [PATCH] Add support for autodestroy of guests to the LXC and UML drivers
by Daniel P. Berrange 17 Oct '11

17 Oct '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> I wrote this months ago and thought I had already submitted/merged it. Obviously not. I need this for the virt sandbox tools asap. We recently added support for VIR_DOMAIN_START_AUTODESTROY and an impl to the QEMU driver. It is very desirable to support in other drivers, so this adds it to LXC and UML * src/lxc/lxc_conf.h, src/lxc/lxc_driver.c, src/uml/uml_conf.h, src/uml/uml_driver.c: Wire up autodestroy functions --- src/lxc/lxc_conf.h | 5 ++ src/lxc/lxc_driver.c | 140 +++++++++++++++++++++++++++++++++++++++++-- src/uml/uml_conf.h | 6 ++ src/uml/uml_driver.c | 164 +++++++++++++++++++++++++++++++++++++++++++------- 4 files changed, 289 insertions(+), 26 deletions(-) diff --git a/src/lxc/lxc_conf.h b/src/lxc/lxc_conf.h index 66aa469..b124330 100644 --- a/src/lxc/lxc_conf.h +++ b/src/lxc/lxc_conf.h @@ -56,6 +56,11 @@ struct __lxc_driver { int have_netns; virDomainEventStatePtr domainEventState; + + /* Mapping of 'char *uuidstr' -> virConnectPtr + * of guests which will be automatically killed + * when the virConnectPtr is closed*/ + virHashTablePtr autodestroy; }; int lxcLoadDriverConfig(lxc_driver_t *driver); diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index c475887..f08e8d1 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -110,6 +110,19 @@ static void lxcDomainEventFlush(int timer, void *opaque); static void lxcDomainEventQueue(lxc_driver_t *driver, virDomainEventPtr event); +static int lxcVmTerminate(lxc_driver_t *driver, + virDomainObjPtr vm, + virDomainShutoffReason reason); +static int lxcProcessAutoDestroyInit(lxc_driver_t *driver); +static void lxcProcessAutoDestroyRun(lxc_driver_t *driver, + virConnectPtr conn); +static void lxcProcessAutoDestroyShutdown(lxc_driver_t *driver); +static int lxcProcessAutoDestroyAdd(lxc_driver_t *driver, + virDomainObjPtr vm, + virConnectPtr conn); +static int lxcProcessAutoDestroyRemove(lxc_driver_t *driver, + virDomainObjPtr vm); + static virDrvOpenStatus lxcOpen(virConnectPtr conn, virConnectAuthPtr auth ATTRIBUTE_UNUSED, @@ -165,6 +178,7 @@ static int lxcClose(virConnectPtr conn) lxcDriverLock(driver); virDomainEventCallbackListRemoveConn(conn, driver->domainEventState->callbacks); + lxcProcessAutoDestroyRun(driver, conn); lxcDriverUnlock(driver); conn->privateData = NULL; @@ -1001,6 +1015,104 @@ cleanup: } +static int lxcProcessAutoDestroyInit(lxc_driver_t *driver) +{ + if (!(driver->autodestroy = virHashCreate(5, NULL))) + return -1; + + return 0; +} + +struct lxcProcessAutoDestroyData { + lxc_driver_t *driver; + virConnectPtr conn; +}; + +static void lxcProcessAutoDestroyDom(void *payload, + const void *name, + void *opaque) +{ + struct lxcProcessAutoDestroyData *data = opaque; + virConnectPtr conn = payload; + const char *uuidstr = name; + unsigned char uuid[VIR_UUID_BUFLEN]; + virDomainObjPtr dom; + virDomainEventPtr event = NULL; + + VIR_DEBUG("conn=%p uuidstr=%s thisconn=%p", conn, uuidstr, data->conn); + + if (data->conn != conn) + return; + + if (virUUIDParse(uuidstr, uuid) < 0) { + VIR_WARN("Failed to parse %s", uuidstr); + return; + } + + if (!(dom = virDomainFindByUUID(&data->driver->domains, + uuid))) { + VIR_DEBUG("No domain object to kill"); + return; + } + + VIR_DEBUG("Killing domain"); + lxcVmTerminate(data->driver, dom, VIR_DOMAIN_SHUTOFF_DESTROYED); + virDomainAuditStop(dom, "destroyed"); + event = virDomainEventNewFromObj(dom, + VIR_DOMAIN_EVENT_STOPPED, + VIR_DOMAIN_EVENT_STOPPED_DESTROYED); + + if (dom && !dom->persistent) + virDomainRemoveInactive(&data->driver->domains, dom); + + if (dom) + virDomainObjUnlock(dom); + if (event) + lxcDomainEventQueue(data->driver, event); + virHashRemoveEntry(data->driver->autodestroy, uuidstr); +} + +/* + * Precondition: driver is locked + */ +static void lxcProcessAutoDestroyRun(lxc_driver_t *driver, virConnectPtr conn) +{ + struct lxcProcessAutoDestroyData data = { + driver, conn + }; + VIR_DEBUG("conn=%p", conn); + virHashForEach(driver->autodestroy, lxcProcessAutoDestroyDom, &data); +} + +static void lxcProcessAutoDestroyShutdown(lxc_driver_t *driver) +{ + virHashFree(driver->autodestroy); +} + +static int lxcProcessAutoDestroyAdd(lxc_driver_t *driver, + virDomainObjPtr vm, + virConnectPtr conn) +{ + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(vm->def->uuid, uuidstr); + VIR_DEBUG("vm=%s uuid=%s conn=%p", vm->def->name, uuidstr, conn); + if (virHashAddEntry(driver->autodestroy, uuidstr, conn) < 0) + return -1; + return 0; +} + +static int lxcProcessAutoDestroyRemove(lxc_driver_t *driver, + virDomainObjPtr vm) +{ + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(vm->def->uuid, uuidstr); + VIR_DEBUG("vm=%s uuid=%s", vm->def->name, uuidstr); + if (virHashRemoveEntry(driver->autodestroy, uuidstr) < 0) + return -1; + return 0; +} + + /** * lxcVmCleanup: * @driver: pointer to driver structure @@ -1028,6 +1140,9 @@ static void lxcVmCleanup(lxc_driver_t *driver, VIR_FREE(xml); } + /* Stop autodestroy in case guest is restarted */ + lxcProcessAutoDestroyRemove(driver, vm); + virEventRemoveHandle(priv->monitorWatch); VIR_FORCE_CLOSE(priv->monitor); @@ -1496,6 +1611,7 @@ cleanup: * @conn: pointer to connection * @driver: pointer to driver structure * @vm: pointer to virtual machine structure + * @autoDestroy: mark the domain for auto destruction * @reason: reason for switching vm to running state * * Starts a vm @@ -1505,6 +1621,7 @@ cleanup: static int lxcVmStart(virConnectPtr conn, lxc_driver_t * driver, virDomainObjPtr vm, + bool autoDestroy, virDomainRunningReason reason) { int rc = -1, r; @@ -1665,6 +1782,10 @@ static int lxcVmStart(virConnectPtr conn, goto cleanup; } + if (autoDestroy && + lxcProcessAutoDestroyAdd(driver, vm, conn) < 0) + goto cleanup; + /* * Again, need to save the live configuration, because the function * requires vm->def->id != -1 to save tty info surely. @@ -1719,7 +1840,7 @@ static int lxcDomainStartWithFlags(virDomainPtr dom, unsigned int flags) virDomainEventPtr event = NULL; int ret = -1; - virCheckFlags(0, -1); + virCheckFlags(VIR_DOMAIN_START_AUTODESTROY, -1); lxcDriverLock(driver); vm = virDomainFindByUUID(&driver->domains, dom->uuid); @@ -1743,7 +1864,9 @@ static int lxcDomainStartWithFlags(virDomainPtr dom, unsigned int flags) goto cleanup; } - ret = lxcVmStart(dom->conn, driver, vm, VIR_DOMAIN_RUNNING_BOOTED); + ret = lxcVmStart(dom->conn, driver, vm, + (flags & VIR_DOMAIN_START_AUTODESTROY), + VIR_DOMAIN_RUNNING_BOOTED); if (ret == 0) { event = virDomainEventNewFromObj(vm, @@ -1796,7 +1919,7 @@ lxcDomainCreateAndStart(virConnectPtr conn, virDomainPtr dom = NULL; virDomainEventPtr event = NULL; - virCheckFlags(0, NULL); + virCheckFlags(VIR_DOMAIN_START_AUTODESTROY, NULL); lxcDriverLock(driver); if (!(def = virDomainDefParseString(driver->caps, xml, @@ -1819,7 +1942,9 @@ lxcDomainCreateAndStart(virConnectPtr conn, goto cleanup; def = NULL; - if (lxcVmStart(conn, driver, vm, VIR_DOMAIN_RUNNING_BOOTED) < 0) { + if (lxcVmStart(conn, driver, vm, + (flags & VIR_DOMAIN_START_AUTODESTROY), + VIR_DOMAIN_RUNNING_BOOTED) < 0) { virDomainAuditStart(vm, "booted", false); virDomainRemoveInactive(&driver->domains, vm); vm = NULL; @@ -2054,7 +2179,7 @@ lxcAutostartDomain(void *payload, const void *name ATTRIBUTE_UNUSED, void *opaqu virDomainObjLock(vm); if (vm->autostart && !virDomainObjIsActive(vm)) { - int ret = lxcVmStart(data->conn, data->driver, vm, + int ret = lxcVmStart(data->conn, data->driver, vm, false, VIR_DOMAIN_RUNNING_BOOTED); virDomainAuditStart(vm, "booted", ret >= 0); if (ret < 0) { @@ -2205,6 +2330,9 @@ static int lxcStartup(int privileged) lxc_driver->caps->privateDataAllocFunc = lxcDomainObjPrivateAlloc; lxc_driver->caps->privateDataFreeFunc = lxcDomainObjPrivateFree; + if (lxcProcessAutoDestroyInit(lxc_driver) < 0) + goto cleanup; + /* Get all the running persistent or transient configs first */ if (virDomainLoadAllConfigs(lxc_driver->caps, &lxc_driver->domains, @@ -2285,6 +2413,8 @@ static int lxcShutdown(void) virDomainObjListDeinit(&lxc_driver->domains); virDomainEventStateFree(lxc_driver->domainEventState); + lxcProcessAutoDestroyShutdown(lxc_driver); + virCapabilitiesFree(lxc_driver->caps); VIR_FREE(lxc_driver->configDir); VIR_FREE(lxc_driver->autostartDir); diff --git a/src/uml/uml_conf.h b/src/uml/uml_conf.h index 5401a7e..657f877 100644 --- a/src/uml/uml_conf.h +++ b/src/uml/uml_conf.h @@ -33,6 +33,7 @@ # include "virterror_internal.h" # include "threads.h" # include "command.h" +# include "hash.h" # define umlDebug(fmt, ...) do {} while(0) @@ -64,6 +65,11 @@ struct uml_driver { /* Event handling */ virDomainEventStatePtr domainEventState; + + /* Mapping of 'char *uuidstr' -> virConnectPtr + * of guests which will be automatically killed + * when the virConnectPtr is closed*/ + virHashTablePtr autodestroy; }; diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index 2b7219a..16ab73a 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -75,6 +75,16 @@ struct _umlDomainObjPrivate { int monitorWatch; }; +static int umlProcessAutoDestroyInit(struct uml_driver *driver); +static void umlProcessAutoDestroyRun(struct uml_driver *driver, + virConnectPtr conn); +static void umlProcessAutoDestroyShutdown(struct uml_driver *driver); +static int umlProcessAutoDestroyAdd(struct uml_driver *driver, + virDomainObjPtr vm, + virConnectPtr conn); +static int umlProcessAutoDestroyRemove(struct uml_driver *driver, + virDomainObjPtr vm); + static int umlShutdown(void); @@ -119,10 +129,10 @@ static void umlDomainEventQueue(struct uml_driver *driver, static int umlStartVMDaemon(virConnectPtr conn, struct uml_driver *driver, - virDomainObjPtr vm); + virDomainObjPtr vm, + bool autoDestroy); -static void umlShutdownVMDaemon(virConnectPtr conn, - struct uml_driver *driver, +static void umlShutdownVMDaemon(struct uml_driver *driver, virDomainObjPtr vm, virDomainShutoffReason reason); @@ -150,7 +160,7 @@ umlAutostartDomain(void *payload, const void *name ATTRIBUTE_UNUSED, void *opaqu !virDomainObjIsActive(vm)) { int ret; virResetLastError(); - ret = umlStartVMDaemon(data->conn, data->driver, vm); + ret = umlStartVMDaemon(data->conn, data->driver, vm, false); virDomainAuditStart(vm, "booted", ret >= 0); if (ret < 0) { virErrorPtr err = virGetLastError(); @@ -309,7 +319,7 @@ reread: continue; } - umlShutdownVMDaemon(NULL, driver, dom, VIR_DOMAIN_SHUTOFF_SHUTDOWN); + umlShutdownVMDaemon(driver, dom, VIR_DOMAIN_SHUTOFF_SHUTDOWN); virDomainAuditStop(dom, "shutdown"); event = virDomainEventNewFromObj(dom, VIR_DOMAIN_EVENT_STOPPED, @@ -337,7 +347,7 @@ reread: if (umlOpenMonitor(driver, dom) < 0) { VIR_WARN("Could not open monitor for new domain"); - umlShutdownVMDaemon(NULL, driver, dom, + umlShutdownVMDaemon(driver, dom, VIR_DOMAIN_SHUTOFF_FAILED); virDomainAuditStop(dom, "failed"); event = virDomainEventNewFromObj(dom, @@ -350,7 +360,7 @@ reread: } } else if (umlIdentifyChrPTY(driver, dom) < 0) { VIR_WARN("Could not identify character devices for new domain"); - umlShutdownVMDaemon(NULL, driver, dom, + umlShutdownVMDaemon(driver, dom, VIR_DOMAIN_SHUTOFF_FAILED); virDomainAuditStop(dom, "failed"); event = virDomainEventNewFromObj(dom, @@ -480,6 +490,9 @@ umlStartup(int privileged) umlInotifyEvent, uml_driver, NULL)) < 0) goto error; + if (umlProcessAutoDestroyInit(uml_driver) < 0) + goto error; + if (virDomainLoadAllConfigs(uml_driver->caps, &uml_driver->domains, uml_driver->configDir, @@ -577,7 +590,7 @@ umlShutdownOneVM(void *payload, const void *name ATTRIBUTE_UNUSED, void *opaque) virDomainObjLock(dom); if (virDomainObjIsActive(dom)) { - umlShutdownVMDaemon(NULL, driver, dom, VIR_DOMAIN_SHUTOFF_SHUTDOWN); + umlShutdownVMDaemon(driver, dom, VIR_DOMAIN_SHUTOFF_SHUTDOWN); virDomainAuditStop(dom, "shutdown"); } virDomainObjUnlock(dom); @@ -612,6 +625,8 @@ umlShutdown(void) { VIR_FREE(uml_driver->autostartDir); VIR_FREE(uml_driver->monitorDir); + umlProcessAutoDestroyShutdown(uml_driver); + if (uml_driver->brctl) brShutdown(uml_driver->brctl); @@ -623,6 +638,104 @@ umlShutdown(void) { } +static int umlProcessAutoDestroyInit(struct uml_driver *driver) +{ + if (!(driver->autodestroy = virHashCreate(5, NULL))) + return -1; + + return 0; +} + +struct umlProcessAutoDestroyData { + struct uml_driver *driver; + virConnectPtr conn; +}; + +static void umlProcessAutoDestroyDom(void *payload, + const void *name, + void *opaque) +{ + struct umlProcessAutoDestroyData *data = opaque; + virConnectPtr conn = payload; + const char *uuidstr = name; + unsigned char uuid[VIR_UUID_BUFLEN]; + virDomainObjPtr dom; + virDomainEventPtr event = NULL; + + VIR_DEBUG("conn=%p uuidstr=%s thisconn=%p", conn, uuidstr, data->conn); + + if (data->conn != conn) + return; + + if (virUUIDParse(uuidstr, uuid) < 0) { + VIR_WARN("Failed to parse %s", uuidstr); + return; + } + + if (!(dom = virDomainFindByUUID(&data->driver->domains, + uuid))) { + VIR_DEBUG("No domain object to kill"); + return; + } + + VIR_DEBUG("Killing domain"); + umlShutdownVMDaemon(data->driver, dom, VIR_DOMAIN_SHUTOFF_DESTROYED); + virDomainAuditStop(dom, "destroyed"); + event = virDomainEventNewFromObj(dom, + VIR_DOMAIN_EVENT_STOPPED, + VIR_DOMAIN_EVENT_STOPPED_DESTROYED); + + if (dom && !dom->persistent) + virDomainRemoveInactive(&data->driver->domains, dom); + + if (dom) + virDomainObjUnlock(dom); + if (event) + umlDomainEventQueue(data->driver, event); + virHashRemoveEntry(data->driver->autodestroy, uuidstr); +} + +/* + * Precondition: driver is locked + */ +static void umlProcessAutoDestroyRun(struct uml_driver *driver, virConnectPtr conn) +{ + struct umlProcessAutoDestroyData data = { + driver, conn + }; + VIR_DEBUG("conn=%p", conn); + virHashForEach(driver->autodestroy, umlProcessAutoDestroyDom, &data); +} + +static void umlProcessAutoDestroyShutdown(struct uml_driver *driver) +{ + virHashFree(driver->autodestroy); +} + +static int umlProcessAutoDestroyAdd(struct uml_driver *driver, + virDomainObjPtr vm, + virConnectPtr conn) +{ + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(vm->def->uuid, uuidstr); + VIR_DEBUG("vm=%s uuid=%s conn=%p", vm->def->name, uuidstr, conn); + if (virHashAddEntry(driver->autodestroy, uuidstr, conn) < 0) + return -1; + return 0; +} + +static int umlProcessAutoDestroyRemove(struct uml_driver *driver, + virDomainObjPtr vm) +{ + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(vm->def->uuid, uuidstr); + VIR_DEBUG("vm=%s uuid=%s", vm->def->name, uuidstr); + if (virHashRemoveEntry(driver->autodestroy, uuidstr) < 0) + return -1; + return 0; +} + + static int umlReadPidFile(struct uml_driver *driver, virDomainObjPtr vm) { @@ -842,8 +955,7 @@ error: } -static int umlCleanupTapDevices(virConnectPtr conn ATTRIBUTE_UNUSED, - virDomainObjPtr vm) { +static int umlCleanupTapDevices(virDomainObjPtr vm) { int i; int err; int ret = 0; @@ -873,7 +985,8 @@ static int umlCleanupTapDevices(virConnectPtr conn ATTRIBUTE_UNUSED, static int umlStartVMDaemon(virConnectPtr conn, struct uml_driver *driver, - virDomainObjPtr vm) { + virDomainObjPtr vm, + bool autoDestroy) { int ret; char *logfile; int logfd = -1; @@ -935,7 +1048,7 @@ static int umlStartVMDaemon(virConnectPtr conn, if (!(cmd = umlBuildCommandLine(conn, driver, vm))) { VIR_FORCE_CLOSE(logfd); virDomainConfVMNWFilterTeardown(vm); - umlCleanupTapDevices(conn, vm); + umlCleanupTapDevices(vm); return -1; } @@ -953,13 +1066,17 @@ static int umlStartVMDaemon(virConnectPtr conn, if (ret < 0) goto cleanup; + if (autoDestroy && + umlProcessAutoDestroyAdd(driver, vm, conn) < 0) + goto cleanup; + ret = virDomainObjSetDefTransient(driver->caps, vm, false); cleanup: virCommandFree(cmd); if (ret < 0) { virDomainConfVMNWFilterTeardown(vm); - umlCleanupTapDevices(conn, vm); + umlCleanupTapDevices(vm); } /* NB we don't mark it running here - we do that async @@ -972,8 +1089,7 @@ cleanup: return ret; } -static void umlShutdownVMDaemon(virConnectPtr conn ATTRIBUTE_UNUSED, - struct uml_driver *driver ATTRIBUTE_UNUSED, +static void umlShutdownVMDaemon(struct uml_driver *driver, virDomainObjPtr vm, virDomainShutoffReason reason) { @@ -997,7 +1113,10 @@ static void umlShutdownVMDaemon(virConnectPtr conn ATTRIBUTE_UNUSED, virDomainObjSetState(vm, VIR_DOMAIN_SHUTOFF, reason); virDomainConfVMNWFilterTeardown(vm); - umlCleanupTapDevices(conn, vm); + umlCleanupTapDevices(vm); + + /* Stop autodestroy in case guest is restarted */ + umlProcessAutoDestroyRemove(driver, vm); if (vm->newDef) { virDomainDefFree(vm->def); @@ -1072,6 +1191,7 @@ static int umlClose(virConnectPtr conn) { umlDriverLock(driver); virDomainEventCallbackListRemoveConn(conn, driver->domainEventState->callbacks); + umlProcessAutoDestroyRun(driver, conn); umlDriverUnlock(driver); conn->privateData = NULL; @@ -1342,7 +1462,7 @@ static virDomainPtr umlDomainCreate(virConnectPtr conn, const char *xml, virDomainPtr dom = NULL; virDomainEventPtr event = NULL; - virCheckFlags(0, NULL); + virCheckFlags(VIR_DOMAIN_START_AUTODESTROY, NULL); umlDriverLock(driver); if (!(def = virDomainDefParseString(driver->caps, xml, @@ -1359,7 +1479,8 @@ static virDomainPtr umlDomainCreate(virConnectPtr conn, const char *xml, goto cleanup; def = NULL; - if (umlStartVMDaemon(conn, driver, vm) < 0) { + if (umlStartVMDaemon(conn, driver, vm, + (flags & VIR_DOMAIN_START_AUTODESTROY)) < 0) { virDomainAuditStart(vm, "booted", false); virDomainRemoveInactive(&driver->domains, vm); @@ -1436,7 +1557,7 @@ umlDomainDestroyFlags(virDomainPtr dom, goto cleanup; } - umlShutdownVMDaemon(dom->conn, driver, vm, VIR_DOMAIN_SHUTOFF_DESTROYED); + umlShutdownVMDaemon(driver, vm, VIR_DOMAIN_SHUTOFF_DESTROYED); virDomainAuditStop(vm, "destroyed"); event = virDomainEventNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED, @@ -1717,7 +1838,7 @@ static int umlDomainStartWithFlags(virDomainPtr dom, unsigned int flags) { virDomainEventPtr event = NULL; int ret = -1; - virCheckFlags(0, -1); + virCheckFlags(VIR_DOMAIN_START_AUTODESTROY, -1); umlDriverLock(driver); vm = virDomainFindByUUID(&driver->domains, dom->uuid); @@ -1728,7 +1849,8 @@ static int umlDomainStartWithFlags(virDomainPtr dom, unsigned int flags) { goto cleanup; } - ret = umlStartVMDaemon(dom->conn, driver, vm); + ret = umlStartVMDaemon(dom->conn, driver, vm, + (flags & VIR_DOMAIN_START_AUTODESTROY)); virDomainAuditStart(vm, "booted", ret >= 0); if (ret == 0) event = virDomainEventNewFromObj(vm, -- 1.7.6.4

2 1

[libvirt] [PATCH 0/3] snapshot: another snapshot-list filter
by Eric Blake 17 Oct '11

17 Oct '11

Previously, we could filter 'virsh snapshot-list --roots' to show just snapshots lacking parents, which is good for top-down algorithms. But sometimes you want just snapshots lacking children, for bottom-up algorithms - this implements that. Once again, I can only compile-test esx. Also, I haven't yet spent time with the vbox code to write up this patch, partly because the previous round of factoring it into reusable recursive iteration is still in churn in an edit-compile-test cycle between Matthias and me. I'm still debating on whether to emulate --leaves when talking to an 0.9.5 server. Probably not too hard... Eric Blake (3): snapshot: add API for filtering by leaves snapshot: implement LIST_LEAVES flag in qemu snapshot: implement LIST_LEAVES flag in esx include/libvirt/libvirt.h.in | 2 ++ src/conf/domain_conf.c | 8 ++++++-- src/esx/esx_driver.c | 29 +++++++++++++++++++++-------- src/esx/esx_vi.c | 27 ++++++++++++++++----------- src/esx/esx_vi.h | 4 ++-- src/libvirt.c | 16 ++++++++++++++-- src/qemu/qemu_driver.c | 12 ++++++++---- tools/virsh.c | 12 ++++++++++++ tools/virsh.pod | 7 ++++++- 9 files changed, 87 insertions(+), 30 deletions(-) -- 1.7.4.4

3 9

[libvirt] [PATCH v2] qemu: Do not reattach PCI device used by other domain when shutdown
by Osier Yang 17 Oct '11

17 Oct '11

When failing on starting a domain, it tries to reattach all the PCI devices defined in the domain conf, regardless of whether the devices are still used by other domain. This will cause the devices to be deleted from the list qemu_driver->activePciHostdevs, thus the devices will be thought as usable even if it's not true. And following commands nodedev-{reattach,reset} will be successful. How to reproduce: 1) Define two domains with same PCI device defined in the confs. 2) # virsh start domain1 3) # virsh start domain2 4) # virsh nodedev-reattach $pci_device You will see the device will be reattached to host successfully. As pciDeviceReattach just check if the device is still used by other domain via checking if the device is in list driver->activePciHostdevs, however, the device is deleted from the list by step 2). This patch is to prohibit the bug by: 1) Prohibit a domain starting or device attachment right at preparation period (qemuPrepareHostdevPCIDevices) if the device is in list driver->activePciHostdevs, which means it's used by other domain. 2) Introduces a new field for struct _pciDevice, (const char *used_by), it will be set as the domain name at preparation period, (qemuPrepareHostdevPCIDevices). Thus we can prohibit deleting the device from driver->activePciHostdevs if it's still used by other domain when stopping the domain process. * src/pci.h (define two internal functions, pciDeviceSetUsedBy and pciDevceGetUsedBy) * src/pci.c (new field "const char *used_by" for struct _pciDevice, implementations for the two new functions) * src/libvirt_private.syms (Add the two new internal functions) * src/qemu_hostdev.h (Modify the definition of functions qemuPrepareHostdevPCIDevices, and qemuDomainReAttachHostdevDevices) * src/qemu_hostdev.c (Prohibit preparation and don't delete the device from activePciHostdevs list if it's still used by other domain) * src/qemu_hotplug.c (Update function usage, as the definitions are changed) v1 - v2: * char * used_by => const char *used_by, and no strdup() * Other nits pointed out by Eric. --- src/libvirt_private.syms | 2 ++ src/qemu/qemu_hostdev.c | 43 ++++++++++++++++++++++++++++++++++++++----- src/qemu/qemu_hostdev.h | 2 ++ src/qemu/qemu_hotplug.c | 4 ++-- src/util/pci.c | 15 +++++++++++++++ src/util/pci.h | 3 +++ 6 files changed, 62 insertions(+), 7 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 4f96518..4d50d86 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -880,6 +880,7 @@ virNWFilterHashTableRemoveEntry; pciDettachDevice; pciDeviceFileIterate; pciDeviceGetManaged; +pciDeviceGetUsedBy; pciDeviceIsAssignable; pciDeviceIsVirtualFunction; pciDeviceListAdd; @@ -892,6 +893,7 @@ pciDeviceListSteal; pciDeviceNetName; pciDeviceReAttachInit; pciDeviceSetManaged; +pciDeviceSetUsedBy; pciFreeDevice; pciGetDevice; pciGetPhysicalFunction; diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c index 6f77717..f354ea8 100644 --- a/src/qemu/qemu_hostdev.c +++ b/src/qemu/qemu_hostdev.c @@ -101,6 +101,7 @@ cleanup: int qemuPrepareHostdevPCIDevices(struct qemud_driver *driver, + const char *name, virDomainHostdevDefPtr *hostdevs, int nhostdevs) { @@ -111,7 +112,7 @@ int qemuPrepareHostdevPCIDevices(struct qemud_driver *driver, if (!(pcidevs = qemuGetPciHostDeviceList(hostdevs, nhostdevs))) return -1; - /* We have to use 4 loops here. *All* devices must + /* We have to use 6 loops here. *All* devices must * be detached before we reset any of them, because * in some cases you have to reset the whole PCI, * which impacts all devices on it. Also, all devices @@ -125,9 +126,16 @@ int qemuPrepareHostdevPCIDevices(struct qemud_driver *driver, for (i = 0; i < pciDeviceListCount(pcidevs); i++) { pciDevice *dev = pciDeviceListGet(pcidevs, i); - if (!pciDeviceIsAssignable(dev, !driver->relaxedACS)) - goto reattachdevs; + /* The device is in use by other active domain if + * the dev is in list driver->activePciHostdevs. + */ + if (!pciDeviceIsAssignable(dev, !driver->relaxedACS) || + pciDeviceListFind(driver->activePciHostdevs, dev)) + goto cleanup; + } + for (i = 0; i < pciDeviceListCount(pcidevs); i++) { + pciDevice *dev = pciDeviceListGet(pcidevs, i); if (pciDeviceGetManaged(dev) && pciDettachDevice(dev, driver->activePciHostdevs) < 0) goto reattachdevs; @@ -150,6 +158,18 @@ int qemuPrepareHostdevPCIDevices(struct qemud_driver *driver, } } + /* Now set the used_by_domain of the device in driver->activePciHostdevs + * as domain name. + */ + for (i = 0; i < pciDeviceListCount(pcidevs); i++) { + pciDevice *dev, *activeDev; + + dev = pciDeviceListGet(pcidevs, i); + activeDev = pciDeviceListFind(driver->activePciHostdevs, dev); + + pciDeviceSetUsedBy(activeDev, name); + } + /* Now steal all the devices from pcidevs */ while (pciDeviceListCount(pcidevs) > 0) { pciDevice *dev = pciDeviceListGet(pcidevs, 0); @@ -183,7 +203,7 @@ static int qemuPrepareHostPCIDevices(struct qemud_driver *driver, virDomainDefPtr def) { - return qemuPrepareHostdevPCIDevices(driver, def->hostdevs, def->nhostdevs); + return qemuPrepareHostdevPCIDevices(driver, def->name, def->hostdevs, def->nhostdevs); } @@ -258,6 +278,7 @@ void qemuReattachPciDevice(pciDevice *dev, struct qemud_driver *driver) void qemuDomainReAttachHostdevDevices(struct qemud_driver *driver, + const char *name, virDomainHostdevDefPtr *hostdevs, int nhostdevs) { @@ -277,6 +298,18 @@ void qemuDomainReAttachHostdevDevices(struct qemud_driver *driver, for (i = 0; i < pciDeviceListCount(pcidevs); i++) { pciDevice *dev = pciDeviceListGet(pcidevs, i); + pciDevice *activeDev = NULL; + const char *used_by = NULL; + + /* Never delete the dev from list driver->activePciHostdevs + * if it's used by other domain. + */ + activeDev = pciDeviceListFind(driver->activePciHostdevs, dev); + if (activeDev && + (used_by = pciDeviceGetUsedBy(activeDev)) && + STRNEQ(name, used_by)) + continue; + pciDeviceListDel(driver->activePciHostdevs, dev); } @@ -305,5 +338,5 @@ void qemuDomainReAttachHostDevices(struct qemud_driver *driver, if (!def->nhostdevs) return; - qemuDomainReAttachHostdevDevices(driver, def->hostdevs, def->nhostdevs); + qemuDomainReAttachHostdevDevices(driver, def->name, def->hostdevs, def->nhostdevs); } diff --git a/src/qemu/qemu_hostdev.h b/src/qemu/qemu_hostdev.h index 1f3d1bc..07d7de2 100644 --- a/src/qemu/qemu_hostdev.h +++ b/src/qemu/qemu_hostdev.h @@ -30,12 +30,14 @@ int qemuUpdateActivePciHostdevs(struct qemud_driver *driver, virDomainDefPtr def); int qemuPrepareHostdevPCIDevices(struct qemud_driver *driver, + const char *name, virDomainHostdevDefPtr *hostdevs, int nhostdevs); int qemuPrepareHostDevices(struct qemud_driver *driver, virDomainDefPtr def); void qemuReattachPciDevice(pciDevice *dev, struct qemud_driver *driver); void qemuDomainReAttachHostdevDevices(struct qemud_driver *driver, + const char *name, virDomainHostdevDefPtr *hostdevs, int nhostdevs); void qemuDomainReAttachHostDevices(struct qemud_driver *driver, diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 4c1705d..bfa524b 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -893,7 +893,7 @@ int qemuDomainAttachHostPciDevice(struct qemud_driver *driver, return -1; } - if (qemuPrepareHostdevPCIDevices(driver, &hostdev, 1) < 0) + if (qemuPrepareHostdevPCIDevices(driver, vm->def->name, &hostdev, 1) < 0) return -1; if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) { @@ -959,7 +959,7 @@ error: hostdev->info.addr.pci.slot) < 0) VIR_WARN("Unable to release PCI address on host device"); - qemuDomainReAttachHostdevDevices(driver, &hostdev, 1); + qemuDomainReAttachHostdevDevices(driver, vm->def->name, &hostdev, 1); VIR_FREE(devstr); VIR_FREE(configfd_name); diff --git a/src/util/pci.c b/src/util/pci.c index 8d8e157..888784a 100644 --- a/src/util/pci.c +++ b/src/util/pci.c @@ -62,6 +62,7 @@ struct _pciDevice { char name[PCI_ADDR_LEN]; /* domain:bus:slot.function */ char id[PCI_ID_LEN]; /* product vendor */ char *path; + const char *used_by; /* The domain which uses the device */ int fd; unsigned initted; @@ -1312,6 +1313,7 @@ pciGetDevice(unsigned domain, dev->bus = bus; dev->slot = slot; dev->function = function; + dev->used_by = NULL; if (snprintf(dev->name, sizeof(dev->name), "%.4x:%.2x:%.2x.%.1x", dev->domain, dev->bus, dev->slot, @@ -1374,6 +1376,7 @@ pciFreeDevice(pciDevice *dev) VIR_DEBUG("%s %s: freeing", dev->id, dev->name); pciCloseConfig(dev); VIR_FREE(dev->path); + dev->used_by = NULL; VIR_FREE(dev); } @@ -1387,6 +1390,18 @@ unsigned pciDeviceGetManaged(pciDevice *dev) return dev->managed; } +void +pciDeviceSetUsedBy(pciDevice *dev, const char *name) +{ + dev->used_by = name; +} + +const char * +pciDeviceGetUsedBy(pciDevice *dev) +{ + return dev->used_by; +} + void pciDeviceReAttachInit(pciDevice *pci) { pci->unbind_from_stub = 1; diff --git a/src/util/pci.h b/src/util/pci.h index a1600fe..640c6af 100644 --- a/src/util/pci.h +++ b/src/util/pci.h @@ -47,6 +47,9 @@ int pciResetDevice (pciDevice *dev, void pciDeviceSetManaged(pciDevice *dev, unsigned managed); unsigned pciDeviceGetManaged(pciDevice *dev); +void pciDeviceSetUsedBy(pciDevice *dev, + const char *used_by); +const char *pciDeviceGetUsedBy(pciDevice *dev); void pciDeviceReAttachInit(pciDevice *dev); pciDeviceList *pciDeviceListNew (void); -- 1.7.6

2 5

[libvirt] [PATCH] Fix virt-sanlock-cleanup documentation
by Philipp Hahn 17 Oct '11

17 Oct '11

The referenced page does not exist, but locking.html has a section about sanlock. Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- tools/virt-sanlock-cleanup.in | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/virt-sanlock-cleanup.in b/tools/virt-sanlock-cleanup.in index 72cd5e0..e143e7d 100644 --- a/tools/virt-sanlock-cleanup.in +++ b/tools/virt-sanlock-cleanup.in @@ -64,8 +64,8 @@ active. =head1 EXIT STATUS -Upon successful processing of leases cleanup, the exit status -will be 0 will be set. Upon fatal error a non-zero status will +Upon successful processing of leases cleanup, an exit status +of 0 will be set. Upon fatal error a non-zero status will be set. =head1 AUTHOR @@ -91,6 +91,6 @@ PURPOSE =head1 SEE ALSO -C<virsh(1)>, online instructions C<http://libvirt.org/locksanlock.html> +C<virsh(1)>, online instructions C<http://libvirt.org/locking.html> =cut -- 1.7.1

2 1

[libvirt] [PATCH] qemu: avoid dereferencing a NULL pointer
by ajia＠redhat.com 17 Oct '11

17 Oct '11

From: Alex Jia <ajia(a)redhat.com> * src/qemu/qemu_hostdev.c: function 'pciDeviceListFind' probably explicitly returns null, however, the function 'pciDeviceSetUsedBy' directly uses it without any judgement. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/qemu/qemu_hostdev.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c index c65f6f5..4e148b0 100644 --- a/src/qemu/qemu_hostdev.c +++ b/src/qemu/qemu_hostdev.c @@ -227,9 +227,8 @@ int qemuPrepareHostdevPCIDevices(struct qemud_driver *driver, pciDevice *dev, *activeDev; dev = pciDeviceListGet(pcidevs, i); - activeDev = pciDeviceListFind(driver->activePciHostdevs, dev); - - pciDeviceSetUsedBy(activeDev, name); + if ((activeDev = pciDeviceListFind(driver->activePciHostdevs, dev))) + pciDeviceSetUsedBy(activeDev, name); } /* Loop 6: Now steal all the devices from pcidevs */ -- 1.7.1

3 2

[libvirt] [PATCH] Fix two comments related to error handling
by Philipp Hahn 17 Oct '11

17 Oct '11

Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- include/libvirt/virterror.h | 2 +- python/libvirt-override.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/libvirt/virterror.h b/include/libvirt/virterror.h index dfbe2bc..a8549b7 100644 --- a/include/libvirt/virterror.h +++ b/include/libvirt/virterror.h @@ -206,7 +206,7 @@ typedef enum { VIR_ERR_INVALID_STORAGE_VOL = 47, /* invalid storage vol object */ VIR_WAR_NO_STORAGE = 48, /* failed to start storage */ VIR_ERR_NO_STORAGE_POOL = 49, /* storage pool not found */ - VIR_ERR_NO_STORAGE_VOL = 50, /* storage pool not found */ + VIR_ERR_NO_STORAGE_VOL = 50, /* storage volume not found */ VIR_WAR_NO_NODE = 51, /* failed to start node driver */ VIR_ERR_INVALID_NODE_DEVICE = 52, /* invalid node device object */ VIR_ERR_NO_NODE_DEVICE = 53, /* node device not found */ diff --git a/python/libvirt-override.py b/python/libvirt-override.py index 387fddf..8427eab 100644 --- a/python/libvirt-override.py +++ b/python/libvirt-override.py @@ -79,7 +79,7 @@ class libvirtError(Exception): # register the libvirt global error handler # def registerErrorHandler(f, ctx): - """Register a Python written function to for error reporting. + """Register a Python function for error reporting. The function is called back as f(ctx, error), with error being a list of information about the error being raised. Returns 1 in case of success.""" -- 1.7.1

2 1

[libvirt] [PATCH V1 0/6] Make part of inner workings of nwfilters more flexible
by Stefan Berger 17 Oct '11

17 Oct '11

The following series of patches re-does some of the inner workings of nwfilters with the goal to enable users to write filters that have other than the system-known chains supported right now ('root','arp','rarp','ipv4' and 'ipv6'). Ideally users should be able to provide a chain name in the chains XML attribute and either be able to jump to it as an 'action' or have the chain created automatically as it is the case right now for those chains enumerated before. I am introducing internal priorities for the chains mentioned above so that their creation can be made more flexible -- currently their creation and the order in which they are accessed is hardcoded. This largely does away with the hardcoded stuff. Further, filters will be automatically accessed from the (ebtables) 'root' chain using the prefix of the name of the chain. As an example, this filter will be accessed from the root chain for 'arp' packets since its name 'arpmac' has the prefix 'arp'. <filter name='allow-arpmac' chain='arpmac'> <uuid>94abeecc-c956-0ac8-1f49-a06ee8995688</uuid> <rule action='accept' direction='out' priority='100'> <arp opcode='Request_Reverse' arpsrcmacaddr='$MAC' arpdstmacaddr='$MAC' arpsrcipaddr='0.0.0.0' arpdstipaddr='0.0.0.0'/> </rule> <rule action='accept' direction='inout' priority='500'/> </filter> In the future the chains may have priorities supported in the XML in order to control the order in which they are accessed. <filter name='allow-arpmac' chain='arpmac' prirotiy='650'> [...] The series does not enable users yet to provide names of chains but instead pushes the problem of their later enablement into the XML parser and prepares the rest of the code to handle it (as far as this can be seen). I did the testing with the test cases in libvirt-tck and did not see regressions. Regards, Stefan

1 6

[libvirt] [BUG, RFC] Python generator: missing error_codes in generated libvirError exceptions
by Philipp Hahn 17 Oct '11

17 Oct '11

Hello, I just encountered a situation, where a KVM instance was reported as "no state" in virsh. This broke some code of mine, which was using "lookupByUUID()" to lookup several VMs. The Python code did raise a libvirt.libvirtError('virDomainLookupByUUID() failed',), where all get_error_*() functions return None. This is because the generated libvirt.py wrapper just raises libvirtError('%s() failed'), which makes deteting the exact fault harder. My current code explicitly checks for get_error_code() == VIR_ERR_NO_DOMAIN. On further investigation I also noticed that qemudDomainLookupByUUID() uses qemuReportError() to reports the error condition, which doesn't associate that error condition with the connection. What's the most appropriate way to fix this: 1. Assume lookupBy*() only will ever report an invalid lookup key and catch all libvirtErrors? 2. Parse the exception string? 3. Extend the generator to add additional information from annotations? 4. Replace the generated code with hand-extended code. Any ideas? Thanks for your input. Sincerely Philipp -- Philipp Hahn Open Source Software Engineer hahn(a)univention.de Univention GmbH Linux for Your Business fon: +49 421 22 232- 0 Mary-Somerville-Str.1 D-28359 Bremen fax: +49 421 22 232-99 http://www.univention.de/

1 0

[libvirt] [libvirt-glib] Turn GVirStream into a GIOStream
by Marc-André Lureau 17 Oct '11

17 Oct '11

Allows to read async from a stream with GVirInputStream. This is modelled after GSocket. --- libvirt-gobject/Makefile.am | 2 + libvirt-gobject/libvirt-gobject-connection.c | 2 +- libvirt-gobject/libvirt-gobject-input-stream.c | 239 ++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-input-stream.h | 68 +++++++ libvirt-gobject/libvirt-gobject-stream.c | 130 +++++++++++++- libvirt-gobject/libvirt-gobject-stream.h | 10 +- 6 files changed, 443 insertions(+), 8 deletions(-) create mode 100644 libvirt-gobject/libvirt-gobject-input-stream.c create mode 100644 libvirt-gobject/libvirt-gobject-input-stream.h diff --git a/libvirt-gobject/Makefile.am b/libvirt-gobject/Makefile.am index 8147db2..7013675 100644 --- a/libvirt-gobject/Makefile.am +++ b/libvirt-gobject/Makefile.am @@ -40,6 +40,8 @@ libvirt_gobject_1_0_la_HEADERS = \ libvirt_gobject_1_0_la_SOURCES = \ $(libvirt_gobject_1_0_la_HEADERS) \ libvirt-gobject-enums.c \ + libvirt-gobject-input-stream.c \ + libvirt-gobject-input-stream.h \ $(GOBJECT_SOURCE_FILES) libvirt_gobject_1_0_la_CFLAGS = \ -DDATADIR="\"$(datadir)\"" \ diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index 5fc0a9e..95cd878 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -1151,7 +1151,7 @@ GVirStream *gvir_connection_get_stream(GVirConnection *self, klass = GVIR_CONNECTION_GET_CLASS(self); g_return_val_if_fail(klass->stream_new, NULL); - virStreamPtr st = virStreamNew(self->priv->conn, flags); + virStreamPtr st = virStreamNew(self->priv->conn, flags | VIR_STREAM_NONBLOCK); return klass->stream_new(self, st); } diff --git a/libvirt-gobject/libvirt-gobject-input-stream.c b/libvirt-gobject/libvirt-gobject-input-stream.c new file mode 100644 index 0000000..a76d670 --- /dev/null +++ b/libvirt-gobject/libvirt-gobject-input-stream.c @@ -0,0 +1,239 @@ +/* + * libvirt-gobject-input-stream.h: libvirt gobject integration + * + * Copyright (C) 2011 Red Hat + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Authors: Daniel P. Berrange <berrange(a)redhat.com> + * Marc-André Lureau <marcandre.lureau(a)redhat.com> + */ + +#include <config.h> + +#include <libvirt/virterror.h> +#include <string.h> + +#include "libvirt-glib/libvirt-glib.h" +#include "libvirt-gobject/libvirt-gobject.h" +#include "libvirt-gobject-input-stream.h" + +extern gboolean debugFlag; + +#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) + +#define gvir_input_stream_get_type _gvir_input_stream_get_type +G_DEFINE_TYPE(GVirInputStream, gvir_input_stream, G_TYPE_INPUT_STREAM); + +enum +{ + PROP_0, + PROP_STREAM +}; + +struct _GVirInputStreamPrivate +{ + GVirStream *stream; + + /* pending operation metadata */ + GSimpleAsyncResult *result; + GCancellable *cancellable; + gpointer buffer; + gsize count; +}; + +static void gvir_input_stream_get_property(GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + GVirInputStream *stream = GVIR_INPUT_STREAM(object); + + switch (prop_id) { + case PROP_STREAM: + g_value_set_object(value, stream->priv->stream); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + } +} + +static void gvir_input_stream_set_property(GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + GVirInputStream *stream = GVIR_INPUT_STREAM(object); + + switch (prop_id) { + case PROP_STREAM: + stream->priv->stream = g_value_dup_object(value); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + } +} + +static void gvir_input_stream_finalize(GObject *object) +{ + GVirInputStream *stream = GVIR_INPUT_STREAM(object); + + if (stream->priv->stream) + g_object_unref(stream->priv->stream); + + if (G_OBJECT_CLASS(gvir_input_stream_parent_class)->finalize) + (*G_OBJECT_CLASS(gvir_input_stream_parent_class)->finalize)(object); +} + +static void +gvir_input_stream_read_ready (G_GNUC_UNUSED virStreamPtr st, + int events, void *opaque) +{ + GVirInputStream *stream = GVIR_INPUT_STREAM(opaque); + GVirInputStreamPrivate *priv = stream->priv; + GSimpleAsyncResult *simple; + GError *error = NULL; + gssize result; + + g_return_if_fail(events & VIR_STREAM_EVENT_READABLE); + + result = gvir_stream_receive(priv->stream, priv->buffer, priv->count, + priv->cancellable, &error); + + if (g_error_matches(error, G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK)) { + g_warn_if_reached(); + return; + } + + simple = stream->priv->result; + stream->priv->result = NULL; + + if (result >= 0) + g_simple_async_result_set_op_res_gssize(simple, result); + + if (error) + g_simple_async_result_take_error(simple, error); + + if (priv->cancellable) { + g_object_unref(stream->priv->cancellable); + priv->cancellable = NULL; + } + + g_simple_async_result_complete(simple); + g_object_unref(simple); + + return; +} + +static void gvir_input_stream_read_async(GInputStream *stream, + void *buffer, + gsize count, + G_GNUC_UNUSED int io_priority, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + GVirInputStream *input_stream = GVIR_INPUT_STREAM(stream); + virStreamPtr handle; + + g_return_if_fail(GVIR_IS_INPUT_STREAM(stream)); + g_return_if_fail(input_stream->priv->result == NULL); + + g_object_get(input_stream->priv->stream, "handle", &handle, NULL); + + if (virStreamEventAddCallback(handle, VIR_STREAM_EVENT_READABLE, + gvir_input_stream_read_ready, stream, NULL) < 0) { + g_simple_async_report_error_in_idle(G_OBJECT(stream), + callback, + user_data, + G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT, + "Couldn't add event callback %s", + G_STRFUNC); + goto end; + } + + input_stream->priv->result = + g_simple_async_result_new(G_OBJECT(stream), callback, user_data, + gvir_input_stream_read_async); + if (cancellable) + g_object_ref(cancellable); + input_stream->priv->cancellable = cancellable; + input_stream->priv->buffer = buffer; + input_stream->priv->count = count; + +end: + virStreamFree(handle); +} + + +static gssize gvir_input_stream_read_finish(GInputStream *stream, + GAsyncResult *result, + G_GNUC_UNUSED GError **error) +{ + GVirInputStream *input_stream = GVIR_INPUT_STREAM(stream); + GSimpleAsyncResult *simple; + virStreamPtr handle; + gssize count; + + g_return_val_if_fail(GVIR_IS_INPUT_STREAM(stream), -1); + g_object_get(input_stream->priv->stream, "handle", &handle, NULL); + + simple = G_SIMPLE_ASYNC_RESULT(result); + + g_warn_if_fail(g_simple_async_result_get_source_tag(simple) == gvir_input_stream_read_async); + + count = g_simple_async_result_get_op_res_gssize(simple); + + virStreamEventRemoveCallback(handle); + virStreamFree(handle); + + return count; +} + + +static void gvir_input_stream_class_init(GVirInputStreamClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS(klass); + GInputStreamClass *ginputstream_class = G_INPUT_STREAM_CLASS(klass); + + g_type_class_add_private(klass, sizeof(GVirInputStreamPrivate)); + + gobject_class->finalize = gvir_input_stream_finalize; + gobject_class->get_property = gvir_input_stream_get_property; + gobject_class->set_property = gvir_input_stream_set_property; + + ginputstream_class->read_fn = NULL; + ginputstream_class->read_async = gvir_input_stream_read_async; + ginputstream_class->read_finish = gvir_input_stream_read_finish; + + g_object_class_install_property(gobject_class, PROP_STREAM, + g_param_spec_object("stream", + "stream", + "GVirStream", + GVIR_TYPE_STREAM, G_PARAM_CONSTRUCT_ONLY | + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); +} + +static void gvir_input_stream_init(GVirInputStream *stream) +{ + stream->priv = G_TYPE_INSTANCE_GET_PRIVATE(stream, GVIR_TYPE_INPUT_STREAM, GVirInputStreamPrivate); +} + +GVirInputStream* _gvir_input_stream_new(GVirStream *stream) +{ + return GVIR_INPUT_STREAM(g_object_new(GVIR_TYPE_INPUT_STREAM, "stream", stream, NULL)); +} diff --git a/libvirt-gobject/libvirt-gobject-input-stream.h b/libvirt-gobject/libvirt-gobject-input-stream.h new file mode 100644 index 0000000..e8002b9 --- /dev/null +++ b/libvirt-gobject/libvirt-gobject-input-stream.h @@ -0,0 +1,68 @@ +/* + * libvirt-gobject-input-stream.h: libvirt gobject integration + * + * Copyright (C) 2011 Red Hat + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Authors: Daniel P. Berrange <berrange(a)redhat.com> + * Marc-André Lureau <marcandre.lureau(a)redhat.com> + */ + +#if !defined(__LIBVIRT_GOBJECT_H__) && !defined(LIBVIRT_GOBJECT_BUILD) +#error "Only <libvirt-gobject/libvirt-gobject.h> can be included directly." +#endif + +#ifndef __LIBVIRT_GOBJECT_INPUT_STREAM_H__ +#define __LIBVIRT_GOBJECT_INPUT_STREAM_H__ + +#include <gio/gio.h> +#include "libvirt-gobject-stream.h" + +G_BEGIN_DECLS + +#define GVIR_TYPE_INPUT_STREAM (_gvir_input_stream_get_type ()) +#define GVIR_INPUT_STREAM(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \ + GVIR_TYPE_INPUT_STREAM, GVirInputStream)) +#define GVIR_INPUT_STREAM_CLASS(class) (G_TYPE_CHECK_CLASS_CAST ((class), \ + GVIR_TYPE_INPUT_STREAM, GVirInputStreamClass)) +#define GVIR_IS_INPUT_STREAM(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \ + GVIR_TYPE_INPUT_STREAM)) +#define GVIR_IS_INPUT_STREAM_CLASS(class) (G_TYPE_CHECK_CLASS_TYPE ((class), \ + GVIR_TYPE_INPUT_STREAM)) +#define GVIR_INPUT_STREAM_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), \ + GVIR_TYPE_INPUT_STREAM, GVirInputStreamClass)) + +typedef struct _GVirInputStreamPrivate GVirInputStreamPrivate; +typedef struct _GVirInputStreamClass GVirInputStreamClass; +typedef struct _GVirInputStream GVirInputStream; + +struct _GVirInputStreamClass +{ + GInputStreamClass parent_class; +}; + +struct _GVirInputStream +{ + GInputStream parent_instance; + GVirInputStreamPrivate *priv; +}; + +GType _gvir_input_stream_get_type (void) G_GNUC_CONST; +GVirInputStream * _gvir_input_stream_new (GVirStream *stream); + +G_END_DECLS + +#endif /* __LIBVIRT_GOBJECT_INPUT_STREAM_H__ */ diff --git a/libvirt-gobject/libvirt-gobject-stream.c b/libvirt-gobject/libvirt-gobject-stream.c index 519d733..88e3a40 100644 --- a/libvirt-gobject/libvirt-gobject-stream.c +++ b/libvirt-gobject/libvirt-gobject-stream.c @@ -30,6 +30,8 @@ #include "libvirt-glib/libvirt-glib.h" #include "libvirt-gobject/libvirt-gobject.h" +#include "libvirt-gobject/libvirt-gobject-input-stream.h" + extern gboolean debugFlag; #define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) @@ -39,10 +41,12 @@ extern gboolean debugFlag; struct _GVirStreamPrivate { - virStreamPtr handle; + virStreamPtr handle; + GInputStream *input_stream; + gboolean in_dispose; }; -G_DEFINE_TYPE(GVirStream, gvir_stream, G_TYPE_OBJECT); +G_DEFINE_TYPE(GVirStream, gvir_stream, G_TYPE_IO_STREAM); enum { @@ -60,6 +64,71 @@ gvir_stream_error_quark(void) return g_quark_from_static_string("vir-g-stream"); } + +static GInputStream* gvir_stream_get_input_stream(GIOStream *io_stream) +{ + GVirStream *self = GVIR_STREAM(io_stream); + + if (self->priv->input_stream == NULL) + self->priv->input_stream = (GInputStream *)_gvir_input_stream_new(self); + + return self->priv->input_stream; +} + + +static gboolean gvir_stream_close(GIOStream *io_stream, + GCancellable *cancellable, G_GNUC_UNUSED GError **error) +{ + GVirStream *self = GVIR_STREAM(io_stream); + + if (self->priv->input_stream) + g_input_stream_close(self->priv->input_stream, cancellable, NULL); + + if (self->priv->in_dispose) + return TRUE; + + return TRUE; /* FIXME: really close the stream? */ +} + + +static void gvir_stream_close_async(GIOStream *stream, G_GNUC_UNUSED int io_priority, + GCancellable *cancellable, GAsyncReadyCallback callback, + gpointer user_data) +{ + GSimpleAsyncResult *res; + GIOStreamClass *class; + GError *error; + + class = G_IO_STREAM_GET_CLASS(stream); + + /* close is not blocked, just do it! */ + error = NULL; + if (class->close_fn && + !class->close_fn(stream, cancellable, &error)) { + g_simple_async_report_take_gerror_in_idle(G_OBJECT (stream), + callback, user_data, + error); + return; + } + + res = g_simple_async_result_new(G_OBJECT (stream), + callback, + user_data, + gvir_stream_close_async); + g_simple_async_result_complete_in_idle(res); + g_object_unref (res); +} + + +static gboolean +gvir_stream_close_finish(G_GNUC_UNUSED GIOStream *stream, + G_GNUC_UNUSED GAsyncResult *result, + G_GNUC_UNUSED GError **error) +{ + return TRUE; +} + + static void gvir_stream_get_property(GObject *object, guint prop_id, GValue *value, @@ -107,6 +176,9 @@ static void gvir_stream_finalize(GObject *object) DEBUG("Finalize GVirStream=%p", self); + if (self->priv->input_stream) + g_object_unref(self->priv->input_stream); + if (priv->handle) { if (virStreamFinish(priv->handle) < 0) g_critical("cannot finish stream"); @@ -120,12 +192,18 @@ static void gvir_stream_finalize(GObject *object) static void gvir_stream_class_init(GVirStreamClass *klass) { - GObjectClass *object_class = G_OBJECT_CLASS (klass); + GObjectClass *object_class = G_OBJECT_CLASS(klass); + GIOStreamClass *stream_class = G_IO_STREAM_CLASS(klass); object_class->finalize = gvir_stream_finalize; object_class->get_property = gvir_stream_get_property; object_class->set_property = gvir_stream_set_property; + stream_class->get_input_stream = gvir_stream_get_input_stream; + stream_class->close_fn = gvir_stream_close; + stream_class->close_async = gvir_stream_close_async; + stream_class->close_finish = gvir_stream_close_finish; + g_object_class_install_property(object_class, PROP_HANDLE, g_param_spec_boxed("handle", @@ -170,6 +248,50 @@ GType gvir_stream_handle_get_type(void) return handle_type; } +/** + * gvir_stream_receive: + * @stream: the stream + * @buffer: a buffer to read data into (which should be at least @size + * bytes long). + * @size: the number of bytes you want to read from the stream + * @cancellable: (allow-none): a %GCancellable or %NULL + * @error: #GError for error reporting, or %NULL to ignore. + * + * Receive data (up to @size bytes) from a stream. + * On error -1 is returned and @error is set accordingly. + * + * gvir_stream_receive() can return any number of bytes, up to + * @size. If more than @size bytes have been received, the additional + * data will be returned in future calls to gvir_stream_receive(). + * + * If there is no data available, a %G_IO_ERROR_WOULD_BLOCK error will be + * returned. + * + * Returns: Number of bytes read, or 0 if the end of stream reached, + * or -1 on error. + */ +gssize gvir_stream_receive(GVirStream *self, gchar *buffer, gsize size, + GCancellable *cancellable, GError **error) +{ + int got; + + g_return_val_if_fail(GVIR_IS_STREAM(self), -1); + g_return_val_if_fail(buffer != NULL, -1); + + if (g_cancellable_set_error_if_cancelled (cancellable, error)) + return -1; + + got = virStreamRecv(self->priv->handle, buffer, size); + + if (got == -2) { /* blocking */ + g_set_error(error, G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK, NULL); + } else if (got < 0) { + g_set_error(error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT, + "Got virStreamRecv error in %s", G_STRFUNC); + } + + return got; +} struct stream_sink_helper { GVirStream *self; @@ -197,7 +319,7 @@ stream_sink(virStreamPtr st G_GNUC_UNUSED, * requested data sink. This is simply a convenient alternative * to virStreamRecv, for apps that do blocking-I/o. */ -gint +gssize gvir_stream_receive_all(GVirStream *self, GVirStreamSinkFunc func, gpointer user_data, GError **err) { struct stream_sink_helper helper = { diff --git a/libvirt-gobject/libvirt-gobject-stream.h b/libvirt-gobject/libvirt-gobject-stream.h index 5181e24..35526db 100644 --- a/libvirt-gobject/libvirt-gobject-stream.h +++ b/libvirt-gobject/libvirt-gobject-stream.h @@ -28,6 +28,9 @@ #ifndef __LIBVIRT_GOBJECT_STREAM_H__ #define __LIBVIRT_GOBJECT_STREAM_H__ +#include <glib-object.h> +#include <gio/gio.h> + G_BEGIN_DECLS #define GVIR_TYPE_STREAM (gvir_stream_get_type ()) @@ -45,7 +48,7 @@ typedef struct _GVirStreamClass GVirStreamClass; struct _GVirStream { - GObject parent; + GIOStream parent_instance; GVirStreamPrivate *priv; @@ -54,7 +57,7 @@ struct _GVirStream struct _GVirStreamClass { - GObjectClass parent_class; + GIOStreamClass parent_class; gpointer padding[20]; }; @@ -76,7 +79,8 @@ typedef gint (* GVirStreamSinkFunc) (GVirStream *stream, GType gvir_stream_get_type(void); GType gvir_stream_handle_get_type(void); -gint gvir_stream_receive_all(GVirStream *stream, GVirStreamSinkFunc func, gpointer user_data, GError **err); +gssize gvir_stream_receive_all(GVirStream *stream, GVirStreamSinkFunc func, gpointer user_data, GError **err); +gssize gvir_stream_receive(GVirStream *stream, gchar *buffer, gsize size, GCancellable *cancellable, GError **error); G_END_DECLS -- 1.7.6.2

3 3

[libvirt] [libvirt-glib] Remove vir- prefix from signals
by Christophe Fergeau 17 Oct '11

17 Oct '11

gobject signals are generally not namespaced this way, removing this prefix makes things look a bit nicer. --- libvirt-gobject/libvirt-gobject-connection.c | 50 +++++++++++++------------- libvirt-gobject/libvirt-gobject-domain.c | 10 +++--- libvirt-gobject/libvirt-gobject-manager.c | 8 ++-- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index 4832908..8813e96 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -170,7 +170,7 @@ static void gvir_connection_class_init(GVirConnectionClass *klass) G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)); - signals[VIR_CONNECTION_OPENED] = g_signal_new("vir-connection-opened", + signals[VIR_CONNECTION_OPENED] = g_signal_new("connection-opened", G_OBJECT_CLASS_TYPE(object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET(GVirConnectionClass, vir_connection_opened), @@ -179,7 +179,7 @@ static void gvir_connection_class_init(GVirConnectionClass *klass) G_TYPE_NONE, 0); - signals[VIR_CONNECTION_CLOSED] = g_signal_new("vir-connection-closed", + signals[VIR_CONNECTION_CLOSED] = g_signal_new("connection-closed", G_OBJECT_CLASS_TYPE(object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET(GVirConnectionClass, vir_connection_closed), @@ -188,7 +188,7 @@ static void gvir_connection_class_init(GVirConnectionClass *klass) G_TYPE_NONE, 0); - signals[VIR_DOMAIN_ADDED] = g_signal_new("vir-domain-added", + signals[VIR_DOMAIN_ADDED] = g_signal_new("domain-added", G_OBJECT_CLASS_TYPE(object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET(GVirConnectionClass, vir_domain_added), @@ -198,7 +198,7 @@ static void gvir_connection_class_init(GVirConnectionClass *klass) 1, G_TYPE_OBJECT); - signals[VIR_DOMAIN_REMOVED] = g_signal_new("vir-domain-removed", + signals[VIR_DOMAIN_REMOVED] = g_signal_new("domain-removed", G_OBJECT_CLASS_TYPE(object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET(GVirConnectionClass, vir_domain_removed), @@ -282,7 +282,7 @@ static int domain_event_cb(virConnectPtr conn G_GNUC_UNUSED, if (detail == VIR_DOMAIN_EVENT_DEFINED_ADDED) g_signal_emit(gconn, signals[VIR_DOMAIN_ADDED], 0, gdom); else if (detail == VIR_DOMAIN_EVENT_DEFINED_UPDATED) - g_signal_emit_by_name(gdom, "vir-updated"); + g_signal_emit_by_name(gdom, "updated"); else g_warn_if_reached(); break; @@ -301,60 +301,60 @@ static int domain_event_cb(virConnectPtr conn G_GNUC_UNUSED, case VIR_DOMAIN_EVENT_STARTED: if (detail == VIR_DOMAIN_EVENT_STARTED_BOOTED) - g_signal_emit_by_name(gdom, "vir-started::booted"); + g_signal_emit_by_name(gdom, "started::booted"); else if (detail == VIR_DOMAIN_EVENT_STARTED_MIGRATED) - g_signal_emit_by_name(gdom, "vir-started::migrated"); + g_signal_emit_by_name(gdom, "started::migrated"); else if (detail == VIR_DOMAIN_EVENT_STARTED_RESTORED) - g_signal_emit_by_name(gdom, "vir-started::restored"); + g_signal_emit_by_name(gdom, "started::restored"); else if (detail == VIR_DOMAIN_EVENT_STARTED_FROM_SNAPSHOT) - g_signal_emit_by_name(gdom, "vir-started::from-snapshot"); + g_signal_emit_by_name(gdom, "started::from-snapshot"); else g_warn_if_reached(); break; case VIR_DOMAIN_EVENT_SUSPENDED: if (detail == VIR_DOMAIN_EVENT_SUSPENDED_PAUSED) - g_signal_emit_by_name(gdom, "vir-suspended::paused"); + g_signal_emit_by_name(gdom, "suspended::paused"); else if (detail == VIR_DOMAIN_EVENT_SUSPENDED_MIGRATED) - g_signal_emit_by_name(gdom, "vir-suspended::migrated"); + g_signal_emit_by_name(gdom, "suspended::migrated"); else if (detail == VIR_DOMAIN_EVENT_SUSPENDED_IOERROR) - g_signal_emit_by_name(gdom, "vir-suspended::ioerror"); + g_signal_emit_by_name(gdom, "suspended::ioerror"); else if (detail == VIR_DOMAIN_EVENT_SUSPENDED_WATCHDOG) - g_signal_emit_by_name(gdom, "vir-suspended::watchdog"); + g_signal_emit_by_name(gdom, "suspended::watchdog"); else if (detail == VIR_DOMAIN_EVENT_SUSPENDED_RESTORED) - g_signal_emit_by_name(gdom, "vir-suspended::restored"); + g_signal_emit_by_name(gdom, "suspended::restored"); else if (detail == VIR_DOMAIN_EVENT_SUSPENDED_FROM_SNAPSHOT) - g_signal_emit_by_name(gdom, "vir-suspended::from-snapshot"); + g_signal_emit_by_name(gdom, "suspended::from-snapshot"); else g_warn_if_reached(); break; case VIR_DOMAIN_EVENT_RESUMED: if (detail == VIR_DOMAIN_EVENT_RESUMED_UNPAUSED) - g_signal_emit_by_name(gdom, "vir-resumed::unpaused"); + g_signal_emit_by_name(gdom, "resumed::unpaused"); else if (detail == VIR_DOMAIN_EVENT_RESUMED_MIGRATED) - g_signal_emit_by_name(gdom, "vir-resumed::migrated"); + g_signal_emit_by_name(gdom, "resumed::migrated"); else if (detail == VIR_DOMAIN_EVENT_RESUMED_FROM_SNAPSHOT) - g_signal_emit_by_name(gdom, "vir-resumed::from-snapshot"); + g_signal_emit_by_name(gdom, "resumed::from-snapshot"); else g_warn_if_reached(); break; case VIR_DOMAIN_EVENT_STOPPED: if (detail == VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN) - g_signal_emit_by_name(gdom, "vir-stopped::shutdown"); + g_signal_emit_by_name(gdom, "stopped::shutdown"); else if (detail == VIR_DOMAIN_EVENT_STOPPED_DESTROYED) - g_signal_emit_by_name(gdom, "vir-stopped::destroyed"); + g_signal_emit_by_name(gdom, "stopped::destroyed"); else if (detail == VIR_DOMAIN_EVENT_STOPPED_CRASHED) - g_signal_emit_by_name(gdom, "vir-stopped::crashed"); + g_signal_emit_by_name(gdom, "stopped::crashed"); else if (detail == VIR_DOMAIN_EVENT_STOPPED_MIGRATED) - g_signal_emit_by_name(gdom, "vir-stopped::migrated"); + g_signal_emit_by_name(gdom, "stopped::migrated"); else if (detail == VIR_DOMAIN_EVENT_STOPPED_SAVED) - g_signal_emit_by_name(gdom, "vir-stopped::saved"); + g_signal_emit_by_name(gdom, "stopped::saved"); else if (detail == VIR_DOMAIN_EVENT_STOPPED_FAILED) - g_signal_emit_by_name(gdom, "vir-stopped::failed"); + g_signal_emit_by_name(gdom, "stopped::failed"); else if (detail == VIR_DOMAIN_EVENT_STOPPED_FROM_SNAPSHOT) - g_signal_emit_by_name(gdom, "vir-stopped::from-snapshot"); + g_signal_emit_by_name(gdom, "stopped::from-snapshot"); else g_warn_if_reached(); break; diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index 2a5c9fd..70d8d6d 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -159,7 +159,7 @@ static void gvir_domain_class_init(GVirDomainClass *klass) G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)); - signals[VIR_STARTED] = g_signal_new("vir-started", + signals[VIR_STARTED] = g_signal_new("started", G_OBJECT_CLASS_TYPE(object_class), G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE | G_SIGNAL_NO_HOOKS | G_SIGNAL_DETAILED, @@ -169,7 +169,7 @@ static void gvir_domain_class_init(GVirDomainClass *klass) G_TYPE_NONE, 1, G_TYPE_STRING | G_SIGNAL_TYPE_STATIC_SCOPE); - signals[VIR_SUSPENDED] = g_signal_new("vir-suspended", + signals[VIR_SUSPENDED] = g_signal_new("suspended", G_OBJECT_CLASS_TYPE(object_class), G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE | G_SIGNAL_NO_HOOKS | G_SIGNAL_DETAILED, @@ -179,7 +179,7 @@ static void gvir_domain_class_init(GVirDomainClass *klass) G_TYPE_NONE, 1, G_TYPE_STRING | G_SIGNAL_TYPE_STATIC_SCOPE); - signals[VIR_RESUMED] = g_signal_new("vir-resumed", + signals[VIR_RESUMED] = g_signal_new("resumed", G_OBJECT_CLASS_TYPE(object_class), G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE | G_SIGNAL_NO_HOOKS | G_SIGNAL_DETAILED, @@ -189,7 +189,7 @@ static void gvir_domain_class_init(GVirDomainClass *klass) G_TYPE_NONE, 1, G_TYPE_STRING | G_SIGNAL_TYPE_STATIC_SCOPE); - signals[VIR_STOPPED] = g_signal_new("vir-stopped", + signals[VIR_STOPPED] = g_signal_new("stopped", G_OBJECT_CLASS_TYPE(object_class), G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE | G_SIGNAL_NO_HOOKS | G_SIGNAL_DETAILED, @@ -199,7 +199,7 @@ static void gvir_domain_class_init(GVirDomainClass *klass) G_TYPE_NONE, 1, G_TYPE_STRING | G_SIGNAL_TYPE_STATIC_SCOPE); - signals[VIR_UPDATED] = g_signal_new("vir-updated", + signals[VIR_UPDATED] = g_signal_new("updated", G_OBJECT_CLASS_TYPE(object_class), G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE | G_SIGNAL_NO_HOOKS, G_STRUCT_OFFSET(GVirDomainClass, vir_domain_updated), diff --git a/libvirt-gobject/libvirt-gobject-manager.c b/libvirt-gobject/libvirt-gobject-manager.c index 36167be..ae3e4a1 100644 --- a/libvirt-gobject/libvirt-gobject-manager.c +++ b/libvirt-gobject/libvirt-gobject-manager.c @@ -88,7 +88,7 @@ static void gvir_manager_class_init(GVirManagerClass *klass) object_class->finalize = gvir_manager_finalize; - g_signal_new("vir-connection-added", + g_signal_new("connection-added", G_OBJECT_CLASS_TYPE(object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET(GVirManagerClass, vir_connection_added), @@ -97,7 +97,7 @@ static void gvir_manager_class_init(GVirManagerClass *klass) G_TYPE_NONE, 1, GVIR_TYPE_CONNECTION); - g_signal_new("vir-connection-removed", + g_signal_new("connection-removed", G_OBJECT_CLASS_TYPE(object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET(GVirManagerClass, vir_connection_removed), @@ -145,7 +145,7 @@ void gvir_manager_add_connection(GVirManager *man, /* Hold extra reference while emitting signal */ g_object_ref(conn); g_mutex_unlock(priv->lock); - g_signal_emit_by_name(man, "vir-connection-added", conn); + g_signal_emit_by_name(man, "connection-added", conn); g_object_unref(conn); } @@ -158,7 +158,7 @@ void gvir_manager_remove_connection(GVirManager *man, priv->connections = g_list_remove(priv->connections, conn); g_mutex_unlock(priv->lock); - g_signal_emit_by_name(man, "vir-connection-removed", conn); + g_signal_emit_by_name(man, "connection-removed", conn); g_object_unref(conn); } -- 1.7.6.4

2 1

[libvirt] [PATCH] build: fix 'make dist' error
by Wen Congyang 15 Oct '11

15 Oct '11

When I run 'make dist', I receive the following error messages: make[1]: Entering directory `/home/wency/source/libvirt/src' GEN remote/remote_protocol.h GEN remote/remote_protocol.c GEN remote/qemu_protocol.h GEN remote/qemu_protocol.c GEN remote/qemu_client_bodies.h CC libvirt_driver_remote_la-remote_protocol.lo In file included from ./remote/remote_protocol.h:16, from ./remote/remote_protocol.c:7: ./internal.h:249:23: error: probes.h: No such file or directory make[1]: *** [libvirt_driver_remote_la-remote_protocol.lo] Error 1 make[1]: Leaving directory `/home/wency/source/libvirt/src' make: *** [distdir] Error 1 The reason is that we use probes.h before generating it. --- src/Makefile.am | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 302d395..510e5ef 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -189,6 +189,11 @@ REMOTE_DRIVER_GENERATED = \ $(srcdir)/remote/qemu_protocol.h \ $(srcdir)/remote/qemu_client_bodies.h +# The remote RPC driver needs probes.h +if WITH_DTRACE +REMOTE_DRIVER_GENERATED += $(srcdir)/probes.h +endif + REMOTE_PROTOCOL = $(srcdir)/remote/remote_protocol.x QEMU_PROTOCOL = $(srcdir)/remote/qemu_protocol.x REMOTE_DRIVER_PROTOCOL = $(REMOTE_PROTOCOL) $(QEMU_PROTOCOL) -- 1.7.1

3 2

[libvirt] [PATCH] qemu: Get the dev from activePciHostdevs list before reattachment
by Osier Yang 15 Oct '11

15 Oct '11

BZ# https://bugzilla.redhat.com/show_bug.cgi?id=736214 The problem is caused by the original info of domain's PCI dev is maintained by qemu_driver->activePciHostdevs list, (E.g. dev->reprobe, which stands for whether need to reprobe driver for the dev when do reattachment). The fields (dev->reprobe, dev->unbind_from_stub, and dev->remove_slot) are initialized properly when preparing the PCI device for managed attachment. However, when do reattachment, it construct a complete new "pciDevice" without honoring the original dev info, and thus the dev won't get the original driver or can get other problem. This patch is to fix the problem by get the dev from list driver->activePciHostdevs if it's in the list, though it's unlikely the dev to be reattached is not in the list, as any PCI dev is added to the list when do preparation (qemuPrepareHostdevPCIDevices), the patch doesn't completely desert the old design so the device can be reattached even if it's not in list driver->activePciHostdevs. -- v1 patch to fix this problem is: http://www.redhat.com/archives/libvir-list/2011-September/msg01101.html But the patch title is complete different, so I don't send this and a v2. --- src/qemu/qemu_hostdev.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c index 6f77717..73cadc5 100644 --- a/src/qemu/qemu_hostdev.c +++ b/src/qemu/qemu_hostdev.c @@ -262,6 +262,7 @@ void qemuDomainReAttachHostdevDevices(struct qemud_driver *driver, int nhostdevs) { pciDeviceList *pcidevs; + pciDeviceList *pci_list = NULL; int i; if (!(pcidevs = qemuGetPciHostDeviceList(hostdevs, nhostdevs))) { @@ -272,12 +273,23 @@ void qemuDomainReAttachHostdevDevices(struct qemud_driver *driver, return; } + if (!(pci_list = pciDeviceListNew())) + return; + /* Again 3 loops; mark all devices as inactive before reset * them and reset all the devices before re-attach */ - for (i = 0; i < pciDeviceListCount(pcidevs); i++) { pciDevice *dev = pciDeviceListGet(pcidevs, i); - pciDeviceListDel(driver->activePciHostdevs, dev); + pciDevice *pci = NULL; + pci = pciDeviceListSteal(driver->activePciHostdevs, dev); + + if (pci) { + pciDeviceListDel(pcidevs, dev); + if (pciDeviceListAdd(pci_list, pci) < 0) { + pciFreeDevice(pci); + goto cleanup; + } + } } for (i = 0; i < pciDeviceListCount(pcidevs); i++) { @@ -290,11 +302,18 @@ void qemuDomainReAttachHostdevDevices(struct qemud_driver *driver, } } + for (i = 0; i < pciDeviceListCount(pci_list); i++) { + pciDevice *dev = pciDeviceListGet(pci_list, i); + qemuReattachPciDevice(dev, driver); + } + for (i = 0; i < pciDeviceListCount(pcidevs); i++) { pciDevice *dev = pciDeviceListGet(pcidevs, i); qemuReattachPciDevice(dev, driver); } +cleanup: + pciDeviceListFree(pci_list); pciDeviceListFree(pcidevs); } -- 1.7.6

2 8

[libvirt] [PATCH] Add missing strdup return value check
by Roopa Prabhu 15 Oct '11

15 Oct '11

From: Roopa Prabhu <roprabhu(a)cisco.com> Check strdup return value and fail if error Signed-off-by: Roopa Prabhu <roprabhu(a)cisco.com> --- src/util/pci.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/src/util/pci.c b/src/util/pci.c index 2bbb90c..df4e6c8 100644 --- a/src/util/pci.c +++ b/src/util/pci.c @@ -2018,7 +2018,13 @@ pciDeviceNetName(char *device_link_sysfs_path, char **netname) /* Assume a single directory entry */ *netname = strdup(entry->d_name); - ret = 0; + if (!*netname) { + virReportOOMError(); + ret = -1; + } + else { + ret = 0; + } break; }

2 2