- 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