- Devel - libvirt List Archives

[libvirt] [PATCH] doc: Add info (where necessary) that paths should be specified as absolute
by Erik Skultety 09 Apr '15

09 Apr '15

We documented this almost everywhere, but missed it on several places. https://bugzilla.redhat.com/show_bug.cgi?id=1208763 --- Hopefully I didn't miss any place where it should be fixed as well. I also thought about adding a check for this issue in the code, but we probably do not want to do that during parsing, as the existing domains might as well disappear. The other thing is, that if the path is invalid, "No such file or directory" is returned which in my opinion describes the problem quite well. docs/formatdomain.html.in | 35 +++++++++++++++++++---------------- docs/formatstorage.html.in | 7 ++++--- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 1b496c3..7ceb1fa 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -126,7 +126,8 @@ provides details on allowed values for these. Since 0.0.1</dd> <dt><code>loader</code></dt> - <dd>The optional <code>loader</code> tag refers to a firmware blob + <dd>The optional <code>loader</code> tag refers to a firmware blob, + which is specified by absolute path, used to assist the domain creation process. It is used by Xen fully virtualized domains as well as setting the QEMU BIOS file path for QEMU/KVM domains. Xen since 0.1.0, @@ -142,10 +143,10 @@ <code>pflash</code>.</dd> <dt><code>nvram</code></dt> <dd>Some UEFI firmwares may want to use a non-volatile memory to store - some variables. In the host, this is represented as a file and the path - to the file is stored in this element. Moreover, when the domain is - started up libvirt copies so called master NVRAM store file defined - in <code>qemu.conf</code>. If needed, the <code>template</code> + some variables. In the host, this is represented as a file and the + absolute path to the file is stored in this element. Moreover, when the + domain is started up libvirt copies so called master NVRAM store file + defined in <code>qemu.conf</code>. If needed, the <code>template</code> attribute can be used to per domain override map of master NVRAM stores from the config file. Note, that for transient domains if the NVRAM file has been created by libvirt it is left behind and it is management @@ -971,7 +972,7 @@ resource partitions, potentially with nesting of said partitions. The <code>resource</code> element groups together configuration related to resource partitioning. It currently supports a child - element <code>partition</code> whose content defines the path + element <code>partition</code> whose content defines the absolute path of the resource partition in which to place the domain. If no partition is listed, then the domain will be placed in a default partition. It is the responsibility of the app/admin to ensure @@ -1954,8 +1955,8 @@ <dt><code>type='block'</code> since 0.0.3</dt> <dd> - The <code>dev</code> attribute specifies the path to the - host device to serve as the disk. + The <code>dev</code> attribute specifies the fully-qualified path + to the host device to serve as the disk. </dd> <dt><code>type='dir'</code> since 0.7.5</dt> @@ -3226,7 +3227,7 @@ versions of qemu used a default of "off", while newer qemus have a default of "on"). Since 0.9.7 (QEMU and KVM only). The optional - <code>file</code> attribute is used to point to a binary file + <code>file</code> attribute contains an absolute path to a binary file to be presented to the guest as the device's ROM BIOS. This can be useful, for example, to provide a PXE boot ROM for a virtual function of an sr-iov capable ethernet device (which @@ -3285,7 +3286,8 @@ Block / character devices from the host can be passed through to the guest using the <code>hostdev</code> element. This is - only possible with container based virtualization. + only possible with container based virtualization. Devices are specified + by a fully qualified path. since after 1.0.1 for LXC: @@ -5486,11 +5488,12 @@ qemu-kvm -net nic,model=? /dev/null <dl> <dt><code>master</code></dt> - <dd>Master device of the pair, that is passed to the hypervisor.</dd> + <dd>Master device of the pair, that is passed to the hypervisor. + Device is specified by a fully qualified path.</dd> <dt><code>slave</code></dt> <dd>Slave device of the pair, that is passed to the clients for connection - to the guest console.</dd> + to the guest console. Device is specified by a fully qualified path.</dd> </dl> <h4><a name="elementsSound">Sound devices</a></h4> @@ -5834,8 +5837,8 @@ qemu-kvm -net nic,model=? /dev/null This backend type requires exclusive access to a TPM device on the host. - An example for such a device is /dev/tpm0. The filename is - specified as path attribute of the <code>source</code> element. + An example for such a device is /dev/tpm0. The fully qualified file + name is specified by path attribute of the <code>source</code> element. If no file name is specified then /dev/tpm0 is automatically used. </dd> @@ -5941,8 +5944,8 @@ qemu-kvm -net nic,model=? /dev/null <dd> The optional <code>server</code> element can be used to configure a server socket the device is supposed to connect to. The optional - <code>path</code> attribute specifies the path to the unix socket and - defaults to <code>/var/lib/libvirt/shmem/$shmem-$name-sock</code>. + <code>path</code> attribute specifies the absolute path to the unix socket + and defaults to <code>/var/lib/libvirt/shmem/$shmem-$name-sock</code>. </dd> <dt><code>msi</code></dt> <dd> diff --git a/docs/formatstorage.html.in b/docs/formatstorage.html.in index 9c7b1bd..479e73c 100644 --- a/docs/formatstorage.html.in +++ b/docs/formatstorage.html.in @@ -379,9 +379,10 @@ <dl> <dt><code>path</code></dt> <dd>Provides the location at which the pool will be mapped into - the local filesystem namespace. For a filesystem/directory based - pool it will be the name of the directory in which volumes will - be created. For device based pools it will be the name of the directory in which + the local filesystem namespace, as an absolute path. For a + filesystem/directory based pool it will be a fully qualified name of + the directory in which volumes will be created. For device based pools + it will be a fully qualified name of the directory in which devices nodes exist. For the latter <code>/dev/</code> may seem like the logical choice, however, devices nodes there are not guaranteed stable across reboots, since they are allocated on -- 1.9.3

2 2

[libvirt] [PATCH 00/11] qemu: Refactor the block job code
by Peter Krempa 09 Apr '15

09 Apr '15

At the expense of adding 113 lines of code, kill the ugly qemuBlockJobImpl method and spread it's guts into separate functions. This series additionally fixes a issue with failed drive pivot and the abort function now returns errors if the returned event contained failure. Peter Krempa (11): qemu: monitor: Extract handling of JSON block job error codes qemu: domain: Introduce helper to retrieve domain monitor object qemu: domain: Add helper to check block job support qemu: blockjob: Use the new helpers in qemuDomainGetBlockJobInfo qemu: blockjob: Split qemuDomainBlockJobSetSpeed from qemuDomainBlockJobImpl qemu: Clean up old leftovers in qemuMonitorDrivePivot qemu: blockPivot: Don't pause the VM any more since we don't use drive-reopen qemu: blockjob: Separate qemuDomainBlockJobAbort from qemuDomainBlockJobImpl qemu: blockPull: Refactor the rest of qemuDomainBlockJobImpl qemu: drivePivot: Fix assumption when 'block-job-complete' fails qemu: Refactor qemuDomainBlockJobAbort() src/qemu/qemu_domain.c | 43 +++++ src/qemu/qemu_domain.h | 4 + src/qemu/qemu_driver.c | 437 +++++++++++++++++++++---------------------- src/qemu/qemu_migration.c | 8 +- src/qemu/qemu_monitor.c | 88 ++++++--- src/qemu/qemu_monitor.h | 35 ++-- src/qemu/qemu_monitor_json.c | 188 +++++++++++-------- src/qemu/qemu_monitor_json.h | 28 ++- tests/qemumonitorjsontest.c | 2 +- 9 files changed, 473 insertions(+), 360 deletions(-) -- 2.2.2

3 32

[libvirt] [PATCH] qemu: Avoid shadow of 'sync' symbol
by Peter Krempa 09 Apr '15

09 Apr '15

Old compilers whine that 'sync' is being shadowed in the function introduced in 1eccac1d2da7bbe97e1df25fd0ddac6e71b0794a. --- Pushed under the build-breaker rule. src/qemu/qemu_domain.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index c18b864..ae632c5 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3063,17 +3063,17 @@ qemuDomainSupportsBlockJobs(virDomainObjPtr vm, bool *modern) { qemuDomainObjPrivatePtr priv = vm->privateData; - bool async = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKJOB_ASYNC); - bool sync = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKJOB_SYNC); + bool asynchronous = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKJOB_ASYNC); + bool synchronous = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKJOB_SYNC); - if (!sync && !async) { + if (!synchronous && !asynchronous) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("block jobs not supported with this QEMU binary")); return -1; } if (modern) - *modern = async; + *modern = asynchronous; return 0; } -- 2.2.2

1 0

[libvirt] [PATCHv2.5 00/10] Add support for memory hotplug
by Peter Krempa 09 Apr '15

09 Apr '15

Rebased version after changes to the prequel series. This applies on top of http://www.redhat.com/archives/libvir-list/2015-March/msg00134.html Convenience branch to pull from: git fetch git://pipo.sk/pipo/libvirt.git memory-hotplug-2.5 Peter Krempa (10): conf: Add support for parsing and formatting max memory and slot count qemu: Implement setup of memory hotplug parameters conf: Add device address type for dimm devices conf: Add interface to parse and format memory device information qemu: memdev: Add infrastructure to load memory device information qemu: migration: Forbid migration with memory modules lacking info qemu: add support for memory devices qemu: conf: Add support for memory device cold(un)plug qemu: Implement memory device hotplug qemu: Implement memory device hotunplug docs/formatdomain.html.in | 98 ++++ docs/schemas/domaincommon.rng | 76 +++ src/bhyve/bhyve_domain.c | 9 +- src/conf/domain_conf.c | 564 ++++++++++++++++++++- src/conf/domain_conf.h | 60 +++ src/libvirt_private.syms | 7 + src/libxl/libxl_domain.c | 8 + src/lxc/lxc_domain.c | 8 + src/openvz/openvz_driver.c | 14 +- src/parallels/parallels_driver.c | 6 +- src/phyp/phyp_driver.c | 6 +- src/qemu/qemu_command.c | 166 +++++- src/qemu/qemu_command.h | 15 + src/qemu/qemu_domain.c | 80 +++ src/qemu/qemu_domain.h | 5 + src/qemu/qemu_driver.c | 29 ++ src/qemu/qemu_hotplug.c | 177 +++++++ src/qemu/qemu_hotplug.h | 6 + src/qemu/qemu_migration.c | 14 + src/qemu/qemu_monitor.c | 42 ++ src/qemu/qemu_monitor.h | 14 + src/qemu/qemu_monitor_json.c | 122 +++++ src/qemu/qemu_monitor_json.h | 5 + src/qemu/qemu_process.c | 4 + src/uml/uml_driver.c | 9 +- src/vbox/vbox_common.c | 6 +- src/vmware/vmware_driver.c | 6 +- src/vmx/vmx.c | 6 +- src/xen/xen_driver.c | 7 + src/xenapi/xenapi_driver.c | 9 +- tests/domainschemadata/maxMemory.xml | 19 + .../qemuxml2argv-memory-hotplug-dimm.args | 11 + .../qemuxml2argv-memory-hotplug-dimm.xml | 50 ++ .../qemuxml2argv-memory-hotplug-nonuma.xml | 22 + .../qemuxml2argv-memory-hotplug.args | 6 + .../qemuxml2argv-memory-hotplug.xml | 34 ++ tests/qemuxml2argvtest.c | 6 + tests/qemuxml2xmltest.c | 4 + 38 files changed, 1707 insertions(+), 23 deletions(-) create mode 100644 tests/domainschemadata/maxMemory.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-nonuma.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug.xml -- 2.2.2

3 27

[libvirt] [PATCH 0/3] Fix some storage issues
by John Ferlan 09 Apr '15

09 Apr '15

Patch 1 & 3 are bz based, while Patch 2 was determined while working on Patch 3. Details in each commit message John Ferlan (3): storage: Fix issues in storageVolResize storage: Need to update freeExtent at delete primary partition storage: Don't duplicate efforts of backend driver src/storage/storage_backend_disk.c | 9 +++-- src/storage/storage_driver.c | 67 ++++++++++++++++++++++++++++++-------- 2 files changed, 59 insertions(+), 17 deletions(-) -- 2.1.0

2 5

[libvirt] [PATCH 0/3] Honour sparse files on migration
by Michal Privoznik 09 Apr '15

09 Apr '15

When the storage is pre-created on the destination, it might have been allocated as sparse on the source. Let's keep it that way if we can. Michal Privoznik (3): qemuMigrationPrecreateStorage: Fix debug message qemuMigrationCookieNBD: Turn some items into their own struct qemuMigrationPrecreateDisk: Preserve sparse files src/qemu/qemu_migration.c | 49 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 37 insertions(+), 12 deletions(-) -- 2.0.5

2 4

[libvirt] securityselinuxlabeltest test fails on v1.2.5
by Scott Sullivan 09 Apr '15

09 Apr '15

I am trying to build v1.2.5-maint, however I have one test failing causing the build to fail: TEST: securityselinuxlabeltest !!!. 4 FAIL PASS: virsh-undefine ======================================= 1 of 112 tests failed Please report to libvir-list(a)redhat.com ======================================= make[2]: *** [check-TESTS] Error 1 make[2]: Leaving directory `/home/rpmbuild/packages/libvirt/tests' make[1]: *** [check-am] Error 2 make[1]: Leaving directory `/home/rpmbuild/packages/libvirt/tests' make: *** [check-recursive] Error 1 error: Bad exit status from /var/tmp/rpm-tmp.UGNUaq (%build) Is anyone else having this problem? Im building on CentOS 6.5. Im happy to provide any further information as needed.

7 12

[libvirt] [PATCH] lxc: create the required directories upon driver start
by Lubomir Rintel 09 Apr '15

09 Apr '15

/var/run may reside on a tmpfs and we fail to create the PID file if /var/run/lxc does not exist. Other drivers (well, BHYVE) seem to do the same thing. Signed-off-by: Lubomir Rintel <lkundrak(a)v3.sk> --- src/lxc/lxc_driver.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 245000d..4363898 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1648,6 +1648,20 @@ static int lxcStateInitialize(bool privileged, if (!(caps = virLXCDriverGetCapabilities(lxc_driver, false))) goto cleanup; + if (virFileMakePath(LXC_LOG_DIR) < 0) { + virReportSystemError(errno, + _("Failed to mkdir %s"), + LXC_LOG_DIR); + goto cleanup; + } + + if (virFileMakePath(LXC_STATE_DIR) < 0) { + virReportSystemError(errno, + _("Failed to mkdir %s"), + LXC_STATE_DIR); + goto cleanup; + } + /* Get all the running persistent or transient configs first */ if (virDomainObjListLoadAllConfigs(lxc_driver->domains, cfg->stateDir, -- 2.1.0

3 5

[libvirt] [PATCHv4 0/3] Support IPv6 addresses for graphics listening on networks
by Ján Tomko 09 Apr '15

09 Apr '15

v1: https://www.redhat.com/archives/libvir-list/2015-February/msg00442.html v2: https://www.redhat.com/archives/libvir-list/2015-February/msg01228.html v3: https://www.redhat.com/archives/libvir-list/2015-March/msg00423.html changes in v4: * remove the family attribute and just return the first IP address * rename virNetDevGetIPv4Address to virNetDevGetIPv4AddressIoctl John Ferlan (1): util: Replace virNetDevGetIPv4Address with virNetDevGetIPAddress Ján Tomko (1): Support IPv6 in networkGetNetworkAddress Luyao Huang (1): util: Update virNetDevGetIPAddress to get IPv6 addresses src/libvirt_private.syms | 2 +- src/network/bridge_driver.c | 11 ++-- src/util/virnetdev.c | 119 +++++++++++++++++++++++++++++++++++++++----- src/util/virnetdev.h | 2 +- 4 files changed, 114 insertions(+), 20 deletions(-) -- 2.0.5

3 5

[libvirt] [PATCH 0/2] Fix virVolLookupByPath error msg with pools that use URI as path
by Peter Krempa 09 Apr '15

09 Apr '15

Peter Krempa (2): test: Add tests for virFileSanitizePath util: file: Don't carelessly sanitize URIs src/util/virfile.c | 6 ++++++ tests/virfiletest.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) -- 2.2.2

2 4

[libvirt] [PATCH] conf: fix memleak in qemuRestoreCgroupState
by Luyao Huang 08 Apr '15

08 Apr '15

131,088 bytes in 16 blocks are definitely lost in loss record 2,174 of 2,176 at 0x4C29BFD: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) by 0x4C2BACB: realloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) by 0x52A026F: virReallocN (viralloc.c:245) by 0x52BFCB5: saferead_lim (virfile.c:1268) by 0x52C00EF: virFileReadLimFD (virfile.c:1328) by 0x52C019A: virFileReadAll (virfile.c:1351) by 0x52A5D4F: virCgroupGetValueStr (vircgroup.c:763) by 0x1DDA0DA3: qemuRestoreCgroupState (qemu_cgroup.c:805) by 0x1DDA0DA3: qemuConnectCgroup (qemu_cgroup.c:857) by 0x1DDB7BA1: qemuProcessReconnect (qemu_process.c:3694) by 0x52FD171: virThreadHelper (virthread.c:206) by 0x82B8DF4: start_thread (pthread_create.c:308) by 0x85C31AC: clone (clone.S:113) Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/qemu/qemu_cgroup.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 7d64ce7..f872525 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -796,6 +796,7 @@ qemuRestoreCgroupState(virDomainObjPtr vm) virCgroupSetCpusetMems(cgroup_temp, nodeset) < 0) goto cleanup; + VIR_FREE(nodeset); virCgroupFree(&cgroup_temp); } @@ -806,6 +807,7 @@ qemuRestoreCgroupState(virDomainObjPtr vm) virCgroupSetCpusetMems(cgroup_temp, nodeset) < 0) goto cleanup; + VIR_FREE(nodeset); virCgroupFree(&cgroup_temp); } -- 1.8.3.1

3 2

[libvirt] [PATCHv2 0/2] vbox: Add support for virDomainSendKey
by Dawid Zamirski 08 Apr '15

08 Apr '15

Those patches implement support for virDomainSendKey in the VBOX driver. Since VBOX SDK does not support "holdtime" natively, it's being simulated by using usleep to wait for that time before "key-up" scancodes are sent. The "key-up" scancodes are automatically generated by add 0x80 to "key-down" scancodes. This is done to make the implementation match the behavior of how QEMU driver handles this, and therefore is different from what native VBoxManage command does - e.g. one has to type in "key-up" scancodes explicitely and no hold time support at all. --- v1 (for reference): https://www.redhat.com/archives/libvir-list/2015-March/msg01028.html v2: - add virReportError in all potentially failing code paths - coding style adjustment - mark for 1.2.15 Dawid Zamirski (2): vbox: Register IKeyboard with the unified API. vbox: Implement virDomainSendKey src/vbox/vbox_common.c | 120 ++++++++++++++++++++++++++++++++++++++++++ src/vbox/vbox_common.h | 1 + src/vbox/vbox_tmpl.c | 27 ++++++++++ src/vbox/vbox_uniformed_api.h | 8 +++ 4 files changed, 156 insertions(+) -- 2.3.4

2 3

[libvirt] [PATCH] qemu_driver: check caps after starting block job
by Michael Chapman 08 Apr '15

08 Apr '15

Currently we check qemuCaps before starting the block job. But qemuCaps isn't available on a stopped domain, which means we get a misleading error message in this case: # virsh domstate example shut off # virsh blockjob example vda error: unsupported configuration: block jobs not supported with this QEMU binary Move the qemuCaps check into the block job so that we are guaranteed the domain is running. Signed-off-by: Michael Chapman <mike(a)very.puzzling.org> --- src/qemu/qemu_driver.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index becf415..cb9295e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16476,12 +16476,6 @@ qemuDomainGetBlockJobInfo(virDomainPtr dom, const char *path, } priv = vm->privateData; - if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKJOB_ASYNC) && - !virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKJOB_SYNC)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("block jobs not supported with this QEMU binary")); - goto cleanup; - } if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) goto cleanup; @@ -16492,6 +16486,13 @@ qemuDomainGetBlockJobInfo(virDomainPtr dom, const char *path, goto endjob; } + if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKJOB_ASYNC) && + !virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKJOB_SYNC)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("block jobs not supported with this QEMU binary")); + goto endjob; + } + device = qemuDiskPathToAlias(vm, path, &idx); if (!device) goto endjob; -- 2.1.0

2 1

[libvirt] [PATCH] qemu_migrate: use nested job when adding NBD to cookie
by Michael Chapman 08 Apr '15

08 Apr '15

qemuMigrationCookieAddNBD is usually called from within an async MIGRATION_OUT or MIGRATION_IN job, so it needs to start a nested job. (The one exception is during the Begin phase when change protection isn't enabled, but qemuDomainObjEnterMonitorAsync will behave the same as qemuDomainObjEnterMonitor in this case.) This bug was encountered with a libvirt client that repeatedly queries the disk mirroring block job info during a migration. If one of these queries occurs just as the Perform migration cookie is baked, libvirt crashes. Relevant logs are as follows: 6701: warning : qemuDomainObjEnterMonitorInternal:1544 : This thread seems to be the async job owner; entering monitor without asking for a nested job is dangerous [1] 6701: info : qemuMonitorSend:972 : QEMU_MONITOR_SEND_MSG: mon=0x7fefdc004700 msg={"execute":"query-block","id":"libvirt-629"} [2] 6699: info : qemuMonitorIOWrite:503 : QEMU_MONITOR_IO_WRITE: mon=0x7fefdc004700 buf={"execute":"query-block","id":"libvirt-629"} [3] 6704: info : qemuMonitorSend:972 : QEMU_MONITOR_SEND_MSG: mon=0x7fefdc004700 msg={"execute":"query-block-jobs","id":"libvirt-630"} [4] 6699: info : qemuMonitorJSONIOProcessLine:203 : QEMU_MONITOR_RECV_REPLY: mon=0x7fefdc004700 reply={"return": [...], "id": "libvirt-629"} 6699: error : qemuMonitorJSONIOProcessLine:211 : internal error: Unexpected JSON reply '{"return": [...], "id": "libvirt-629"}' At [1] qemuMonitorBlockStatsUpdateCapacity sends its request, then waits on mon->notify. At [2] the request is written out to the monitor socket. At [3] qemuMonitorBlockJobInfo sends its request, and also waits on mon->notify. The reply from the first request is received at [4]. However, qemuMonitorJSONIOProcessLine is not expecting this reply since the second request hadn't completed sending. The reply is dropped and an error is returned. qemuMonitorIO signals mon->notify twice during its error handling, waking up both of the threads waiting on it. One of them clears mon->msg as it exits qemuMonitorSend; the other crashes: qemuMonitorSend (mon=0x7fefdc004700, msg=<value optimized out>) at qemu/qemu_monitor.c:975 975 while (!mon->msg->finished) { (gdb) print mon->msg $1 = (qemuMonitorMessagePtr) 0x0 Signed-off-by: Michael Chapman <mike(a)very.puzzling.org> --- src/qemu/qemu_migration.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 5607d1a..d770aea 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -571,7 +571,9 @@ qemuMigrationCookieAddNBD(qemuMigrationCookiePtr mig, if (!(stats = virHashCreate(10, virHashValueFree))) goto cleanup; - qemuDomainObjEnterMonitor(driver, vm); + if (qemuDomainObjEnterMonitorAsync(driver, vm, + priv->job.asyncJob) < 0) + goto cleanup; rc = qemuMonitorBlockStatsUpdateCapacity(priv->mon, stats, false); if (qemuDomainObjExitMonitor(driver, vm) < 0) goto cleanup; -- 2.1.0

2 1

[libvirt] [PATCH v2 0/3] A few NUMA fixes
by Michal Privoznik 08 Apr '15

08 Apr '15

diff to v1: -reworked to follow Jan's review. Hopefully. Michal Privoznik (3): vircgroup: Introduce virCgroupControllerAvailable qemuProcessHook: Call virNuma*() iff needed virLXCControllerSetupResourceLimits: Call virNuma*() iff needed src/libvirt_private.syms | 1 + src/lxc/lxc_controller.c | 22 ++++++++++++++++------ src/qemu/qemu_process.c | 21 +++++++++++++++++---- src/util/vircgroup.c | 19 +++++++++++++++++++ src/util/vircgroup.h | 1 + tests/vircgrouptest.c | 31 +++++++++++++++++++++++++++++++ 6 files changed, 85 insertions(+), 10 deletions(-) -- 2.0.5

2 6

[libvirt] [PATCH 0/3] qemu: fix broken block job handling
by Peter Krempa 08 Apr '15

08 Apr '15

Block job handling violates our usage of domain jobs and changes disk source definition behind our back. Peter Krempa (3): qemu: process: Export qemuProcessFindDomainDiskByAlias qemu: event: Don't fiddle with disk backing trees without a job qemu: Disallow concurrent block jobs on a single disk src/conf/domain_conf.h | 1 + src/qemu/qemu_domain.c | 23 +++++++ src/qemu/qemu_domain.h | 4 ++ src/qemu/qemu_driver.c | 170 +++++++++++++++++++++++++++++++++++++++++++----- src/qemu/qemu_process.c | 131 +++++++------------------------------ src/qemu/qemu_process.h | 3 + 6 files changed, 211 insertions(+), 121 deletions(-) -- 2.2.2

4 11

[libvirt] [PATCH] parallels: delete old networks in prlsdkDoApplyConfig before adding new ones
by Maxim Nestratov 08 Apr '15

08 Apr '15

In order to change an existing domain we delete all existing devices and add new from scratch. In case of network devices we should also delete corresponding virtual networks (if any) before removing actual devices from xml. In the patch, we do it by extending prlsdkDoApplyConfig with a new parameter, which stands for old xml, and calling prlsdkDelNet every time old xml is specified. Signed-off-by: Maxim Nestratov <mnestratov(a)parallels.com> --- src/parallels/parallels_sdk.c | 24 +++++++++++++++--------- 1 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/parallels/parallels_sdk.c b/src/parallels/parallels_sdk.c index c36b772..64a2d15 100644 --- a/src/parallels/parallels_sdk.c +++ b/src/parallels/parallels_sdk.c @@ -2935,7 +2935,8 @@ prlsdkAddFS(PRL_HANDLE sdkdom, virDomainFSDefPtr fs) static int prlsdkDoApplyConfig(virConnectPtr conn, PRL_HANDLE sdkdom, - virDomainDefPtr def) + virDomainDefPtr def, + virDomainDefPtr olddef) { PRL_RESULT pret; size_t i; @@ -2997,6 +2998,16 @@ prlsdkDoApplyConfig(virConnectPtr conn, if (prlsdkRemoveBootDevices(sdkdom) < 0) goto error; + if(olddef) { + for (i = 0; i < olddef->nnets; i++) + prlsdkDelNet(conn->privateData, olddef->nets[i]); + } + + for (i = 0; i < def->nnets; i++) { + if (prlsdkAddNet(sdkdom, conn->privateData, def->nets[i]) < 0) + goto error; + } + if (prlsdkApplyGraphicsParams(sdkdom, def) < 0) goto error; @@ -3008,11 +3019,6 @@ prlsdkDoApplyConfig(virConnectPtr conn, goto error; } - for (i = 0; i < def->nnets; i++) { - if (prlsdkAddNet(sdkdom, conn->privateData, def->nets[i]) < 0) - goto error; - } - for (i = 0; i < def->ndisks; i++) { bool bootDisk = false; @@ -3060,7 +3066,7 @@ prlsdkApplyConfig(virConnectPtr conn, if (PRL_FAILED(waitJob(job, privconn->jobTimeout))) return -1; - ret = prlsdkDoApplyConfig(conn, sdkdom, new); + ret = prlsdkDoApplyConfig(conn, sdkdom, new, dom->def); if (ret == 0) { job = PrlVm_CommitEx(sdkdom, PVCF_DETACH_HDD_BUNDLE); @@ -3100,7 +3106,7 @@ prlsdkCreateVm(virConnectPtr conn, virDomainDefPtr def) pret = PrlVmCfg_SetOfflineManagementEnabled(sdkdom, 0); prlsdkCheckRetGoto(pret, cleanup); - ret = prlsdkDoApplyConfig(conn, sdkdom, def); + ret = prlsdkDoApplyConfig(conn, sdkdom, def, NULL); if (ret) goto cleanup; @@ -3162,7 +3168,7 @@ prlsdkCreateCt(virConnectPtr conn, virDomainDefPtr def) } - ret = prlsdkDoApplyConfig(conn, sdkdom, def); + ret = prlsdkDoApplyConfig(conn, sdkdom, def, NULL); if (ret) goto cleanup; -- 1.7.1

3 2

[libvirt] [PATCH 0/4] Various bugfixes for cancelled VM migrations
by Michael Chapman 08 Apr '15

08 Apr '15

This patch series contains fixes for several bugs I encountered while deliberately forcing a VM migration to abort by killing the libvirt client. My VM has storage on local disk, which needs to be mirrored during the migration, and this gives ample time for this abort to take place. The particular bug I encountered depended on precisely which phase the migration had made it to (e.g. whether disk mirroring had actually commenced). Patch 1 fixes a crash on the destination libvirt daemon due to a use-after-free of the domain object. Patches 2 and 4 fix some bugs related to the close callback handling on the source libvirt side. Patch 3 ensures that the VM on the source libvirt does not get into an invalid state if its migration is aborted during disk mirroring. All patches are independent of one another and can be applied separately. Michael Chapman (4): qemu: fix crash in qemuProcessAutoDestroy qemu: fix error propagation in qemuMigrationBegin qemu: fix race between disk mirror fail and cancel util: fix removal of callbacks in virCloseCallbacksRun src/qemu/qemu_domain.c | 5 +++++ src/qemu/qemu_migration.c | 12 +++++++++++- src/qemu/qemu_process.c | 4 +++- src/util/virclosecallbacks.c | 10 ++++++---- 4 files changed, 25 insertions(+), 6 deletions(-) -- 2.1.0

2 9

[libvirt] [PATCH 0/2] fail out if enable userns but disable netns
by Chen Hanxiao 08 Apr '15

08 Apr '15

Chen Hanxiao (2): Revert "LXC: create a bind mount for sysfs when enable userns but disable netns" LXC: make sure netns been enabled when trying to enable userns src/lxc/lxc_container.c | 45 ++++++++++++++++----------------------------- 1 file changed, 16 insertions(+), 29 deletions(-) -- 2.1.0

3 8

[libvirt] [RFC PATCH 0/2] Vbox: Add support for virDomainSendKey
by Dawid Zamirski 07 Apr '15

07 Apr '15

Hello, Those small patches implement virDomainSendKey support in VBOX driver. However, the VBOX SDK does not support "holdtime" so I used usleep to wait for that time before sending "key-up" scancodes. This makes it behave similarly to QEMU driver, however I'm not sure if that way of handling this would be preferred. Another option, would be to ignore holdtime argument and make virDomainSendKey work the same as via VBoxManage cli tool where one has to send "key-down" scancodes followed by "key-up" scancodes. For this RFC paches, I've choosen to make it work as close to the public API documentation. Dawid Zamirski (2): vbox: Register IKeyboard with the unified API. vbox: Implement virDomainSendKey src/vbox/vbox_common.c | 107 ++++++++++++++++++++++++++++++++++++++++++ src/vbox/vbox_common.h | 1 + src/vbox/vbox_tmpl.c | 27 +++++++++++ src/vbox/vbox_uniformed_api.h | 8 ++++ 4 files changed, 143 insertions(+) -- 2.3.3

2 4

[libvirt] [PATCH 0/6] Add support for storage pool state XML
by Erik Skultety 07 Apr '15

07 Apr '15

Patches add necessary changes to add support for storage pool state XMLs and thus resolve https://bugzilla.redhat.com/show_bug.cgi?id=1177733 Erik Skultety (6): conf: Introduce virStoragePoolDefFormatBuf conf: Introduce virStoragePoolSaveXML conf: Introduce virStoragePoolSaveState storage: Add support for storage pool state XML conf: Introduce virStoragePoolLoadAllState && virStoragePoolLoadState storage: Introduce storagePoolUpdateAllState function src/conf/storage_conf.c | 233 ++++++++++++++++++++++++++++++++++++------- src/conf/storage_conf.h | 12 ++- src/libvirt_private.syms | 2 + src/storage/storage_driver.c | 188 +++++++++++++++++++++++++++------- 4 files changed, 358 insertions(+), 77 deletions(-) -- 1.9.3

4 22

[libvirt] [PATCH] hostdev: Report the domain name for used hostdevs during nodedev-detach
by Shivaprasad G Bhat 07 Apr '15

07 Apr '15

The nodedev-detach can report the name of the domain using the device just the way nodedev-reattach does it. Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- src/util/virhostdev.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c index 23365a3..55eb9c9 100644 --- a/src/util/virhostdev.c +++ b/src/util/virhostdev.c @@ -1519,11 +1519,18 @@ int virHostdevPCINodeDeviceDetach(virHostdevManagerPtr hostdev_mgr, virPCIDevicePtr pci) { + virPCIDeviceAddressPtr devAddr = NULL; int ret = -1; virObjectLock(hostdev_mgr->activePCIHostdevs); virObjectLock(hostdev_mgr->inactivePCIHostdevs); + if (!(devAddr = virPCIDeviceGetAddress(pci))) + goto out; + + if (virHostdevIsPCINodeDeviceUsed(devAddr, hostdev_mgr)) + goto out; + if (virPCIDeviceDetach(pci, hostdev_mgr->activePCIHostdevs, hostdev_mgr->inactivePCIHostdevs) < 0) { goto out;

3 2

[libvirt] [PATCH 0/3] Fix couple of memleaks
by Michal Privoznik 07 Apr '15

07 Apr '15

*** BLURB HERE *** Michal Privoznik (3): qemuSetupCgroupForVcpu: Fix memleak virDomainVirtioSerialAddrSetFree: Fix memleak virQEMUDriverGetConfig: Fix memleak src/conf/domain_addr.c | 1 + src/qemu/qemu_cgroup.c | 8 ++++--- src/qemu/qemu_command.c | 5 ++++- src/qemu/qemu_domain.c | 58 +++++++++++++++++++++++-------------------------- 4 files changed, 37 insertions(+), 35 deletions(-) -- 2.0.5

2 6

[libvirt] [libvirt-cmdref PATCH] Adding Documentation for cd
by Swaathi Ramesh 07 Apr '15

07 Apr '15

The documentation for command cd did not have information about the command. Added the required information. --- source/cd.xml | 38 ++++++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/source/cd.xml b/source/cd.xml index 78a13df..d15c74c 100644 --- a/source/cd.xml +++ b/source/cd.xml @@ -9,16 +9,46 @@ </text> </description> - <options /> + <options> + <parameter requirement="optional"> + <keyword requirement="optional">--dir</keyword> + <value type="string" requirement="optional">path</value> + <description> + <text> + directory to switch to (default: home or else root) + </text> + <text> + --dir itself is optional + </text> + </description> + </parameter> + </options> <availability from="0.7.0" /> <notes /> - <examples type="usage" /> + <examples type="usage" > + <example> + <terminal> +virsh # <bold> cd </bold> <value>/tmp</value> </terminal> + <text> + Changes the current working directory to <value> /tmp </value> + </text> + </example> + </examples> <examples type="fullcontext" /> - <reference type="seealso" /> - + <reference type="seealso" > + <item> + <link type="internal" href="pwd"/> + <name> + pwd + </name> + <description> + Displays the current directory + </description> + </item> + </reference> </command> -- 1.9.1

2 1

[libvirt] [PATCH] virsh: Improve change-media success message
by Cole Robinson 07 Apr '15

07 Apr '15

$ sudo virsh change-media f19 hdc /mnt/data/devel/media/Fedora-16-x86_64-Live-KDE.iso succeeded to complete action update on media Change the message to: Successfully {inserted,ejected,changed} media. https://bugzilla.redhat.com/show_bug.cgi?id=967946 --- tools/virsh-domain.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 020a308..928360c 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -12295,6 +12295,7 @@ cmdChangeMedia(vshControl *ctl, const vshCmd *cmd) bool ret = false; vshUpdateDiskXMLType update_type; const char *action = NULL; + const char *success_msg = NULL; bool config = vshCommandOptBool(cmd, "config"); bool live = vshCommandOptBool(cmd, "live"); bool current = vshCommandOptBool(cmd, "current"); @@ -12314,16 +12315,19 @@ cmdChangeMedia(vshControl *ctl, const vshCmd *cmd) if (eject) { update_type = VSH_UPDATE_DISK_XML_EJECT; action = "eject"; + success_msg = _("Successfully ejected media."); } if (insert) { update_type = VSH_UPDATE_DISK_XML_INSERT; action = "insert"; + success_msg = _("Successfully inserted media."); } if (update || (!eject && !insert)) { update_type = VSH_UPDATE_DISK_XML_UPDATE; action = "update"; + success_msg = _("Successfully updated media."); } VSH_EXCLUSIVE_OPTIONS_VAR(current, live); @@ -12367,7 +12371,7 @@ cmdChangeMedia(vshControl *ctl, const vshCmd *cmd) goto cleanup; } - vshPrint(ctl, _("succeeded to complete action %s on media\n"), action); + vshPrint(ctl, "%s", success_msg); } ret = true; -- 2.3.4

2 2

[libvirt] RFC: whether or not to support multiple IDE controllers (and any IDE at all on Q35)
by Laine Stump 06 Apr '15

06 Apr '15

Due to a bug report by someone trying to add two cd drives to a Q35 domain in virt-manager (which assumes all CD drives are IDE), I've learned that libvirt doesn't support adding a "piix3-ide" controller when there is no ide controller for the domain (or when there are more than 4 disk devices that need to be connected to an IDE controller). It does dutifully add: <controller type='ide' index='n'/> as many times as necessary, it's just that there is no code behind that to add the device to the qemu commandline. I first thought I should add support for this, but then had second thoughts after following this reasoning: 1) I'm not sure exactly where the piix3-ide controller was added to qemu, but it was apparently sometime after qemu-1.2.0 (at least according to tests/qemuhelpdata/qemu-1.2.0-device). 2) At some point (again not sure, but it was there at least in qemu 1.0) support for a SATA controller was added (named ich9-achi by qemu), and it can also accept CD devices. So there is no version of qemu that has piix3-ide and no ich9-ahci. 3) "ide old, ahci new" 4) I'm doubtful there is any OS old enough to require an IDE disk controller rather than SATA that anyone would also want to put > 4 disk devices on. That leads me to think that maybe it is a better idea to just log an error if someone tries to add a disk with bus='ide' on a Q35 domain, or add more than 4 of them on an i440fx domain. Does anyone have an opinion, or (better yet) a smoking gun (e.g. problems with piix3-ide, or alternately problems with ahci or a situation where IDE would be required) that will force action in one direction or the other? (One possible example - although ahci was added on or before qemu 1.0, up until the most recent upstream it wasn't possible to migrate or save a domain with an ahci controller. Do we need to worry about people with qemu < 2.3.0 that want > 4 IDE devices? Or should we figure that if none have come up before now, likely none will come up in the future either?)

1 1

[libvirt] [PATCH] libvirt: virsh: Kill all uses of __FUNCTION__ in error messages
by Noella Ashu 04 Apr '15

04 Apr '15

The error output of snapshot-revert should be more friendly. There is no need to show up virDomainRevertToSnapshot to user. virError already includes __FUNCTION__ information in a separate member of the struct, so repeating it in the message is redundant and leads to situations where higher level code ends up reporting the lower level name We correctly converted the error output making it more succinct and user-friendly. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1086726 --- src/libvirt-domain-snapshot.c | 30 +++---- src/libvirt-domain.c | 201 ++++++++++++++++++------------------------ 2 files changed, 96 insertions(+), 135 deletions(-) diff --git a/src/libvirt-domain-snapshot.c b/src/libvirt-domain-snapshot.c index 9feb669..ac858ba 100644 --- a/src/libvirt-domain-snapshot.c +++ b/src/libvirt-domain-snapshot.c @@ -222,26 +222,20 @@ virDomainSnapshotCreateXML(virDomainPtr domain, if ((flags & VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT) && !(flags & VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE)) { - virReportInvalidArg(flags, - _("use of 'current' flag in %s requires " - "'redefine' flag"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("use of 'current' flag in requires 'redefine' flag")); goto error; } if ((flags & VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE) && (flags & VIR_DOMAIN_SNAPSHOT_CREATE_NO_METADATA)) { - virReportInvalidArg(flags, - _("'redefine' and 'no metadata' flags in %s are " - "mutually exclusive"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("'redefine' and 'no metadata' flags in are mutually exclusive")); goto error; } if ((flags & VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE) && (flags & VIR_DOMAIN_SNAPSHOT_CREATE_HALT)) { - virReportInvalidArg(flags, - _("'redefine' and 'halt' flags in %s are mutually " - "exclusive"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("'redefine' and 'halt' flags are mutually exclusive")); goto error; } @@ -1084,10 +1078,8 @@ virDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, if ((flags & VIR_DOMAIN_SNAPSHOT_REVERT_RUNNING) && (flags & VIR_DOMAIN_SNAPSHOT_REVERT_PAUSED)) { - virReportInvalidArg(flags, - _("running and paused flags in %s are mutually " - "exclusive"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("running and paused flags are mutually exclusive")); goto error; } @@ -1146,10 +1138,8 @@ virDomainSnapshotDelete(virDomainSnapshotPtr snapshot, if ((flags & VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN) && (flags & VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN_ONLY)) { - virReportInvalidArg(flags, - _("children and children_only flags in %s are " - "mutually exclusive"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("children and children_only flags are mutually exclusive")); goto error; } diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 8b5f91e..e0be331 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -385,9 +385,7 @@ virDomainLookupByUUIDString(virConnectPtr conn, const char *uuidstr) virCheckNonNullArgGoto(uuidstr, error); if (virUUIDParse(uuidstr, uuid) < 0) { - virReportInvalidArg(uuidstr, - _("uuidstr in %s must be a valid UUID"), - __FUNCTION__); + virReportInvalidArg(uuidstr, "%s", _("Invalid UUID")); goto error; } @@ -1440,9 +1438,9 @@ virDomainScreenshot(virDomainPtr domain, virCheckReadOnlyGoto(domain->conn->flags, error); if (domain->conn != stream->conn) { - virReportInvalidArg(stream, - _("stream in %s must match connection of domain '%s'"), - __FUNCTION__, domain->name); + virReportInvalidArg(stream, "%s", + _("stream must match connection of domain '%s'"), + domain->name); goto error; } @@ -2179,10 +2177,8 @@ virDomainGetMemoryParameters(virDomainPtr domain, /* At most one of these two flags should be set. */ if ((flags & VIR_DOMAIN_AFFECT_LIVE) && (flags & VIR_DOMAIN_AFFECT_CONFIG)) { - virReportInvalidArg(flags, - _("flags 'affect live' and 'affect config' in %s " - "are mutually exclusive"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("flags 'affect live' and 'affect config' are mutually exclusive")); goto error; } conn = domain->conn; @@ -2423,10 +2419,8 @@ virDomainGetBlkioParameters(virDomainPtr domain, /* At most one of these two flags should be set. */ if ((flags & VIR_DOMAIN_AFFECT_LIVE) && (flags & VIR_DOMAIN_AFFECT_CONFIG)) { - virReportInvalidArg(flags, - _("flags 'affect live' and 'affect config' in %s " - "are mutually exclusive"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("flags 'affect live' and 'affect config' are mutually exclusive")); goto error; } conn = domain->conn; @@ -3343,9 +3337,8 @@ virDomainMigratePeer2PeerFull(virDomainPtr domain, if (!(tempuri = virURIParse(dconnuri))) return -1; if (!tempuri->server || STRPREFIX(tempuri->server, "localhost")) { - virReportInvalidArg(dconnuri, - _("unable to parse server from dconnuri in %s"), - __FUNCTION__); + virReportInvalidArg(dconnuri, "%s", + _("unable to parse server from dconnuri")); virURIFree(tempuri); return -1; } @@ -3580,10 +3573,9 @@ virDomainMigrate(virDomainPtr domain, if (flags & VIR_MIGRATE_NON_SHARED_DISK && flags & VIR_MIGRATE_NON_SHARED_INC) { - virReportInvalidArg(flags, - _("flags 'shared disk' and 'shared incremental' " - "in %s are mutually exclusive"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("flags 'shared disk' and 'shared incremental'" + " are mutually exclusive")); goto error; } @@ -3809,10 +3801,9 @@ virDomainMigrate2(virDomainPtr domain, if (flags & VIR_MIGRATE_NON_SHARED_DISK && flags & VIR_MIGRATE_NON_SHARED_INC) { - virReportInvalidArg(flags, + virReportInvalidArg(flags, "%s", _("flags 'shared disk' and 'shared incremental' " - "in %s are mutually exclusive"), - __FUNCTION__); + "are mutually exclusive")); goto error; } @@ -3989,10 +3980,9 @@ virDomainMigrate3(virDomainPtr domain, if (flags & VIR_MIGRATE_NON_SHARED_DISK && flags & VIR_MIGRATE_NON_SHARED_INC) { - virReportInvalidArg(flags, + virReportInvalidArg(flags, "%s", _("flags 'shared disk' and 'shared incremental' " - "in %s are mutually exclusive"), - __FUNCTION__); + "are mutually exclusive")); goto error; } if (flags & VIR_MIGRATE_PEER2PEER) { @@ -4212,10 +4202,9 @@ virDomainMigrateToURI(virDomainPtr domain, if (flags & VIR_MIGRATE_NON_SHARED_DISK && flags & VIR_MIGRATE_NON_SHARED_INC) { - virReportInvalidArg(flags, + virReportInvalidArg(flags, "%s", _("flags 'shared disk' and 'shared incremental' " - "in %s are mutually exclusive"), - __FUNCTION__); + "are mutually exclusive")); goto error; } @@ -4372,10 +4361,9 @@ virDomainMigrateToURI2(virDomainPtr domain, if (flags & VIR_MIGRATE_NON_SHARED_DISK && flags & VIR_MIGRATE_NON_SHARED_INC) { - virReportInvalidArg(flags, + virReportInvalidArg(flags, "%s", _("flags 'shared disk' and 'shared incremental' " - "in %s are mutually exclusive"), - __FUNCTION__); + "are mutually exclusive")); goto error; } @@ -4481,10 +4469,9 @@ virDomainMigrateToURI3(virDomainPtr domain, if (flags & VIR_MIGRATE_NON_SHARED_DISK && flags & VIR_MIGRATE_NON_SHARED_INC) { - virReportInvalidArg(flags, + virReportInvalidArg(flags, "%s", _("flags 'shared disk' and 'shared incremental' " - "in %s are mutually exclusive"), - __FUNCTION__); + "are mutually exclusive")); goto error; } @@ -4791,9 +4778,8 @@ virDomainMigratePrepareTunnel(virConnectPtr conn, virCheckReadOnlyGoto(conn->flags, error); if (conn != st->conn) { - virReportInvalidArg(conn, - _("conn in %s must match stream connection"), - __FUNCTION__); + virReportInvalidArg(conn, "%s", + _("conn must match stream connection")); goto error; } @@ -4937,9 +4923,8 @@ virDomainMigratePrepareTunnel3(virConnectPtr conn, virCheckReadOnlyGoto(conn->flags, error); if (conn != st->conn) { - virReportInvalidArg(conn, - _("conn in %s must match stream connection"), - __FUNCTION__); + virReportInvalidArg(conn, "%s", + _("conn must match stream connection")); goto error; } @@ -5221,8 +5206,7 @@ virDomainMigratePrepareTunnel3Params(virConnectPtr conn, if (conn != st->conn) { virReportInvalidArg(conn, - _("conn in %s must match stream connection"), - __FUNCTION__); + _("conn must match stream connection")); goto error; } @@ -5529,10 +5513,9 @@ virDomainGetSchedulerParametersFlags(virDomainPtr domain, /* At most one of these two flags should be set. */ if ((flags & VIR_DOMAIN_AFFECT_LIVE) && (flags & VIR_DOMAIN_AFFECT_CONFIG)) { - virReportInvalidArg(flags, - _("flags 'affect live' and 'affect config' in %s " - "are mutually exclusive"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("flags 'affect live' and 'affect config' in " + "are mutually exclusive")); goto error; } conn = domain->conn; @@ -5709,9 +5692,9 @@ virDomainBlockStats(virDomainPtr dom, const char *disk, virCheckNonNullArgGoto(disk, error); virCheckNonNullArgGoto(stats, error); if (size > sizeof(stats2)) { - virReportInvalidArg(size, - _("size in %s must not exceed %zu"), - __FUNCTION__, sizeof(stats2)); + virReportInvalidArg(size, "%s", + _("size must not exceed %zu"), + sizeof(stats2)); goto error; } conn = dom->conn; @@ -5850,9 +5833,9 @@ virDomainInterfaceStats(virDomainPtr dom, const char *path, virCheckNonNullArgGoto(path, error); virCheckNonNullArgGoto(stats, error); if (size > sizeof(stats2)) { - virReportInvalidArg(size, - _("size in %s must not exceed %zu"), - __FUNCTION__, sizeof(stats2)); + virReportInvalidArg(size, "%s", + _("size must not exceed %zu"), + sizeof(stats2)); goto error; } @@ -6297,10 +6280,9 @@ virDomainMemoryPeek(virDomainPtr dom, /* Exactly one of these two flags must be set. */ if (!(flags & VIR_MEMORY_VIRTUAL) == !(flags & VIR_MEMORY_PHYSICAL)) { - virReportInvalidArg(flags, - _("flags in %s must include VIR_MEMORY_VIRTUAL or " - "VIR_MEMORY_PHYSICAL"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("flags must include VIR_MEMORY_VIRTUAL or " + "VIR_MEMORY_PHYSICAL")); goto error; } @@ -7144,9 +7126,9 @@ virDomainSendKey(virDomainPtr domain, virCheckPositiveArgGoto(nkeycodes, error); if (nkeycodes > VIR_DOMAIN_SEND_KEY_MAX_KEYS) { - virReportInvalidArg(nkeycodes, - _("nkeycodes in %s must be <= %d"), - __FUNCTION__, VIR_DOMAIN_SEND_KEY_MAX_KEYS); + virReportInvalidArg(nkeycodes, "%s", + _("nkeycodes must be <= %d"), + VIR_DOMAIN_SEND_KEY_MAX_KEYS); goto error; } @@ -7344,8 +7326,8 @@ virDomainSetVcpusFlags(virDomainPtr domain, unsigned int nvcpus, flags & VIR_DOMAIN_VCPU_MAXIMUM) { virReportInvalidArg(flags, _("flags 'VIR_DOMAIN_VCPU_MAXIMUM' and " - "'VIR_DOMAIN_VCPU_GUEST' in '%s' are mutually " - "exclusive"), __FUNCTION__); + "'VIR_DOMAIN_VCPU_GUEST' in are mutually " + "exclusive")); goto error; } @@ -7419,10 +7401,9 @@ virDomainGetVcpusFlags(virDomainPtr domain, unsigned int flags) /* At most one of these two flags should be set. */ if ((flags & VIR_DOMAIN_AFFECT_LIVE) && (flags & VIR_DOMAIN_AFFECT_CONFIG)) { - virReportInvalidArg(flags, - _("flags 'affect live' and 'affect config' in %s " - "are mutually exclusive"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("flags 'affect live' and 'affect config' " + "are mutually exclusive")); goto error; } @@ -7626,9 +7607,8 @@ virDomainGetVcpuPinInfo(virDomainPtr domain, int ncpumaps, if ((flags & VIR_DOMAIN_AFFECT_LIVE) && (flags & VIR_DOMAIN_AFFECT_CONFIG)) { virReportInvalidArg(flags, - _("flags 'affect live' and 'affect config' in %s " - "are mutually exclusive"), - __FUNCTION__); + _("flags 'affect live' and 'affect config' " + "are mutually exclusive")); goto error; } @@ -7756,9 +7736,8 @@ virDomainGetEmulatorPinInfo(virDomainPtr domain, unsigned char *cpumap, if ((flags & VIR_DOMAIN_AFFECT_LIVE) && (flags & VIR_DOMAIN_AFFECT_CONFIG)) { virReportInvalidArg(flags, - _("flags 'affect live' and 'affect config' in %s " - "are mutually exclusive"), - __FUNCTION__); + _("flags 'affect live' and 'affect config' " + "are mutually exclusive")); goto error; } conn = domain->conn; @@ -7925,10 +7904,9 @@ virDomainGetIOThreadInfo(virDomainPtr dom, /* At most one of these two flags should be set. */ if ((flags & VIR_DOMAIN_AFFECT_LIVE) && (flags & VIR_DOMAIN_AFFECT_CONFIG)) { - virReportInvalidArg(flags, - _("flags 'affect live' and 'affect config' in %s " - "are mutually exclusive"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("flags 'affect live' and 'affect config' " + "are mutually exclusive")); goto error; } @@ -8181,10 +8159,9 @@ virDomainSetMetadata(virDomainPtr domain, switch (type) { case VIR_DOMAIN_METADATA_TITLE: if (metadata && strchr(metadata, '\n')) { - virReportInvalidArg(metadata, - _("metadata title in %s can't contain " - "newlines"), - __FUNCTION__); + virReportInvalidArg(metadata, "%s", + _("metadata title can't contain " + "newlines")); goto error; } /* fallthrough */ @@ -8259,10 +8236,9 @@ virDomainGetMetadata(virDomainPtr domain, if ((flags & VIR_DOMAIN_AFFECT_LIVE) && (flags & VIR_DOMAIN_AFFECT_CONFIG)) { - virReportInvalidArg(flags, - _("flags 'affect live' and 'affect config' in %s " - "are mutually exclusive"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("flags 'affect live' and 'affect config' " + "are mutually exclusive")); goto error; } @@ -9199,18 +9175,18 @@ virConnectDomainEventRegisterAny(virConnectPtr conn, if (dom) { virCheckDomainGoto(dom, error); if (dom->conn != conn) { - virReportInvalidArg(dom, - _("domain '%s' in %s must match connection"), - dom->name, __FUNCTION__); + virReportInvalidArg(dom, "%s", + _("domain '%s' must match connection"), + dom->name); goto error; } } virCheckNonNullArgGoto(cb, error); virCheckNonNegativeArgGoto(eventID, error); if (eventID >= VIR_DOMAIN_EVENT_ID_LAST) { - virReportInvalidArg(eventID, - _("eventID in %s must be less than %d"), - __FUNCTION__, VIR_DOMAIN_EVENT_ID_LAST); + virReportInvalidArg(eventID, "%s", + _("eventID must be less than %d"), + VIR_DOMAIN_EVENT_ID_LAST); goto error; } @@ -9311,9 +9287,8 @@ virDomainManagedSave(virDomainPtr dom, unsigned int flags) if ((flags & VIR_DOMAIN_SAVE_RUNNING) && (flags & VIR_DOMAIN_SAVE_PAUSED)) { virReportInvalidArg(flags, - _("running and paused flags in %s are mutually " - "exclusive"), - __FUNCTION__); + _("running and paused flags are mutually " + "exclusive")); goto error; } @@ -9466,9 +9441,9 @@ virDomainOpenConsole(virDomainPtr dom, virCheckReadOnlyGoto(conn->flags, error); if (conn != st->conn) { - virReportInvalidArg(st, - _("stream in %s must match connection of domain '%s'"), - __FUNCTION__, dom->name); + virReportInvalidArg(st, "%s", + _("stream must match connection of domain '%s'"), + dom->name); goto error; } @@ -9531,8 +9506,8 @@ virDomainOpenChannel(virDomainPtr dom, if (conn != st->conn) { virReportInvalidArg(st, - _("stream in %s must match connection of domain '%s'"), - __FUNCTION__, dom->name); + _("stream must match connection of domain '%s'"), + dom->name); goto error; } @@ -9955,9 +9930,8 @@ virDomainBlockRebase(virDomainPtr dom, const char *disk, VIR_DOMAIN_BLOCK_REBASE_REUSE_EXT | VIR_DOMAIN_BLOCK_REBASE_COPY_RAW | VIR_DOMAIN_BLOCK_REBASE_COPY_DEV)) { - virReportInvalidArg(flags, - _("use of flags in %s requires a copy job"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("use of flags requires a copy job")); goto error; } @@ -10276,9 +10250,9 @@ virDomainOpenGraphics(virDomainPtr dom, } if (!S_ISSOCK(sb.st_mode)) { - virReportInvalidArg(fd, - _("fd %d in %s must be a socket"), - fd, __FUNCTION__); + virReportInvalidArg(fd, "%s", + _("fd %d must be a socket"), + fd); goto error; } @@ -10490,9 +10464,8 @@ virDomainGetBlockIoTune(virDomainPtr dom, if ((flags & VIR_DOMAIN_AFFECT_LIVE) && (flags & VIR_DOMAIN_AFFECT_CONFIG)) { virReportInvalidArg(flags, - _("flags 'affect live' and 'affect config' in %s " - "are mutually exclusive"), - __FUNCTION__); + _("flags 'affect live' and 'affect config' " + "are mutually exclusive")); goto error; } conn = dom->conn; @@ -10615,8 +10588,7 @@ virDomainGetCPUStats(virDomainPtr domain, if (start_cpu == -1) { if (ncpus != 1) { virReportInvalidArg(start_cpu, - _("ncpus in %s must be 1 when start_cpu is -1"), - __FUNCTION__); + _("ncpus must be 1 when start_cpu is -1")); goto error; } } else { @@ -11284,9 +11256,8 @@ virDomainListGetStats(virDomainPtr *doms, virCheckNonNullArgGoto(retStats, cleanup); if (!*doms) { - virReportError(VIR_ERR_INVALID_ARG, - _("doms array must contain at least one domain in %s"), - __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("doms array must contain at least one domain")); goto cleanup; } @@ -11304,9 +11275,9 @@ virDomainListGetStats(virDomainPtr *doms, virCheckDomainGoto(dom, cleanup); if (dom->conn != conn) { - virReportError(VIR_ERR_INVALID_ARG, + virReportError(VIR_ERR_INVALID_ARG, "%s", _("domains in 'doms' array must belong to a " - "single connection in %s"), __FUNCTION__); + "single connection")); goto cleanup; } -- 2.1.0

2 2

[libvirt] [PATCH V2 0/3] libxl: domain destroy fixes
by Jim Fehlig 04 Apr '15

04 Apr '15

V2 of a small series to fix issues wrt domain destroy https://www.redhat.com/archives/libvir-list/2015-March/msg01337.html Comments from Konrad and Martin are addressed in this version. Jim Fehlig (3): libxl: Move job acquisition in libxlDomainStart to callers libxl: acquire a job when destroying a domain libxl: drop virDomainObj lock when destroying a domain src/libxl/libxl_domain.c | 81 ++++++++++++++++++------------------------------ src/libxl/libxl_domain.h | 4 --- src/libxl/libxl_driver.c | 80 +++++++++++++++++++++++++++++++++++------------ 3 files changed, 91 insertions(+), 74 deletions(-) -- 1.8.4.5

1 4

[libvirt] [PATCH] virsh.pod: Remove redundant --config from attach-interface
by Jiri Denemark 03 Apr '15

03 Apr '15

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- Pushed as trivial. tools/virsh.pod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 79d50f9..d642a69 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2458,7 +2458,7 @@ Likewise, I<--shareable> is an alias for I<--mode shareable>. =item B<attach-interface> I<domain> I<type> I<source> [[[I<--live>] [I<--config>] | [I<--current>]] | [I<--persistent>]] [I<--target target>] [I<--mac mac>] [I<--script script>] [I<--model model>] -[I<--config>] [I<--inbound average,peak,burst>] [I<--outbound average,peak,burst>] +[I<--inbound average,peak,burst>] [I<--outbound average,peak,burst>] Attach a new network interface to the domain. I<type> can be I<network> to indicate connection via a libvirt virtual network, or -- 2.3.5

1 0

[libvirt] [PATCH] Fix xlconfigtest with older libxl
by Ján Tomko 03 Apr '15

03 Apr '15

Commit cd5dc30 added this test, but it fails if LIBXL_HAVE_BUILDINFO_USBDEVICE_LIST is not defined: 6) Xen XM-2-XML Format fullvirt-multiusb ... libvirt: error : unsupported configuration: multiple USB devices not supported FAILED --- tests/xlconfigtest.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/xlconfigtest.c b/tests/xlconfigtest.c index 6d4aa6d..c992548 100644 --- a/tests/xlconfigtest.c +++ b/tests/xlconfigtest.c @@ -215,7 +215,10 @@ mymain(void) DO_TEST("new-disk", 3); DO_TEST("spice", 3); + +#ifdef LIBXL_HAVE_BUILDINFO_USBDEVICE_LIST DO_TEST("fullvirt-multiusb", 3); +#endif virObjectUnref(caps); virObjectUnref(xmlopt); -- 2.0.5

2 2

[libvirt] Entering freeze for libvirt-1.2.14
by Daniel Veillard 03 Apr '15

03 Apr '15

I have tagged a release candidate 1 in git and generated signed tarballs and rpms at the usual place: ftp://libvirt.org/libvirt/ This seems to work normally in my limited testing but others need to give it a serious try ! I think I will do an RC2 on Monday, and if everything look file the final release will be on April 1st. Thanks in advance for reports about it ! 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 5

[libvirt] [PATCH] libvirt: virsh: Kill all uses of __FUNCTION__ in error messages
by Noella Ashu 03 Apr '15

03 Apr '15

The error output of snapshot-revert should be more friendly. There is no need to show up virDomainRevertToSnapshot to user. virError already includes __FUNCTION__ information in a separate member of the struct, so repeating it in the message is redundant and leads to situations where higher level code ends up reporting the lower level name We correctly converted the error output making it more succinct and user-friendly. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1086726 --- src/libvirt-domain-snapshot.c | 30 +++---- src/libvirt-domain.c | 201 ++++++++++++++++++------------------------ 2 files changed, 96 insertions(+), 135 deletions(-) diff --git a/src/libvirt-domain-snapshot.c b/src/libvirt-domain-snapshot.c index 9feb669..ac858ba 100644 --- a/src/libvirt-domain-snapshot.c +++ b/src/libvirt-domain-snapshot.c @@ -222,26 +222,20 @@ virDomainSnapshotCreateXML(virDomainPtr domain, if ((flags & VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT) && !(flags & VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE)) { - virReportInvalidArg(flags, - _("use of 'current' flag in %s requires " - "'redefine' flag"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("use of 'current' flag in requires 'redefine' flag")); goto error; } if ((flags & VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE) && (flags & VIR_DOMAIN_SNAPSHOT_CREATE_NO_METADATA)) { - virReportInvalidArg(flags, - _("'redefine' and 'no metadata' flags in %s are " - "mutually exclusive"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("'redefine' and 'no metadata' flags in are mutually exclusive")); goto error; } if ((flags & VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE) && (flags & VIR_DOMAIN_SNAPSHOT_CREATE_HALT)) { - virReportInvalidArg(flags, - _("'redefine' and 'halt' flags in %s are mutually " - "exclusive"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("'redefine' and 'halt' flags are mutually exclusive")); goto error; } @@ -1084,10 +1078,8 @@ virDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, if ((flags & VIR_DOMAIN_SNAPSHOT_REVERT_RUNNING) && (flags & VIR_DOMAIN_SNAPSHOT_REVERT_PAUSED)) { - virReportInvalidArg(flags, - _("running and paused flags in %s are mutually " - "exclusive"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("running and paused flags are mutually exclusive")); goto error; } @@ -1146,10 +1138,8 @@ virDomainSnapshotDelete(virDomainSnapshotPtr snapshot, if ((flags & VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN) && (flags & VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN_ONLY)) { - virReportInvalidArg(flags, - _("children and children_only flags in %s are " - "mutually exclusive"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("children and children_only flags are mutually exclusive")); goto error; } diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 4a45b9e..78b7a93 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -385,9 +385,7 @@ virDomainLookupByUUIDString(virConnectPtr conn, const char *uuidstr) virCheckNonNullArgGoto(uuidstr, error); if (virUUIDParse(uuidstr, uuid) < 0) { - virReportInvalidArg(uuidstr, - _("uuidstr in %s must be a valid UUID"), - __FUNCTION__); + virReportInvalidArg(uuidstr, "%s", _("Invalid UUID")); goto error; } @@ -1440,9 +1438,9 @@ virDomainScreenshot(virDomainPtr domain, virCheckReadOnlyGoto(domain->conn->flags, error); if (domain->conn != stream->conn) { - virReportInvalidArg(stream, - _("stream in %s must match connection of domain '%s'"), - __FUNCTION__, domain->name); + virReportInvalidArg(stream, "%s", + _("stream must match connection of domain '%s'"), + domain->name); goto error; } @@ -2179,10 +2177,8 @@ virDomainGetMemoryParameters(virDomainPtr domain, /* At most one of these two flags should be set. */ if ((flags & VIR_DOMAIN_AFFECT_LIVE) && (flags & VIR_DOMAIN_AFFECT_CONFIG)) { - virReportInvalidArg(flags, - _("flags 'affect live' and 'affect config' in %s " - "are mutually exclusive"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("flags 'affect live' and 'affect config' are mutually exclusive")); goto error; } conn = domain->conn; @@ -2423,10 +2419,8 @@ virDomainGetBlkioParameters(virDomainPtr domain, /* At most one of these two flags should be set. */ if ((flags & VIR_DOMAIN_AFFECT_LIVE) && (flags & VIR_DOMAIN_AFFECT_CONFIG)) { - virReportInvalidArg(flags, - _("flags 'affect live' and 'affect config' in %s " - "are mutually exclusive"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("flags 'affect live' and 'affect config' are mutually exclusive")); goto error; } conn = domain->conn; @@ -3343,9 +3337,8 @@ virDomainMigratePeer2PeerFull(virDomainPtr domain, if (!(tempuri = virURIParse(dconnuri))) return -1; if (!tempuri->server || STRPREFIX(tempuri->server, "localhost")) { - virReportInvalidArg(dconnuri, - _("unable to parse server from dconnuri in %s"), - __FUNCTION__); + virReportInvalidArg(dconnuri, "%s", + _("unable to parse server from dconnuri")); virURIFree(tempuri); return -1; } @@ -3580,10 +3573,9 @@ virDomainMigrate(virDomainPtr domain, if (flags & VIR_MIGRATE_NON_SHARED_DISK && flags & VIR_MIGRATE_NON_SHARED_INC) { - virReportInvalidArg(flags, - _("flags 'shared disk' and 'shared incremental' " - "in %s are mutually exclusive"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("flags 'shared disk' and 'shared incremental'" + " are mutually exclusive")); goto error; } @@ -3809,10 +3801,9 @@ virDomainMigrate2(virDomainPtr domain, if (flags & VIR_MIGRATE_NON_SHARED_DISK && flags & VIR_MIGRATE_NON_SHARED_INC) { - virReportInvalidArg(flags, + virReportInvalidArg(flags, "%s", _("flags 'shared disk' and 'shared incremental' " - "in %s are mutually exclusive"), - __FUNCTION__); + "are mutually exclusive")); goto error; } @@ -3989,10 +3980,9 @@ virDomainMigrate3(virDomainPtr domain, if (flags & VIR_MIGRATE_NON_SHARED_DISK && flags & VIR_MIGRATE_NON_SHARED_INC) { - virReportInvalidArg(flags, + virReportInvalidArg(flags, "%s", _("flags 'shared disk' and 'shared incremental' " - "in %s are mutually exclusive"), - __FUNCTION__); + "are mutually exclusive")); goto error; } if (flags & VIR_MIGRATE_PEER2PEER) { @@ -4212,10 +4202,9 @@ virDomainMigrateToURI(virDomainPtr domain, if (flags & VIR_MIGRATE_NON_SHARED_DISK && flags & VIR_MIGRATE_NON_SHARED_INC) { - virReportInvalidArg(flags, + virReportInvalidArg(flags, "%s", _("flags 'shared disk' and 'shared incremental' " - "in %s are mutually exclusive"), - __FUNCTION__); + "are mutually exclusive")); goto error; } @@ -4372,10 +4361,9 @@ virDomainMigrateToURI2(virDomainPtr domain, if (flags & VIR_MIGRATE_NON_SHARED_DISK && flags & VIR_MIGRATE_NON_SHARED_INC) { - virReportInvalidArg(flags, + virReportInvalidArg(flags, "%s", _("flags 'shared disk' and 'shared incremental' " - "in %s are mutually exclusive"), - __FUNCTION__); + "are mutually exclusive")); goto error; } @@ -4481,10 +4469,9 @@ virDomainMigrateToURI3(virDomainPtr domain, if (flags & VIR_MIGRATE_NON_SHARED_DISK && flags & VIR_MIGRATE_NON_SHARED_INC) { - virReportInvalidArg(flags, + virReportInvalidArg(flags, "%s", _("flags 'shared disk' and 'shared incremental' " - "in %s are mutually exclusive"), - __FUNCTION__); + "are mutually exclusive")); goto error; } @@ -4791,9 +4778,8 @@ virDomainMigratePrepareTunnel(virConnectPtr conn, virCheckReadOnlyGoto(conn->flags, error); if (conn != st->conn) { - virReportInvalidArg(conn, - _("conn in %s must match stream connection"), - __FUNCTION__); + virReportInvalidArg(conn, "%s", + _("conn must match stream connection")); goto error; } @@ -4937,9 +4923,8 @@ virDomainMigratePrepareTunnel3(virConnectPtr conn, virCheckReadOnlyGoto(conn->flags, error); if (conn != st->conn) { - virReportInvalidArg(conn, - _("conn in %s must match stream connection"), - __FUNCTION__); + virReportInvalidArg(conn, "%s", + _("conn must match stream connection")); goto error; } @@ -5221,8 +5206,7 @@ virDomainMigratePrepareTunnel3Params(virConnectPtr conn, if (conn != st->conn) { virReportInvalidArg(conn, - _("conn in %s must match stream connection"), - __FUNCTION__); + _("conn must match stream connection")); goto error; } @@ -5529,10 +5513,9 @@ virDomainGetSchedulerParametersFlags(virDomainPtr domain, /* At most one of these two flags should be set. */ if ((flags & VIR_DOMAIN_AFFECT_LIVE) && (flags & VIR_DOMAIN_AFFECT_CONFIG)) { - virReportInvalidArg(flags, - _("flags 'affect live' and 'affect config' in %s " - "are mutually exclusive"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("flags 'affect live' and 'affect config' in " + "are mutually exclusive")); goto error; } conn = domain->conn; @@ -5709,9 +5692,9 @@ virDomainBlockStats(virDomainPtr dom, const char *disk, virCheckNonNullArgGoto(disk, error); virCheckNonNullArgGoto(stats, error); if (size > sizeof(stats2)) { - virReportInvalidArg(size, - _("size in %s must not exceed %zu"), - __FUNCTION__, sizeof(stats2)); + virReportInvalidArg(size, "%s", + _("size must not exceed %zu"), + sizeof(stats2)); goto error; } conn = dom->conn; @@ -5850,9 +5833,9 @@ virDomainInterfaceStats(virDomainPtr dom, const char *path, virCheckNonNullArgGoto(path, error); virCheckNonNullArgGoto(stats, error); if (size > sizeof(stats2)) { - virReportInvalidArg(size, - _("size in %s must not exceed %zu"), - __FUNCTION__, sizeof(stats2)); + virReportInvalidArg(size, "%s", + _("size must not exceed %zu"), + sizeof(stats2)); goto error; } @@ -6297,10 +6280,9 @@ virDomainMemoryPeek(virDomainPtr dom, /* Exactly one of these two flags must be set. */ if (!(flags & VIR_MEMORY_VIRTUAL) == !(flags & VIR_MEMORY_PHYSICAL)) { - virReportInvalidArg(flags, - _("flags in %s must include VIR_MEMORY_VIRTUAL or " - "VIR_MEMORY_PHYSICAL"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("flags must include VIR_MEMORY_VIRTUAL or " + "VIR_MEMORY_PHYSICAL")); goto error; } @@ -7144,9 +7126,9 @@ virDomainSendKey(virDomainPtr domain, virCheckPositiveArgGoto(nkeycodes, error); if (nkeycodes > VIR_DOMAIN_SEND_KEY_MAX_KEYS) { - virReportInvalidArg(nkeycodes, - _("nkeycodes in %s must be <= %d"), - __FUNCTION__, VIR_DOMAIN_SEND_KEY_MAX_KEYS); + virReportInvalidArg(nkeycodes, "%s", + _("nkeycodes must be <= %d"), + VIR_DOMAIN_SEND_KEY_MAX_KEYS); goto error; } @@ -7344,8 +7326,8 @@ virDomainSetVcpusFlags(virDomainPtr domain, unsigned int nvcpus, flags & VIR_DOMAIN_VCPU_MAXIMUM) { virReportInvalidArg(flags, _("flags 'VIR_DOMAIN_VCPU_MAXIMUM' and " - "'VIR_DOMAIN_VCPU_GUEST' in '%s' are mutually " - "exclusive"), __FUNCTION__); + "'VIR_DOMAIN_VCPU_GUEST' in are mutually " + "exclusive")); goto error; } @@ -7419,10 +7401,9 @@ virDomainGetVcpusFlags(virDomainPtr domain, unsigned int flags) /* At most one of these two flags should be set. */ if ((flags & VIR_DOMAIN_AFFECT_LIVE) && (flags & VIR_DOMAIN_AFFECT_CONFIG)) { - virReportInvalidArg(flags, - _("flags 'affect live' and 'affect config' in %s " - "are mutually exclusive"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("flags 'affect live' and 'affect config' " + "are mutually exclusive")); goto error; } @@ -7626,9 +7607,8 @@ virDomainGetVcpuPinInfo(virDomainPtr domain, int ncpumaps, if ((flags & VIR_DOMAIN_AFFECT_LIVE) && (flags & VIR_DOMAIN_AFFECT_CONFIG)) { virReportInvalidArg(flags, - _("flags 'affect live' and 'affect config' in %s " - "are mutually exclusive"), - __FUNCTION__); + _("flags 'affect live' and 'affect config' " + "are mutually exclusive")); goto error; } @@ -7756,9 +7736,8 @@ virDomainGetEmulatorPinInfo(virDomainPtr domain, unsigned char *cpumap, if ((flags & VIR_DOMAIN_AFFECT_LIVE) && (flags & VIR_DOMAIN_AFFECT_CONFIG)) { virReportInvalidArg(flags, - _("flags 'affect live' and 'affect config' in %s " - "are mutually exclusive"), - __FUNCTION__); + _("flags 'affect live' and 'affect config' " + "are mutually exclusive")); goto error; } conn = domain->conn; @@ -7925,10 +7904,9 @@ virDomainGetIOThreadInfo(virDomainPtr dom, /* At most one of these two flags should be set. */ if ((flags & VIR_DOMAIN_AFFECT_LIVE) && (flags & VIR_DOMAIN_AFFECT_CONFIG)) { - virReportInvalidArg(flags, - _("flags 'affect live' and 'affect config' in %s " - "are mutually exclusive"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("flags 'affect live' and 'affect config' " + "are mutually exclusive")); goto error; } @@ -8181,10 +8159,9 @@ virDomainSetMetadata(virDomainPtr domain, switch (type) { case VIR_DOMAIN_METADATA_TITLE: if (metadata && strchr(metadata, '\n')) { - virReportInvalidArg(metadata, - _("metadata title in %s can't contain " - "newlines"), - __FUNCTION__); + virReportInvalidArg(metadata, "%s", + _("metadata title can't contain " + "newlines")); goto error; } /* fallthrough */ @@ -8259,10 +8236,9 @@ virDomainGetMetadata(virDomainPtr domain, if ((flags & VIR_DOMAIN_AFFECT_LIVE) && (flags & VIR_DOMAIN_AFFECT_CONFIG)) { - virReportInvalidArg(flags, - _("flags 'affect live' and 'affect config' in %s " - "are mutually exclusive"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("flags 'affect live' and 'affect config' " + "are mutually exclusive")); goto error; } @@ -9199,18 +9175,18 @@ virConnectDomainEventRegisterAny(virConnectPtr conn, if (dom) { virCheckDomainGoto(dom, error); if (dom->conn != conn) { - virReportInvalidArg(dom, - _("domain '%s' in %s must match connection"), - dom->name, __FUNCTION__); + virReportInvalidArg(dom, "%s", + _("domain '%s' must match connection"), + dom->name); goto error; } } virCheckNonNullArgGoto(cb, error); virCheckNonNegativeArgGoto(eventID, error); if (eventID >= VIR_DOMAIN_EVENT_ID_LAST) { - virReportInvalidArg(eventID, - _("eventID in %s must be less than %d"), - __FUNCTION__, VIR_DOMAIN_EVENT_ID_LAST); + virReportInvalidArg(eventID, "%s", + _("eventID must be less than %d"), + VIR_DOMAIN_EVENT_ID_LAST); goto error; } @@ -9311,9 +9287,8 @@ virDomainManagedSave(virDomainPtr dom, unsigned int flags) if ((flags & VIR_DOMAIN_SAVE_RUNNING) && (flags & VIR_DOMAIN_SAVE_PAUSED)) { virReportInvalidArg(flags, - _("running and paused flags in %s are mutually " - "exclusive"), - __FUNCTION__); + _("running and paused flags are mutually " + "exclusive")); goto error; } @@ -9466,9 +9441,9 @@ virDomainOpenConsole(virDomainPtr dom, virCheckReadOnlyGoto(conn->flags, error); if (conn != st->conn) { - virReportInvalidArg(st, - _("stream in %s must match connection of domain '%s'"), - __FUNCTION__, dom->name); + virReportInvalidArg(st, "%s", + _("stream must match connection of domain '%s'"), + dom->name); goto error; } @@ -9531,8 +9506,8 @@ virDomainOpenChannel(virDomainPtr dom, if (conn != st->conn) { virReportInvalidArg(st, - _("stream in %s must match connection of domain '%s'"), - __FUNCTION__, dom->name); + _("stream must match connection of domain '%s'"), + dom->name); goto error; } @@ -9955,9 +9930,8 @@ virDomainBlockRebase(virDomainPtr dom, const char *disk, VIR_DOMAIN_BLOCK_REBASE_REUSE_EXT | VIR_DOMAIN_BLOCK_REBASE_COPY_RAW | VIR_DOMAIN_BLOCK_REBASE_COPY_DEV)) { - virReportInvalidArg(flags, - _("use of flags in %s requires a copy job"), - __FUNCTION__); + virReportInvalidArg(flags, "%s", + _("use of flags requires a copy job")); goto error; } @@ -10276,9 +10250,9 @@ virDomainOpenGraphics(virDomainPtr dom, } if (!S_ISSOCK(sb.st_mode)) { - virReportInvalidArg(fd, - _("fd %d in %s must be a socket"), - fd, __FUNCTION__); + virReportInvalidArg(fd, "%s", + _("fd %d must be a socket"), + fd); goto error; } @@ -10490,9 +10464,8 @@ virDomainGetBlockIoTune(virDomainPtr dom, if ((flags & VIR_DOMAIN_AFFECT_LIVE) && (flags & VIR_DOMAIN_AFFECT_CONFIG)) { virReportInvalidArg(flags, - _("flags 'affect live' and 'affect config' in %s " - "are mutually exclusive"), - __FUNCTION__); + _("flags 'affect live' and 'affect config' " + "are mutually exclusive")); goto error; } conn = dom->conn; @@ -10615,8 +10588,7 @@ virDomainGetCPUStats(virDomainPtr domain, if (start_cpu == -1) { if (ncpus != 1) { virReportInvalidArg(start_cpu, - _("ncpus in %s must be 1 when start_cpu is -1"), - __FUNCTION__); + _("ncpus must be 1 when start_cpu is -1")); goto error; } } else { @@ -11284,9 +11256,8 @@ virDomainListGetStats(virDomainPtr *doms, virCheckNonNullArgGoto(retStats, cleanup); if (!*doms) { - virReportError(VIR_ERR_INVALID_ARG, - _("doms array must contain at least one domain in %s"), - __FUNCTION__); + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("doms array must contain at least one domain")); goto cleanup; } @@ -11304,9 +11275,9 @@ virDomainListGetStats(virDomainPtr *doms, virCheckDomainGoto(dom, cleanup); if (dom->conn != conn) { - virReportError(VIR_ERR_INVALID_ARG, + virReportError(VIR_ERR_INVALID_ARG, "%s", _("domains in 'doms' array must belong to a " - "single connection in %s"), __FUNCTION__); + "single connection")); goto cleanup; } -- 2.1.0

2 3

[libvirt] [PATCH] virsh: fix domifaddr no output in quiet mode
by Luyao Huang 03 Apr '15

03 Apr '15

All of print function use vshPrintExtra in cmdDomIfAddr, this will make domifaddr no output in quiet mode, after this patch, quiet mode output will be: # virsh -q domifaddr test3 --source agent lo 00:00:00:00:00:00 ipv4 127.0.0.1/8 - - ipv6 ::1/128 ens8 52:54:00:1a:cb:3f ipv6 fe80::5054:ff:fe1a:cb3f/64 virbr0 52:54:00:db:51:e7 ipv4 192.168.122.1/24 virbr0-nic 52:54:00:db:51:e7 N/A N/A Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- tools/virsh-domain-monitor.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 6951db2..9686531 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -2278,9 +2278,9 @@ cmdDomIfAddr(vshControl *ctl, const vshCmd *cmd) /* When the interface has no IP address */ if (!iface->naddrs) { - vshPrintExtra(ctl, " %-10s %-17s %-12s %s\n", - iface->name, - iface->hwaddr ? iface->hwaddr : "N/A", "N/A", "N/A"); + vshPrint(ctl, " %-10s %-17s %-12s %s\n", + iface->name, + iface->hwaddr ? iface->hwaddr : "N/A", "N/A", "N/A"); continue; } @@ -2313,12 +2313,12 @@ cmdDomIfAddr(vshControl *ctl, const vshCmd *cmd) /* Don't repeat interface name */ if (full || !j) - vshPrintExtra(ctl, " %-10s %-17s %s\n", - iface->name, - iface->hwaddr ? iface->hwaddr : "", ip_addr_str); + vshPrint(ctl, " %-10s %-17s %s\n", + iface->name, + iface->hwaddr ? iface->hwaddr : "", ip_addr_str); else - vshPrintExtra(ctl, " %-10s %-17s %s\n", - "-", "-", ip_addr_str); + vshPrint(ctl, " %-10s %-17s %s\n", + "-", "-", ip_addr_str); virBufferFreeAndReset(&buf); VIR_FREE(ip_addr_str); -- 1.8.3.1

2 1

[libvirt] [PATCH 0/2] esx: Make esxNodeGetFreeMemory always use ESX host.
by Dawid Zamirski 03 Apr '15

03 Apr '15

This patch is intended to make ESX driver behave more consistently. When calling virNodeGetFreeMemory, it would return the free bytes from a cluster when using vpx connection or ESX host when using esx connection. However, virGetNodeInfo always returns info from ESX host (specifying ESX host is mandatory, even for vpx connections) so to make this consitent, these patches make virNodeGetFreeMemory always return info from the ESX host. Dawid Zamirski (2): esx: add esxVI_GetInt esx: esxNodeGetFreeMemory return info from host. src/esx/esx_driver.c | 53 ++++++++++++++++++-------------------------------- src/esx/esx_vi.c | 32 ++++++++++++++++++++++++++++++ src/esx/esx_vi.h | 3 +++ src/esx/esx_vi_types.c | 3 +++ src/esx/esx_vi_types.h | 1 + 5 files changed, 58 insertions(+), 34 deletions(-) -- 2.1.0

2 3

[libvirt] qemu: migration: continuously sending and receiving ARP packets guest mistakenly thinks there's another guest with the same IP.
by zhang bo 03 Apr '15

03 Apr '15

Problem Description: Live-migrate a guest, which has a tap device and continuously sends and receives ARP packets, it would mistakenly think there's another guest with the same IP, immedially after migration. The steps to reproduce the problem: 1 define and start a domain with its network configured as: <interface type='bridge'> <mac address='52:54:00:7d:b0:af'/> <source bridge='br0'/> <virtualport type='openvswitch'> <parameters interfaceid='e4ad3dbb-7808-4175-83ee-ee0cba1c5456'/> </virtualport> <model type='virtio'/> <driver name='vhost' queues='4'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> 2 The guest sends ARP packets continuously: arping -I ethX xx.xx.xx.xx(self_ip) 3 Meanwhile, the guest also receives ARP packets continuously: tcpdump -i ethX arp host xx.xx.xx.xx(self_ip) -entttt 4 After migrateion, at the dest side, the guest gets a lot of ARP packets which came from the source-side guest(which was stored while it's suspended.). For example: 2015-03-27 16:45:56.695166 52:54:00:7d:b0:af > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: arp who-has 9.61.108.208 (ff:ff:ff:ff:ff:ff) tell 9.61.108.208 2015-03-27 16:45:56.695197 52:54:00:7d:b0:af > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: arp who-has 9.61.108.208 (ff:ff:ff:ff:ff:ff) tell 9.61.108.208 2015-03-27 16:45:56.695205 52:54:00:7d:b0:af > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: arp who-has 9.61.108.208 (ff:ff:ff:ff:ff:ff) tell 9.61.108.208 2015-03-27 16:45:56.695214 52:54:00:7d:b0:af > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: arp who-has 9.61.108.208 (ff:ff:ff:ff:ff:ff) tell 9.61.108.208 2015-03-27 16:45:56.695244 52:54:00:7d:b0:af > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: arp who-has 9.61.108.208 (ff:ff:ff:ff:ff:ff) tell 9.61.108.208 2015-03-27 16:45:56.695256 52:54:00:7d:b0:af > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: arp who-has 9.61.108.208 (ff:ff:ff:ff:ff:ff) tell 9.61.108.208 2015-03-27 16:45:56.695264 52:54:00:7d:b0:af > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: arp who-has 9.61.108.208 (ff:ff:ff:ff:ff:ff) tell 9.61.108.208 2015-03-27 16:45:56.695291 52:54:00:7d:b0:af > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: arp who-has 9.61.108.208 (ff:ff:ff:ff:ff:ff) tell 9.61.108.208 2015-03-27 16:45:56.695324 52:54:00:7d:b0:af > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: arp who-has 9.61.108.208 (ff:ff:ff:ff:ff:ff) tell 9.61.108.208 2015-03-27 16:45:56.695337 52:54:00:7d:b0:af > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: arp who-has 9.61.108.208 (ff:ff:ff:ff:ff:ff) tell 9.61.108.208 2015-03-27 16:45:56.695344 52:54:00:7d:b0:af > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: arp who-has 9.61.108.208 (ff:ff:ff:ff:ff:ff) tell 9.61.108.208 2015-03-27 16:45:56.695364 52:54:00:7d:b0:af > ff:ff:ff:ff:ff:ff, ethertype ARP (0x0806), length 60: arp who-has 9.61.108.208 (ff:ff:ff:ff:ff:ff) tell 9.61.108.208 5 These packets will confuse my process. It may think that there is another VM has the same IP with itself. Reasons for the problem: The tap device will get up as soon as it's created(in virNetDevTapCreateInBridgePort), before the cpus got un-paused. So, it kept receiving data before the guest starts to run, please note that the data are sent from the source side. As soon as the guest get running, it parses the data stored before, and thinks they were from other guest with the same IP, which is in fact the guest from the source side. There was a patch "network: Bring netdevs online later", it move the virNetDevSetOnline() of network device just before start VM's vcpu. But in the Laine Stump replay mail say "It turns out, though, that regular tap devices which will be connected to a bridge should be ifup'ed and attached to the bridge as soon as possible, so that the forwarding delay timer of the bridge can start to count down." I agree with Laine Stump's idea that it's not a perfect solution to start the tap device right before running vcpu. so, here comes the question: what can we do to insure our guests not receive itself's ARP packets from src side during migrateion?

1 0

[libvirt] [PATCH] conf: Change virStoragePoolSaveConfig prototype s/configDir/configFile
by Erik Skultety 03 Apr '15

03 Apr '15

Just a minor change which might be a little confusing for someone looking only at the API. --- Pushed as trivial. src/conf/storage_conf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h index edcdaed..da378b7 100644 --- a/src/conf/storage_conf.h +++ b/src/conf/storage_conf.h @@ -373,7 +373,7 @@ virStoragePoolObjAssignDef(virStoragePoolObjListPtr pools, int virStoragePoolSaveState(const char *stateFile, virStoragePoolDefPtr def); -int virStoragePoolSaveConfig(const char *configDir, +int virStoragePoolSaveConfig(const char *configFile, virStoragePoolDefPtr def); int virStoragePoolObjSaveDef(virStorageDriverStatePtr driver, virStoragePoolObjPtr pool, -- 1.9.3

1 0

[libvirt] [PATCH 0/3] REWORK/REPOST: Refactor some qemuDomainHotplugVcpus code
by John Ferlan 03 Apr '15

03 Apr '15

Originally these were in the middle of the IOThreads Setting code that needs some rework. So rather than needing to have to continually merge changes in this space, I separated them out. These are (hopefully) pure code motion and will be used in some manner by changes that will come this release cycle for IOThread Add/Del Support. IOThreads's posting: http://www.redhat.com/archives/libvir-list/2015-March/msg01014.html and specifically in order: http://www.redhat.com/archives/libvir-list/2015-March/msg01017.html http://www.redhat.com/archives/libvir-list/2015-March/msg01018.html http://www.redhat.com/archives/libvir-list/2015-March/msg01019.html I did have to make some changes to the last one to account for other recent changes in the code John Ferlan (3): qemu: qemuDomainHotplugVcpus - separate out the add cgroup qemu: qemuDomainHotplugVcpus - separate out the del cgroup and pin qemu: qemuDomainHotplugVcpus - separate out pin adjustment code src/qemu/qemu_driver.c | 201 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 130 insertions(+), 71 deletions(-) -- 2.1.0

2 4

[libvirt] [PATCH V3] libxl: fix dom0 balloon logic
by Jim Fehlig 02 Apr '15

02 Apr '15

Recent testing on large memory systems revealed a bug in the Xen xl tool's freemem() function. When autoballooning is enabled, freemem() is used to ensure enough memory is available to start a domain, ballooning dom0 if necessary. When ballooning large amounts of memory from dom0, freemem() would exceed its self-imposed wait time and return an error. Meanwhile, dom0 continued to balloon. Starting the domain later, after sufficient memory was ballooned from dom0, would succeed. The libvirt implementation in libxlDomainFreeMem() suffers the same bug since it is modeled after freemem(). In the end, the best place to fix the bug on the Xen side was to slightly change the behavior of libxl_wait_for_memory_target(). Instead of failing after caller-provided wait_sec, the function now blocks as long as dom0 memory ballooning is progressing. It will return failure only when more memory is needed to reach the target and wait_sec have expired with no progress being made. See xen.git commit fd3aa246. There was a dicussion on how this would affect other libxl apps like libvirt http://lists.xen.org/archives/html/xen-devel/2015-03/msg00739.html If libvirt containing this patch was build against a Xen containing the old libxl_wait_for_memory_target() behavior, libxlDomainFreeMem() will fail after 30 sec and domain creation will be terminated. Without this patch and with old libxl_wait_for_memory_target() behavior, libxlDomainFreeMem() does not succeed after 30 sec, but returns success anyway. Domain creation continues resulting in all sorts of fun stuff like cpu soft lockups in the guest OS. It was decided to properly fix libxl_wait_for_memory_target(), and if anything improve the default behavior of apps using the freemem reference impl in xl. xl was patched to accommodate the change in libxl_wait_for_memory_target() with xen.git commit 883b30a0. This patch does the same in the libxl driver. While at it, I changed the logic to essentially match freemem() in $xensrc/tools/libxl/xl_cmdimpl.c. It was a bit cleaner IMO and will make it easier to spot future, potentially interesting divergences. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- V3: Remove unneeded local variable 'ret' in libxlDomainFreeMem. src/libxl/libxl_domain.c | 49 ++++++++++++++++++++---------------------------- 1 file changed, 20 insertions(+), 29 deletions(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index ce9e4d8..37b2b58 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -811,38 +811,33 @@ libxlDomainFreeMem(libxl_ctx *ctx, libxl_domain_config *d_config) { uint32_t needed_mem; uint32_t free_mem; - size_t i; - int ret = -1; int tries = 3; int wait_secs = 10; - if ((ret = libxl_domain_need_memory(ctx, &d_config->b_info, - &needed_mem)) >= 0) { - for (i = 0; i < tries; ++i) { - if ((ret = libxl_get_free_memory(ctx, &free_mem)) < 0) - break; + if (libxl_domain_need_memory(ctx, &d_config->b_info, &needed_mem) < 0) + goto error; - if (free_mem >= needed_mem) { - ret = 0; - break; - } + do { + if (libxl_get_free_memory(ctx, &free_mem) < 0) + goto error; - if ((ret = libxl_set_memory_target(ctx, 0, - free_mem - needed_mem, - /* relative */ 1, 0)) < 0) - break; + if (free_mem >= needed_mem) + return 0; - ret = libxl_wait_for_free_memory(ctx, 0, needed_mem, - wait_secs); - if (ret == 0 || ret != ERROR_NOMEM) - break; + if (libxl_set_memory_target(ctx, 0, free_mem - needed_mem, + /* relative */ 1, 0) < 0) + goto error; - if ((ret = libxl_wait_for_memory_target(ctx, 0, 1)) < 0) - break; - } - } + if (libxl_wait_for_memory_target(ctx, 0, wait_secs) < 0) + goto error; - return ret; + tries--; + } while (tries > 0); + + error: + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("Failed to balloon domain0 memory")); + return -1; } static void @@ -958,12 +953,8 @@ libxlDomainStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm, cfg->ctx, &d_config) < 0) goto endjob; - if (cfg->autoballoon && libxlDomainFreeMem(cfg->ctx, &d_config) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("libxenlight failed to get free memory for domain '%s'"), - d_config.c_info.name); + if (cfg->autoballoon && libxlDomainFreeMem(cfg->ctx, &d_config) < 0) goto endjob; - } if (virHostdevPrepareDomainDevices(hostdev_mgr, LIBXL_DRIVER_NAME, vm->def, VIR_HOSTDEV_SP_PCI) < 0) -- 1.8.4.5

2 2

[libvirt] [PATCH] virNetSocketNewConnectUNIX: Use flocks when spawning a daemon
by Michal Privoznik 02 Apr '15

02 Apr '15

https://bugzilla.redhat.com/show_bug.cgi?id=1200149 Even though we have a mutex mechanism so that two clients don't spawn two daemons, it's not strong enough. It can happen that while one client is spawning the daemon, the other one fails to connect. Basically two possible errors can happen: error: Failed to connect socket to '/home/mprivozn/.cache/libvirt/libvirt-sock': Connection refused or: error: Failed to connect socket to '/home/mprivozn/.cache/libvirt/libvirt-sock': No such file or directory The problem in both cases is, the daemon is only starting up, while we are trying to connect (and fail). We should postpone the connecting phase until the daemon is started (by the other thread that is spawning it). In order to do that, create a file lock 'libvirt-lock' in the directory where session daemon would create its socket. So even when called from multiple processes, spawning a daemon will serialize on the file lock. So only the first to come will spawn the daemon. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/rpc/virnetsocket.c | 46 ++++++++++++++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 6b019cc..8d8b6e0 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -545,8 +545,10 @@ int virNetSocketNewConnectUNIX(const char *path, { char *binname = NULL; char *pidpath = NULL; + char *lockpath = NULL; int fd, passfd = -1; int pidfd = -1; + int lockfd = -1; virSocketAddr localAddr; virSocketAddr remoteAddr; @@ -561,6 +563,22 @@ int virNetSocketNewConnectUNIX(const char *path, return -1; } + if (spawnDaemon) { + if (virPidFileConstructPath(false, NULL, "libvirt-lock", &lockpath) < 0) + goto error; + + if ((lockfd = open(lockpath, O_RDWR | O_CREAT, 0600)) < 0 || + virSetCloseExec(lockfd) < 0) { + virReportSystemError(errno, _("Unable to create lock '%s'"), lockpath); + goto error; + } + + if (virFileLock(lockfd, false, 0, 1, true) < 0) { + virReportSystemError(errno, _("Unable to lock '%s'"), lockpath); + goto error; + } + } + if ((fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) { virReportSystemError(errno, "%s", _("Failed to create socket")); goto error; @@ -595,17 +613,8 @@ int virNetSocketNewConnectUNIX(const char *path, if (virPidFileConstructPath(false, NULL, binname, &pidpath) < 0) goto error; - pidfd = virPidFileAcquirePath(pidpath, false, getpid()); - if (pidfd < 0) { - /* - * This can happen in a very rare case of two clients spawning two - * daemons at the same time, and the error in the logs that gets - * reset here can be a clue to some future debugging. - */ - virResetLastError(); - spawnDaemon = false; - goto retry; - } + if ((pidfd = virPidFileAcquirePath(pidpath, false, getpid())) < 0) + goto error; if ((passfd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) { virReportSystemError(errno, "%s", _("Failed to create socket")); @@ -668,16 +677,17 @@ int virNetSocketNewConnectUNIX(const char *path, goto error; } - /* - * Do we need to eliminate the super-rare race here any more? It would - * need incorporating the following VIR_FORCE_CLOSE() into a - * virCommandHook inside a virNetSocketForkDaemon(). - */ VIR_FORCE_CLOSE(pidfd); if (virNetSocketForkDaemon(binary, passfd) < 0) goto error; } + if (lockfd) { + unlink(lockpath); + VIR_FORCE_CLOSE(lockfd); + VIR_FREE(lockpath); + } + localAddr.len = sizeof(localAddr.data); if (getsockname(fd, &localAddr.data.sa, &localAddr.len) < 0) { virReportSystemError(errno, "%s", _("Unable to get local socket name")); @@ -694,10 +704,14 @@ int virNetSocketNewConnectUNIX(const char *path, error: if (pidfd >= 0) virPidFileDeletePath(pidpath); + if (lockfd) + unlink(lockpath); VIR_FREE(pidpath); + VIR_FREE(lockpath); VIR_FORCE_CLOSE(fd); VIR_FORCE_CLOSE(passfd); VIR_FORCE_CLOSE(pidfd); + VIR_FORCE_CLOSE(lockfd); if (spawnDaemon) unlink(path); return -1; -- 2.0.5

2 2

Re: [libvirt] [Qemu-devel] [PATCH v4 11/15] target-s390x: New QMP command query-cpu-model
by Eduardo Habkost 02 Apr '15

02 Apr '15

(CCing libvir-list and Jiri Denemark for libvirt-related discussion about -cpu host/none, and live-migration safety expectations) On Wed, Apr 01, 2015 at 06:31:23PM +0200, Michael Mueller wrote: > On Wed, 1 Apr 2015 10:01:13 -0300 > Eduardo Habkost <ehabkost(a)redhat.com> wrote: > > > On Tue, Mar 31, 2015 at 10:09:09PM +0200, Michael Mueller wrote: > > > On Tue, 31 Mar 2015 15:35:26 -0300 > > > Eduardo Habkost <ehabkost(a)redhat.com> wrote: > > > > > > > On Mon, Mar 30, 2015 at 04:28:24PM +0200, Michael Mueller wrote: > > > > > This patch implements a new QMP request named 'query-cpu-model'. > > > > > It returns the cpu model of cpu 0 and its backing accelerator. > > > > > > > > > > request: > > > > > {"execute" : "query-cpu-model" } > > > > > > > > > > answer: > > > > > {"return" : {"name": "2827-ga2", "accel": "kvm" }} > > > > > > > > > > Alias names are resolved to their respective machine type and GA names > > > > > already during cpu instantiation. Thus, also a cpu model like 'host' > > > > > which is implemented as alias will return its normalized cpu model name. > > > > > > > > > > Furthermore the patch implements the following function: > > > > > > > > > > - s390_cpu_models_used(), returns true if S390 cpu models are in use > > > > > > > > > > Signed-off-by: Michael Mueller <mimu(a)linux.vnet.ibm.com> > > > > > --- > > > > [...] > > > > > +static inline char *strdup_s390_cpu_name(S390CPUClass *cc) > > > > > +{ > > > > > + return g_strdup_printf("%04x-ga%u", cc->proc.type, cc->mach.ga); > > > > > +} > > > > > > > > How exactly is this information going to be used by clients? If getting > > > > the correct type and ga values is important for them, maybe you could > > > > add them as integer fields, instead of requiring clients to parse the > > > > CPU model name? > > > > > > The consumer don't need to parse the name, it is just important for them to have > > > distinctive names that correlate with the names returned by query-cpu-definitions. > > > Once the name of an active guest is known, e.g. ("2827-ga2", "kvm") a potential > > > migration target can be verified, i.e. its query-cpu-definitions answer for "kvm" > > > has to contain "2827-ga2" with the attribute runnable set to true. With that mechanism > > > also the largest common denominator can be calculated. That model will be used then. > > > > Understood. So the point is to really have a name that can be found at > > query-cpu-definitions. Makes sense. > > > > (BTW, if you reused strdup_s390_cpu_name() inside > > s390_cpu_compare_class_name() too, you would automatically ensure that > > query-cpus, query-cpu-definitions and s390_cpu_class_by_name() will > > always agree with each other). > > I have to verify but it seems to make sense from reading... I will do that if it works. :-) > > > > > > > > > I also changed the above mentioned routine to map the cpu model none case: > > > > > > static inline char *strdup_s390_cpu_name(S390CPUClass *cc) > > > { > > > if (cpuid(cc->proc)) { > > > return g_strdup_printf("%04x-ga%u", cc->proc.type, cc->mach.ga); > > > } else { > > > return g_strdup("none"); > > > } > > > } > > > > What about: > > > > static const char *s390_cpu_name(S390CPUClass *cc) > > { > > return cc->model_name; > > } > > > > And then you can just set cc->model_name=_name inside S390_PROC_DEF (and > > set it to "none" inside s390_cpu_class_init()). > > > > Wouldn't that store redundant information... but it would at least shift the work into the > initialization phase and do the format just once per model. To be honest, calculating the CPU model name on the fly with strdup_s390_cpu_name() like you did above wouldn't be a problem to me. I just wanted to avoid having the same CPU model name logic (and special cases like "none") duplicated inside strdup_s390_cpu_name(), S390_PROC_DEF, s390_cpu_class_by_name(), and maybe other places. Maybe this duplication can be eliminated by simply reusing strdup_s390_cpu_name() inside s390_cpu_compare_class_name(). > > > I wonder if this class->model_name conversion could be made generic > > inside the CPU class. We already have a CPU::class_by_name() method, so > > it makes sense to have the opposite function too. > > > > (But I wouldn't mind making this s390-specific first, and converted > > later to generic code if appropriate). > > ok > > > > > > > > > This implicitly will fail a comparison for cpu model ("none", "kvm") as that will > > > never be part of the query-cpu-definitions answer. > > > > I am not sure I follow. If ("none", "kvm") is never in the list, is > > "-cpu none -machine accel=kvm" always an invalid use case? > > Not directly invalid as "-cpu none" will be the same as omitting the -cpu option. > KVM will setup the vcpu properties withou any QEMU control to whatever the hosting > machine and the kvm kernel code offers. That will allow to run QEMU against a KVM > version that is not aware of the s390 cpu model ioctls. It looks like we have conflicting expectations about query-cpu-definitions, it seems: on the one hand, if "-cpu none" is valid I believe it should appear on the query-cpu-definitions return value; on the other hand, it is not (always?) migration-safe, so just comparing the source query-cpus data with the target query-cpu-definitions data wouldn't be enough to ensure live-migration safety. On x86, we have a similar problem with "-cpu host", that changes depending on the host hardware and host kernel. We solve this problem by making libvirt code aware of the set of valid CPU models, and libvirt has special cases for "-cpu host". If you don't want to encode that knowledge in libvirt or other management software for s390, it looks like you need something like a "stable-abi-safe" field on CpuDefinitionInfo? > > > > > (I don't understand completely the meaning of "-cpu none" yet. How does > > the CPU look like for the guest in this case? Is it possible to > > live-migrate when using -cpu none?) > > And yes, that does not make sense in a migration context. The answer on query-cpu-model > (or query-cpus) will be ("none", "kvm") and that will never match a runnable model. > The guest cpu will be derived from the hosting system and the kvm kernel as it is currently > without the cpu model interface. > > I hope I made it better to understand now... Yes, thanks! -- Eduardo

2 5

[libvirt] [PATCH 0/2] fix 2 bugs in virHostdevReAttachPCIDevices
by Huanle Han 02 Apr '15

02 Apr '15

Fix 1: Fix index error in loop after remove an element from the array 'virPCIDeviceList' is actually an array. Removing one element makes the rest of the element move. Use while loop, increase index only when not do 'virPCIDeviceListDel(pcidevs, dev)' Fix 2: In such a case: 1. Domain A and B xml contain the same SRIOV net hostdev(<interface type='hostdev' /> with same pci address). 2. virsh start A (Successfully, and configure the SRIOV net with custom mac) 3. virsh start B (Fail because of the hostdev used by domain A or other reason.) In step 3, 'virHostdevNetConfigRestore' is called for the hostdev which is still used by domain A. It makes the mac/vlan of the SRIOV net change. Code Change in this fix: 1. As the pci used by other domain have been removed from 'pcidevs' in previous loop, we only restore the nic config for the hostdev still in 'pcidevs'(used by this domain) 2. wrap a function 'virHostdevIsPCINetDevice', which detect whether the hostdev is a pci net device or not. 3. update the comments to make it more clear Huanle Han (2): hostdev: Fix index error in loop after remove an element hostdev: fix net config restore error src/util/virhostdev.c | 56 ++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 40 insertions(+), 16 deletions(-) -- 1.9.1

3 9

[libvirt] [PATCH] Typos: Get rid of dependan(t|cies)
by Martin Kletzander 02 Apr '15

02 Apr '15

Dependant is flagged as wrong in US dictionary (only valid in UK dictionary, and even then, it has only the financial sense and not the inter-relatedness sense that we are more prone to be wanting throughout code). Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed as trivial and already decided on in here: https://www.redhat.com/archives/libvir-list/2015-March/msg01320.html src/libvirt-domain.c | 4 ++-- src/libvirt-secret.c | 2 +- src/util/virkmod.c | 2 +- tools/virsh.pod | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index f1608dc..0d00af8 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -2642,7 +2642,7 @@ virDomainGetXMLDesc(virDomainPtr domain, unsigned int flags) * * Reads native configuration data describing a domain, and * generates libvirt domain XML. The format of the native - * data is hypervisor dependant. + * data is hypervisor dependent. * * Returns a 0 terminated UTF-8 encoded XML instance, or NULL in case of error. * the caller must free() the returned value. @@ -2692,7 +2692,7 @@ virConnectDomainXMLFromNative(virConnectPtr conn, * * Reads a domain XML configuration document, and generates * a native configuration file describing the domain. - * The format of the native data is hypervisor dependant. + * The format of the native data is hypervisor dependent. * * Returns a 0 terminated UTF-8 encoded native config datafile, or NULL in case of error. * the caller must free() the returned value. diff --git a/src/libvirt-secret.c b/src/libvirt-secret.c index 946d1b8..e77f223 100644 --- a/src/libvirt-secret.c +++ b/src/libvirt-secret.c @@ -452,7 +452,7 @@ virSecretGetUsageType(virSecretPtr secret) * * Get the unique identifier of the object with which this * secret is to be used. The format of the identifier is - * dependant on the usage type of the secret. For a secret + * dependent on the usage type of the secret. For a secret * with a usage type of VIR_SECRET_USAGE_TYPE_VOLUME the * identifier will be a fully qualfied path name. The * identifiers are intended to be unique within the set of diff --git a/src/util/virkmod.c b/src/util/virkmod.c index e0bcdfc..219fad6 100644 --- a/src/util/virkmod.c +++ b/src/util/virkmod.c @@ -121,7 +121,7 @@ virKModLoad(const char *module, bool useBlacklist) * Remove or unload a module. * * NB: Do not use 'modprobe -r' here as that code will recursively - * unload any modules that were dependancies of the one being removed + * unload any modules that were dependencies of the one being removed * even if things still require them. e.g. it'll see the 'bridge' * module has refcount of 0 and remove it, even if there are bridges * created on the host diff --git a/tools/virsh.pod b/tools/virsh.pod index 5d52761..79d50f9 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -3235,7 +3235,7 @@ B<Note>: A storage pool that relies on remote resources such as an times in order to have all the volumes detected (see B<pool-refresh>). This is because the corresponding volume devices may not be present in the host's filesystem during the initial pool startup or the current -refresh attempt. The number of refresh retries is dependant upon the +refresh attempt. The number of refresh retries is dependent upon the network connection and the time the host takes to export the corresponding devices. -- 2.3.4

1 0

[libvirt] [PATCH] docs: Add Host sFlow into monitoring apps
by Martin Kletzander 02 Apr '15

02 Apr '15

Reported-by: Peter Phaal <peter.phaal(a)gmail.com> Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- docs/apps.html.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/apps.html.in b/docs/apps.html.in index 79ee73a..fd45189 100644 --- a/docs/apps.html.in +++ b/docs/apps.html.in @@ -321,6 +321,12 @@ For a full description, please refer to the libvirt section in the collectd.conf(5) manual page. </dd> + <dt><a href="http://host-sflow.sourceforge.net/">Host sFlow</a></dt> + <dd> + Host sFlow is a lightweight agent running on KVM hypervisors that + links to libvirt library and exports standardized cpu, memory, network + and disk metrics for all virtual machines. + </dd> <dt><a href="http://honk.sigxcpu.org/projects/libvirt/#munin">Munin</a></dt> <dd> The plugins provided by Guido Günther allow to monitor various things -- 2.3.3

2 1

[libvirt] [PATCHv3 0/6] Allocate virtio-serial addresses
by Ján Tomko 02 Apr '15

02 Apr '15

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1076708 https://bugzilla.redhat.com/show_bug.cgi?id=890606 New in v3: * preserve the behavior of honoring the controller if a partial address is specified: <address type='virtio-serial' controller='2'/> * automatically add a controller if we're out of free ports and add a test for it Ján Tomko (6): Add test for virtio serial port assignment Add functions to track virtio-serial addresses Allocate virtio-serial addresses when starting a domain Expand the address set when attaching a virtio-serial controller Assign an address when hotplugging a virtio-serial device Auto add virtio-serial controllers src/conf/domain_addr.c | 435 +++++++++++++++++++++ src/conf/domain_addr.h | 61 +++ src/conf/domain_conf.c | 48 +-- src/conf/domain_conf.h | 1 + src/libvirt_private.syms | 11 + src/qemu/qemu_command.c | 63 +++ src/qemu/qemu_domain.c | 1 + src/qemu/qemu_domain.h | 1 + src/qemu/qemu_hotplug.c | 32 +- src/qemu/qemu_process.c | 2 + tests/qemuhotplugtest.c | 2 +- .../qemuxml2argv-channel-virtio-auto.args | 2 +- .../qemuxml2argv-channel-virtio-autoadd.args | 33 ++ .../qemuxml2argv-channel-virtio-autoadd.xml | 45 +++ .../qemuxml2argv-channel-virtio-autoassign.args | 20 + .../qemuxml2argv-channel-virtio-autoassign.xml | 50 +++ tests/qemuxml2argvtest.c | 4 + .../qemuxml2xmlout-channel-virtio-auto.xml | 9 +- 18 files changed, 777 insertions(+), 43 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoadd.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoadd.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.xml -- 2.0.5

2 8

[libvirt] [PATCH v2 0/6] storage: handle scsi/iscsi error paths better
by John Ferlan 02 Apr '15

02 Apr '15

v1 here: http://www.redhat.com/archives/libvir-list/2015-March/msg01562.html changes: 1/6: Removed the virGetLastError() == NULL check 2/6: New - reading more closely showed an error path without a goto 3/6: New - Adjust return for virStorageBackendSCSINewLun to be able to differentiate real error vs. deciding to return because a stable path could not be determined 4/6: New - Found an unused variable in processLU 5/6: Adjust the logic to return -1 for "real" errors and -2 for errors that are "recoverable". Removed the need for goto cleanup. 6/6: Add check for non-existent stable path at startup (and fail). Add check during refresh for a found non standard stable path that returns no volumes in the pool John Ferlan (6): iscsi: Use error message from virStorageBackendSCSIFindLUs iscsi: Fix exit path for virStorageBackendISCSIFindLUs failure scsi: Adjust return value for virStorageBackendSCSINewLun scsi: Remove unused 'type_path' in processLU scsi: Adjust return values from processLU iscsi: Add checks for non standard stable target.path src/storage/storage_backend_iscsi.c | 33 ++++++++++++++++----- src/storage/storage_backend_scsi.c | 59 ++++++++++++++++++++++++------------- 2 files changed, 64 insertions(+), 28 deletions(-) -- 2.1.0

2 12

[libvirt] [PATCH 0/7] Introduce storage pool status XML
by Erik Skultety 02 Apr '15

02 Apr '15

All of the commits resolve BZ https://bugzilla.redhat.com/show_bug.cgi?id=1177733 Erik Skultety (7): storage: Remove unused attribute conn from 'checkPool' callback conf: Add support for storage state directory conf: Add/modify storage formatting functions storage: Modify stateInitialize to support storage state XML conf: Introduce virStoragePoolLoadAllState && virStoragePoolLoadState storage: Introduce storagePoolUpdateAllState function storage: Create/Delete pool status XML src/conf/storage_conf.c | 229 ++++++++++++++++++++++++++++------ src/conf/storage_conf.h | 14 ++- src/libvirt_private.syms | 2 + src/storage/storage_backend.h | 3 +- src/storage/storage_backend_fs.c | 3 +- src/storage/storage_backend_iscsi.c | 3 +- src/storage/storage_backend_logical.c | 3 +- src/storage/storage_backend_mpath.c | 3 +- src/storage/storage_backend_scsi.c | 3 +- src/storage/storage_backend_zfs.c | 3 +- src/storage/storage_driver.c | 166 +++++++++++++++++++----- 11 files changed, 348 insertions(+), 84 deletions(-) -- 1.9.3

3 20

[libvirt] [PATCH] virsh: remove stale comment
by Ján Tomko 02 Apr '15

02 Apr '15

Copied from the vcpupin command, which has two modes of operation. --- Pushed as trivial. tools/virsh-domain.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index eee441f..e7b5eeb 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6961,7 +6961,6 @@ cmdIOThreadPin(vshControl *ctl, const vshCmd *cmd) goto cleanup; cpumaplen = VIR_CPU_MAPLEN(maxcpu); - /* Pin mode: pinning specified vcpu to specified physical cpus*/ if (!(cpumap = vshParseCPUList(ctl, cpulist, maxcpu, cpumaplen))) goto cleanup; -- 2.0.5

1 0

[libvirt] [python PATCH] Post-release version bump to 1.2.15
by Jiri Denemark 02 Apr '15

02 Apr '15

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- Pushed as trivial. setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 00e6d75..79b048f 100755 --- a/setup.py +++ b/setup.py @@ -309,7 +309,7 @@ class my_clean(clean): _c_modules, _py_modules = get_module_lists() setup(name = 'libvirt-python', - version = '1.2.14', + version = '1.2.15', url = 'http://www.libvirt.org', maintainer = 'Libvirt Maintainers', maintainer_email = 'libvir-list(a)redhat.com', -- 2.3.5

1 0

[libvirt] [PATCH 0/2] qemu: Finish fixing of interlocking domain ops with blockjobs
by Peter Krempa 02 Apr '15

02 Apr '15

Peter Krempa (1): qemu: snapshot: Check for block jobs individually Shanzhi Yu (1): conf: Rename virDomainHasDiskMirror and detect block jobs properly src/conf/domain_conf.c | 25 ++++++++++++++++++++----- src/conf/domain_conf.h | 3 ++- src/libvirt_private.syms | 2 +- src/qemu/qemu_driver.c | 19 +++++++++++-------- src/qemu/qemu_migration.c | 2 +- 5 files changed, 35 insertions(+), 16 deletions(-) -- 2.2.2

2 5

[libvirt] [PATCH 0/6] Cleanups
by Ján Tomko 02 Apr '15

02 Apr '15

First two patches are a result of compiling with -Wunused-macros. They reduce the number of infractions from 111 to 82. The remaining cases are: * unused VIR_FROM_THIS * copies of other headers * in drivers I'm not familiar with enough The next two were found randomly, which lead me to look into virutil.h as well, because just like virsh.c, the util files were split as well. Ján Tomko (6): Remove unused macros Use the DEFAULT_DRIVER_DIR macro Do not include cpu_map.h in libvirtd.c Clean up headers in src/util/virutil.h Remove unused includes from virsh Remove unnecessary includes from virsh.h daemon/libvirtd.c | 2 -- src/conf/network_conf.c | 1 - src/driver.c | 4 ++-- src/locking/lock_daemon.c | 1 - src/locking/lock_driver_lockd.c | 4 ---- src/openvz/openvz_driver.c | 4 ---- src/qemu/qemu_driver.c | 2 -- src/qemu/qemu_monitor_text.c | 3 --- src/test/test_driver.c | 1 - src/uml/uml_driver.c | 3 --- src/util/virutil.c | 4 ---- src/util/virutil.h | 2 -- tests/sockettest.c | 10 ---------- tests/testutils.c | 5 ----- tools/virsh-domain.c | 1 + tools/virsh-network.c | 7 +------ tools/virsh-nodedev.c | 7 +------ tools/virsh-nwfilter.c | 6 ------ tools/virsh-pool.c | 6 ------ tools/virsh-secret.c | 6 ------ tools/virsh-snapshot.c | 1 + tools/virsh.c | 10 ---------- tools/virsh.h | 3 --- 23 files changed, 6 insertions(+), 87 deletions(-) -- 2.0.5

2 13