- Devel - libvirt List Archives

[libvirt] [PATCH] Prevent overfilling of self-pipe in python event loop
by Daniel P. Berrange 27 Jan '11

27 Jan '11

If the event loop takes a very long time todo something, it is possible for the 'self pipe' buffer to become full at which point the entire event loop + remote driver deadlock. Use a boolean flag to ensure we have strict one-in, one-out behaviour on writes/reads of the 'self pipe' --- examples/domain-events/events-python/event-test.py | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/examples/domain-events/events-python/event-test.py b/examples/domain-events/events-python/event-test.py index 903f934..c149ed9 100644 --- a/examples/domain-events/events-python/event-test.py +++ b/examples/domain-events/events-python/event-test.py @@ -92,6 +92,8 @@ class virEventLoopPure: def __init__(self): self.poll = select.poll() self.pipetrick = os.pipe() + self.pendingWakeup = False + self.runningPoll = False self.nextHandleID = 1 self.nextTimerID = 1 self.handles = [] @@ -166,6 +168,7 @@ class virEventLoopPure: # these pointless repeated tiny sleeps. def run_once(self): sleep = -1 + self.runningPoll = True next = self.next_timeout() debug("Next timeout due at %d" % next) if next > 0: @@ -184,6 +187,7 @@ class virEventLoopPure: # telling us to wakup. if so, then discard # the data just continue if fd == self.pipetrick[0]: + self.pendingWakeup = False data = os.read(fd, 1) continue @@ -206,6 +210,8 @@ class virEventLoopPure: t.set_last_fired(now) t.dispatch() + self.runningPoll = False + # Actually the event loop forever def run_loop(self): @@ -214,7 +220,9 @@ class virEventLoopPure: self.run_once() def interrupt(self): - os.write(self.pipetrick[1], 'c') + if self.runningPoll and not self.pendingWakeup: + self.pendingWakeup = True + os.write(self.pipetrick[1], 'c') # Registers a new file handle 'fd', monitoring for 'events' (libvirt -- 1.7.3.4

2 1

[libvirt] [PATCH] docs: fix incorrect XML element mentioned by setmem text
by Justin Clift 27 Jan '11

27 Jan '11

--- Pushed this under the trivial rule, as it's definitely wrong. The setmaxmem text can follow when ready. tools/virsh.pod | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 1f15fef..4e8b295 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -580,7 +580,7 @@ paravirtualized or running the PV balloon driver. Note, this command only works on active guest domains. To change the memory allocation for an inactive guest domain, use the virsh B<edit> command to -update the XML <memory> element. +update the XML <currentMemory> element. =item B<setmaxmem> I<domain-id> B<kilobytes> -- 1.7.3.5

1 0

[libvirt] Planning for next release and discussions on project process
by Daniel Veillard 27 Jan '11

27 Jan '11

So we are around the end of the month, i.e. the time where I usually come out and suggest to enter a freeze within a few days for the next release. However, looking at the git history I note that we have only around 125 patches commited since 0.8.7 was released and while I'm fairly convinced that time based releases are a really good thing (allowing people to see their patches out within a predictable delay, and allowing the whole ecosystem of distros/users to plan accordingly), it's also time I think to open up the process to the growing (or at least changing) set of people involved in building libvirt. I usually ask if everybody agrees on the next freeze but I have to make the initial selection based on the calendar and my own agenda (or Red Hat one). Other projects I know use things like weekly teleconferences to discuss ther development plans, or IRC meetings. My opinion is that phone is not alway convenient/eficient, IRC has the advantage of being more open (no spoken english barrier), less intrusive, and it's nearly trivial to extract and publish some kind of minutes. But both suffer from the timezone problem, basically if there is meeting time it's gonna be during insane hours for someone somewhere (we have a large set of developpers in the US, Matthias and Dan are in Europe, Justin is in Australia, I'm in China now and I think the Fujitsu developpers too) One possibility could be to use a mix of IRC channel gathering and an Etherpad file (very convenient tool try it), I just created one at http://ietherpad.com/oETnXKdcFf to try this out and put my own sugegstions, then others can come and put their own feedback even if they happen to not be online at the time of the meeting. To come back to the release, maybe we can do 2 release for Jan-Mar since we didn't released early in Jan and Feb is short, so I would suggest to plan a release before Feb 15, entering a freeze around the 7th Feb. This should allow to put in some of the code already reviewed but not yet commited that I spotted: + migration enhancements from Hu Tao and Wen Congyang + integration of locking in the QEmu driver from Dan + cgroup blkio support (lxc and qemu) from Gui Jianfeng + smartcard support from Eric but there is certainly things I forgot, and well people may have specific things they want in ASAP, so let's use IRC (irc.oftc.net #virt) and http://ietherpad.com/oETnXKdcFf and share opinions about next release and features to come, well unless people have a better idea on how to organize ourselves, Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 2

[libvirt] [v2] remote: Add extra parameter pkipath for URI
by Osier Yang 27 Jan '11

27 Jan '11

This new parameter allows user specifies where the client cerficate, client key, CA certificate of x509 is, instead of hardcoding it. If 'pkipath' is not specified, and the user is not root, try to find files in $HOME/.pki, as long as one of client cerficate, client key, CA certificate can not be found, use default global location (LIBVIRT_CACERT, LIBVIRT_CLIENTCERT, LIBVIRT_CLIENTKEY, see src/remote/remote_driver.h) e.g. [root@Osier client]# virsh -c qemu+tls://10.66.93.111/system?pkipath=/tmp/pki/client error: Cannot access CA certificate '/tmp/pki/client/cacert.pem': No such file or directory error: failed to connect to the hypervisor [root@Osier client]# ls -l total 24 -rwxrwxr-x. 1 root root 6424 Jan 24 21:35 a.out -rw-r--r--. 1 root root 1245 Jan 23 19:04 clientcert.pem -rw-r--r--. 1 root root 132 Jan 23 19:04 client.info -rw-r--r--. 1 root root 1679 Jan 23 19:04 clientkey.pem [root@Osier client]# cp /tmp/cacert.pem . [root@Osier client]# virsh -c qemu+tls://10.66.93.111/system?pkipath=/tmp/pki/client Welcome to virsh, the virtualization interactive terminal. Type: 'help' for help with commands 'quit' to quit virsh # * src/remote/remote_driver.c --- src/remote/remote_driver.c | 130 ++++++++++++++++++++++++++++++++++++++------ 1 files changed, 112 insertions(+), 18 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index ea119c6..01f1995 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -268,7 +268,7 @@ void remoteDomainEventQueueFlush(int timer, void *opaque); static char *get_transport_from_scheme (char *scheme); /* GnuTLS functions used by remoteOpen. */ -static int initialize_gnutls(void); +static int initialize_gnutls(char *pkipath, int flags); static gnutls_session_t negotiate_gnutls_on_connection (virConnectPtr conn, struct private_data *priv, int no_verify); #ifdef WITH_LIBVIRTD @@ -430,6 +430,7 @@ doRemoteOpen (virConnectPtr conn, char *port = NULL, *authtype = NULL, *username = NULL; int no_verify = 0, no_tty = 0; char **cmd_argv = NULL; + char *pkipath = NULL; /* Return code from this function, and the private data. */ int retcode = VIR_DRV_OPEN_ERROR; @@ -509,9 +510,14 @@ doRemoteOpen (virConnectPtr conn, priv->debugLog = stdout; else priv->debugLog = stderr; - } else + } else if (STRCASEEQ(var->name, "pkipath")) { + pkipath = strdup(var->value); + if (!pkipath) goto out_of_memory; + var->ignore = 1; + } else { DEBUG("passing through variable '%s' ('%s') to remote end", var->name, var->value); + } } /* Construct the original name. */ @@ -577,7 +583,7 @@ doRemoteOpen (virConnectPtr conn, /* Connect to the remote service. */ switch (transport) { case trans_tls: - if (initialize_gnutls() == -1) goto failed; + if (initialize_gnutls(pkipath, flags) == -1) goto failed; priv->uses_tls = 1; priv->is_secure = 1; @@ -947,6 +953,7 @@ doRemoteOpen (virConnectPtr conn, } VIR_FREE(cmd_argv); } + VIR_FREE(pkipath); return retcode; @@ -1139,11 +1146,17 @@ static void remote_debug_gnutls_log(int level, const char* str) { } static int -initialize_gnutls(void) +initialize_gnutls(char *pkipath, int flags) { static int initialized = 0; int err; char *gnutlsdebug; + char *libvirt_cacert = NULL; + char *libvirt_clientkey = NULL; + char *libvirt_clientcert = NULL; + int ret = -1; + char *userdir = NULL; + char *user_pki_path = NULL; if (initialized) return 0; @@ -1166,43 +1179,124 @@ initialize_gnutls(void) return -1; } + if (pkipath) { + if ((virAsprintf(&libvirt_cacert, "%s/%s", pkipath, + "cacert.pem")) < 0) + goto out_of_memory; - if (check_cert_file("CA certificate", LIBVIRT_CACERT) < 0) - return -1; - if (check_cert_file("client key", LIBVIRT_CLIENTKEY) < 0) - return -1; - if (check_cert_file("client certificate", LIBVIRT_CLIENTCERT) < 0) - return -1; + if ((virAsprintf(&libvirt_clientkey, "%s/%s", pkipath, + "clientkey.pem")) < 0) + goto out_of_memory; + + if ((virAsprintf(&libvirt_clientcert, "%s/%s", pkipath, + "clientcert.pem")) < 0) + goto out_of_memory; + } else if (flags & VIR_DRV_OPEN_REMOTE_USER) { + userdir = virGetUserDirectory(getuid()); + + if (!userdir) + goto out_of_memory; + + if (virAsprintf(&user_pki_path, "%s/.pki", userdir) < 0) + goto out_of_memory; + + if ((virAsprintf(&libvirt_cacert, "%s/%s", user_pki_path, + "cacert.pem")) < 0) + goto out_of_memory; + + if ((virAsprintf(&libvirt_clientkey, "%s/%s", user_pki_path, + "clientkey.pem")) < 0) + goto out_of_memory; + + if ((virAsprintf(&libvirt_clientcert, "%s/%s", user_pki_path, + "clientcert.pem")) < 0) + goto out_of_memory; + + /* Use default locations as long as one of CA certificate, + * client key, and client certificate can not be found in + * $HOME/.pki, we don't want to make user confused with one + * file is here, and the other is there. + */ + if (!virFileExists(libvirt_cacert) || + !virFileExists(libvirt_clientkey) || + !virFileExists(libvirt_clientcert)) { + VIR_FREE(libvirt_cacert); + VIR_FREE(libvirt_clientkey); + VIR_FREE(libvirt_clientcert); + + libvirt_cacert = strdup(LIBVIRT_CACERT); + if (!libvirt_cacert) goto out_of_memory; + + libvirt_clientkey = strdup(LIBVIRT_CLIENTKEY); + if (!libvirt_clientkey) goto out_of_memory; + + libvirt_clientcert = strdup(LIBVIRT_CLIENTCERT); + if (!libvirt_clientcert) goto out_of_memory; + } + } else { + libvirt_cacert = strdup(LIBVIRT_CACERT); + if (!libvirt_cacert) goto out_of_memory; + + libvirt_clientkey = strdup(LIBVIRT_CLIENTKEY); + if (!libvirt_clientkey) goto out_of_memory; + + libvirt_clientcert = strdup(LIBVIRT_CLIENTCERT); + if (!libvirt_clientcert) goto out_of_memory; + } + + if (check_cert_file("CA certificate", libvirt_cacert) < 0) + goto error; + if (check_cert_file("client key", libvirt_clientkey) < 0) + goto error; + if (check_cert_file("client certificate", libvirt_clientcert) < 0) + goto error; /* Set the trusted CA cert. */ - DEBUG("loading CA file %s", LIBVIRT_CACERT); + DEBUG("loading CA file %s", libvirt_cacert); err = - gnutls_certificate_set_x509_trust_file (x509_cred, LIBVIRT_CACERT, + gnutls_certificate_set_x509_trust_file (x509_cred, libvirt_cacert, GNUTLS_X509_FMT_PEM); if (err < 0) { remoteError(VIR_ERR_GNUTLS_ERROR, _("unable to load CA certificate: %s"), gnutls_strerror (err)); - return -1; + goto error; } /* Set the client certificate and private key. */ DEBUG("loading client cert and key from files %s and %s", - LIBVIRT_CLIENTCERT, LIBVIRT_CLIENTKEY); + libvirt_clientcert, libvirt_clientkey); err = gnutls_certificate_set_x509_key_file (x509_cred, - LIBVIRT_CLIENTCERT, - LIBVIRT_CLIENTKEY, + libvirt_clientcert, + libvirt_clientkey, GNUTLS_X509_FMT_PEM); if (err < 0) { remoteError(VIR_ERR_GNUTLS_ERROR, _("unable to load private key/certificate: %s"), gnutls_strerror (err)); - return -1; + goto error; } initialized = 1; - return 0; + ret = 0; + +cleanup: + VIR_FREE(libvirt_cacert); + VIR_FREE(libvirt_clientkey); + VIR_FREE(libvirt_clientcert); + VIR_FREE(userdir); + VIR_FREE(user_pki_path); + return ret; + +error: + ret = -1; + goto cleanup; + +out_of_memory: + ret = -1; + virReportOOMError(); + goto cleanup; } static int verify_certificate (virConnectPtr conn, struct private_data *priv, gnutls_session_t session); -- 1.7.3.2

4 6

[libvirt] [PATCH] [v2] storage: Round up capacity for LVM volume creation
by Osier Yang 27 Jan '11

27 Jan '11

If vol->capacity is odd, the capacity will be rounded down by devision, this patch is to round it up instead of rounding down, to be safer in case of one writes to the volume with the size he used to create. * src/storage/storage_backend_logical.c --- src/storage/storage_backend_logical.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index 203fe5d..2057692 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -604,7 +604,10 @@ virStorageBackendLogicalCreateVol(virConnectPtr conn, cmdargv = cmdargvsnap; } - snprintf(size, sizeof(size)-1, "%lluK", vol->capacity/1024); + unsigned long long int capacity; + capacity = (vol->capacity + 1023) /1024; + + snprintf(size, sizeof(size)-1, "%lluK", capacity); size[sizeof(size)-1] = '\0'; vol->type = VIR_STORAGE_VOL_BLOCK; -- 1.7.3.2

2 1

[libvirt] [PATCH 1/4] cgroup: Enable cgroup hierarchy for blkio cgroup
by Gui Jianfeng 27 Jan '11

27 Jan '11

Enable cgroup hierarchy for blkio cgroup. Signed-off-by: Gui Jianfeng <guijianfeng(a)cn.fujitsu.com> --- src/util/cgroup.c | 2 +- src/util/cgroup.h | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/util/cgroup.c b/src/util/cgroup.c index cd9caba..309f4e9 100644 --- a/src/util/cgroup.c +++ b/src/util/cgroup.c @@ -37,7 +37,7 @@ VIR_ENUM_IMPL(virCgroupController, VIR_CGROUP_CONTROLLER_LAST, "cpu", "cpuacct", "cpuset", "memory", "devices", - "freezer"); + "freezer", "blkio"); struct virCgroupController { int type; diff --git a/src/util/cgroup.h b/src/util/cgroup.h index 964da7a..67b1299 100644 --- a/src/util/cgroup.h +++ b/src/util/cgroup.h @@ -22,6 +22,7 @@ enum { VIR_CGROUP_CONTROLLER_MEMORY, VIR_CGROUP_CONTROLLER_DEVICES, VIR_CGROUP_CONTROLLER_FREEZER, + VIR_CGROUP_CONTROLLER_BLKIO, VIR_CGROUP_CONTROLLER_LAST }; -- 1.7.1

1 0

[libvirt] [PATCH 3/3] qemu: Implement blkio tunable XML configuration and parsing.
by Gui Jianfeng 27 Jan '11

27 Jan '11

Implement blkio tunable XML configuration and parsing. Signed-off-by: Gui Jianfeng <guijianfeng(a)cn.fujitsu.com> --- src/conf/domain_conf.c | 17 ++++++++++++++++- src/conf/domain_conf.h | 4 ++++ src/qemu/qemu_cgroup.c | 16 +++++++++++++++- src/qemu/qemu_conf.c | 3 ++- 4 files changed, 37 insertions(+), 3 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 645767e..a05ada5 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4810,7 +4810,7 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, { xmlNodePtr *nodes = NULL, node = NULL; char *tmp = NULL; - int i, n; + int i, n, w; long id = -1; virDomainDefPtr def; unsigned long count; @@ -4887,6 +4887,13 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, if (node) def->mem.hugepage_backed = 1; + /* Extract blkio cgroup tunables */ + w = virXPathULong("string(./blkiotune/weight)", ctxt, + &def->blkio.weight); + if (w < 0 || def->blkio.weight > 1000 || def->blkio.weight < 100) + virDomainReportError(VIR_ERR_XML_ERROR, "%s", + _("I/O weight should fall in [100, 1000]")); + /* Extract other memory tunables */ if (virXPathULong("string(./memtune/hard_limit)", ctxt, &def->mem.hard_limit) < 0) @@ -7289,6 +7296,14 @@ char *virDomainDefFormat(virDomainDefPtr def, virBufferVSprintf(&buf, " <currentMemory>%lu</currentMemory>\n", def->mem.cur_balloon); + /* add blkiotune only if there are any */ + if (def->blkio.weight) { + virBufferVSprintf(&buf, " <blkiotune>\n"); + virBufferVSprintf(&buf, " <weight>%lu</weight>\n", + def->blkio.weight); + virBufferVSprintf(&buf, " </blkiotune>\n"); + } + /* add memtune only if there are any */ if (def->mem.hard_limit || def->mem.soft_limit || def->mem.min_guarantee || def->mem.swap_hard_limit) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index cf7bdc0..b117869 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -969,6 +969,10 @@ struct _virDomainDef { char *description; struct { + unsigned long weight; + } blkio; + + struct { unsigned long max_balloon; unsigned long cur_balloon; unsigned long hugepage_backed; diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index e5536c0..a3e8e6a 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -54,7 +54,6 @@ int qemuCgroupControllerActive(struct qemud_driver *driver, return 0; } - int qemuSetupDiskPathAllow(virDomainDiskDefPtr disk ATTRIBUTE_UNUSED, const char *path, size_t depth ATTRIBUTE_UNUSED, @@ -270,6 +269,21 @@ int qemuSetupCgroup(struct qemud_driver *driver, } } + if (qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_BLKIO)) { + if (vm->def->blkio.weight != 0) { + rc = virCgroupSetWeight(cgroup, vm->def->blkio.weight); + if(rc != 0) { + virReportSystemError(-rc, + _("Unable to set io weight for domain %s"), + vm->def->name); + goto cleanup; + } + } + } else { + VIR_WARN("Blkio cgroup is disabled in qemu configuration file: %s", + vm->def->name); + } + if ((rc = qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_MEMORY))) { if (vm->def->mem.hard_limit != 0) { rc = virCgroupSetMemoryHardLimit(cgroup, vm->def->mem.hard_limit); diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index e1502dc..121080f 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -299,7 +299,8 @@ int qemudLoadDriverConfig(struct qemud_driver *driver, driver->cgroupControllers = (1 << VIR_CGROUP_CONTROLLER_CPU) | (1 << VIR_CGROUP_CONTROLLER_DEVICES) | - (1 << VIR_CGROUP_CONTROLLER_MEMORY); + (1 << VIR_CGROUP_CONTROLLER_MEMORY) | + (1 << VIR_CGROUP_CONTROLLER_BLKIO); } for (i = 0 ; i < VIR_CGROUP_CONTROLLER_LAST ; i++) { if (driver->cgroupControllers & (1 << i)) { -- 1.7.1

3 4

[libvirt] [PATCH] docs: correct setmem text plus expand setmaxmem text
by Justin Clift 26 Jan '11

26 Jan '11

This completes the man page updates required for BZ # 622534: https://bugzilla.redhat.com/show_bug.cgi?id=622534 --- tools/virsh.pod | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 1f15fef..c0cda79 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -580,13 +580,20 @@ paravirtualized or running the PV balloon driver. Note, this command only works on active guest domains. To change the memory allocation for an inactive guest domain, use the virsh B<edit> command to -update the XML <memory> element. +update the XML <currentMemory> element. =item B<setmaxmem> I<domain-id> B<kilobytes> -Change the maximum memory allocation limit in the guest domain. This should -not change the current memory use. The memory limit is specified in -kilobytes. +Change the maximum memory allocation limit for an active guest domain. + +Some hypervisors require a larger granularity than kilobytes, and requests +that are not an even multiple will either be rounded down or rejected. For +example, vSphere/ESX rejects the parameter unless the kB argument is evenly +divisible by 1024 (that is, the kB argument happens to represent megabytes). + +Note, this command only works on active guest domains. To change the memory +allocation for an inactive guest domain, use the virsh B<edit> command to +update the XML <memory> element. =item B<memtune> I<domain-id> optional I<--hard-limit> B<kilobytes> optional I<--soft-limit> B<kilobytes> optional I<--swap-hard-limit> -- 1.7.3.5

4 10

[libvirt] [PATCH 0/3] Fix selinux problem when restoring qemu domain via a pipe
by Laine Stump 26 Jan '11

26 Jan '11

Patches 1 & 2 provide *most* of the fix required for https://bugzilla.redhat.com/show_bug.cgi?id=667756 Note that restoring from a gzip'ed image also suffers the same problem, and requires the same remedy. Patch 3 remedies a hang during failure that I encountered while debugging the main problem.

2 15

[libvirt] Interface XML description
by arnaud.champion＠devatom.fr 26 Jan '11

26 Jan '11

?Hi, I'm currently working on C# binding, precisly on virInterface things. I don't see any XML documentation around interface XML description. IS there infos anywhere ? Regards, Arnaud

4 3

[libvirt] [PATCH 1/3] cgroup: Enable cgroup hierarchy for blkio cgroup
by Gui Jianfeng 26 Jan '11

26 Jan '11

Enable cgroup hierarchy for blkio cgroup. Signed-off-by: Gui Jianfeng <guijianfen(a)cn.fujitsu.com> --- src/util/cgroup.c | 2 +- src/util/cgroup.h | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/util/cgroup.c b/src/util/cgroup.c index cd9caba..309f4e9 100644 --- a/src/util/cgroup.c +++ b/src/util/cgroup.c @@ -37,7 +37,7 @@ VIR_ENUM_IMPL(virCgroupController, VIR_CGROUP_CONTROLLER_LAST, "cpu", "cpuacct", "cpuset", "memory", "devices", - "freezer"); + "freezer", "blkio"); struct virCgroupController { int type; diff --git a/src/util/cgroup.h b/src/util/cgroup.h index 964da7a..67b1299 100644 --- a/src/util/cgroup.h +++ b/src/util/cgroup.h @@ -22,6 +22,7 @@ enum { VIR_CGROUP_CONTROLLER_MEMORY, VIR_CGROUP_CONTROLLER_DEVICES, VIR_CGROUP_CONTROLLER_FREEZER, + VIR_CGROUP_CONTROLLER_BLKIO, VIR_CGROUP_CONTROLLER_LAST }; -- 1.7.1

2 1

[libvirt] Move "Bindings" page under "Downloads" heading?
by Justin Clift 26 Jan '11

26 Jan '11

Hi us, It just clicked for me, that when people want to download (or even find) our language bindings, they have to find them through our Documentation section pages. Would it make more sense to have our language bindings listed under Downloads? + Justin

4 7

[libvirt] [PATCH] qemu: Error prompt when managed save a shutoff domain
by Osier Yang 26 Jan '11

26 Jan '11

The problem was intrduced by commit 4303c91, which removed the checking of domain state, this patch is to fix it. Otherwise, improper error will be throwed, e.g. # virsh managedsave rhel6 error: Failed to save domain rhel6 state error: cannot resolve symlink /var/lib/libvirt/qemu/save/rhel6.save: No such file or directory --- src/qemu/qemu_driver.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 34cc29f..575dbd3 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4640,6 +4640,12 @@ qemuDomainManagedSave(virDomainPtr dom, unsigned int flags) goto cleanup; } + if (!virDomainObjIsActive(vm)) { + qemuReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain is not running")); + goto cleanup; + } + name = qemuDomainManagedSavePath(driver, vm); if (name == NULL) goto cleanup; -- 1.7.3.2

3 3

[libvirt] Rudimentary (basic) s390x architecture functions for libvirt
by Patrick Siegl 25 Jan '11

25 Jan '11

Hello there, I don't know whether or not you are only interested in the x86 / x86_64 architecture, but I think you could also be interested in the small bit of code which I have programmed. Since the release of libvirt 0.8.5, there is a small bit of s390x architecture code (one line) within libvirt which has given me the impression that you could be interested in my small bit of code. I study 'computer science' at the University of Tuebingen (Germany) and each student has to do a research study during his studies on his way to receiving his diploma. One of my goals is to implement basic s390x functions into libvirt in order to be able to start / create virtual machines on a s390x architecture (i.e. on our IBM Mainframe z9 at the university) more easily. Our Setup is (as just mentioned) an IBM Mainframe z9 on which I have the root access to a zLinux (which runs native on two LPARs) with the OS "SUSE Enterprise 11 SP1" and a kernel 2.6.34. (Our test virtual machine is a copy of the running zLinux.) I have actually implemented my patch into libvirt release 0.8.6 but I think a git patch would be more practical for you, so I have implemented it into git today (see underneath or attachment). The following XML file creates a virtual machine on my zLinux with my git patch which is listed underneath (or attachment). As you can see, there is not much that needs to be done so that libvirt can create rudimentary virtual machines on IBM Mainframe z9 (under an zLinux). Regards, Patrick Siegl University of Tuebingen (Germany) Here is the necessary XML file: =============================================================== <domain type='kvm'> <name>TestVM</name> <uuid></uuid> <memory>1024000</memory> <currentMemory>1024000</currentMemory> <cpu> <topology sockets='1' cores='1' threads='1'/> </cpu> <os> <type arch="s390x" machine='s390'>hvm</type> <kernel>/boot/image-2.6.34-tue01</kernel> <initrd>/boot/initrd-2.6.34-tue01_GUEST</initrd> <cmdline>"root=/dev/vda1 rw"</cmdline> <boot dev='hd'/> </os> <devices> <graphics type='vnc' port='5903' listen='' keymap='de'/> <console type='vc'> <target type='virtio' name='virtio.serial'/> </console> <disk type='file' device='disk'> <source file='/data/sle11.img'/> <target dev='vda'/> </disk> <interface type='ethernet'> <target dev='tap0'/> <mac address='00:17:31:88:AC:86'/> <ip address='134.2.14.241'/> </interface> </devices> </domain> ... and here is the patch: =============================================================== diff --git a/libvirt-git/src/qemu/qemu_capabilities.c b/libvirt/src/qemu/qemu_capabilities.c index faf7d44..7bbb1d5 100644 --- a/libvirt-git/src/qemu/qemu_capabilities.c +++ b/libvirt/src/qemu/qemu_capabilities.c @@ -83,7 +83,7 @@ static const struct qemu_arch_info const arch_info_hvm[] = { { "sparc", 32, NULL, "qemu-system-sparc", NULL, NULL, 0 }, { "ppc", 32, NULL, "qemu-system-ppc", NULL, NULL, 0 }, { "itanium", 64, NULL, "qemu-system-ia64", NULL, NULL, 0 }, - { "s390x", 64, NULL, "qemu-system-s390x", NULL, NULL, 0 }, + { "s390x", 64, NULL, "qemu-system-s390x", NULL, NULL, 0 }, // Since 0.8.5: doesn't work on it's own! }; static const struct qemu_arch_info const arch_info_xen[] = { diff --git a/libvirt-git/src/nodeinfo.c b/libvirt/src/nodeinfo.c index 22d53e5..c9059d4 100644 --- a/libvirt-git/src/nodeinfo.c +++ b/libvirt/src/nodeinfo.c @@ -164,7 +164,11 @@ cleanup: static int parse_socket(unsigned int cpu) { +# if ( defined __s390x__ || defined __s390__ ) + return 0; /* s390 does not implement physical_package_id by now */ +# else return get_cpu_value(cpu, "topology/physical_package_id", false); +# endif } int linuxNodeInfoCPUPopulate(FILE *cpuinfo, @@ -195,6 +199,30 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, * has no knowledge of NUMA nodes */ /* NOTE: hyperthreads are ignored here; they are parsed out of /sys */ +# if defined __s390x__ || defined __s390__ + while (fgets(line, sizeof(line), cpuinfo) != NULL) { + char *buf = line; + if (STRPREFIX(buf, "# processors")) { /* Number of processors */ + char *p; + unsigned int id; + buf += 12; + while (*buf && c_isspace(*buf)) + buf++; + if (*buf != ':' || !buf[1]) { + nodeReportError(VIR_ERR_INTERNAL_ERROR, + "parsing cpuinfo cpu count %c", *buf); + return -1; + } + if (virStrToLong_ui(buf+1, &p, 10, &id) == 0 + && (*p == '\0' || c_isspace(*p)) + && id > nodeinfo->cores) { + nodeinfo->cpus = id; + nodeinfo->cores = 1; + nodeinfo->mhz = 1400; /* z9 BC */ + } + } + } +# else /* no s390 */ while (fgets(line, sizeof(line), cpuinfo) != NULL) { char *buf = line; if (STRPREFIX(buf, "processor")) { /* aka a single logical CPU */ @@ -239,6 +267,7 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, nodeinfo->cores = id; } } +# endif /* s390 */ if (!nodeinfo->cpus) { nodeReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/libvirt-git/src/qemu/qemu_command.c b/libvirt/src/qemu/qemu_command.c index c20f031..0419a0c 100644 --- a/libvirt-git/src/qemu/qemu_command.c +++ b/libvirt/src/qemu/qemu_command.c @@ -1267,9 +1267,15 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, break; } } else { +# if ( defined __s390x__ || defined __s390__ ) + virBufferVSprintf(&opt, "file=%s", disk->src); +# else virBufferVSprintf(&opt, "file=%s,", disk->src); +# endif } } +// makes problems under s390x +# if ! ( defined __s390x__ || defined __s390__ ) if (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE) virBufferAddLit(&opt, "if=none"); else @@ -1291,6 +1297,7 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, virBufferVSprintf(&opt, ",unit=%d", unitid); } } +# endif if (bootable && disk->device == VIR_DOMAIN_DISK_DEVICE_DISK && disk->bus != VIR_DOMAIN_DISK_BUS_IDE) @@ -1298,10 +1305,12 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, if (disk->readonly && qemuCmdFlags & QEMUD_CMD_FLAG_DRIVE_READONLY) virBufferAddLit(&opt, ",readonly=on"); +# if ! ( defined __s390x__ || defined __s390__ ) if (disk->driverType && *disk->driverType != '\0' && disk->type != VIR_DOMAIN_DISK_TYPE_DIR && qemuCmdFlags & QEMUD_CMD_FLAG_DRIVE_FORMAT) virBufferVSprintf(&opt, ",format=%s", disk->driverType); +# endif if (disk->serial && (qemuCmdFlags & QEMUD_CMD_FLAG_DRIVE_SERIAL)) { if (qemuSafeSerialParamValue(disk->serial) < 0) @@ -1370,8 +1379,12 @@ qemuBuildDriveDevStr(virDomainDiskDefPtr disk, disk->info.addr.drive.unit); break; case VIR_DOMAIN_DISK_BUS_VIRTIO: +# if ( defined __s390x__ || defined __s390__ ) + virBufferAddLit(&opt, "virtio-blk-s390"); +# else virBufferAddLit(&opt, "virtio-blk-pci"); qemuBuildDeviceAddressStr(&opt, &disk->info); +# endif break; case VIR_DOMAIN_DISK_BUS_USB: virBufferAddLit(&opt, "usb-storage"); @@ -1476,6 +1489,9 @@ qemuBuildControllerDevStr(virDomainControllerDefPtr def) break; case VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL: +# if ( defined __s390x__ || defined __s390__ ) + virBufferAddLit(&buf, "virtio-serial-s390"); +# else if (def->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { virBufferAddLit(&buf, "virtio-serial-pci"); } else { @@ -1491,6 +1507,7 @@ qemuBuildControllerDevStr(virDomainControllerDefPtr def) virBufferVSprintf(&buf, ",vectors=%d", def->opts.vioserial.vectors); } +# endif break; /* We always get an IDE controller, whether we want it or not. */ @@ -1499,6 +1516,7 @@ qemuBuildControllerDevStr(virDomainControllerDefPtr def) goto error; } +# if ! ( defined __s390x__ || defined __s390__ ) if (qemuBuildDeviceAddressStr(&buf, &def->info) < 0) goto error; @@ -1506,6 +1524,7 @@ qemuBuildControllerDevStr(virDomainControllerDefPtr def) virReportOOMError(); goto error; } +# endif return virBufferContentAndReset(&buf); @@ -1551,7 +1570,11 @@ qemuBuildNicDevStr(virDomainNetDefPtr net, if (!net->model) { nic = "rtl8139"; } else if (STREQ(net->model, "virtio")) { +# if ( defined __s390x__ || defined __s390__ ) + nic = "virtio-net-s390"; +# else nic = "virtio-net-pci"; +# endif } else { nic = net->model; } @@ -2587,7 +2610,11 @@ qemuBuildCommandLine(virConnectPtr conn, break; } - cmd = virCommandNewArgList(emulator, "-S", NULL); +# if ! ( defined __s390x__ || defined __s390__ ) + cmd = virCommandNewArgList(emulator, "-S", NULL); // param '-S' makes problems under s390x +# else + cmd = virCommandNewArgList(emulator, "", NULL); +# endif virCommandAddEnvPassCommon(cmd); @@ -2909,8 +2936,10 @@ qemuBuildCommandLine(virConnectPtr conn, def->onReboot != VIR_DOMAIN_LIFECYCLE_RESTART) virCommandAddArg(cmd, "-no-reboot"); +# if ! ( defined __s390x__ || defined __s390__ ) if (!(def->features & (1 << VIR_DOMAIN_FEATURE_ACPI))) virCommandAddArg(cmd, "-no-acpi"); +# endif if (!def->os.bootloader) { for (i = 0 ; i < def->os.nBootDevs ; i++) { @@ -2980,6 +3009,7 @@ qemuBuildCommandLine(virConnectPtr conn, } } +# if ! ( defined __s390x__ || defined __s390__ ) if (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE) { for (i = 0 ; i < def->ncontrollers ; i++) { virDomainControllerDefPtr cont = def->controllers[i]; @@ -3008,6 +3038,7 @@ qemuBuildCommandLine(virConnectPtr conn, VIR_FREE(devstr); } } +# endif /* If QEMU supports -drive param instead of old -hda, -hdb, -cdrom .. */ if (qemuCmdFlags & QEMUD_CMD_FLAG_DRIVE) { @@ -3106,6 +3137,7 @@ qemuBuildCommandLine(virConnectPtr conn, } } +# if ! ( defined __s390x__ || defined __s390__ ) // s390x doesn't need DeviceArg yet (it doesn't even work with ...) if (withDeviceArg) { if (disk->bus == VIR_DOMAIN_DISK_BUS_FDC) { virCommandAddArg(cmd, "-global"); @@ -3131,6 +3163,7 @@ qemuBuildCommandLine(virConnectPtr conn, VIR_FREE(optstr); } } +# endif } } else { for (i = 0 ; i < def->ndisks ; i++) { @@ -3277,11 +3310,13 @@ qemuBuildCommandLine(virConnectPtr conn, char vhostfd_name[50] = ""; int vlan; +# if ! ( defined __s390x__ || defined __s390__ ) /* VLANs are not used with -netdev, so don't record them */ if ((qemuCmdFlags & QEMUD_CMD_FLAG_NETDEV) && (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE)) vlan = -1; else +# endif vlan = i; if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK || @@ -3338,6 +3373,7 @@ qemuBuildCommandLine(virConnectPtr conn, * * NB, no support for -netdev without use of -device */ +# if ! ( defined __s390x__ || defined __s390__ ) // Old way works on IBM z9 Tuebingen; maybe there are other z9's which also work with "semi-" or "best way" if ((qemuCmdFlags & QEMUD_CMD_FLAG_NETDEV) && (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE)) { virCommandAddArg(cmd, "-netdev"); @@ -3354,21 +3390,26 @@ qemuBuildCommandLine(virConnectPtr conn, virCommandAddArg(cmd, nic); VIR_FREE(nic); } else { +# endif virCommandAddArg(cmd, "-net"); if (!(nic = qemuBuildNicStr(net, "nic,", vlan))) goto error; virCommandAddArg(cmd, nic); VIR_FREE(nic); +# if ! ( defined __s390x__ || defined __s390__ ) } if (!((qemuCmdFlags & QEMUD_CMD_FLAG_NETDEV) && (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE))) { +# endif virCommandAddArg(cmd, "-net"); if (!(host = qemuBuildHostNetStr(net, ',', vlan, tapfd_name, vhostfd_name))) goto error; virCommandAddArg(cmd, host); VIR_FREE(host); +# if ! ( defined __s390x__ || defined __s390__ ) } +# endif } } @@ -3384,6 +3425,7 @@ qemuBuildCommandLine(virConnectPtr conn, /* Use -chardev with -device if they are available */ if ((qemuCmdFlags & QEMUD_CMD_FLAG_CHARDEV) && (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE)) { +# if ! ( defined __s390x__ || defined __s390__ ) virCommandAddArg(cmd, "-chardev"); if (!(devstr = qemuBuildChrChardevStr(&serial->source, serial->info.alias))) @@ -3394,6 +3436,7 @@ qemuBuildCommandLine(virConnectPtr conn, virCommandAddArg(cmd, "-device"); virCommandAddArgFormat(cmd, "isa-serial,chardev=%s", serial->info.alias); +# endif; } else { virCommandAddArg(cmd, "-serial"); if (!(devstr = qemuBuildChrArgStr(&serial->source, NULL))) @@ -3483,6 +3526,11 @@ qemuBuildCommandLine(virConnectPtr conn, virCommandAddArg(cmd, devstr); VIR_FREE(devstr); +# if ( defined __s390x__ || defined __s390__ ) + virCommandAddArg(cmd, "-device"); + virCommandAddArg(cmd, "virtio-serial-s390"); +# endif + virCommandAddArg(cmd, "-device"); if (!(devstr = qemuBuildVirtioSerialPortDevStr(channel))) goto error; @@ -3512,6 +3560,11 @@ qemuBuildCommandLine(virConnectPtr conn, virCommandAddArg(cmd, devstr); VIR_FREE(devstr); +# if ( defined __s390x__ || defined __s390__ ) + virCommandAddArg(cmd, "-device"); + virCommandAddArg(cmd, "virtio-serial-s390"); +# endif + virCommandAddArg(cmd, "-device"); if (!(devstr = qemuBuildVirtioSerialPortDevStr(console))) goto error; @@ -4011,6 +4064,8 @@ qemuBuildCommandLine(virConnectPtr conn, * NB: Earlier we declared that VirtIO balloon will always be in * slot 0x3 on bus 0x0 */ +// our SUSE Enterprise, running on one LPAR (IBM z9), doesn't have ballon support ... +# if ! ( defined __s390x__ || defined __s390__ ) if ((def->memballoon) && (def->memballoon->model != VIR_DOMAIN_MEMBALLOON_MODEL_NONE)) { if (def->memballoon->model != VIR_DOMAIN_MEMBALLOON_MODEL_VIRTIO) { @@ -4032,6 +4087,7 @@ qemuBuildCommandLine(virConnectPtr conn, virCommandAddArgList(cmd, "-balloon", "virtio", NULL); } } +# endif if (current_snapshot && current_snapshot->def->active) virCommandAddArgList(cmd, "-loadvm", current_snapshot->def->name,

2 2

[libvirt] [PATCH] bugfix for https://bugzilla.redhat.com/show_bug.cgi?id=671050
by Michal Privoznik 25 Jan '11

25 Jan '11

virsh simply refutes to detach-interface in case when multiple interfaces are attached and --mac is not specified. --- tools/virsh.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index aba7945..f965fc0 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -8557,6 +8557,11 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) goto cleanup; } + if ((!mac) && (obj->nodesetval->nodeNr > 1)) { + vshError(ctl, _("Domain has %d interfaces. Please specify which one you want to detach using --mac"), obj->nodesetval->nodeNr); + goto cleanup; + } + if (!mac) goto hit; -- 1.7.3.5

2 1

[libvirt] [PATCH] dispatch error before return
by Wen Congyang 25 Jan '11

25 Jan '11

Signed-off-by: Wen Congyang <wency(a)cn.fujitsu.com> --- src/libvirt.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 5f8b131..c65b1e5 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -5560,6 +5560,7 @@ virDomainAttachDeviceFlags(virDomainPtr domain, if (!VIR_IS_CONNECTED_DOMAIN(domain)) { virLibDomainError(VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virDispatchError(NULL); return -1; } if (domain->conn->flags & VIR_CONNECT_RO) { @@ -5660,6 +5661,7 @@ virDomainDetachDeviceFlags(virDomainPtr domain, if (!VIR_IS_CONNECTED_DOMAIN(domain)) { virLibDomainError(VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virDispatchError(NULL); return -1; } if (domain->conn->flags & VIR_CONNECT_RO) { @@ -5719,6 +5721,7 @@ virDomainUpdateDeviceFlags(virDomainPtr domain, if (!VIR_IS_CONNECTED_DOMAIN(domain)) { virLibDomainError(VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virDispatchError(NULL); return -1; } if (domain->conn->flags & VIR_CONNECT_RO) { -- 1.7.1

2 1

[libvirt] [PATCH] build: avoid corrupted gnulib/tests/Makefile
by Eric Blake 25 Jan '11

25 Jan '11

Running 'make check' can sometimes fail in the gnulib/tests subdirectory, when doing an incremental build, because ./bootstrap generates a Makefile.am that tries to refer to ../../.. instead of ../.., and gets lost. This may be an upstream gnulib bug, where a more elegant solution will present itself in the future: http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/24898 But in the meantime, I was able to reproduce both the issue, and this solution to work around it. * bootstrap.conf (bootstrap_epilogue): Ensure that no stray ../../.. components remain in gnulib/tests/Makefile.in. Reported by Serge Hallyn. --- bootstrap.conf | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/bootstrap.conf b/bootstrap.conf index 88832d1..14d5ace 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -168,0 +168,0 @@ touch ChangeLog || exit 1 bootstrap_epilogue() { - # Change paths in gnulib/tests/Makefile.am from "../../.." to "../..". + # Change paths in gnulib/tests/Makefile.am from "../../.." to "../..", + # then ensure that gnulib/tests/Makefile.in is up-to-date. m=gnulib/tests/Makefile.am sed 's,\.\./\.\./\.\.,../..,g' $m > $m-t mv -f $m-t $m + ${AUTOMAKE-automake} gnulib/tests/Makefile } -- 1.7.3.4

3 3

[libvirt] [PATCH v5] qemu: sound: Support intel 'ich6' model
by Cole Robinson 24 Jan '11

24 Jan '11

In QEMU, the card itself is a PCI device, but it requires a codec (either -device hda-output or -device hda-duplex) to actually output sound. Specifying <sound model='ich6'/> gives us -device intel-hda -device hda-duplex I think it's important that a simple <sound model='ich6'/> sets up a useful codec, to have consistent behavior with all other sound cards. This is basically Dan's proposal of <sound model='ich6'> <codec type='output' slot='0'/> <codec type='duplex' slot='3'/> </sound> without the codec bits implemented. The important thing is to keep a consistent API here, we don't want some <sound> devs require tweaking codecs but not others. Steps I see to accomplishing this: - every <sound> device has a <codec type='default'/> (unless codecs are manually specified) - <codec type='none'/> is required to specify 'no codecs' - new audio settings like mic=on|off could then be exposed in <sound> or <codec> in a consistent manner for all sound models v2: Use model='ich6' v3: Use feature detection, from eblake Set codec id, bus, and cad values v4: intel-hda isn't supported if -device isn't available v5: Comment spelling fixes Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- docs/formatdomain.html.in | 5 +- docs/schemas/domain.rng | 1 + src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 5 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 56 +++++++++++++++++++- .../qemuxml2argv-sound-device.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-sound-device.xml | 1 + tests/qemuxml2argvtest.c | 2 +- 10 files changed, 70 insertions(+), 7 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 859f3fd..e7f65ad 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1880,8 +1880,9 @@ qemu-kvm -net nic,model=? /dev/null The <code>sound</code> element has one mandatory attribute, <code>model</code>, which specifies what real sound device is emulated. Valid values are specific to the underlying hypervisor, though typical - choices are 'es1370', 'sb16', and 'ac97' - ('ac97' only since 0.6.0) + choices are 'es1370', 'sb16', 'ac97', and 'ich6' + ( + 'ac97' only since 0.6.0, 'ich6' only since 0.8.8) </dd> </dl> diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index d4756e6..b2f8e00 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -1530,6 +1530,7 @@ <value>es1370</value> <value>pcspk</value> <value>ac97</value> + <value>ich6</value> </choice> </attribute> <optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 699fee7..d5445a4 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -231,7 +231,8 @@ VIR_ENUM_IMPL(virDomainSoundModel, VIR_DOMAIN_SOUND_MODEL_LAST, "sb16", "es1370", "pcspk", - "ac97") + "ac97", + "ich6") VIR_ENUM_IMPL(virDomainMemballoonModel, VIR_DOMAIN_MEMBALLOON_MODEL_LAST, "virtio", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 3b00ba0..fc69627 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -480,6 +480,7 @@ enum virDomainSoundModel { VIR_DOMAIN_SOUND_MODEL_ES1370, VIR_DOMAIN_SOUND_MODEL_PCSPK, VIR_DOMAIN_SOUND_MODEL_AC97, + VIR_DOMAIN_SOUND_MODEL_ICH6, VIR_DOMAIN_SOUND_MODEL_LAST }; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index faf7d44..02865e4 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1079,6 +1079,11 @@ cleanup: int qemuCapsParseDeviceStr(const char *str, unsigned long long *flags) { + /* Which devices exist. */ + if (strstr(str, "name \"hda-duplex\"")) + *flags |= QEMUD_CMD_FLAG_HDA_DUPLEX; + + /* Features of given devices. */ if (strstr(str, "pci-assign.configfd")) *flags |= QEMUD_CMD_FLAG_PCI_CONFIGFD; if (strstr(str, "virtio-blk-pci.bootindex")) diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index e9e2da0..9148d90 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -84,6 +84,7 @@ enum qemuCapsFlags { QEMUD_CMD_FLAG_VGA_NONE = (1LL << 47), /* The 'none' arg for '-vga' */ QEMUD_CMD_FLAG_MIGRATE_QEMU_FD = (1LL << 48), /* -incoming fd:n */ QEMUD_CMD_FLAG_BOOTINDEX = (1LL << 49), /* -device bootindex property */ + QEMUD_CMD_FLAG_HDA_DUPLEX = (1LL << 50), /* -device hda-duplex */ }; virCapsPtr qemuCapsInit(virCapsPtr old_caps); diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c20f031..6dc586f 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1774,11 +1774,13 @@ qemuBuildSoundDevStr(virDomainSoundDefPtr sound) goto error; } - /* Hack for 2 wierdly unusal devices name in QEMU */ + /* Hack for weirdly unusual devices name in QEMU */ if (STREQ(model, "es1370")) model = "ES1370"; else if (STREQ(model, "ac97")) model = "AC97"; + else if (STREQ(model, "ich6")) + model = "intel-hda"; virBufferVSprintf(&buf, "%s", model); virBufferVSprintf(&buf, ",id=%s", sound->info.alias); @@ -1797,6 +1799,29 @@ error: return NULL; } +static char * +qemuBuildSoundCodecStr(virDomainSoundDefPtr sound, + const char *codec) +{ + virBuffer buf = VIR_BUFFER_INITIALIZER; + int cad = 0; + + virBufferVSprintf(&buf, "%s", codec); + virBufferVSprintf(&buf, ",id=%s-codec%d", sound->info.alias, cad); + virBufferVSprintf(&buf, ",bus=%s.0", sound->info.alias); + virBufferVSprintf(&buf, ",cad=%d", cad); + + if (virBufferError(&buf)) { + virReportOOMError(); + goto error; + } + + return virBufferContentAndReset(&buf); + +error: + virBufferFreeAndReset(&buf); + return NULL; +} static char * qemuBuildVideoDevStr(virDomainVideoDefPtr video) @@ -3817,11 +3842,29 @@ qemuBuildCommandLine(virConnectPtr conn, virCommandAddArgList(cmd, "-soundhw", "pcspk", NULL); } else { virCommandAddArg(cmd, "-device"); - if (!(str = qemuBuildSoundDevStr(sound))) goto error; virCommandAddArg(cmd, str); + + if (sound->model == VIR_DOMAIN_SOUND_MODEL_ICH6) { + char *codecstr = NULL; + if (!(qemuCmdFlags & QEMUD_CMD_FLAG_HDA_DUPLEX)) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("this QEMU binary lacks hda support")); + goto error; + } + + virCommandAddArg(cmd, "-device"); + if (!(codecstr = qemuBuildSoundCodecStr(sound, + "hda-duplex"))) { + goto error; + } + + virCommandAddArg(cmd, codecstr); + VIR_FREE(codecstr); + } + VIR_FREE(str); } } @@ -3840,6 +3883,13 @@ qemuBuildCommandLine(virConnectPtr conn, "%s", _("invalid sound model")); goto error; } + + if (sound->model == VIR_DOMAIN_SOUND_MODEL_ICH6) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("this QEMU binary lacks hda support")); + goto error; + } + strncat(modstr, model, size); size -= strlen(model); if (i < (def->nsounds - 1)) @@ -5675,6 +5725,8 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr caps, type = VIR_DOMAIN_SOUND_MODEL_ES1370; } else if (STRPREFIX(start, "ac97")) { type = VIR_DOMAIN_SOUND_MODEL_AC97; + } else if (STRPREFIX(start, "hda")) { + type = VIR_DOMAIN_SOUND_MODEL_ICH6; } if (type != -1) { diff --git a/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args b/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args index 6b2e697..4c5172f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args @@ -1 +1 @@ -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 -hda /dev/HostVG/QEMUGuest1 -usb -soundhw pcspk -device ES1370,id=sound1,bus=pci.0,addr=0x2 -device sb16,id=sound2 -device AC97,id=sound3,bus=pci.0,addr=0x3 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 +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 -hda /dev/HostVG/QEMUGuest1 -usb -soundhw pcspk -device ES1370,id=sound1,bus=pci.0,addr=0x2 -device sb16,id=sound2 -device AC97,id=sound3,bus=pci.0,addr=0x3 -device intel-hda,id=sound4,bus=pci.0,addr=0x4 -device hda-duplex,id=sound4-codec0,bus=sound4.0,cad=0 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-sound-device.xml b/tests/qemuxml2argvdata/qemuxml2argv-sound-device.xml index c725346..fbca4fe 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-sound-device.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-sound-device.xml @@ -22,6 +22,7 @@ <sound model='es1370'/> <sound model='sb16'/> <sound model='ac97'/> + <sound model='ich6'/> <memballoon model='virtio'/> </devices> </domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index a7270ec..0c0693b 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -418,7 +418,7 @@ mymain(int argc, char **argv) QEMUD_CMD_FLAG_NODEFCONFIG, false); DO_TEST("sound", 0, false); DO_TEST("sound-device", QEMUD_CMD_FLAG_DEVICE | - QEMUD_CMD_FLAG_NODEFCONFIG, false); + QEMUD_CMD_FLAG_NODEFCONFIG | QEMUD_CMD_FLAG_HDA_DUPLEX, false); DO_TEST("fs9p", QEMUD_CMD_FLAG_DEVICE | QEMUD_CMD_FLAG_NODEFCONFIG | QEMUD_CMD_FLAG_FSDEV, false); -- 1.7.3.2

2 2

[libvirt] [PATCH] Fix leak in SCSI storage backend
by Daniel P. Berrange 24 Jan '11

24 Jan '11

The SCSI storage backend leaks a string containing the pathname for each block device it discovers * src/storage/storage_backend_scsi.c: Free the device name --- src/storage/storage_backend_scsi.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c index 95ae546..d880d65 100644 --- a/src/storage/storage_backend_scsi.c +++ b/src/storage/storage_backend_scsi.c @@ -455,6 +455,7 @@ processLU(virStoragePoolObjPtr pool, VIR_FREE(type_path); out: + VIR_FREE(block_device); return retval; } -- 1.7.3.4

3 2

[libvirt] [PATCH v4] qemu: sound: Support intel 'ich6' model
by Cole Robinson 24 Jan '11

24 Jan '11

In QEMU, the card itself is a PCI device, but it requires a codec (either -device hda-output or -device hda-duplex) to actually output sound. Specifying <sound model='ich6'/> gives us -device intel-hda -device hda-duplex I think it's important that a simple <sound model='ich6'/> sets up a useful codec, to have consistent behavior with all other sound cards. This is basically Dan's proposal of <sound model='ich6'> <codec type='output' slot='0'/> <codec type='duplex' slot='3'/> </sound> without the codec bits implemented. The important thing is to keep a consistent API here, we don't want some <sound> devs require tweaking codecs but not others. Steps I see to accomplishing this: - every <sound> device has a <codec type='default'/> (unless codecs are manually specified) - <codec type='none'/> is required to specify 'no codecs' - new audio settings like mic=on|off could then be exposed in <sound> or <codec> in a consistent manner for all sound models v2: Use model='ich6' v3: Use feature detection, from eblake Set codec id, bus, and cad values v4: intel-hda isn't supported if -device isn't available Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- docs/formatdomain.html.in | 5 +- docs/schemas/domain.rng | 1 + src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 5 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 56 +++++++++++++++++++- .../qemuxml2argv-sound-device.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-sound-device.xml | 1 + tests/qemuxml2argvtest.c | 2 +- 10 files changed, 70 insertions(+), 7 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 859f3fd..e7f65ad 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1880,8 +1880,9 @@ qemu-kvm -net nic,model=? /dev/null The <code>sound</code> element has one mandatory attribute, <code>model</code>, which specifies what real sound device is emulated. Valid values are specific to the underlying hypervisor, though typical - choices are 'es1370', 'sb16', and 'ac97' - ('ac97' only since 0.6.0) + choices are 'es1370', 'sb16', 'ac97', and 'ich6' + ( + 'ac97' only since 0.6.0, 'ich6' only since 0.8.8) </dd> </dl> diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index d4756e6..b2f8e00 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -1530,6 +1530,7 @@ <value>es1370</value> <value>pcspk</value> <value>ac97</value> + <value>ich6</value> </choice> </attribute> <optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 699fee7..d5445a4 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -231,7 +231,8 @@ VIR_ENUM_IMPL(virDomainSoundModel, VIR_DOMAIN_SOUND_MODEL_LAST, "sb16", "es1370", "pcspk", - "ac97") + "ac97", + "ich6") VIR_ENUM_IMPL(virDomainMemballoonModel, VIR_DOMAIN_MEMBALLOON_MODEL_LAST, "virtio", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 3b00ba0..fc69627 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -480,6 +480,7 @@ enum virDomainSoundModel { VIR_DOMAIN_SOUND_MODEL_ES1370, VIR_DOMAIN_SOUND_MODEL_PCSPK, VIR_DOMAIN_SOUND_MODEL_AC97, + VIR_DOMAIN_SOUND_MODEL_ICH6, VIR_DOMAIN_SOUND_MODEL_LAST }; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index faf7d44..02865e4 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1079,6 +1079,11 @@ cleanup: int qemuCapsParseDeviceStr(const char *str, unsigned long long *flags) { + /* Which devices exist. */ + if (strstr(str, "name \"hda-duplex\"")) + *flags |= QEMUD_CMD_FLAG_HDA_DUPLEX; + + /* Features of given devices. */ if (strstr(str, "pci-assign.configfd")) *flags |= QEMUD_CMD_FLAG_PCI_CONFIGFD; if (strstr(str, "virtio-blk-pci.bootindex")) diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index e9e2da0..9148d90 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -84,6 +84,7 @@ enum qemuCapsFlags { QEMUD_CMD_FLAG_VGA_NONE = (1LL << 47), /* The 'none' arg for '-vga' */ QEMUD_CMD_FLAG_MIGRATE_QEMU_FD = (1LL << 48), /* -incoming fd:n */ QEMUD_CMD_FLAG_BOOTINDEX = (1LL << 49), /* -device bootindex property */ + QEMUD_CMD_FLAG_HDA_DUPLEX = (1LL << 50), /* -device hda-duplex */ }; virCapsPtr qemuCapsInit(virCapsPtr old_caps); diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c20f031..44a57d8 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1774,11 +1774,13 @@ qemuBuildSoundDevStr(virDomainSoundDefPtr sound) goto error; } - /* Hack for 2 wierdly unusal devices name in QEMU */ + /* Hack for wierdly unusal devices name in QEMU */ if (STREQ(model, "es1370")) model = "ES1370"; else if (STREQ(model, "ac97")) model = "AC97"; + else if (STREQ(model, "ich6")) + model = "intel-hda"; virBufferVSprintf(&buf, "%s", model); virBufferVSprintf(&buf, ",id=%s", sound->info.alias); @@ -1797,6 +1799,29 @@ error: return NULL; } +static char * +qemuBuildSoundCodecStr(virDomainSoundDefPtr sound, + const char *codec) +{ + virBuffer buf = VIR_BUFFER_INITIALIZER; + int cad = 0; + + virBufferVSprintf(&buf, "%s", codec); + virBufferVSprintf(&buf, ",id=%s-codec%d", sound->info.alias, cad); + virBufferVSprintf(&buf, ",bus=%s.0", sound->info.alias); + virBufferVSprintf(&buf, ",cad=%d", cad); + + if (virBufferError(&buf)) { + virReportOOMError(); + goto error; + } + + return virBufferContentAndReset(&buf); + +error: + virBufferFreeAndReset(&buf); + return NULL; +} static char * qemuBuildVideoDevStr(virDomainVideoDefPtr video) @@ -3817,11 +3842,29 @@ qemuBuildCommandLine(virConnectPtr conn, virCommandAddArgList(cmd, "-soundhw", "pcspk", NULL); } else { virCommandAddArg(cmd, "-device"); - if (!(str = qemuBuildSoundDevStr(sound))) goto error; virCommandAddArg(cmd, str); + + if (sound->model == VIR_DOMAIN_SOUND_MODEL_ICH6) { + char *codecstr = NULL; + if (!(qemuCmdFlags & QEMUD_CMD_FLAG_HDA_DUPLEX)) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("this QEMU binary lacks hda support")); + goto error; + } + + virCommandAddArg(cmd, "-device"); + if (!(codecstr = qemuBuildSoundCodecStr(sound, + "hda-duplex"))) { + goto error; + } + + virCommandAddArg(cmd, codecstr); + VIR_FREE(codecstr); + } + VIR_FREE(str); } } @@ -3840,6 +3883,13 @@ qemuBuildCommandLine(virConnectPtr conn, "%s", _("invalid sound model")); goto error; } + + if (sound->model == VIR_DOMAIN_SOUND_MODEL_ICH6) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("this QEMU binary lacks hda support")); + goto error; + } + strncat(modstr, model, size); size -= strlen(model); if (i < (def->nsounds - 1)) @@ -5675,6 +5725,8 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr caps, type = VIR_DOMAIN_SOUND_MODEL_ES1370; } else if (STRPREFIX(start, "ac97")) { type = VIR_DOMAIN_SOUND_MODEL_AC97; + } else if (STRPREFIX(start, "hda")) { + type = VIR_DOMAIN_SOUND_MODEL_ICH6; } if (type != -1) { diff --git a/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args b/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args index 6b2e697..4c5172f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args @@ -1 +1 @@ -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 -hda /dev/HostVG/QEMUGuest1 -usb -soundhw pcspk -device ES1370,id=sound1,bus=pci.0,addr=0x2 -device sb16,id=sound2 -device AC97,id=sound3,bus=pci.0,addr=0x3 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 +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 -hda /dev/HostVG/QEMUGuest1 -usb -soundhw pcspk -device ES1370,id=sound1,bus=pci.0,addr=0x2 -device sb16,id=sound2 -device AC97,id=sound3,bus=pci.0,addr=0x3 -device intel-hda,id=sound4,bus=pci.0,addr=0x4 -device hda-duplex,id=sound4-codec0,bus=sound4.0,cad=0 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-sound-device.xml b/tests/qemuxml2argvdata/qemuxml2argv-sound-device.xml index c725346..fbca4fe 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-sound-device.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-sound-device.xml @@ -22,6 +22,7 @@ <sound model='es1370'/> <sound model='sb16'/> <sound model='ac97'/> + <sound model='ich6'/> <memballoon model='virtio'/> </devices> </domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index a7270ec..0c0693b 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -418,7 +418,7 @@ mymain(int argc, char **argv) QEMUD_CMD_FLAG_NODEFCONFIG, false); DO_TEST("sound", 0, false); DO_TEST("sound-device", QEMUD_CMD_FLAG_DEVICE | - QEMUD_CMD_FLAG_NODEFCONFIG, false); + QEMUD_CMD_FLAG_NODEFCONFIG | QEMUD_CMD_FLAG_HDA_DUPLEX, false); DO_TEST("fs9p", QEMUD_CMD_FLAG_DEVICE | QEMUD_CMD_FLAG_NODEFCONFIG | QEMUD_CMD_FLAG_FSDEV, false); -- 1.7.3.2

2 2

[libvirt] [PATCH] Fix leak of mutex attributes in POSIX threads impl
by Daniel P. Berrange 24 Jan '11

24 Jan '11

* src/util/threads-pthread.c: Fix mutex leak --- src/util/threads-pthread.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/util/threads-pthread.c b/src/util/threads-pthread.c index ea71589..f812045 100644 --- a/src/util/threads-pthread.c +++ b/src/util/threads-pthread.c @@ -47,7 +47,9 @@ int virMutexInit(virMutexPtr m) pthread_mutexattr_t attr; pthread_mutexattr_init(&attr); pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_NORMAL); - if ((ret = pthread_mutex_init(&m->lock, &attr)) != 0) { + ret = pthread_mutex_init(&m->lock, &attr); + pthread_mutexattr_destroy(&attr); + if (ret != 0) { errno = ret; return -1; } @@ -60,7 +62,9 @@ int virMutexInitRecursive(virMutexPtr m) pthread_mutexattr_t attr; pthread_mutexattr_init(&attr); pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); - if ((ret = pthread_mutex_init(&m->lock, &attr)) != 0) { + ret = pthread_mutex_init(&m->lock, &attr); + pthread_mutexattr_destroy(&attr); + if (ret != 0) { errno = ret; return -1; } -- 1.7.3.4

2 1

[libvirt] [v1] remote: Add extra parameter client_pki_dir for URI
by Osier Yang 24 Jan '11

24 Jan '11

This new parameter allows user specifies directory in which the client cerficate, client key, CA certificate reside (the directory path must be absolute), instead of hardcoding it in remote driver. But the hardcoded locations are still kept, and attempt to use them if the required files can not be found in the location user specified. e.g. [root@Osier client]# virsh -c qemu+tls://$hostname/system?client_pki_dir\ > =/tmp/pki/client Welcome to virsh, the virtualization interactive terminal. Type: 'help' for help with commands 'quit' to quit virsh # quit [root@Osier client]# pwd /tmp/pki/client [root@Osier client]# ls cacert.pem clientcert.pem client.info clientkey.pem [root@Osier client]# mv cacert.pem .. mv: overwrite `../cacert.pem'? y [root@Osier client]# virsh -c qemu+tls://10.66.93.111/system?client_pki_dir\ > =/tmp/pki/client 19:11:23.844: 7589: warning : initialize_gnutls:1186 : /tmp/pki/client/cacert.pem doesn't exist, try to use: /etc/pki/CA/cacert.pem Welcome to virsh, the virtualization interactive terminal. Type: 'help' for help with commands 'quit' to quit virsh # * src/remote/remote_driver.c --- src/remote/remote_driver.c | 87 ++++++++++++++++++++++++++++++++++++++------ 1 files changed, 75 insertions(+), 12 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index ea119c6..7053e45 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -268,7 +268,7 @@ void remoteDomainEventQueueFlush(int timer, void *opaque); static char *get_transport_from_scheme (char *scheme); /* GnuTLS functions used by remoteOpen. */ -static int initialize_gnutls(void); +static int initialize_gnutls(char *client_pki_dir); static gnutls_session_t negotiate_gnutls_on_connection (virConnectPtr conn, struct private_data *priv, int no_verify); #ifdef WITH_LIBVIRTD @@ -430,6 +430,7 @@ doRemoteOpen (virConnectPtr conn, char *port = NULL, *authtype = NULL, *username = NULL; int no_verify = 0, no_tty = 0; char **cmd_argv = NULL; + char *client_pki_dir = NULL; /* Return code from this function, and the private data. */ int retcode = VIR_DRV_OPEN_ERROR; @@ -509,9 +510,14 @@ doRemoteOpen (virConnectPtr conn, priv->debugLog = stdout; else priv->debugLog = stderr; - } else + } else if (STRCASEEQ(var->name, "client_pki_dir")) { + client_pki_dir = strdup(var->value); + if (!client_pki_dir) goto out_of_memory; + var->ignore = 1; + } else { DEBUG("passing through variable '%s' ('%s') to remote end", var->name, var->value); + } } /* Construct the original name. */ @@ -577,7 +583,7 @@ doRemoteOpen (virConnectPtr conn, /* Connect to the remote service. */ switch (transport) { case trans_tls: - if (initialize_gnutls() == -1) goto failed; + if (initialize_gnutls(client_pki_dir) == -1) goto failed; priv->uses_tls = 1; priv->is_secure = 1; @@ -947,6 +953,7 @@ doRemoteOpen (virConnectPtr conn, } VIR_FREE(cmd_argv); } + VIR_FREE(client_pki_dir); return retcode; @@ -1139,11 +1146,14 @@ static void remote_debug_gnutls_log(int level, const char* str) { } static int -initialize_gnutls(void) +initialize_gnutls(char *client_pki_dir) { static int initialized = 0; int err; char *gnutlsdebug; + char *libvirt_cacert = NULL; + char *libvirt_clientkey = NULL; + char *libvirt_clientcert = NULL; if (initialized) return 0; @@ -1166,18 +1176,64 @@ initialize_gnutls(void) return -1; } + if (client_pki_dir) { + if((virAsprintf(&libvirt_cacert, "%s/%s", client_pki_dir, + "cacert.pem")) < 0) + goto out_of_memory; + + if (!virFileExists(libvirt_cacert)) { + VIR_WARN(_("%s doesn't exist, try to use: %s"), + libvirt_cacert, LIBVIRT_CACERT); + + libvirt_cacert = strdup(LIBVIRT_CACERT); + if (!libvirt_cacert) goto out_of_memory; + } + + if((virAsprintf(&libvirt_clientkey, "%s/%s", client_pki_dir, + "clientkey.pem")) < 0) + goto out_of_memory; + + if (!virFileExists(libvirt_clientkey)) { + VIR_WARN(_("%s doesn't exist, try to use: %s"), + libvirt_clientkey, LIBVIRT_CLIENTKEY); + + libvirt_clientkey = strdup(LIBVIRT_CLIENTKEY); + if (!libvirt_clientkey) goto out_of_memory; + } + + if((virAsprintf(&libvirt_clientcert, "%s/%s", client_pki_dir, + "clientcert.pem")) < 0) + goto out_of_memory; - if (check_cert_file("CA certificate", LIBVIRT_CACERT) < 0) + if (!virFileExists(libvirt_clientcert)) { + VIR_WARN(_("%s doesn't exist, try to use: %s"), + libvirt_clientcert, LIBVIRT_CLIENTCERT); + + libvirt_clientcert = strdup(LIBVIRT_CLIENTCERT); + if (!libvirt_clientcert) goto out_of_memory; + } + } else { + libvirt_cacert = strdup(LIBVIRT_CACERT); + if (!libvirt_cacert) goto out_of_memory; + + libvirt_clientkey = strdup(LIBVIRT_CLIENTKEY); + if (!libvirt_cacert) goto out_of_memory; + + libvirt_clientcert = strdup(LIBVIRT_CLIENTCERT); + if (!libvirt_cacert) goto out_of_memory; + } + + if (check_cert_file("CA certificate", libvirt_cacert) < 0) return -1; - if (check_cert_file("client key", LIBVIRT_CLIENTKEY) < 0) + if (check_cert_file("client key", libvirt_clientkey) < 0) return -1; - if (check_cert_file("client certificate", LIBVIRT_CLIENTCERT) < 0) + if (check_cert_file("client certificate", libvirt_clientcert) < 0) return -1; /* Set the trusted CA cert. */ - DEBUG("loading CA file %s", LIBVIRT_CACERT); + DEBUG("loading CA file %s", libvirt_cacert); err = - gnutls_certificate_set_x509_trust_file (x509_cred, LIBVIRT_CACERT, + gnutls_certificate_set_x509_trust_file (x509_cred, libvirt_cacert, GNUTLS_X509_FMT_PEM); if (err < 0) { remoteError(VIR_ERR_GNUTLS_ERROR, @@ -1188,11 +1244,11 @@ initialize_gnutls(void) /* Set the client certificate and private key. */ DEBUG("loading client cert and key from files %s and %s", - LIBVIRT_CLIENTCERT, LIBVIRT_CLIENTKEY); + libvirt_clientcert, libvirt_clientkey); err = gnutls_certificate_set_x509_key_file (x509_cred, - LIBVIRT_CLIENTCERT, - LIBVIRT_CLIENTKEY, + libvirt_clientcert, + libvirt_clientkey, GNUTLS_X509_FMT_PEM); if (err < 0) { remoteError(VIR_ERR_GNUTLS_ERROR, @@ -1202,7 +1258,14 @@ initialize_gnutls(void) } initialized = 1; + VIR_FREE(libvirt_cacert); + VIR_FREE(libvirt_clientkey); + VIR_FREE(libvirt_clientcert); return 0; + +out_of_memory: + virReportOOMError(); + return -1; } static int verify_certificate (virConnectPtr conn, struct private_data *priv, gnutls_session_t session); -- 1.7.3.2

2 2

[libvirt] [PATCH v3] qemu: sound: Support intel 'ich6' model
by Cole Robinson 24 Jan '11

24 Jan '11

In QEMU, the card itself is a PCI device, but it requires a codec (either -device hda-output or -device hda-duplex) to actually output sound. Specifying <sound model='ich6'/> gives us -device intel-hda -device hda-duplex I think it's important that a simple <sound model='ich6'/> sets up a useful codec, to have consistent behavior with all other sound cards. This is basically Dan's proposal of <sound model='ich6'> <codec type='output' slot='0'/> <codec type='duplex' slot='3'/> </sound> without the codec bits implemented. The important thing is to keep a consistent API here, we don't want some <sound> devs require tweaking codecs but not others. Steps I see to accomplishing this: - every <sound> device has a <codec type='default'/> (unless codecs are manually specified) - <codec type='none'/> is required to specify 'no codecs' - new audio settings like mic=on|off could then be exposed in <sound> or <codec> in a consistent manner for all sound models One difference from danpb's suggestion is that the codec id takes the form ${soundid}-codec-${cad}, rather than codec${soundid}${cad}, just for readability. Also, QEMU seems to set the bus name as ${soundid}.0. Is that expected? Or should it just be ${soundid}? v2: Use feature detection, from eblake Set codec id, bus, and cad values Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- docs/formatdomain.html.in | 5 +- docs/schemas/domain.rng | 1 + src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 5 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 61 ++++++++++++++++++-- .../qemuxml2argv-sound-device.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-sound-device.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-sound.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-sound.xml | 1 + tests/qemuxml2argvtest.c | 2 +- 12 files changed, 74 insertions(+), 11 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 859f3fd..e7f65ad 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1880,8 +1880,9 @@ qemu-kvm -net nic,model=? /dev/null The <code>sound</code> element has one mandatory attribute, <code>model</code>, which specifies what real sound device is emulated. Valid values are specific to the underlying hypervisor, though typical - choices are 'es1370', 'sb16', and 'ac97' - ('ac97' only since 0.6.0) + choices are 'es1370', 'sb16', 'ac97', and 'ich6' + ( + 'ac97' only since 0.6.0, 'ich6' only since 0.8.8) </dd> </dl> diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index d4756e6..b2f8e00 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -1530,6 +1530,7 @@ <value>es1370</value> <value>pcspk</value> <value>ac97</value> + <value>ich6</value> </choice> </attribute> <optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 699fee7..d5445a4 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -231,7 +231,8 @@ VIR_ENUM_IMPL(virDomainSoundModel, VIR_DOMAIN_SOUND_MODEL_LAST, "sb16", "es1370", "pcspk", - "ac97") + "ac97", + "ich6") VIR_ENUM_IMPL(virDomainMemballoonModel, VIR_DOMAIN_MEMBALLOON_MODEL_LAST, "virtio", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 3b00ba0..fc69627 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -480,6 +480,7 @@ enum virDomainSoundModel { VIR_DOMAIN_SOUND_MODEL_ES1370, VIR_DOMAIN_SOUND_MODEL_PCSPK, VIR_DOMAIN_SOUND_MODEL_AC97, + VIR_DOMAIN_SOUND_MODEL_ICH6, VIR_DOMAIN_SOUND_MODEL_LAST }; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index faf7d44..02865e4 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1079,6 +1079,11 @@ cleanup: int qemuCapsParseDeviceStr(const char *str, unsigned long long *flags) { + /* Which devices exist. */ + if (strstr(str, "name \"hda-duplex\"")) + *flags |= QEMUD_CMD_FLAG_HDA_DUPLEX; + + /* Features of given devices. */ if (strstr(str, "pci-assign.configfd")) *flags |= QEMUD_CMD_FLAG_PCI_CONFIGFD; if (strstr(str, "virtio-blk-pci.bootindex")) diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index e9e2da0..9148d90 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -84,6 +84,7 @@ enum qemuCapsFlags { QEMUD_CMD_FLAG_VGA_NONE = (1LL << 47), /* The 'none' arg for '-vga' */ QEMUD_CMD_FLAG_MIGRATE_QEMU_FD = (1LL << 48), /* -incoming fd:n */ QEMUD_CMD_FLAG_BOOTINDEX = (1LL << 49), /* -device bootindex property */ + QEMUD_CMD_FLAG_HDA_DUPLEX = (1LL << 50), /* -device hda-duplex */ }; virCapsPtr qemuCapsInit(virCapsPtr old_caps); diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c20f031..627ec43 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1774,11 +1774,13 @@ qemuBuildSoundDevStr(virDomainSoundDefPtr sound) goto error; } - /* Hack for 2 wierdly unusal devices name in QEMU */ + /* Hack for wierdly unusal devices name in QEMU */ if (STREQ(model, "es1370")) model = "ES1370"; else if (STREQ(model, "ac97")) model = "AC97"; + else if (STREQ(model, "ich6")) + model = "intel-hda"; virBufferVSprintf(&buf, "%s", model); virBufferVSprintf(&buf, ",id=%s", sound->info.alias); @@ -1797,6 +1799,29 @@ error: return NULL; } +static char * +qemuBuildSoundCodecStr(virDomainSoundDefPtr sound, + const char *codec) +{ + virBuffer buf = VIR_BUFFER_INITIALIZER; + int cad = 0; + + virBufferVSprintf(&buf, "%s", codec); + virBufferVSprintf(&buf, ",id=%s-codec%d", sound->info.alias, cad); + virBufferVSprintf(&buf, ",bus=%s.0", sound->info.alias); + virBufferVSprintf(&buf, ",cad=%d", cad); + + if (virBufferError(&buf)) { + virReportOOMError(); + goto error; + } + + return virBufferContentAndReset(&buf); + +error: + virBufferFreeAndReset(&buf); + return NULL; +} static char * qemuBuildVideoDevStr(virDomainVideoDefPtr video) @@ -3817,11 +3842,29 @@ qemuBuildCommandLine(virConnectPtr conn, virCommandAddArgList(cmd, "-soundhw", "pcspk", NULL); } else { virCommandAddArg(cmd, "-device"); - if (!(str = qemuBuildSoundDevStr(sound))) goto error; virCommandAddArg(cmd, str); + + if (sound->model == VIR_DOMAIN_SOUND_MODEL_ICH6) { + char *codecstr = NULL; + if (!(qemuCmdFlags & QEMUD_CMD_FLAG_HDA_DUPLEX)) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("this QEMU binary lacks hda support")); + goto error; + } + + virCommandAddArg(cmd, "-device"); + if (!(codecstr = qemuBuildSoundCodecStr(sound, + "hda-duplex"))) { + goto error; + } + + virCommandAddArg(cmd, codecstr); + VIR_FREE(codecstr); + } + VIR_FREE(str); } } @@ -3833,13 +3876,19 @@ qemuBuildCommandLine(virConnectPtr conn, for (i = 0 ; i < def->nsounds && size > 0 ; i++) { virDomainSoundDefPtr sound = def->sounds[i]; - const char *model = virDomainSoundModelTypeToString(sound->model); - if (!model) { - VIR_FREE(modstr); + const char *model = "hda"; + + if (sound->model != VIR_DOMAIN_SOUND_MODEL_ICH6 && + !(model = virDomainSoundModelTypeToString(sound->model))) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("invalid sound model")); + } + + if (!model) { + VIR_FREE(modstr); goto error; } + strncat(modstr, model, size); size -= strlen(model); if (i < (def->nsounds - 1)) @@ -5675,6 +5724,8 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr caps, type = VIR_DOMAIN_SOUND_MODEL_ES1370; } else if (STRPREFIX(start, "ac97")) { type = VIR_DOMAIN_SOUND_MODEL_AC97; + } else if (STRPREFIX(start, "hda")) { + type = VIR_DOMAIN_SOUND_MODEL_ICH6; } if (type != -1) { diff --git a/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args b/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args index 6b2e697..4c5172f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args @@ -1 +1 @@ -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 -hda /dev/HostVG/QEMUGuest1 -usb -soundhw pcspk -device ES1370,id=sound1,bus=pci.0,addr=0x2 -device sb16,id=sound2 -device AC97,id=sound3,bus=pci.0,addr=0x3 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 +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 -hda /dev/HostVG/QEMUGuest1 -usb -soundhw pcspk -device ES1370,id=sound1,bus=pci.0,addr=0x2 -device sb16,id=sound2 -device AC97,id=sound3,bus=pci.0,addr=0x3 -device intel-hda,id=sound4,bus=pci.0,addr=0x4 -device hda-duplex,id=sound4-codec0,bus=sound4.0,cad=0 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-sound-device.xml b/tests/qemuxml2argvdata/qemuxml2argv-sound-device.xml index c725346..fbca4fe 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-sound-device.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-sound-device.xml @@ -22,6 +22,7 @@ <sound model='es1370'/> <sound model='sb16'/> <sound model='ac97'/> + <sound model='ich6'/> <memballoon model='virtio'/> </devices> </domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-sound.args b/tests/qemuxml2argvdata/qemuxml2argv-sound.args index 8cb2da2..0db62c3 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-sound.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-sound.args @@ -1 +1 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -soundhw pcspk,es1370,sb16,ac97 +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -soundhw pcspk,es1370,sb16,ac97,hda diff --git a/tests/qemuxml2argvdata/qemuxml2argv-sound.xml b/tests/qemuxml2argvdata/qemuxml2argv-sound.xml index d34e0b3..78bfe3d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-sound.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-sound.xml @@ -24,6 +24,7 @@ <sound model='es1370'/> <sound model='sb16'/> <sound model='ac97'/> + <sound model='ich6'/> <memballoon model='virtio'/> </devices> </domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index a7270ec..0c0693b 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -418,7 +418,7 @@ mymain(int argc, char **argv) QEMUD_CMD_FLAG_NODEFCONFIG, false); DO_TEST("sound", 0, false); DO_TEST("sound-device", QEMUD_CMD_FLAG_DEVICE | - QEMUD_CMD_FLAG_NODEFCONFIG, false); + QEMUD_CMD_FLAG_NODEFCONFIG | QEMUD_CMD_FLAG_HDA_DUPLEX, false); DO_TEST("fs9p", QEMUD_CMD_FLAG_DEVICE | QEMUD_CMD_FLAG_NODEFCONFIG | QEMUD_CMD_FLAG_FSDEV, false); -- 1.7.3.2

3 2

[libvirt] [PATCH] storage: Round up capacity for LVM volume creation
by Osier Yang 24 Jan '11

24 Jan '11

If vol->capacity is odd, the capacity will be rounded down by devision, this patch is to round it up instead of rounding down, to be safer in case of one writes to the volume with the size he used to create. * src/storage/storage_backend_logical.c --- src/storage/storage_backend_logical.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index 203fe5d..2057692 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -604,7 +604,10 @@ virStorageBackendLogicalCreateVol(virConnectPtr conn, cmdargv = cmdargvsnap; } - snprintf(size, sizeof(size)-1, "%lluK", vol->capacity/1024); + unsigned long long int capacity; + capacity = vol->capacity/1024 + (vol->capacity%1024 > 0 ? 1 : 0); + + snprintf(size, sizeof(size)-1, "%lluK", capacity); size[sizeof(size)-1] = '\0'; vol->type = VIR_STORAGE_VOL_BLOCK; -- 1.7.3.2

2 2

[libvirt] [PATCH 0/3] Add blkio cgroup support
by Gui Jianfeng 23 Jan '11

23 Jan '11

Hi This patchset adds blkio cgroup support for qemu. [PATCH 1/3] cgroup: Enable cgroup hierarchy for blkio cgroup [PATCH 2/3] cgroup: implement blkio.weight tuning API. [PATCH 3/3] qemu: Implement blkio tunable XML configuration and parsing. Will post a patchset to implement virsh command "blkiotune" to tune blkio cgroup parameter later on. --- conf/domain_conf.c | 17 ++++++++++++++++- conf/domain_conf.h | 4 ++++ libvirt_private.syms | 2 ++ qemu/qemu_cgroup.c | 16 +++++++++++++++- qemu/qemu_conf.c | 3 ++- util/cgroup.c | 38 +++++++++++++++++++++++++++++++++++++- util/cgroup.h | 4 ++++ 7 files changed, 80 insertions(+), 4 deletions(-) Thanks Gui

1 0