- Devel - libvirt List Archives

[libvirt] [PATCH] build: fix VPATH build of remote driver
by Eric Blake 17 Sep '13

17 Sep '13

Commit 073e1575 tried to set things up so that 1) generated files to be shipped in the tarball always live in srcdir, and 2) we have no files in SOURCES that depend on any other files with a literal $(srcdir) in the name, because that situation can cause confusing results for the make expansion of $@ depending on whether the file is found locally or via VPATH. But all my testing for that patch was done incrementally, where all the protocol.[ch] files had already been generated prior to the patch and were up-to-date in the srcdir, and thus I missed one case where $@ causes grief in a VPATH build from a fresh checkout: We have a pattern rule for generating remote_protocol.[ch], and what's more, the rule for protocol.c depends on protocol.h AND on the protocol.x file. The pattern for protocol.c is only satisfied via the VPATH lookup for protocol.x, and if protocol.h doesn't yet exist, the VPATH rule kicks in and we end up with a dependency on a file with $(srcdir) in the name. Based on make's rules for $@, this resulted in make building remote_protocol.h into srcdir (where we want it), then remote_protocol.c into builddir (oops, not so good for the tarball), and also causes the build to fail (the compiler can't find the .h if it lives in a different directory than the .c): CC remote/libvirt_driver_remote_la-remote_protocol.lo remote/remote_protocol.c:7:29: fatal error: remote_protocol.h: No such file or directory #include "remote_protocol.h" ^ compilation terminated. As before, the fix is to hard-code the output file to go into srcdir in spite of $@; but since this is in a pattern rule, we are forced to use $@ in the recipe, so the patch is a bit trickier than what was done in commit 073e1575. * src/Makefile.am (%protocol.c, %protocol.h): Force output to srcdir. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. src/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index da6f7a1..1388c5f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1014,11 +1014,11 @@ endif WITH_REMOTE %protocol.c: %protocol.x %protocol.h $(srcdir)/rpc/genprotocol.pl $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/genprotocol.pl $(RPCGEN) -c \ - $< $@ + $< $(srcdir)/$(subst $(srcdir)/,,$@) %protocol.h: %protocol.x $(srcdir)/rpc/genprotocol.pl $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/genprotocol.pl $(RPCGEN) -h \ - $< $@ + $< $(srcdir)/$(subst $(srcdir)/,,$@) if WITH_XEN noinst_LTLIBRARIES += libvirt_driver_xen_impl.la -- 1.8.3.1

1 0

[libvirt] [PATCH] conf: Don't corrupt metadata on OOM
by Peter Krempa 17 Sep '13

17 Sep '13

Eric Blake suggested that we could do a little better in case copying of the metadata to be set fails. With this patch, the old metadata is discarded after the new string is copied successfuly. --- src/conf/domain_conf.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 7e78068..60f25ab 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -18599,19 +18599,24 @@ virDomainDefSetMetadata(virDomainDefPtr def, xmlDocPtr doc = NULL; xmlNodePtr old; xmlNodePtr new; + char *tmp; int ret = -1; switch ((virDomainMetadataType) type) { case VIR_DOMAIN_METADATA_DESCRIPTION: - VIR_FREE(def->description); - if (VIR_STRDUP(def->description, metadata) < 0) + if (VIR_STRDUP(tmp, metadata) < 0) goto cleanup; + + VIR_FREE(def->description); + def->description = tmp; break; case VIR_DOMAIN_METADATA_TITLE: - VIR_FREE(def->title); - if (VIR_STRDUP(def->title, metadata) < 0) + if (VIR_STRDUP(tmp, metadata) < 0) goto cleanup; + + VIR_FREE(def->title); + def->title = tmp; break; case VIR_DOMAIN_METADATA_ELEMENT: -- 1.8.3.2

2 2

[libvirt] [PATCH] qemu: Fix memleak after commit 59898a88ce8431bd3ea249b8789edc2ef9985827
by Peter Krempa 17 Sep '13

17 Sep '13

If the ABI compatibility check with the "migratable" user XML is successful, we would leak the originaly parsed XML from the user that would not be used in this case. Reported by Ján Tomko. --- src/qemu/qemu_driver.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 75348a1..0763f9b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5274,6 +5274,8 @@ qemuDomainSaveImageOpen(virQEMUDriverPtr driver, /* use the user provided XML */ newdef = def2; def2 = NULL; + } else { + virDomainDefFree(def2); } virDomainDefFree(def); -- 1.8.3.2

2 2

[libvirt] [PATCH 0/2] Fix reverting of external snapshots with custom XML
by Peter Krempa 17 Sep '13

17 Sep '13

The external snapshot code mistakenly used non-"migratable" XMLs in the save image which caused problems with restoring them via the workaround way of doing virDomainRestore(). This series adds workaround to add compatibility with older snapshots and fixes the problem in the snapshot code. Unfortunately, this is not testable with unit tests. I'll try to do a autotest virt-test test case for this particular issue. Peter Krempa (2): qemu: Fix checking of ABI stability when restoring external checkpoints qemu: Use "migratable" XML definition when doing external checkpoints src/qemu/qemu_driver.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) -- 1.8.3.2

3 7

[libvirt] [PATCH v2 0/6]qemu: add usb-bot scsi controller support
by Guannan Ren 17 Sep '13

17 Sep '13

BZ:https://bugzilla.redhat.com/show_bug.cgi?id=917702 v2: After discussion in BZ, qemu guys hope the usb-bot(+usb-uas) can be supported although the absence of its hot-plug feature. In this patch, libvirt gives an unsupported error in this case. v1: https://www.redhat.com/archives/libvir-list/2013-September/msg00020.html And as the missing of hot-plug feature, the replacement of usb-storage is not a urgent thing. disk attached to usb-storage supports hot-plug/unplug already. Guannan Ren(6) qemu: add usb-bot qemu cap flag qemu: add usb-bot model scsi controller support qemu: add usb-bot support from disks points of view qemu: refactor out function to build scsi device qemu commandline qemu: no hot-plug/unplug support currently for usb-bot tests: add xml2argv test for usb-bot scsi controller docs/formatdomain.html.in | 4 ++-- docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- src/conf/domain_conf.h | 5 +++++ src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------- src/qemu/qemu_hotplug.c | 14 ++++++++++++++ src/vmx/vmx.c | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-usbbot.args | 11 +++++++++++ tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-usbbot.xml | 33 +++++++++++++++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 +++ 13 files changed, 259 insertions(+), 58 deletions(-)

1 7

[libvirt] Release of libvirt-java-0.5.0
by Daniel Veillard 17 Sep '13

17 Sep '13

With a bit of delay, the release needed by Wido is finally available, it is tagged in git and I have pushed tarball, jar and rpms to the FTP: ftp://libvirt.org/libvirt/java/ Wido maybe you can push to Maven, I'm unsure how to do this and last time I tried I made a mess :-) I bumped the intermediate release number as this release includes more improvements and fixes than the previous ones and deprecates a couple of things: Portability: - Fix the rpm build (Daniel Veillard) - Explicitly set includeAntRuntime to false for javac tasks. (Claudio Bley) - Fix build with jna >= 3.5.0 (Jiri Denemark) Bug Fixes: - Fixed broken dates in Changelog (Daniel Veillard) - Fix memory leaks for libvirt functions returning newly allocated memory. (Claudio Bley) - Fix memory leak for virDomainGetSchedulerType. (Claudio Bley) Improvements: - Implement and use virDomainMigrateToURI2 by overloading migrateToUri (Wido den Hollander) - Implement virDomainMigrate2 and use it for a new migrate method. (Wido den Hollander) - Overload Domain.snapshotCreateXML with a method that has an argument for flags (Wido den Hollander) - Overload Domain.snapshotListNames with a method that has an additional flags argument. (Wido den Hollander) - Implement virDomainUndefineFlags by overloading the existing undefine method (Wido den Hollander) - Implement virStorageVolResize by adding resize to StorageVol (Wido den Hollander) - Implement virDomainBlockResize (Wido den Hollander) - Avoid creating new Arrays and Lists on every struct instantiation (Claudio Bley) - Make the build fail if any of the JUnit tests have errors or failures (Claudio Bley) - Avoid unnecessary copying and calling virResetLastError. (Claudio Bley) - Split "build" target and automatically rebuild out of date files. (Claudio Bley) - Split JUnit tests and use a fixture for Connect. (Claudio Bley) - Call processError only if a libvirt function indicates an error. (Claudio Bley) - Change visibility of class members to private to enforce encapsulation. (Claudio Bley) - Make finalize() methods protected. (Claudio Bley) - Add findbugs build file for ant. (Claudio Bley) - Introduce a javac.debug property. (Claudio Bley) - maint: correct name for license file (Eric Blake) - Add Javadoc and Source JARs to Maven repo (Wido den Hollander) - Fix the Maven build system with Ant (Wido den Hollander) Cleanups: - trivial remove unused imports (Stefan Majer) - Remove unused imports (Stefan Majer) - Remove functions not intended to be used by libvirt bindings. (Claudio Bley) - Remove the libvirt instance attribute from all classes. (Claudio Bley) - Mark virConnCopyLastError and virConnGetLastError as deprecated. (Claudio Bley) - Remove redundant public modifier from Libvirt interface methods. (Claudio Bley) Thanks Claudio, Wido and everybody else who contributed ! 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 6

[libvirt] [PATCH] tools: Fix a wrong check in cmdEcho()
by Hongwei Bi 17 Sep '13

17 Sep '13

What should be checked here is xmlbuf rather then buf. --- tools/virsh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index bf2fbf8..ac354ac 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -921,7 +921,7 @@ cmdEcho(vshControl *ctl, const vshCmd *cmd) if (xml) { virBufferEscapeString(&xmlbuf, "%s", arg); - if (virBufferError(&buf)) { + if (virBufferError(&xmlbuf)) { vshPrint(ctl, "%s", _("Failed to allocate XML buffer")); return false; } -- 1.7.1

3 2

[libvirt] [bug] State of "in shutdown".
by Dongsheng Yang 17 Sep '13

17 Sep '13

Hi experts: I got the following description by <man virsh>: ``` STATES shutdown The domain is in the process of shutting down, i.e. the guest operating system has been notified and should be in the process of stopping its operations gracefully. ``` But I found the state of VM is "running" even when it is in process of shutting down. e.g: # virsh list Id Name State ---------------------------------------------------- 41 virt-tests-vm1 running # virsh shutdown virt-tests-vm1;echo $?;virsh domstate virt-tests-vm1 --reason Domain virt-tests-vm1 is being shutdown 0 running (booted) # virsh domstate virt-tests-vm1 --reason running (booted) ... ... # virsh domstate virt-tests-vm1 --reason shut off (shutdown) As shown above, I can not get a "shutdown" (or "in shutdown") for the VM state. Do you think it is a bug, or something not good enough? Wish your help!!

1 1

[libvirt] [PATCHv4 0/4] VMX: CD-ROM handling improvements
by Doug Goldstein 17 Sep '13

17 Sep '13

A user came into #virt the other day and was trying to get libvirtd to work with VMware Fusion 5, which is basically the Mac OS X version of VMware Workstation. In helping him out I noticed a few limitations of our VMX parser so I've added support through this patchset. I don't personally have access or own VMware's product. v4: * Half the patchset has been merged at this point * Add back 'auto detect' support via <source startupPolicy='optional'/> * Made device='lun' match device='cdrom' * Patch 1 & 2 are new to the series v3: * Dropped 'auto detect' support from series as it needs more work based on feedback * Added patch to combine virVMXFormatHardDisk and virVMXFormatCDROM into one function. * Converted to <disk type='block' device='lun'> instead of adding a <driver> element to better match the behavior available via QEMU. v2: * Added additional test cases and fixed issues that arose from those *** BLURB HERE *** Doug Goldstein (4): Allow LUN type disks to have no source Allow <source> for type=block to have no dev VMX: Add support for 'auto detect' fileNames VMX: Add a VMWare Fusion 5 configuration for tests docs/schemas/domaincommon.rng | 8 +- src/conf/domain_conf.c | 9 ++- src/vmx/vmx.c | 28 +++++-- .../vmx2xml-cdrom-ide-raw-auto-detect.vmx | 5 ++ .../vmx2xml-cdrom-ide-raw-auto-detect.xml | 24 ++++++ .../vmx2xml-cdrom-scsi-raw-auto-detect.vmx | 6 ++ .../vmx2xml-cdrom-scsi-raw-auto-detect.xml | 24 ++++++ tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.vmx | 88 ++++++++++++++++++++++ tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.xml | 39 ++++++++++ tests/vmx2xmltest.c | 4 + .../xml2vmx-cdrom-ide-raw-auto-detect.vmx | 14 ++++ .../xml2vmx-cdrom-ide-raw-auto-detect.xml | 14 ++++ .../xml2vmx-cdrom-scsi-raw-auto-detect.vmx | 15 ++++ .../xml2vmx-cdrom-scsi-raw-auto-detect.xml | 14 ++++ tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.vmx | 30 ++++++++ tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.xml | 41 ++++++++++ tests/xml2vmxtest.c | 4 + 17 files changed, 356 insertions(+), 11 deletions(-) create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-auto-detect.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-auto-detect.xml create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-auto-detect.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-auto-detect.xml create mode 100644 tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.xml create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-ide-raw-auto-detect.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-ide-raw-auto-detect.xml create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-scsi-raw-auto-detect.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-scsi-raw-auto-detect.xml create mode 100644 tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.xml -- 1.8.1.5

2 11

[libvirt] [PATCHv3 0/4] Introduce APIs to extract DHCP leases info
by Nehal J Wani 17 Sep '13

17 Sep '13

This API returns the leases information stored in the DHCP leases file of dnsmasq for a given virtual network. It contacts the bridge network driver, which parses the leases file. It supports two methods: 1. Return info for all network interfaces connected to a given virtual network 2. Return information for a particular network interface in a given virtual network by providing its MAC Address v3 * Mostly small nits, change in MACRO names, use of virSocketAddrGetIpPrefix to retrieve IP prefix from @dom XML. v2 * Since DHCPv6 is supposed to be suported in future, virNetworkGetDHCPLeasesForMAC changed, prefix and virIPAddrType added in virNetworkDHCPLeases struct. Refer: https://www.redhat.com/archives/libvir-list/2013-September/msg00732.html v1 * Refer: https://www.redhat.com/archives/libvir-list/2013-September/msg00620.html * The need for these APIs were result of a RFC was proposed on the list. Refer: http://www.redhat.com/archives/libvir-list/2013-July/msg01603.html Nehal J Wani (4): net-dhcp-leases: Implement the public APIs net-dhcp-leases: Implement the remote protocol net-dhcp-leases: Private implementation inside network driver net-dhcp-leases: Add virsh support daemon/remote.c | 133 ++++++++++++++++++++++++++++++++ include/libvirt/libvirt.h.in | 33 ++++++++ python/generator.py | 3 + src/driver.h | 13 ++++ src/libvirt.c | 173 ++++++++++++++++++++++++++++++++++++++++++ src/libvirt_public.syms | 7 ++ src/network/bridge_driver.c | 177 +++++++++++++++++++++++++++++++++++++++++++ src/remote/remote_driver.c | 150 ++++++++++++++++++++++++++++++++++++ src/remote/remote_protocol.x | 50 +++++++++++- src/remote_protocol-structs | 32 ++++++++ src/rpc/gendispatch.pl | 1 + tools/virsh-network.c | 100 ++++++++++++++++++++++++ tools/virsh.pod | 6 ++ 13 files changed, 877 insertions(+), 1 deletion(-) -- 1.7.11.7

3 16