- Devel - libvirt List Archives

[libvirt] cpuset / numa and qemu in TCG mode
by Tony Breeds 18 May '15

18 May '15

Hello all, This is with reference to OpenStack (nova) bug 1439280 [1]. The symptom is when nova(-compute) tries to launch an instance/VM it errors out with: "libvirtError: Requested operation is not valid: cpu affinity is not supported" This only happens with using qemu in TCG mode. After looking at the domain XML and the docs at [2] It seems to me the problem is either: 1) the libvirt driver in nova is generating valid XML that is an invalid domain description ; or 2) NUMA support in qemu (TCG) mode is broken. Exploring these options a little further: Option 1: the libvirt driver in nova is generating valid XML that is an invalid domain description ==== This is the relevant section of the domain XML --- <vcpu placement='static' cpuset='0-1'>1</vcpu> <cputune> <shares>1024</shares> </cputune> --- To my reading of [2] the domain XML should either avoid specifying the 'cpuset' in the vcpu node ; or include 'emulatorpin' in the cputune node. Have I understood the documentation correctly? If so it would seem that the correct fix is in nova to teach the libvirt driver to generate the correct XML for this virtulisation type. Option 2: NUMA support in qemu (TCG) mode is broken. ==== Is cpuset and NUMA architecture expected to work in qemu when running in TCG mode? If it is then clearly we need to dig into this and fix qemu. Yours Tony. [1] https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1439280 [2] https://libvirt.org/formatdomain.html#elementsCPUAllocation

5 13

[libvirt] [PATCH 0/4] xenconfig: fix SPICE parsing/formatting
by Jim Fehlig 18 May '15

18 May '15

This series fixes several bugs related to SPICE parsing and formatting code in xenconfig. The bugs are mostly due to misinterpretation of the Xen documenation, which I failed to notice when reviewing the initial submission. Jim Fehlig (4): xenconfig: use local variable for graphics def xenconfig: format spice listenAddr when formating ports xenconfig: fix spicepasswd handling xenconfig: fix spice mousemode and copypaste src/xenconfig/xen_xl.c | 95 ++++++++++++++++++++---------- tests/xlconfigdata/test-spice-features.cfg | 32 ++++++++++ tests/xlconfigdata/test-spice-features.xml | 48 +++++++++++++++ tests/xlconfigdata/test-spice.cfg | 4 +- tests/xlconfigdata/test-spice.xml | 2 + tests/xlconfigtest.c | 1 + 6 files changed, 148 insertions(+), 34 deletions(-) create mode 100644 tests/xlconfigdata/test-spice-features.cfg create mode 100644 tests/xlconfigdata/test-spice-features.xml -- 1.8.4.5

3 9

[libvirt] [PATCH 0/6] node_device: update sriov/iommu info before dumpxml of a device
by Laine Stump 18 May '15

18 May '15

Patch 5/6 resolves this bug: https://bugzilla.redhat.com/show_bug.cgi?id=981546 (filed against RHEL7, but existing in every version of libvirt that supports reporting of SRIOV virtual function info via the NodeDevice APIs - 0.7.5, believe it or not). The rest of the series is there to make the bugfix less of a hack (and make it easier to fix future similar bugs). Laine Stump (6): conf: make virNodeDevCapData an official type nodedev: change if-else if in update_caps to switch node device: prepare node_device_linux_sysfs.c to add more functions node_device: new functions to get sriov/iommu info from sysfs node_device: update sriov/iommu info before dumpxml of a device node_device: replace duplicated code in hal and udev backends src/Makefile.am | 5 +- src/conf/node_device_conf.c | 50 ++++++++-------- src/conf/node_device_conf.h | 16 +++-- src/libxl/libxl_driver.c | 4 +- src/node_device/node_device_driver.c | 50 ++++++++++++---- src/node_device/node_device_driver.h | 2 - src/node_device/node_device_hal.c | 39 +++++------- src/node_device/node_device_linux_sysfs.c | 99 +++++++++++++++++++++++++++++-- src/node_device/node_device_linux_sysfs.h | 32 ++++++++++ src/node_device/node_device_udev.c | 70 +++++++--------------- src/qemu/qemu_driver.c | 2 +- src/test/test_driver.c | 6 +- src/xen/xen_driver.c | 4 +- 13 files changed, 247 insertions(+), 132 deletions(-) create mode 100644 src/node_device/node_device_linux_sysfs.h -- 2.1.0

2 8

[libvirt] [PATCH v2 0/4] Enable support for s390 crypto key mgmt operations
by Michal Privoznik 18 May '15

18 May '15

I've taken Tony's patches from here: https://www.redhat.com/archives/libvir-list/2015-April/msg01395.html polished them a bit, and resend. Tony Krowiak (4): libvirt: docs: XML to enable/disable protected key mgmt ops libvirt: conf: parse XML for protected key management ops libvirt: qemu: enable/disable protected key management ops libvirt: tests: test protected key mgmt ops support docs/formatdomain.html.in | 37 +++++ docs/schemas/domaincommon.rng | 24 ++++ src/conf/domain_conf.c | 156 +++++++++++++++++++++ src/conf/domain_conf.h | 17 +++ src/libvirt_private.syms | 2 + src/qemu/qemu_capabilities.c | 4 + src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 73 ++++++++++ tests/qemuargv2xmltest.c | 6 + .../qemuxml2argv-machine-aeskeywrap-off-argv.args | 6 + .../qemuxml2argv-machine-aeskeywrap-off-argv.xml | 27 ++++ .../qemuxml2argv-machine-aeskeywrap-off-cap.args | 7 + .../qemuxml2argv-machine-aeskeywrap-off-cap.xml | 28 ++++ .../qemuxml2argv-machine-aeskeywrap-off-caps.args | 7 + .../qemuxml2argv-machine-aeskeywrap-off-caps.xml | 28 ++++ .../qemuxml2argv-machine-aeskeywrap-on-argv.args | 6 + .../qemuxml2argv-machine-aeskeywrap-on-argv.xml | 27 ++++ .../qemuxml2argv-machine-aeskeywrap-on-cap.args | 7 + .../qemuxml2argv-machine-aeskeywrap-on-cap.xml | 28 ++++ .../qemuxml2argv-machine-aeskeywrap-on-caps.args | 7 + .../qemuxml2argv-machine-aeskeywrap-on-caps.xml | 27 ++++ .../qemuxml2argv-machine-deakeywrap-off-argv.args | 6 + .../qemuxml2argv-machine-deakeywrap-off-argv.xml | 27 ++++ .../qemuxml2argv-machine-deakeywrap-off-cap.args | 7 + .../qemuxml2argv-machine-deakeywrap-off-cap.xml | 28 ++++ .../qemuxml2argv-machine-deakeywrap-off-caps.args | 7 + .../qemuxml2argv-machine-deakeywrap-off-caps.xml | 28 ++++ .../qemuxml2argv-machine-deakeywrap-on-argv.args | 6 + .../qemuxml2argv-machine-deakeywrap-on-argv.xml | 27 ++++ .../qemuxml2argv-machine-deakeywrap-on-cap.args | 7 + .../qemuxml2argv-machine-deakeywrap-on-cap.xml | 28 ++++ .../qemuxml2argv-machine-deakeywrap-on-caps.args | 7 + .../qemuxml2argv-machine-deakeywrap-on-caps.xml | 28 ++++ .../qemuxml2argv-machine-keywrap-none-argv.args | 6 + .../qemuxml2argv-machine-keywrap-none-argv.xml | 24 ++++ .../qemuxml2argv-machine-keywrap-none-caps.args | 7 + .../qemuxml2argv-machine-keywrap-none-caps.xml | 25 ++++ .../qemuxml2argv-machine-keywrap-none.args | 7 + .../qemuxml2argv-machine-keywrap-none.xml | 25 ++++ tests/qemuxml2argvtest.c | 81 +++++++++++ 40 files changed, 907 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-argv.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-argv.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-cap.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-cap.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-caps.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-caps.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-argv.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-argv.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-cap.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-cap.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-caps.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-caps.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-argv.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-argv.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-cap.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-cap.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-caps.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-caps.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-argv.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-argv.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-cap.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-cap.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-caps.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-caps.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-argv.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-argv.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-caps.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-caps.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none.xml -- 2.3.6

4 12

[libvirt] [PATCH] libxl: provide impl for nodeGetSecurityModel
by Jim Fehlig 18 May '15

18 May '15

Currently, the libxl driver does not support any security drivers. When the qemu driver has no security driver configued, nodeGetSecurityModel succeeds but returns an empty virSecurityModel object. Do the same in the libxl driver instead of reporting this function is not supported by the connection driver: virNodeGetSecurityModel Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- I was reminded of this today when looking through a libvirtd log. The system was running a test script that among other things called 'virsh dominfo'. Each time dominfo was called, the log was spammed with "this function is not supported by the connection driver: virNodeGetSecurityModel". src/libxl/libxl_driver.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 60c139e..d6b20ae 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -5027,6 +5027,23 @@ libxlDomainMigrateConfirm3Params(virDomainPtr domain, return libxlDomainMigrationConfirm(driver, vm, flags, cancelled); } +static int libxlNodeGetSecurityModel(virConnectPtr conn, + virSecurityModelPtr secmodel) +{ + memset(secmodel, 0, sizeof(*secmodel)); + + if (virNodeGetSecurityModelEnsureACL(conn) < 0) + return -1; + + /* + * Currently the libxl driver does not support security model. + * Similar to the qemu driver, treat this as success and simply + * return no data in secmodel. Avoids spamming the libvirt log + * with "this function is not supported by the connection driver: + * virNodeGetSecurityModel" + */ + return 0; +} static virHypervisorDriver libxlHypervisorDriver = { .name = LIBXL_DRIVER_NAME, @@ -5122,6 +5139,7 @@ static virHypervisorDriver libxlHypervisorDriver = { .domainMigratePerform3Params = libxlDomainMigratePerform3Params, /* 1.2.6 */ .domainMigrateFinish3Params = libxlDomainMigrateFinish3Params, /* 1.2.6 */ .domainMigrateConfirm3Params = libxlDomainMigrateConfirm3Params, /* 1.2.6 */ + .nodeGetSecurityModel = libxlNodeGetSecurityModel, /* 1.2.16 */ }; static virConnectDriver libxlConnectDriver = { -- 2.3.7

3 2

[libvirt] [PATCH] util: make it more robust to calculate timeout value
by zhang bo 18 May '15

18 May '15

When we change system clock to years ago, a certain CPU may use up 100% cputime. The reason is that in function virEventPollCalculateTimeout(), we assign the unsigned long long result to an INT variable, *timeout = then - now; // timeout is INT, and then/now are long long if (*timeout < 0) *timeout = 0; there's a chance that variable @then minus variable @now may be a very large number that overflows INT value expression, then *timeout will be negative and be assigned to 0. Next the 'poll' in function virEventPollRunOnce() will get into an 'endless' while loop there. thus, the cpu that virEventPollRunOnce() thread runs on will go up to 100%. Although as we discussed before in https://www.redhat.com/archives/libvir-list/2015-May/msg00400.html it should be prohibited to set-time while other applications are running, but it does seems to have no harm to make the codes more robust. Signed-off-by: Wang Yufei <james.wangyufei(a)huawei.com> Signed-off-by: Zhang Bo <oscar.zhangbo(a)huawei.com> --- src/util/vireventpoll.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/util/vireventpoll.c b/src/util/vireventpoll.c index ffda206..5f5a149 100644 --- a/src/util/vireventpoll.c +++ b/src/util/vireventpoll.c @@ -357,9 +357,10 @@ static int virEventPollCalculateTimeout(int *timeout) return -1; EVENT_DEBUG("Schedule timeout then=%llu now=%llu", then, now); - *timeout = then - now; - if (*timeout < 0) + if (then < now) *timeout = 0; + else + *timeout = (then - now) & 0x7FFFFFFF; } else { *timeout = -1; } -- 1.7.12.4

4 5

[libvirt] C# PInvoke Library done, Nuget Package released
by scott lee 17 May '15

17 May '15

Libvirt C# Nuget package released at https://www.nuget.org/packages/Libvirt_Pinvoke/ This will add all necessary dll's and includes a full 1 to 1 mapping of the libvirt API 1.2.13 (http://libvirt.org/html/) All Structures, enums, delegates, and functions are included with the same naming and function.

1 0

[libvirt] [PATCH] netdev: assure that SRIOV PF is online before modifying VF params
by Laine Stump 15 May '15

15 May '15

The kernel won't complain if you set the mac address and vlan tag for an SRIOV VF via its PF, and it will even let you assign the PF to a guest using PCI device assignment or macvtap passthrough. But if the PF isn't online, the device won't be usable in the guest. This patch makes sure that it is turned on. Since multiple guests/VFs could use the same PF, there is no point in ever setting the PF *off*line. This resolves: https://bugzilla.redhat.com/show_bug.cgi?id=893738 Originally filed against RHEL6, but present in every version of libvirt until today. --- src/util/virnetdev.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index e14b401..7022dfa 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -2258,6 +2258,17 @@ virNetDevReplaceVfConfig(const char *pflinkdev, int vf, char macstr[VIR_MAC_STRING_BUFLEN]; char *fileData = NULL; int ifindex = -1; + bool pfIsOnline; + + /* Assure that PF is online prior to twiddling with the VF. It + * *should* be, but if the PF isn't online the changes made to the + * VF via the PF won't take effect, yet there will be no error + * reported. + */ + if (virNetDevGetOnline(pflinkdev, &pfIsOnline) < 0) + return ret; + if (!pfIsOnline && virNetDevSetOnline(pflinkdev, true) < 0) + return ret; if (virNetDevGetVfConfig(pflinkdev, vf, &oldmac, &oldvlanid) < 0) goto cleanup; -- 2.1.0

2 4

[libvirt] [PATCH 0/4] Enable support for s390 crypto key mgmt operations
by akrowiak＠linux.vnet.ibm.com 15 May '15

15 May '15

From: Tony Krowiak <akrowiak(a)linux.vnet.ibm.com> The IBM System z Central Processor Assist for Cryptographic Functions (CPACF) hardware provides a set of CPU instructions for use in clear-key encryption, pseudo random number generation, hash functions, and protected-key encryption. The CPACF protected key cryptographic functions operate with a protected key which is encrypted under a unique wrapping key that is stored in the Hardware System Area (HSA) of the machine and can only be accessed by firmware. The wrapping key cannot be accessed by the operating system or application programs. There are two wrapping keys: One for wrapping AES keys and one for wrapping DES/TDES keys. This patch set enables the support for encrypting clear keys under the AES and DES/TDES wrapping keys for guests started on hosts running on s390 hardware that supports key wrapping. Tony Krowiak (4): libvirt: docs: XML to enable/disable protected key mgmt ops libvirt: conf: parse XML for protected key management ops libvirt: qemu: enable/disable protected key management ops libvirt: tests: test protected key mgmt ops support

3 9

[libvirt] [PATCHv2 0/9] qemu: fix device alias usage, ide controllers,
by Laine Stump 15 May '15

15 May '15

V1 was here: http://www.redhat.com/archives/libvir-list/2015-May/msg00124.html This started out with the intent to generate an error/failure on request for an IDE controller on a machinetype that doesn't support IDE (currently anything except 440fx-based machinetypes), or a 2nd IDE controller on a machinetype that only supports one (i.e. 440fx). This led to a few other related fixes, and some "fixes related to the related fixes". I've pushed some of the ACKed patches, and dropped the two patches that changed qemuBuildDeviceAddress and qemuAssignDeviceControllerAlias to use switches instead of "if .. else if .." (03/13 and 04/13) and dropped the two SCSI patches (12/13 and 13/13), but left a couple of ACKed patches in for clarity. Detailed differences from V1 in each patch. Laine Stump (9): conf: utility to return alias of a controller based on type/index qemu: fix exceptions in qemuAssignDeviceControllerAlias qemu: use controller alias when constructing device/controller args qemu: use alias to refer to non-multibus PCI controller qemu: use controller's alias in commandline for scsi-generic qemu: use USB controller's alias instead of qemuUSBId() qemu: remove test for allowing ide controller in s390, rename usb tests qemu: clean up qemuBuildCommandline loop that builds controller args qemu: log error when domain has an unsupported IDE controller src/conf/domain_conf.c | 34 +++ src/conf/domain_conf.h | 3 + src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 317 +++++++++++---------- src/qemu/qemu_command.h | 6 +- src/qemu/qemu_hotplug.c | 4 +- .../qemuxml2argv-disk-blockio.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-disk-blockio.xml | 1 - .../qemuxml2argv-disk-ide-drive-split.args | 2 +- .../qemuxml2argv-disk-ide-drive-split.xml | 1 - .../qemuxml2argv-disk-sata-device.args | 4 +- .../qemuxml2argv-disk-source-pool-mode.args | 2 +- .../qemuxml2argv-disk-source-pool-mode.xml | 1 - .../qemuxml2argv-disk-source-pool.args | 2 +- .../qemuxml2argv-disk-source-pool.xml | 1 - ...uxml2argv-s390-allow-bogus-usb-controller.args} | 0 ...muxml2argv-s390-allow-bogus-usb-controller.xml} | 3 - ...=> qemuxml2argv-s390-allow-bogus-usb-none.args} | 0 ... => qemuxml2argv-s390-allow-bogus-usb-none.xml} | 0 tests/qemuxml2argvtest.c | 4 +- .../qemuxml2xmlout-disk-source-pool.xml | 1 - 21 files changed, 226 insertions(+), 163 deletions(-) rename tests/qemuxml2argvdata/{qemuxml2argv-s390-piix-controllers.args => qemuxml2argv-s390-allow-bogus-usb-controller.args} (100%) rename tests/qemuxml2argvdata/{qemuxml2argv-s390-piix-controllers.xml => qemuxml2argv-s390-allow-bogus-usb-controller.xml} (86%) rename tests/qemuxml2argvdata/{qemuxml2argv-s390-usb-none.args => qemuxml2argv-s390-allow-bogus-usb-none.args} (100%) rename tests/qemuxml2argvdata/{qemuxml2argv-s390-usb-none.xml => qemuxml2argv-s390-allow-bogus-usb-none.xml} (100%) -- 2.1.0

2 11

[libvirt] [PATCH v2 0/5] Cleanup storage migration code a bit
by Jiri Denemark 15 May '15

15 May '15

Version 2: - move QEMU-only data from virDomainDiskDef to a private data object Jiri Denemark (5): Add privateData to virDomainDiskDef Rename virDomainHasBlockjob as qemuDomainHasBlockjob Move QEMU-only fields from virDomainDiskDef into privateData qemu: Keep track of what disks are being migrated qemu: Don't give up on first error in qemuMigrationCancelDriverMirror src/conf/domain_conf.c | 43 ++++------------------- src/conf/domain_conf.h | 19 +++------- src/libvirt_private.syms | 1 - src/parallels/parallels_sdk.c | 4 +-- src/qemu/qemu_blockjob.c | 48 ++++++++++++++----------- src/qemu/qemu_command.c | 4 +-- src/qemu/qemu_domain.c | 81 ++++++++++++++++++++++++++++++++++++++++++- src/qemu/qemu_domain.h | 25 +++++++++++++ src/qemu/qemu_driver.c | 15 ++++---- src/qemu/qemu_migration.c | 42 +++++++++++----------- src/qemu/qemu_process.c | 17 +++++---- src/vbox/vbox_common.c | 4 +-- src/vbox/vbox_tmpl.c | 6 ++-- src/vmx/vmx.c | 2 +- src/xenconfig/xen_sxpr.c | 6 ++-- src/xenconfig/xen_xl.c | 2 +- src/xenconfig/xen_xm.c | 4 +-- 17 files changed, 201 insertions(+), 122 deletions(-) -- 2.4.0

2 9

[libvirt] Windows Development
by scott lee 15 May '15

15 May '15

I just finished the C# PInvoke portion for the libvirt library. https://github.com/smasherprog/Libvirt_Windows_Dll If you download the repo, and execute the powershell script, all dlls/headers are pulled, and a single C# PInvoke file is generated from the libvirt header files which contains all enums, callbacks, functions, etc. It is a complete parse of all headers libvirt-domain-snapshot.h libvirt-domain.h libvirt-event.h libvirt-host.h libvirt-interface.h libvirt-lxc.h libvirt-network.h libvirt-nodedev.h libvirt-nwfilter.h libvirt-qemu.h libvirt-secret.h libvirt-storage.h libvirt-stream.h libvirt.h virterror.h into a single .cs file that can be used for development -- thanks to the clang compiler! Now, I'll create a demo solution for this as well.

1 0

[libvirt] [PATCH] docs: add dimm address document in docs
by Luyao Huang 15 May '15

15 May '15

As we have a new device address type 'dimm', add some document and an example to our docs. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- docs/formatdomain.html.in | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index e0b6ba7..0e908a1 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -2876,6 +2876,13 @@ attributes: <code>iobase</code> and <code>irq</code>. <span class="since">Since 1.2.1</span> </dd> + <dt><code>type='dimm'</code></dt> + <dd>DIMM addresses, for memory device, have the following additional + attributes: <code>slot</code> (a value between 0 and 4294967295, + inclusive), and <code>base</code> (a hex value between 0 and + 0xffffffffffffffff, inclusive). + <span class="since">Since 1.2.14</span> + </dd> </dl> <h4><a name="elementsControllers">Controllers</a></h4> @@ -6038,6 +6045,7 @@ qemu-kvm -net nic,model=? /dev/null <size unit='KiB'>524287</size> <node>0</node> </target> + <address type='dimm' slot='0' base='0x0'/> </memory> <memory model='dimm'> <source> -- 1.8.3.1

3 2

[libvirt] [PATCHv2] virsh: fix no error output when parse cpulist fail
by Luyao Huang 15 May '15

15 May '15

When we pass a invalid cpulist or the lastcpu in the cpulist exceed the maxcpu, we cannot get any error. like this: # virsh vcpupin test3 1 aaa # virsh vcpupin test3 1 1000 Because virBitmapParse() use virReportError() to set the error message, vshCommandRun would output the error in vshReportError, but in the meantime it is overwriten by the virResetLastError in virDomainFree. If we want use the error which set by virReportError(), we need vshSaveLibvirtError to help us. However the error from virBitmap is not clearly enough, i chose use vshError to output error when parse failed. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- v2: Add the check in vshParseCPUList, because this will make get last cpu more easier when the cpulist is a bitmap. tools/virsh-domain.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 14e1e35..20f8c75 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6348,7 +6348,7 @@ vshPrintPinInfo(unsigned char *cpumap, size_t cpumaplen) } static unsigned char * -vshParseCPUList(int *cpumaplen, const char *cpulist, int maxcpu) +vshParseCPUList(vshControl *ctl, int *cpumaplen, const char *cpulist, int maxcpu) { unsigned char *cpumap = NULL; virBitmapPtr map = NULL; @@ -6358,8 +6358,17 @@ vshParseCPUList(int *cpumaplen, const char *cpulist, int maxcpu) return NULL; virBitmapSetAll(map); } else { - if (virBitmapParse(cpulist, '\0', &map, maxcpu) < 0) - return NULL; + if ((virBitmapParse(cpulist, '\0', &map, 1024) < 0) || + virBitmapIsAllClear(map)) { + vshError(ctl, _("Invalid cpulist '%s'"), cpulist); + goto cleanup; + } + int lastcpu = virBitmapLastSetBit(map); + if (lastcpu >= maxcpu) { + vshError(ctl, _("CPU %d in cpulist '%s' exceed the maxcpu %d"), + lastcpu, cpulist, maxcpu); + goto cleanup; + } } if (virBitmapToData(map, &cpumap, cpumaplen) < 0) @@ -6458,7 +6467,7 @@ cmdVcpuPin(vshControl *ctl, const vshCmd *cmd) } } else { /* Pin mode: pinning specified vcpu to specified physical cpus*/ - if (!(cpumap = vshParseCPUList(&cpumaplen, cpulist, maxcpu))) + if (!(cpumap = vshParseCPUList(ctl, &cpumaplen, cpulist, maxcpu))) goto cleanup; if (flags == -1) { @@ -6577,7 +6586,7 @@ cmdEmulatorPin(vshControl *ctl, const vshCmd *cmd) } /* Pin mode: pinning emulator threads to specified physical cpus*/ - if (!(cpumap = vshParseCPUList(&cpumaplen, cpulist, maxcpu))) + if (!(cpumap = vshParseCPUList(ctl, &cpumaplen, cpulist, maxcpu))) goto cleanup; if (flags == -1) @@ -6862,7 +6871,7 @@ cmdIOThreadPin(vshControl *ctl, const vshCmd *cmd) if ((maxcpu = vshNodeGetCPUCount(ctl->conn)) < 0) goto cleanup; - if (!(cpumap = vshParseCPUList(&cpumaplen, cpulist, maxcpu))) + if (!(cpumap = vshParseCPUList(ctl, &cpumaplen, cpulist, maxcpu))) goto cleanup; if (virDomainPinIOThread(dom, iothread_id, -- 1.8.3.1

3 2

[libvirt] [RFC v1 0/6] Live Migration with ephemeral host NIC devices
by Chen Fan 15 May '15

15 May '15

my main goal is to add support migration with host NIC passthrough devices and keep the network connectivity. this series patch base on Shradha's patches on https://www.redhat.com/archives/libvir-list/2012-November/msg01324.html which is add migration support for host passthrough devices. 1) unplug the ephemeral devices before migration 2) do native migration 3) when migration finished, hotplug the ephemeral devices TODO: keep network connectivity on guest level by bonding device. Chen Fan (6): conf: add ephemeral element for hostdev supporting migration qemu: Save ephemeral devices into qemuDomainObjPrivate qemu: add check ephemeral devices only for PCI host devices migration: Migration support for ephemeral hostdevs managedsave: move the domain xml handling forward to stop CPU managedsave: add managedsave support for ephemeral host devices docs/schemas/domaincommon.rng | 10 ++ docs/schemas/network.rng | 5 + src/conf/domain_conf.c | 14 +- src/conf/domain_conf.h | 1 + src/conf/network_conf.c | 13 ++ src/conf/network_conf.h | 1 + src/network/bridge_driver.c | 1 + src/qemu/qemu_command.c | 11 ++ src/qemu/qemu_domain.c | 5 + src/qemu/qemu_domain.h | 3 + src/qemu/qemu_driver.c | 48 +++--- src/qemu/qemu_migration.c | 182 ++++++++++++++++++++- src/qemu/qemu_migration.h | 9 + src/qemu/qemu_process.c | 12 ++ tests/networkxml2xmlin/hostdev-pf.xml | 2 +- tests/networkxml2xmlin/hostdev.xml | 2 +- tests/networkxml2xmlout/hostdev-pf.xml | 2 +- tests/networkxml2xmlout/hostdev.xml | 2 +- .../qemuxml2argv-controller-order.xml | 2 +- .../qemuxml2argv-hostdev-pci-address-device.xml | 2 +- .../qemuxml2argv-hostdev-pci-address.xml | 2 +- .../qemuxml2argv-hostdev-scsi-autogen-address.xml | 22 +-- .../qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.xml | 4 +- .../qemuxml2argv-hostdev-scsi-lsi-iscsi.xml | 4 +- .../qemuxml2argv-hostdev-scsi-lsi.xml | 2 +- .../qemuxml2argv-hostdev-scsi-rawio.xml | 2 +- .../qemuxml2argv-hostdev-scsi-readonly.xml | 2 +- .../qemuxml2argv-hostdev-scsi-sgio.xml | 2 +- .../qemuxml2argv-hostdev-scsi-shareable.xml | 2 +- ...qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.xml | 4 +- .../qemuxml2argv-hostdev-scsi-virtio-iscsi.xml | 4 +- .../qemuxml2argv-hostdev-scsi-virtio-scsi.xml | 2 +- ...emuxml2argv-hostdev-usb-address-device-boot.xml | 2 +- .../qemuxml2argv-hostdev-usb-address-device.xml | 2 +- .../qemuxml2argv-hostdev-usb-address.xml | 2 +- .../qemuxml2argv-hostdev-vfio-multidomain.xml | 2 +- .../qemuxml2argvdata/qemuxml2argv-hostdev-vfio.xml | 2 +- .../qemuxml2argv-net-hostdev-multidomain.xml | 2 +- .../qemuxml2argv-net-hostdev-vfio-multidomain.xml | 2 +- .../qemuxml2argv-net-hostdev-vfio.xml | 2 +- .../qemuxml2argvdata/qemuxml2argv-net-hostdev.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-pci-rom.xml | 4 +- ...qemuxml2xmlout-hostdev-scsi-autogen-address.xml | 22 +-- 43 files changed, 340 insertions(+), 83 deletions(-) -- 1.9.3

7 33

[libvirt] [PATCH 00/13] qemu: fix device alias usage, ide controllers, scsi options
by Laine Stump 14 May '15

14 May '15

These are intertwined a bit, hence they are all posted in the same series. This started out with the intent to generate an error/failure on request for an IDE controller on a machinetype that doesn't support IDE (currently anything except 440fx-based machinetypes), or a 2nd IDE controller on a machinetype that only supports one (i.e. 440fx). This led to a few other related fixes, and some "fixes related to the related fixes": * 1 and 2 just eliminate redundant code that I found while making the changes. * 3 & 4 change two sets of if else if else if, into switches, so that it's cleaner and simpler to add more cases. * 5 is a utility function that will be used later to make it easier to get the alias of the controller required by a particular device. * 6 adds exceptions for the primary IDE on 440fx and primary SATA on q35 to the function that creates controller alias names (since those are hardcoded in qemu) * 7-9 switch all remaining uses of BufferAsprintf(buf, "blahcontroller%d") with calls to the function that returns the *real* alias of the controller device. * 10 removes a test that verifies we allow an IDE controller in an s390 machine definition, and renames the tests to indicate that although we're checking to make sure we allow usb controllers on s390, that this isn't actually a valid config. (I would add a warning in the appropriate place when this happens, but at the moment I'm sick of looking at the problem :-/) - This is v2 of the following patch that I posted by itself earlier: https://www.redhat.com/archives/libvir-list/2015-April/msg01596.html https://www.redhat.com/archives/libvir-list/2015-May/msg00031.html * 11 makes it an error to define an IDE controller that qemu won't be able to actually create. * 12 and 13 fix two additional prolems I noticed with the creation of device and drive strings for SCSI disks - the first is that we add a "channel=" option even when qemu has told us it doesn't support it, and the 2nd is that we have carried forward a restriction that bus must == 0 for SCSI - this check was added in 2009, and it seems that it is only valid when *not* using -device to define the disk parameters. Laine Stump (13): qemu: use qemuDomainMachineIsI440FX() in appropriate place qemu: eliminate duplicated code in qemuBuildDriveDevStr() qemu: change if to switch in qemuBuildDeviceAddressStr qemu: restructure qemuAssignDeviceControllerAlias conf: utility to return alias of a controller based on type/index qemu: add exceptions for alias names of primary sata/ide controllers qemu: use controller alias when constructing disk/controller args qemu: use alias for all controller ids in qemuBuildControllerDevStr qemu: use controller object alias in commandline for virtio-serial device qemu: remove test for allowing ide controller in s390, rename usb tests qemu: log error when domain has an upsupported IDE controller qemu: only add channel arg to scsi-disk if qemu binary supports it qemu: allow bus != 0 for scsi-disk when -device is used src/conf/domain_conf.c | 34 +++ src/conf/domain_conf.h | 3 + src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 314 ++++++++++++--------- src/qemu/qemu_command.h | 3 +- src/qemu/qemu_hotplug.c | 4 +- .../qemuxml2argv-disk-blockio.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-disk-blockio.xml | 1 - .../qemuxml2argv-disk-drive-network-iscsi-lun.args | 2 +- .../qemuxml2argv-disk-ide-drive-split.args | 2 +- .../qemuxml2argv-disk-ide-drive-split.xml | 1 - .../qemuxml2argv-disk-sata-device.args | 4 +- .../qemuxml2argv-disk-scsi-disk-split.args | 8 +- .../qemuxml2argv-disk-scsi-disk-vpd.args | 2 +- .../qemuxml2argv-disk-scsi-disk-wwn.args | 4 +- .../qemuxml2argv-disk-scsi-lun-passthrough.args | 12 +- .../qemuxml2argv-disk-scsi-lun-passthrough.xml | 4 +- .../qemuxml2argv-disk-scsi-megasas.args | 2 +- .../qemuxml2argv-disk-scsi-virtio-scsi.args | 2 +- .../qemuxml2argv-disk-scsi-vscsi.args | 2 +- .../qemuxml2argv-disk-source-pool-mode.args | 2 +- .../qemuxml2argv-disk-source-pool-mode.xml | 1 - .../qemuxml2argv-disk-source-pool.args | 2 +- .../qemuxml2argv-disk-source-pool.xml | 1 - .../qemuxml2argv-disk-virtio-scsi-ccw.args | 2 +- .../qemuxml2argv-disk-virtio-scsi-cmd_per_lun.args | 2 +- .../qemuxml2argv-disk-virtio-scsi-max_sectors.args | 2 +- .../qemuxml2argv-disk-virtio-scsi-num_queues.args | 2 +- .../qemuxml2argv-pseries-vio-user-assigned.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-pseries-vio.args | 2 +- ...uxml2argv-s390-allow-bogus-usb-controller.args} | 0 ...muxml2argv-s390-allow-bogus-usb-controller.xml} | 3 - ...=> qemuxml2argv-s390-allow-bogus-usb-none.args} | 0 ... => qemuxml2argv-s390-allow-bogus-usb-none.xml} | 0 tests/qemuxml2argvtest.c | 29 +- .../qemuxml2xmlout-disk-source-pool.xml | 1 - 36 files changed, 266 insertions(+), 192 deletions(-) rename tests/qemuxml2argvdata/{qemuxml2argv-s390-piix-controllers.args => qemuxml2argv-s390-allow-bogus-usb-controller.args} (100%) rename tests/qemuxml2argvdata/{qemuxml2argv-s390-piix-controllers.xml => qemuxml2argv-s390-allow-bogus-usb-controller.xml} (86%) rename tests/qemuxml2argvdata/{qemuxml2argv-s390-usb-none.args => qemuxml2argv-s390-allow-bogus-usb-none.args} (100%) rename tests/qemuxml2argvdata/{qemuxml2argv-s390-usb-none.xml => qemuxml2argv-s390-allow-bogus-usb-none.xml} (100%) -- 2.1.0

3 41

[libvirt] Windows Development
by scott lee 14 May '15

14 May '15

I am experimenting with libvirt, and my favorite IDE is visual studio so I looked for an easy method to build the libvirt library on windows and found that the state of cross-platform libraries like Mingw are outdated or difficult to use correctly for developers who want to start coding immediatly with libvirt. I know there is a way, but assembling the right libraries and commands was just too much. So, I found that the libvirt dll’s are actually a part of most distros of linux and can be downloaded and extracted. I just needed to find out what dlls were needed, then search the repos for those files. After the search, I have begun work on a powershell script to get the latest libvirt builds from fedora, download and extract them. After that, you can go to town building libraries against the libvirt api. Check out the script here: https://github.com/smasherprog/Libvirt_Windows_Dll Anyone who links against the libvirt library would be creating a management tool of some sort so a language like C# so after I create this tool, I will write some code to generate the C# code files for the DLLImport calls. The Libvirt header thousands of lines long so I will write some code to extract the calls/structs and generate the PInvoke calls for everything at once and place it into a .cs file so developers can start dewveloping in libvirt fast and easy. Scott Lee

1 0

[libvirt] [PATCH 0/4] Misc clean-ups again
by Martin Kletzander 14 May '15

14 May '15

Just a couple of them this time. Martin Kletzander (4): rpc: Don't mix max_clients and max_workers in PostExecRestart virnetserver: Remove unnecessary double space gendispatch: Don't generate long lines Some alignment fixes in lxc_controller and jsontest src/lxc/lxc_controller.c | 16 ++++++++-------- src/rpc/gendispatch.pl | 5 +++-- src/rpc/virnetserver.c | 6 +++--- tests/jsontest.c | 12 ++++++------ 4 files changed, 20 insertions(+), 19 deletions(-) -- 2.4.0

2 5

[libvirt] [PATCH 0/2] Clear iothreadid autofill flag for two instances
by John Ferlan 14 May '15

14 May '15

https://bugzilla.redhat.com/show_bug.cgi?id=1218577 The first patch considers the philosophy of the bug report with respect to thread deletion, but doesn't resolve it completely since the ordering of when iothreadpin is done is important. For this patch, when an iothreadid is removed from the "beginning" or "middle" of the iothreadid list, then clear the autofill flag unconditionally for all subsequent iothreadid's. The second patch specifically clears the autofill flag when iothreadpin is used treating it as if someone added an IOThread via iothreadadd John Ferlan (2): conf: Expose iothreadids when delete non sequential iothreadids qemu: Clear autofil fill flag when pinning iothread src/conf/domain_conf.c | 19 ++++++++++++++----- src/qemu/qemu_driver.c | 2 ++ 2 files changed, 16 insertions(+), 5 deletions(-) -- 2.1.0

2 3

[libvirt] [PATCH] reject out of range memory in SetMemory APIs
by Ján Tomko 14 May '15

14 May '15

The APIs take the memory value in KiB and we store it in KiB internally, but we cannot parse the whole ULONG_MAX range on 64-bit systems, because virDomainParseScaledValue needs to fit the value in bytes in an unsigned long long. https://bugzilla.redhat.com/show_bug.cgi?id=1176739 --- src/conf/domain_conf.c | 7 +------ src/libvirt-domain.c | 18 ++++++++++++++++++ src/libvirt_private.syms | 1 + src/util/virutil.c | 20 ++++++++++++++++++++ src/util/virutil.h | 1 + 5 files changed, 41 insertions(+), 6 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 4cd36a1..821a43c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7116,12 +7116,7 @@ virDomainParseMemory(const char *xpath, int ret = -1; unsigned long long bytes, max; - /* On 32-bit machines, our bound is 0xffffffff * KiB. On 64-bit - * machines, our bound is off_t (2^63). */ - if (capped && sizeof(unsigned long) < sizeof(long long)) - max = 1024ull * ULONG_MAX; - else - max = LLONG_MAX; + max = virMemoryMaxValue(capped); ret = virDomainParseScaledValue(xpath, units_xpath, ctxt, &bytes, 1024, max, required); diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 7dcd40e..d467758 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -1850,6 +1850,12 @@ virDomainSetMaxMemory(virDomainPtr domain, unsigned long memory) virCheckReadOnlyGoto(conn->flags, error); virCheckNonZeroArgGoto(memory, error); + if (virMemoryMaxValue(true) / 1024 <= memory) { + virReportError(VIR_ERR_OVERFLOW, _("input too large: %lu"), + memory); + goto error; + } + if (conn->driver->domainSetMaxMemory) { int ret; ret = conn->driver->domainSetMaxMemory(domain, memory); @@ -1896,6 +1902,12 @@ virDomainSetMemory(virDomainPtr domain, unsigned long memory) virCheckReadOnlyGoto(conn->flags, error); virCheckNonZeroArgGoto(memory, error); + if (virMemoryMaxValue(true) / 1024 <= memory) { + virReportError(VIR_ERR_OVERFLOW, _("input too large: %lu"), + memory); + goto error; + } + if (conn->driver->domainSetMemory) { int ret; ret = conn->driver->domainSetMemory(domain, memory); @@ -1953,6 +1965,12 @@ virDomainSetMemoryFlags(virDomainPtr domain, unsigned long memory, virCheckReadOnlyGoto(conn->flags, error); virCheckNonZeroArgGoto(memory, error); + if (virMemoryMaxValue(true) / 1024 <= memory) { + virReportError(VIR_ERR_OVERFLOW, _("input too large: %lu"), + memory); + goto error; + } + if (conn->driver->domainSetMemoryFlags) { int ret; ret = conn->driver->domainSetMemoryFlags(domain, memory, flags); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index c8e6fb4..e77ca81 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2331,6 +2331,7 @@ virIsSUID; virManageVport; virMemoryLimitIsSet; virMemoryLimitTruncate; +virMemoryMaxValue; virParseNumber; virParseOwnershipIds; virParseVersionString; diff --git a/src/util/virutil.c b/src/util/virutil.c index 0426517..e190308 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -2598,3 +2598,23 @@ virMemoryLimitIsSet(unsigned long long value) { return value < VIR_DOMAIN_MEMORY_PARAM_UNLIMITED; } + + +/** + * virMemoryMaxValue + * + * @ulong: whether the value must fit into unsigned long + * (unsigned long long is assumed otherwise) + * + * Returns the maximum possible memory value in bytes. + */ +unsigned long long +virMemoryMaxValue(bool ulong) +{ + /* On 32-bit machines, our bound is 0xffffffff * KiB. On 64-bit + * machines, our bound is off_t (2^63). */ + if (ulong && sizeof(unsigned long) < sizeof(long long)) + return 1024ull * ULONG_MAX; + else + return LLONG_MAX; +} diff --git a/src/util/virutil.h b/src/util/virutil.h index 55a3bd6..c78b357 100644 --- a/src/util/virutil.h +++ b/src/util/virutil.h @@ -245,5 +245,6 @@ long virGetSystemPageSizeKB(void); unsigned long long virMemoryLimitTruncate(unsigned long long value); bool virMemoryLimitIsSet(unsigned long long value); +unsigned long long virMemoryMaxValue(bool ulong); #endif /* __VIR_UTIL_H__ */ -- 2.0.5

2 1

[libvirt] [PATCH v2 0/4] Introduce pci-serial
by Michal Privoznik 13 May '15

13 May '15

diff to v1: - Fix hot(un-)plug Michal Privoznik (4): Introduce pci-serial qemu: Implement pci-serial qemuDomainAttachChrDevice: Fix chardev hotplug qemuDomainDetachChrDevice: Fix chardev hot-unplug docs/formatdomain.html.in | 16 ++++++---- docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 18 +++++++++++ src/qemu/qemu_hotplug.c | 36 ++++++++++++++++----- tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 1 + .../qemuxml2argv-pci-serial-dev-chardev.args | 7 ++++ .../qemuxml2argv-pci-serial-dev-chardev.xml | 37 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 ++ tests/qemuxml2xmltest.c | 1 + 18 files changed, 117 insertions(+), 15 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pci-serial-dev-chardev.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pci-serial-dev-chardev.xml -- 2.3.6

2 5

[libvirt] [PATCH v2] parallels: remove connection wide wait timeout
by Nikolay Shirokovskiy 13 May '15

13 May '15

We have a lot of passing arguments code just to pass connection object cause it holds jobTimeout. Taking into account that right now this value is defined at compile time let's just get rid of it and make arguments list more clear in many places. In case we later need some runtime configurable timeout value we can provide this value through arguments function already operate such as a parallels domain object etc as this timeouts are operation( and thus object) specific in practice. Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)parallels.com> --- src/parallels/parallels_driver.c | 9 ++-- src/parallels/parallels_sdk.c | 108 +++++++++++++++++--------------------- src/parallels/parallels_sdk.h | 27 ++++----- src/parallels/parallels_utils.h | 1 - 4 files changed, 64 insertions(+), 81 deletions(-) diff --git a/src/parallels/parallels_driver.c b/src/parallels/parallels_driver.c index 205ec1c..4b87213 100644 --- a/src/parallels/parallels_driver.c +++ b/src/parallels/parallels_driver.c @@ -214,7 +214,7 @@ parallelsOpenDefault(virConnectPtr conn) goto err_free; } - if (prlsdkInit(privconn)) { + if (prlsdkInit()) { VIR_DEBUG("%s", _("Can't initialize Parallels SDK")); goto err_free; } @@ -1007,7 +1007,6 @@ parallelsDomainManagedSave(virDomainPtr domain, unsigned int flags) static int parallelsDomainManagedSaveRemove(virDomainPtr domain, unsigned int flags) { - parallelsConnPtr privconn = domain->conn->privateData; virDomainObjPtr dom = NULL; int state, reason; int ret = -1; @@ -1022,7 +1021,7 @@ parallelsDomainManagedSaveRemove(virDomainPtr domain, unsigned int flags) if (!(state == VIR_DOMAIN_SHUTOFF && reason == VIR_DOMAIN_SHUTOFF_SAVED)) goto cleanup; - ret = prlsdkDomainManagedSaveRemove(privconn, dom); + ret = prlsdkDomainManagedSaveRemove(dom); cleanup: virObjectUnlock(dom); @@ -1071,7 +1070,7 @@ static int parallelsDomainAttachDeviceFlags(virDomainPtr dom, const char *xml, switch (dev->type) { case VIR_DOMAIN_DEVICE_DISK: - ret = prlsdkAttachVolume(dom->conn, privdom, dev->data.disk); + ret = prlsdkAttachVolume(privdom, dev->data.disk); if (ret) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("disk attach failed")); @@ -1140,7 +1139,7 @@ static int parallelsDomainDetachDeviceFlags(virDomainPtr dom, const char *xml, switch (dev->type) { case VIR_DOMAIN_DEVICE_DISK: - ret = prlsdkDetachVolume(dom->conn, privdom, dev->data.disk); + ret = prlsdkDetachVolume(privdom, dev->data.disk); if (ret) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("disk detach failed")); diff --git a/src/parallels/parallels_sdk.c b/src/parallels/parallels_sdk.c index fcd274f..d48d4b7 100644 --- a/src/parallels/parallels_sdk.c +++ b/src/parallels/parallels_sdk.c @@ -35,8 +35,6 @@ #define VIR_FROM_THIS VIR_FROM_PARALLELS #define JOB_INFINIT_WAIT_TIMEOUT UINT_MAX -PRL_UINT32 defaultJobTimeout = JOB_INFINIT_WAIT_TIMEOUT; - VIR_LOG_INIT("parallels.sdk"); /* @@ -179,9 +177,9 @@ getJobResultHelper(PRL_HANDLE job, unsigned int timeout, PRL_HANDLE *result, return ret; } -#define getJobResult(job, timeout, result) \ - getJobResultHelper(job, timeout, result, __FILE__, \ - __FUNCTION__, __LINE__) +#define getJobResult(job, result) \ + getJobResultHelper(job, JOB_INFINIT_WAIT_TIMEOUT, \ + result, __FILE__, __FUNCTION__, __LINE__) static PRL_RESULT waitJobHelper(PRL_HANDLE job, unsigned int timeout, @@ -197,12 +195,13 @@ waitJobHelper(PRL_HANDLE job, unsigned int timeout, return ret; } -#define waitJob(job, timeout) \ - waitJobHelper(job, timeout, __FILE__, \ +#define waitJob(job) \ + waitJobHelper(job, JOB_INFINIT_WAIT_TIMEOUT, __FILE__, \ __FUNCTION__, __LINE__) + int -prlsdkInit(parallelsConnPtr privconn) +prlsdkInit(void) { PRL_RESULT ret; @@ -212,8 +211,6 @@ prlsdkInit(parallelsConnPtr privconn) return -1; } - privconn->jobTimeout = JOB_INFINIT_WAIT_TIMEOUT; - return 0; }; @@ -238,7 +235,7 @@ prlsdkConnect(parallelsConnPtr privconn) job = PrlSrv_LoginLocalEx(privconn->server, NULL, 0, PSL_HIGH_SECURITY, PACF_NON_INTERACTIVE_MODE); - if (waitJob(job, privconn->jobTimeout)) { + if (waitJob(job)) { PrlHandle_Free(privconn->server); return -1; } @@ -252,7 +249,7 @@ prlsdkDisconnect(parallelsConnPtr privconn) PRL_HANDLE job; job = PrlSrv_Logoff(privconn->server); - waitJob(job, privconn->jobTimeout); + waitJob(job); PrlHandle_Free(privconn->server); } @@ -269,7 +266,7 @@ prlsdkSdkDomainLookup(parallelsConnPtr privconn, int ret = -1; job = PrlSrv_GetVmConfig(privconn->server, id, flags); - if (PRL_FAILED(getJobResult(job, privconn->jobTimeout, &result))) + if (PRL_FAILED(getJobResult(job, &result))) goto cleanup; pret = PrlResult_GetParamByIndex(result, 0, sdkdom); @@ -374,9 +371,7 @@ prlsdkGetDomainIds(PRL_HANDLE sdkdom, } static int -prlsdkGetDomainState(parallelsConnPtr privconn, - PRL_HANDLE sdkdom, - VIRTUAL_MACHINE_STATE_PTR vmState) +prlsdkGetDomainState(PRL_HANDLE sdkdom, VIRTUAL_MACHINE_STATE_PTR vmState) { PRL_HANDLE job = PRL_INVALID_HANDLE; PRL_HANDLE result = PRL_INVALID_HANDLE; @@ -386,7 +381,7 @@ prlsdkGetDomainState(parallelsConnPtr privconn, job = PrlVm_GetState(sdkdom); - if (PRL_FAILED(getJobResult(job, privconn->jobTimeout, &result))) + if (PRL_FAILED(getJobResult(job, &result))) goto cleanup; pret = PrlResult_GetParamByIndex(result, 0, &vmInfo); @@ -1354,7 +1349,7 @@ prlsdkLoadDomain(parallelsConnPtr privconn, dom->privateDataFreeFunc = prlsdkDomObjFreePrivate; dom->persistent = 1; - if (prlsdkGetDomainState(privconn, sdkdom, &domainState) < 0) + if (prlsdkGetDomainState(sdkdom, &domainState) < 0) goto error; if (prlsdkConvertDomainState(domainState, envId, dom) < 0) @@ -1404,7 +1399,7 @@ prlsdkLoadDomains(parallelsConnPtr privconn) job = PrlSrv_GetVmListEx(privconn->server, PVTF_VM | PVTF_CT); - if (PRL_FAILED(getJobResult(job, privconn->jobTimeout, &result))) + if (PRL_FAILED(getJobResult(job, &result))) return -1; pret = PrlResult_GetParamsCount(result, &paramsCount); @@ -1464,7 +1459,7 @@ prlsdkUpdateDomain(parallelsConnPtr privconn, virDomainObjPtr dom) parallelsDomObjPtr pdom = dom->privateData; job = PrlVm_RefreshConfig(pdom->sdkdom); - if (waitJob(job, privconn->jobTimeout)) + if (waitJob(job)) return -1; retdom = prlsdkLoadDomain(privconn, pdom->sdkdom, dom); @@ -1748,56 +1743,54 @@ void prlsdkUnsubscribeFromPCSEvents(parallelsConnPtr privconn) logPrlError(ret); } -PRL_RESULT prlsdkStart(parallelsConnPtr privconn, PRL_HANDLE sdkdom) +PRL_RESULT prlsdkStart(PRL_HANDLE sdkdom) { PRL_HANDLE job = PRL_INVALID_HANDLE; job = PrlVm_StartEx(sdkdom, PSM_VM_START, 0); - return PRL_FAILED(waitJob(job, privconn->jobTimeout)) ? -1 : 0; + return waitJob(job); } -static PRL_RESULT prlsdkStopEx(parallelsConnPtr privconn, - PRL_HANDLE sdkdom, - PRL_UINT32 mode) +static PRL_RESULT prlsdkStopEx(PRL_HANDLE sdkdom, PRL_UINT32 mode) { PRL_HANDLE job = PRL_INVALID_HANDLE; job = PrlVm_StopEx(sdkdom, mode, 0); - return waitJob(job, privconn->jobTimeout); + return waitJob(job); } -PRL_RESULT prlsdkKill(parallelsConnPtr privconn, PRL_HANDLE sdkdom) +PRL_RESULT prlsdkKill(PRL_HANDLE sdkdom) { - return prlsdkStopEx(privconn, sdkdom, PSM_KILL); + return prlsdkStopEx(sdkdom, PSM_KILL); } -PRL_RESULT prlsdkStop(parallelsConnPtr privconn, PRL_HANDLE sdkdom) +PRL_RESULT prlsdkStop(PRL_HANDLE sdkdom) { - return prlsdkStopEx(privconn, sdkdom, PSM_SHUTDOWN); + return prlsdkStopEx(sdkdom, PSM_SHUTDOWN); } -PRL_RESULT prlsdkPause(parallelsConnPtr privconn, PRL_HANDLE sdkdom) +PRL_RESULT prlsdkPause(PRL_HANDLE sdkdom) { PRL_HANDLE job = PRL_INVALID_HANDLE; job = PrlVm_Pause(sdkdom, false); - return waitJob(job, privconn->jobTimeout); + return waitJob(job); } -PRL_RESULT prlsdkResume(parallelsConnPtr privconn, PRL_HANDLE sdkdom) +PRL_RESULT prlsdkResume(PRL_HANDLE sdkdom) { PRL_HANDLE job = PRL_INVALID_HANDLE; job = PrlVm_Resume(sdkdom); - return waitJob(job, privconn->jobTimeout); + return waitJob(job); } -PRL_RESULT prlsdkSuspend(parallelsConnPtr privconn, PRL_HANDLE sdkdom) +PRL_RESULT prlsdkSuspend(PRL_HANDLE sdkdom) { PRL_HANDLE job = PRL_INVALID_HANDLE; job = PrlVm_Suspend(sdkdom); - return waitJob(job, privconn->jobTimeout); + return waitJob(job); } int @@ -1810,7 +1803,7 @@ prlsdkDomainChangeStateLocked(parallelsConnPtr privconn, virErrorNumber virerr; pdom = dom->privateData; - pret = chstate(privconn, pdom->sdkdom); + pret = chstate(pdom->sdkdom); if (PRL_FAILED(pret)) { virResetLastError(); @@ -2805,7 +2798,7 @@ static int prlsdkAddNet(PRL_HANDLE sdkdom, prlsdkCheckRetGoto(pret, cleanup); job = PrlSrv_AddVirtualNetwork(privconn->server, vnet, 0); - if (PRL_FAILED(pret = waitJob(job, privconn->jobTimeout))) + if (PRL_FAILED(pret = waitJob(job))) goto cleanup; pret = PrlVmDev_SetEmulatedType(sdknet, PNA_BRIDGED_ETHERNET); @@ -2844,7 +2837,7 @@ static void prlsdkDelNet(parallelsConnPtr privconn, virDomainNetDefPtr net) prlsdkCheckRetGoto(pret, cleanup); PrlSrv_DeleteVirtualNetwork(privconn->server, vnet, 0); - if (PRL_FAILED(pret = waitJob(job, privconn->jobTimeout))) + if (PRL_FAILED(pret = waitJob(job))) goto cleanup; cleanup: @@ -3041,23 +3034,20 @@ static int prlsdkAddDisk(PRL_HANDLE sdkdom, virDomainDiskDefPtr disk, bool bootD } int -prlsdkAttachVolume(virConnectPtr conn, - virDomainObjPtr dom, - virDomainDiskDefPtr disk) +prlsdkAttachVolume(virDomainObjPtr dom, virDomainDiskDefPtr disk) { int ret = -1; - parallelsConnPtr privconn = conn->privateData; parallelsDomObjPtr privdom = dom->privateData; PRL_HANDLE job = PRL_INVALID_HANDLE; job = PrlVm_BeginEdit(privdom->sdkdom); - if (PRL_FAILED(waitJob(job, privconn->jobTimeout))) + if (PRL_FAILED(waitJob(job))) goto cleanup; ret = prlsdkAddDisk(privdom->sdkdom, disk, false); if (ret == 0) { job = PrlVm_CommitEx(privdom->sdkdom, PVCF_DETACH_HDD_BUNDLE); - if (PRL_FAILED(waitJob(job, privconn->jobTimeout))) { + if (PRL_FAILED(waitJob(job))) { ret = -1; goto cleanup; } @@ -3113,12 +3103,10 @@ prlsdkGetDiskIndex(PRL_HANDLE sdkdom, virDomainDiskDefPtr disk) return idx; } -int prlsdkDetachVolume(virConnectPtr conn, - virDomainObjPtr dom, - virDomainDiskDefPtr disk) +int +prlsdkDetachVolume(virDomainObjPtr dom, virDomainDiskDefPtr disk) { int ret = -1, idx; - parallelsConnPtr privconn = conn->privateData; parallelsDomObjPtr privdom = dom->privateData; PRL_HANDLE job = PRL_INVALID_HANDLE; @@ -3127,13 +3115,13 @@ int prlsdkDetachVolume(virConnectPtr conn, goto cleanup; job = PrlVm_BeginEdit(privdom->sdkdom); - if (PRL_FAILED(waitJob(job, privconn->jobTimeout))) + if (PRL_FAILED(waitJob(job))) goto cleanup; ret = prlsdkDelDisk(privdom->sdkdom, idx); if (ret == 0) { job = PrlVm_CommitEx(privdom->sdkdom, PVCF_DETACH_HDD_BUNDLE); - if (PRL_FAILED(waitJob(job, privconn->jobTimeout))) { + if (PRL_FAILED(waitJob(job))) { ret = -1; goto cleanup; } @@ -3314,14 +3302,14 @@ prlsdkApplyConfig(virConnectPtr conn, return -1; job = PrlVm_BeginEdit(sdkdom); - if (PRL_FAILED(waitJob(job, privconn->jobTimeout))) + if (PRL_FAILED(waitJob(job))) return -1; ret = prlsdkDoApplyConfig(conn, sdkdom, new, dom->def); if (ret == 0) { job = PrlVm_CommitEx(sdkdom, PVCF_DETACH_HDD_BUNDLE); - if (PRL_FAILED(waitJob(job, privconn->jobTimeout))) + if (PRL_FAILED(waitJob(job))) ret = -1; } @@ -3345,7 +3333,7 @@ prlsdkCreateVm(virConnectPtr conn, virDomainDefPtr def) prlsdkCheckRetGoto(pret, cleanup); job = PrlSrv_GetSrvConfig(privconn->server); - if (PRL_FAILED(getJobResult(job, privconn->jobTimeout, &result))) + if (PRL_FAILED(getJobResult(job, &result))) goto cleanup; pret = PrlResult_GetParamByIndex(result, 0, &srvconf); @@ -3362,7 +3350,7 @@ prlsdkCreateVm(virConnectPtr conn, virDomainDefPtr def) goto cleanup; job = PrlVm_Reg(sdkdom, "", 1); - if (PRL_FAILED(waitJob(job, privconn->jobTimeout))) + if (PRL_FAILED(waitJob(job))) ret = -1; cleanup: @@ -3407,7 +3395,7 @@ prlsdkCreateCt(virConnectPtr conn, virDomainDefPtr def) confParam.nOsVersion = 0; job = PrlSrv_GetDefaultVmConfig(privconn->server, &confParam, 0); - if (PRL_FAILED(getJobResult(job, privconn->jobTimeout, &result))) + if (PRL_FAILED(getJobResult(job, &result))) goto cleanup; pret = PrlResult_GetParamByIndex(result, 0, &sdkdom); @@ -3425,7 +3413,7 @@ prlsdkCreateCt(virConnectPtr conn, virDomainDefPtr def) job = PrlVm_RegEx(sdkdom, "", PACF_NON_INTERACTIVE_MODE | PRNVM_PRESERVE_DISK); - if (PRL_FAILED(waitJob(job, privconn->jobTimeout))) + if (PRL_FAILED(waitJob(job))) ret = -1; cleanup: @@ -3444,7 +3432,7 @@ prlsdkUnregisterDomain(parallelsConnPtr privconn, virDomainObjPtr dom) prlsdkDelNet(privconn, dom->def->nets[i]); job = PrlVm_Unreg(privdom->sdkdom); - if (PRL_FAILED(waitJob(job, privconn->jobTimeout))) + if (PRL_FAILED(waitJob(job))) return -1; if (prlsdkSendEvent(privconn, dom, VIR_DOMAIN_EVENT_UNDEFINED, @@ -3456,13 +3444,13 @@ prlsdkUnregisterDomain(parallelsConnPtr privconn, virDomainObjPtr dom) } int -prlsdkDomainManagedSaveRemove(parallelsConnPtr privconn, virDomainObjPtr dom) +prlsdkDomainManagedSaveRemove(virDomainObjPtr dom) { parallelsDomObjPtr privdom = dom->privateData; PRL_HANDLE job; job = PrlVm_DropSuspendedState(privdom->sdkdom); - if (PRL_FAILED(waitJob(job, privconn->jobTimeout))) + if (PRL_FAILED(waitJob(job))) return -1; return 0; diff --git a/src/parallels/parallels_sdk.h b/src/parallels/parallels_sdk.h index 3ad46c3..3f17fc8 100644 --- a/src/parallels/parallels_sdk.h +++ b/src/parallels/parallels_sdk.h @@ -24,7 +24,7 @@ #include "parallels_utils.h" -int prlsdkInit(parallelsConnPtr privconn); +int prlsdkInit(void); void prlsdkDeinit(void); int prlsdkConnect(parallelsConnPtr privconn); void prlsdkDisconnect(parallelsConnPtr privconn); @@ -35,14 +35,14 @@ prlsdkAddDomain(parallelsConnPtr privconn, const unsigned char *uuid); int prlsdkUpdateDomain(parallelsConnPtr privconn, virDomainObjPtr dom); int prlsdkSubscribeToPCSEvents(parallelsConnPtr privconn); void prlsdkUnsubscribeFromPCSEvents(parallelsConnPtr privconn); -PRL_RESULT prlsdkStart(parallelsConnPtr privconn, PRL_HANDLE sdkdom); -PRL_RESULT prlsdkKill(parallelsConnPtr privconn, PRL_HANDLE sdkdom); -PRL_RESULT prlsdkStop(parallelsConnPtr privconn, PRL_HANDLE sdkdom); -PRL_RESULT prlsdkPause(parallelsConnPtr privconn, PRL_HANDLE sdkdom); -PRL_RESULT prlsdkResume(parallelsConnPtr privconn, PRL_HANDLE sdkdom); -PRL_RESULT prlsdkSuspend(parallelsConnPtr privconn, PRL_HANDLE sdkdom); +PRL_RESULT prlsdkStart(PRL_HANDLE sdkdom); +PRL_RESULT prlsdkKill(PRL_HANDLE sdkdom); +PRL_RESULT prlsdkStop(PRL_HANDLE sdkdom); +PRL_RESULT prlsdkPause(PRL_HANDLE sdkdom); +PRL_RESULT prlsdkResume(PRL_HANDLE sdkdom); +PRL_RESULT prlsdkSuspend(PRL_HANDLE sdkdom); -typedef PRL_RESULT (*prlsdkChangeStateFunc)(parallelsConnPtr privconn, PRL_HANDLE sdkdom); +typedef PRL_RESULT (*prlsdkChangeStateFunc)(PRL_HANDLE sdkdom); int prlsdkDomainChangeState(virDomainPtr domain, prlsdkChangeStateFunc chstate); @@ -59,11 +59,8 @@ int prlsdkCreateCt(virConnectPtr conn, virDomainDefPtr def); int prlsdkUnregisterDomain(parallelsConnPtr privconn, virDomainObjPtr dom); int -prlsdkDomainManagedSaveRemove(parallelsConnPtr privconn, virDomainObjPtr dom); +prlsdkDomainManagedSaveRemove(virDomainObjPtr dom); int -prlsdkAttachVolume(virConnectPtr conn, - virDomainObjPtr dom, - virDomainDiskDefPtr disk); -int prlsdkDetachVolume(virConnectPtr conn, - virDomainObjPtr dom, - virDomainDiskDefPtr disk); +prlsdkAttachVolume(virDomainObjPtr dom, virDomainDiskDefPtr disk); +int +prlsdkDetachVolume(virDomainObjPtr dom, virDomainDiskDefPtr disk); diff --git a/src/parallels/parallels_utils.h b/src/parallels/parallels_utils.h index 3f49cec..2d1d405 100644 --- a/src/parallels/parallels_utils.h +++ b/src/parallels/parallels_utils.h @@ -62,7 +62,6 @@ struct _parallelsConn { virDomainObjListPtr domains; PRL_HANDLE server; - PRL_UINT32 jobTimeout; virStoragePoolObjList pools; virNetworkObjListPtr networks; virCapsPtr caps; -- 1.7.1

2 1

[libvirt] [PATCHv2] Ignore bridge template names with multiple printf conversions
by Ján Tomko 13 May '15

13 May '15

For some reason, we allow a bridge name with %d in it, which we replace with an unsigned integer to form a bridge name that does not yet exist on the host. Do not blindly pass it to virAsprintf if it's not the only conversion, to prevent crashing on input like: <network> <name>test</name> <forward mode='none'/> <bridge name='virbr%d%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s'/> </network> Ignore any template strings that do not have exactly one %d conversion, like we do in various drivers before calling virNetDevTapCreateInBridgePort. --- v2: drop the unnecessary changes in networkBridgeNameValidate src/network/bridge_driver.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 3b879cd..fe2448d 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -2775,7 +2775,13 @@ networkFindUnusedBridgeName(virNetworkObjListPtr nets, int ret = -1, id = 0; char *newname = NULL; - const char *templ = def->bridge ? def->bridge : "virbr%d"; + const char *templ = "virbr%d"; + const char *p; + + if (def->bridge && + (p = strchr(def->bridge, '%')) == strrchr(def->bridge, '%') && + strstr(def->bridge, "%d")) + templ = def->bridge; do { if (virAsprintf(&newname, templ, id) < 0) -- 2.0.5

3 7

[libvirt] [PATCH] qemu: clear useless code
by zhang bo 13 May '15

13 May '15

The variable 'now' is useless in qemuMigrationPrepareAny(), so I clear it. Signed-off-by: Wang Yufei <james.wangyufei(a)huawei.com> Signed-off-by: Zhang Bo <oscar.zhangbo(a)huawei.com> --- src/qemu/qemu_migration.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index c1af704..4dcba7a 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2913,7 +2913,6 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, int ret = -1; int dataFD[2] = { -1, -1 }; qemuDomainObjPrivatePtr priv = NULL; - unsigned long long now; qemuMigrationCookiePtr mig = NULL; bool tunnel = !!st; char *xmlout = NULL; @@ -2923,9 +2922,6 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, bool abort_on_error = !!(flags & VIR_MIGRATE_ABORT_ON_ERROR); bool taint_hook = false; - if (virTimeMillisNow(&now) < 0) - return -1; - virNWFilterReadLockFilterUpdates(); if (flags & VIR_MIGRATE_OFFLINE) { -- 1.7.12.4

2 1

[libvirt] [PATCH] Ignore Vim swap files.
by Andrea Bolognani 13 May '15

13 May '15

This removes some noise when you're working on the repository and also have a bunch of source files open in Vim in another terminal. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 7bcf359..1a5cf8e 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,7 @@ *.pyc *.rej *.s +*.swp *~ .#* .deps -- 2.1.0

3 4

[libvirt] [PATCH] Fix build --without-network
by Martin Kletzander 13 May '15

13 May '15

In order not to bring in any link dependencies, bridge driver doesn't use the usual stubs as other conditionally-built code does. However, having the function as a macro imposes a problem with possibly unused variables if just defined as "0". This was worked around by using (dom=dom, iface=iface, 0) which should act like a 0 if used in a condition. However, gcc still bugs about that, so I came up with another way how to fix that. Using static inline functions in the header won't collide with anything, it fixes the bug and does one thing that the macro didn't do. It checks whenther passed variables are pointers of compatible type. It has only one downside, and that is that we need to either a) define it with ATTRIBUTE_UNUSED, which needs an exception in cfg.mk or b) do something like ignore_value(variable); in the function body. I went with the first variant. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: I can go with the version (b) if that's the preferred one. cfg.mk | 4 ++-- src/network/bridge_driver.h | 19 ++++++++++++++++--- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/cfg.mk b/cfg.mk index 9ba2134..796ed80 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1,5 +1,5 @@ # Customize Makefile.maint. -*- makefile -*- -# Copyright (C) 2008-2014 Red Hat, Inc. +# Copyright (C) 2008-2015 Red Hat, Inc. # Copyright (C) 2003-2008 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify @@ -1184,7 +1184,7 @@ exclude_file_name_regexp--sc_prohibit_getenv = \ ^tests/.*\.[ch]$$ exclude_file_name_regexp--sc_avoid_attribute_unused_in_header = \ - ^src/util/virlog\.h$$ + ^(src/util/virlog\.h|src/network/bridge_driver\.h)$$ exclude_file_name_regexp--sc_prohibit_mixed_case_abbreviations = \ ^src/(vbox/vbox_CAPI.*.h|esx/esx_vi.(c|h)|esx/esx_storage_backend_iscsi.c)$$ diff --git a/src/network/bridge_driver.h b/src/network/bridge_driver.h index 2f801ee..513ccf7 100644 --- a/src/network/bridge_driver.h +++ b/src/network/bridge_driver.h @@ -1,7 +1,7 @@ /* * bridge_driver.h: core driver methods for managing networks * - * Copyright (C) 2006-2013 Red Hat, Inc. + * Copyright (C) 2006-2015 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -55,11 +55,24 @@ int networkDnsmasqConfContents(virNetworkObjPtr network, # else /* Define no-op replacements that don't drag in any link dependencies. */ # define networkAllocateActualDevice(dom, iface) 0 -# define networkNotifyActualDevice(dom, iface) (dom=dom, iface=iface, 0) -# define networkReleaseActualDevice(dom, iface) (dom=dom, iface=iface, 0) # define networkGetNetworkAddress(netname, netaddr) (-2) # define networkDnsmasqConfContents(network, pidfile, configstr, \ dctx, caps) 0 + +static inline int +networkNotifyActualDevice(virDomainDefPtr dom ATTRIBUTE_UNUSED, + virDomainNetDefPtr iface ATTRIBUTE_UNUSED) +{ + return 0; +} + +static inline int +networkReleaseActualDevice(virDomainDefPtr dom ATTRIBUTE_UNUSED, + virDomainNetDefPtr iface ATTRIBUTE_UNUSED) +{ + return 0; +} + # endif typedef char *(*networkDnsmasqLeaseFileNameFunc)(const char *netname); -- 2.3.6

2 2

[libvirt] [PATCH] parallels: remove connection wide wait timeout
by Nikolay Shirokovskiy 13 May '15

13 May '15

We have a lot of passing arguments code just to pass connection object cause it holds jobTimeout. Taking into account that right now this value is defined at compile time let's just get rid of it and make arguments list more clear in many places. In case we later need some runtime configurable timeout value we can provide this value through arguments function already operate such as a parallels domain object etc as this timeouts are operation( and thus object) specific in practice. Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)parallels.com> --- src/parallels/parallels_driver.c | 6 +- src/parallels/parallels_sdk.c | 98 +++++++++++++++++--------------------- src/parallels/parallels_sdk.h | 22 ++++----- src/parallels/parallels_utils.h | 1 - 4 files changed, 57 insertions(+), 70 deletions(-) diff --git a/src/parallels/parallels_driver.c b/src/parallels/parallels_driver.c index 3aa87ca..63bf638 100644 --- a/src/parallels/parallels_driver.c +++ b/src/parallels/parallels_driver.c @@ -214,7 +214,7 @@ parallelsOpenDefault(virConnectPtr conn) goto err_free; } - if (prlsdkInit(privconn)) { + if (prlsdkInit()) { VIR_DEBUG("%s", _("Can't initialize Parallels SDK")); goto err_free; } @@ -1087,7 +1087,7 @@ parallelsDomainManagedSaveRemove(virDomainPtr domain, unsigned int flags) if (!(state == VIR_DOMAIN_SHUTOFF && reason == VIR_DOMAIN_SHUTOFF_SAVED)) goto cleanup; - ret = prlsdkDomainManagedSaveRemove(privconn, dom); + ret = prlsdkDomainManagedSaveRemove(dom); cleanup: virObjectUnlock(dom); @@ -1139,7 +1139,7 @@ static int parallelsDomainAttachDeviceFlags(virDomainPtr dom, const char *xml, switch (dev->type) { case VIR_DOMAIN_DEVICE_DISK: - ret = prlsdkAttachVolume(dom->conn, privdom, dev->data.disk); + ret = prlsdkAttachVolume(privdom, dev->data.disk); if (ret) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("disk attach failed")); diff --git a/src/parallels/parallels_sdk.c b/src/parallels/parallels_sdk.c index e1ba7cf..83de1de 100644 --- a/src/parallels/parallels_sdk.c +++ b/src/parallels/parallels_sdk.c @@ -35,8 +35,6 @@ #define VIR_FROM_THIS VIR_FROM_PARALLELS #define JOB_INFINIT_WAIT_TIMEOUT UINT_MAX -PRL_UINT32 defaultJobTimeout = JOB_INFINIT_WAIT_TIMEOUT; - VIR_LOG_INIT("parallels.sdk"); /* @@ -179,9 +177,9 @@ getJobResultHelper(PRL_HANDLE job, unsigned int timeout, PRL_HANDLE *result, return ret; } -#define getJobResult(job, timeout, result) \ - getJobResultHelper(job, timeout, result, __FILE__, \ - __FUNCTION__, __LINE__) +#define getJobResult(job, result) \ + getJobResultHelper(job, JOB_INFINIT_WAIT_TIMEOUT, \ + result, __FILE__, __FUNCTION__, __LINE__) static PRL_RESULT waitJobHelper(PRL_HANDLE job, unsigned int timeout, @@ -197,12 +195,13 @@ waitJobHelper(PRL_HANDLE job, unsigned int timeout, return ret; } -#define waitJob(job, timeout) \ - waitJobHelper(job, timeout, __FILE__, \ +#define waitJob(job) \ + waitJobHelper(job, JOB_INFINIT_WAIT_TIMEOUT, __FILE__, \ __FUNCTION__, __LINE__) + int -prlsdkInit(parallelsConnPtr privconn) +prlsdkInit(void) { PRL_RESULT ret; @@ -212,8 +211,6 @@ prlsdkInit(parallelsConnPtr privconn) return -1; } - privconn->jobTimeout = JOB_INFINIT_WAIT_TIMEOUT; - return 0; }; @@ -238,7 +235,7 @@ prlsdkConnect(parallelsConnPtr privconn) job = PrlSrv_LoginLocalEx(privconn->server, NULL, 0, PSL_HIGH_SECURITY, PACF_NON_INTERACTIVE_MODE); - if (waitJob(job, privconn->jobTimeout)) { + if (waitJob(job)) { PrlHandle_Free(privconn->server); return -1; } @@ -252,7 +249,7 @@ prlsdkDisconnect(parallelsConnPtr privconn) PRL_HANDLE job; job = PrlSrv_Logoff(privconn->server); - waitJob(job, privconn->jobTimeout); + waitJob(job); PrlHandle_Free(privconn->server); } @@ -269,7 +266,7 @@ prlsdkSdkDomainLookup(parallelsConnPtr privconn, int ret = -1; job = PrlSrv_GetVmConfig(privconn->server, id, flags); - if (PRL_FAILED(getJobResult(job, privconn->jobTimeout, &result))) + if (PRL_FAILED(getJobResult(job, &result))) goto cleanup; pret = PrlResult_GetParamByIndex(result, 0, sdkdom); @@ -374,9 +371,7 @@ prlsdkGetDomainIds(PRL_HANDLE sdkdom, } static int -prlsdkGetDomainState(parallelsConnPtr privconn, - PRL_HANDLE sdkdom, - VIRTUAL_MACHINE_STATE_PTR vmState) +prlsdkGetDomainState(PRL_HANDLE sdkdom, VIRTUAL_MACHINE_STATE_PTR vmState) { PRL_HANDLE job = PRL_INVALID_HANDLE; PRL_HANDLE result = PRL_INVALID_HANDLE; @@ -386,7 +381,7 @@ prlsdkGetDomainState(parallelsConnPtr privconn, job = PrlVm_GetState(sdkdom); - if (PRL_FAILED(getJobResult(job, privconn->jobTimeout, &result))) + if (PRL_FAILED(getJobResult(job, &result))) goto cleanup; pret = PrlResult_GetParamByIndex(result, 0, &vmInfo); @@ -1356,7 +1351,7 @@ prlsdkLoadDomain(parallelsConnPtr privconn, dom->privateDataFreeFunc = prlsdkDomObjFreePrivate; dom->persistent = 1; - if (prlsdkGetDomainState(privconn, sdkdom, &domainState) < 0) + if (prlsdkGetDomainState(sdkdom, &domainState) < 0) goto error; if (prlsdkConvertDomainState(domainState, envId, dom) < 0) @@ -1406,7 +1401,7 @@ prlsdkLoadDomains(parallelsConnPtr privconn) job = PrlSrv_GetVmListEx(privconn->server, PVTF_VM | PVTF_CT); - if (PRL_FAILED(getJobResult(job, privconn->jobTimeout, &result))) + if (PRL_FAILED(getJobResult(job, &result))) return -1; pret = PrlResult_GetParamsCount(result, &paramsCount); @@ -1466,7 +1461,7 @@ prlsdkUpdateDomain(parallelsConnPtr privconn, virDomainObjPtr dom) parallelsDomObjPtr pdom = dom->privateData; job = PrlVm_RefreshConfig(pdom->sdkdom); - if (waitJob(job, privconn->jobTimeout)) + if (waitJob(job)) return -1; retdom = prlsdkLoadDomain(privconn, pdom->sdkdom, dom); @@ -1750,56 +1745,54 @@ void prlsdkUnsubscribeFromPCSEvents(parallelsConnPtr privconn) logPrlError(ret); } -PRL_RESULT prlsdkStart(parallelsConnPtr privconn, PRL_HANDLE sdkdom) +PRL_RESULT prlsdkStart(PRL_HANDLE sdkdom) { PRL_HANDLE job = PRL_INVALID_HANDLE; job = PrlVm_StartEx(sdkdom, PSM_VM_START, 0); - return PRL_FAILED(waitJob(job, privconn->jobTimeout)) ? -1 : 0; + return waitJob(job); } -static PRL_RESULT prlsdkStopEx(parallelsConnPtr privconn, - PRL_HANDLE sdkdom, - PRL_UINT32 mode) +static PRL_RESULT prlsdkStopEx(PRL_HANDLE sdkdom, PRL_UINT32 mode) { PRL_HANDLE job = PRL_INVALID_HANDLE; job = PrlVm_StopEx(sdkdom, mode, 0); - return waitJob(job, privconn->jobTimeout); + return waitJob(job); } -PRL_RESULT prlsdkKill(parallelsConnPtr privconn, PRL_HANDLE sdkdom) +PRL_RESULT prlsdkKill(PRL_HANDLE sdkdom) { - return prlsdkStopEx(privconn, sdkdom, PSM_KILL); + return prlsdkStopEx(sdkdom, PSM_KILL); } -PRL_RESULT prlsdkStop(parallelsConnPtr privconn, PRL_HANDLE sdkdom) +PRL_RESULT prlsdkStop(PRL_HANDLE sdkdom) { - return prlsdkStopEx(privconn, sdkdom, PSM_SHUTDOWN); + return prlsdkStopEx(sdkdom, PSM_SHUTDOWN); } -PRL_RESULT prlsdkPause(parallelsConnPtr privconn, PRL_HANDLE sdkdom) +PRL_RESULT prlsdkPause(PRL_HANDLE sdkdom) { PRL_HANDLE job = PRL_INVALID_HANDLE; job = PrlVm_Pause(sdkdom, false); - return waitJob(job, privconn->jobTimeout); + return waitJob(job); } -PRL_RESULT prlsdkResume(parallelsConnPtr privconn, PRL_HANDLE sdkdom) +PRL_RESULT prlsdkResume(PRL_HANDLE sdkdom) { PRL_HANDLE job = PRL_INVALID_HANDLE; job = PrlVm_Resume(sdkdom); - return waitJob(job, privconn->jobTimeout); + return waitJob(job); } -PRL_RESULT prlsdkSuspend(parallelsConnPtr privconn, PRL_HANDLE sdkdom) +PRL_RESULT prlsdkSuspend(PRL_HANDLE sdkdom) { PRL_HANDLE job = PRL_INVALID_HANDLE; job = PrlVm_Suspend(sdkdom); - return waitJob(job, privconn->jobTimeout); + return waitJob(job); } int @@ -1812,7 +1805,7 @@ prlsdkDomainChangeStateLocked(parallelsConnPtr privconn, virErrorNumber virerr; pdom = dom->privateData; - pret = chstate(privconn, pdom->sdkdom); + pret = chstate(pdom->sdkdom); if (PRL_FAILED(pret)) { virResetLastError(); @@ -2803,7 +2796,7 @@ static int prlsdkAddNet(PRL_HANDLE sdkdom, prlsdkCheckRetGoto(pret, cleanup); job = PrlSrv_AddVirtualNetwork(privconn->server, vnet, 0); - if (PRL_FAILED(pret = waitJob(job, privconn->jobTimeout))) + if (PRL_FAILED(pret = waitJob(job))) goto cleanup; pret = PrlVmDev_SetEmulatedType(sdknet, PNA_BRIDGED_ETHERNET); @@ -2842,7 +2835,7 @@ static void prlsdkDelNet(parallelsConnPtr privconn, virDomainNetDefPtr net) prlsdkCheckRetGoto(pret, cleanup); PrlSrv_DeleteVirtualNetwork(privconn->server, vnet, 0); - if (PRL_FAILED(pret = waitJob(job, privconn->jobTimeout))) + if (PRL_FAILED(pret = waitJob(job))) goto cleanup; cleanup: @@ -3020,23 +3013,20 @@ static int prlsdkAddDisk(PRL_HANDLE sdkdom, virDomainDiskDefPtr disk, bool bootD } int -prlsdkAttachVolume(virConnectPtr conn, - virDomainObjPtr dom, - virDomainDiskDefPtr disk) +prlsdkAttachVolume(virDomainObjPtr dom, virDomainDiskDefPtr disk) { int ret = -1; - parallelsConnPtr privconn = conn->privateData; parallelsDomObjPtr privdom = dom->privateData; PRL_HANDLE job = PRL_INVALID_HANDLE; job = PrlVm_BeginEdit(privdom->sdkdom); - if (PRL_FAILED(waitJob(job, privconn->jobTimeout))) + if (PRL_FAILED(waitJob(job))) goto cleanup; ret = prlsdkAddDisk(privdom->sdkdom, disk, false); if (ret == 0) { job = PrlVm_CommitEx(privdom->sdkdom, PVCF_DETACH_HDD_BUNDLE); - if (PRL_FAILED(waitJob(job, privconn->jobTimeout))) { + if (PRL_FAILED(waitJob(job))) { ret = -1; goto cleanup; } @@ -3217,14 +3207,14 @@ prlsdkApplyConfig(virConnectPtr conn, return -1; job = PrlVm_BeginEdit(sdkdom); - if (PRL_FAILED(waitJob(job, privconn->jobTimeout))) + if (PRL_FAILED(waitJob(job))) return -1; ret = prlsdkDoApplyConfig(conn, sdkdom, new, dom->def); if (ret == 0) { job = PrlVm_CommitEx(sdkdom, PVCF_DETACH_HDD_BUNDLE); - if (PRL_FAILED(waitJob(job, privconn->jobTimeout))) + if (PRL_FAILED(waitJob(job))) ret = -1; } @@ -3248,7 +3238,7 @@ prlsdkCreateVm(virConnectPtr conn, virDomainDefPtr def) prlsdkCheckRetGoto(pret, cleanup); job = PrlSrv_GetSrvConfig(privconn->server); - if (PRL_FAILED(getJobResult(job, privconn->jobTimeout, &result))) + if (PRL_FAILED(getJobResult(job, &result))) goto cleanup; pret = PrlResult_GetParamByIndex(result, 0, &srvconf); @@ -3265,7 +3255,7 @@ prlsdkCreateVm(virConnectPtr conn, virDomainDefPtr def) goto cleanup; job = PrlVm_Reg(sdkdom, "", 1); - if (PRL_FAILED(waitJob(job, privconn->jobTimeout))) + if (PRL_FAILED(waitJob(job))) ret = -1; cleanup: @@ -3310,7 +3300,7 @@ prlsdkCreateCt(virConnectPtr conn, virDomainDefPtr def) confParam.nOsVersion = 0; job = PrlSrv_GetDefaultVmConfig(privconn->server, &confParam, 0); - if (PRL_FAILED(getJobResult(job, privconn->jobTimeout, &result))) + if (PRL_FAILED(getJobResult(job, &result))) goto cleanup; pret = PrlResult_GetParamByIndex(result, 0, &sdkdom); @@ -3328,7 +3318,7 @@ prlsdkCreateCt(virConnectPtr conn, virDomainDefPtr def) job = PrlVm_RegEx(sdkdom, "", PACF_NON_INTERACTIVE_MODE | PRNVM_PRESERVE_DISK); - if (PRL_FAILED(waitJob(job, privconn->jobTimeout))) + if (PRL_FAILED(waitJob(job))) ret = -1; cleanup: @@ -3347,7 +3337,7 @@ prlsdkUnregisterDomain(parallelsConnPtr privconn, virDomainObjPtr dom) prlsdkDelNet(privconn, dom->def->nets[i]); job = PrlVm_Unreg(privdom->sdkdom); - if (PRL_FAILED(waitJob(job, privconn->jobTimeout))) + if (PRL_FAILED(waitJob(job))) return -1; if (prlsdkSendEvent(privconn, dom, VIR_DOMAIN_EVENT_UNDEFINED, @@ -3359,13 +3349,13 @@ prlsdkUnregisterDomain(parallelsConnPtr privconn, virDomainObjPtr dom) } int -prlsdkDomainManagedSaveRemove(parallelsConnPtr privconn, virDomainObjPtr dom) +prlsdkDomainManagedSaveRemove(virDomainObjPtr dom) { parallelsDomObjPtr privdom = dom->privateData; PRL_HANDLE job; job = PrlVm_DropSuspendedState(privdom->sdkdom); - if (PRL_FAILED(waitJob(job, privconn->jobTimeout))) + if (PRL_FAILED(waitJob(job))) return -1; return 0; diff --git a/src/parallels/parallels_sdk.h b/src/parallels/parallels_sdk.h index 00fa44d..027dd0c 100644 --- a/src/parallels/parallels_sdk.h +++ b/src/parallels/parallels_sdk.h @@ -24,7 +24,7 @@ #include "parallels_utils.h" -int prlsdkInit(parallelsConnPtr privconn); +int prlsdkInit(void); void prlsdkDeinit(void); int prlsdkConnect(parallelsConnPtr privconn); void prlsdkDisconnect(parallelsConnPtr privconn); @@ -35,14 +35,14 @@ prlsdkAddDomain(parallelsConnPtr privconn, const unsigned char *uuid); int prlsdkUpdateDomain(parallelsConnPtr privconn, virDomainObjPtr dom); int prlsdkSubscribeToPCSEvents(parallelsConnPtr privconn); void prlsdkUnsubscribeFromPCSEvents(parallelsConnPtr privconn); -PRL_RESULT prlsdkStart(parallelsConnPtr privconn, PRL_HANDLE sdkdom); -PRL_RESULT prlsdkKill(parallelsConnPtr privconn, PRL_HANDLE sdkdom); -PRL_RESULT prlsdkStop(parallelsConnPtr privconn, PRL_HANDLE sdkdom); -PRL_RESULT prlsdkPause(parallelsConnPtr privconn, PRL_HANDLE sdkdom); -PRL_RESULT prlsdkResume(parallelsConnPtr privconn, PRL_HANDLE sdkdom); -PRL_RESULT prlsdkSuspend(parallelsConnPtr privconn, PRL_HANDLE sdkdom); +PRL_RESULT prlsdkStart(PRL_HANDLE sdkdom); +PRL_RESULT prlsdkKill(PRL_HANDLE sdkdom); +PRL_RESULT prlsdkStop(PRL_HANDLE sdkdom); +PRL_RESULT prlsdkPause(PRL_HANDLE sdkdom); +PRL_RESULT prlsdkResume(PRL_HANDLE sdkdom); +PRL_RESULT prlsdkSuspend(PRL_HANDLE sdkdom); -typedef PRL_RESULT (*prlsdkChangeStateFunc)(parallelsConnPtr privconn, PRL_HANDLE sdkdom); +typedef PRL_RESULT (*prlsdkChangeStateFunc)(PRL_HANDLE sdkdom); int prlsdkDomainChangeState(virDomainPtr domain, prlsdkChangeStateFunc chstate); @@ -59,8 +59,6 @@ int prlsdkCreateCt(virConnectPtr conn, virDomainDefPtr def); int prlsdkUnregisterDomain(parallelsConnPtr privconn, virDomainObjPtr dom); int -prlsdkDomainManagedSaveRemove(parallelsConnPtr privconn, virDomainObjPtr dom); +prlsdkDomainManagedSaveRemove(virDomainObjPtr dom); int -prlsdkAttachVolume(virConnectPtr conn, - virDomainObjPtr dom, - virDomainDiskDefPtr disk); +prlsdkAttachVolume(virDomainObjPtr dom, virDomainDiskDefPtr disk); diff --git a/src/parallels/parallels_utils.h b/src/parallels/parallels_utils.h index 0f29374..912f450 100644 --- a/src/parallels/parallels_utils.h +++ b/src/parallels/parallels_utils.h @@ -59,7 +59,6 @@ struct _parallelsConn { virMutex lock; virDomainObjListPtr domains; PRL_HANDLE server; - PRL_UINT32 jobTimeout; virStoragePoolObjList pools; virNetworkObjListPtr networks; virCapsPtr caps; -- 1.7.1

2 1

[libvirt] [PATCH] qemu: vnc: error out for invalid port number
by Pavel Hrdina 13 May '15

13 May '15

In the XML we have the vnc port number, but QEMU takes on command line a vnc screen number, it's port-5900. We should fail with error message that only ports in range [5900,65535] are valid. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1164966 Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/qemu/qemu_command.c | 96 +++++++++++++++++++++++++++---------------------- 1 file changed, 53 insertions(+), 43 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 8ccbe82..5d0a167 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7591,50 +7591,60 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigPtr cfg, virBufferAsprintf(&opt, "unix:%s", graphics->data.vnc.socket); - } else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VNC_COLON)) { - switch (virDomainGraphicsListenGetType(graphics, 0)) { - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS: - listenAddr = virDomainGraphicsListenGetAddress(graphics, 0); - break; - - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK: - listenNetwork = virDomainGraphicsListenGetNetwork(graphics, 0); - if (!listenNetwork) - break; - ret = networkGetNetworkAddress(listenNetwork, &netAddr); - if (ret <= -2) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - "%s", _("network-based listen not possible, " - "network driver not present")); - goto error; - } - if (ret < 0) - goto error; - - listenAddr = netAddr; - /* store the address we found in the <graphics> element so it will - * show up in status. */ - if (virDomainGraphicsListenSetAddress(graphics, 0, - listenAddr, -1, false) < 0) - goto error; - break; - } - - if (!listenAddr) - listenAddr = cfg->vncListen; - - escapeAddr = strchr(listenAddr, ':') != NULL; - if (escapeAddr) - virBufferAsprintf(&opt, "[%s]", listenAddr); - else - virBufferAdd(&opt, listenAddr, -1); - virBufferAsprintf(&opt, ":%d", - graphics->data.vnc.port - 5900); - - VIR_FREE(netAddr); } else { - virBufferAsprintf(&opt, "%d", - graphics->data.vnc.port - 5900); + if (!graphics->data.vnc.autoport && + (graphics->data.vnc.port < 5900 || + graphics->data.vnc.port > 65535)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("vnc port must be in range [5900,65535]")); + goto error; + } + + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VNC_COLON)) { + switch (virDomainGraphicsListenGetType(graphics, 0)) { + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS: + listenAddr = virDomainGraphicsListenGetAddress(graphics, 0); + break; + + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK: + listenNetwork = virDomainGraphicsListenGetNetwork(graphics, 0); + if (!listenNetwork) + break; + ret = networkGetNetworkAddress(listenNetwork, &netAddr); + if (ret <= -2) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + "%s", _("network-based listen not possible, " + "network driver not present")); + goto error; + } + if (ret < 0) + goto error; + + listenAddr = netAddr; + /* store the address we found in the <graphics> element so it + * will show up in status. */ + if (virDomainGraphicsListenSetAddress(graphics, 0, + listenAddr, -1, false) < 0) + goto error; + break; + } + + if (!listenAddr) + listenAddr = cfg->vncListen; + + escapeAddr = strchr(listenAddr, ':') != NULL; + if (escapeAddr) + virBufferAsprintf(&opt, "[%s]", listenAddr); + else + virBufferAdd(&opt, listenAddr, -1); + virBufferAsprintf(&opt, ":%d", + graphics->data.vnc.port - 5900); + + VIR_FREE(netAddr); + } else { + virBufferAsprintf(&opt, "%d", + graphics->data.vnc.port - 5900); + } } if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VNC_COLON)) { -- 2.3.6

2 2

[libvirt] time: event poll may become un-triggerable after changing system clock.
by zhang bo 13 May '15

13 May '15

event poll may become un-triggerable after changing system clock. The steps to reproduce the problem: 1 run event-test 1 define and start a domain with name vm1. 2 destroy vm1 3 change system time to 1 hour before when timer.expiresAt has been set in virEventPollUpdateTimeout (and before virEventPollDispatchTimeouts()). 4 event-test will recive no message until 1 hour later. The reasons for the problem is : 1 The value of timer.expiresAt is set by virTimeMillisNowRaw. virTimeMillisNowRaw is effectable by settimeofday(), bacause it uses CLOCK_REALTIME to get time. 2 If we change the system time to a time long before now, after that timer.expiresAt has been set. timer.expiresAt is not affected, while virEventPollDispatchTimeouts is. Suppose it's now May 12th, and we set it to 10th, then the expiresAt is 12th, and the time virEventPollDispatchTimeouts got is 10th. if (eventLoop.timeouts[i].expiresAt <= (now+20)) { // expiresAt will not be less than now until 2 days later. *Solution(not good enough)*: 1 change the clock mode in virTimeMillisNowRaw from REALTIME to MONOTONIC, which would not be affected by settimeofday(). 2 add the time got from clock_gettime(*MONOTONIC*) with the system-start-time from epoch, making it equal to the value got from REALTIME. 3 As that the timestamp of the log message should follow system time, so we keep it to REALTIME as before. However, there's still problems: 1 pthread_cond_wait() gets time with REALTIME mode. When we change system time, pthread_cond_wait() may still be affected. So, Is there any other better solution? thanks in advance. oscar

2 3

[libvirt] [PATCH 0/2] Couple of sysinfo fixes
by Michal Privoznik 13 May '15

13 May '15

I've just tried sysinfo on my RPi, and found some bugs there. Michal Privoznik (2): virSysinfoParseProcessor: Drop useless check for NULL sysinfo: Fix reports on arm src/util/virsysinfo.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- 2.3.6

3 5

[libvirt] [PATCH] libxl: Disallow save or migrate when host devices are assigned to a guest.
by Konrad Rzeszutek Wilk 13 May '15

13 May '15

It is unhealthy. If the device is not doing any DMA operations it would work - but if you are saving and there are DMA operations happening the chance of corruption (outstanding DMAs) increase. As such re-use the check migration used. Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk(a)oracle.com> --- src/libxl/libxl_domain.c | 19 +++++++++++++++++++ src/libxl/libxl_domain.h | 3 +++ src/libxl/libxl_driver.c | 6 ++++++ src/libxl/libxl_migration.c | 15 +-------------- 4 files changed, 29 insertions(+), 14 deletions(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 5e0ab56..c038989 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -178,6 +178,25 @@ libxlDomainObjEndJob(libxlDriverPrivatePtr driver ATTRIBUTE_UNUSED, return virObjectUnref(obj); } +/* + * Checks whether the domain has host devices (PCIe) to disallow + * migration or saving of guest - unless they are detached. + * + * Returns true if the domain has host devices, otherwise false. + */ +bool +libxlDomainHasHostDevices(virDomainDefPtr def) +{ + /* Migration is not allowed if definition contains any hostdevs */ + if (def->nhostdevs > 0) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("domain has assigned host devices")); + return true; + } + + return false; +} + static void * libxlDomainObjPrivateAlloc(void) { diff --git a/src/libxl/libxl_domain.h b/src/libxl/libxl_domain.h index aa647b8..76c0c8d 100644 --- a/src/libxl/libxl_domain.h +++ b/src/libxl/libxl_domain.h @@ -95,6 +95,9 @@ char * libxlDomainManagedSavePath(libxlDriverPrivatePtr driver, virDomainObjPtr vm); +bool +libxlDomainHasHostDevices(virDomainDefPtr def); + int libxlDomainSaveImageOpen(libxlDriverPrivatePtr driver, libxlDriverConfigPtr cfg, diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 9eb071e..b9faba8 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -1650,6 +1650,9 @@ libxlDomainSaveFlags(virDomainPtr dom, const char *to, const char *dxml, goto endjob; } + if (libxlDomainHasHostDevices(vm->def)) + goto endjob; + if (libxlDoDomainSave(driver, vm, to) < 0) goto endjob; @@ -1876,6 +1879,9 @@ libxlDomainManagedSave(virDomainPtr dom, unsigned int flags) goto endjob; } + if (libxlDomainHasHostDevices(vm->def)) + goto endjob; + name = libxlDomainManagedSavePath(driver, vm); if (name == NULL) goto endjob; diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index 4010506..aaed448c 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -209,19 +209,6 @@ libxlDoMigrateSend(libxlDriverPrivatePtr driver, return ret; } -static bool -libxlDomainMigrationIsAllowed(virDomainDefPtr def) -{ - /* Migration is not allowed if definition contains any hostdevs */ - if (def->nhostdevs > 0) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("domain has assigned host devices")); - return false; - } - - return true; -} - char * libxlDomainMigrationBegin(virConnectPtr conn, virDomainObjPtr vm, @@ -251,7 +238,7 @@ libxlDomainMigrationBegin(virConnectPtr conn, def = vm->def; } - if (!libxlDomainMigrationIsAllowed(def)) + if (libxlDomainHasHostDevices(def)) goto endjob; xml = virDomainDefFormat(def, VIR_DOMAIN_DEF_FORMAT_SECURE); -- 2.1.0

3 7

[libvirt] [PATCH] qemu: fix double free when fail to cold-plug a rng device
by Luyao Huang 13 May '15

13 May '15

https://bugzilla.redhat.com/show_bug.cgi?id=1220809 When cold-plug a rng device and get failed in qemuDomainAssignAddresses, we will double free the rng device. Free the pointer after we Insert the device success to fix this issue. ... 5 0x00007fb7d180ac8a in virFree at util/viralloc.c:582 6 0x00007fb7d1895cdd in virDomainRNGDefFree at conf/domain_conf.c:19786 7 0x00007fb7d1895d99 in virDomainDeviceDefFree at conf/domain_conf.c:2022 8 0x00007fb7b92b8baf in qemuDomainAttachDeviceFlags at qemu/qemu_driver.c:8785 9 0x00007fb7d190c5d7 in virDomainAttachDeviceFlags at libvirt-domain.c:8488 10 0x00007fb7d23af9d2 in remoteDispatchDomainAttachDeviceFlags at remote_dispatch.h:2842 ... Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/qemu/qemu_driver.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 33c1cfd..f922a28 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8359,11 +8359,10 @@ qemuDomainAttachDeviceConfig(virQEMUCapsPtr qemuCaps, if (virDomainRNGInsert(vmdef, dev->data.rng, false) < 0) return -1; + dev->data.rng = NULL; if (qemuDomainAssignAddresses(vmdef, qemuCaps, NULL) < 0) return -1; - - dev->data.rng = NULL; break; case VIR_DOMAIN_DEVICE_MEMORY: -- 1.8.3.1

3 2

[libvirt] [PATCHv2] conf: fix no error when set an unsupport string in ./devices/shmem/msi[@ioeventfd]
by Luyao Huang 13 May '15

13 May '15

https://bugzilla.redhat.com/show_bug.cgi?id=1220265 Pass the return value to an enum directly is not safe. When pass a invalid @ioeventfd and virTristateSwitchTypeFromString return -1 to def->msi.ioeventfd, and this value transform to 4294967295, so no error when the parse failed. To fix this issue, folter the value using int and then assign it to virTristateSwitch as it's done. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- v2: a new way to fix this issue. src/conf/domain_conf.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 4cd36a1..04cce50 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10847,12 +10847,16 @@ virDomainShmemDefParseXML(xmlNodePtr node, } VIR_FREE(tmp); - if ((tmp = virXMLPropString(msi, "ioeventfd")) && - (def->msi.ioeventfd = virTristateSwitchTypeFromString(tmp)) <= 0) { - virReportError(VIR_ERR_XML_ERROR, - _("invalid msi ioeventfd setting for shmem: '%s'"), - tmp); - goto cleanup; + if ((tmp = virXMLPropString(msi, "ioeventfd"))) { + int val; + + if ((val = virTristateSwitchTypeFromString(tmp)) <= 0) { + virReportError(VIR_ERR_XML_ERROR, + _("invalid msi ioeventfd setting for shmem: '%s'"), + tmp); + goto cleanup; + } + def->msi.ioeventfd = val; } VIR_FREE(tmp); } -- 1.8.3.1

3 2

[libvirt] [PATCH] libxl: support VNC passwd
by Jim Fehlig 12 May '15

12 May '15

While implementing support for SPICE, noticed VNC passwd was never copied to libxl_device_vfb's vnc.passwd field. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_conf.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index fccada5..35b1d04 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1283,6 +1283,8 @@ libxlMakeVfb(virPortAllocatorPtr graphicsports, if (VIR_STRDUP(x_vfb->vnc.listen, listenAddr) < 0) return -1; } + if (VIR_STRDUP(x_vfb->vnc.passwd, l_vfb->data.vnc.auth.passwd) < 0) + return -1; if (VIR_STRDUP(x_vfb->keymap, l_vfb->data.vnc.keymap) < 0) return -1; break; -- 1.8.4.5

2 2

[libvirt] [v3 0/2] Remove host name checking from iSCSI duplicate source checks
by John Ferlan 12 May '15

12 May '15

Only a v3 because the first two series "Addition host name check for network storage pools" were not well received. If someone wants to pick up/use the the hostname checking code from the v2, then have at it. Patch 1, 2, 7, & 8 use the virSocketAddr code. This series just focuses on the iSCSI duplicate source checks and in particular the removal of the host name checks to be replaced primarily by the duplicate source device path (or IQN) check. For iSCSI devices, checking the resolved host name was not feasible. Instead, if the source device path (IQN) of the new definition is the same as a running pool, then the new definition will be rejected. The secondary check is for an undocumented <inititor> element to define the initiator iqn (see bz 488142). The first patch is "new" - it's something I discovered while doing some extra testing with the v2 of the series. The second patch provides the change and modifies the documentation. It resolves two bz's as listed in the patch description. v2 here: http://www.redhat.com/archives/libvir-list/2015-April/msg01197.html Much discussion took place in v1 though in 7/7: http://www.redhat.com/archives/libvir-list/2015-April/msg00880.html John Ferlan (2): conf: Adjust duplicate source host port check conf: Remove source host name check for iSCSI docs/formatstorage.html.in | 18 ++++++++++++++---- docs/storage.html.in | 8 +++++++- src/conf/storage_conf.c | 7 +++---- 3 files changed, 24 insertions(+), 9 deletions(-) -- 2.1.0

2 3

[libvirt] [PATCH 0/2] Cleanup storage migration code a bit
by Jiri Denemark 12 May '15

12 May '15

Jiri Denemark (2): qemu: Keep track of what disks are being migrated qemu: Don't give up on first error in qemuMigrationCancelDriverMirror src/conf/domain_conf.h | 2 ++ src/qemu/qemu_migration.c | 36 +++++++++++++++++------------------- 2 files changed, 19 insertions(+), 19 deletions(-) -- 2.4.0

2 4

[libvirt] [PATCH] daemon: logging: Suppress logging of VIR_ERR_NO_DOMAIN_METADATA
by Peter Krempa 12 May '15

12 May '15

Similarly to other error codes that notify the user that the object does not exist lower the priority of VIR_ERR_NO_DOMAIN_METADATA to VIR_LOG_DEBUG when writing the log entry. --- daemon/libvirtd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 107b88d..3e7f87c 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -320,6 +320,7 @@ static int daemonErrorLogFilter(virErrorPtr err, int priority) case VIR_ERR_NO_SECRET: case VIR_ERR_NO_DOMAIN_SNAPSHOT: case VIR_ERR_OPERATION_INVALID: + case VIR_ERR_NO_DOMAIN_METADATA: return VIR_LOG_DEBUG; } -- 2.3.5

2 2

[libvirt] [PATCH 0/2] remove 2 unused functions
by Zhang Bo 12 May '15

12 May '15

From: YueWenyuan <yuewenyuan(a)huawei.com> remove unused functions virTimeFieldsNow() and virTimeFieldsNowRaw() YueWenyuan (2): remove unused function virTimeFieldsNow remove unused function virTimeFieldsNowRaw src/libvirt_private.syms | 2 -- src/util/virtime.c | 43 ------------------------------------------- src/util/virtime.h | 4 ---- 3 files changed, 49 deletions(-) -- 1.7.12.4

2 3

[libvirt] [PATCH v2] XML: escape strings where we should do it
by Pavel Hrdina 12 May '15

12 May '15

There is a lot of places, were it's pretty ease for user to enter some characters that we need to escape to create a valid XML description. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1197580 Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Previous version: https://www.redhat.com/archives/libvir-list/2015-May/msg00110.html I've went through all the usage of virBufferAsprintf and hopefully I didn't miss any wrong usage. src/conf/capabilities.c | 6 ++-- src/conf/cpu_conf.c | 6 ++-- src/conf/domain_capabilities.c | 2 +- src/conf/domain_conf.c | 63 +++++++++++++++++++++--------------------- src/conf/network_conf.c | 17 ++++++------ src/conf/node_device_conf.c | 4 +-- 6 files changed, 49 insertions(+), 49 deletions(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index c43bfb3..6bd06e5 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -682,9 +682,9 @@ virCapabilitiesDomainDataLookupInternal(virCapsPtr caps, virBufferAsprintf(&buf, "domaintype=%s ", virDomainVirtTypeToString(domaintype)); if (emulator) - virBufferAsprintf(&buf, "emulator=%s ", emulator); + virBufferEscapeString(&buf, "emulator=%s ", emulator); if (machinetype) - virBufferAsprintf(&buf, "machine=%s ", machinetype); + virBufferEscapeString(&buf, "machine=%s ", machinetype); if (virBufferCurrentContent(&buf) && !virBufferCurrentContent(&buf)[0]) virBufferAsprintf(&buf, "%s", _("any configuration")); @@ -903,7 +903,7 @@ virCapabilitiesFormatXML(virCapsPtr caps) virBufferAdjustIndent(&buf, 2); for (i = 0; i < caps->host.nmigrateTrans; i++) { virBufferAsprintf(&buf, "<uri_transport>%s</uri_transport>\n", - caps->host.migrateTrans[i]); + caps->host.migrateTrans[i]); } virBufferAdjustIndent(&buf, -2); virBufferAddLit(&buf, "</uri_transports>\n"); diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index e959ecc..1ba1d82 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -544,17 +544,17 @@ virCPUDefFormatBuf(virBufferPtr buf, } virBufferAsprintf(buf, " fallback='%s'", fallback); if (def->vendor_id) - virBufferAsprintf(buf, " vendor_id='%s'", def->vendor_id); + virBufferEscapeString(buf, " vendor_id='%s'", def->vendor_id); } if (formatModel && def->model) { - virBufferAsprintf(buf, ">%s</model>\n", def->model); + virBufferEscapeString(buf, ">%s</model>\n", def->model); } else { virBufferAddLit(buf, "/>\n"); } } if (formatModel && def->vendor) - virBufferAsprintf(buf, "<vendor>%s</vendor>\n", def->vendor); + virBufferEscapeString(buf, "<vendor>%s</vendor>\n", def->vendor); if (def->sockets && def->cores && def->threads) { virBufferAddLit(buf, "<topology"); diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c index 7c59912..0e32f52 100644 --- a/src/conf/domain_capabilities.c +++ b/src/conf/domain_capabilities.c @@ -272,7 +272,7 @@ virDomainCapsFormatInternal(virBufferPtr buf, virBufferAddLit(buf, "<domainCapabilities>\n"); virBufferAdjustIndent(buf, 2); - virBufferAsprintf(buf, "<path>%s</path>\n", caps->path); + virBufferEscapeString(buf, "<path>%s</path>\n", caps->path); virBufferAsprintf(buf, "<domain>%s</domain>\n", virttype_str); virBufferAsprintf(buf, "<machine>%s</machine>\n", caps->machine); virBufferAsprintf(buf, "<arch>%s</arch>\n", arch_str); diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e3e0f63..4c3f46f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3724,7 +3724,7 @@ virDomainDeviceInfoFormat(virBufferPtr buf, virBufferAsprintf(buf, " bar='%s'", rombar); } if (info->romfile) - virBufferAsprintf(buf, " file='%s'", info->romfile); + virBufferEscapeString(buf, " file='%s'", info->romfile); virBufferAddLit(buf, "/>\n"); } @@ -17712,7 +17712,7 @@ virSecurityDeviceLabelDefFormat(virBufferPtr buf, virBufferAddLit(buf, "<seclabel"); if (def->model) - virBufferAsprintf(buf, " model='%s'", def->model); + virBufferEscapeString(buf, " model='%s'", def->model); if (def->labelskip) virBufferAddLit(buf, " labelskip='yes'"); @@ -19246,50 +19246,51 @@ virDomainChrSourceDefFormat(virBufferPtr buf, break; case VIR_DOMAIN_CHR_TYPE_NMDM: - virBufferAsprintf(buf, "<source master='%s' slave='%s'/>\n", - def->data.nmdm.master, - def->data.nmdm.slave); + virBufferEscapeString(buf, "<source master='%s' ", + def->data.nmdm.master); + virBufferEscapeString(buf, "slave='%s'/>\n", def->data.nmdm.slave); break; case VIR_DOMAIN_CHR_TYPE_UDP: if (def->data.udp.bindService && def->data.udp.bindHost) { - virBufferAsprintf(buf, - "<source mode='bind' host='%s' " - "service='%s'/>\n", - def->data.udp.bindHost, - def->data.udp.bindService); + virBufferEscapeString(buf, + "<source mode='bind' host='%s' ", + def->data.udp.bindHost); + virBufferEscapeString(buf, + "service='%s'/>\n", + def->data.udp.bindService); } else if (def->data.udp.bindHost) { - virBufferAsprintf(buf, "<source mode='bind' host='%s'/>\n", - def->data.udp.bindHost); + virBufferEscapeString(buf, "<source mode='bind' host='%s'/>\n", + def->data.udp.bindHost); } else if (def->data.udp.bindService) { - virBufferAsprintf(buf, "<source mode='bind' service='%s'/>\n", - def->data.udp.bindService); + virBufferEscapeString(buf, "<source mode='bind' service='%s'/>\n", + def->data.udp.bindService); } if (def->data.udp.connectService && def->data.udp.connectHost) { - virBufferAsprintf(buf, - "<source mode='connect' host='%s' " - "service='%s'/>\n", - def->data.udp.connectHost, - def->data.udp.connectService); + virBufferEscapeString(buf, + "<source mode='connect' host='%s' ", + def->data.udp.connectHost); + virBufferEscapeString(buf, + "service='%s'/>\n", + def->data.udp.connectService); } else if (def->data.udp.connectHost) { - virBufferAsprintf(buf, "<source mode='connect' host='%s'/>\n", - def->data.udp.connectHost); + virBufferEscapeString(buf, "<source mode='connect' host='%s'/>\n", + def->data.udp.connectHost); } else if (def->data.udp.connectService) { - virBufferAsprintf(buf, - "<source mode='connect' service='%s'/>\n", - def->data.udp.connectService); + virBufferEscapeString(buf, + "<source mode='connect' service='%s'/>\n", + def->data.udp.connectService); } break; case VIR_DOMAIN_CHR_TYPE_TCP: - virBufferAsprintf(buf, - "<source mode='%s' host='%s' service='%s'/>\n", - def->data.tcp.listen ? "bind" : "connect", - def->data.tcp.host, - def->data.tcp.service); + virBufferAsprintf(buf, "<source mode='%s' ", + def->data.tcp.listen ? "bind" : "connect"); + virBufferEscapeString(buf, "host='%s' ", def->data.tcp.host); + virBufferEscapeString(buf, "service='%s'/>\n", def->data.tcp.service); virBufferAsprintf(buf, "<protocol type='%s'/>\n", virDomainChrTcpProtocolTypeToString( def->data.tcp.protocol)); @@ -19303,8 +19304,8 @@ virDomainChrSourceDefFormat(virBufferPtr buf, break; case VIR_DOMAIN_CHR_TYPE_SPICEPORT: - virBufferAsprintf(buf, "<source channel='%s'/>\n", - def->data.spiceport.channel); + virBufferEscapeString(buf, "<source channel='%s'/>\n", + def->data.spiceport.channel); break; } diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 5b734f2..aa607a8 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -2422,21 +2422,20 @@ virNetworkDNSDefFormat(virBufferPtr buf, } for (i = 0; i < def->ntxts; i++) { - virBufferAsprintf(buf, "<txt name='%s' value='%s'/>\n", - def->txts[i].name, - def->txts[i].value); + virBufferEscapeString(buf, "<txt name='%s' ", def->txts[i].name); + virBufferEscapeString(buf, "value='%s'/>\n", def->txts[i].value); } for (i = 0; i < def->nsrvs; i++) { if (def->srvs[i].service && def->srvs[i].protocol) { - virBufferAsprintf(buf, "<srv service='%s' protocol='%s'", - def->srvs[i].service, - def->srvs[i].protocol); + virBufferEscapeString(buf, "<srv service='%s' ", + def->srvs[i].service); + virBufferEscapeString(buf, "protocol='%s'", def->srvs[i].protocol); if (def->srvs[i].domain) virBufferAsprintf(buf, " domain='%s'", def->srvs[i].domain); if (def->srvs[i].target) - virBufferAsprintf(buf, " target='%s'", def->srvs[i].target); + virBufferEscapeString(buf, " target='%s'", def->srvs[i].target); if (def->srvs[i].port) virBufferAsprintf(buf, " port='%d'", def->srvs[i].port); if (def->srvs[i].priority) @@ -2455,8 +2454,8 @@ virNetworkDNSDefFormat(virBufferPtr buf, virBufferAsprintf(buf, "<host ip='%s'>\n", ip); virBufferAdjustIndent(buf, 2); for (j = 0; j < def->hosts[i].nnames; j++) - virBufferAsprintf(buf, "<hostname>%s</hostname>\n", - def->hosts[i].names[j]); + virBufferEscapeString(buf, "<hostname>%s</hostname>\n", + def->hosts[i].names[j]); virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "</host>\n"); diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index a286847..feae3d4 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -514,8 +514,8 @@ char *virNodeDeviceDefFormat(const virNodeDeviceDef *def) virBufferEscapeString(&buf, "<vendor>%s</vendor>\n", data->storage.vendor); if (data->storage.serial) - virBufferAsprintf(&buf, "<serial>%s</serial>\n", - data->storage.serial); + virBufferEscapeString(&buf, "<serial>%s</serial>\n", + data->storage.serial); if (data->storage.flags & VIR_NODE_DEV_CAP_STORAGE_REMOVABLE) { int avl = data->storage.flags & VIR_NODE_DEV_CAP_STORAGE_REMOVABLE_MEDIA_AVAILABLE; -- 2.3.6

2 2

[libvirt] [PATCH] libvirt-guests: Initialize SYNC_TIME
by Michal Privoznik 12 May '15

12 May '15

https://bugzilla.redhat.com/show_bug.cgi?id=1191227 Since 0fa15b19 we have this variable SYNC_TIME which allows users to synchronize time on domain resume. However, despite what documentation says, it's by default on because it's never initialized. Fix this by setting it to zero at the beginning of the libvirt-guests script. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tools/libvirt-guests.sh.in | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in index 9aa06fa..7f74b85 100644 --- a/tools/libvirt-guests.sh.in +++ b/tools/libvirt-guests.sh.in @@ -39,6 +39,7 @@ START_DELAY=0 BYPASS_CACHE=0 CONNECT_RETRIES=10 RETRIES_SLEEP=1 +SYNC_TIME=0 test -f "$sysconfdir"/sysconfig/libvirt-guests && . "$sysconfdir"/sysconfig/libvirt-guests -- 2.3.6

2 1

[libvirt] Plans for supporting smbios type 2 ( baseboard/module info ) in libvirt
by Soumik Bhattacharya 11 May '15

11 May '15

Hi Experts, Just wondering if there are plans to implement smbios type 2 parameters in libvirt ? I am trying to pass a couple of critical parameters ( especially 'location' ) to qemu via libvirt but it's failing ( silently ignored ) currently due to libvirt not supporting smbios type 2 ( yet ), even though qemu does support it. Libvirt version used = 1.2.2 Qemu version used = 2.0.0 Thanks & regards, Soumik

2 2

[libvirt] [PATCH] maint: increase stack frame size limit
by Roman Bogorodskiy 11 May '15

11 May '15

Currently the stack frame size limit is set to 4096 and it started to cause an error like this: virshtest.c:253:1: error: stack frame size of 5512 bytes in function 'mymain' [-Werror,-Wframe-larger-than=] mymain(void) ^ 1 error generated. Increase it to 6144. --- m4/virt-compile-warnings.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4 index 8aebdb0..1478753 100644 --- a/m4/virt-compile-warnings.m4 +++ b/m4/virt-compile-warnings.m4 @@ -153,7 +153,7 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ # This should be < 256 really. Currently we're down to 4096, # but using 1024 bytes sized buffers (mostly for virStrerror) # stops us from going down further - wantwarn="$wantwarn -Wframe-larger-than=4096" + wantwarn="$wantwarn -Wframe-larger-than=6144" dnl wantwarn="$wantwarn -Wframe-larger-than=256" # Extra special flags -- 2.3.7

2 7

[libvirt] [PATCH 0/2] FreeBSD/gcc fixes
by Roman Bogorodskiy 11 May '15

11 May '15

Due to clang problems[1] I've switched to gcc from FreeBSD ports. That involves some minor fixes provided in this series. Roman Bogorodskiy (2): bhyve: fix bhyvexml2argvtest build with gcc maint: extend PIE support check m4/virt-compile-pie.m4 | 4 ++-- tests/bhyvexml2argvtest.c | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) -- 2.3.7

2 5

[libvirt] [PATCH 0/2] Introduce pci-serial
by Michal Privoznik 11 May '15

11 May '15

It's very similar to usb-serial. You wouldn't guess the difference :-P Michal Privoznik (2): Introduce pci-serial qemu: Implement pci-serial docs/formatdomain.html.in | 16 ++++++---- docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 18 +++++++++++ tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 1 + .../qemuxml2argv-pci-serial-dev-chardev.args | 7 ++++ .../qemuxml2argv-pci-serial-dev-chardev.xml | 37 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 ++ tests/qemuxml2xmltest.c | 1 + 17 files changed, 89 insertions(+), 7 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pci-serial-dev-chardev.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pci-serial-dev-chardev.xml -- 2.3.6

2 4

[libvirt] [PATCH] Assign virtio-serial addresses after coldplugging a device
by Ján Tomko 11 May '15

11 May '15

Otherwise we might allow coldplugging a device that uses an address that is already occupied, creating an unstartable domain. https://bugzilla.redhat.com/show_bug.cgi?id=1076708#c10 --- src/qemu/qemu_driver.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d173aa1..bab20c6 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8326,6 +8326,8 @@ qemuDomainAttachDeviceConfig(virQEMUCapsPtr qemuCaps, dev->data.chr = NULL; if (virDomainDefAddImplicitControllers(vmdef) < 0) return -1; + if (qemuDomainAssignAddresses(vmdef, qemuCaps, NULL) < 0) + return -1; break; case VIR_DOMAIN_DEVICE_FS: -- 2.0.5

2 1

[libvirt] [PATCH] conf: fix no error when set an unsupport string in ./devices/shmem/msi[@ioeventfd]
by Luyao Huang 11 May '15

11 May '15

https://bugzilla.redhat.com/show_bug.cgi?id=1220265 Pass the return value to an enum directly is not safe. When pass a invalid @ioeventfd and virTristateSwitchTypeFromString return -1 to def->msi.ioeventfd, and this value transform to 4294967295, so no error when the parse failed. Instead of define a int variable in virDomainShmemDefParseXML and use the new defined variable as transition variable. I think define ioeventfd as an 'int' variable will be better. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/conf/domain_conf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 087d282..fea9baa 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1610,7 +1610,7 @@ struct _virDomainShmemDef { struct { bool enabled; unsigned vectors; - virTristateSwitch ioeventfd; + int ioeventfd; /* enum virTristateSwitch */ } msi; virDomainDeviceInfo info; }; -- 1.8.3.1

2 2

[libvirt] [PATCH 0/6] Refactor critical section in virDomainListAllDomains and fix qemuConnectGetAllDomainStats
by Peter Krempa 11 May '15

11 May '15

Peter Krempa (6): util: Make the virDomainListFree helper more universal conf: Extract code to filter domain list into a separate function conf: Rename virDomainObjListFilter type to virDomainObjListACLFilter conf: Refactor domain list collection critical section conf: Add helper to convert list of virDomains to a list of virDomainObjs qemu: Convert qemuConnectGetAllDomainStats to use new helpers daemon/remote.c | 2 +- src/conf/domain_conf.c | 258 ++++++++++++++++++++++++++++--------------- src/conf/domain_conf.h | 29 +++-- src/libvirt_private.syms | 5 +- src/qemu/qemu_driver.c | 86 +++++++-------- src/util/virobject.c | 41 +++++++ src/util/virobject.h | 2 + tools/virsh-domain-monitor.c | 2 +- 8 files changed, 275 insertions(+), 150 deletions(-) -- 2.3.5

3 13

[libvirt] [python PATCH] Post-release version bump to 1.2.16
by Peter Krempa 11 May '15

11 May '15

--- Pushed as trivial. setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index a8e9e86..2571742 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.15', + version = '1.2.16', url = 'http://www.libvirt.org', maintainer = 'Libvirt Maintainers', maintainer_email = 'libvir-list(a)redhat.com', -- 2.3.5

1 0

[libvirt] [PATCH 0/3] Few more memory hotplug related fixes
by Peter Krempa 11 May '15

11 May '15

Peter Krempa (3): conf: Always truncate balloon size to maximum memory size conf: Fix up balloon size after removing a memory device from def qemu: Fix balloon size handling with memory hot(un)plug src/conf/domain_conf.c | 27 +++++++-------------------- src/qemu/qemu_driver.c | 3 +++ src/qemu/qemu_hotplug.c | 10 ++++++++++ 3 files changed, 20 insertions(+), 20 deletions(-) -- 2.3.5

2 5

[libvirt] [PATCH] tools: fix the output of blockjob
by Shanzhi Yu 11 May '15

11 May '15

There will be no output when use blockjob with "--raw" option if guest has no block job. A explicit message should be given just like with "--info" Signed-off-by: Shanzhi Yu <shyu(a)redhat.com> --- tools/virsh-domain.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 14e1e35..7094a43 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -2541,7 +2541,6 @@ cmdBlockJob(vshControl *ctl, const vshCmd *cmd) } if (rc == 0) { - if (!raw) vshPrint(ctl, _("No current block job for %s"), path); ret = true; goto cleanup; -- 2.1.0

2 1

[libvirt] [PATCH v2] libxl: include a XLU_Config in _libxlDriverConfig
by Olaf Hering 08 May '15

08 May '15

Upcoming changes for vscsi will use libxlutil.so to prepare the configuration for libxl. The helpers needs a xlu struct for logging. Provide one and reuse the existing output as log target. Signed-off-by: Olaf Hering <olaf(a)aepfle.de> Cc: Jim Fehlig <jfehlig(a)suse.com> --- v2: - call xlu_cfg_destroy, unconditionally - fix cpp indention in libxl_conf.h src/libxl/libxl_conf.c | 7 +++++++ src/libxl/libxl_conf.h | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index fccada5..e1bc0f6 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -92,6 +92,7 @@ libxlDriverConfigDispose(void *obj) virObjectUnref(cfg->caps); libxl_ctx_free(cfg->ctx); xtl_logger_destroy(cfg->logger); + xlu_cfg_destroy(cfg->xlu); if (cfg->logger_file) VIR_FORCE_FCLOSE(cfg->logger_file); @@ -1468,6 +1469,12 @@ libxlDriverConfigNew(void) goto error; } + cfg->xlu = xlu_cfg_init(cfg->logger_file, "libvirt"); + if (!cfg->xlu) { + VIR_ERROR(_("cannot create xlu for libxenlight, disabling driver")); + goto error; + } + if (libxl_ctx_alloc(&cfg->ctx, LIBXL_VERSION, 0, cfg->logger)) { VIR_ERROR(_("cannot initialize libxenlight context, probably not " "running in a Xen Dom0, disabling driver")); diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h index 0a1c0db..24fa960 100644 --- a/src/libxl/libxl_conf.h +++ b/src/libxl/libxl_conf.h @@ -27,6 +27,12 @@ # define LIBXL_CONF_H # include <libxl.h> +# ifdef HAVE_LIBXLUTIL_H +# include <libxlutil.h> +# else +typedef struct XLU_Config XLU_Config; +XLU_Config *xlu_cfg_init(FILE *report, const char *report_filename); +# endif # include "internal.h" # include "libvirt_internal.h" @@ -92,6 +98,7 @@ struct _libxlDriverConfig { /* log stream for driver-wide libxl ctx */ FILE *logger_file; xentoollog_logger *logger; + XLU_Config *xlu; /* libxl ctx for driver wide ops; getVersion, getNodeInfo, ... */ libxl_ctx *ctx;

2 1

[libvirt] [PATCH] libxl: support vscsi
by Olaf Hering 08 May '15

08 May '15

This uses the API version of the proposed vscsi support in libxl (v4): http://lists.xenproject.org/archives/html/xen-devel/2015-04/msg01949.html Is there anything else that needs to be done in libvirt? Right now libvirt scsi support is very simple minded, no support at all to describe host devices with persistant names. This patch got very little runtime testing up to now... Signed-off-by: Olaf Hering <olaf(a)aepfle.de> --- src/libxl/libxl_conf.c | 59 +++++++++++++++++ src/libxl/libxl_conf.h | 1 + src/libxl/libxl_domain.c | 2 +- src/libxl/libxl_driver.c | 167 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 228 insertions(+), 1 deletion(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index f9bb5ed..7964e8b 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1591,6 +1591,61 @@ libxlMakePCIList(virDomainDefPtr def, libxl_domain_config *d_config) } static int +libxlMakeVscsiList(libxl_ctx *ctx, + XLU_Config *xlu, + virDomainDefPtr def, + libxl_domain_config *d_config) +{ + virDomainHostdevDefPtr *l_hostdevs = def->hostdevs; + size_t i, nhostdevs = def->nhostdevs; + virDomainHostdevDefPtr hostdev; + virDomainHostdevSubsysSCSIPtr scsisrc; + char *str; + int rc = 0; + + if (nhostdevs == 0) + return 0; + + for (i = 0; i < nhostdevs; i++) { + hostdev = l_hostdevs[i]; + if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) + continue; + if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI) + continue; + scsisrc = &hostdev->source.subsys.u.scsi; + if (scsisrc->protocol == VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI) + continue; +#if defined(LIBXL_HAVE_VSCSI) + if (virAsprintf(&str, "%s:%u:%u:%u,%u:%u:%u:%u%s", + scsisrc->u.host.adapter + strlen("scsi_host"), + scsisrc->u.host.bus, + scsisrc->u.host.target, + scsisrc->u.host.unit, + hostdev->info->addr.drive.controller, + hostdev->info->addr.drive.bus, + hostdev->info->addr.drive.target, + hostdev->info->addr.drive.unit, + scsisrc->rawio == VIR_TRISTATE_BOOL_YES ? ",feature-host" : "") < 0) { + goto error; + }; + rc = xlu_vscsi_config_add(xlu, ctx, str, &d_config->num_vscsis, &d_config->vscsis); + VIR_FREE(str); + if (rc) + goto error; +#else + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("This version of libxenlight does not support vscsi")); + goto error; +#endif + } + + return 0; + + error: + return -1; +} + +static int libxlMakeVideo(virDomainDefPtr def, libxl_domain_config *d_config) { @@ -1724,6 +1779,7 @@ int libxlBuildDomainConfig(virPortAllocatorPtr graphicsports, virDomainDefPtr def, libxl_ctx *ctx, + XLU_Config *xlu, libxl_domain_config *d_config) { libxl_domain_config_init(d_config); @@ -1746,6 +1802,9 @@ libxlBuildDomainConfig(virPortAllocatorPtr graphicsports, if (libxlMakePCIList(def, d_config) < 0) return -1; + if (libxlMakeVscsiList(ctx, xlu, def, d_config) < 0) + return -1; + /* * Now that any potential VFBs are defined, update the build info with * the data of the primary display. Some day libxl might implicitely do diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h index bdc68d4..94a3046 100644 --- a/src/libxl/libxl_conf.h +++ b/src/libxl/libxl_conf.h @@ -205,6 +205,7 @@ int libxlBuildDomainConfig(virPortAllocatorPtr graphicsports, virDomainDefPtr def, libxl_ctx *ctx, + XLU_Config *xlu, libxl_domain_config *d_config); static inline void diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 3039427..537e370 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -950,7 +950,7 @@ libxlDomainStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm, } if (libxlBuildDomainConfig(driver->reservedVNCPorts, vm->def, - cfg->ctx, &d_config) < 0) + cfg->ctx, cfg->xlu, &d_config) < 0) goto cleanup; if (cfg->autoballoon && libxlDomainFreeMem(cfg->ctx, &d_config) < 0) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index f915f91..424150f 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -2943,6 +2943,97 @@ libxlDomainAttachHostPCIDevice(libxlDriverPrivatePtr driver, } static int +libxlDomainAttachHostSCSIDevice(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, + virDomainHostdevDefPtr hostdev) +{ +#if defined(LIBXL_HAVE_VSCSI) + libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); + libxl_device_vscsi vscsidev; + virDomainHostdevDefPtr found; + virHostdevManagerPtr hostdev_mgr = driver->hostdevMgr; + virDomainHostdevSubsysSCSIPtr scsisrc = &hostdev->source.subsys.u.scsi; + char *str = NULL; + int ret = -1; + + if (scsisrc->protocol == VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI) + return -1; + + libxl_device_vscsi_init(&vscsidev); + + if (virDomainHostdevFind(vm->def, hostdev, &found) >= 0) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("target scsi device %u:%u:%u:%u already exists"), + hostdev->info->addr.drive.controller, + hostdev->info->addr.drive.bus, + hostdev->info->addr.drive.target, + hostdev->info->addr.drive.unit); + goto cleanup; + } + + if (VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs + 1) < 0) + goto cleanup; + + if (virHostdevPrepareSCSIDevices(hostdev_mgr, LIBXL_DRIVER_NAME, + vm->def->name, &hostdev, 1) < 0) + goto cleanup; + + if (virAsprintf(&str, "%s:%u:%u:%u,%u:%u:%u:%u%s", + scsisrc->u.host.adapter + strlen("scsi_host"), + scsisrc->u.host.bus, + scsisrc->u.host.target, + scsisrc->u.host.unit, + hostdev->info->addr.drive.controller, + hostdev->info->addr.drive.bus, + hostdev->info->addr.drive.target, + hostdev->info->addr.drive.unit, + scsisrc->rawio == VIR_TRISTATE_BOOL_YES ? + ",feature-host" : "") < 0) { + goto error; + }; + + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", str); + + if (xlu_vscsi_get_host(cfg->xlu, cfg->ctx, vm->def->id, str, &vscsidev) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("libxutil failed to parse scsi device %u:%u:%u:%u"), + hostdev->info->addr.drive.controller, + hostdev->info->addr.drive.bus, + hostdev->info->addr.drive.target, + hostdev->info->addr.drive.unit); + } + + if (libxl_device_vscsi_add(cfg->ctx, vm->def->id, &vscsidev, NULL) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("libxenlight failed to attach scsi device %u:%u:%u:%u"), + hostdev->info->addr.drive.controller, + hostdev->info->addr.drive.bus, + hostdev->info->addr.drive.target, + hostdev->info->addr.drive.unit); + goto error; + } + + vm->def->hostdevs[vm->def->nhostdevs++] = hostdev; + ret = 0; + goto cleanup; + + error: + virHostdevReAttachSCSIDevices(hostdev_mgr, LIBXL_DRIVER_NAME, + vm->def->name, &hostdev, 1); + + cleanup: + VIR_FREE(str); + virObjectUnref(cfg); + libxl_device_vscsi_dispose(&vscsidev); + return ret; +#else + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("This version of libxenlight does not support vscsi")); + return -1; +#endif +} + +static int libxlDomainAttachHostDevice(libxlDriverPrivatePtr driver, virDomainObjPtr vm, virDomainHostdevDefPtr hostdev) @@ -2960,6 +3051,11 @@ libxlDomainAttachHostDevice(libxlDriverPrivatePtr driver, return -1; break; + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI: + if (libxlDomainAttachHostSCSIDevice(driver, vm, hostdev) < 0) + return -1; + break; + default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("hostdev subsys type '%s' not supported"), @@ -3284,6 +3380,74 @@ libxlDomainDetachHostPCIDevice(libxlDriverPrivatePtr driver, } static int +libxlDomainDetachHostSCSIDevice(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, + virDomainHostdevDefPtr hostdev) +{ +#if defined(LIBXL_HAVE_VSCSI) + libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); + virDomainHostdevDefPtr detach; + int idx; + virHostdevManagerPtr hostdev_mgr = driver->hostdevMgr; + virDomainHostdevSubsysSCSIPtr scsisrc = &hostdev->source.subsys.u.scsi; + int ret = -1; + char *str = NULL; + + if (scsisrc->protocol == VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI) + return -1; + + idx = virDomainHostdevFind(vm->def, hostdev, &detach); + if (idx < 0) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("target scsi device %u:%u:%u:%u not found"), + hostdev->info->addr.drive.controller, + hostdev->info->addr.drive.bus, + hostdev->info->addr.drive.target, + hostdev->info->addr.drive.unit); + goto cleanup; + } + + if (virAsprintf(&str, "%u:%u:%u:%u", + hostdev->info->addr.drive.controller, + hostdev->info->addr.drive.bus, + hostdev->info->addr.drive.target, + hostdev->info->addr.drive.unit) < 0) { + goto error; + }; + + if (xlu_vscsi_detach(cfg->xlu, cfg->ctx, vm->def->id, str) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("libxenlight failed to detach pci device %u:%u:%u:%u"), + hostdev->info->addr.drive.controller, + hostdev->info->addr.drive.bus, + hostdev->info->addr.drive.target, + hostdev->info->addr.drive.unit); + goto error; + } + + + virDomainHostdevRemove(vm->def, idx); + + virHostdevReAttachPCIDevices(hostdev_mgr, LIBXL_DRIVER_NAME, + vm->def->name, &hostdev, 1, NULL); + + ret = 0; + + error: + VIR_FREE(str); + virDomainHostdevDefFree(detach); + + cleanup: + virObjectUnref(cfg); + return ret; +#else + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("This version of libxenlight does not support vscsi")); + return -1; +#endif +} + +static int libxlDomainDetachHostDevice(libxlDriverPrivatePtr driver, virDomainObjPtr vm, virDomainHostdevDefPtr hostdev) @@ -3301,6 +3465,9 @@ libxlDomainDetachHostDevice(libxlDriverPrivatePtr driver, case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: return libxlDomainDetachHostPCIDevice(driver, vm, hostdev); + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI: + return libxlDomainDetachHostSCSIDevice(driver, vm, hostdev); + default: virReportError(VIR_ERR_INTERNAL_ERROR, _("unexpected hostdev type %d"), subsys->type);

2 1

[libvirt] [PATCH v2] caps: Fix regression defaulting to host arch
by Cole Robinson 08 May '15

08 May '15

My commit 747761a79 (v1.2.15 only) dropped this bit of logic when filling in a default arch in the XML: - /* First try to find one matching host arch */ - for (i = 0; i < caps->nguests; i++) { - if (caps->guests[i]->ostype == ostype) { - for (j = 0; j < caps->guests[i]->arch.ndomains; j++) { - if (caps->guests[i]->arch.domains[j]->type == domain && - caps->guests[i]->arch.id == caps->host.arch) - return caps->guests[i]->arch.id; - } - } - } That attempt to match host.arch is important, otherwise we end up defaulting to i686 on x86_64 host for KVM, which is not intended. Duplicate it in the centralized CapsLookup function. Additionally add some testcases that would have caught this. https://bugzilla.redhat.com/show_bug.cgi?id=1219191 --- v2: Tweak subject add test case for type=qemu as well src/conf/capabilities.c | 63 +++++++++++++++------- .../qemuxml2argv-default-kvm-host-arch.args | 4 ++ .../qemuxml2argv-default-kvm-host-arch.xml | 11 ++++ .../qemuxml2argv-default-qemu-host-arch.args | 4 ++ .../qemuxml2argv-default-qemu-host-arch.xml | 11 ++++ tests/qemuxml2argvtest.c | 2 + .../qemuxml2xmlout-default-kvm-host-arch.xml | 21 ++++++++ .../qemuxml2xmlout-default-qemu-host-arch.xml | 21 ++++++++ tests/qemuxml2xmltest.c | 2 + tests/testutilsqemu.c | 12 +++++ 10 files changed, 132 insertions(+), 19 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-default-qemu-host-arch.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-default-qemu-host-arch.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-default-kvm-host-arch.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-default-qemu-host-arch.xml diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 922741f..c43bfb3 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -607,25 +607,13 @@ virCapsDomainDataCompare(virCapsGuestPtr guest, return true; } -/** - * virCapabilitiesDomainDataLookup: - * @caps: capabilities to query - * @ostype: guest operating system type, of enum VIR_DOMAIN_OSTYPE - * @arch: Architecture to search for - * @domaintype: domain type to search for, of enum VIR_DOMAIN_VIRT - * @emulator: Emulator path to search for - * @machinetype: Machine type to search for - * - * Search capabilities for the passed values, and if found return - * virCapabilitiesDomainDataLookup filled in with the default values - */ -virCapsDomainDataPtr -virCapabilitiesDomainDataLookup(virCapsPtr caps, - int ostype, - virArch arch, - int domaintype, - const char *emulator, - const char *machinetype) +static virCapsDomainDataPtr +virCapabilitiesDomainDataLookupInternal(virCapsPtr caps, + int ostype, + virArch arch, + int domaintype, + const char *emulator, + const char *machinetype) { virCapsGuestPtr foundguest = NULL; virCapsGuestDomainPtr founddomain = NULL; @@ -730,6 +718,43 @@ virCapabilitiesDomainDataLookup(virCapsPtr caps, return ret; } +/** + * virCapabilitiesDomainDataLookup: + * @caps: capabilities to query + * @ostype: guest operating system type, of enum VIR_DOMAIN_OSTYPE + * @arch: Architecture to search for + * @domaintype: domain type to search for, of enum VIR_DOMAIN_VIRT + * @emulator: Emulator path to search for + * @machinetype: Machine type to search for + * + * Search capabilities for the passed values, and if found return + * virCapabilitiesDomainDataLookup filled in with the default values + */ +virCapsDomainDataPtr +virCapabilitiesDomainDataLookup(virCapsPtr caps, + int ostype, + virArch arch, + int domaintype, + const char *emulator, + const char *machinetype) +{ + virCapsDomainDataPtr ret; + + if (arch == VIR_ARCH_NONE) { + /* Prefer host arch if its available */ + ret = virCapabilitiesDomainDataLookupInternal(caps, ostype, + caps->host.arch, + domaintype, + emulator, machinetype); + if (ret) + return ret; + } + + return virCapabilitiesDomainDataLookupInternal(caps, ostype, + arch, domaintype, + emulator, machinetype); +} + static int virCapabilitiesFormatNUMATopology(virBufferPtr buf, size_t ncells, diff --git a/tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.args b/tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.args new file mode 100644 index 0000000..102691f --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.args @@ -0,0 +1,4 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/kvm -S -machine pc,accel=kvm -m 4096 -smp 4 -nographic \ +-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -net none \ +-serial none -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.xml b/tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.xml new file mode 100644 index 0000000..66dead0 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.xml @@ -0,0 +1,11 @@ +<domain type='kvm'> + <name>kvm</name> + <uuid>d091ea82-29e6-2e34-3005-f02617b36e87</uuid> + <memory unit='KiB'>4194304</memory> + <currentMemory unit='KiB'>4194304</currentMemory> + <vcpu placement='static'>4</vcpu> + <os> + <type>hvm</type> + <boot dev='hd'/> + </os> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-default-qemu-host-arch.args b/tests/qemuxml2argvdata/qemuxml2argv-default-qemu-host-arch.args new file mode 100644 index 0000000..5bd404c --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-default-qemu-host-arch.args @@ -0,0 +1,4 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-x86_64 -S -machine pc-0.11,accel=tcg -m 4096 -smp 4 \ +-nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +-usb -net none -serial none -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-default-qemu-host-arch.xml b/tests/qemuxml2argvdata/qemuxml2argv-default-qemu-host-arch.xml new file mode 100644 index 0000000..85ddec5 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-default-qemu-host-arch.xml @@ -0,0 +1,11 @@ +<domain type='qemu'> + <name>qemu-host</name> + <uuid>d091ea82-29e6-2e34-3005-f02617b36e87</uuid> + <memory unit='KiB'>4194304</memory> + <currentMemory unit='KiB'>4194304</currentMemory> + <vcpu placement='static'>4</vcpu> + <os> + <type>hvm</type> + <boot dev='hd'/> + </os> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 97c7fba..d317c9b 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -599,6 +599,8 @@ mymain(void) DO_TEST_FAILURE("machine-xen-vmport-opt", QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_MACHINE_VMPORT_OPT); DO_TEST("kvm", QEMU_CAPS_MACHINE_OPT); + DO_TEST("default-kvm-host-arch", QEMU_CAPS_MACHINE_OPT); + DO_TEST("default-qemu-host-arch", QEMU_CAPS_MACHINE_OPT); DO_TEST("boot-cdrom", NONE); DO_TEST("boot-network", NONE); DO_TEST("boot-floppy", NONE); diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-default-kvm-host-arch.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-default-kvm-host-arch.xml new file mode 100644 index 0000000..30fa66d --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-default-kvm-host-arch.xml @@ -0,0 +1,21 @@ +<domain type='kvm'> + <name>kvm</name> + <uuid>d091ea82-29e6-2e34-3005-f02617b36e87</uuid> + <memory unit='KiB'>4194304</memory> + <currentMemory unit='KiB'>4194304</currentMemory> + <vcpu placement='static'>4</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/kvm</emulator> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-default-qemu-host-arch.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-default-qemu-host-arch.xml new file mode 100644 index 0000000..3e65b97 --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-default-qemu-host-arch.xml @@ -0,0 +1,21 @@ +<domain type='qemu'> + <name>qemu-host</name> + <uuid>d091ea82-29e6-2e34-3005-f02617b36e87</uuid> + <memory unit='KiB'>4194304</memory> + <currentMemory unit='KiB'>4194304</currentMemory> + <vcpu placement='static'>4</vcpu> + <os> + <type arch='x86_64' machine='pc-0.11'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index b611afd..99f402c 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -346,6 +346,8 @@ mymain(void) DO_TEST("minimal"); DO_TEST("machine-core-on"); DO_TEST("machine-core-off"); + DO_TEST_DIFFERENT("default-kvm-host-arch"); + DO_TEST_DIFFERENT("default-qemu-host-arch"); DO_TEST("boot-cdrom"); DO_TEST("boot-network"); DO_TEST("boot-floppy"); diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 14743be..d067bca 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -354,6 +354,18 @@ virCapsPtr testQemuCapsInit(void) NULL) == NULL) goto cleanup; + if ((machines = testQemuAllocMachines(&nmachines)) == NULL) + goto cleanup; + + if (virCapabilitiesAddGuestDomain(guest, + VIR_DOMAIN_VIRT_KVM, + "/usr/bin/qemu-kvm", + NULL, + nmachines, + machines) == NULL) + goto cleanup; + machines = NULL; + if ((machines = testQemuAllocNewerMachines(&nmachines)) == NULL) goto cleanup; -- 2.4.0

2 2

Re: [libvirt] vmfork in KVM
by Zhi Yong Wu 08 May '15

08 May '15

HI, all guys Why does vmfork not get supported by KVM project? What is the drawback? It's very cool if it's used in some scenario, e.g. HPC. It will be appreciated for your comments, thanks. On Fri, Oct 24, 2014 at 2:25 AM, Hu Yaohui <loki2441(a)gmail.com> wrote: > Hi all, > There are some vmfork features provided by Xen based on shadow page > table few years ago. I am wondering whether KVM provides the similar > feature on the same host. > By triggering vmfork, we can get a child VM which CPU and I/O status > is the same as the parent, and the memory is CoW shared with parent > VM. > > Thanks, > Yaohui > -- > To unsubscribe from this list: send the line "unsubscribe kvm" in > the body of a message to majordomo(a)vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- Regards, Zhi Yong Wu

2 1

[libvirt] [PATCH 0/8] virsh: kill blockJobImpl
by Peter Krempa 08 May '15

08 May '15

Move the code to appropriate parts to sanitize control flow. Peter Krempa (8): virsh: blockjob: Extract block job info code into a separate function virsh: cmdBlockJob: Switch to declarative flag interlocking virsh: blockjob: Split out vshBlockJobSetSpeed from blockJobImpl virsh: man: Add missing dashes for blockjob --bandwidth virsh: block job: Support --bytes and scaled integers when setting speed virsh: block job: separate abort from blockJobImpl virsh: Split out block pull implementation from blockJobImpl virsh: Kill blockJobImpl by moving the final impl into cmdBlockCommit tools/virsh-domain.c | 314 +++++++++++++++++++++++++++++---------------------- tools/virsh.pod | 14 ++- 2 files changed, 189 insertions(+), 139 deletions(-) -- 2.3.5

3 18

[libvirt] RFC Parallels driver renaming
by Maxim Nestratov 07 May '15

07 May '15

Hi all, You probably already know that our Parallels business devision responsible for Parallels Cloud Server, which is supported currently in libvirt as a "parallels" driver, was recently renamed to Odin [1]. As a part of this change our Parallels Cloud Server product name was also changed to Virtuozzo [2]. That said, we need to address this change in all publicly available products and projects and libvirt is not an exception. Thus, I intend to do the following renaming: 1. connection uri from "parallels" to "vz", 2. driver directory and source files from "parallels" to "vz", 3. internal names (function prefixes, variable and other names) from "parallels", "prl" to "vz". I would like to request for comments about proposed renamings, if they are affordable? If so, I will send the patch series shortly. Maxim Nestratov --- [1] http://www.odin.com/odin/ [2] http://www.odin.com/products/virtuozzo/#tab4

2 4

[libvirt] [PATCH] tests: Remove redundant aarch64 tests
by Cole Robinson 07 May '15

07 May '15

My commit 7b9de914 added some aarch64 CPU test cases. I wanted to test two different code paths but inadvertently added two of the same test cases. The second code path (using <cpu><model>host</model</cpu>) isn't easily exercised via the qemu tests anyways, I'll need to look elsewhere. Regardless, remove the redundant tests for now --- .../qemuxml2argv-aarch64-cpu-model-host.args | 5 ---- .../qemuxml2argv-aarch64-cpu-model-host.xml | 28 ---------------------- tests/qemuxml2argvtest.c | 3 --- .../qemuxml2argv-aarch64-cpu-passthrough.xml | 27 --------------------- tests/qemuxml2xmltest.c | 2 -- 5 files changed, 65 deletions(-) delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-model-host.args delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-model-host.xml delete mode 100644 tests/qemuxml2xmloutdata/qemuxml2argv-aarch64-cpu-passthrough.xml diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-model-host.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-model-host.args deleted file mode 100644 index 72e6526..0000000 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-model-host.args +++ /dev/null @@ -1,5 +0,0 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-aarch64 -S -M virt -cpu host -m 1024 -smp 1 -nographic \ --nodefconfig -nodefaults -monitor unix:/tmp/test-monitor,server,nowait \ --boot c -usb -drive file=/aarch64.raw,if=none,id=drive-virtio-disk0 \ --device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-model-host.xml b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-model-host.xml deleted file mode 100644 index 53d528f..0000000 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-model-host.xml +++ /dev/null @@ -1,28 +0,0 @@ -<domain type='kvm'> - <name>aarch64test</name> - <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid> - <memory unit='KiB'>1048576</memory> - <currentMemory unit='KiB'>1048576</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='aarch64' machine='virt'>hvm</type> - <boot dev='hd'/> - </os> - <features> - <acpi/> - <apic/> - <pae/> - </features> - <cpu mode='host-passthrough'/> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>restart</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-aarch64</emulator> - <disk type='file' device='disk'> - <source file='/aarch64.raw'/> - <target dev='vda' bus='virtio'/> - </disk> - </devices> -</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 97c7fba..aa15822 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1538,9 +1538,6 @@ mymain(void) DO_TEST("aarch64-cpu-passthrough", QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_CPU_HOST, QEMU_CAPS_KVM); - DO_TEST("aarch64-cpu-model-host", QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE, - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_VIRTIO_MMIO, - QEMU_CAPS_CPU_HOST, QEMU_CAPS_KVM); DO_TEST("aarch64-gic", QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE, QEMU_CAPS_KVM); diff --git a/tests/qemuxml2xmloutdata/qemuxml2argv-aarch64-cpu-passthrough.xml b/tests/qemuxml2xmloutdata/qemuxml2argv-aarch64-cpu-passthrough.xml deleted file mode 100644 index 4cdf387..0000000 --- a/tests/qemuxml2xmloutdata/qemuxml2argv-aarch64-cpu-passthrough.xml +++ /dev/null @@ -1,27 +0,0 @@ -<domain type="kvm"> - <name>aarch64test</name> - <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid> - <memory>1048576</memory> - <currentMemory>1048576</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch="aarch64" machine="virt">hvm</type> - </os> - <features> - <acpi/> - <apic/> - <pae/> - </features> - <cpu mode='host-passthrough'/> - <clock offset="utc"/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>restart</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-aarch64</emulator> - <disk type='file' device='disk'> - <source file='/aarch64.raw'/> - <target dev='vda' bus='virtio'/> - </disk> - </devices> -</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index b611afd..d418776 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -614,8 +614,6 @@ mymain(void) DO_TEST("memory-hotplug-nonuma"); DO_TEST("memory-hotplug-dimm"); - DO_TEST("aarch64-cpu-model-host"); - virObjectUnref(driver.caps); virObjectUnref(driver.xmlopt); -- 2.4.0

2 2

[libvirt] [PATCH 0/4] Enable support for s390 crypto key mgmt operations
by akrowiak＠linux.vnet.ibm.com 07 May '15

07 May '15

From: Tony Krowiak <akrowiak(a)linux.vnet.ibm.com> The IBM System z Central Processor Assist for Cryptographic Functions (CPACF) hardware provides a set of CPU instructions for use in clear-key encryption, pseudo random number generation, hash functions, and protected-key encryption. The CPACF protected key cryptographic functions operate with a protected key which is encrypted under a unique wrapping key that is stored in the Hardware System Area (HSA) of the machine and can only be accessed by firmware. The wrapping key cannot be accessed by the operating system or application programs. There are two wrapping keys: One for wrapping AES keys and one for wrapping DES/TDES keys. This patch set enables the support for encrypting clear keys under the AES and DES/TDES wrapping keys for guests started on hosts running on s390 hardware that supports key wrapping. Tony Krowiak (4): libvirt: docs: XML to enable/disable protected key mgmt ops libvirt: conf: parse XML for protected key management ops libvirt: qemu: enable/disable protected key management ops libvirt: tests: test protected key mgmt ops support

1 4

[libvirt] [PATCH] cpu_conf: properly escape characters for model and vendor
by Pavel Hrdina 07 May '15

07 May '15

We should escape strings for those two elements to be consistent along the whole XML. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1197580 Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/conf/cpu_conf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index e959ecc..34725c0 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -547,14 +547,14 @@ virCPUDefFormatBuf(virBufferPtr buf, virBufferAsprintf(buf, " vendor_id='%s'", def->vendor_id); } if (formatModel && def->model) { - virBufferAsprintf(buf, ">%s</model>\n", def->model); + virBufferEscapeString(buf, ">%s</model>\n", def->model); } else { virBufferAddLit(buf, "/>\n"); } } if (formatModel && def->vendor) - virBufferAsprintf(buf, "<vendor>%s</vendor>\n", def->vendor); + virBufferEscapeString(buf, "<vendor>%s</vendor>\n", def->vendor); if (def->sockets && def->cores && def->threads) { virBufferAddLit(buf, "<topology"); -- 2.3.6

2 2

[libvirt] [PATCH v2] processSerialChangedEvent: Close agent monitor early
by Michal Privoznik 07 May '15

07 May '15

https://bugzilla.redhat.com/show_bug.cgi?id=890648 So, imagine you've issued an API that involves guest agent. For instance, you want to query guest's IP addresses. So the API acquires QUERY_JOB, locks the guest agent and issues the agent command. However, for some reason, guest agent replies to initial ping correctly, but then crashes tragically while executing real command (in this case guest-network-get-interfaces). Since initial ping went well, libvirt thinks guest agent is accessible and awaits reply to the real command. But it will never come. What will is a monitor event. Our handler (processSerialChangedEvent) will try to acquire MODIFY_JOB, which will fail obviously because the other thread that's executing the API already holds a job. So the event handler exits early, and the QUERY_JOB is never released nor ended. The way how to solve this is to put flag somewhere in the monitor internals. The flag is called @running and agent commands are issued iff the flag is set. The flag itself is set when we connect to the agent socket. And unset whenever we see DISCONNECT event from the agent. Moreover, we must wake up all the threads waiting for the agent. This is done by signalizing the condition they're waiting on. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- diff to v1: - introduced @running flag to produce prettier error message src/qemu/qemu_agent.c | 53 ++++++++++++++++++++++++++++++++++++++++++-------- src/qemu/qemu_agent.h | 2 ++ src/qemu/qemu_driver.c | 8 ++++++++ 3 files changed, 55 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 3f6a9bf..fc23c41 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -92,6 +92,7 @@ struct _qemuAgent { int watch; bool connectPending; + bool running; virDomainObjPtr vm; @@ -772,6 +773,7 @@ qemuAgentOpen(virDomainObjPtr vm, goto cleanup; } + mon->running = true; VIR_DEBUG("New mon %p fd =%d watch=%d", mon, mon->fd, mon->watch); return mon; @@ -788,6 +790,36 @@ qemuAgentOpen(virDomainObjPtr vm, } +static void +qemuAgentNotifyCloseLocked(qemuAgentPtr mon) +{ + if (mon) { + mon->running = false; + + /* If there is somebody waiting for a message + * wake him up. No message will arrive anyway. */ + if (mon->msg && !mon->msg->finished) { + mon->msg->finished = 1; + virCondSignal(&mon->notify); + } + } +} + + +void +qemuAgentNotifyClose(qemuAgentPtr mon) +{ + if (!mon) + return; + + VIR_DEBUG("mon=%p", mon); + + virObjectLock(mon); + qemuAgentNotifyCloseLocked(mon); + virObjectUnlock(mon); +} + + void qemuAgentClose(qemuAgentPtr mon) { if (!mon) @@ -803,12 +835,7 @@ void qemuAgentClose(qemuAgentPtr mon) VIR_FORCE_CLOSE(mon->fd); } - /* If there is somebody waiting for a message - * wake him up. No message will arrive anyway. */ - if (mon->msg && !mon->msg->finished) { - mon->msg->finished = 1; - virCondSignal(&mon->notify); - } + qemuAgentNotifyCloseLocked(mon); virObjectUnlock(mon); virObjectUnref(mon); @@ -1087,6 +1114,12 @@ qemuAgentCommand(qemuAgentPtr mon, *reply = NULL; + if (!mon->running) { + virReportError(VIR_ERR_AGENT_UNRESPONSIVE, "%s", + _("Guest agent disappeared while executing command")); + return -1; + } + if (qemuAgentGuestSync(mon) < 0) return -1; @@ -1112,8 +1145,12 @@ qemuAgentCommand(qemuAgentPtr mon, if (await_event && !needReply) { VIR_DEBUG("Woken up by event %d", await_event); } else { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Missing monitor reply object")); + if (mon->running) + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Missing monitor reply object")); + else + virReportError(VIR_ERR_AGENT_UNRESPONSIVE, "%s", + _("Guest agent disappeared while executing command")); ret = -1; } } else { diff --git a/src/qemu/qemu_agent.h b/src/qemu/qemu_agent.h index 1cd5749..988228b 100644 --- a/src/qemu/qemu_agent.h +++ b/src/qemu/qemu_agent.h @@ -49,6 +49,8 @@ qemuAgentPtr qemuAgentOpen(virDomainObjPtr vm, void qemuAgentClose(qemuAgentPtr mon); +void qemuAgentNotifyClose(qemuAgentPtr mon); + typedef enum { QEMU_AGENT_EVENT_NONE = 0, QEMU_AGENT_EVENT_SHUTDOWN, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 537797e..f40ccae 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4480,6 +4480,14 @@ processSerialChangedEvent(virQEMUDriverPtr driver, VIR_DEBUG("Changing serial port state %s in domain %p %s", devAlias, vm, vm->def->name); + if (newstate == VIR_DOMAIN_CHR_DEVICE_STATE_DISCONNECTED && + virDomainObjIsActive(vm) && priv->agent) { + /* Close agent monitor early, so that other threads + * waiting for the agent to reply can finish and our + * job we acquire below can succeed. */ + qemuAgentNotifyClose(priv->agent); + } + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) goto cleanup; -- 2.3.6

2 2

[libvirt] storage volume download/upload
by Vasiliy Tolstov 07 May '15

07 May '15

As i see in some cases, for example in case of lvm storage pool libvirt spawns libvirt_iohelper to upload or download data to volume. But in case of big data contains zeroes this is wast bw of network. May be we can use gzip or lz4 for compression stream? How the best do this not breaking exiting software? May be add new parameter to libvirt_iohelper with compression method and compression level? In my cases of 20-160 Gb data and used only 4-5 Gb this provide major benefit.... Thanks! -- Vasiliy Tolstov, e-mail: v.tolstov(a)selfip.ru jabber: vase(a)selfip.ru

2 4

[libvirt] [RFC PATCH] network: add an option to disable dnsmasq's bind-dynamic
by Cédric Bosdonnat 07 May '15

07 May '15

When building vlans on top of veth networks, dnsmasq doesn't catch DNS requests on the vlans interfaces. Allowing to disable the bind-dynamic helps this use case. --- src/conf/network_conf.c | 12 ++++++++++++ src/conf/network_conf.h | 1 + src/network/bridge_driver.c | 3 ++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index f4a9df0..63e26e1 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1987,6 +1987,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) xmlNodePtr forwardNode = NULL; char *ipv6nogwStr = NULL; char *trustGuestRxFilters = NULL; + char *binddynamicStr = NULL; xmlNodePtr save = ctxt->node; xmlNodePtr bandwidthNode = NULL; xmlNodePtr vlanNode; @@ -2049,6 +2050,16 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) VIR_FREE(trustGuestRxFilters); } + /* Default for binddynamic is on */ + def->binddynamic = true; + binddynamicStr = virXPathString("string(./@binddynamic)", ctxt); + if (binddynamicStr) { + if (STRNEQ(binddynamicStr, "no")) { + def->binddynamic = false; + } + VIR_FREE(binddynamicStr); + } + /* Parse network domain information */ def->domain = virXPathString("string(./domain[1]/@name)", ctxt); tmp = virXPathString("string(./domain[1]/@localOnly)", ctxt); @@ -2326,6 +2337,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) VIR_FREE(ipNodes); VIR_FREE(portGroupNodes); VIR_FREE(ipv6nogwStr); + VIR_FREE(binddynamicStr); VIR_FREE(trustGuestRxFilters); ctxt->node = save; return NULL; diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index f69d999..163581e 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -253,6 +253,7 @@ struct _virNetworkDef { virNetDevBandwidthPtr bandwidth; virNetDevVlan vlan; int trustGuestRxFilters; /* enum virTristateBool */ + bool binddynamic; /* to force off bind_dynamic option of dnsmasq */ }; typedef struct _virNetworkObj virNetworkObj; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index d195085..5dddc4b 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -988,7 +988,8 @@ networkDnsmasqConfContents(virNetworkObjPtr network, /* dnsmasq will *always* listen on localhost unless told otherwise */ virBufferAddLit(&configbuf, "except-interface=lo\n"); - if (dnsmasqCapsGet(caps, DNSMASQ_CAPS_BIND_DYNAMIC)) { + if (network->def->binddynamic && + dnsmasqCapsGet(caps, DNSMASQ_CAPS_BIND_DYNAMIC)) { /* using --bind-dynamic with only --interface (no * --listen-address) prevents dnsmasq from responding to dns * queries that arrive on some interface other than our bridge -- 2.1.4

3 2

[libvirt] [PATCH] caps: Don't default to i686 of KVM on x86_64
by Cole Robinson 07 May '15

07 May '15

My commit 747761a79 (v1.2.15 only) dropped this bit of logic when filling in a default arch in the XML: - /* First try to find one matching host arch */ - for (i = 0; i < caps->nguests; i++) { - if (caps->guests[i]->ostype == ostype) { - for (j = 0; j < caps->guests[i]->arch.ndomains; j++) { - if (caps->guests[i]->arch.domains[j]->type == domain && - caps->guests[i]->arch.id == caps->host.arch) - return caps->guests[i]->arch.id; - } - } - } That attempt to match host.arch is important, otherwise we end up defaulting to i686 on x86_64 host for KVM, which is not intended. Duplicate it in the centralized CapsLookup function. Additionally add some testcases that would have caught this. https://bugzilla.redhat.com/show_bug.cgi?id=1219191 --- src/conf/capabilities.c | 63 +++++++++++++++------- .../qemuxml2argv-default-kvm-host-arch.args | 4 ++ .../qemuxml2argv-default-kvm-host-arch.xml | 11 ++++ tests/qemuxml2argvtest.c | 1 + .../qemuxml2xmlout-default-kvm-host-arch.xml | 21 ++++++++ tests/qemuxml2xmltest.c | 1 + tests/testutilsqemu.c | 12 +++++ 7 files changed, 94 insertions(+), 19 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-default-kvm-host-arch.xml diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 922741f..c43bfb3 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -607,25 +607,13 @@ virCapsDomainDataCompare(virCapsGuestPtr guest, return true; } -/** - * virCapabilitiesDomainDataLookup: - * @caps: capabilities to query - * @ostype: guest operating system type, of enum VIR_DOMAIN_OSTYPE - * @arch: Architecture to search for - * @domaintype: domain type to search for, of enum VIR_DOMAIN_VIRT - * @emulator: Emulator path to search for - * @machinetype: Machine type to search for - * - * Search capabilities for the passed values, and if found return - * virCapabilitiesDomainDataLookup filled in with the default values - */ -virCapsDomainDataPtr -virCapabilitiesDomainDataLookup(virCapsPtr caps, - int ostype, - virArch arch, - int domaintype, - const char *emulator, - const char *machinetype) +static virCapsDomainDataPtr +virCapabilitiesDomainDataLookupInternal(virCapsPtr caps, + int ostype, + virArch arch, + int domaintype, + const char *emulator, + const char *machinetype) { virCapsGuestPtr foundguest = NULL; virCapsGuestDomainPtr founddomain = NULL; @@ -730,6 +718,43 @@ virCapabilitiesDomainDataLookup(virCapsPtr caps, return ret; } +/** + * virCapabilitiesDomainDataLookup: + * @caps: capabilities to query + * @ostype: guest operating system type, of enum VIR_DOMAIN_OSTYPE + * @arch: Architecture to search for + * @domaintype: domain type to search for, of enum VIR_DOMAIN_VIRT + * @emulator: Emulator path to search for + * @machinetype: Machine type to search for + * + * Search capabilities for the passed values, and if found return + * virCapabilitiesDomainDataLookup filled in with the default values + */ +virCapsDomainDataPtr +virCapabilitiesDomainDataLookup(virCapsPtr caps, + int ostype, + virArch arch, + int domaintype, + const char *emulator, + const char *machinetype) +{ + virCapsDomainDataPtr ret; + + if (arch == VIR_ARCH_NONE) { + /* Prefer host arch if its available */ + ret = virCapabilitiesDomainDataLookupInternal(caps, ostype, + caps->host.arch, + domaintype, + emulator, machinetype); + if (ret) + return ret; + } + + return virCapabilitiesDomainDataLookupInternal(caps, ostype, + arch, domaintype, + emulator, machinetype); +} + static int virCapabilitiesFormatNUMATopology(virBufferPtr buf, size_t ncells, diff --git a/tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.args b/tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.args new file mode 100644 index 0000000..102691f --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.args @@ -0,0 +1,4 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/kvm -S -machine pc,accel=kvm -m 4096 -smp 4 -nographic \ +-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -net none \ +-serial none -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.xml b/tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.xml new file mode 100644 index 0000000..66dead0 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.xml @@ -0,0 +1,11 @@ +<domain type='kvm'> + <name>kvm</name> + <uuid>d091ea82-29e6-2e34-3005-f02617b36e87</uuid> + <memory unit='KiB'>4194304</memory> + <currentMemory unit='KiB'>4194304</currentMemory> + <vcpu placement='static'>4</vcpu> + <os> + <type>hvm</type> + <boot dev='hd'/> + </os> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 97c7fba..b27e3a4 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -599,6 +599,7 @@ mymain(void) DO_TEST_FAILURE("machine-xen-vmport-opt", QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_MACHINE_VMPORT_OPT); DO_TEST("kvm", QEMU_CAPS_MACHINE_OPT); + DO_TEST("default-kvm-host-arch", QEMU_CAPS_MACHINE_OPT); DO_TEST("boot-cdrom", NONE); DO_TEST("boot-network", NONE); DO_TEST("boot-floppy", NONE); diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-default-kvm-host-arch.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-default-kvm-host-arch.xml new file mode 100644 index 0000000..30fa66d --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-default-kvm-host-arch.xml @@ -0,0 +1,21 @@ +<domain type='kvm'> + <name>kvm</name> + <uuid>d091ea82-29e6-2e34-3005-f02617b36e87</uuid> + <memory unit='KiB'>4194304</memory> + <currentMemory unit='KiB'>4194304</currentMemory> + <vcpu placement='static'>4</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/kvm</emulator> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index b611afd..a21a299 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -346,6 +346,7 @@ mymain(void) DO_TEST("minimal"); DO_TEST("machine-core-on"); DO_TEST("machine-core-off"); + DO_TEST_DIFFERENT("default-kvm-host-arch"); DO_TEST("boot-cdrom"); DO_TEST("boot-network"); DO_TEST("boot-floppy"); diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 14743be..d067bca 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -354,6 +354,18 @@ virCapsPtr testQemuCapsInit(void) NULL) == NULL) goto cleanup; + if ((machines = testQemuAllocMachines(&nmachines)) == NULL) + goto cleanup; + + if (virCapabilitiesAddGuestDomain(guest, + VIR_DOMAIN_VIRT_KVM, + "/usr/bin/qemu-kvm", + NULL, + nmachines, + machines) == NULL) + goto cleanup; + machines = NULL; + if ((machines = testQemuAllocNewerMachines(&nmachines)) == NULL) goto cleanup; -- 2.4.0

3 2

[libvirt] [PATCH] processSerialChangedEvent: Close agent monitor early
by Michal Privoznik 07 May '15

07 May '15

https://bugzilla.redhat.com/show_bug.cgi?id=890648 So, imagine you've issued an API that involves guest agent. For instance, you want to query guest's IP addresses. So the API acquires QUERY_JOB, locks the guest agent and issues the agemt command. However, for some reason, guest agent replies to initial ping correctly, but then crashes tragically while executing real command (in this case guest-network-get-interfaces). Since initial ping went well, libvirt thinks guest agent is accessible and awaits reply to the real command. But it will never come. What will is a monitor event. Our handler (processSerialChangedEvent) will try to acquire MODIFY_JOB, which will fail obviously because the other thread that's executing the API already holds a job. So the event handler exits early, and the QUERY_JOB is never released nor ended. I don't understand why, but qemu should in fact instead of sending a event on the monitor close the socket. But leave that for a different discussion. Since qemu is not doing that, we must work around it and close and unregister the agent's FD from the even loop ourselves. This will wake up all callers stuck in waiting for agent's reply. Hopefully, it will make them finish the job too and even handler can acquire its job later. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_driver.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d173aa1..becb6ae 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4480,6 +4480,14 @@ processSerialChangedEvent(virQEMUDriverPtr driver, VIR_DEBUG("Changing serial port state %s in domain %p %s", devAlias, vm, vm->def->name); + if (newstate == VIR_DOMAIN_CHR_DEVICE_STATE_DISCONNECTED && + virDomainObjIsActive(vm) && priv->agent) { + /* Close agent monitor early, so that other threads + * waiting for the agent to reply can finish and our + * job we acquire below can succeed. */ + qemuAgentClose(priv->agent); + } + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) goto cleanup; @@ -4508,7 +4516,6 @@ processSerialChangedEvent(virQEMUDriverPtr driver, } } else { if (priv->agent) { - qemuAgentClose(priv->agent); priv->agent = NULL; priv->agentError = false; } -- 2.3.6

3 4

[libvirt] [PATCH] libxl: include a XLU_Config in _libxlDriverConfig
by Olaf Hering 07 May '15

07 May '15

Upcoming changes for vscsi will use libxlutil.so to prepare the configuration for libxl. The helpers needs a xlu struct for logging. Provide one and reuse the existing output as log target. Signed-off-by: Olaf Hering <olaf(a)aepfle.de> Cc: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_conf.c | 6 ++++++ src/libxl/libxl_conf.h | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 53f327b..f9bb5ed 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1454,6 +1454,12 @@ libxlDriverConfigNew(void) goto error; } + cfg->xlu = xlu_cfg_init(cfg->logger_file, "libvirt"); + if (!cfg->xlu) { + VIR_ERROR(_("cannot create xlu for libxenlight, disabling driver")); + goto error; + } + if (libxl_ctx_alloc(&cfg->ctx, LIBXL_VERSION, 0, cfg->logger)) { VIR_ERROR(_("cannot initialize libxenlight context, probably not " "running in a Xen Dom0, disabling driver")); diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h index 5ba1a71..bdc68d4 100644 --- a/src/libxl/libxl_conf.h +++ b/src/libxl/libxl_conf.h @@ -27,6 +27,12 @@ # define LIBXL_CONF_H # include <libxl.h> +#ifdef HAVE_LIBXLUTIL_H +# include <libxlutil.h> +#else +typedef struct XLU_Config XLU_Config; +XLU_Config *xlu_cfg_init(FILE *report, const char *report_filename); +#endif # include "internal.h" # include "libvirt_internal.h" @@ -91,6 +97,7 @@ struct _libxlDriverConfig { /* log stream for driver-wide libxl ctx */ FILE *logger_file; xentoollog_logger *logger; + XLU_Config *xlu; /* libxl ctx for driver wide ops; getVersion, getNodeInfo, ... */ libxl_ctx *ctx;

3 9

[libvirt] [PATCH 0/2] Storage : Fixes for cloning raw volumes
by Prerna Saxena 06 May '15

06 May '15

From: Prerna Saxena <prerna(a)linux.vnet.ibm.com> Date: Mon, 4 May 2015 12:00:46 -0700 This series has some long-overdue fixes for copying of raw storage volumes with libvirt. Prerna Saxena (2): Storage : Suppress metadata refresh for volumes being built. Storage : Fix cloning of raw, sparse volumes. src/storage/storage_backend.c | 5 ++++- src/storage/storage_driver.c | 5 ----- 2 files changed, 4 insertions(+), 6 deletions(-) -- 1.8.3.1 -- Prerna Saxena Linux Technology Centre, IBM Systems and Technology Lab, Bangalore, India

3 9

[libvirt] [PATCH] lxc: don't up the veth interfaces unless explicitly asked to
by Lubomir Rintel 06 May '15

06 May '15

Upping an interface for no reason and not configuring it is a cardinal sin. With the default addrgenmode if eui64 it sticks a link-local address to the interface. That is not good, as NetworkManager would see an address configured, assume the interface is already configured and won't touch it iself and the interface might stay unconfigured until the end of the days. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1124721 --- src/lxc/lxc_container.c | 2 +- src/lxc/lxc_native.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index cc20b6d..50e38e9 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -541,7 +541,7 @@ static int lxcContainerRenameAndEnableInterfaces(virDomainDefPtr vmDef, VIR_FREE(ipStr); } - if (netDef->linkstate != VIR_DOMAIN_NET_INTERFACE_LINK_STATE_DOWN) { + if (netDef->linkstate == VIR_DOMAIN_NET_INTERFACE_LINK_STATE_UP) { VIR_DEBUG("Enabling %s", newname); rc = virNetDevSetOnline(newname, true); if (rc < 0) diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index c15eb19..2297dbe 100644 --- a/src/lxc/lxc_native.c +++ b/src/lxc/lxc_native.c @@ -348,12 +348,10 @@ lxcCreateNetDef(const char *type, if (VIR_ALLOC(net) < 0) goto error; - if (flag) { - if (STREQ(flag, "up")) - net->linkstate = VIR_DOMAIN_NET_INTERFACE_LINK_STATE_UP; - else - net->linkstate = VIR_DOMAIN_NET_INTERFACE_LINK_STATE_DOWN; - } + if (flag && STREQ(flag, "up")) + net->linkstate = VIR_DOMAIN_NET_INTERFACE_LINK_STATE_UP; + else + net->linkstate = VIR_DOMAIN_NET_INTERFACE_LINK_STATE_DOWN; if (VIR_STRDUP(net->ifname_guest, name) < 0) goto error; -- 2.1.0

3 3

[libvirt] [PATCH] qemu: multiqueue for ccw devices
by Boris Fiuczynski 06 May '15

06 May '15

Allow ccw devices to be used with multiqueues. Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com> Reviewed-by: Matthew Rosato <mjrosato(a)linux.vnet.ibm.com> Reviewed-by: Daniel Hansel <daniel.hansel(a)linux.vnet.ibm.com> Reviewed-by: Cornelia Huck <cornelia.huck(a)de.ibm.comCornelia Huck <cornelia.huck(a)de.ibm.com>> --- src/qemu/qemu_command.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 2137985..0205831 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5062,9 +5062,13 @@ qemuBuildNicDevStr(virDomainDefPtr def, } } if (usingVirtio && vhostfdSize > 1) { - /* As advised at http://www.linux-kvm.org/page/Multiqueue - * we should add vectors=2*N+2 where N is the vhostfdSize */ - virBufferAsprintf(&buf, ",mq=on,vectors=%zu", 2 * vhostfdSize + 2); + if (net->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) { + virBufferAsprintf(&buf, ",mq=on"); + } else { + /* As advised at http://www.linux-kvm.org/page/Multiqueue + * we should add vectors=2*N+2 where N is the vhostfdSize */ + virBufferAsprintf(&buf, ",mq=on,vectors=%zu", 2 * vhostfdSize + 2); + } } if (vlan == -1) virBufferAsprintf(&buf, ",netdev=host%s", net->info.alias); -- 2.3.0

2 5

[libvirt] [PATCH] qemuDomainShutdownFlags: check for domain activeness prior to guest presence
by Michal Privoznik 06 May '15

06 May '15

Running shutdown with mode agent on a shutoff domain gives cryptic error message: virsh # shutdown --mode agent gentoo error: Failed to shutdown domain gentoo error: Guest agent is not responding: QEMU guest agent is not connected After this patch, the error is more clear: virsh # shutdown --mode agent gentoo error: Failed to shutdown domain gentoo error: Requested operation is not valid: domain is not running Reported-by: Martin Kletzander <mkletzan(a)redhat.com> Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_driver.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d173aa1..537797e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1989,21 +1989,21 @@ static int qemuDomainShutdownFlags(virDomainPtr dom, unsigned int flags) if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) goto cleanup; + if (!virDomainObjIsActive(vm)) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain is not running")); + goto endjob; + } + agentForced = agentRequested && !acpiRequested; if (!qemuDomainAgentAvailable(vm, agentForced)) { if (agentForced) goto endjob; useAgent = false; } - if (!virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("domain is not running")); - goto endjob; - } - qemuDomainSetFakeReboot(driver, vm, isReboot); if (useAgent) { qemuDomainObjEnterAgent(vm); -- 2.3.6

2 1

[libvirt] [PATCH] virsh: fix no error output when parse cpulist fail
by Luyao Huang 06 May '15

06 May '15

When we pass a invalid cpulist or the lastcpu in the cpulist exceed the maxcpu, we cannot get any error. like this: # virsh vcpupin test3 1 aaa # virsh vcpupin test3 1 1000 Because virBitmapParse() use virReportError() to set the error message, virsh client use vshError to output error. If we want get the error which set by virReportError(), we need virGetLastError/virGetLastErrorMessage to help us. However instead of do this, i chose use vshError to output error when parse failed. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- tools/virsh-domain.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 14e1e35..64bfbfd 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6362,9 +6362,7 @@ vshParseCPUList(int *cpumaplen, const char *cpulist, int maxcpu) return NULL; } - if (virBitmapToData(map, &cpumap, cpumaplen) < 0) - goto cleanup; - + virBitmapToData(map, &cpumap, cpumaplen); cleanup: virBitmapFree(map); return cpumap; @@ -6458,8 +6456,10 @@ cmdVcpuPin(vshControl *ctl, const vshCmd *cmd) } } else { /* Pin mode: pinning specified vcpu to specified physical cpus*/ - if (!(cpumap = vshParseCPUList(&cpumaplen, cpulist, maxcpu))) + if (!(cpumap = vshParseCPUList(&cpumaplen, cpulist, maxcpu))) { + vshError(ctl, _("vcpupin: invalid cpulist '%s'"), cpulist); goto cleanup; + } if (flags == -1) { if (virDomainPinVcpu(dom, vcpu, cpumap, cpumaplen) != 0) @@ -6577,8 +6577,10 @@ cmdEmulatorPin(vshControl *ctl, const vshCmd *cmd) } /* Pin mode: pinning emulator threads to specified physical cpus*/ - if (!(cpumap = vshParseCPUList(&cpumaplen, cpulist, maxcpu))) + if (!(cpumap = vshParseCPUList(&cpumaplen, cpulist, maxcpu))) { + vshError(ctl, _("emulatorpin: invalid cpulist '%s'"), cpulist); goto cleanup; + } if (flags == -1) flags = VIR_DOMAIN_AFFECT_LIVE; @@ -6854,16 +6856,14 @@ cmdIOThreadPin(vshControl *ctl, const vshCmd *cmd) goto cleanup; } - if (vshCommandOptString(cmd, "cpulist", &cpulist) < 0) { - vshError(ctl, "%s", _("iothreadpin: invalid cpulist.")); - goto cleanup; - } - if ((maxcpu = vshNodeGetCPUCount(ctl->conn)) < 0) goto cleanup; - if (!(cpumap = vshParseCPUList(&cpumaplen, cpulist, maxcpu))) + if ((vshCommandOptString(cmd, "cpulist", &cpulist) < 0) || + !(cpumap = vshParseCPUList(&cpumaplen, cpulist, maxcpu))) { + vshError(ctl, "%s", _("iothreadpin: invalid cpulist.")); goto cleanup; + } if (virDomainPinIOThread(dom, iothread_id, cpumap, cpumaplen, flags) != 0) -- 1.8.3.1

2 2

[libvirt] [PATCH] libxl: initialize vfb defbools in libxlMakeVfb
by Olaf Hering 06 May '15

06 May '15

If the domU configu has sdl enabled libvirtd crashes: libvirtd[5158]: libvirtd: libxl.c:343: libxl_defbool_val: Assertion `!libxl_defbool_is_default(db)' failed. Initialize the relevant defbool variables in libxl_device_vfb. Signed-off-by: Olaf Hering <olaf(a)aepfle.de> Cc: Jim Fehlig <jfehlig(a)suse.com> --- Seen in 1.2.14. src/libxl/libxl_conf.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 9b3c949..6feb7d9 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1232,6 +1232,7 @@ libxlMakeVfb(virPortAllocatorPtr graphicsports, switch (l_vfb->type) { case VIR_DOMAIN_GRAPHICS_TYPE_SDL: libxl_defbool_set(&x_vfb->sdl.enable, 1); + libxl_defbool_set(&x_vfb->vnc.enable, 0); if (VIR_STRDUP(x_vfb->sdl.display, l_vfb->data.sdl.display) < 0) return -1; if (VIR_STRDUP(x_vfb->sdl.xauthority, l_vfb->data.sdl.xauth) < 0) @@ -1239,6 +1240,7 @@ libxlMakeVfb(virPortAllocatorPtr graphicsports, break; case VIR_DOMAIN_GRAPHICS_TYPE_VNC: libxl_defbool_set(&x_vfb->vnc.enable, 1); + libxl_defbool_set(&x_vfb->sdl.enable, 0); /* driver handles selection of free port */ libxl_defbool_set(&x_vfb->vnc.findunused, 0); if (l_vfb->data.vnc.autoport) {

3 21

Re: [libvirt] [Qemu-devel] [Qemu-block] [RFC] Differential Backups
by Stefan Hajnoczi 06 May '15

06 May '15

On Tue, May 05, 2015 at 11:55:49AM -0400, John Snow wrote: > On 05/05/2015 06:25 AM, Stefan Hajnoczi wrote: > >On Wed, Apr 29, 2015 at 06:51:08PM -0400, John Snow wrote: > >>This is a feature that should be very easy to add on top of the existing > >>incremental feature, since it's just a difference in how the bitmap is > >>treated: > >> > >>Incremental > >>- Links to the last incremental (managed by libvirt) > >>- Clears the bitmap after creation > >> > >>Differential: > >>- Links to the last full backup always (managed by libvirt) > >>- Does not clear the bitmap after creation > >> > >>No biggie. > > > >Differential backups can be done using incremental backup functionality > >in QEMU: > > > >The client application points QEMU to the same target repeatedly instead > >of keeping separate incremental backups. > > > >Stefan > > > > Oh, so you're saying: > > [anchor]<--[diff1] > > And then when making a new incremental, we re-use diff1 as a target and > overwrite it so that it becomes: > > [anchor]<--[diff2] > > In effect giving us a differential. > > OK, so it's possible, but we still lose out on some flexibility that a > slightly different mode would provide us, like the ability to keep multiple > differentials if desired. (Well, I suppose we *can* create those by manually > copying differentials after we create them, but that seems hackier than > necessary.) > > Still, it would be such a paltry few lines of code and introduce no real > complexity to the subsystem, and it might make libvirt's time a little > easier for managing such things. I have CCed Eric Blake and the libvirt mailing list. This is a good time to discuss libvirt requirements for backup APIs. Current work for QEMU 2.4: * QMP command to take incremental backup of guest disks in a single atomic operation * Dirty bitmap persistence across live migration and QEMU restart Eric: Do you have any opinion on a differential backup feature in addition to incremental backup. My thoughts are that QEMU should only copy out changed blocks and let the backup application worry about concepts like incremental vs differential. From a host performance perspective, copying out the same blocks that have already been sent in a previous backup is a waste of I/O bandwidth. Even backup applications that want differential backup may not actually use the QEMU feature for this reason. Regarding the size of the patch, there's a cost to adding the tests, documentation, and commiting to QMP APIs. These costs dwarf the small code change that preserves the dirty bitmap. If there's a concrete requirement for this feature then I'm happy with it, but let's not add bells and whistles just because we can. Stefan

1 0

[libvirt] [PATCH] test: remove s390 tests used only for testing usb and ide controllers
by Laine Stump 05 May '15

05 May '15

Back in 2013, commit 877bc089 added in some tests that made sure no error was generated on a domain definition that had an automatically added usb controller if that domain didn't have a PCI bus to attach the usb controller to. In particular, two s390-specific tests were added, one with <controller type='usb' model='none'/> and another (called "s390-piix-controllers") that had both usb and ide controllers, but nothing attached to them. Then in February of this year, commit 09ab9dcc eliminated the annoying auto-adding of a usb device for s390 and s390x machines, stating: "Since s390 does not support usb the default creation of a usb controller for a domain should not occur." Since s390 doesn't support usb and usb controllers aren't added to s390 domain definitions automatically, there is no reason to have the tests with a usb controller and expect them to succeed. And since the only reference of an IDE controller wrt s390 that I've found is in the one test case mentioned above, and the commit log that added it specifically mentions the purpose to be quieting error messages on machines with no PCI bus, I'm assuming that the s390 also doesn't support IDE controllers. Based on that reasoning (and the fact that s390-piix-controllers causes a test error for an upcoming patch), this patch removes those two tests. --- .../qemuxml2argv-s390-piix-controllers.args | 12 -------- .../qemuxml2argv-s390-piix-controllers.xml | 34 ---------------------- .../qemuxml2argv-s390-usb-none.args | 12 -------- .../qemuxml2argv-s390-usb-none.xml | 29 ------------------ tests/qemuxml2argvtest.c | 10 ------- 5 files changed, 97 deletions(-) delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-s390-piix-controllers.args delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-s390-piix-controllers.xml delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-s390-usb-none.args delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-s390-usb-none.xml diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-piix-controllers.args b/tests/qemuxml2argvdata/qemuxml2argv-s390-piix-controllers.args deleted file mode 100644 index e939be4..0000000 --- a/tests/qemuxml2argvdata/qemuxml2argv-s390-piix-controllers.args +++ /dev/null @@ -1,12 +0,0 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-s390x -S -M s390-virtio -m 214 -smp 1 -nographic \ --nodefconfig -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ --mon chardev=charmonitor,id=monitor,mode=readline -no-acpi \ --device virtio-serial-s390,id=virtio-serial0 -drive \ -file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ --device virtio-blk-s390,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \ --chardev pty,id=charconsole0 \ --device virtconsole,chardev=charconsole0,id=console0 \ --object rng-random,id=objrng0,filename=/dev/hwrng \ --device virtio-rng-s390,rng=objrng0,id=rng0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-piix-controllers.xml b/tests/qemuxml2argvdata/qemuxml2argv-s390-piix-controllers.xml deleted file mode 100644 index a8b72d7..0000000 --- a/tests/qemuxml2argvdata/qemuxml2argv-s390-piix-controllers.xml +++ /dev/null @@ -1,34 +0,0 @@ -<domain type='qemu'> - <name>test</name> - <memory>219100</memory> - <currentMemory>219100</currentMemory> - <os> - <type arch='s390x' machine='s390-virtio'>hvm</type> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-s390x</emulator> - <disk type='block' device='disk'> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='virtio'/> - <boot order='1'/> - </disk> - <console type='pty'> - <target type='virtio'/> - </console> - <controller type='usb' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> - <controller type='ide' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> - </controller> - <memballoon model='virtio'> - </memballoon> - <rng model='virtio'> - <backend model='random'>/dev/hwrng</backend> - </rng> - </devices> -</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-usb-none.args b/tests/qemuxml2argvdata/qemuxml2argv-s390-usb-none.args deleted file mode 100644 index 51fcfa6..0000000 --- a/tests/qemuxml2argvdata/qemuxml2argv-s390-usb-none.args +++ /dev/null @@ -1,12 +0,0 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-s390x -S -M s390-virtio -m 214 -smp 1 \ --nographic -nodefconfig -nodefaults \ --chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ --mon chardev=charmonitor,id=monitor,mode=readline -no-acpi \ --device virtio-serial-s390,id=virtio-serial0 \ --drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ --device virtio-blk-s390,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \ --chardev pty,id=charconsole0 \ --device virtconsole,chardev=charconsole0,id=console0 \ --object rng-random,id=objrng0,filename=/dev/hwrng \ --device virtio-rng-s390,rng=objrng0,id=rng0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-s390-usb-none.xml b/tests/qemuxml2argvdata/qemuxml2argv-s390-usb-none.xml deleted file mode 100644 index f2977b5..0000000 --- a/tests/qemuxml2argvdata/qemuxml2argv-s390-usb-none.xml +++ /dev/null @@ -1,29 +0,0 @@ -<domain type='qemu'> - <name>test</name> - <memory>219100</memory> - <currentMemory>219100</currentMemory> - <os> - <type arch='s390x' machine='s390-virtio'>hvm</type> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-s390x</emulator> - <disk type='block' device='disk'> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='virtio'/> - <boot order='1'/> - </disk> - <console type='pty'> - <target type='virtio'/> - </console> - <controller type='usb' index='0' model='none'/> - <memballoon model='virtio'> - </memballoon> - <rng model='virtio'> - <backend model='random'>/dev/hwrng</backend> - </rng> - </devices> -</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 0763068..da5afd4 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1405,16 +1405,6 @@ mymain(void) QEMU_CAPS_VIRTIO_S390, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); - DO_TEST("s390-usb-none", - QEMU_CAPS_DEVICE, QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, - QEMU_CAPS_DRIVE, QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_S390, - QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); - - DO_TEST("s390-piix-controllers", - QEMU_CAPS_DEVICE, QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, - QEMU_CAPS_DRIVE, QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_S390, - QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); - DO_TEST("ppc-dtb", QEMU_CAPS_KVM, QEMU_CAPS_DTB); DO_TEST("ppce500-serial", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE, QEMU_CAPS_CHARDEV); -- 2.1.0

5 7

[libvirt] [PATCH] libxl: support soundhw for hvm domains
by Jim Fehlig 05 May '15

05 May '15

The xend driver and the parsing/formating code in src/xenconfig have long supported soundhw. Add support in the libxl driver too. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- This patch continues the tradition of silently ignoring unsupported config in the libxl driver. But it is an improvement; post-patch only sound devices after the first are ignored :-). src/libxl/libxl_conf.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 2a09190..fccada5 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -678,6 +678,19 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, libxl_defbool_set(&b_info->u.hvm.hpet, 1); } } + + if (def->nsounds > 0) { + /* + * Use first sound device. man xl.cfg(5) describes soundhw as + * a single device. From the man page: soundhw=DEVICE + */ + virDomainSoundDefPtr snd = def->sounds[0]; + + if (VIR_STRDUP(b_info->u.hvm.soundhw, + virDomainSoundModelTypeToString(snd->model)) < 0) + return -1; + } + for (i = 0; i < def->os.nBootDevs; i++) { switch (def->os.bootDevs[i]) { case VIR_DOMAIN_BOOT_FLOPPY: -- 1.8.4.5

2 2

[libvirt] [PATCH] libxl: add logrotate config file
by Jim Fehlig 05 May '15

05 May '15

Add logrotate config for log files in /var/log/libvirt/libxl. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- daemon/Makefile.am | 13 ++++++++++++- daemon/libvirtd.libxl.logrotate.in | 9 +++++++++ libvirt.spec.in | 3 +++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 300b9a5..b19a126 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -62,6 +62,7 @@ EXTRA_DIST = \ libvirtd.logrotate.in \ libvirtd.qemu.logrotate.in \ libvirtd.lxc.logrotate.in \ + libvirtd.libxl.logrotate.in \ libvirtd.uml.logrotate.in \ test_libvirtd.aug.in \ THREADS.txt \ @@ -275,7 +276,8 @@ remote.c: $(DAEMON_GENERATED) remote.h: $(DAEMON_GENERATED) LOGROTATE_CONFS = libvirtd.qemu.logrotate libvirtd.lxc.logrotate \ - libvirtd.uml.logrotate libvirtd.logrotate + libvirtd.libxl.logrotate libvirtd.uml.logrotate \ + libvirtd.logrotate BUILT_SOURCES += $(LOGROTATE_CONFS) @@ -297,6 +299,12 @@ libvirtd.lxc.logrotate: libvirtd.lxc.logrotate.in < $< > $@-t && \ mv $@-t $@ +libvirtd.libxl.logrotate: libvirtd.libxl.logrotate.in + $(AM_V_GEN)sed \ + -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ + < $< > $@-t && \ + mv $@-t $@ + libvirtd.uml.logrotate: libvirtd.uml.logrotate.in $(AM_V_GEN)sed \ -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ @@ -314,6 +322,8 @@ install-logrotate: $(LOGROTATE_CONFS) $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.qemu $(INSTALL_DATA) libvirtd.lxc.logrotate \ $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.lxc + $(INSTALL_DATA) libvirtd.libxl.logrotate \ + $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.libxl $(INSTALL_DATA) libvirtd.uml.logrotate \ $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.uml @@ -321,6 +331,7 @@ uninstall-logrotate: rm -f $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd \ $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.qemu \ $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.lxc \ + $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.libxl \ $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.uml rmdir $(DESTDIR)$(localstatedir)/log/libvirt/qemu || : rmdir $(DESTDIR)$(localstatedir)/log/libvirt/lxc || : diff --git a/daemon/libvirtd.libxl.logrotate.in b/daemon/libvirtd.libxl.logrotate.in new file mode 100644 index 0000000..523b2f8 --- /dev/null +++ b/daemon/libvirtd.libxl.logrotate.in @@ -0,0 +1,9 @@ +@localstatedir@/log/libvirt/libxl/*.log { + weekly + missingok + rotate 4 + compress + delaycompress + copytruncate + minsize 100k +} diff --git a/libvirt.spec.in b/libvirt.spec.in index f95e31f..3feda9d 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1601,6 +1601,7 @@ rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.lxc %endif %if ! %{with_libxl} rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/libxl.conf +rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.libxl rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirtd_libxl.aug rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_libxl.aug %endif @@ -2007,6 +2008,7 @@ exit 0 %endif %if %{with_libxl} %config(noreplace) %{_sysconfdir}/libvirt/libxl.conf +%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.libxl %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/libxl/ %ghost %dir %{_localstatedir}/run/libvirt/libxl/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/ @@ -2129,6 +2131,7 @@ exit 0 %files daemon-driver-libxl %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/libvirt/libxl.conf +%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.libxl %config(noreplace) %{_sysconfdir}/libvirt/libxl-lockd.conf %config(noreplace) %{_sysconfdir}/libvirt/libxl-sanlock.conf %{_datadir}/augeas/lenses/libvirtd_libxl.aug -- 1.8.4.5

2 2

[libvirt] [PATCH4/3] qemu: add cpu feature check for host-passthrough
by Luyao Huang 05 May '15

05 May '15

Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- I forgot this place. src/qemu/qemu_process.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 79f763e..5f418a9 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4070,11 +4070,6 @@ qemuProcessVerifyGuestCPU(virQEMUDriverPtr driver, bool ret = false; size_t i; - /* no features are passed to QEMU with -cpu host - * so it makes no sense to verify them */ - if (def->cpu && def->cpu->mode == VIR_CPU_MODE_HOST_PASSTHROUGH) - return true; - switch (arch) { case VIR_ARCH_I686: case VIR_ARCH_X86_64: -- 1.8.3.1

2 2

[libvirt] [PATCH 0/3] fix some issue around host-passthough cpu model
by Luyao Huang 05 May '15

05 May '15

We support add feature in host-passthough cpu model, but there are some place need fix. Luyao Huang (3): cpu:x86: fix cannot keep cpu feature after migrate/restore qemu: add a check for non-migratable cpu flags docs: fix a small xml error in docs docs/formatdomain.html.in | 2 +- src/cpu/cpu_x86.c | 9 ++++----- src/qemu/qemu_migration.c | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) -- 1.8.3.1

2 5

[libvirt] [PATCHv3] conf: Add the cpu duplicate use check for vm numa settings
by Luyao Huang 05 May '15

05 May '15

https://bugzilla.redhat.com/show_bug.cgi?id=1176020 We had a check for the vcpu count total number in <numa> before, however this check is not good enough. There are some examples: 1. one of cpu id is out of maxvcpus, can set success(cpu count = 5 < 10): <vcpu placement='static'>10</vcpu> <cell id='0' cpus='0-3,100' memory='512000' unit='KiB'/> 2. use the same cpu in 2 cell, can set success(cpu count = 8 < 10): <vcpu placement='static'>10</vcpu> <cell id='0' cpus='0-3' memory='512000' unit='KiB'/> <cell id='1' cpus='0-3' memory='512000' unit='KiB'/> 3. use the same cpu in 2 cell, cannot set success(cpu count = 11 > 10): <vcpu placement='static'>10</vcpu> <cell id='0' cpus='0-6' memory='512000' unit='KiB'/> <cell id='1' cpus='0-3' memory='512000' unit='KiB'/> Add a check for numa cpus, check if duplicate use one cpu in more than one cell. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- v3: remove the max vcpu check, just add a check when parse the numa settings, and change the subject. src/conf/numa_conf.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c index 7ad3f66..e25d7a8 100644 --- a/src/conf/numa_conf.c +++ b/src/conf/numa_conf.c @@ -738,6 +738,15 @@ virDomainNumaDefCPUParseXML(virDomainNumaPtr def, } VIR_FREE(tmp); + for (j = 0; j < i; j++) { + if (virBitmapOverlaps(def->mem_nodes[j].cpumask, + def->mem_nodes[i].cpumask)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("NUMA cells %zu and %zu have overlapping vCPU ids"), i, j); + goto cleanup; + } + } + ctxt->node = nodes[i]; if (virDomainParseMemory("./@memory", "./@unit", ctxt, &def->mem_nodes[cur_cell].mem, true, false) < 0) -- 1.8.3.1

2 2

[libvirt] [PATCH 0/8] Resolve new Coverity issues
by John Ferlan 05 May '15

05 May '15

Installed a new Coverity checker (7.6.1) and naturally new issues were found, plus a set of false positives which for now I'll just have to ignore since it seems they may be a bug in Coverity, but that's still to be determined John Ferlan (8): libxl: Resolve Coverity RESOURCE_LEAK vbox: Resolve Coverity RESOURCE_LEAK qemu: Resolve Coverity IDENTICAL_BRANCHES qemu: Resolve Coverity FORWARD_NULL xen: Resolve Coverity FORWARD_NULL qemu: Resolve Coverity FORWARD_NULL qemu: Resolve Coverity FORWARD_NULL qemu: Resolve Coverity FORWARD_NULL src/libxl/libxl_migration.c | 1 + src/qemu/qemu_capabilities.c | 4 +++- src/qemu/qemu_command.c | 4 +++- src/qemu/qemu_driver.c | 5 +++-- src/qemu/qemu_hotplug.c | 11 +++-------- src/vbox/vbox_common.c | 21 +++++++-------------- src/xen/xm_internal.c | 3 +++ 7 files changed, 23 insertions(+), 26 deletions(-) -- 2.1.0

2 9

[libvirt] [PATCH v1] [libvirt-php] add stream support and upload/resize/download for volume
by Vasiliy Tolstov 05 May '15

05 May '15

This patch add to libvirt php binding libvirt stream support Also provide resize/upload/download for libvirt volume Signed-off-by: Vasiliy Tolstov <v.tolstov(a)selfip.ru> --- configure.ac | 3 +- src/libvirt-php.c | 382 +++++++++++++++++++++++++++++++++++++++++++++++++++++- src/libvirt-php.h | 17 +++ 3 files changed, 395 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index b854153..7099f9d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,6 @@ AC_INIT([libvirt-php], [0.5.0], [http://libvirt.org] -AM_INIT_AUTOMAKE([-Wall -Werror]) +AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability]) AC_CONFIG_FILES([Makefile tools/Makefile src/Makefile tests/Makefile docs/Makefile]) -AM_INIT_AUTOMAKE([-Wno-portability]) AM_MAINTAINER_MODE([enable]) dnl Checks for programs. diff --git a/src/libvirt-php.c b/src/libvirt-php.c index 6d6fa81..0adc4be 100644 --- a/src/libvirt-php.c +++ b/src/libvirt-php.c @@ -61,6 +61,7 @@ int le_libvirt_storagepool; int le_libvirt_volume; int le_libvirt_network; int le_libvirt_nodedev; +int le_libvirt_stream; #if LIBVIR_VERSION_NUMBER>=8000 int le_libvirt_snapshot; #endif @@ -90,6 +91,13 @@ static zend_function_entry libvirt_functions[] = { PHP_FE(libvirt_connect_get_maxvcpus, NULL) PHP_FE(libvirt_connect_get_encrypted, NULL) PHP_FE(libvirt_connect_get_secure, NULL) + /* Stream functions */ + PHP_FE(libvirt_stream_create, NULL) + PHP_FE(libvirt_stream_close, NULL) + PHP_FE(libvirt_stream_abort, NULL) + PHP_FE(libvirt_stream_finish, NULL) + PHP_FE(libvirt_stream_send, NULL) + PHP_FE(libvirt_stream_recv, NULL) /* Domain functions */ PHP_FE(libvirt_domain_new, NULL) PHP_FE(libvirt_domain_new_get_vnc, NULL) @@ -148,7 +156,7 @@ static zend_function_entry libvirt_functions[] = { PHP_FE(libvirt_domain_get_screen_dimensions, NULL) PHP_FE(libvirt_domain_send_keys, NULL) PHP_FE(libvirt_domain_send_pointer_event, NULL) - PHP_FE(libvirt_domain_update_device, NULL) + PHP_FE(libvirt_domain_update_device, NULL) /* Domain snapshot functions */ PHP_FE(libvirt_domain_has_current_snapshot, NULL) PHP_FE(libvirt_domain_snapshot_create, NULL) @@ -169,6 +177,9 @@ static zend_function_entry libvirt_functions[] = { PHP_FE(libvirt_storagevolume_create_xml,NULL) PHP_FE(libvirt_storagevolume_create_xml_from,NULL) PHP_FE(libvirt_storagevolume_delete,NULL) + PHP_FE(libvirt_storagevolume_download,NULL) + PHP_FE(libvirt_storagevolume_upload,NULL) + PHP_FE(libvirt_storagevolume_resize,NULL) PHP_FE(libvirt_storagepool_get_uuid_string, NULL) PHP_FE(libvirt_storagepool_get_name, NULL) PHP_FE(libvirt_storagepool_lookup_by_uuid_string, NULL) @@ -370,6 +381,8 @@ char *translate_counter_type(int type) break; case INT_RESOURCE_DOMAIN: return "domain"; break; + case INT_RESOURCE_STREAM: return "stream"; + break; case INT_RESOURCE_NETWORK: return "network"; break; case INT_RESOURCE_NODEDEV: return "node device"; @@ -444,7 +457,7 @@ void free_tokens(tTokenizer t) Private function name: resource_change_counter Since version: 0.4.2 Description: Function to increment (inc = 1) / decrement (inc = 0) the resource pointers count including the memory location - Arguments: @type [int]: type of resource (INT_RESOURCE_x defines where x can be { CONNECTION | DOMAIN | NETWORK | NODEDEV | STORAGEPOOL | VOLUME | SNAPSHOT }) + Arguments: @type [int]: type of resource (INT_RESOURCE_x defines where x can be { CONNECTION | DOMAIN | NETWORK | NODEDEV | STORAGEPOOL | VOLUME | SNAPSHOT | STREAM }) @conn [virConnectPtr]: libvirt connection pointer associated with the resource, NULL for libvirt connection objects @mem [pointer]: Pointer to memory location for the resource. Will be converted to appropriate uint for the arch. @inc [int/bool]: Increment the counter (1 = add memory location) or decrement the counter (0 = remove memory location) from entries. @@ -724,6 +737,18 @@ void free_resource(int type, arch_uint mem TSRMLS_DC) } } + if (type == INT_RESOURCE_STREAM) { + rv = virStreamFree( (virStreamPtr)mem ); + if (rv != 0) { + DPRINTF("%s: virStreamFree(%p) returned %d (%s)\n", __FUNCTION__, (virStreamPtr)mem, rv, LIBVIRT_G (last_error)); + php_error_docref(NULL TSRMLS_CC, E_WARNING,"virStreamFree failed with %i on destructor: %s", rv, LIBVIRT_G (last_error)); + } + else { + DPRINTF("%s: virStreamFree(%p) completed successfully\n", __FUNCTION__, (virStreamPtr)mem); + resource_change_counter(INT_RESOURCE_STREAM, NULL, (virStreamPtr)mem, 0 TSRMLS_CC); + } + } + if (type == INT_RESOURCE_NETWORK) { rv = virNetworkFree( (virNetworkPtr)mem ); if (rv != 0) { @@ -986,6 +1011,36 @@ static void php_libvirt_domain_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) } } +/* Destructor for stream resource */ +static void php_libvirt_stream_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) +{ + php_libvirt_stream *stream = (php_libvirt_stream*)rsrc->ptr; + int rv = 0; + + if (stream != NULL) + { + if (stream->stream != NULL) + { + if (!check_resource_allocation(NULL, INT_RESOURCE_STREAM, stream->stream TSRMLS_CC)) { + stream->stream=NULL; + efree (stream); + return; + } + rv = virStreamFree(stream->stream); + if (rv != 0) { + DPRINTF("%s: virStreamFree(%p) returned %d (%s)\n", __FUNCTION__, stream->stream, rv, LIBVIRT_G (last_error)); + php_error_docref(NULL TSRMLS_CC, E_WARNING,"virStreamFree failed with %i on destructor: %s", rv, LIBVIRT_G (last_error)); + } + else { + DPRINTF("%s: virStreamFree(%p) completed successfully\n", __FUNCTION__, stream->stream); + resource_change_counter(INT_RESOURCE_STREAM, NULL, stream->stream, 0 TSRMLS_CC); + } + stream->stream=NULL; + } + efree (stream); + } +} + /* Destructor for storagepool resource */ static void php_libvirt_storagepool_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) { @@ -1144,6 +1199,7 @@ PHP_MINIT_FUNCTION(libvirt) /* register resource types and their descriptors */ le_libvirt_connection = zend_register_list_destructors_ex(php_libvirt_connection_dtor, NULL, PHP_LIBVIRT_CONNECTION_RES_NAME, module_number); le_libvirt_domain = zend_register_list_destructors_ex(php_libvirt_domain_dtor, NULL, PHP_LIBVIRT_DOMAIN_RES_NAME, module_number); + le_libvirt_stream = zend_register_list_destructors_ex(php_libvirt_stream_dtor, NULL, PHP_LIBVIRT_STREAM_RES_NAME, module_number); le_libvirt_storagepool = zend_register_list_destructors_ex(php_libvirt_storagepool_dtor, NULL, PHP_LIBVIRT_STORAGEPOOL_RES_NAME, module_number); le_libvirt_volume = zend_register_list_destructors_ex(php_libvirt_volume_dtor, NULL, PHP_LIBVIRT_VOLUME_RES_NAME, module_number); le_libvirt_network = zend_register_list_destructors_ex(php_libvirt_network_dtor, NULL, PHP_LIBVIRT_NETWORK_RES_NAME, module_number); @@ -1171,6 +1227,11 @@ PHP_MINIT_FUNCTION(libvirt) REGISTER_LONG_CONSTANT("VIR_DOMAIN_SHUTOFF", 5, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("VIR_DOMAIN_CRASHED", 6, CONST_CS | CONST_PERSISTENT); + /* Volume constants */ + REGISTER_LONG_CONSTANT("VIR_STORAGE_VOL_RESIZE_ALLOCATE", 1, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("VIR_STORAGE_VOL_RESIZE_DELTA", 2, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("VIR_STORAGE_VOL_RESIZE_SHRINK", 4, CONST_CS | CONST_PERSISTENT); + /* Domain vCPU flags */ REGISTER_LONG_CONSTANT("VIR_DOMAIN_VCPU_CONFIG", VIR_DOMAIN_VCPU_CONFIG, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("VIR_DOMAIN_VCPU_CURRENT", VIR_DOMAIN_VCPU_CURRENT, CONST_CS | CONST_PERSISTENT); @@ -3456,6 +3517,207 @@ PHP_FUNCTION(libvirt_domain_lookup_by_uuid_string) } /* + Function name: libvirt_stream_create + Since version: 0.5.0 + Description: Function is used to create new stream from libvirt conn + Arguments: @res [resource]: libvirt connection resource from libvirt_connect() + Returns: resource libvirt stream resource +*/ +PHP_FUNCTION(libvirt_stream_create) +{ + php_libvirt_connection *conn=NULL; + zval *zconn; + virStreamPtr stream = NULL; + php_libvirt_stream *res_stream; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zconn) == FAILURE) { + RETURN_FALSE; + } + ZEND_FETCH_RESOURCE (conn, php_libvirt_connection*, &zconn, -1, PHP_LIBVIRT_CONNECTION_RES_NAME, le_libvirt_connection); + if ((conn==NULL)||(conn->conn==NULL))RETURN_FALSE; + + stream = virStreamNew(conn->conn, 0); + if (stream==NULL) { + set_error("Cannot create new stream" TSRMLS_CC); + RETURN_FALSE; + } + + res_stream = (php_libvirt_stream *)emalloc(sizeof(php_libvirt_stream)); + res_stream->stream = stream; + res_stream->conn = conn; + + resource_change_counter(INT_RESOURCE_STREAM, conn->conn, res_stream->stream, 1 TSRMLS_CC); + ZEND_REGISTER_RESOURCE(return_value, res_stream, le_libvirt_stream); +} + +/* + Function name: libvirt_stream_close + Since version: 0.5.0 + Description: Function is used to close stream + Arguments: @res [resource]: libvirt stream resource from libvirt_stream_create() + Returns: int +*/ +PHP_FUNCTION(libvirt_stream_close) +{ + zval *zstream; + php_libvirt_stream *stream=NULL; + int retval = -1; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zstream) == FAILURE) { + RETURN_LONG(retval); + } + ZEND_FETCH_RESOURCE (stream, php_libvirt_stream*, &zstream, -1, PHP_LIBVIRT_STREAM_RES_NAME, le_libvirt_stream); + if ((stream==NULL)||(stream->stream==NULL))RETURN_LONG(retval); + + retval = virStreamFree(stream->stream); + if (retval != 0) { + set_error("Cannot free stream" TSRMLS_CC); + RETURN_LONG(retval); + } + + resource_change_counter(INT_RESOURCE_STREAM, stream->conn, stream->stream, 0 TSRMLS_CC); + RETURN_LONG(retval); +} + +/* + Function name: libvirt_stream_abort + Since version: 0.5.0 + Description: Function is used to abort transfer + Arguments: @res [resource]: libvirt stream resource from libvirt_stream_create() + Returns: int +*/ +PHP_FUNCTION(libvirt_stream_abort) +{ + zval *zstream; + php_libvirt_stream *stream=NULL; + int retval = -1; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zstream) == FAILURE) { + RETURN_LONG(retval); + } + ZEND_FETCH_RESOURCE (stream, php_libvirt_stream*, &zstream, -1, PHP_LIBVIRT_STREAM_RES_NAME, le_libvirt_stream); + if ((stream==NULL)||(stream->stream==NULL))RETURN_LONG(retval); + + retval = virStreamAbort(stream->stream); + if (retval != 0) { + set_error("Cannot abort stream" TSRMLS_CC); + RETURN_LONG(retval); + } + RETURN_LONG(retval); +} + +/* + Function name: libvirt_stream_finish + Since version: 0.5.0 + Description: Function is used to finish transfer + Arguments: @res [resource]: libvirt stream resource from libvirt_stream_create() + Returns: int +*/ +PHP_FUNCTION(libvirt_stream_finish) +{ + zval *zstream; + php_libvirt_stream *stream=NULL; + int retval = -1; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zstream) == FAILURE) { + RETURN_LONG(retval); + } + ZEND_FETCH_RESOURCE (stream, php_libvirt_stream*, &zstream, -1, PHP_LIBVIRT_STREAM_RES_NAME, le_libvirt_stream); + if ((stream==NULL)||(stream->stream==NULL))RETURN_LONG(retval); + + retval = virStreamFinish(stream->stream); + if (retval != 0) { + set_error("Cannot finish stream" TSRMLS_CC); + RETURN_LONG(retval); + } + RETURN_LONG(retval); +} + +/* + Function name: libvirt_stream_recv + Since version: 0.5.0 + Description: Function is used to close stream from libvirt conn + Arguments: @res [resource]: libvirt stream resource from libvirt_stream_create() + @data [string]: buffer + @len [int]: amout of data to recieve + Returns: int +*/ +PHP_FUNCTION(libvirt_stream_recv) +{ + zval *zstream, *zbuf; + char *recv_buf; + php_libvirt_stream *stream=NULL; + int retval = -1; + long length = 0; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rz|l", &zstream, &zbuf, &length) == FAILURE) { + RETURN_LONG(retval); + } + ZEND_FETCH_RESOURCE (stream, php_libvirt_stream*, &zstream, -1, PHP_LIBVIRT_STREAM_RES_NAME, le_libvirt_stream); + if ((stream==NULL)||(stream->stream==NULL))RETURN_LONG(retval); + + recv_buf = emalloc(length + 1); + memset(recv_buf, 0, length + 1); + + retval = virStreamRecv(stream->stream, recv_buf, length); + if (retval < 0) { + efree(recv_buf); + zval_dtor(zbuf); + Z_TYPE_P(zbuf) = IS_NULL; + } else { + recv_buf[retval] = '\0'; + /* Rebuild buffer zval */ + zval_dtor(zbuf); + Z_STRVAL_P(zbuf) = recv_buf; + Z_STRLEN_P(zbuf) = retval; + Z_TYPE_P(zbuf) = IS_STRING; + } + + if (retval == -1) { + set_error("Cannot recv from stream" TSRMLS_CC); + RETURN_LONG(retval); + } + + RETURN_LONG(retval); +} + +/* + Function name: libvirt_stream_send + Since version: 0.5.0 + Description: Function is used to close stream from libvirt conn + Arguments: @res [resource]: libvirt stream resource from libvirt_stream_create() + @data [string]: buffer + @length [int]: amout of data to send + Returns: int +*/ +PHP_FUNCTION(libvirt_stream_send) +{ + zval *zstream, *zbuf; + php_libvirt_stream *stream=NULL; + int retval = -1; + long length = 0; + char *cstr; + //int cstrlen; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rz|l", &zstream, &zbuf, &length) == FAILURE) { + RETURN_LONG(retval); + } + ZEND_FETCH_RESOURCE (stream, php_libvirt_stream*, &zstream, -1, PHP_LIBVIRT_STREAM_RES_NAME, le_libvirt_stream); + if ((stream==NULL)||(stream->stream==NULL))RETURN_LONG(retval); + + cstr = Z_STRVAL_P(zbuf); + //cstrlen = Z_STRLEN_P(zbuf); + + retval = virStreamSend(stream->stream, cstr, length); + if (retval == -1) { + set_error("Cannot send to stream" TSRMLS_CC); + RETURN_LONG(retval); + } + + RETURN_LONG(retval); +} + +/* Function name: libvirt_domain_lookup_by_id Since version: 0.4.1(-1) Description: Function is used to get domain by it's ID, applicable only to running guests @@ -3544,13 +3806,12 @@ PHP_FUNCTION(libvirt_domain_get_uuid_string) @opaque [void *]: used for file descriptor Returns: write() error code as it's calling write */ - static int streamSink(virStreamPtr st ATTRIBUTE_UNUSED, const char *bytes, size_t nbytes, void *opaque) { - int *fd = (int *)opaque; + int *fd = (int *)opaque; - return write(*fd, bytes, nbytes); + return write(*fd, bytes, nbytes); } /* @@ -6782,6 +7043,117 @@ PHP_FUNCTION(libvirt_storagevolume_delete) } /* + Function name: libvirt_storagevolume_resize + Since version: 0.5.0 + Description: Function is used to resize volume identified by it's resource + Arguments: @res [resource]: libvirt storagevolume resource + @capacity [int]: capacity for the storage volume + @flags [int]: optional flags for the storage volume resize for virStorageVolResize() + Returns: int +*/ +PHP_FUNCTION(libvirt_storagevolume_resize) +{ + php_libvirt_volume *volume=NULL; + zval *zvolume; + long flags = 0; + long capacity = 0; + int retval = -1; + + GET_VOLUME_FROM_ARGS("rl|l", &zvolume, &capacity, &flags); + + retval = virStorageVolResize(volume->volume, capacity, flags); + DPRINTF("%s: virStorageVolResize(%p, %d, %d) returned %d\n", PHPFUNC, volume->volume, (int) capacity, (int) flags, retval); + if (retval != 0) { + set_error_if_unset("Cannot resize storage volume" TSRMLS_CC); + RETURN_LONG(retval); + } + + RETURN_LONG(retval); +} + +/* + Function name: libvirt_storagevolume_download + Since version: 0.5.0 + Description: Function is used to download volume identified by it's resource + Arguments: @res [resource]: libvirt storagevolume resource + @stream [resource]: stream to use as output + @offset [int]: position to start reading from + @length [int] : limit on amount of data to download + @flags [int]: optional flags for the storage volume download for virStorageVolDownload() + Returns: int +*/ +PHP_FUNCTION(libvirt_storagevolume_download) +{ + php_libvirt_volume *volume=NULL; + php_libvirt_stream *stream=NULL; + zval *zvolume; + zval *zstream; + long flags = 0; + long offset = 0; + long length = 0; + int retval = -1; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rr|l|l|l", &zvolume, &zstream, &offset, &length, &flags) == FAILURE) { + RETURN_LONG(retval); + } + ZEND_FETCH_RESOURCE (volume, php_libvirt_volume*, &zvolume, -1, PHP_LIBVIRT_VOLUME_RES_NAME, le_libvirt_volume); + if ((volume==NULL)||(volume->volume==NULL))RETURN_LONG(retval); + ZEND_FETCH_RESOURCE (stream, php_libvirt_stream*, &zstream, -1, PHP_LIBVIRT_STREAM_RES_NAME, le_libvirt_stream); + if ((stream==NULL)||(stream->stream==NULL))RETURN_LONG(retval); + + retval = virStorageVolDownload(volume->volume, stream->stream, offset, length, flags); + DPRINTF("%s: virStorageVolDownload(%p, %p, %d, %d, %d) returned %d\n", PHPFUNC, volume->volume, stream->stream, (int) offset, (int) length, (int) flags, retval); + + if (retval == -1) { + set_error("Cannot download from stream" TSRMLS_CC); + RETURN_LONG(retval); + } + + RETURN_LONG(retval); +} + +/* + Function name: libvirt_storagevolume_upload + Since version: 0.5.0 + Description: Function is used to upload volume identified by it's resource + Arguments: @res [resource]: libvirt storagevolume resource + @stream [resource]: stream to use as input + @offset [int]: position to start writing to + @length [int] : limit on amount of data to upload + @flags [int]: optional flags for the storage volume upload for virStorageVolUpload() + Returns: int +*/ +PHP_FUNCTION(libvirt_storagevolume_upload) +{ + php_libvirt_volume *volume=NULL; + php_libvirt_stream *stream=NULL; + zval *zvolume; + zval *zstream; + long flags = 0; + long offset = 0; + long length = 0; + int retval = -1; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rr|l|l|l", &zvolume, &zstream, &offset, &length, &flags) == FAILURE) { + RETURN_LONG(retval); + } + ZEND_FETCH_RESOURCE (volume, php_libvirt_volume*, &zvolume, -1, PHP_LIBVIRT_VOLUME_RES_NAME, le_libvirt_volume); + if ((volume==NULL)||(volume->volume==NULL))RETURN_LONG(retval); + ZEND_FETCH_RESOURCE (stream, php_libvirt_stream*, &zstream, -1, PHP_LIBVIRT_STREAM_RES_NAME, le_libvirt_stream); + if ((stream==NULL)||(stream->stream==NULL))RETURN_LONG(retval); + + retval = virStorageVolUpload(volume->volume, stream->stream, offset, length, flags); + DPRINTF("%s: virStorageVolUpload(%p, %p, %d, %d, %d) returned %d\n", PHPFUNC, volume->volume, stream->stream, (int) offset, (int) length, (int) flags, retval); + + if (retval == -1) { + set_error_if_unset("Cannot upload storage volume" TSRMLS_CC); + RETURN_LONG(retval); + } + + RETURN_LONG(retval); +} + +/* Function name: libvirt_storagepool_get_uuid_string Since version: 0.4.1(-1) Description: Function is used to get storage pool by UUID string diff --git a/src/libvirt-php.h b/src/libvirt-php.h index 450fbea..3bcc682 100644 --- a/src/libvirt-php.h +++ b/src/libvirt-php.h @@ -214,6 +214,7 @@ ZEND_END_MODULE_GLOBALS(libvirt) #define INT_RESOURCE_STORAGEPOOL 0x10 #define INT_RESOURCE_VOLUME 0x20 #define INT_RESOURCE_SNAPSHOT 0x40 +#define INT_RESOURCE_STREAM 0x50 typedef struct tVMDisk { char *path; @@ -257,6 +258,11 @@ typedef struct _php_libvirt_connection { long resource_id; } php_libvirt_connection; +typedef struct _php_libvirt_stream { + virStreamPtr stream; + php_libvirt_connection* conn; +} php_libvirt_stream; + typedef struct _php_libvirt_domain { virDomainPtr domain; php_libvirt_connection* conn; @@ -311,6 +317,7 @@ int gdebug; #define PHP_LIBVIRT_CONNECTION_RES_NAME "Libvirt connection" #define PHP_LIBVIRT_DOMAIN_RES_NAME "Libvirt domain" +#define PHP_LIBVIRT_STREAM_RES_NAME "Libvirt stream" #define PHP_LIBVIRT_STORAGEPOOL_RES_NAME "Libvirt storagepool" #define PHP_LIBVIRT_VOLUME_RES_NAME "Libvirt volume" #define PHP_LIBVIRT_NETWORK_RES_NAME "Libvirt virtual network" @@ -347,6 +354,13 @@ PHP_FUNCTION(libvirt_node_get_info); PHP_FUNCTION(libvirt_node_get_cpu_stats); PHP_FUNCTION(libvirt_node_get_cpu_stats_for_each_cpu); PHP_FUNCTION(libvirt_node_get_mem_stats); +/* Stream functions */ +PHP_FUNCTION(libvirt_stream_create); +PHP_FUNCTION(libvirt_stream_close); +PHP_FUNCTION(libvirt_stream_abort); +PHP_FUNCTION(libvirt_stream_finish); +PHP_FUNCTION(libvirt_stream_recv); +PHP_FUNCTION(libvirt_stream_send); /* Domain functions */ PHP_FUNCTION(libvirt_domain_new); PHP_FUNCTION(libvirt_domain_new_get_vnc); @@ -427,6 +441,9 @@ PHP_FUNCTION(libvirt_storagevolume_get_xml_desc); PHP_FUNCTION(libvirt_storagevolume_create_xml); PHP_FUNCTION(libvirt_storagevolume_create_xml_from); PHP_FUNCTION(libvirt_storagevolume_delete); +PHP_FUNCTION(libvirt_storagevolume_download); +PHP_FUNCTION(libvirt_storagevolume_upload); +PHP_FUNCTION(libvirt_storagevolume_resize); PHP_FUNCTION(libvirt_storagepool_get_uuid_string); PHP_FUNCTION(libvirt_storagepool_get_name); PHP_FUNCTION(libvirt_storagepool_lookup_by_uuid_string); -- 2.3.3

2 3

Re: [libvirt] add a rbd disk by virsh attach-device , the operation fails
by 饶俊明 05 May '15

05 May '15

The problem has been resolved,. qemu-kvm is required to support the Ceph RBD versions, and restart the virtual machine; --------------------------------------------------------------------------- -----邮件原件----- 发件人: Martin Kletzander [mailto:mkletzan@redhat.com] 发送时间: 2015年5月5日 14:15 收件人: 饶俊明抄送: libvir-list(a)redhat.com 主题: Re: [libvirt] add a rbd disk by virsh attach-device , the operation fails On Tue, May 05, 2015 at 03:25:39AM +0000, 饶俊明 wrote: >Hello: > add a rbd disk by virsh attach-device ,the operation fails; libvirt >version: libvirt-0.10.2-46.el6.x86_64 operated virsh pool-info, pool-edit, attach-device domain_id /tmp/rbddisk.xml command: > Hi there, this list is for upstream discussions and as I can see, the version of libvirt you are using is a little old and it's downstream. Try whether this problem persist with e.g. the now released version 1.2.15 or feel free to contact your support specialist in case you are using RHEL. >virsh # pool-info 0a081d22-070b-3f58-a883-78e29012b052 >Name: 0a081d22-070b-3f58-a883-78e29012b052 >UUID: 0a081d22-070b-3f58-a883-78e29012b052 >State: running >Persistent: no >Autostart: no >Capacity: 305.50 TiB >Allocation: 173.06 GiB >Available: 304.98 TiB > >virsh # pool-edit 0a081d22-070b-3f58-a883-78e29012b052 ><pool type='rbd'> > <name>0a081d22-070b-3f58-a883-78e29012b052</name> > <uuid>0a081d22-070b-3f58-a883-78e29012b052</uuid> > <capacity unit='bytes'>335898508001280</capacity> > <allocation unit='bytes'>185824236409</allocation> > <available unit='bytes'>335327800442880</available> > <source> > <host name='szebs01.app.paic.com.cn' port='6789'/> > <name>ebs_sz_01_01</name> > <auth username='szbcs' type='ceph'> > <secret uuid='0a081d22-070b-3f58-a883-78e29012b052'/> > </auth> > </source> ></pool> > >virsh # attach-device 52 /tmp/rbddisk.xml >error: Failed to attach device from /tmp/rbddisk.xml >error: internal error unable to execute QEMU command >'__com.redhat_drive_add': Device 'drive-virtio-disk1' could not be >initialized > This error comes from qemu, but it doesn't say much. Does the domain fail to start with the disk already in the XML or is this a problem just with hot-plugging? >This context of /tmp/rbddisk.xml : > <disk type='network' device='disk'> > <driver name='qemu' type='raw' cache='none'/> > <auth username='szbcs'> > <secret type='ceph' uuid='0a081d22-070b-3f58-a883-78e29012b052'/> > </auth> > <source protocol='rbd' name='ebs_sz_01_01/5eba8a02-f251-4674-88b8-e368a07d50c5'> > <host name='szebs01.app.paic.com.cn' port='6789'/> > </source> > <target dev='vdb' bus='virtio'/> > <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> > </disk> > >This error information in libvirtd log file: >2015-05-05 02:51:52.005+0000: 32082: error : >qemuMonitorJSONCheckError:359 : internal error unable to execute QEMU >command '__com.redhat_drive_add': Device 'drive-virtio-disk1' could not >be initialized > This is only one line and it doesn't say anything more than the error from virsh. Try looking at more context, or rather in the domain's log file where qemu might've said more about the error. ******************************************************************************************************************************** The information in this email is confidential and may be legally privileged. If you have received this email in error or are not the intended recipient, please immediately notify the sender and delete this message from your computer. Any use, distribution, or copying of this email other than by the intended recipient is strictly prohibited. All messages sent to and from us may be monitored to ensure compliance with internal policies and to protect our business. Emails are not secure and cannot be guaranteed to be error free as they can be intercepted, amended, lost or destroyed, or contain viruses. Anyone who communicates with us by email is taken to accept these risks. 收发邮件者请注意：本邮件含保密信息，若误收本邮件，请务必通知发送人并直接删去，不得使用、传播或复制本邮件。进出邮件均受到本公司合规监控。邮件可能发生被截留、被修改、丢失、被破坏或包含计算机病毒等不安全情况。 ********************************************************************************************************************************

1 0

[libvirt] [PATCH] Ignore bridge template names with multiple printf conversions
by Ján Tomko 05 May '15

05 May '15

For some reason, we allow a bridge name with %d in it, which we replace with an unsigned integer to form a bridge name that does not yet exist on the host. Do not blindly pass it to virAsprintf if it's not the only conversion, to prevent crashing on input like: <network> <name>test</name> <forward mode='none'/> <bridge name='virbr%d%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s'/> </network> Ignore any template strings that do not have exactly one %d conversion, like we do in various drivers before calling virNetDevTapCreateInBridgePort. --- This was added by commit 4c3f3b4 http://libvirt.org/git/?p=libvirt.git;a=commitdiff;h=4c3f3b4 https://www.redhat.com/archives/libvir-list/2009-April/msg00394.html claiming it worked some time before that src/network/bridge_driver.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 3b879cd..1c5613a 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -2775,7 +2775,13 @@ networkFindUnusedBridgeName(virNetworkObjListPtr nets, int ret = -1, id = 0; char *newname = NULL; - const char *templ = def->bridge ? def->bridge : "virbr%d"; + const char *templ = "virbr%d"; + const char *p; + + if (def->bridge && + (p = strchr(def->bridge, '%')) == strrchr(def->bridge, '%') && + strstr(def->bridge, "%d")) + templ = def->bridge; do { if (virAsprintf(&newname, templ, id) < 0) @@ -2809,7 +2815,7 @@ networkFindUnusedBridgeName(virNetworkObjListPtr nets, /* * networkValidateBridgeName() - if no bridge name is set, or if the - * bridge name contains a %d (indicating that this is a template for + * bridge name contains a % (indicating that this is a template for * the actual name) try to set an appropriate bridge name. If a * bridge name *is* set, make sure it doesn't conflict with any other * network's bridge name. @@ -2820,7 +2826,7 @@ networkBridgeNameValidate(virNetworkObjListPtr nets, { int ret = -1; - if (def->bridge && !strstr(def->bridge, "%d")) { + if (def->bridge && !strchr(def->bridge, '%')) { if (virNetworkBridgeInUse(nets, def->bridge, def->name)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("bridge name '%s' already in use."), -- 2.0.5

2 2

[libvirt] [PATCH] qemu: Properly rename persistent def after migration
by Jiri Denemark 05 May '15

05 May '15

When migrating a domain while changing its name and using VIR_MIGRATE_PERSIST_DEST flag, libvirt would fail to properly change the name in the persistent definition. The inconsistency results in weird behavior when dumping domain XML, destroying the domain, restarting libvirtd and likely in several other situations. Since the new name is already stored in vm->def->name, we just need to make sure the persistent definition uses this new name too. https://bugzilla.redhat.com/show_bug.cgi?id=1076354 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_migration.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 20c2193..c1af704 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1392,6 +1392,14 @@ qemuMigrationEatCookie(virQEMUDriverPtr driver, flags) < 0) goto error; + if (flags & QEMU_MIGRATION_COOKIE_PERSISTENT && + mig->persistent && + STRNEQ(dom->def->name, mig->persistent->name)) { + VIR_FREE(mig->persistent->name); + if (VIR_STRDUP(mig->persistent->name, dom->def->name) < 0) + goto error; + } + if (mig->flags & QEMU_MIGRATION_COOKIE_LOCKSTATE) { if (!mig->lockDriver) { if (virLockManagerPluginUsesState(driver->lockManager)) { -- 2.4.0

2 5

[libvirt] add a rbd disk by virsh attach-device , the operation fails
by 饶俊明 05 May '15

05 May '15

Hello: add a rbd disk by virsh attach-device ,the operation fails; libvirt version: libvirt-0.10.2-46.el6.x86_64 operated virsh pool-info, pool-edit, attach-device domain_id /tmp/rbddisk.xml command: virsh # pool-info 0a081d22-070b-3f58-a883-78e29012b052 Name: 0a081d22-070b-3f58-a883-78e29012b052 UUID: 0a081d22-070b-3f58-a883-78e29012b052 State: running Persistent: no Autostart: no Capacity: 305.50 TiB Allocation: 173.06 GiB Available: 304.98 TiB virsh # pool-edit 0a081d22-070b-3f58-a883-78e29012b052 <pool type='rbd'> <name>0a081d22-070b-3f58-a883-78e29012b052</name> <uuid>0a081d22-070b-3f58-a883-78e29012b052</uuid> <capacity unit='bytes'>335898508001280</capacity> <allocation unit='bytes'>185824236409</allocation> <available unit='bytes'>335327800442880</available> <source> <host name='szebs01.app.paic.com.cn' port='6789'/> <name>ebs_sz_01_01</name> <auth username='szbcs' type='ceph'> <secret uuid='0a081d22-070b-3f58-a883-78e29012b052'/> </auth> </source> </pool> virsh # attach-device 52 /tmp/rbddisk.xml error: Failed to attach device from /tmp/rbddisk.xml error: internal error unable to execute QEMU command '__com.redhat_drive_add': Device 'drive-virtio-disk1' could not be initialized This context of /tmp/rbddisk.xml : <disk type='network' device='disk'> <driver name='qemu' type='raw' cache='none'/> <auth username='szbcs'> <secret type='ceph' uuid='0a081d22-070b-3f58-a883-78e29012b052'/> </auth> <source protocol='rbd' name='ebs_sz_01_01/5eba8a02-f251-4674-88b8-e368a07d50c5'> <host name='szebs01.app.paic.com.cn' port='6789'/> </source> <target dev='vdb' bus='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> </disk> This error information in libvirtd log file: 2015-05-05 02:51:52.005+0000: 32082: error : qemuMonitorJSONCheckError:359 : internal error unable to execute QEMU command '__com.redhat_drive_add': Device 'drive-virtio-disk1' could not be initialized Thanks!! ******************************************************************************************************************************** The information in this email is confidential and may be legally privileged. If you have received this email in error or are not the intended recipient, please immediately notify the sender and delete this message from your computer. Any use, distribution, or copying of this email other than by the intended recipient is strictly prohibited. All messages sent to and from us may be monitored to ensure compliance with internal policies and to protect our business. Emails are not secure and cannot be guaranteed to be error free as they can be intercepted, amended, lost or destroyed, or contain viruses. Anyone who communicates with us by email is taken to accept these risks. �跺��欢��娉ㄦ�锛��浠跺�淇��淇℃�锛��璇��浠讹�璇峰�蹇��ュ��汉骞剁��ュ��伙�涓��浣跨��澶��浠躲� 杩��欢��版��浠跺��藉��淇��涪澶便�琚��璁＄��虹�姣��涓��ㄦ��点� ********************************************************************************************************************************

2 1

[libvirt] [libvirt-test-api][PATCH] Add a new test case for getMemoryParameters
by Luyao Huang 05 May '15

05 May '15

Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- cases/test_connection.conf | 4 ++ repos/virconn/connection_getMemoryParameters.py | 61 +++++++++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 repos/virconn/connection_getMemoryParameters.py diff --git a/cases/test_connection.conf b/cases/test_connection.conf index 914acac..3c08a95 100644 --- a/cases/test_connection.conf +++ b/cases/test_connection.conf @@ -69,3 +69,7 @@ storage:pool_uuid virconn:connection_getCellsFreeMemory conn qemu:///system + +virconn:connection_getMemoryParameters + conn + qemu:///system diff --git a/repos/virconn/connection_getMemoryParameters.py b/repos/virconn/connection_getMemoryParameters.py new file mode 100644 index 0000000..9b88fc3 --- /dev/null +++ b/repos/virconn/connection_getMemoryParameters.py @@ -0,0 +1,61 @@ +#!/usr/bin/env python + +import libvirt +from libvirt import libvirtError +from utils import utils + +required_params = () +optional_params = {'conn': ''} +node_memory = ['full_scans', + 'merge_across_nodes', + 'pages_shared', + 'pages_sharing', + 'pages_to_scan', + 'pages_unshared', + 'pages_volatile', + 'sleep_millisecs'] + +SYSFS_MEMORY_SHARED_PATH = '/sys/kernel/mm/ksm/' +LIBVIRT_API_PATH = '/usr/share/libvirt/api/libvirt-api.xml' +flags=0 + +def check_memory_parameter(libvirt_dict, parameter_name): + a = libvirt_dict.get('shm_%s' % parameter_name) + try: + b = long(open('%s%s' % (SYSFS_MEMORY_SHARED_PATH, parameter_name)).read()) + except IOError: + logger.info("Cannot get file in path %s%s" \ + % (SYSFS_MEMORY_SHARED_PATH, parameter_name)) + return 1 + logger.info("equal %s : libvirt get %u and we get %u"\ + % (parameter_name, a, b)) + if a == b: + return 0 + else: + return 1 + +def connection_getMemoryParameters(params): + """ + test API for getMemoryParameters in class virConnect + """ + global logger + logger = params['logger'] + fail=0 + + try: + conn=libvirt.open(params['conn']) + + logger.info("get connection to libvirtd") + + if utils.check_flags('getMemoryParameters', LIBVIRT_API_PATH) == 1: + return 1 + + param_dict=conn.getMemoryParameters() + + for n in node_memory: + fail=check_memory_parameter(param_dict, n) + + except libvirtError, e: + logger.error("API error message: %s" % e.message) + fail=1 + return fail -- 1.8.3.1

2 1

[libvirt] [PATCH 0/7] Addition host name check for network storage pools
by John Ferlan 04 May '15

04 May '15

https://bugzilla.redhat.com/show_bug.cgi?id=1171984 As a followon to a recent series to conslidate the various network source host checks into a single API, this series of patches takes the next steps. First off existing code assumed the provided "<host name='%s'>" string resolved to a valid IP Address; however, that's not necessarily the case. So rather than assume the path is valid during the various networked pool startup, open, mount, etc API's check to make sure the host name can be resolved. More than like the processing was going to fail anyway, so failing a bit sooner and with a message indicating the problem might help someone resolve it. Second now that we hope the running pools are using a resolved name, check the new/incoming definitions to make sure that their host name strings do not duplicate an existing/running pool. The existing check only compares the strings for equality, but with networks a name could be an IP Address by number (IPv4 or IPv6) or a name that would need to be resolved. If that name resolves to the same IP Address already running, then we fail the attempted new pool definition. John Ferlan (7): virutil: Introduce virIsValidHostname iscsi: Check for validity of pool source hostname netfs: Check for validity of pool source hostname gluster: Check for validity of pool source hostname sheepdog: Check for validity of pool source hostname util: Introduce virIsSameHostnameInfo storage: Check for duplicate host for incoming pool def src/conf/storage_conf.c | 11 ++- src/libvirt_private.syms | 2 + src/storage/storage_backend_fs.c | 2 + src/storage/storage_backend_gluster.c | 3 + src/storage/storage_backend_iscsi.c | 7 ++ src/storage/storage_backend_sheepdog.c | 36 +++++--- src/util/virutil.c | 155 +++++++++++++++++++++++++++++++++ src/util/virutil.h | 3 + 8 files changed, 205 insertions(+), 14 deletions(-) -- 2.1.0

3 33

[libvirt] [PATCH v3] polkit: Allow password-less access for 'libvirt' group
by Cole Robinson 04 May '15

04 May '15

Many users, who admin their own machines, want to be able to access system libvirtd via tools like virt-manager without having to enter a root password. Just google 'virt-manager without password' and you'll find many hits. I've read at least 5 blog posts over the years describing slightly different ways of achieving this goal. Let's finally add official support for this. Install a polkit-1 rules file granting password-less auth for any user in the new 'libvirt' group. Create the group on RPM install https://bugzilla.redhat.com/show_bug.cgi?id=957300 --- v3: Back to group=libvirt to match what debian and suse are using Patch is unchanged otherwise. So unless there's objects all carry over the previous ACK from danpb and push after the release is out daemon/Makefile.am | 13 +++++++++++++ daemon/libvirt.rules | 9 +++++++++ libvirt.spec.in | 15 +++++++++++++-- 3 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 daemon/libvirt.rules diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 300b9a5..974feed 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -53,6 +53,7 @@ EXTRA_DIST = \ libvirtd.init.in \ libvirtd.upstart \ libvirtd.policy.in \ + libvirt.rules \ libvirtd.sasl \ libvirtd.service.in \ libvirtd.socket.in \ @@ -233,6 +234,8 @@ policyauth = auth_admin_keep_session else ! WITH_POLKIT0 policydir = $(datadir)/polkit-1/actions policyauth = auth_admin_keep +rulesdir = $(datadir)/polkit-1/rules.d +rulesfile = libvirt.rules endif ! WITH_POLKIT0 endif WITH_POLKIT @@ -263,9 +266,19 @@ if WITH_POLKIT install-data-polkit:: $(MKDIR_P) $(DESTDIR)$(policydir) $(INSTALL_DATA) libvirtd.policy $(DESTDIR)$(policydir)/org.libvirt.unix.policy +if ! WITH_POLKIT0 + $(MKDIR_P) $(DESTDIR)$(rulesdir) + $(INSTALL_DATA) $(srcdir)/$(rulesfile) $(DESTDIR)$(rulesdir)/50-libvirt.rules +endif ! WITH_POLKIT0 + uninstall-data-polkit:: rm -f $(DESTDIR)$(policydir)/org.libvirt.unix.policy rmdir $(DESTDIR)$(policydir) || : +if ! WITH_POLKIT0 + rm -f $(DESTDIR)$(rulesdir)/50-libvirt.rules + rmdir $(DESTDIR)$(rulesdir) || : +endif ! WITH_POLKIT0 + else ! WITH_POLKIT install-data-polkit:: uninstall-data-polkit:: diff --git a/daemon/libvirt.rules b/daemon/libvirt.rules new file mode 100644 index 0000000..01a15fa --- /dev/null +++ b/daemon/libvirt.rules @@ -0,0 +1,9 @@ +// Allow any user in the 'libvirt' group to connect to system libvirtd +// without entering a password. + +polkit.addRule(function(action, subject) { + if (action.id == "org.libvirt.unix.manage" && + subject.isInGroup("libvirt")) { + return polkit.Result.YES; + } +}); diff --git a/libvirt.spec.in b/libvirt.spec.in index 20af502..c71ef25 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1645,9 +1645,9 @@ then fi %if %{with_libvirtd} +%pre daemon %if ! %{with_driver_modules} %if %{with_qemu} -%pre daemon %if 0%{?fedora} || 0%{?rhel} >= 6 # We want soft static allocation of well-known ids, as disk images # are commonly shared across NFS mounts by id rather than name; see @@ -1661,11 +1661,21 @@ if ! getent passwd qemu >/dev/null; then useradd -r -g qemu -G kvm -d / -s /sbin/nologin -c "qemu user" qemu fi fi -exit 0 %endif %endif %endif + %if %{with_polkit} + %if 0%{?fedora} || 0%{?rhel} >= 6 +# 'libvirt' group is just to allow password-less polkit access to +# libvirtd. The uid number is irrelevant, so we use dynamic allocation +# described at the above link. +getent group libvirt >/dev/null || groupadd -r libvirt + %endif + %endif + +exit 0 + %post daemon %if %{with_systemd} @@ -1939,6 +1949,7 @@ exit 0 %if 0%{?fedora} || 0%{?rhel} >= 6 %{_datadir}/polkit-1/actions/org.libvirt.unix.policy %{_datadir}/polkit-1/actions/org.libvirt.api.policy +%{_datadir}/polkit-1/rules.d/50-libvirt.rules %else %{_datadir}/PolicyKit/policy/org.libvirt.unix.policy %endif -- 2.3.6

2 2

[libvirt] [PATCH v2 0/2] Introduce GIC for aarch64
by Michal Privoznik 04 May '15

04 May '15

diff to v1: - John's review worked in (hopefully) Michal Privoznik (2): Introduce GIC feature qemu: Implement GIC docs/formatdomain.html.in | 10 ++++++ docs/schemas/domaincommon.rng | 11 ++++++- src/conf/domain_conf.c | 37 +++++++++++++++++++++- src/conf/domain_conf.h | 2 ++ src/qemu/qemu_command.c | 13 ++++++++ .../qemuxml2argvdata/qemuxml2argv-aarch64-gic.args | 6 ++++ .../qemuxml2argvdata/qemuxml2argv-aarch64-gic.xml | 26 +++++++++++++++ tests/qemuxml2argvtest.c | 2 ++ 8 files changed, 105 insertions(+), 2 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic.xml -- 2.3.6

2 3

[libvirt] [PATCH 0/2] Forbid unsupported parameters for tunnelled migration
by Jiri Denemark 04 May '15

04 May '15

Jiri Denemark (2): virsh: Don't check migrate parameters qemu: Forbid unsupported parameters for tunnelled migration src/qemu/qemu_migration.c | 16 +++++++++++++++- tools/virsh-domain.c | 13 +------------ 2 files changed, 16 insertions(+), 13 deletions(-) -- 2.4.0

3 5

[libvirt] [PATCH] tests: Fix grammar in comments.
by Andrea Bolognani 04 May '15

04 May '15

Replace all occurrences of "stream write to differences to" with "stream to write differences to". --- tests/testutils.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/testutils.c b/tests/testutils.c index 6a8fe6a..89026c6 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -458,7 +458,7 @@ virtTestCaptureProgramOutput(const char *const argv[] ATTRIBUTE_UNUSED, /** - * @param stream: output stream write to differences to + * @param stream: output stream to write differences to * @param expect: expected output text * @param expectName: name designator of the expected text * @param actual: actual output text @@ -532,7 +532,7 @@ int virtTestDifferenceFull(FILE *stream, } /** - * @param stream: output stream write to differences to + * @param stream: output stream to write differences to * @param expect: expected output text * @param actual: actual output text * @@ -548,7 +548,7 @@ int virtTestDifference(FILE *stream, /** - * @param stream: output stream write to differences to + * @param stream: output stream to write differences to * @param expect: expected output text * @param actual: actual output text * -- 2.1.0

2 2

[libvirt] [PATCH] qemu: improve error message for domain stats API
by Pavel Hrdina 04 May '15

04 May '15

Filtering specific list of domains is not supported yet. Print a better error message. old error message: error: unsupported flags (0x1) in function qemuConnectGetAllDomainStats new error message: error: using filters with list of domains is not implemented yet Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1143837 Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- Based on https://www.redhat.com/archives/libvir-list/2014-November/msg00069.html with different commit and error message. src/qemu/qemu_driver.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index f8d493d..b88e2cc 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -19809,15 +19809,19 @@ qemuConnectGetAllDomainStats(virConnectPtr conn, unsigned int privflags = 0; unsigned int domflags = 0; - if (ndoms) - virCheckFlags(VIR_CONNECT_GET_ALL_DOMAINS_STATS_BACKING | - VIR_CONNECT_GET_ALL_DOMAINS_STATS_ENFORCE_STATS, -1); - else - virCheckFlags(VIR_CONNECT_LIST_DOMAINS_FILTERS_ACTIVE | - VIR_CONNECT_LIST_DOMAINS_FILTERS_PERSISTENT | - VIR_CONNECT_LIST_DOMAINS_FILTERS_STATE | - VIR_CONNECT_GET_ALL_DOMAINS_STATS_BACKING | - VIR_CONNECT_GET_ALL_DOMAINS_STATS_ENFORCE_STATS, -1); + if (ndoms && (flags & (VIR_CONNECT_LIST_DOMAINS_FILTERS_ACTIVE | + VIR_CONNECT_LIST_DOMAINS_FILTERS_PERSISTENT | + VIR_CONNECT_LIST_DOMAINS_FILTERS_STATE))) { + virReportInvalidArg(flags, "%s", _("using filters with list of domains " + "is not implemented yet")); + return -1; + } + + virCheckFlags(VIR_CONNECT_LIST_DOMAINS_FILTERS_ACTIVE | + VIR_CONNECT_LIST_DOMAINS_FILTERS_PERSISTENT | + VIR_CONNECT_LIST_DOMAINS_FILTERS_STATE | + VIR_CONNECT_GET_ALL_DOMAINS_STATS_BACKING | + VIR_CONNECT_GET_ALL_DOMAINS_STATS_ENFORCE_STATS, -1); if (virConnectGetAllDomainStatsEnsureACL(conn) < 0) return -1; -- 2.3.6

2 2

[libvirt] [PATCH] Bump version to 1.2.16 for new dev cycle
by Jiri Denemark 04 May '15

04 May '15

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- Pushed as trivial. configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index d5fb71d..6122fa5 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU Lesser General Public dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>. -AC_INIT([libvirt], [1.2.15], [libvir-list(a)redhat.com] [], [http://libvirt.org] +AC_INIT([libvirt], [1.2.16], [libvir-list(a)redhat.com] [], [http://libvirt.org] AC_CONFIG_SRCDIR([src/libvirt.c]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) -- 2.4.0

1 0

[libvirt] [PATCH] qemu: fix the vm deadlock when delete an unexist iothread
by Luyao Huang 04 May '15

04 May '15

https://bugzilla.redhat.com/show_bug.cgi?id=1218145 Jump to endjob instead of cleanup to fix this deadlock. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 3695b26..5e998c9 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6379,7 +6379,7 @@ qemuDomainChgIOThread(virQEMUDriverPtr driver, _("cannot find IOThread '%u' in persistent " "iothreadids"), iothread_id); - goto cleanup; + goto endjob; } virDomainIOThreadIDDel(persistentDef, iothread_id); -- 1.8.3.1

2 1

[libvirt] Release of libvirt-1.2.15
by Daniel Veillard 04 May '15

04 May '15

It's out ! Libvirt 1.2.15 is released, I tagged it in git and provided signed tarballs and rpms available at the usual place: ftp://libvirt.org/libvirt/ I also pushed a python bindings release too at: ftp://libvirt.org/libvirt/python/ This is again a reasonably large release with around 375 patches merged in, including a fairly large set of bug fixes across all areas. A few user visible features and a large set of improvements are there too: Features: - Implement virDomainAddIOThread and virDomainDelIOThread (John Ferlan) - libxl: Introduce configuration file for libxl driver (Jim Fehlig) - Add VIR_DOMAIN_EVENT_ID_DEVICE_ADDED event (Ján Tomko) - various improvements to parallels driver (Maxim Nestratov, Dmitry Guryanov) Documentation: - qemu: Fix comment for timeDelta (Jiri Denemark) - Fix typo in comment about memory binding (zhang bo) - virhostdev: Fix comments for virHostdevReAttachPCIDevices (John Ferlan) - Add articles to virDomainDeviceDetachFlags docs (Ján Tomko) - lib: snapshot: Explain that only one layer of images is inserted (Peter Krempa) - Visually separate snapshot disk subelements (Ján Tomko) - Add info (where necessary) that paths should be specified as absolute (Erik Skultety) - Typos: Get rid of dependan(t|cies) (Martin Kletzander) - Add Host sFlow into monitoring apps (Martin Kletzander) Portability: - Fix building virnetserverclientmock with MinGW (Martin Kletzander) - Cleanup parameters for mock libraries (Martin Kletzander) - Cleanup srcdir usage (Michal Privoznik) - Add missing linker flags for MinGW build (Pavel Fedin) - build: add pragma directive to fix build on some gcc (Pavel Hrdina) - build: avoid obsolete index() (Eric Blake) - util: fix build on non-Linux (Roman Bogorodskiy) - vircapstest: fix build without LXC, QEMU or XEN (Roman Bogorodskiy) - virbuffer: fix build on rhel-6 (Pavel Hrdina) - tests: fix build on old 32-bit platforms (Eric Blake) - build: provide virNetDevSysfsFile on non-Linux (Eric Blake) - build: include correct header for time() (Eric Blake) - xen: fix build error on rhel-5 (Pavel Hrdina) - qemu: Avoid shadow of 'sync' symbol (Peter Krempa) Bug Fixes: - qemu: Fix bus and lun checks when scsi-disk.channel not present (John Ferlan) - rpm-build: update %files section for libxl (Pavel Hrdina) - qemu: blockjob: Call qemuDomainSupportsBlockJobs only on online VMs (Peter Krempa) - qemu: Check address type for USB disks (Jiri Denemark) - cpu: Honor vendor_id override in host-model (Jiri Denemark) - iscsi: do not fail to stop a stopped pool (Ján Tomko) - qemu: conf: Reject memory device if it would exceed configured max size (Peter Krempa) - qemu: blockCopy: Allow reuse of raw image for shallow block copy (Peter Krempa) - tests: free ChardevInfo correctly in qemumonitorjsontest (Zhang Bo) - storage: fs: Ignore volumes that fail to open with EACCESS/EPERM (Cole Robinson) - storage: If driver startup state syncing fails, delete statefile (Cole Robinson) - storage: Don't leave stale state file if pool startup fails (Cole Robinson) - storage: Fix autostart dir for qemu:///session (Cole Robinson) - qemu: qemuProcessDetectIOThreadPIDs invert checks (John Ferlan) - conf: Resolve some Coverity errors (John Ferlan) - network: check newDef for used bridge names in addition to def (Laine Stump) - network: check for bridge name conflict with existing devices (Laine Stump) - network: move auto-assign of bridge name from XML parser to net driver (Laine Stump) - test: Fix actual vs. expected in virtTestCompareFiles (Laine Stump) - qemu: Resolve Coverity DEADCODE (John Ferlan) - util: fix memleak in virStorageSourceClear (zhang bo) - storage: Resolve Coverity UNINIT (John Ferlan) - Fix check for return value of qemuDomainAgentAvailable() (Martin Kletzander) - conf: fix memleak in virDomainHostdevDefClear (Zhang Bo) - conf: fix memleak in virDomainNetIpParseXML (Zhang Bo) - qemu: fix memleak in virCapabilitiesDomainDataLookup (Zhang Bo) - qemu: fix memleaks in qemuBuildCommandLine (Zhang Bo) - util: fix memleak in virFindSCSIHostByPCI (Zhang Bo) - tests: fix some memleaks in tests (Zhang Bo) - qemu: Fix domain object leak in qemuDomainInterfaceAddresses (Peter Krempa) - libxl: initialize sdl.opengl defbool in libxlMakeVfb (Jim Fehlig) - libxl: initialize vfb defbools in libxlMakeVfb (Olaf Hering) - parallels: fix crash in prlsdkAddNet in case of CT definition (Maxim Nestratov) - bhyve: fix build in tests (Roman Bogorodskiy) - Fix memory leak in virNetSocketNewConnectUNIX (Jiri Denemark) - parallels: fix IS_CT macro (Maxim Nestratov) - rng: fix port number range validation (Daniel P. Berrange) - qemu: Don't fail to reboot domains with unresponsive agent (zhang bo) - bhyve: fix build in tests (Roman Bogorodskiy) - spec: Fix libxl build with driver modules (Cole Robinson) - configure: Fix --loader-nvram typo (Cole Robinson) - parallels: don't forget to unlock domain after successful virDomainObjListFindByUUID call (Maxim Nestratov) - vircommand: fix polling in virCommandProcessIO (Roman Bogorodskiy) - util: storage: Fix possible crash when source path is NULL (Peter Krempa) - qemu: Fix issues with maxMemory in qemuDomainSetMemoryFlags() (Luyao Huang) - qemu: set macvtap physdevs online when macvtap is set online (Laine Stump) - util: set MAC address for VF via netlink message to PF+VF# when possible (Laine Stump) - qemu: Always refresh capabilities if no <guests> found (Cole Robinson) - scsi: Adjust return values from processLU (John Ferlan) - storage: Fix check for stable path check (John Ferlan) - domtop: Properly free cpu status (Michal Privoznik) - parallels: fix return status for parallelsConnectOpen (Nikolay Shirokovskiy) - lxc: fix starting a domain with non-strict numa memory mode (Luyao Huang) - lxc: fix starting a domain with a cpuset but no numatune (Luyao Huang) - rng: Forbid to validate mismatched <disk> 'device' and 'type' attributes (Erik Skultety) - domcaps: Check for architecture more wisely (Michal Privoznik) - virNetSocketNewConnectUNIX: Don't unlink(NULL) (Michal Privoznik) - libxl: drop virDomainObj lock when destroying a domain (Jim Fehlig) - libxl: acquire a job when destroying a domain (Jim Fehlig) - virCondWaitUntil: calculate timespec correctly (Michael Chapman) - qemu: bulk stats: Ignore errors from missing/inaccessible disks (Peter Krempa) - Strip control codes in virBufferEscapeString (Ján Tomko) - Ignore storage volumes with control codes in their names (Ján Tomko) - Strip control characters from sysfs attributes (Ján Tomko) - tests: Resolve Coverity RESOURCE_LEAK (John Ferlan) - virsh: fix regression in 'virsh event' by domain (Eric Blake) - qemu: monitor: Fix qemuMonitorGetAllBlockStatsInfo with HMP (Peter Krempa) - qemu: monitor: Ensure that qemuMonitorSetLink is called with non-null name (Peter Krempa) - virNetSocketNewConnectUNIX: Use flocks when spawning a daemon (Michal Privoznik) - sanlock: Use VIR_ERR_RESOURCE_BUSY if sanlock_acquire fails (Jiri Denemark) - hostdev: fix loop index error when resetvfnetconfig (Huanle Han) - qemu: fix index error when clean up vport profile (Huanle Han) - virt-aa-helper: add unix channels (esp for qemu-guest-agent) (Serge Hallyn) - qemu: save domain status after set memory parameters (Shanzhi Yu) - virsh: improve the error for wrong memtune parameters (Shanzhi Yu) - qemu: drivePivot: Fix assumption when 'block-job-complete' fails (Peter Krempa) - qemu: Fix condition for checking vcpu when pinning vcpus (Peter Krempa) - qemu: Enforce WWN to be unique among VM's disks (Peter Krempa) - virBitmap: Place virBitmapIsAllClear check after virBitmapParse calls (Erik Skultety) - Fix usb device version parsing issues (Ján Tomko) - Support IPv6 in networkGetNetworkAddress (Ján Tomko) - util: Update virNetDevGetIPAddress to get IPv6 addresses (Luyao Huang) - parallels: fix virDomainDefineXML for domain in saved state (Dmitry Guryanov) - conf: fix virDomainDefFormatInternal for parallels (Dmitry Guryanov) - conf: fix virDomainDefParseXML for parallels (Dmitry Guryanov) - storage: Don't duplicate efforts of backend driver (John Ferlan) - storage: Need to update freeExtent at delete primary partition (John Ferlan) - storage: Fix issues in storageVolResize (John Ferlan) - Open /proc/PID/ns/* read-only to avoid getting permission denied (Cédric Bosdonnat) - lxc: create the required directories upon driver start (Lubomir Rintel) - util: file: Don't carelessly sanitize URIs (Peter Krempa) - fix memleak in qemuRestoreCgroupState (Luyao Huang) - qemuProcessHook: Call virNuma*() only when needed (Michal Privoznik) - parallels: delete old networks in prlsdkDoApplyConfig before adding new ones (Maxim Nestratov) - util: fix removal of callbacks in virCloseCallbacksRun (Michael Chapman) - qemu: fix race between disk mirror fail and cancel (Michael Chapman) - qemu: fix error propagation in qemuMigrationBegin (Michael Chapman) - qemu: fix crash in qemuProcessAutoDestroy (Michael Chapman) - virQEMUDriverGetConfig: Fix memleak (Michal Privoznik) - virDomainVirtioSerialAddrSetFree: Fix memleak (Michal Privoznik) - qemuSetupCgroupForVcpu: Fix memleak (Michal Privoznik) - libvirt: virsh: Kill all uses of __FUNCTION__ in error messages (Noella Ashu) - virsh: Fix domifaddr output in quiet mode (Luyao Huang) - libxl: fix dom0 balloon logic (Jim Fehlig) - hostdev: Fix index error in loop after remove an element (Huanle Han) - Fix xlconfigtest with older libxl (Ján Tomko) - iscsi: Fix exit path for virStorageBackendISCSIFindLUs failure (John Ferlan) - qemuDomainBlockCopy: Check @granularity to be a power of two (Luyao Huang) - nodeinfodata: Remove broken symlinks and uneeded files (Michal Privoznik) - qemu: lifecycle: make agent-mode shutdown and reboot timeout (zhang bo) Improvements: - main: add new generated files to .gitignore (Pavel Hrdina) - libxl: provide integration with lock manager (Jim Fehlig) - domain: conf: Drop unused OSTYPE_AIX (Cole Robinson) - qemu: migration: use sync block job helpers (Michael Chapman) - qemuDomainBlockJobAbort: use sync block job helpers (Michael Chapman) - qemuProcessStop: wake up pending sync block jobs (Michael Chapman) - qemuBlockJobSync*: introduce sync block job helpers (Michael Chapman) - qemuBlockJobEventProcess: move to new source file (Michael Chapman) - qemu: Validate available slot count for memory devices (Peter Krempa) - qemu: command: Validate that memory devices slot ID is in range (Peter Krempa) - parallels: implement domainDetachDevice and domainDetachDeviceFlags (Maxim Nestratov) - parallels: add prlsdkDelDisk and prlsdkGetDiskIndex functions (Maxim Nestratov) - qemu: make qemuMonitorChardevInfoFree non-static (Zhang Bo) - storage: Break out storageDriverLoadPoolState (Cole Robinson) - qemu: Remove need for qemuMonitorIOThreadInfoFree (John Ferlan) - qemu: Remove need for qemuDomainParseIOThreadAlias (John Ferlan) - conf: explicitly initialize 'cpumask' variable (Roman Bogorodskiy) - virsh: Add iothreadadd and iothreaddel commands (John Ferlan) - qemu: Add support to Add/Delete IOThreads (John Ferlan) - domain: Introduce virDomainIOThreadSchedDelId (John Ferlan) - remote: Add support for AddIOThread and DelIOThread (John Ferlan) - conf: Adjust the iothreadsched expectations (John Ferlan) - Move iothreadspin information into iothreadids (John Ferlan) - conf: Move virDomainPinIsDuplicate and make static (John Ferlan) - qemu: Use domain iothreadids to IOThread's 'thread_id' (John Ferlan) - conf: Add new domain XML element 'iothreadids' (John Ferlan) - openvz: Drop useless domain lookup (Michal Privoznik) - qemu: Connect to guest agent after channel hotplug (Peter Krempa) - qemu: agent: Differentiate errors when the agent channel was hotplugged (Peter Krempa) - qemu: Reuse qemuDomainAgentAvailable in qemuDomainInterfaceAddresses (Peter Krempa) - qemu: agent: Reuse virJSONValueObjectCreateVArgs in qemuAgentMakeCommand (Peter Krempa) - libxl: remove duplicate check for pci subsystem type (Olaf Hering) - libxl: use pci init and dispose functions (Olaf Hering) - hostdev: fix net config restore error (Huanle Han) - hostdev: Create virHostdevIsPCINetDevice (Huanle Han) - qemu: Build nvram directory at driver startup (Cole Robinson) - qemu: Build channel autosocket directory at driver startup (Cole Robinson) - qemu: chown autoDumpPath on driver startup (Cole Robinson) - qemu: conf: Clarify paths that are relative to libDir (Cole Robinson) - tests: qemu: Couple aarch64 CPU tests (Cole Robinson) - migration: Usable time statistics without requiring NTP (Jiri Denemark) - uml: s/virDomainObjListFindByID/virDomainObjListFindByUUID/ (Michal Privoznik) - virDomainObjList: Introduce yet another hash table (Michal Privoznik) - virDomainObjListFindByName: Return referenced object (Michal Privoznik) - Introduce virDomainObjEndAPI (Michal Privoznik) - virDomainObjListNew: Use virObjectFreeHashData (Michal Privoznik) - virDomainObjListAddLocked: s/false/NULL/ for @oldDef (Michal Privoznik) - parallels: implement .domainGetMaxMemory (Dmitry Guryanov) - Apparmor: allow reading block-rbd.so (Cédric Bosdonnat) - Allow access to vendor and device file for PCI device passthrough (Cédric Bosdonnat) - qemu: cgroup: Fix priorities when setting emulatorpin (Peter Krempa) - tests: Add VIR_TEST_REGENERATE_OUTPUT (Cole Robinson) - tests: Add virtTestCompareToFile (Cole Robinson) - tests: Use *DefParseFile more (Cole Robinson) - tests: Add VIR_TEST_DEBUG and VIR_TEST_VERBOSE (Cole Robinson) - parallels_sdk: Utilize parallelsDomObjFromDomain() (Michal Privoznik) - parallels_driver: Utilize parallelsDomObjFromDomain() (Michal Privoznik) - parallels: Introduce parallelsDomObjFromDomain() (Michal Privoznik) - struct _parallelsConn: Mark @domains as immutable pointer (Michal Privoznik) - spec: Point fedora --with-loader-nvram at nightly firmware repo (Cole Robinson) - configure: Report --with-loader-nvram value in summary (Cole Robinson) - locking: relax PID requirement (Jim Fehlig) - util: storage: Improve error message when requesting image above 'start' (Peter Krempa) - util: storage: Add hint to error message that indexed access was used (Peter Krempa) - util: command: Deduplicate code in virCommandNewArgList (Peter Krempa) - qemu: migration: Refactor hostdev validation in migration check (Peter Krempa) - processNicRxFilterChangedEvent: Take appropriate actions for NET_TYPE_NETWORK too (Michal Privoznik) - virDomainActualNetDefContentsFormat: Format class_id only for status XML (Michal Privoznik) - scsi: Change return values for virStorageBackendSCSIFindLUs (John Ferlan) - scsi: Adjust return value for virStorageBackendSCSINewLun (John Ferlan) - storage: Split out the stable path check (John Ferlan) - xend: Remove a couple of unused function prototypes. (Richard W.M. Jones) - domain: conf: Drop expectedVirtTypes (Cole Robinson) - caps: Use DomainDataLookup to replace GuestDefault* (Cole Robinson) - domain: conf: Use CapabilitiesDomainDataLookup for caps validation (Cole Robinson) - domain: conf: Do ostype/arch/machine parsing earlier (Cole Robinson) - caps: Add virCapabilitiesDomainDataLookup (Cole Robinson) - caps: Convert to use VIR_DOMAIN_VIRT internally (Cole Robinson) - domain: Convert os.type to VIR_DOMAIN_OSTYPE enum (Cole Robinson) - caps: Switch AddGuest to take VIR_DOMAIN_OSTYPE value (Cole Robinson) - caps: Use an enum internally for ostype value (Cole Robinson) - domain: conf: Don't validate VM ostype/arch at daemon startup (Cole Robinson) - domain: conf: Better errors on bad os <type> values (Cole Robinson) - parallels: make device addressing consistent (Nikolay Shirokovskiy) - rng: Move sgio attr definition to a separate block (Erik Skultety) - Apparmor: removed duplicate nscd rules (Cédric Bosdonnat) - schema: Allow multiple machines for VMs and unite architectures (Martin Kletzander) - qemuDomainShutdownFlags: Set fakeReboot more frequently (zhang bo) - Introduce virNetDevBandwidthUpdateFilter (Michal Privoznik) - virnetdevbandwidth.c: Separate tc filter creation to a function (Michal Privoznik) - virNetDevBandwidthSet: Add priority to filter (Michal Privoznik) - virDomainActualNetDefContentsFormat: Format class_id more frequently (Michal Privoznik) - nwfilter: Partly initialize driver even for non-privileged users (Michal Privoznik) - lxc: move wireless PHYs to a network namespace (Lubomir Rintel) - libxl: Move job acquisition in libxlDomainStart to callers (Jim Fehlig) - libxl: support HVM direct kernel boot (Jim Fehlig) - xenconfig: don't use "kernel" for hvmloader (Jim Fehlig) - xenconfig: move <os> parsing/formating to config-specific files (Jim Fehlig) - xenconfig: remove redunant parsing of device_model (Jim Fehlig) - xenconfig: export xenConfigCopyString (Jim Fehlig) - storage: Refactor virStorageBackendSCSINewLun (John Ferlan) - qemu: monitor: Refactor and fix monitor checking (Peter Krempa) - daemon: Prefix sysctl configuration filename with a number (Jiri Denemark) - RNG schema: allow plain @floor to <bandwidth/> (Michal Privoznik) - virNetDevBandwidthPlug: Update function description (Michal Privoznik) - Add functions dealing with control characters in strings (Ján Tomko) - tests: rename testStripIPv6BracketsData to testStripData (Ján Tomko) - Add an example for EVENT_ID_DEVICE_ADDED (Ján Tomko) - Emit VIR_DOMAIN_EVENT_ID_DEVICE_ADDED in the QEMU driver (Ján Tomko) - Cleanup "/sys/class/net" usage (Michal Privoznik) - tests: Add virnetdevtestdata to EXTRA_DIST (Michal Privoznik) - node: udev: Remove some redundant error reports (Peter Krempa) - virPidFileConstructPath: Drop useless VIR_FREE() (Michal Privoznik) - qemu: monitor: @running in qemuMonitorGetStatus is always non-NULL (Peter Krempa) - qemu: monitor: Don't use 'ret' variable where not necessary (Peter Krempa) - qemu: monitor: Sanitize control flow in qemuMonitorSetCapabilities (Peter Krempa) - qemu: monitor: Clean up coding style (Peter Krempa) - json: export non-static functions (Martin Kletzander) - Change virConnectPtr into virObjectLocklable (Martin Kletzander) - closeCallback is already lockable, initialize it as such (Martin Kletzander) - configure: Align messages (Martin Kletzander) - storage: Add duplicate devices check for zfs pool def (John Ferlan) - storage: Add duplicate source pool for Gluster pool def (John Ferlan) - storage: Add duplicate host check for Sheepdog pool def (John Ferlan) - storage: Remove default from switch in virStoragePoolSourceFindDuplicate (John Ferlan) - storage: Use virStoragePoolSourceMatchSingleHost for NETFS (John Ferlan) - storage: Add check for different ports for host duplicate matching (John Ferlan) - storage: Create virStoragePoolSourceMatchSingleHost (John Ferlan) - storage: Refactor iSCSI Source matching (John Ferlan) - Introduce virnetdevtest (Michal Privoznik) - cfg: Disallow usage of 'index' as variable name (John Ferlan) - nwfilter: Change 'index' to 'idx' (John Ferlan) - snapshot: Change 'index' to 'idx' (John Ferlan) - util: Use 'idx' instead of 'index' (John Ferlan) - qemu: Adjust the prototype to match the function (John Ferlan) - sparc: Add default PCI root controller (Martin Kletzander) - qemu: Use 'idx' instead of 'index' for variable name (John Ferlan) - qemu: Refactor qemuDomainBlockJobAbort() (Peter Krempa) - qemu: blockPull: Refactor the rest of qemuDomainBlockJobImpl (Peter Krempa) - qemu: blockjob: Separate qemuDomainBlockJobAbort from qemuDomainBlockJobImpl (Peter Krempa) - qemu: blockjob: Split qemuDomainBlockJobSetSpeed from qemuDomainBlockJobImpl (Peter Krempa) - qemu: monitor: Extract handling of JSON block job error codes (Peter Krempa) - qemu: monitor: json: Refactor error code class checker (Peter Krempa) - conf: Refactor virDomainVcpuPinDefParseXML (Peter Krempa) - conf: Error out if iothread id is missing in iothreadpin (Peter Krempa) - onf: Split up virDomainVcpuPinDefParseXML (Peter Krempa) - conf: Split out parsing of emulatorpin (Peter Krempa) - conf: ABI: Check WWN in disk abi stability check (Peter Krempa) - Convert virDomainPinIsDuplicate into bool return (John Ferlan) - Rename qemuCheckIothreads to qemuCheckIOThreads (John Ferlan) - Rewrite vshParseCPUList (Ján Tomko) - Rewrite vshPrintPinInfo (Ján Tomko) - Parallels: implemented domainAttachDevice (Alexander Burluka) - Parallels: implement domainAttachDeviceFlags (Alexander Burluka) - Parallels: remove disk serial number check (Alexander Burluka) - Remove overengineered loop (Ján Tomko) - Introduce struct _virStorageBackendQemuImgInfo (Ján Tomko) - Rename virStorageBackendCreateQemuImgCmd (Ján Tomko) - Use XPath when parsing snapshot disk definition (Ján Tomko) - Split out storage format 'compat' attribute sanity check (Ján Tomko) - Remove feature formating funcs from pool-specific options (Ján Tomko) - Rewrite usb device version parsing (Ján Tomko) - Do xml->xml test for usb-redir-filter (Ján Tomko) - Do not require virtio-pci devices when using virtio-mmio (Ján Tomko) - qemuMigrationPrecreateStorage: Fix debug message (Michal Privoznik) - qemu_migration.c: sleep first before checking for migration status. (Xing Lin) - conf: Don't output <cpu> tag if it contains no information. (Andrea Bolognani) - qemu: qemuDomainHotplugVcpus - separate out pin adjustment code (John Ferlan) - AUTHORS: Add my email address to AUTHORS.in (Dmitry Guryanov) - util: Replace virNetDevGetIPv4Address with virNetDevGetIPAddress (John Ferlan) - parallels: add implicit input devices (Dmitry Guryanov) - conf: add input device type for parallels containers (Dmitry Guryanov) - conf: return proper default video type for parallels (Dmitry Guryanov) - conf: add VIR_DOMAIN_VIDEO_TYPE_PARALLELS video type (Dmitry Guryanov) - parallels: don't fill net adapter model for containers (Dmitry Guryanov) - parallels: fill adapter model in virDomainNetDef (Dmitry Guryanov) - parallels: add controllers in prlsdkLoadDomain (Dmitry Guryanov) - parallels: report, that cdroms are readonly (Dmitry Guryanov) - parallels: implement virDomainManagedSave (Dmitry Guryanov) - parallels: split prlsdkDomainChangeState function (Dmitry Guryanov) - parallels: fix headers in parallels_sdk.h (Dmitry Guryanov) - qemu: qemuDomainHotplugVcpus - separate out the del cgroup and pin (John Ferlan) - qemu: qemuDomainHotplugVcpus - separate out the add cgroup (John Ferlan) - cgroup: Use virCgroupNewThread (John Ferlan) - cgroup: Introduce virCgroupNewThread (John Ferlan) - qemu: blockPivot: Don't pause the VM any more since we don't use drive-reopen (Peter Krempa) - qemu: Clean up old leftovers in qemuMonitorDrivePivot (Peter Krempa) - qemu: blockjob: Use the new helpers in qemuDomainGetBlockJobInfo (Peter Krempa) - qemu: domain: Add helper to check block job support (Peter Krempa) - qemu: domain: Introduce helper to retrieve domain monitor object (Peter Krempa) - Apparmor qemu abstraction fixes for SLES (Cédric Bosdonnat) - test: Add tests for virFileSanitizePath (Peter Krempa) - virLXCControllerSetupResourceLimits: Call virNuma*() iff needed (Michal Privoznik) - vbox: Implement virDomainSendKey (Dawid Zamirski) - vbox: Register IKeyboard with the unified API. (Dawid Zamirski) - vircgroup: Introduce virCgroupControllerAvailable (Michal Privoznik) - qemu_driver: check caps after starting block job (Michael Chapman) - qemu_migrate: use nested job when adding NBD to cookie (Michael Chapman) - storage: Introduce storagePoolUpdateAllState function (Erik Skultety) - conf: Introduce virStoragePoolLoadAllState && virStoragePoolLoadState (Erik Skultety) - storage: Add support for storage pool state XML (Erik Skultety) - hostdev: Report the domain name for used hostdevs during nodedev-detach (Shivaprasad G Bhat) - virsh: Improve change-media success message (Cole Robinson) - interface: allow multiple IPv4 addresses in interface XML (Laine Stump) - virsh.pod: Remove redundant --config from attach-interface (Jiri Denemark) - esx: esxNodeGetFreeMemory return info from host. (Dawid Zamirski) - esx: add esxVI_GetInt (Dawid Zamirski) - conf: Change virStoragePoolSaveConfig prototype s/configDir/configFile (Erik Skultety) - conf: Introduce virStoragePoolSaveState (Erik Skultety) - conf: Introduce virStoragePoolDefFormatBuf (Erik Skultety) - Auto add virtio-serial controllers (Ján Tomko) - Assign an address when hotplugging a virtio-serial device (Ján Tomko) - Expand the address set when attaching a virtio-serial controller (Ján Tomko) - Allocate virtio-serial addresses when starting a domain (Ján Tomko) - Add functions to track virtio-serial addresses (Ján Tomko) - Add test for virtio serial port assignment (Ján Tomko) - scsi: Remove unused 'type_path' in processLU (John Ferlan) - iscsi: Use error message from virStorageBackendSCSIFindLUs (John Ferlan) - conf: Introduce virStoragePoolSaveXML (Erik Skultety) - storage: Remove unused attribute conn from 'checkPool' callback (Erik Skultety) - Fix indentation in cmdVcpuPin (Ján Tomko) - virsh: remove stale comment (Ján Tomko) - conf: Rename virDomainHasDiskMirror and detect block jobs properly (Shanzhi Yu) - qemu: snapshot: Check for block jobs individually (Peter Krempa) - Remove unnecessary includes from virsh.h (Ján Tomko) - Remove unused includes from virsh (Ján Tomko) - Clean up headers in src/util/virutil.h (Ján Tomko) - Do not include cpu_map.h in libvirtd.c (Ján Tomko) - Use the DEFAULT_DRIVER_DIR macro (Ján Tomko) - Remove unused macros (Ján Tomko) - qemu: Copy bitmap in a sane way (Peter Krempa) - qemu: cgroup: Kill qemuSetupCgroupVcpuPin() (Peter Krempa) - qemu: cgroup: Kill qemuSetupCgroupIOThreadsPin() (Peter Krempa) - qemu: cgroup: Rename qemuSetupCgroupEmulatorPin to qemuSetupCgroupCpusetCpus (Peter Krempa) - qemu: cgroup: Use priv->autoCpuset instead of using qemuPrepareCpumap() (Peter Krempa) - qemu: cgroup: Properly set up vcpu pinning (Peter Krempa) - qemu: cgroup: Refactor setup for IOThread cgroups (Peter Krempa) - qemu: cgroup: Store auto cpuset instead of re-creating it on demand (Peter Krempa) So thanks everybody for your contributions for this release, be it ideas, bug reports, documentations, patches, reviews ... all those releases represent a massive amount of work ! 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/

1 0

[libvirt] Entering freeze for libvirt-1.2.15
by Daniel Veillard 03 May '15

03 May '15

I'm a little late, but I have now tagged candidate release 1 for 1.2.15 in git and pushed signed tarballs and rpms to the usual place: ftp://libvirt.org/libvirt/ this seems to work for me in my limited testing, but please give it a try, especially on less common platforms. The https://ci.centos.org/ seems to indicate issues on building the Perl tests as well as virt-manager regression testing, can someone dig into what is happening there ? I will likely push an rc2 on Thursday, and then the final release over the week-end, thanks! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

3 4

[libvirt] [PATCH V3] libxl: provide integration with lock manager
by Jim Fehlig 01 May '15

01 May '15

Provide integration with libvirt's lock manager in the libxl driver. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- V3 of https://www.redhat.com/archives/libvir-list/2015-April/msg01006.html In V3, call virDomainLockProcessStart() with 'paused' parameter set to 'true' and add a call to virDomainLockProcessResume(). src/Makefile.am | 12 +++++++++ src/libxl/libvirtd_libxl.aug | 2 ++ src/libxl/libxl.conf | 10 +++++++ src/libxl/libxl_conf.c | 14 ++++++++++ src/libxl/libxl_conf.h | 6 +++++ src/libxl/libxl_domain.c | 51 +++++++++++++++++++++++++++++++++++- src/libxl/libxl_domain.h | 1 + src/libxl/libxl_driver.c | 25 ++++++++++++++++++ src/libxl/libxl_migration.c | 6 +++++ src/libxl/test_libvirtd_libxl.aug.in | 1 + 10 files changed, 127 insertions(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 9a5f16c..1438174 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2246,6 +2246,12 @@ BUILT_SOURCES += locking/qemu-lockd.conf DISTCLEANFILES += locking/qemu-lockd.conf endif WITH_QEMU +if WITH_LIBXL +nodist_conf_DATA += locking/libxl-lockd.conf +BUILT_SOURCES += locking/libxl-lockd.conf +DISTCLEANFILES += locking/libxl-lockd.conf +endif WITH_LIBXL + locking/%-lockd.conf: $(srcdir)/locking/lockd.conf $(AM_V_GEN)$(MKDIR_P) locking ; \ cp $< $@ @@ -2431,6 +2437,12 @@ nodist_conf_DATA += locking/qemu-sanlock.conf BUILT_SOURCES += locking/qemu-sanlock.conf DISTCLEANFILES += locking/qemu-sanlock.conf endif WITH_QEMU + +if WITH_LIBXL +nodist_conf_DATA += locking/libxl-sanlock.conf +BUILT_SOURCES += locking/libxl-sanlock.conf +DISTCLEANFILES += locking/libxl-sanlock.conf +endif WITH_LIBXL else ! WITH_SANLOCK EXTRA_DIST += $(LOCK_DRIVER_SANLOCK_SOURCES) endif ! WITH_SANLOCK diff --git a/src/libxl/libvirtd_libxl.aug b/src/libxl/libvirtd_libxl.aug index f225954..d5aa150 100644 --- a/src/libxl/libvirtd_libxl.aug +++ b/src/libxl/libvirtd_libxl.aug @@ -25,9 +25,11 @@ module Libvirtd_libxl = (* Config entry grouped by function - same order as example config *) let autoballoon_entry = bool_entry "autoballoon" + let lock_entry = str_entry "lock_manager" (* Each entry in the config is one of the following ... *) let entry = autoballoon_entry + | lock_entry let comment = [ label "#comment" . del /#[ \t]*/ "# " . store /([^ \t\n][^\n]*)?/ . del /\n/ "\n" ] let empty = [ label "#empty" . eol ] diff --git a/src/libxl/libxl.conf b/src/libxl/libxl.conf index c104d40..ba3de7a 100644 --- a/src/libxl/libxl.conf +++ b/src/libxl/libxl.conf @@ -10,3 +10,13 @@ # autoballoon setting. # #autoballoon = 1 + + +# In order to prevent accidentally starting two domains that +# share one writable disk, libvirt offers two approaches for +# locking files: sanlock and virtlockd. sanlock is an external +# project which libvirt integrates with via the libvirt-lock-sanlock +# package. virtlockd is a libvirt implementation that is enabled with +# "lockd". Accepted values are "sanlock" and "lockd". +# +#lock_manager = "lockd" diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 1b504fa..29498d5 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -102,6 +102,7 @@ libxlDriverConfigDispose(void *obj) VIR_FREE(cfg->libDir); VIR_FREE(cfg->saveDir); VIR_FREE(cfg->autoDumpDir); + VIR_FREE(cfg->lockManagerName); } @@ -1495,6 +1496,7 @@ int libxlDriverConfigLoadFile(libxlDriverConfigPtr cfg, const char *filename) { virConfPtr conf = NULL; + virConfValuePtr p; int ret = -1; /* Check the file is readable before opening it, otherwise @@ -1512,6 +1514,18 @@ int libxlDriverConfigLoadFile(libxlDriverConfigPtr cfg, if (libxlGetAutoballoonConf(cfg, conf) < 0) goto cleanup; + if ((p = virConfGetValue(conf, "lock_manager"))) { + if (p->type != VIR_CONF_STRING) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", + _("Unexpected type for 'lock_manager' setting")); + goto cleanup; + } + + if (VIR_STRDUP(cfg->lockManagerName, p->str) < 0) + goto cleanup; + } + ret = 0; cleanup: diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h index 5ba1a71..0a1c0db 100644 --- a/src/libxl/libxl_conf.h +++ b/src/libxl/libxl_conf.h @@ -38,6 +38,7 @@ # include "virobject.h" # include "virchrdev.h" # include "virhostdev.h" +# include "locking/lock_manager.h" # define LIBXL_DRIVER_NAME "xenlight" # define LIBXL_VNC_PORT_MIN 5900 @@ -98,6 +99,8 @@ struct _libxlDriverConfig { * memory for new domains from domain0. */ bool autoballoon; + char *lockManagerName; + /* Once created, caps are immutable */ virCapsPtr caps; @@ -144,6 +147,9 @@ struct _libxlDriverPrivate { /* Immutable pointer, lockless APIs*/ virSysinfoDefPtr hostsysinfo; + + /* Immutable pointer. lockless access */ + virLockManagerPluginPtr lockManager; }; # define LIBXL_SAVE_MAGIC "libvirt-xml\n \0 \r" diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 3039427..5f5f8e5 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -34,6 +34,7 @@ #include "virlog.h" #include "virstring.h" #include "virtime.h" +#include "locking/domain_lock.h" #define VIR_FROM_THIS VIR_FROM_LIBXL @@ -217,12 +218,36 @@ libxlDomainObjPrivateFree(void *data) { libxlDomainObjPrivatePtr priv = data; + VIR_FREE(priv->lockState); virObjectUnref(priv); } +static int +libxlDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, void *data) +{ + libxlDomainObjPrivatePtr priv = data; + + priv->lockState = virXPathString("string(./lockstate)", ctxt); + + return 0; +} + +static int +libxlDomainObjPrivateXMLFormat(virBufferPtr buf, void *data) +{ + libxlDomainObjPrivatePtr priv = data; + + if (priv->lockState) + virBufferAsprintf(buf, "<lockstate>%s</lockstate>\n", priv->lockState); + + return 0; +} + virDomainXMLPrivateDataCallbacks libxlDomainXMLPrivateDataCallbacks = { .alloc = libxlDomainObjPrivateAlloc, .free = libxlDomainObjPrivateFree, + .parse = libxlDomainObjPrivateXMLParse, + .format = libxlDomainObjPrivateXMLFormat, }; @@ -667,6 +692,11 @@ libxlDomainCleanup(libxlDriverPrivatePtr driver, virHostdevReAttachDomainDevices(hostdev_mgr, LIBXL_DRIVER_NAME, vm->def, VIR_HOSTDEV_SP_PCI, NULL); + VIR_FREE(priv->lockState); + if (virDomainLockProcessPause(driver->lockManager, vm, &priv->lockState) < 0) + VIR_WARN("Unable to release lease on %s", vm->def->name); + VIR_DEBUG("Preserving lock state '%s'", NULLSTR(priv->lockState)); + vm->def->id = -1; if (priv->deathW) { @@ -960,6 +990,20 @@ libxlDomainStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm, vm->def, VIR_HOSTDEV_SP_PCI) < 0) goto cleanup; + if (virDomainLockProcessStart(driver->lockManager, + "xen:///system", + vm, + true, + NULL) < 0) + goto cleanup; + + if (virDomainLockProcessResume(driver->lockManager, + "xen:///system", + vm, + priv->lockState) < 0) + goto cleanup; + VIR_FREE(priv->lockState); + /* Unlock virDomainObj while creating the domain */ virObjectUnlock(vm); @@ -990,7 +1034,7 @@ libxlDomainStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm, virReportError(VIR_ERR_INTERNAL_ERROR, _("libxenlight failed to restore domain '%s'"), d_config.c_info.name); - goto cleanup; + goto release_dom; } /* @@ -1003,6 +1047,7 @@ libxlDomainStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm, if (libxl_evenable_domain_death(cfg->ctx, vm->def->id, 0, &priv->deathW)) goto cleanup_dom; + if ((dom_xml = virDomainDefFormat(vm->def, 0)) == NULL) goto cleanup_dom; @@ -1040,6 +1085,7 @@ libxlDomainStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm, goto cleanup; cleanup_dom: + ret = -1; if (priv->deathW) { libxl_evdisable_domain_death(cfg->ctx, priv->deathW); priv->deathW = NULL; @@ -1048,6 +1094,9 @@ libxlDomainStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm, vm->def->id = -1; virDomainObjSetState(vm, VIR_DOMAIN_SHUTOFF, VIR_DOMAIN_SHUTOFF_FAILED); + release_dom: + virDomainLockProcessPause(driver->lockManager, vm, &priv->lockState); + cleanup: libxl_domain_config_dispose(&d_config); VIR_FREE(dom_xml); diff --git a/src/libxl/libxl_domain.h b/src/libxl/libxl_domain.h index aa647b8..8c73cc4 100644 --- a/src/libxl/libxl_domain.h +++ b/src/libxl/libxl_domain.h @@ -64,6 +64,7 @@ struct _libxlDomainObjPrivate { virChrdevsPtr devs; libxl_evgen_domain_death *deathW; unsigned short migrationPort; + char *lockState; struct libxlDomainJobObj job; }; diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 6a54c73..1ecfd71 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -57,6 +57,7 @@ #include "viratomic.h" #include "virhostdev.h" #include "network/bridge_driver.h" +#include "locking/domain_lock.h" #define VIR_FROM_THIS VIR_FROM_LIBXL @@ -411,6 +412,7 @@ libxlStateCleanup(void) virObjectUnref(libxl_driver->domains); virObjectUnref(libxl_driver->reservedVNCPorts); virObjectUnref(libxl_driver->migrationPorts); + virLockManagerPluginUnref(libxl_driver->lockManager); virObjectEventStateFree(libxl_driver->domainEventState); virSysinfoDefFree(libxl_driver->hostsysinfo); @@ -590,6 +592,14 @@ libxlStateInitialize(bool privileged, goto error; } + if (!(libxl_driver->lockManager = + virLockManagerPluginNew(cfg->lockManagerName ? + cfg->lockManagerName : "nop", + "libxl", + cfg->configBaseDir, + 0))) + goto error; + /* read the host sysinfo */ libxl_driver->hostsysinfo = virSysinfoRead(); @@ -2860,11 +2870,21 @@ libxlDomainAttachDeviceDiskLive(virDomainObjPtr vm, virDomainDeviceDefPtr dev) if (libxlMakeDisk(l_disk, &x_disk) < 0) goto cleanup; + if (virDomainLockDiskAttach(libxl_driver->lockManager, + "xen:///system", + vm, l_disk) < 0) + goto cleanup; + if ((ret = libxl_device_disk_add(cfg->ctx, vm->def->id, &x_disk, NULL)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("libxenlight failed to attach disk '%s'"), l_disk->dst); + if (virDomainLockDiskDetach(libxl_driver->lockManager, + vm, l_disk) < 0) { + VIR_WARN("Unable to release lock on %s", + virDomainDiskGetSource(l_disk)); + } goto cleanup; } @@ -3005,6 +3025,11 @@ libxlDomainDetachDeviceDiskLive(virDomainObjPtr vm, virDomainDeviceDefPtr dev) goto cleanup; } + if (virDomainLockDiskDetach(libxl_driver->lockManager, + vm, l_disk) < 0) + VIR_WARN("Unable to release lock on %s", + virDomainDiskGetSource(l_disk)); + virDomainDiskRemove(vm->def, idx); virDomainDiskDefFree(l_disk); diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index 51993c6..1efd98f 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -41,6 +41,7 @@ #include "libxl_driver.h" #include "libxl_conf.h" #include "libxl_migration.h" +#include "locking/domain_lock.h" #define VIR_FROM_THIS VIR_FROM_LIBXL @@ -469,6 +470,7 @@ libxlDomainMigrationPerform(libxlDriverPrivatePtr driver, const char *dname ATTRIBUTE_UNUSED, unsigned int flags) { + libxlDomainObjPrivatePtr priv = vm->privateData; char *hostname = NULL; unsigned short port = 0; char portstr[100]; @@ -503,6 +505,10 @@ libxlDomainMigrationPerform(libxlDriverPrivatePtr driver, sockfd = virNetSocketDupFD(sock, true); virObjectUnref(sock); + if (virDomainLockProcessPause(driver->lockManager, vm, &priv->lockState) < 0) + VIR_WARN("Unable to release lease on %s", vm->def->name); + VIR_DEBUG("Preserving lock state '%s'", NULLSTR(priv->lockState)); + /* suspend vm and send saved data to dst through socket fd */ virObjectUnlock(vm); ret = libxlDoMigrateSend(driver, vm, flags, sockfd); diff --git a/src/libxl/test_libvirtd_libxl.aug.in b/src/libxl/test_libvirtd_libxl.aug.in index 23e667c..baa8c79 100644 --- a/src/libxl/test_libvirtd_libxl.aug.in +++ b/src/libxl/test_libvirtd_libxl.aug.in @@ -3,3 +3,4 @@ module Test_libvirtd_libxl = test Libvirtd_libxl.lns get conf = { "autoballoon" = "1" } +{ "lock_manager" = "lockd" } -- 1.8.4.5

3 6

[libvirt] [PATCH] qemu: Fix bus and lun checks when scsi-disk.channel not present
by John Ferlan 01 May '15

01 May '15

Found by Laine and discussed a bit on internal IRC. Commit id c56fe7f1d6 added support for creating a command line to support scsi-disk.channel. Series was here: http://www.redhat.com/archives/libvir-list/2012-February/msg01052.html Which pointed to a design proposal here: http://permalink.gmane.org/gmane.comp.emulators.libvirt/50428 Which states (in part): Libvirt should check for the QEMU "scsi-disk.channel" property. If it is unavailable, QEMU will only support channel=lun=0 and 0<=target<=7. However, the check added was ensuring that bus != lun *and* bus != 0. So if bus == lun and both were non zero, we'd never make the second check. Changing this to an *or* check fixes the check, but still is less readable than the just checking each for 0 Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/qemu/qemu_command.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 0dc8628..583bc11 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4127,8 +4127,8 @@ qemuBuildDriveDevStr(virDomainDefPtr def, goto error; } - if ((disk->info.addr.drive.bus != disk->info.addr.drive.unit) && - (disk->info.addr.drive.bus != 0)) { + if (disk->info.addr.drive.bus != 0 && + disk->info.addr.drive.unit != 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("This QEMU only supports both bus and " "unit equal to 0")); -- 2.1.0

2 1

[libvirt] [PATCH] rpm-build: update %files section for libxl
by Pavel Hrdina 30 Apr '15

30 Apr '15

Recent commit 198cc1d3 introduced integration of lockd and sanlock into libxl, but forget to update libvirt.spec.in to also list new files distributed via package. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Pushed under build-breaker rule. libvirt.spec.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 20af502..f95e31f 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -2129,6 +2129,8 @@ exit 0 %files daemon-driver-libxl %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/libvirt/libxl.conf +%config(noreplace) %{_sysconfdir}/libvirt/libxl-lockd.conf +%config(noreplace) %{_sysconfdir}/libvirt/libxl-sanlock.conf %{_datadir}/augeas/lenses/libvirtd_libxl.aug %{_datadir}/augeas/lenses/tests/test_libvirtd_libxl.aug %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/libxl/ -- 2.0.5

3 2

[libvirt] [PATCH] main: add new generated files to .gitignore
by Pavel Hrdina 30 Apr '15

30 Apr '15

This means new libxl-lockd.conf and libxl-sanlock.conf Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Pushed under trivial rule. .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 9d09709..7bcf359 100644 --- a/.gitignore +++ b/.gitignore @@ -124,6 +124,8 @@ /src/libvirt_*helper /src/libvirt_*probes.h /src/libvirt_lxc +/src/locking/libxl-lockd.conf +/src/locking/libxl-sanlock.conf /src/locking/lock_daemon_dispatch_stubs.h /src/locking/lock_protocol.[ch] /src/locking/qemu-lockd.conf -- 2.0.5

1 0

[libvirt] [PATCH] qemu: blockjob: Call qemuDomainSupportsBlockJobs only on online VMs
by Peter Krempa 30 Apr '15

30 Apr '15

Since the qemu capabilities are not initialized for offline VMs the caller might get suboptimal error message: $ virsh blockjob VM PATH --bandwidth 1 error: unsupported configuration: block jobs not supported with this QEMU binary Move the checks after we make sure that the VM is alive. --- src/qemu/qemu_driver.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 3695b26..d6e7570 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16555,34 +16555,34 @@ qemuDomainBlockPullCommon(virQEMUDriverPtr driver, goto cleanup; } - if (qemuDomainSupportsBlockJobs(vm, &modern) < 0) + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) goto cleanup; + if (!virDomainObjIsActive(vm)) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("domain is not running")); + goto endjob; + } + + if (qemuDomainSupportsBlockJobs(vm, &modern) < 0) + goto endjob; + if (!modern) { if (base) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("partial block pull not supported with this " "QEMU binary")); - goto cleanup; + goto endjob; } if (bandwidth) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("setting bandwidth at start of block pull not " "supported with this QEMU binary")); - goto cleanup; + goto endjob; } } - if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) - goto cleanup; - - if (!virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("domain is not running")); - goto endjob; - } - if (!(device = qemuDiskPathToAlias(vm, path, &idx))) goto endjob; disk = vm->def->disks[idx]; @@ -16682,9 +16682,6 @@ qemuDomainBlockJobAbort(virDomainPtr dom, if (virDomainBlockJobAbortEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - if (qemuDomainSupportsBlockJobs(vm, &modern) < 0) - goto cleanup; - if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) goto cleanup; @@ -16694,6 +16691,9 @@ qemuDomainBlockJobAbort(virDomainPtr dom, goto endjob; } + if (qemuDomainSupportsBlockJobs(vm, &modern) < 0) + goto endjob; + if (!(device = qemuDiskPathToAlias(vm, path, &idx))) goto endjob; disk = vm->def->disks[idx]; @@ -16896,9 +16896,6 @@ qemuDomainBlockJobSetSpeed(virDomainPtr dom, if (virDomainBlockJobSetSpeedEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - if (qemuDomainSupportsBlockJobs(vm, &modern) < 0) - goto cleanup; - if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) goto cleanup; @@ -16908,6 +16905,9 @@ qemuDomainBlockJobSetSpeed(virDomainPtr dom, goto endjob; } + if (qemuDomainSupportsBlockJobs(vm, &modern) < 0) + goto endjob; + if (!(device = qemuDiskPathToAlias(vm, path, NULL))) goto endjob; -- 2.3.5

2 2