- Devel - libvirt List Archives

[libvirt] make check error
by hzguanqiang＠corp.netease.com 17 Sep '13

17 Sep '13

Hi guys, I made a automated test for the libvirt code in git source repository right now, It reported a check error. The operation steps and error info are as following: ubuntu@ubuntu:~/github/libvirt.git$ ./autogen.sh ubuntu@ubuntu:~/github/libvirt.git$ ./configure --enable-werror ubuntu@ubuntu:~/github/libvirt.git$ make check ............ make check-local make[3]: Entering directory `/home/ubuntu/github/libvirt.git/daemon' GEN check-augeas make[3]: Leaving directory `/home/ubuntu/github/libvirt.git/daemon' make[2]: Leaving directory `/home/ubuntu/github/libvirt.git/daemon' make[1]: Leaving directory `/home/ubuntu/github/libvirt.git/daemon' Making check in tools make[1]: Entering directory `/home/ubuntu/github/libvirt.git/tools' GEN libvirt-guests.sh make check-am make[2]: Entering directory `/home/ubuntu/github/libvirt.git/tools' CC virsh-virsh.o CC virsh-virsh-console.o CC virsh-virsh-domain.o virsh-domain.c: In function 'cmdMetadata': virsh-domain.c:6857:10: error: declaration of 'remove' shadows a global declaration [-Werror=shadow] cc1: all warnings being treated as errors make[2]: *** [virsh-virsh-domain.o] Error 1 make[2]: Leaving directory `/home/ubuntu/github/libvirt.git/tools' make[1]: *** [check] Error 2 make[1]: Leaving directory `/home/ubuntu/github/libvirt.git/tools' make: *** [check-recursive] Error 1 What's the problem? Thanks. BTW, The code version is: ubuntu@ubuntu:~/github/libvirt.git$ git branch -a -v * master 7655ed0 conf: Don't corrupt metadata on OOM remotes/origin/HEAD -> origin/master remotes/origin/master 7655ed0 conf: Don't corrupt metadata on OOM ------------------ Best regards! GuanQiang 2013-09-17

3 4

[libvirt] [PATCH 0/2] Build fixes after metadata series
by Peter Krempa 17 Sep '13

17 Sep '13

Some people reported a few issues on different systems/compilers. Series pushed under the build-breaker rule. Peter Krempa (2): conf: Avoid false positive of uninitialized variable use virsh: Don't shadow global variable "remove" in cmdMetadata src/conf/domain_conf.c | 9 +++------ tools/virsh-domain.c | 6 +++--- 2 files changed, 6 insertions(+), 9 deletions(-) -- 1.8.3.2

1 2

[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 16 Sep '13

16 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 16 Sep '13

16 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

[libvirt] [PATCH] Free slicename in virSystemdCreateMachine
by Ján Tomko 16 Sep '13

16 Sep '13

1,003 bytes in 1 blocks are definitely lost in loss record 599 of 635 ==404== by 0x50728A7: virBufferAddChar (virbuffer.c:185) ==404== by 0x50BC466: virSystemdEscapeName (virsystemd.c:67) ==404== by 0x50BC6B2: virSystemdMakeSliceName (virsystemd.c:108) ==404== by 0x50BC870: virSystemdCreateMachine (virsystemd.c:169) ==404== by 0x5078267: virCgroupNewMachine (vircgroup.c:1498) --- src/util/virsystemd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index 7674cc6..e72b7f0 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -239,5 +239,6 @@ cleanup: VIR_FREE(username); VIR_FREE(creatorname); VIR_FREE(machinename); + VIR_FREE(slicename); return ret; } -- 1.8.1.5

2 2

[libvirt] [PATCH] Always free network and graphics cookies
by Ján Tomko 16 Sep '13

16 Sep '13

qemuMigrationEatCookie has flags to control if these should be parsed, but it does not fill mig->flags. These cookies might get leaked if these flags are not set by qemuMigrationBakeCookie. 42 (32 direct, 10 indirect) bytes in 1 blocks are definitely lost in loss record 361 of 662 ==123== by 0x1BA33FCA: qemuMigrationEatCookie (qemu_migration.c:678) ==123== by 0x1BA34A1E: qemuMigrationRun (qemu_migration.c:3108) ==123== by 0x1BA3622B: doNativeMigrate (qemu_migration.c:3343) ==123== by 0x1BA3B408: qemuMigrationPerform (qemu_migration.c:4138) --- src/qemu/qemu_migration.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 69a9013..d7b89fc 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -202,11 +202,8 @@ static void qemuMigrationCookieFree(qemuMigrationCookiePtr mig) if (!mig) return; - if (mig->flags & QEMU_MIGRATION_COOKIE_GRAPHICS) - qemuMigrationCookieGraphicsFree(mig->graphics); - - if (mig->flags & QEMU_MIGRATION_COOKIE_NETWORK) - qemuMigrationCookieNetworkFree(mig->network); + qemuMigrationCookieGraphicsFree(mig->graphics); + qemuMigrationCookieNetworkFree(mig->network); VIR_FREE(mig->localHostname); VIR_FREE(mig->remoteHostname); -- 1.8.1.5

2 2

[libvirt] [PATCHv2] build: make autobuild require rpm build deps
by Eric Blake 16 Sep '13

16 Sep '13

I spent far too long on a new machine trying to figure out why ./autobuild.sh failed due to an rpm build failure (complaining that libvirt_parthelper was supposed to be packaged but was not built), and finally traced it to a missing parted-devel installation. I learned that --nodeps is in place for autobuilder setups, but for developers, removing it would make rpmbuild error out much sooner for a less cryptic failure. * autobuild.sh: Conditionally drop --nodeps from rpmbuild lines. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- v2: make --nodeps conditional based on $AUTOBUILD_COUNTER; suggested by Dan Berrange. autobuild.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/autobuild.sh b/autobuild.sh index e5aa35c..3109b49 100755 --- a/autobuild.sh +++ b/autobuild.sh @@ -8,6 +8,13 @@ set -v test -n "$1" && RESULTS=$1 || RESULTS=results.log : ${AUTOBUILD_INSTALL_ROOT=$HOME/builder} +# If run under the autobuilder, we must use --nodeps with rpmbuild; +# but this can lead to odd error diagnosis for normal development. +nodeps= +if test "${AUTOBUILD_COUNTER+set}"; then + nodeps=--nodeps +fi + test -f Makefile && make -k distclean || : rm -rf coverage @@ -60,7 +67,7 @@ else fi if test -f /usr/bin/rpmbuild ; then - rpmbuild --nodeps \ + rpmbuild $nodeps \ --define "extra_release $EXTRA_RELEASE" \ --define "_sourcedir `pwd`" \ -ba --clean libvirt.spec @@ -111,7 +118,7 @@ fi if test -x /usr/bin/i686-w64-mingw32-gcc && test -x /usr/bin/x86_64-w64-mingw32-gcc ; then if test -f /usr/bin/rpmbuild ; then - rpmbuild --nodeps \ + rpmbuild $nodeps \ --define "extra_release $EXTRA_RELEASE" \ --define "_sourcedir `pwd`" \ -ba --clean mingw-libvirt.spec -- 1.8.3.1

2 2

Re: [libvirt] rpmbuild libvirt 1.1.2 problem
by jsjshaowentao＠21cn.com 16 Sep '13

16 Sep '13

1 0

[libvirt] [PATCHv2] cgroup: Move [qemu|lxc]GetCpuBWStatus to vicgroup.c and refactor it
by Peter Krempa 16 Sep '13

16 Sep '13

The function existed in two identical instances in lxc and qemu. Move it to vircgroup.c and simplify it. Refactor the callers too. --- Notes: Version 2: - added a fallback implementation that doesn't spam logs with errors src/libvirt_private.syms | 1 + src/lxc/lxc_driver.c | 52 +++++------------------------------------------- src/qemu/qemu_driver.c | 51 +++++------------------------------------------ src/util/vircgroup.c | 38 +++++++++++++++++++++++++++++++++++ src/util/vircgroup.h | 2 ++ 5 files changed, 51 insertions(+), 93 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 35f0f1b..82e3d6f 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1217,6 +1217,7 @@ virCgroupSetMemory; virCgroupSetMemoryHardLimit; virCgroupSetMemorySoftLimit; virCgroupSetMemSwapHardLimit; +virCgroupSupportsCpuBW; # util/virclosecallbacks.h diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index b587c22..87ced95 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1574,45 +1574,10 @@ static char *lxcConnectGetHostname(virConnectPtr conn) } - -/* - * check whether the host supports CFS bandwidth - * - * Return 1 when CFS bandwidth is supported, 0 when CFS bandwidth is not - * supported, -1 on error. - */ -static int lxcGetCpuBWStatus(virCgroupPtr cgroup) -{ - char *cfs_period_path = NULL; - int ret = -1; - - if (!cgroup) - return 0; - - if (virCgroupPathOfController(cgroup, VIR_CGROUP_CONTROLLER_CPU, - "cpu.cfs_period_us", &cfs_period_path) < 0) { - VIR_INFO("cannot get the path of cgroup CPU controller"); - ret = 0; - goto cleanup; - } - - if (access(cfs_period_path, F_OK) < 0) { - ret = 0; - } else { - ret = 1; - } - -cleanup: - VIR_FREE(cfs_period_path); - return ret; -} - - static char *lxcDomainGetSchedulerType(virDomainPtr dom, int *nparams) { char *ret = NULL; - int rc; virDomainObjPtr vm; virLXCDomainObjPrivatePtr priv; @@ -1639,13 +1604,10 @@ static char *lxcDomainGetSchedulerType(virDomainPtr dom, } if (nparams) { - rc = lxcGetCpuBWStatus(priv->cgroup); - if (rc < 0) - goto cleanup; - else if (rc == 0) - *nparams = 1; - else + if (virCgroupSupportsCpuBW(priv->cgroup)) *nparams = 3; + else + *nparams = 1; } ignore_value(VIR_STRDUP(ret, "posix")); @@ -1872,12 +1834,8 @@ lxcDomainGetSchedulerParametersFlags(virDomainPtr dom, if (virDomainGetSchedulerParametersFlagsEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - if (*nparams > 1) { - rc = lxcGetCpuBWStatus(priv->cgroup); - if (rc < 0) - goto cleanup; - cpu_bw_status = !!rc; - } + if (*nparams > 1) + cpu_bw_status = virCgroupSupportsCpuBW(priv->cgroup); if (!(caps = virLXCDriverGetCapabilities(driver, false))) goto cleanup; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ae1948f..0caeb08 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7325,44 +7325,10 @@ cleanup: } -/* - * check whether the host supports CFS bandwidth - * - * Return 1 when CFS bandwidth is supported, 0 when CFS bandwidth is not - * supported, -1 on error. - */ -static int qemuGetCpuBWStatus(virCgroupPtr cgroup) -{ - char *cfs_period_path = NULL; - int ret = -1; - - if (!cgroup) - return 0; - - if (virCgroupPathOfController(cgroup, VIR_CGROUP_CONTROLLER_CPU, - "cpu.cfs_period_us", &cfs_period_path) < 0) { - VIR_INFO("cannot get the path of cgroup CPU controller"); - ret = 0; - goto cleanup; - } - - if (access(cfs_period_path, F_OK) < 0) { - ret = 0; - } else { - ret = 1; - } - -cleanup: - VIR_FREE(cfs_period_path); - return ret; -} - - static char *qemuDomainGetSchedulerType(virDomainPtr dom, int *nparams) { char *ret = NULL; - int rc; virDomainObjPtr vm = NULL; qemuDomainObjPrivatePtr priv; @@ -7389,13 +7355,10 @@ static char *qemuDomainGetSchedulerType(virDomainPtr dom, } if (nparams) { - rc = qemuGetCpuBWStatus(priv->cgroup); - if (rc < 0) - goto cleanup; - else if (rc == 0) - *nparams = 1; - else + if (virCgroupSupportsCpuBW(priv->cgroup)) *nparams = 5; + else + *nparams = 1; } ignore_value(VIR_STRDUP(ret, "posix")); @@ -8728,12 +8691,8 @@ qemuDomainGetSchedulerParametersFlags(virDomainPtr dom, if (virDomainGetSchedulerParametersFlagsEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - if (*nparams > 1) { - rc = qemuGetCpuBWStatus(priv->cgroup); - if (rc < 0) - goto cleanup; - cpu_bw_status = !!rc; - } + if (*nparams > 1) + cpu_bw_status = virCgroupSupportsCpuBW(priv->cgroup); if (!(caps = virQEMUDriverGetCapabilities(driver, false))) goto cleanup; diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index a615f28..e99caf5 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -3061,6 +3061,36 @@ cleanup: } +/** + * virCgroupSupportsCpuBW(): + * Check whether the host supports CFS bandwidth. + * + * Return true when CFS bandwidth is supported, + * false when CFS bandwidth is not supported. + */ +bool +virCgroupSupportsCpuBW(virCgroupPtr cgroup) +{ + char *path = NULL; + int ret = false; + + if (!cgroup) + return false; + + if (virCgroupPathOfController(cgroup, VIR_CGROUP_CONTROLLER_CPU, + "cpu.cfs_period_us", &path) < 0) { + virResetLastError(); + goto cleanup; + } + + ret = virFileExists(path); + +cleanup: + VIR_FREE(path); + return ret; +} + + #else /* !VIR_CGROUP_SUPPORTED */ bool @@ -3646,4 +3676,12 @@ virCgroupIsolateMount(virCgroupPtr group ATTRIBUTE_UNUSED, return -1; } + +bool +virCgroupSupportsCpuBW(virCgroupPtr cgroup ATTRIBUTE_UNUSED) +{ + VIR_DEBUG("Control groups not supported on this platform"); + return false; +} + #endif /* !VIR_CGROUP_SUPPORTED */ diff --git a/src/util/vircgroup.h b/src/util/vircgroup.h index 7bb4b2a..835eb30 100644 --- a/src/util/vircgroup.h +++ b/src/util/vircgroup.h @@ -207,4 +207,6 @@ int virCgroupIsolateMount(virCgroupPtr group, const char *oldroot, const char *mountopts); +bool virCgroupSupportsCpuBW(virCgroupPtr cgroup); + #endif /* __VIR_CGROUP_H__ */ -- 1.8.3.2

2 2

[libvirt] [PATCH] build: fix build with latest rawhide kernel headers
by Eric Blake 16 Sep '13

16 Sep '13

Bother those kernel developers. In the latest rawhide, kernel and glibc have now been unified so that <netinet/in.h> and <linux/in6.h> no longer clash; but <linux/if_bridge.h> is still not self-contained. Because of the latest header change, the build is failing with: checking for linux/param.h... no configure: error: You must install kernel-headers in order to compile libvirt with QEMU or LXC support with details: In file included from conftest.c:561:0: /usr/include/linux/in6.h:71:18: error: field 'flr_dst' has incomplete type struct in6_addr flr_dst; We need a workaround to avoid our workaround :) * configure.ac (KERNEL_HEADERS_WORKAROUND): New test. * src/util/virnetdevbridge.c (includes): Use it. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- This qualifies as a build-breaker; but last time I pushed a patch in this area of code without review, it got reverted, so I'll wait for the review. I've tested on RHEL 5, RHEL 6, Fedora 19 (all of which have glibc and kernel differences, although not the same error messages) and rawhide (where glibc and kernel finally agree, but where the kernel headers _still_ assume that the caller already declared ipv6 structs). configure.ac | 38 ++++++++++++++++++++++++++++---------- src/util/virnetdevbridge.c | 24 ++++++++++++++---------- 2 files changed, 42 insertions(+), 20 deletions(-) diff --git a/configure.ac b/configure.ac index 8426863..8acccdd 100644 --- a/configure.ac +++ b/configure.ac @@ -1051,18 +1051,36 @@ dnl check for kernel headers required by src/bridge.c dnl if test "$with_linux" = "yes"; then if test "$with_qemu" = "yes" || test "$with_lxc" = "yes" ; then + # Various kernel versions have headers that are not self-standing, but + # yet are incompatible with the corresponding glibc headers. In order + # to guarantee compilation across a wide range of versions (from RHEL 5 + # to rawhide), we first have to probe whether glibc and kernel can be + # used in tandem; and if not, provide workarounds that ensure that + # ABI-compatible IPv6 types are present for use by the kernel headers. + # These probes mirror the usage in virnetdevbridge.c + AC_CACHE_CHECK([whether kernel and glibc headers are compatible], + [lv_cv_kernel_glibc_compatible], + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include <netinet/in.h> + #include <linux/in6.h> + ]])], + [lv_cv_kernel_glibc_compatible=yes], + [lv_cv_kernel_glibc_compatible=no])]) + if test "x$lv_cv_kernel_glibc_compatible" != xyes; then + AC_DEFINE([KERNEL_HEADERS_WORKAROUND], [1], + [define to 1 if Linux kernel headers require a workaround to avoid + compilation errors when mixed with glibc headers]) + fi AC_CHECK_HEADERS([linux/param.h linux/sockios.h linux/if_bridge.h linux/if_tun.h],, [AC_MSG_ERROR([You must install kernel-headers in order to compile libvirt with QEMU or LXC support])], - [[/* The kernel folks broke their headers when used with particular - * glibc versions; although the structs are ABI compatible, the - * C type system doesn't like struct redefinitions. We work around - * the problem here in the same manner as in virnetdevbridge.c. */ - #include <netinet/in.h> - #define in6_addr in6_addr_ - #define sockaddr_in6 sockaddr_in6_ - #define ipv6_mreq ipv6_mreq_ - #define in6addr_any in6addr_any_ - #define in6addr_loopback in6addr_loopback_ + [[#include <netinet/in.h> + #if KERNEL_HEADERS_WORKAROUND + # define in6_addr in6_addr_ + # define sockaddr_in6 sockaddr_in6_ + # define ipv6_mreq ipv6_mreq_ + # define in6addr_any in6addr_any_ + # define in6addr_loopback in6addr_loopback_ + #endif #include <linux/in6.h> ]]) fi diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c index e4daa27..b78ab07 100644 --- a/src/util/virnetdevbridge.c +++ b/src/util/virnetdevbridge.c @@ -39,22 +39,26 @@ #ifdef __linux__ # include <linux/sockios.h> # include <linux/param.h> /* HZ */ +# if KERNEL_HEADERS_WORKAROUND /* Depending on the version of kernel vs. glibc, there may be a collision * between <net/in.h> and kernel IPv6 structures. The different types * are ABI compatible, but choke the C type system; work around it by * using temporary redefinitions. */ -# define in6_addr in6_addr_ -# define sockaddr_in6 sockaddr_in6_ -# define ipv6_mreq ipv6_mreq_ -# define in6addr_any in6addr_any_ -# define in6addr_loopback in6addr_loopback_ +# define in6_addr in6_addr_ +# define sockaddr_in6 sockaddr_in6_ +# define ipv6_mreq ipv6_mreq_ +# define in6addr_any in6addr_any_ +# define in6addr_loopback in6addr_loopback_ +# endif # include <linux/in6.h> # include <linux/if_bridge.h> /* SYSFS_BRIDGE_ATTR */ -# undef in6_addr -# undef sockaddr_in6 -# undef ipv6_mreq -# undef in6addr_any -# undef in6addr_loopback +# if KERNEL_HEADERS_WORKAROUND +# undef in6_addr +# undef sockaddr_in6 +# undef ipv6_mreq +# undef in6addr_any +# undef in6addr_loopback +# endif # define JIFFIES_TO_MS(j) (((j)*1000)/HZ) # define MS_TO_JIFFIES(ms) (((ms)*HZ)/1000) -- 1.8.3.1

2 2

[libvirt] [PATCH] build: make autobuild require rpm build deps
by Eric Blake 16 Sep '13

16 Sep '13

I spent far too long on a new machine trying to figure out why ./autobuild.sh failed during the rpm build failure (complaining that libvirt_parthelper was supposed to be packaged but was not built), and finally traced it to a missing parted-devel installation. I don't know why we have --nodeps in place, but removing it would make rpmbuild error out much sooner, and with a much less cryptic failure case. * autobuild.sh: Drop --nodeps from rpmbuild lines. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- I'm okay ditching this patch if someone can explain why the --nodeps line should be there. autobuild.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autobuild.sh b/autobuild.sh index e5aa35c..0ab5f5e 100755 --- a/autobuild.sh +++ b/autobuild.sh @@ -60,7 +60,7 @@ else fi if test -f /usr/bin/rpmbuild ; then - rpmbuild --nodeps \ + rpmbuild \ --define "extra_release $EXTRA_RELEASE" \ --define "_sourcedir `pwd`" \ -ba --clean libvirt.spec @@ -111,7 +111,7 @@ fi if test -x /usr/bin/i686-w64-mingw32-gcc && test -x /usr/bin/x86_64-w64-mingw32-gcc ; then if test -f /usr/bin/rpmbuild ; then - rpmbuild --nodeps \ + rpmbuild \ --define "extra_release $EXTRA_RELEASE" \ --define "_sourcedir `pwd`" \ -ba --clean mingw-libvirt.spec -- 1.8.3.1

2 2

[libvirt] [PATCHv3 RESEND 0/5] Handling of undefine and redefine snapshots with VirtualBox 4.2
by Manuel VIVES 16 Sep '13

16 Sep '13

Hi, This is a serie of patches in order to support undefining and redefining snapshots with VirtualBox 4.2. The serie of patches is rather big, and adds among other things some utility functions unrelated to VirtualBox in patches 1 & 2. The code review could be done in several parts: e.g. patches 1 & 2 separately to validate the utility functions. The VirtualBox API provides only high level operations to manipulate snapshots, so it not possible to support flags like VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE and VIR_DOMAIN_SNAPSHOT_DELETE_METADATA_ONLY with only API calls. Following an IRC talk with Eric Blake, the decision was taken to emulate these behaviours by manipulating directly the .vbox XML files. The first two patches are some util methods for handling uuid and strings that will be used after. The third patch brings more details in the snapshot XML returned by libvirt. We will need those modifications in order to redefine the snapshots. The fourth patch brings the support of the VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE and VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT flags in virDomainSnapshotCreateXML. The fifth and last patch brings the support of the VIR_DOMAIN_SNAPSHOT_DELETE_METADATA_ONLY flag in virDomainSnapshotDelete. The patches are only for Virtualbox 4.2 Regards, Manuel VIVES V3: * Use of STREQ_NULLABLE instead of STREQ in one case * Fix the method for finding uuids according to Ján Tomko review V2: * Fix a licence problem with the method for string replacement Manuel VIVES (5): viruuid.h/c: Util method for finding uuid patterns in some strings virstring.h/c: Util method for making some find and replace in strings vbox_tmpl.c: Better XML description for snapshots vbox_tmpl.c: Patch for redefining snapshots vbox_tmpl.c: Add methods for undefining snapshots po/POTFILES.in | 1 + src/conf/domain_conf.c | 2 +- src/libvirt_private.syms | 2 + src/util/virstring.c | 48 ++ src/util/virstring.h | 2 + src/util/viruuid.c | 81 ++ src/util/viruuid.h | 1 + src/vbox/vbox_tmpl.c | 1846 +++++++++++++++++++++++++++++++++++++++++++--- 8 files changed, 1871 insertions(+), 112 deletions(-) -- 1.7.10.4

1 5

[libvirt] One question about ACS for pci passthrough
by Li Zhang 16 Sep '13

16 Sep '13

Hi all, In libvirt, it doesn't allow non-ACS switch to assign devices to guests. Is this required for X86 to support PCI passthrough? On my power machine, ACS capability can't be found. I think HW doesn't support it. I don't know whether this is a special situation, and I have to set relaxed_acs_check = 1. Thanks. --Li

2 1

[libvirt] [PATCH 0/3] Clean up usage of access(PATH, F_OK)
by Peter Krempa 16 Sep '13

16 Sep '13

Peter Krempa (3): util: Declare that virFileExists shall honor errno cgroup: Move [qemu|lxc]GetCpuBWStatus to vicgroup.c and refactor it cleanup: Kill usage of access(PATH, F_OK) in favor of virFileExists() src/libvirt_private.syms | 1 + src/lxc/lxc_driver.c | 52 ++++------------------------------- src/openvz/openvz_conf.c | 2 +- src/parallels/parallels_storage.c | 2 +- src/qemu/qemu_capabilities.c | 4 +-- src/qemu/qemu_cgroup.c | 6 ++-- src/qemu/qemu_driver.c | 51 ++++------------------------------ src/qemu/qemu_process.c | 2 +- src/storage/storage_backend_fs.c | 2 +- src/storage/storage_backend_logical.c | 2 +- src/storage/storage_backend_mpath.c | 8 +----- src/storage/storage_backend_scsi.c | 3 +- src/util/vircgroup.c | 31 ++++++++++++++++++++- src/util/vircgroup.h | 2 ++ src/util/virfile.c | 8 +++++- src/util/virpci.c | 2 +- src/util/virscsi.c | 2 +- src/util/virutil.c | 6 ++-- 18 files changed, 67 insertions(+), 119 deletions(-) -- 1.8.3.2

3 8

Re: [libvirt] [Users] Live Migration failed oVirt 3.3 Nightly
by Dan Kenigsberg 16 Sep '13

16 Sep '13

On Sun, Sep 15, 2013 at 09:57:47PM +1000, Andrew Lau wrote: > On Sun, Sep 15, 2013 at 9:34 PM, Dan Kenigsberg <danken(a)redhat.com> wrote: > > > On Sun, Sep 15, 2013 at 08:44:18PM +1000, Andrew Lau wrote: > > > On Sun, Sep 15, 2013 at 8:00 PM, Dan Kenigsberg <danken(a)redhat.com> > > wrote: > > > > > > > On Sun, Sep 15, 2013 at 06:48:41PM +1000, Andrew Lau wrote: > > > > > Hi Dan, > > > > > > > > > > Certainly, I've uploaded them to fedora's paste bin and tried to snip > > > > just > > > > > the relevant details. > > > > > > > > > > Sender (hv01.melb.domain.net) > > > > > http://paste.fedoraproject.org/39660/92339651/ > > > > > > > > This one has > > > > > > > > libvirtError: operation failed: Failed to connect to remote libvirt > > > > URI qemu+tls://hv02.melb.domain.net/system > > > > > > > > which is most often related to firewall issues, and some time to key > > > > mismatch. > > > > > > > > Does > > > > virsh -c qemu+tls://hv02.melb.domain.net/system capabilities > > > > work when run from the command line of hv01? > > > > > > > > Dan. > > > > > Receiver (hv02.melb.domain.net) ` > > > > > http://paste.fedoraproject.org/39661/23406913/ > > > > > > > > > > VM being transfered is ovirt_guest_vm > > > > > > > > > > Thanks, > > > > > Andrew > > > > > > > > > > virsh -c qemu+tls://hv02.melb.domain.net/system > > > 2013-09-15 10:41:10.620+0000: 23994: info : libvirt version: 0.10.2, > > > package: 18.el6_4.9 (CentOS BuildSystem <http://bugs.centos.org>, > > > 2013-07-02-11:19:29, c6b8.bsys.dev.centos.org) > > > 2013-09-15 10:41:10.620+0000: 23994: warning : > > > virNetTLSContextCheckCertificate:1102 : Certificate check failed > > > Certificate failed validation: The certificate hasn't got a known issuer. > > > > Would you share your > > > > > > openssl x509 -in > > /etc/pki/vdsm/certs/cacert.pem -text > > > > openssl x509 -in /etc/pki/vdsm/certs/vdsmcert.pem -text > > > > on both hosts? This content may be sensitive, and may not > > provide an answer why libvirt on src cannot contact libvirtd on the > > other host. So before you do that, would you test if > > > > > > vdsClient -s hv02.melb.domain.net getVdsCapabilities > > > > works when run on hv01? It may be that the certificates are fine, but > > libvirt is not configured to use the correct ones. > > > > Dan. > > > > > vdsClient -s hv02.melb.domain.net getVdsCapabilities runs fine > > I did a quick comparison between the files on both hosts, they seem to have > the right details (host names, authority etc.) > cacert.pem matches > > /etc/libvirt/libvirtd.conf > > ca_file="/etc/pki/vdsm/certs/cacert.pem" > cert_file="/etc/pki/vdsm/certs/vdsmcert.pem" > key_file="/etc/pki/vdsm/keys/vdsmkey.pem" Maybe someone on libvir-list could guess why this could be happening?

3 4

[libvirt] [PATCH] virsh: move command maxvcpus from domain group to host group.
by yangdongsheng 16 Sep '13

16 Sep '13

Since the maxvcpus command query the maximum number of virtual CPUs supported for a guest VM on this connection, it should be in virsh-host.c but not virsh-domain.c. Signed-off-by: yangdongsheng <yangds.fnst(a)cn.fujitsu.com> --- tools/virsh-domain.c | 44 -------------------------------------------- tools/virsh-host.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 4f85f5f..50a57ee 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -5172,44 +5172,6 @@ cmdDomjobabort(vshControl *ctl, const vshCmd *cmd) } /* - * "maxvcpus" command - */ -static const vshCmdInfo info_maxvcpus[] = { - {.name = "help", - .data = N_("connection vcpu maximum") - }, - {.name = "desc", - .data = N_("Show maximum number of virtual CPUs for guests on this connection.") - }, - {.name = NULL} -}; - -static const vshCmdOptDef opts_maxvcpus[] = { - {.name = "type", - .type = VSH_OT_STRING, - .help = N_("domain type") - }, - {.name = NULL} -}; - -static bool -cmdMaxvcpus(vshControl *ctl, const vshCmd *cmd) -{ - const char *type = NULL; - int vcpus; - - if (vshCommandOptStringReq(ctl, cmd, "type", &type) < 0) - return false; - - if ((vcpus = virConnectGetMaxVcpus(ctl->conn, type)) < 0) - return false; - - vshPrint(ctl, "%d\n", vcpus); - - return true; -} - -/* * "vcpucount" command */ static const vshCmdInfo info_vcpucount[] = { @@ -10637,12 +10599,6 @@ const vshCmdDef domManagementCmds[] = { .info = info_managedsaveremove, .flags = 0 }, - {.name = "maxvcpus", - .handler = cmdMaxvcpus, - .opts = opts_maxvcpus, - .info = info_maxvcpus, - .flags = 0 - }, {.name = "memtune", .handler = cmdMemtune, .opts = opts_memtune, diff --git a/tools/virsh-host.c b/tools/virsh-host.c index 880ae4b..f69ab79 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -193,6 +193,44 @@ cleanup: } /* + * "maxvcpus" command + */ +static const vshCmdInfo info_maxvcpus[] = { + {.name = "help", + .data = N_("connection vcpu maximum") + }, + {.name = "desc", + .data = N_("Show maximum number of virtual CPUs for guests on this connection.") + }, + {.name = NULL} +}; + +static const vshCmdOptDef opts_maxvcpus[] = { + {.name = "type", + .type = VSH_OT_STRING, + .help = N_("domain type") + }, + {.name = NULL} +}; + +static bool +cmdMaxvcpus(vshControl *ctl, const vshCmd *cmd) +{ + const char *type = NULL; + int vcpus; + + if (vshCommandOptStringReq(ctl, cmd, "type", &type) < 0) + return false; + + if ((vcpus = virConnectGetMaxVcpus(ctl->conn, type)) < 0) + return false; + + vshPrint(ctl, "%d\n", vcpus); + + return true; +} + +/* * "nodeinfo" command */ static const vshCmdInfo info_nodeinfo[] = { @@ -863,6 +901,12 @@ const vshCmdDef hostAndHypervisorCmds[] = { .info = info_hostname, .flags = 0 }, + {.name = "maxvcpus", + .handler = cmdMaxvcpus, + .opts = opts_maxvcpus, + .info = info_maxvcpus, + .flags = 0 + }, {.name = "node-memory-tune", .handler = cmdNodeMemoryTune, .opts = opts_node_memory_tune, -- 1.7.10.1

4 3

[libvirt] [PATCH RESEND 0/4] Pre-create storage on live migration
by Michal Privoznik 16 Sep '13

16 Sep '13

[Resending due to some list difficulties] Currently users are required to pre-create storage on their own upon migration. This patch set implements the feature for RAW, QCOW and QCOW2 images. While for the RAW fallocate() is used (so we are guaranteed subsequent write() won't fail with ENOSPC, for the latter two we have no other option than using qemu-img, which uses ftruncate(). On the other hand, this is not such big deal. If the spare runs out as a domain is migrating, the migration is aborted, and pre-created storage unlink()-ed. There's no difference to what will happen if user will pre-create storage by hand. https://bugzilla.redhat.com/show_bug.cgi?id=927252 Michal Privoznik (4): qemu: Expose file opening functions qemu_domain: Introduce qemuDomainGetDiskBlockInfo qemu_migration: Check size prerequisites qemu_migration: Unlink pre-created storage on error src/qemu/qemu_domain.c | 299 ++++++++++++++++++++++++++++++++++++++++++++- src/qemu/qemu_domain.h | 16 +++ src/qemu/qemu_driver.c | 276 ++--------------------------------------- src/qemu/qemu_migration.c | 304 +++++++++++++++++++++++++++++++++++++++++++++- src/qemu/qemu_process.c | 8 ++ 5 files changed, 627 insertions(+), 276 deletions(-) -- 1.8.1.5

2 7