- Devel - libvirt List Archives

[libvirt] [PATCH] tests: add a comment about our fake qmp
by Eric Blake 01 Feb '13

01 Feb '13

While testing QMP, I used a simple qemu session of 'qemu-kvm -M none -nodefaults -nographic -qmp stdio' for some experiments. But it took me far too long to remember the magic invocation to unlock QMP into accepting normal commands. While I was able to grep libvirt sources and easily find where libvirt expects the normal "QMP" greeting, I could not find the proper reply to that greeting nearby. Reading the testsuite didn't help either, since there we don't emulate the mandatory handshake. But since my grep hit the testsuite, adding a bit of documentation will make it much easier to jog my memory in the future. * tests/qemumonitortestutils.c (QEMU_JSON_GREETING): Mention that the normal counterpart reply is skipped. --- tests/qemumonitortestutils.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index d1b2ab5..7b90c38 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2012 Red Hat, Inc. + * Copyright (C) 2011-2013 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -439,6 +439,8 @@ static qemuMonitorCallbacks qemuCallbacks = { }; #define QEMU_JSON_GREETING "{\"QMP\": {\"version\": {\"qemu\": {\"micro\": 1, \"minor\": 0, \"major\": 1}, \"package\": \" (qemu-kvm-1.0.1)\"}, \"capabilities\": []}}" +/* We skip the normal handshake reply of "{\"execute\":\"qmp_capabilities\"}" */ + #define QEMU_TEXT_GREETING "QEMU 1.0,1 monitor - type 'help' for more information" qemuMonitorTestPtr qemuMonitorTestNew(bool json, virCapsPtr caps) -- 1.8.1

2 2

[libvirt] [PATCH] spec: Avoid using makeinstall relic
by Jiri Denemark 31 Jan '13

31 Jan '13

The macro was made to help installing broken packages that did not use DESTDIR correctly by overriding individual path variables (prefix, sysconfdir, ...). Newer rpm provides fixed make_install macro that calls make install with just the correct DESTDIR, however it is not available everywhere (e.g., RHEL 5 does not have it). On the other hand the make_install macro is simple and straightforward enough for us to use its expansion directly. --- libvirt.spec.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 87253c6..8df908d 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1336,7 +1336,11 @@ gzip -9 ChangeLog %install rm -fr %{buildroot} -%makeinstall SYSTEMD_UNIT_DIR=%{buildroot}%{_unitdir} +# Avoid using makeinstall macro as it changes prefixes rather than setting +# DESTDIR. Newer make_install macro would be better but it's not available +# on RHEL 5, thus we need to expand it here. +make install DESTDIR=%{?buildroot} SYSTEMD_UNIT_DIR=%{_unitdir} + for i in domain-events/events-c dominfo domsuspend hellolibvirt openauth python xml/nwfilter systemtap do (cd examples/$i ; make clean ; rm -rf .deps .libs Makefile Makefile.in) -- 1.8.1.2

2 2

[libvirt] [Libvirt][Sheepdog]How to test network disk support for sheepdog in Libvirt
by harryxiyou 31 Jan '13

31 Jan '13

Hi all, Morita added network disk support for Libvirt, which supported nbd, rbd, sheepdog, and other protocols. Now, i wanna test network disk support for sheepdog solely. I have following questions. Could anyone please give me some suggestions? Thanks in advance. 1, Before this test, whether should i build the environment of sheepdog or other projects (QEMU)? 2, How could i test network disk support of sheepdog in Libvirt? Which steps should i do for it? 3, Network disk support can support online storage management, right? -- Thanks Harry Wei

1 0

[libvirt] [libvirt-php PATCH 0/1] docs/distros.html.in: fix html validity
by stefan.kuhn＠foss-group.ch 31 Jan '13

31 Jan '13

The error is: ### distros.html.tmp:96: element table: validity error : No declaration for attribute align of element table <table align="center" width="75%"> ^ make[2]: *** [distros.html] Error 1 ### Stefan Kuhn (1): docs/distros.html.in: fix html validity error docs/distros.html.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 1.7.12.4

2 2

[libvirt] libvirt error while start vm with VGA passthrough
by mzawdx wang 31 Jan '13

31 Jan '13

http://docs.redhat.com/docs/en-US/Red_Hat_Enterprise_Linux/6/html/Virtualiz… I have followed the instructions in the RedHat reference above to the best of my ability to understand them. I add the pci multi-port serial io card through virt-manager and it was indeed entered into the virtual machine's configuration file inside the <devices> tag: <hostdev mode='subsystem' type='pci' managed='yes'> <source> <address domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </source> <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> </hostdev> However, when I try and start the virtual machine I get this error: Error starting domain: internal error Unable to reset PCI device 0000:00:03.0: no FLR, PM reset or bus reset available Traceback (most recent call last): File "/usr/share/virt-manager/virtManager/asyncjob.py", line 44, in cb_wrapper callback(asyncjob, *args, **kwargs) File "/usr/share/virt-manager/virtManager/asyncjob.py", line 65, in tmpcb callback(*args, **kwargs) File "/usr/share/virt-manager/virtManager/domain.py", line 1050, in startup self._backend.create() File "/usr/lib64/python2.6/site-packages/libvirt.py", line 511, in create if ret == -1: raise libvirtError ('virDomainCreate() failed', dom=self) libvirtError: internal error Unable to reset PCI device 0000:00:03.0: no FLR, PM reset or bus reset available The steps I followed were: 1. Check VT-D extensions available and enabled in BIOS - yes 2. Restart virtual host - yes 3. Identify device - yes <address domain='0x000' bus='0x00' slot='0x03' function='0x0'/> 4. Add device to virtual machine configuration - yes . . . <hostdev mode='subsystem' type='pci' managed='yes'> <source> <address domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </source> <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> </hostdev> <memballoon model='virtio'> <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> </memballoon> </devices> </domain> 5. Start virtual machine - fails Am I making any obvious errors?

2 1

[libvirt] [libvirt-php PATCH 0/2] *** Add libvirt_domain_migrate_to_uri2() for virDomainMigrateToURI2() ***
by stefan.kuhn＠foss-group.ch 31 Jan '13

31 Jan '13

*** Please add new function libvirt_domain_migrate_to_uri2 for libirts virDomainMigrateToURI2(). *** Stefan Kuhn (2): Implement libvirt_domain_migrate_to_uri2 for virDomainMigrateToURI2 Document new funct. libvirt_domain_migrate_to_uri2 .../functions/libvirt-domain-get-job-info.xml | 1 + .../functions/libvirt-domain-migrate-to-uri.xml | 5 +- .../functions/libvirt-domain-migrate-to-uri2.xml | 134 +++++++++++++++++++++ .../libvirt/functions/libvirt-domain-migrate.xml | 3 +- doc/source/libvirt/versions.xml | 1 + src/libvirt-php.c | 53 ++++++++ src/libvirt-php.h | 1 + 7 files changed, 195 insertions(+), 3 deletions(-) create mode 100644 doc/source/libvirt/functions/libvirt-domain-migrate-to-uri2.xml -- 1.7.12.4

3 5

[libvirt] [PATCH] apibuild.py: fix TypeError raised in except clause
by Claudio Bley 31 Jan '13

31 Jan '13

When an exception happened inside the try clause in serialize_function, a new exception was raised in the except clause subsequently: Traceback (most recent call last): File "./apibuild.py", line 2529, in <module> rebuild("libvirt") File "./apibuild.py", line 2513, in rebuild builder.serialize() File "./apibuild.py", line 2467, in serialize self.serialize_function(output, function) File "./apibuild.py", line 2208, in serialize_function self.warning("Failed to save function %s info: " % name, `id.info`) TypeError: warning() takes exactly 2 arguments (3 given) Use the correct number of arguments for self.warning and print the original exception to stderr. Signed-off-by: Claudio Bley <cbley(a)av-test.de> --- docs/apibuild.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/apibuild.py b/docs/apibuild.py index 91dabf8..2d72936 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -2198,7 +2198,8 @@ class docBuilder: output.write(" <arg name='%s' type='%s' info='%s'/>\n" % (param[1], param[0], escape(param[2]))) self.indexString(name, param[2]) except: - self.warning("Failed to save function %s info: " % name, `id.info`) + print >>sys.stderr, "Exception:", sys.exc_info()[1] + self.warning("Failed to save function %s info: %s" % (name, `id.info`)) output.write(" </%s>\n" % (id.type)) def serialize_exports(self, output, file): -- 1.7.9.5

2 2

[libvirt] [PATCH v2 0/7] documentation improvements
by Claudio Bley 31 Jan '13

31 Jan '13

Hi. Version 2 of this series incorporates the following changes: - patch #1 fail if documentation is missing - reword subject line of patch #3 as suggessted by Eric Incidently, patch #1 truthfully makes the build fail because of missing documentation. Go figure :) I'll submit a single patch with a fix shortly. Claudio Bley (7): docs: abort when missing return or argument documention docs: only generate function argument info for args with a description docs: use div, not table, for notices on opaque types docs: process code blocks similar to markdown docs: add class "description" to div's containing descriptions docs: define style of code blocks inside descriptions docs: syntax highlight code blocks using SHJS docs/apibuild.py | 15 +++- docs/libvirt.css | 8 ++ docs/newapi.xsl | 209 +++++++++++++++++++++++++++++-------------------- docs/page.xsl | 5 +- docs/sh_c.min.js | 1 + docs/sh_emacs.min.css | 1 + docs/sh_main.min.js | 4 + 7 files changed, 157 insertions(+), 86 deletions(-) create mode 100644 docs/sh_c.min.js create mode 100644 docs/sh_emacs.min.css create mode 100644 docs/sh_main.min.js -- 1.7.9.5

2 12

[libvirt] [PATCH] Enforce return check on virAsprintf() calls
by John Ferlan 31 Jan '13

31 Jan '13

Way back when I started making changes for Coverity messages my first set were to a bunch of CHECKED_RETURN errors. In particular virAsprintf() had a few callers that Coverity noted didn't check their return (although some did check if the buffer being printed to was NULL or not). It was suggested at the time as a further patch an ATTRIBUTE_RETURN_CHECK should be added to virAsprintf(), see: https://www.redhat.com/archives/libvir-list/2013-January/msg00120.html This patch does that and fixes two more instances not found by Coverity that failed the check. --- src/util/virutil.h | 3 ++- src/xen/xend_internal.c | 6 ++---- tests/networkxml2conftest.c | 5 +++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/util/virutil.h b/src/util/virutil.h index 5a08c81..c386d24 100644 --- a/src/util/virutil.h +++ b/src/util/virutil.h @@ -200,7 +200,8 @@ int virParseNumber(const char **str); int virParseVersionString(const char *str, unsigned long *version, bool allowMissing); int virAsprintf(char **strp, const char *fmt, ...) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_FMT_PRINTF(2, 3); + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_FMT_PRINTF(2, 3) + ATTRIBUTE_RETURN_CHECK; int virVasprintf(char **strp, const char *fmt, va_list list) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_FMT_PRINTF(2, 0); char *virStrncpy(char *dest, const char *src, size_t n, size_t destbytes) diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index b03b7bc..3036cbb 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -2738,10 +2738,8 @@ xenDaemonAttachDeviceFlags(virDomainPtr domain, const char *xml, virDevicePCIAddress PCIAddr; PCIAddr = dev->data.hostdev->source.subsys.u.pci; - virAsprintf(&target, "PCI device: %.4x:%.2x:%.2x", PCIAddr.domain, - PCIAddr.bus, PCIAddr.slot); - - if (target == NULL) { + if (virAsprintf(&target, "PCI device: %.4x:%.2x:%.2x", + PCIAddr.domain, PCIAddr.bus, PCIAddr.slot) < 0) { virReportOOMError(); goto cleanup; } diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c index 3979540..fd24f74 100644 --- a/tests/networkxml2conftest.c +++ b/tests/networkxml2conftest.c @@ -102,8 +102,9 @@ testDnsmasqLeaseFileName(const char *netname) { char *leasefile; - virAsprintf(&leasefile, "/var/lib/libvirt/dnsmasq/%s.leases", - netname); + if (virAsprintf(&leasefile, "/var/lib/libvirt/dnsmasq/%s.leases", + netname) < 0) + return NULL; return leasefile; } -- 1.7.11.7

2 1

[libvirt] Libvirt support for windows
by varun bhatnagar 31 Jan '13

31 Jan '13

Hi, I want to use libvirt for windows but when i try to launch virsh it gives an error message saying "*error: invalid argument in transport methods unix, ssh and ext are not supported under Windows"* The version which I downloaded is libvirt-0.8.8.exe. I want to connect to two virtualization techniques --- *Virtualbox* and *VMWare* If libvirt is not supported on windows then is there any other tool or API which supports multiple virtualization technology? Thanks in advance..!!!!

1 0

[libvirt] [PATCH V1 0/4] [RFC] Add support for QEMU file descriptor sets (part 1)
by Stefan Berger 31 Jan '13

31 Jan '13

The following patch series adds initial support for QEMU file descriptor sets implementing support for creating the proper command line. What's missing is currently the monitor support removing the sets once QEMU has started. So these patches are posted for RFC purposes... Regards, Stefan

3 12

[libvirt] [PATCH] tests: Don't build securityselinuxlabeltest without qemu
by Jiri Denemark 31 Jan '13

31 Jan '13

Sources for securityselinuxlabeltest are only defined if qemu driver is enabled so we should not try to build the test if qemu driver is disabled. --- tests/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/Makefile.am b/tests/Makefile.am index 9da0b4a..0194db2 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -108,10 +108,12 @@ endif if WITH_SECDRIVER_SELINUX test_programs += securityselinuxtest +if WITH_QEMU if WITH_ATTR test_programs += securityselinuxlabeltest endif endif +endif if WITH_DRIVER_MODULES test_programs += virdrivermoduletest -- 1.8.1.2

2 1

[libvirt] [PATCH] util: Fix mask for 172.16.0.0 private address range
by Jiri Denemark 31 Jan '13

31 Jan '13

https://bugzilla.redhat.com/show_bug.cgi?id=905708 Only the first 12 bits should be set in the mask for this range. All addresses between 172.16.0.0 and 172.31.255.255 are private. --- src/util/virsocketaddr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c index 7bc43a9..3dfa3fb 100644 --- a/src/util/virsocketaddr.c +++ b/src/util/virsocketaddr.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2012 Red Hat, Inc. + * Copyright (C) 2009-2013 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -199,7 +199,7 @@ virSocketAddrEqual(const virSocketAddrPtr s1, const virSocketAddrPtr s2) * * Return true if this address is in its family's defined * "private/local" address space. For IPv4, private addresses are in - * the range of 192.168.0.0/16, 172.16.0.0/16, or 10.0.0.0/8. For + * the range of 192.168.0.0/16, 172.16.0.0/12, or 10.0.0.0/8. For * IPv6, local addresses are in the range of FC00::/7 or FEC0::/10 * (that last one is deprecated, but still in use). * @@ -215,7 +215,7 @@ virSocketAddrIsPrivate(const virSocketAddrPtr addr) val = ntohl(addr->data.inet4.sin_addr.s_addr); return ((val & 0xFFFF0000) == ((192L << 24) + (168 << 16)) || - (val & 0xFFFF0000) == ((172L << 24) + (16 << 16)) || + (val & 0xFFF00000) == ((172L << 24) + (16 << 16)) || (val & 0xFF000000) == ((10L << 24))); case AF_INET6: -- 1.8.1.2

2 2

[libvirt] [PATCH 0/2] documentation fixes for virConnectClose and virConnectDomainEventBlockJobCallback
by Claudio Bley 30 Jan '13

30 Jan '13

Hi. This series fixes some documentation glitches that broke the build when rejecting missing documentation in apibuild.py. See https://www.redhat.com/archives/libvir-list/2013-January/msg02020.html Claudio Bley (2): libvirt.h.in: add missing documentation for virConnectCloseFunc libvirt.h.in: fix documentation for virConnectDomainEventBlockJobCallback include/libvirt/libvirt.h.in | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) -- 1.7.9.5

1 4

[libvirt] vCPU hotplug roadmap (was: Minutes for KVM call 2013-01-15)
by Andreas Färber 30 Jan '13

30 Jan '13

Am 15.01.2013 17:16, schrieb Juan Quintela: > > * cpu hot plug > - use qdev propierties conected to a set of socket objects (anthony) > - cpusets are the wrong interface (anthony) > - make a link between cpu <-> socket instead of a propierty? > - how far are we from being able to describe a cpu with -device? > (didn't heare the answer, andreas?) > - perhaps the best approach? > - After soft-freeze, exceptions depend on the maintainer > - After hard-freeze, no exceptions > -device don't require a bus, just an implementation detail, we can change that > - use cpuset as an intermediate step until full vision is implemented > - several approaches from where we are now, to have something before > we get a full solution > > > At this point, Andreas agreed to write a better summary of the > discussion and suggestions O:-) Got buried, here we go: == vCPU hot-plug user interfaces == === cpu_set === Previously available in qemu-kvm.git: `cpu_set <n+1> online` via HMP Pros: * Hides QOM/qdev implementation details (afaerber) * Thus: Doesn't depend on QOM CPUState refactoring (imammedo) * Opens a fast route to implementing vCPU unplug in KVM (imammedo) * Unintrusive to add and easy to obsolete/remove in future (imammedo) * Existing virt-test cases (afaerber) * Supported by libvirt (imammedo) * Prevents confusing guests by hot-plugging random mix of CPUs (agraf) Cons: * Cannot express topologies (ehabkost) === device_add === `device_add driver=Haswell-x86_64-cpu id=qdevid` [You can try this today and see it failing / not working.] Pros: * QMP/HMP command available today and known to users (afaerber) * Unified command for device and CPU hot-plug (imammedo) * Would allow first doing thread-level vCPU hotplug (imammedo) * Could be extended to support socket-level hot-plug (aliguori/imammedo) Cons: * Operates on raw QOM type name unlike -cpu (afaerber) * Needs support in libvirt for device_add driver=<CPU> (imammedo) * libvirt needs means to enumerate CPU types (imammedo) => QMP? (AF) Challenges: * No CPU qbus (afaerber) => "should work" without (aliguori) * CPU subclasses needed for identifying type name (afaerber/imammedo) => "Haswell-x86_64-cpu" does not exist yet, just "x86_64-cpu" * CPU class_init for -cpu host requires KVM init (imammedo) [suggestion by ehabkost to use kvm_arch_vcpu_init, WIP by afaerber] * Conversion of CPU features to static properties needed (imammedo) => device_add driver=foo,level=x,xlevel=y,... * Alternatively conversion to global properties (imammedo) * Cements type names - rename for 1.4? (afaerber) => permissable (alig.) [patches for arm, m68k, openrisc, unicore32 on list] === qom-set === `qom-set` via QMP w/ link<CPUSocket> property (aliguori) Topology represented in QOM: CPUSocket has-a CPUCore has-a CPUThread a.k.a. CPUState, or CPUSocket links-to CPUCore links-to CPUThread a.k.a. CPUState Challenges (afaerber): * No CPUSocket/CPUCore objects yet and may take a while to get there... topology fields being moved to CPUState for 1.4 [done, more WIP] * No decisions on canonical paths for CPUs: CPU? machine? unassigned? * Duality of thread-level device types and socket-level? (afaerber) => fine to have, e.g., quad-core Xeon 500 device (aliguori) * CPUState is no_user (afaerber) => need to generally drop no_user for QOM (aliguori) === libvirt === libvirt's XML topology modelling is closer to today's -smp than to the desired QOM modelling: http://www.libvirt.org/formatcaps.html `virsh setvcpus <domain> <n>` http://libvirt.org/sources/virshcmdref/html/sect-setvcpus.html == qom-cpu course of action (afaerber) == It was requested to have vCPU hot-plug in v1.5. For device_add we need to move code from cpu_init() into QOM facilities. => QOM realize support would help [applied by aliguori] => cleanups piggy-backed onto CPU realizefn [applied to qom-cpu-next] Agreement on goal of X86CPU subclasses, but conflicts how to get there: * Refactor x86_def_t to X86CPUInfo for X86CPUClass class_init? (AF 2012) * Refactor x86_def_t to X86CPU instance_init as done for arm? * Refactor x86_def_t to class_inits? (afaerber) -> heavy merge conflicts due to bug fixes / cleanups Pro: We can get things into a consistent QOM'ish state across targets. Con: We will refactor again on top for machine-compat properties. * Keep x86_def_t within X86CPUClass as done for ppc? (WIP: afaerber) => smallest common denominator, separates x86 from cross-target work APIC ID topology fixes are being reviewed for 1.4. [merged] X86CPU wave 4 cleanups by Igor are being reviewed for 1.4. [merged] Rename CPU types according to unified <name>-<arch>-cpu scheme for 1.4? (aliguori: permissable) [patches on list] VMState series by Juan being rebased - subset for 1.4, rest for 1.5. [1.4 part on list, WIP for 1.5] Remainder is considered 1.5 material, qom-cpu-next avail. during Freeze. == Common issues (imammedo) == - back-port CPU hot-plug ACPI notification - hot-plug is not allowed on SysBus: - APIC that is created by CPU on hot-plug is a SysBus device, so essentially APIC is hot-plugged to SysBus anyway which causes abort in qdev_try_create() -> qdev_set_parent_bus(SysBus) -> bus_add_child() [no hot-plug on SysBus], which is hard to fix without allowing hot-plug on SysBus. [AF: change the APIC to not be a SysBusDevice (like CPUState) then?] - qdev_device_add() and qdev_try_create() assign SysBus by default to device if no explicit bus was provided. - qbus_find_recursive() in qdev_device_add() always returns SysBus if last 2 args are NULL, which is case with busless CPU - qdev_try_create() adds device SysBus if no bus was provided in 1st arg - vapic is not working with hot-plug in current master (do not know why yet) Experimental CPU hot-add tree using device_add implemented only for qemu64 CPU: https://github.com/imammedo/qemu/tree/x86-cpu-hot-add.WIP --- That completes Igor's and my notes, amended by status updates of mine. Sorry for the delay, I did try to address some of the discussed issues in form of patches in the meantime though. ;) CC'ing s390x, ppc and arm KVM folks that were not on the call for feedback on their requirements and thoughts. Regards, Andreas -- SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

3 3

[libvirt] [PATCH] snapshot: Mention disk-only snapshots in error message
by Peter Krempa 30 Jan '13

30 Jan '13

When a disk-only snapshot is requested the domain is treated as if it was offline. This forbids to mix memory checkpoints with the DISK_ONLY flag. This patch improves the error message and mentions the restriction in the virsh man page. --- Note: this is techicaly a v2 as I've redone it after checking the code again after Eric's review. Difference to the previous version: - The check for --memspec and --disk-only together was removed from virsh - Error message while parsing the xml was improved src/conf/snapshot_conf.c | 3 ++- tools/virsh.pod | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index 0c5b005..fe77bd0 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -309,7 +309,8 @@ virDomainSnapshotDefParseString(const char *xmlStr, if (offline && def->memory && def->memory != VIR_DOMAIN_SNAPSHOT_LOCATION_NONE) { virReportError(VIR_ERR_XML_ERROR, "%s", - _("memory state cannot be saved with offline snapshot")); + _("memory state cannot be saved with offline or " + "disk-only snapshot")); goto cleanup; } def->file = memoryFile; diff --git a/tools/virsh.pod b/tools/virsh.pod index fd0f762..ec1772d 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2749,7 +2749,8 @@ The I<--memspec> option can be used to control whether a checkpoint is internal or external. The I<--memspec> flag is mandatory, followed by a B<memspec> of the form B<[file=]name[,snapshot=type]>, where type can be B<none>, B<internal>, or B<external>. To include a literal -comma in B<file=name>, escape it with a second comma. +comma in B<file=name>, escape it with a second comma. I<--memspec> cannot +be used together with I<--disk-only>. The I<--diskspec> option can be used to control how I<--disk-only> and external checkpoints create external files. This option can occur -- 1.8.1.1

2 2

[libvirt] [PATCH] Sync HACKING and hacking.html.in
by Martin Kletzander 30 Jan '13

30 Jan '13

After one last-minute change, only HACKING was updated and not hacking.html.in, so this patch synchronizes that. --- Pushed under the 'trivial' rule. --- docs/hacking.html.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/hacking.html.in b/docs/hacking.html.in index 78620fc..fe4324a 100644 --- a/docs/hacking.html.in +++ b/docs/hacking.html.in @@ -241,7 +241,7 @@ The keywords <code>if</code>, <code>for</code>, <code>while</code>, and <code>switch</code> must have a single space following them - before the opening bracket. e.g. + before the opening bracket. E.g. <pre> if(foo) // Bad @@ -250,7 +250,7 @@ Function implementations must not have any whitespace - between the function name and the opening bracket. e.g. + between the function name and the opening bracket. E.g. <pre> int foo (int wizz) // Bad @@ -259,7 +259,7 @@ Function calls must not have any whitespace - between the function name and the opening bracket. e.g. + between the function name and the opening bracket. E.g. <pre> bar = foo (wizz); // Bad @@ -269,7 +269,7 @@ Function typedefs must not have any whitespace between the closing bracket of the function name and opening - bracket of the arg list. e.g. + bracket of the arg list. E.g. <pre> typedef int (*foo) (int wizz); // Bad @@ -278,7 +278,7 @@ There must not be any whitespace immediately following any - opening bracket, or immediately prior to any closing bracket. e.g. + opening bracket, or immediately prior to any closing bracket. E.g. <pre> int foo( int wizz ); // Bad -- 1.8.1.2

1 0

[libvirt] [PATCH v2 0/3] Miscellaneous cleanups
by Martin Kletzander 30 Jan '13

30 Jan '13

This is basically v2 of long lost [1] with fixes for what Osier found out and with one one-liner patch added. [1] http://www.redhat.com/archives/libvir-list/2012-December/msg01043.html Martin Kletzander (3): conf: Don't format cputune element when not needed docs: aesthetical cleanups Ignore '.trs' files .gitignore | 1 + HACKING | 10 +++++----- docs/firewall.html.in | 2 +- docs/formatdomain.html.in | 4 ++-- docs/hacking.html.in | 10 +++++----- src/conf/domain_conf.c | 12 ++++++------ src/locking/lock_driver.h | 6 +++--- 7 files changed, 23 insertions(+), 22 deletions(-) -- 1.8.1.2

2 5

[libvirt] [PATCH] docs: fix missed documentation for virterror functions
by Claudio Bley 30 Jan '13

30 Jan '13

Commit f24404a3244b50c1d6d3a735445b02450ac40981 renamed virterror.c to virerror.c but forgot to change the reference in this file. Signed-off-by: Claudio Bley <cbley(a)av-test.de> --- docs/apibuild.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/apibuild.py b/docs/apibuild.py index 9a29c42..91dabf8 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -24,7 +24,7 @@ included_files = { "libvirt.h": "header with general libvirt API definitions", "virterror.h": "header with error specific API definitions", "libvirt.c": "Main interfaces for the libvirt library", - "virterror.c": "implements error handling and reporting code for libvirt", + "virerror.c": "implements error handling and reporting code for libvirt", "virevent.c": "event loop for monitoring file handles", "virtypedparam.c": "virTypedParameters APIs", } -- 1.7.9.5

2 2

[libvirt] [PATCH v2] LXC: create directory /dev/shm automatically
by Gao feng 30 Jan '13

30 Jan '13

Now we mount /dev as tmpfs and haven't created directory /dev/shm,so the glibc api such as shm_open/sem_open will create files under dir /dev.(since /dev is mounted as tmpfs) Through these api still useable in container,but this cause directory /dev looks a little chaos. We already have filesystem type "ram",if user want to limit the memory usage of /dev/shm,he should configure the XML,so we only need to create directroy /dev/shm.If user configure the filesystem type on /dev/shm, we will mount it on /dev/shm then. This patch create directory /dev/shm automatically,the files created by shm_open/sem_open will stay in this directroy. This patch also enlarge the size of directroy /dev to the half of container's memory,64k may be too small to contain POSIX shared memory and named semphore. Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 497539c..eba3e68 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -504,7 +504,8 @@ err: static int lxcContainerMountBasicFS(bool pivotRoot, - char *sec_mount_options) + char *sec_mount_options, + virDomainDefPtr vmDef) { const struct { const char *src; @@ -567,12 +568,22 @@ static int lxcContainerMountBasicFS(bool pivotRoot, if (pivotRoot) { /* - * tmpfs is limited to 64kb, since we only have device nodes in there - * and don't want to DOS the entire OS RAM usage + * tmpfs is limited to half of container's memory, + * since we not only have device nodes in there,we + * may have POSIX shared memory object and named + * semphore in there too. */ - ignore_value(virAsprintf(&opts, - "mode=755,size=65536%s", sec_mount_options)); + if (vmDef->mem.max_balloon != VIR_DOMAIN_MEMORY_PARAM_UNLIMITED) { + unsigned long long size = 0; + size = vmDef->mem.max_balloon << 9; + ignore_value(virAsprintf(&opts, + "mode=755,size=%llu%s", size, sec_mount_options)); + } else { + ignore_value(virAsprintf(&opts, + "mode=755,%s", sec_mount_options)); + } + if (!opts) { virReportOOMError(); goto cleanup; @@ -586,6 +597,13 @@ static int lxcContainerMountBasicFS(bool pivotRoot, "devfs", "/dev", "tmpfs", opts); goto cleanup; } + + VIR_DEBUG("create directory /dev/shm for POSIX shared memory and named semphore"); + if (virFileMakePath("/dev/shm") < 0) { + virReportSystemError(errno, "%s", + _("Failed to mkdir /dev/shm")); + goto cleanup; + } } rc = 0; @@ -1947,7 +1965,7 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef, goto cleanup; /* Mounts the core /proc, /sys, etc filesystems */ - if (lxcContainerMountBasicFS(true, sec_mount_options) < 0) + if (lxcContainerMountBasicFS(true, sec_mount_options, vmDef) < 0) goto cleanup; /* Mounts /proc/meminfo etc sysinfo */ @@ -2055,7 +2073,7 @@ static int lxcContainerSetupExtraMounts(virDomainDefPtr vmDef, goto cleanup; /* Mounts the core /proc, /sys, etc filesystems */ - if (lxcContainerMountBasicFS(false, sec_mount_options) < 0) + if (lxcContainerMountBasicFS(false, sec_mount_options, vmDef) < 0) goto cleanup; /* Mounts /proc/meminfo etc sysinfo */ -- 1.7.11.7

1 0

[libvirt] [PATCH 0/9] Address Coverity false positives
by John Ferlan 30 Jan '13

30 Jan '13

As the Coverity work winds down, I've bundled together a series of patches that only add a comment tag to the offending line of code that Coverity believes the error to be on. Each submit has a commit message indicating the reason for the tag. John Ferlan (9): xend: Address some Coverity false positives lxc: Add coverity[dead_error_begin] tag in switch stmts nodeinfo: Add coverity[dead_error_begin] and [returned_null] tags xen: Add coverity[ptr_arith] and [sign_extension] tags rpc: Add coverity[dead_error_begin] tag qemu: Add coverity[negative_returns] tag remote: Avoid coverity[leaked_storage] message. network: Add coverity[leaked_handle] to ignore error storage: Add coverity[dead_error_condition] to avoid error src/lxc/lxc_driver.c | 3 +++ src/network/bridge_driver.c | 1 + src/nodeinfo.c | 3 +++ src/qemu/qemu_hotplug.c | 1 + src/remote/remote_driver.c | 1 + src/rpc/virnetclient.c | 1 + src/storage/parthelper.c | 2 ++ src/xen/xen_hypervisor.c | 5 ++++- src/xen/xend_internal.c | 4 ++++ 9 files changed, 20 insertions(+), 1 deletion(-) -- 1.7.11.7

3 22

[libvirt] Add support for QEMU file descriptor sets
by Stefan Berger 30 Jan '13

30 Jan '13

Add two API calls to virCommand for generating the parameters necessary for passing to the QEMU -add-fd option, for example "set=10,fd=20", and the file descriptor set for the path= option, such as for example "/dev/fdset/10" Regards, Stefan --- src/libvirt_private.syms | 2 + src/util/vircommand.c | 65 +++++++++++++++++++++++++++++++++++++++++++---- src/util/vircommand.h | 6 ++++ 3 files changed, 68 insertions(+), 5 deletions(-) Index: libvirt/src/libvirt_private.syms =================================================================== --- libvirt.orig/src/libvirt_private.syms +++ libvirt/src/libvirt_private.syms @@ -165,6 +165,8 @@ virCommandSetPreExecHook; virCommandSetWorkingDirectory; virCommandToString; virCommandTransferFD; +virCommandTransferFDGetDevSet; +virCommandTransferFDGetFDSet; virCommandWait; virCommandWriteArgLog; virFork; Index: libvirt/src/util/vircommand.c =================================================================== --- libvirt.orig/src/util/vircommand.c +++ libvirt/src/util/vircommand.c @@ -109,7 +109,7 @@ struct _virCommand { * Returns true if @set contains @fd, * false otherwise. */ -static bool +static int virCommandFDIsSet(int fd, const int *set, int set_size) @@ -118,9 +118,9 @@ virCommandFDIsSet(int fd, while (i < set_size) if (set[i++] == fd) - return true; + return i--; - return false; + return -1; } /* @@ -145,7 +145,7 @@ virCommandFDSet(int fd, if (fd < 0 || !set || !set_size) return -1; - if (virCommandFDIsSet(fd, *set, *set_size)) + if (virCommandFDIsSet(fd, *set, *set_size) >= 0) return 0; if (VIR_REALLOC_N(*set, *set_size + 1) < 0) { @@ -523,7 +523,7 @@ virExecWithHook(const char *const*argv, for (i = 3; i < openmax; i++) { if (i == infd || i == childout || i == childerr) continue; - if (!keepfd || !virCommandFDIsSet(i, keepfd, keepfd_size)) { + if (!keepfd || virCommandFDIsSet(i, keepfd, keepfd_size) < 0) { tmpfd = i; VIR_MASS_CLOSE(tmpfd); } else if (virSetInherit(i, true) < 0) { @@ -896,6 +896,61 @@ virCommandTransferFD(virCommandPtr cmd, VIR_FORCE_CLOSE(fd); } +/** + * virCommandTransferFDGetFDSet: + * @cmd: the command to modify + * @fd: fd to reassign to the child + * + * Get the parameters for the the QEMU -add-fd command line option + * for the given file descriptor. The file descriptor must previously + * have been 'transferred' in a virCommandTransfer() call. + * This function for example returns "set=10,fd=20" for file descriptor 20. + */ +char * +virCommandTransferFDGetFDSet(virCommandPtr cmd, int fd) +{ + char *result = NULL; + int idx = virCommandFDIsSet(fd, cmd->transfer, cmd->transfer_size); + + if (idx >= 0) { + if (virAsprintf(&result, "set=%d,fd=%d", idx, fd) < 0) { + virReportOOMError(); + } + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("file descriptor %d has not been transferred"), fd); + } + + return result; +} + +/** + * virCommandTransferFDGetDevSet: + * @cmd: the command to modify + * @fd: fd to reassign to the child + * + * Get the parameters for the the QEMU path= parameter where a file + * descriptor is accessed via a file descriptor set, for example + * /dev/fdset/10. The file descriptor must previously have been + * 'transferred' in a virCommandTransfer() call. + */ +char * +virCommandTransferFDGetDevSet(virCommandPtr cmd, int fd) +{ + char *result = NULL; + int idx = virCommandFDIsSet(fd, cmd->transfer, cmd->transfer_size); + + if (idx >= 0) { + if (virAsprintf(&result, "/dev/fdset/%d", idx) < 0) { + virReportOOMError(); + } + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("file descriptor %d has not been transferred"), fd); + } + return result; +} + /** * virCommandSetPidFile: Index: libvirt/src/util/vircommand.h =================================================================== --- libvirt.orig/src/util/vircommand.h +++ libvirt/src/util/vircommand.h @@ -58,6 +58,12 @@ void virCommandPreserveFD(virCommandPtr void virCommandTransferFD(virCommandPtr cmd, int fd); +char *virCommandTransferFDGetFDSet(virCommandPtr cmd, + int fd); + +char *virCommandTransferFDGetDevSet(virCommandPtr cmd, + int fd); + void virCommandSetPidFile(virCommandPtr cmd, const char *pidfile) ATTRIBUTE_NONNULL(2);

3 8

[libvirt] [PATCH v2 0/7] Introduce virCommandDoAsyncIO
by Michal Privoznik 29 Jan '13

29 Jan '13

Currently, if we want to use IO with asynchronous command we have to copy code from virFileWrapperFd to misuse our event loop for reading and writing to the command. However, we can extend our virCommand implementation to automatically set things up. All patches but the first has been ACKed already. diff to v1: -drop usleep(100) while waiting for the event loop to process our string IOs and do it ourselves instead. Michal Privoznik (7): virCommand: Introduce virCommandDoAsyncIO Introduce event loop to commandtest tests: Create test for virCommandDoAsyncIO virFileWrapperFd: Switch to new virCommandDoAsyncIO qemu: Catch stderr of image decompression binary qemu: Catch stderr of image compression binary qemu: Destroy domain on decompression binary error src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 9 +- src/qemu/qemu_migration.c | 9 +- src/util/vircommand.c | 279 ++++++++++++++++++++++++++++++++++++++++++-- src/util/vircommand.h | 1 + src/util/virfile.c | 82 +------------ tests/commanddata/test3.log | 2 +- tests/commandtest.c | 136 +++++++++++++++++++++ 8 files changed, 430 insertions(+), 89 deletions(-) -- 1.8.0.2

2 10

[libvirt] [Libvirt][QEMU][HLFS]How to test HLFS driver for Libvirt
by harryxiyou 29 Jan '13

29 Jan '13

Hi Morita and other developers, I have programed HLFS(HDFS based Log-structured FileSystem) driver for Libvirt according to Morita's patch(commit 036ad5052b43fe9f0d197e89fd16715950408e1d) for Libvirt, which my patch is not for Libvirt latest version but the version of Morita's patch time.I have called back my git tree to commit 036ad5052b43fe9f0d197e89fd16715950408e1d, then i develop this patch. My patch is now available at http://cloudxy.googlecode.com/svn/branches/hlfs/person/harry/hlfs/hlfs_driv… Therefore, i am not clear about how to test it. How could i know whether it works well for libvirt&QEMU? Could Morita (Or other developers) give me some suggestions? Thanks in advance ;-) -- Thanks Harry Wei

2 10

[libvirt] [PATCH] build: Regenerate man pages on version bump
by Jiri Denemark 29 Jan '13

29 Jan '13

Whenever libvirt version changes in configure.ac, we need to regenerate man pages so that they contain correct version info. --- daemon/Makefile.am | 2 +- tools/Makefile.am | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 72c6190..4d5c2fd 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -395,7 +395,7 @@ endif # WITH_LIBVIRTD POD2MAN = pod2man -c "Virtualization Support" \ -r "$(PACKAGE)-$(VERSION)" -s 8 -$(srcdir)/libvirtd.8.in: libvirtd.pod.in +$(srcdir)/libvirtd.8.in: libvirtd.pod.in $(top_srcdir)/configure.ac $(AM_V_GEN)$(POD2MAN) --name LIBVIRTD $< $@ \ && if grep 'POD ERROR' $@ ; then rm $@; exit 1; fi diff --git a/tools/Makefile.am b/tools/Makefile.am index 8a0429c..0010c39 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -61,7 +61,7 @@ virt-xml-validate: virt-xml-validate.in Makefile $(AM_V_GEN)sed -e 's|[@]schemadir@|$(pkgdatadir)/schemas|' < $< > $@ \ || (rm $@ && exit 1) && chmod +x $@ -virt-xml-validate.1: virt-xml-validate.in +virt-xml-validate.1: virt-xml-validate.in $(top_srcdir)/configure.ac $(AM_V_GEN)$(POD2MAN) --name VIRT-XML-VALIDATE $< $(srcdir)/$@ \ && if grep 'POD ERROR' $(srcdir)/$@ ; then \ rm $(srcdir)/$@; exit 1; fi @@ -70,12 +70,12 @@ virt-pki-validate: virt-pki-validate.in Makefile $(AM_V_GEN)sed -e 's|[@]sysconfdir@|$(sysconfdir)|' < $< > $@ \ || (rm $@ && exit 1) && chmod +x $@ -virt-pki-validate.1: virt-pki-validate.in +virt-pki-validate.1: virt-pki-validate.in $(top_srcdir)/configure.ac $(AM_V_GEN)$(POD2MAN) --name VIRT-PKI-VALIDATE $< $(srcdir)/$@ \ && if grep 'POD ERROR' $(srcdir)/$@ ; then \ rm $(srcdir)/$@; exit 1; fi -virt-host-validate.1: virt-host-validate.c +virt-host-validate.1: virt-host-validate.c $(top_srcdir)/configure.ac $(AM_V_GEN)$(POD2MAN) --name VIRT-HOST-VALIDATE $< $(srcdir)/$@ \ && if grep 'POD ERROR' $(srcdir)/$@ ; then \ rm $(srcdir)/$@; exit 1; fi @@ -85,7 +85,7 @@ virt-sanlock-cleanup: virt-sanlock-cleanup.in Makefile -e 's|[@]localstatedir@|$(localstatedir)|' < $< > $@ \ || (rm $@ && exit 1) && chmod +x $@ -virt-sanlock-cleanup.8: virt-sanlock-cleanup.in +virt-sanlock-cleanup.8: virt-sanlock-cleanup.in $(top_srcdir)/configure.ac $(AM_V_GEN)$(POD2MAN) --name VIRT-SANLOCK-CLEANUP $< $(srcdir)/$@ \ && if grep 'POD ERROR' $(srcdir)/$@ ; then \ rm $(srcdir)/$@; exit 1; fi @@ -171,7 +171,7 @@ virsh_win_icon.$(OBJEXT): virsh_win_icon.rc --output-format coff --output $@ endif -virsh.1: virsh.pod +virsh.1: virsh.pod $(top_srcdir)/configure.ac $(AM_V_GEN)$(POD2MAN) $< $(srcdir)/$@ \ && if grep 'POD ERROR' $(srcdir)/$@ ; then \ rm $(srcdir)/$@; exit 1; fi -- 1.8.1.1

2 2

[libvirt] [PATCH 0/2] conf: fix some memory leaks
by Ján Tomko 29 Jan '13

29 Jan '13

Ján Tomko (2): conf: Fix cpumask leak in virDomainDefFree conf: Fix leaks in virNetworkObjUpdateParseFile src/conf/domain_conf.c | 2 +- src/conf/network_conf.c | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) -- 1.7.8.6

3 7

[libvirt] [libvirt-sandbox][PATCH] Don't redefine _FORTIFY_SOURCE macro
by Michal Privoznik 29 Jan '13

29 Jan '13

If the _FORTIFY_SOURCE has been already defined, we unconditionally redefine it, leaving us with warning/error thrown at compilation time. --- m4/virt-compile-warnings.m4 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4 index cdcbad9..894ab59 100644 --- a/m4/virt-compile-warnings.m4 +++ b/m4/virt-compile-warnings.m4 @@ -84,8 +84,13 @@ AC_DEFUN([LIBVIRT_SANDBOX_COMPILE_WARNINGS],[ gl_WARN_ADD([-Wframe-larger-than=4096]) # Use improved glibc headers - AC_DEFINE([_FORTIFY_SOURCE], [2], - [enable compile-time and run-time bounds-checking, and some warnings]) + AH_VERBATIM([FORTIFY_SOURCE], + [/* Enable compile-time and run-time bounds-checking, and some warnings, + without upsetting newer glibc. */ + #if !defined _FORTIFY_SOURCE && defined __OPTIMIZE__ && __OPTIMIZE__ + # define _FORTIFY_SOURCE 2 + #endif + ]) # Extra special flags dnl -fstack-protector stuff passes gl_WARN_ADD with gcc -- 1.8.0.2

2 2

[libvirt] [PATCH] LXC: create directory /dev/shm automatically
by Gao feng 29 Jan '13

29 Jan '13

Now we mount /dev as tmpfs and haven't created directory /dev/shm,so the glibc api such as shm_open/sem_open will create files under dir /dev.(since /dev is mounted as tmpfs) Through these api still useable in container,but this cause directory /dev looks a little chaos. This patch create directory /dev/shm automatically,the files created by shm_open/sem_open will stay in this directroy. Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 497539c..5150564 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -586,6 +586,13 @@ static int lxcContainerMountBasicFS(bool pivotRoot, "devfs", "/dev", "tmpfs", opts); goto cleanup; } + + VIR_DEBUG("create directory /dev/shm for POSIX shared memory and named semphore"); + if (virFileMakePath("/dev/shm") < 0) { + virReportSystemError(errno, "%s", + _("Failed to mkdir /dev/shm")); + goto cleanup; + } } rc = 0; -- 1.7.11.7

3 8

[libvirt] Candidate Release 2 of libvirt-1.0.2
by Daniel Veillard 29 Jan '13

29 Jan '13

I have just tagged the rc2 in git and pushed the associated tarball and rpms for F17 to the FTP area: ftp://libvirt.org/libvirt/ Seems to work just fine for m limited testing, but please give it a try, and let's limit commits to only bug fixes until the release. I think I will push 1.0.2 final on Wednesday morning if everything is going fine until then, thanks for any testing and feedback ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

4 3

[libvirt] [PATCH v3 0/3] add pci-bridge support
by liguang 29 Jan '13

29 Jan '13

Now, it's impossible to arrange devices into multi-pci-bus, for example: <sound model='ac97'> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </sound> <video> <model type='cirrus' vram='9216' heads='1'/> <address type='pci' domain='0x0000' bus='0x1' slot='0x02' function='0x0'/> </video> libvirt will complain about "bus != 0", fortunately, qemu supports pci-to-pci bridge, if we want to use multi-pci-bus, we can define 2 pci bridge controllers, then attach 1 to the other as a subordinate pci-bus, so, 2 pci-buses appear. for example: <controller type='pci-bridge' index='0'/> <controller type='pci-bridge' index='1'> <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> </controller> <sound model='ac97'> <address type='pci' domain='0x0000' bus='0x01' slot='0x02' function='0x0'/> </sound> <video> <model type='cirrus' vram='9216' heads='1'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> </video> src/conf/domain_conf.c | 5 ++++- src/conf/domain_conf.h | 1 + docs/schemas/domaincommon.rng | 1 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 70 ++++++++++++++++++++----- 6 files changed, 57 insertions(+), 23 deletions(-)

4 11

[libvirt] ANNOUNCE: libvirt 0.9.6.4 maintenance release
by Cole Robinson 29 Jan '13

29 Jan '13

libvirt 0.9.6.4 maintenance release is now available. This is libvirt 0.9.6 with additional bugfixes that have accumulated upstream since the initial release. This release can be downloaded at: http://libvirt.org/sources/stable_updates/libvirt-0.9.6.4.tar.gz Changes in this version: * rpc: Fix crash on error paths of message dispatching * qemu: Clear async job when p2p migration fails early For info about past maintenance releases, see: http://wiki.libvirt.org/page/Maintenance_Releases Thanks, Cole

1 0

[libvirt] ANNOUNCE: libvirt 0.9.11.9 maintenance release
by Cole Robinson 29 Jan '13

29 Jan '13

libvirt 0.9.11.9 maintenance release is now available. This is libvirt 0.9.11 with additional bugfixes that have accumulated upstream since the initial release. This release can be downloaded at: http://libvirt.org/sources/stable_updates/libvirt-0.9.11.9.tar.gz Changes in this version: * Fix race condition when destroying guests * rpc: Fix crash on error paths of message dispatching * util: fix botched check for new netlink request filters * util: add missing error log messages when failing to get netlink VFINFO * util: fix functions that retrieve SRIOV VF info * network: prevent dnsmasq from listening on localhost For info about past maintenance releases, see: http://wiki.libvirt.org/page/Maintenance_Releases Thanks, Cole

1 0

[libvirt] ANNOUNCE: libvirt 0.10.2.3 maintenance release
by Cole Robinson 29 Jan '13

29 Jan '13

libvirt 0.10.2.3 maintenance release is now available. This is libvirt 0.10.2 with additional bugfixes that have accumulated upstream since the initial release. This release can be downloaded at: http://libvirt.org/sources/stable_updates/libvirt-0.10.2.3.tar.gz Changes in this version: * selinux: Only create the selabel_handle once. * Skip bulk relabelling of resources in SELinux driver when used with LXC * selinux: Resolve resource leak using the default disk label * rpc: Fix crash on error paths of message dispatching * nwfilter: Remove unprivileged code path to set base * Fix nwfilter driver reload/shutdown handling when unprivileged * call virstateCleanup to do the cleanup before libvirtd exits * Fix race condition when destroying guests * build: move file deleting action from %files list to %install * build: libvirt-guests files misplaced in specfile * qemu: Relax hard RSS limit * util: fix botched check for new netlink request filters * util: add missing error log messages when failing to get netlink VFINFO * util: fix functions that retrieve SRIOV VF info * virsh: Fix POD syntax * build: install libvirt sysctl file correctly * build: .service files don't need to be executable * build: use common .in replacement mechanism * tools: Only install guests init script if --with-init=script=redhat * build: fix syntax-check tab violation * build: check for pod errors * daemon: Use $(AM_V_GEN) in a few more places * build: Add libxenctrl to LIBXL_LIBS * Convert libxl driver to Xen 4.2 * Introduce APIs for splitting/joining strings * network: prevent dnsmasq from listening on localhost For info about past maintenance releases, see: http://wiki.libvirt.org/page/Maintenance_Releases Thanks, Cole

1 0

[libvirt] [PATCHv2 0/7] Add additional data for the NUMA topology info
by Peter Krempa 29 Jan '13

29 Jan '13

This version fixes most of coments on v1 by DanPB and Martin. The two things that are not yet done are: 1) docs and 2) support for the xend driver I will follow up with those tomorrow after I create a testbed for xen. There are 2 new patches: 1/7: fixes bad comment for a bitmap function 7/7: adds data for the test driver Peter Krempa (7): util: Fix docs for virBitmapParse schema: Make the cpuset type reusable across schema files schemas: Add schemas for more CPU topology information in the caps XML conf: Split out NUMA topology formatting to simplify access to data capabilities: Switch CPU data in NUMA topology to a struct capabilities: Add additional data to the NUMA topology info test: Add support for thread and core information for the test driver docs/schemas/basictypes.rng | 6 +++ docs/schemas/capability.rng | 11 ++++++ docs/schemas/domaincommon.rng | 5 --- src/conf/capabilities.c | 92 ++++++++++++++++++++++++++++++------------- src/conf/capabilities.h | 14 ++++++- src/nodeinfo.c | 75 +++++++++++++++++++++++++++++------ src/qemu/qemu_process.c | 2 +- src/test/test_driver.c | 24 +++++++++-- src/util/virbitmap.c | 16 ++++---- src/xen/xend_internal.c | 25 ++++++------ 10 files changed, 201 insertions(+), 69 deletions(-) -- 1.8.1.1

4 20

[libvirt] [PATCH] auto-create pci-bridge controller info
by liguang 29 Jan '13

29 Jan '13

if some devices specify a pci bus number that haven't been defined by a pci-bridge controller then fill the required correct controller info silently. it based on previous add pci-bridge support patches, https://www.redhat.com/archives/libvir-list/2013-January/msg00577.html Signed-off-by: liguang <lig.fnst(a)cn.fujitsu.com> --- src/conf/domain_conf.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 95 insertions(+), 0 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 8ebe77d..dabd374 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11756,6 +11756,98 @@ virDomainDefMaybeAddSmartcardController(virDomainDefPtr def) } +static int +virDomainDefMaybeAddPcibridgeController(virDomainDefPtr def) +{ + int i, idx = 0; + + for (i = 0; i < def->nnets; i++) { + if (def->nets[i]->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) + continue; + idx = def->nets[i]->info.addr.pci.bus; + if (virDomainDefMaybeAddController(def, + VIR_DOMAIN_CONTROLLER_TYPE_PCIBRIDGE, + idx) < 0) + return -1; + } + + for (i = 0; i < def->nsounds; i++) { + if (def->sounds[i]->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) + continue; + idx = def->sounds[i]->info.addr.pci.bus; + if (virDomainDefMaybeAddController(def, + VIR_DOMAIN_CONTROLLER_TYPE_PCIBRIDGE, + idx) < 0) + return -1; + } + + for (i = 0; i < def->nvideos; i++) { + if (def->videos[i]->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) + continue; + idx = def->videos[i]->info.addr.pci.bus; + if (virDomainDefMaybeAddController(def, + VIR_DOMAIN_CONTROLLER_TYPE_PCIBRIDGE, + idx) < 0) + return -1; + } + + for (i = 0; i < def->ncontrollers; i++) { + if (def->controllers[i]->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) + continue; + idx = def->controllers[i]->info.addr.pci.bus; + if (virDomainDefMaybeAddController(def, + VIR_DOMAIN_CONTROLLER_TYPE_PCIBRIDGE, + idx) < 0) + return -1; + } + + for (i = 0; i < def->nfss; i++) { + if (def->fss[i]->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) + continue; + idx = def->fss[i]->info.addr.pci.bus; + if (virDomainDefMaybeAddController(def, + VIR_DOMAIN_CONTROLLER_TYPE_PCIBRIDGE, + idx) < 0) + return -1; + } + + for (i = 0; i < def->nhostdevs; i++) { + if (def->hostdevs[i]->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) + continue; + idx = def->hostdevs[i]->info->addr.pci.bus; + if (virDomainDefMaybeAddController(def, + VIR_DOMAIN_CONTROLLER_TYPE_PCIBRIDGE, + idx) < 0) + return -1; + } + + for (i = 0; i < def->ndisks; i++) { + if (def->disks[i]->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) + continue; + idx = def->disks[i]->info.addr.pci.bus; + if (virDomainDefMaybeAddController(def, + VIR_DOMAIN_CONTROLLER_TYPE_PCIBRIDGE, + idx) < 0) + return -1; + } + + if (def->watchdog->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) + idx = def->watchdog->info.addr.pci.bus; + if (virDomainDefMaybeAddController(def, + VIR_DOMAIN_CONTROLLER_TYPE_PCIBRIDGE, + idx) < 0) + return -1; + + if (def->memballoon->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) + idx = def->memballoon->info.addr.pci.bus; + if (virDomainDefMaybeAddController(def, + VIR_DOMAIN_CONTROLLER_TYPE_PCIBRIDGE, + idx) < 0) + return -1; + + return 0; +} + /* * Based on the declared <address/> info for any devices, * add necessary drive controllers which are not already present @@ -11790,6 +11882,9 @@ int virDomainDefAddImplicitControllers(virDomainDefPtr def) if (virDomainDefMaybeAddSmartcardController(def) < 0) return -1; + if (virDomainDefMaybeAddPcibridgeController(def) < 0) + return -1; + return 0; } -- 1.7.2.5

4 5

[libvirt] [Libvirt][Test]How to test storage solely in Libvirt?
by harryxiyou 28 Jan '13

28 Jan '13

Hi all, I wanna test if a storage driver (like Sheepdog) works well in Libvirt separately. How should i finish this job. Could anyone give me some suggestions? -- Thanks Harry Wei

4 7

[libvirt] [RFC PATCH 0/n] Glue domain and storage
by Osier Yang 28 Jan '13

28 Jan '13

This is the 4th part to implement NPIV migration support [1]. Part 1: https://www.redhat.com/archives/libvir-list/2013-January/msg00859.html Part 2: (Already ACKed by Michal) https://www.redhat.com/archives/libvir-list/2013-January/msg00859.html Part 3: https://www.redhat.com/archives/libvir-list/2013-January/msg01012.html This set is based on above 3 ones. The subject "Glue domain and storage" is a bit bigger than what this series does. This set only tries to support using the storage for domain disks. And the storage might be further used by disk backing chains, or future scsi-host passthrough, etc, if the pricinple is correct. However, this can setup the basis, which can be extended for future stuffs. This introduces new XMLs to specify the disk source with storage like (See PATCH 3/n for more details): <disk type='file' device='disk'> <driver name='qemu' type='raw' cache='none'/> <source type='pool'> <pool uuid|name="$var"/> <volume name|path|key='$var'/> <seclabel relabel='no'/> </source> <target dev='vdb' bus='virtio'/> </disk> And before domain starting, the source represented by storage is translated into the real underlying source. Disk of type 'network' is not supported yet. But I'd like post the patches as soon as possible to make sure I'm not on the wrong road. Osier Yang (6): eng: Remove the duplicate definition rng: Change the datatype for volume name for common use Introduce new XMLs to specify disk source using storage pool/vol New files to glue domain and storage together Implement translateDiskSourcePool qemu: Translate the source when starting domain docs/formatdomain.html.in | 31 ++- docs/schemas/basictypes.rng | 6 + docs/schemas/domaincommon.rng | 156 +++++--- docs/schemas/storagepool.rng | 10 +- docs/schemas/storagevol.rng | 8 +- src/Makefile.am | 3 +- src/conf/domain_conf.c | 426 ++++++++++++++++---- src/conf/domain_conf.h | 46 +++ src/conf/domain_storage.c | 45 ++ src/conf/domain_storage.h | 37 ++ src/libvirt_private.syms | 6 + src/qemu/qemu_driver.c | 7 + src/storage/storage_driver.c | 207 ++++++++++ .../qemuxml2argv-disk-source-pool.xml | 36 ++ tests/qemuxml2xmltest.c | 1 + 15 files changed, 865 insertions(+), 160 deletions(-) create mode 100644 src/conf/domain_storage.c create mode 100644 src/conf/domain_storage.h create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.xml [1] https://www.redhat.com/archives/libvir-list/2012-November/msg00826.html Regards, Osier

4 19

[libvirt] [Libvirt][Sheepdog]How to test Sheepdog patch
by harryxiyou 28 Jan '13

28 Jan '13

Hi Morita and other developers, I have done following jobs. 1, git clone git://libvirt.org/libvirt.git 2, cd libvirt 3, git reset --hard 036ad50 4, ./autogen.sh 5, make NOTE: step 3 calls back to Morita's patch for Libvirt version, which is here http://libvirt.org/git/?p=libvirt.git;a=commitdiff;h=036ad5052b43fe9f0d197e… After step 5, i have following questions. 1, I am not clear about how to test Sheepdog. Actually, i just wanna study Sheepdog driver, then i will program our driver for Libvirt. 2, I am not clear about how Sheepdog, Libvirt and QEMU communicate with each other. Before my test for Sheepdog patch for Libvirt, i have to build Sheepdog, Libvirt and QEMU environment, right? Morita, i have seen your patch for Libvirt but i do not find it calls for Sheepdog functions, so it does not have to build Sheepdog environment, right? -- Thanks Harry Wei

2 2

[libvirt] [Sheepdog][Libvirt]How should i test sheepdog in libvirt
by harryxiyou 28 Jan '13

28 Jan '13

Hi Morita, I just wanna test if sheepdog works well in libvirt. I am not sure if i can only use libvirt environment to finish this test? Or maybe i should also set up QEMU/Sheepdog/Openstack environment, right? I have done following jobs. 1, git clone git://libvirt.org/libvirt.git 2, cd libvirt 3, git reset --hard v0.9.13 4, ./autogen.sh && make NOTE: Step 3 just call back to libvirt version 0.9.13, which you, Morita, patched for Libvirt at around this version. (Your patch is here http://libvirt.org/git/?p=libvirt.git;a=commitdiff;h=036ad5052b43fe9f0d197e…) I just wanna study the original patch for libvirt. After step 4, if i can use tool virsh(under libvirt/tools dir) to test sheepdog driver? Therefore, i am not sure how i should use tool virsh to test if Sheepdog driver works well in libvirt. If i can finish this test only with libvirt ENV.?(Or also should set up QEMU/Sheepdog/Openstack environment) How should i do next step? Could anyone give me some suggestions? Thanks in advance ;-) -- Thanks Harry Wei

2 7

[libvirt] [Libvirt][QEMU]The relationships between Libvirt and QEMU indetails
by harryxiyou 27 Jan '13

27 Jan '13

Hi Daniel and other developers, We have programed a HLFS(HDFS based Log-Structured FileSystem) driver for QEMU, which you can see it here. http://cloudxy.googlecode.com/svn/trunk/hlfs/patches/hlfs_driver_for_qemu_1… And i have tested in QEMU environment, which works well for us. Now, we wanna add a HLFS driver(Volume storage) for Libvirt(The same as Sheepdog) but i am not sure how to test HLFS driver for Libvirt. How could i know if the HLFS driver for Libvirt works well? I guess libvirt uses qemu interfaces(QEMU way) to finish the real jobs like create/delete volumes. I wanna use command 'virsh' to finish them, which the logical procedure like this: virsh --> libvirt client --> libvirt server --> QEMU Therefore, 'virsh' cannot work for me. I do not know how to test it with command 'virsh' solely. Or maybe i must build QEMU environment for this test, right? In brief, i am not clear about the relationships between Libvirt and QEMU. How do they(QEMU and Libvirt) communicate with each other? How could i test create/delete volumes of Sheepdog/HLFS only with Libvirt environment? Could anyone give me some suggestions? Thanks in advance;-) -- Thanks Harry Wei

1 0

[libvirt] [PATCH] virlog: remove old code comment
by Doug Goldstein 27 Jan '13

27 Jan '13

Setting the log output prefix to 0 is not supported and in fact results in the following message: warning : virLogParseOutputs:1021 : Ignoring invalid log output setting. --- src/util/virlog.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/util/virlog.c b/src/util/virlog.c index acd42c1..24ec9d3 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -1261,7 +1261,6 @@ static int virLogAddOutputToJournald(int priority) * x:file:file_path * output to a file, with the given filepath * In all case the x prefix is the minimal level, acting as a filter - * 0: everything * 1: DEBUG * 2: INFO * 3: WARNING -- 1.7.12.4

2 1

[libvirt] [PATCH 0/7] Introduce virCommandDoAsyncIO
by Michal Privoznik 27 Jan '13

27 Jan '13

Currently, if we want to use IO with asynchronous command we have to copy code from virFileWrapperFd to misuse our event loop for reading and writing to the command. However, we can extend our virCommand implementation to automatically set things up. Michal Privoznik (7): virCommand: Introduce virCommandDoAsyncIO Introduce event loop to commandtest tests: Create test for virCommandDoAsyncIO virFileWrapperFd: Switch to new virCommandDoAsyncIO qemu: Catch stderr of image decompression binary qemu: Catch stderr of image compression binary qemu: Destroy domain on decompression binary error src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 9 +- src/qemu/qemu_migration.c | 9 +- src/util/vircommand.c | 214 ++++++++++++++++++++++++++++++++++++++++++-- src/util/vircommand.h | 1 + src/util/virfile.c | 82 +---------------- tests/commanddata/test3.log | 2 +- tests/commandtest.c | 136 ++++++++++++++++++++++++++++ 8 files changed, 365 insertions(+), 89 deletions(-) -- 1.8.0.2

2 15

[libvirt] qemu kvm-pit device arg missing?
by Doug Goldstein 27 Jan '13

27 Jan '13

With a domain defined with the following: <clock offset='utc'> <timer name='pit' tickpolicy='delay'/> <timer name='rtc' tickpolicy='catchup'/> </clock> The following define is set: VIR_DOMAIN_TIMER_TICKPOLICY_DELAY for VIR_DOMAIN_TIMER_NAME_PIT. And VIR_DOMAIN_TIMER_TICKPOLICY_CATCHUP for VIR_DOMAIN_TIMER_NAME_RTC. I see where for the RTC we'll set -rtc,driftfix=slew (well -rtc,base=X,driftfix=slew) or -rtc-td-hack for older qemu's. But for the kvm-pit, we pass with qemu{,-kvm} 1.1 and lower -no-kvm-pit-reinjection but with qemu{,-kvm} 1.2 the QEMU_CAPS_NO_KVM_PIT is not set, nor detected via QMP so nothing is ever passed. I even looked through the QMP commands passed once the process is started and there doesn't seem to be anything passed. I was expecting with qemu{,-kvm} 1.2 and newer to see -device kvm-pit,lost_tick_policy=discard appear on the command line but didn't. Am I missing something? Or is this command line argument not necessary any longer? -- Doug Goldstein

1 0

[libvirt] [PATCH] Make python objects inherit from 'object' base class
by Daniel P. Berrange 27 Jan '13

27 Jan '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> As of python >= 2.2, it is recommended that all objects inherit from the 'object' base class. We already require python >= 2.3 for libvirt for thread macro support, so we should follow this best practice. See also http://stackoverflow.com/questions/4015417/python-class-inherits-object This is motivated the patch Rich just did for libguestfs https://www.redhat.com/archives/libguestfs/2013-January/msg00063.html Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- python/generator.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/generator.py b/python/generator.py index f853d77..a079fc5 100755 --- a/python/generator.py +++ b/python/generator.py @@ -1413,7 +1413,7 @@ def buildWrappers(module): classes.write(" %s.__init__(self, _obj=_obj)\n\n" % ( classes_ancestor[classname])) else: - classes.write("class %s:\n" % (classname)) + classes.write("class %s(object):\n" % (classname)) if classname in [ "virDomain", "virNetwork", "virInterface", "virStoragePool", "virStorageVol", "virNodeDevice", "virSecret","virStream", "virNWFilter" ]: -- 1.8.1

3 2

[libvirt] [PATCH 0/2] Resolve Coverity issues in vbox_tmpl.c
by John Ferlan 26 Jan '13

26 Jan '13

This pair of patches resolves what amount to false positives in the vbox_tmpl.c code relating to attempts to dereference NULL in the 2002 VBOX_API_VERSION call to 'vboxIIDFromUUID()'. It also removes "false postives" from the various VBOX_UTF*_FREE() macros. Some code paths checked if the arg was valid prior to calling free. That triggered Coverity into tagging other uses of the variables where the check wasn't performed. While these changes resolve the Coverity issues there still exists a "problem" where the VBOX_UTF<n>_TO_UTF<m> macros don't check the return status from the called function nor does the code that uses the macros always check the returned arg2 for validity (125 occurrances). John Ferlan (2): vbox: Address false positive for NULL dereference vbox: Adjust the UTF FREE macros src/vbox/vbox_tmpl.c | 77 ++++++++++++++++++++++++++-------------------------- 1 file changed, 38 insertions(+), 39 deletions(-) -- 1.7.11.7

2 5

[libvirt] [PATCH] Make sure we only abort without libcurl if $with_esx = yes
by Guido Günther 26 Jan '13

26 Jan '13

--- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 712918f..4bd3c3e 100644 --- a/configure.ac +++ b/configure.ac @@ -1810,7 +1810,7 @@ dnl check for (ESX) dnl if test "$with_curl" != "yes" ; then - if test "$with_esx" = "check"; then + if test "$with_esx" != "yes"; then with_esx=no else AC_MSG_ERROR([Curl is required for the ESX driver]) -- 1.7.10.4

2 2

[libvirt] [PATCH] virsh: Add --print-xml flag for attach-disk command
by Peter Krempa 26 Jan '13

26 Jan '13

The flag causes the XML of the disk that would be attached to be printed instead. --- tools/virsh-domain.c | 46 ++++++++++++++++++++++++++++------------------ tools/virsh.pod | 5 ++++- 2 files changed, 32 insertions(+), 19 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 026dac1..829e475 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -317,6 +317,12 @@ static const vshCmdOptDef opts_attach_disk[] = { .flags = 0, .help = N_("use multifunction pci under specified address") }, + {.name = "print-xml", + .type = VSH_OT_BOOL, + .flags = 0, + .help = N_("print XML document rather than attach the disk") + }, + {.name = NULL} }; @@ -480,11 +486,11 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) unsigned int flags; const char *stype = NULL; virBuffer buf = VIR_BUFFER_INITIALIZER; - char *xml; + char *xml = NULL; struct stat st; if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) - goto cleanup; + return false; if (vshCommandOptString(cmd, "source", &source) <= 0) goto cleanup; @@ -620,27 +626,31 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) xml = virBufferContentAndReset(&buf); - if (vshCommandOptBool(cmd, "config")) { - flags = VIR_DOMAIN_AFFECT_CONFIG; - if (virDomainIsActive(dom) == 1) - flags |= VIR_DOMAIN_AFFECT_LIVE; - ret = virDomainAttachDeviceFlags(dom, xml, flags); - } else { - ret = virDomainAttachDevice(dom, xml); - } - - VIR_FREE(xml); + if (!vshCommandOptBool(cmd, "print-xml")) { + if (vshCommandOptBool(cmd, "config")) { + flags = VIR_DOMAIN_AFFECT_CONFIG; + if (virDomainIsActive(dom) == 1) + flags |= VIR_DOMAIN_AFFECT_LIVE; + ret = virDomainAttachDeviceFlags(dom, xml, flags); + } else { + ret = virDomainAttachDevice(dom, xml); + } - if (ret != 0) { - vshError(ctl, "%s", _("Failed to attach disk")); + if (ret != 0) { + vshError(ctl, "%s", _("Failed to attach disk")); + goto cleanup; + } else { + vshPrint(ctl, "%s", _("Disk attached successfully\n")); + } } else { - vshPrint(ctl, "%s", _("Disk attached successfully\n")); - functionReturn = true; + vshPrint(ctl, "%s", xml); } + functionReturn = true; + cleanup: - if (dom) - virDomainFree(dom); + VIR_FREE(xml); + virDomainFree(dom); virBufferFreeAndReset(&buf); return functionReturn; } diff --git a/tools/virsh.pod b/tools/virsh.pod index e2a2aec..fd0f762 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1787,7 +1787,7 @@ needed if the device does not use managed mode. [I<--driver driver>] [I<--subdriver subdriver>] [I<--cache cache>] [I<--type type>] [I<--mode mode>] [I<--config>] [I<--sourcetype soucetype>] [I<--serial serial>] [I<--shareable>] [I<--rawio>] [I<--address address>] -[I<--multifunction>] +[I<--multifunction>] [I<--print-xml>] Attach a new disk device to the domain. I<source> is path for the files and devices. I<target> controls the bus or @@ -1817,6 +1817,9 @@ scsi:controller.bus.unit or ide:controller.bus.unit. I<multifunction> indicates specified pci address is a multifunction pci device address. +If I<--print-xml> is specified, then the XML of the disk that would be attached +is printed instead. + =item B<attach-interface> I<domain> I<type> I<source> [I<--target target>] [I<--mac mac>] [I<--script script>] [I<--model model>] [I<--config>] [I<--inbound average,peak,burst>] [I<--outbound average,peak,burst>] -- 1.8.1.1

3 3

[libvirt] [PATCH 0/6] libxl bug and race fixes
by Jim Fehlig 26 Jan '13

26 Jan '13

This series fixes several bugs and races in the libxl driver, as described in the commit messages of the individual patches. One of the races was discussed on the xen-devel ml [1] and resulted in two fixes in libxl [2,3]. I've tested this series with and without the libxl patches. All of the previously discovered races are fixed with this series and the libxl patches. It is possible to fire asserts in libxl with this series and without the libxl patches, but that is no worse than the current behavior. The libxl patches have not yet been committed upstream, hence the 'XXXX' for commit id in patch 1. I will respond to the xen-devel thread now with an ACK on the libxl patches (and a reference to this series) so those can be committed. I'll fixup the commit message for patch 1 later, but wanted to get this series on the list for review before the 1.0.2 freeze. [1] http://lists.xen.org/archives/html/xen-devel/2012-11/msg01016.html [2] http://lists.xen.org/archives/html/xen-devel/2012-12/msg00684.html [3] http://lists.xen.org/archives/html/xen-devel/2012-12/msg00685.html Jim Fehlig (6): libxl: Fix handling of timeouts libxl: Fix races in libxl event code libxl: Fix race between destruction of objects libxl: Explicitly remove timeouts libxl: Fix removing non-persistent domain after save libxl: Find domain object in event handler src/libxl/libxl_conf.h | 9 ++ src/libxl/libxl_driver.c | 298 ++++++++++++++++++++++++++++++++++------------- 2 files changed, 226 insertions(+), 81 deletions(-) -- 1.8.0.1

2 18

[libvirt] [PATCH v2] python: Fix bindings for virDomainSnapshotGet{Domain, Connect}
by Jiri Denemark 26 Jan '13

26 Jan '13

https://bugzilla.redhat.com/show_bug.cgi?id=895882 virDomainSnapshot.getDomain() and virDomainSnapshot.getConnect() wrappers around virDomainSnapshotGet{Domain,Connect} were not supposed to be ever implemented. The class should contain proper domain() and connect() accessors that fetch python objects stored internally within the class. While domain() was already provided, connect() was missing. This patch adds connect() method to virDomainSnapshot class and reimplements getDomain() and getConnect() methods as aliases to domain() and connect() for backward compatibility. --- python/generator.py | 4 +++- python/libvirt-override-virDomainSnapshot.py | 8 ++++++++ src/libvirt.c | 10 ++++++++-- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/python/generator.py b/python/generator.py index f853d77..5894616 100755 --- a/python/generator.py +++ b/python/generator.py @@ -527,6 +527,8 @@ skip_function = ( "virNWFilterGetConnect", "virStoragePoolGetConnect", "virStorageVolGetConnect", + "virDomainSnapshotGetConnect", + "virDomainSnapshotGetDomain", # only useful in C code, python code uses dict for typed parameters "virTypedParamsAddBoolean", @@ -953,7 +955,6 @@ classes_destructors = { class_skip_connect_impl = { "virConnect" : True, - "virDomainSnapshot": True, } class_domain_impl = { @@ -1436,6 +1437,7 @@ def buildWrappers(module): " self._conn = conn._conn\n") elif classname in [ "virDomainSnapshot" ]: classes.write(" self._dom = dom\n") + classes.write(" self._conn = dom.connect()\n") classes.write(" if _obj != None:self._o = _obj;return\n") classes.write(" self._o = None\n\n"); destruct=None diff --git a/python/libvirt-override-virDomainSnapshot.py b/python/libvirt-override-virDomainSnapshot.py index 3da7bfd..bf708a5 100644 --- a/python/libvirt-override-virDomainSnapshot.py +++ b/python/libvirt-override-virDomainSnapshot.py @@ -1,3 +1,11 @@ + def getConnect(self): + """Get the connection that owns the domain that a snapshot was created for""" + return self.connect() + + def getDomain(self): + """Get the domain that a snapshot was created for""" + return self.domain() + def listAllChildren(self, flags): """List all child snapshots and returns a list of snapshot objects""" ret = libvirtmod.virDomainSnapshotListAllChildren(self._o, flags) diff --git a/src/libvirt.c b/src/libvirt.c index d5d561c..fa39881 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -17850,7 +17850,10 @@ virDomainSnapshotGetName(virDomainSnapshotPtr snapshot) * virDomainSnapshotGetDomain: * @snapshot: a snapshot object * - * Get the domain that a snapshot was created for + * Get the domain that a snapshot was created for. + * + * WARNING: When writing libvirt bindings in other languages, do not use this + * function. Instead, store the domain and the snapshot object together. * * Returns the domain or NULL. */ @@ -17874,7 +17877,10 @@ virDomainSnapshotGetDomain(virDomainSnapshotPtr snapshot) * virDomainSnapshotGetConnect: * @snapshot: a snapshot object * - * Get the connection that owns the domain that a snapshot was created for + * Get the connection that owns the domain that a snapshot was created for. + * + * WARNING: When writing libvirt bindings in other languages, do not use this + * function. Instead, store the connection and the snapshot object together. * * Returns the connection or NULL. */ -- 1.8.1.1

3 5

[libvirt] Entering freeze for libvirt-1.0.2
by Daniel Veillard 26 Jan '13

26 Jan '13

As scheduled and to gte a release by the end of the month next week, I have just tagged a release candidate 1 version in git and pushed associated tarballs and rpms to the usual place: ftp://libvirt.org/libvirt/ please give it a try and let's ocuse on fixing bugs untl the freeze end. I will probably make a release candidate 2 on Monday, and if everything goes well rol out the 1.0.2 release on Wednesday or Thursday. thanks ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

3 3