- Devel - libvirt List Archives

[libvirt] [PATCH v4 0/9] Implement Add/Del IOThreads
by John Ferlan 24 Apr '15

24 Apr '15

v3 here: http://www.redhat.com/archives/libvir-list/2015-April/msg00621.html Changes since v3 Patch 1: * Add back in and use virDomainIOThreadIDDefFree * Change _virDomainIOThreadIDDef 'undefined' to 'autofill' * Adjust virDomainDefParseXML to only allocate what's defined allowing virDomainDefPostParseInternal to Add in IOThreads which weren't defined and set the 'autofill' boolean * Have virDomainIOThreadIDAdd return a virDomainIOThreadIDDefPtr Patch 2: No changes Patch 3: (NEW) * Discussed in prior review regarding making virDomainPinIsDuplicate a static function (needed to move it) Patch 4: (NEW) * Move the iothreadspin data (e.g., the cpumask) into _virDomainIOThreadIDDef * Kept the 'niothreadspin' and manipulated as necessary since there was code to write out <cputune> data that I didn't want to reinvent/rototill just to search through iothreadids for a cpumask * Adjusted virDomainIOThreadPinDefParseXML to handle storing the cpumask in the right iothreadsid[] entry. If not found (it may not be since the virDomainDefPostParseInternal hasn't run), then create an autofill version of an iothreadids entry. * Remove/adjust a lot of code that used to handle iothreadspin Patch 5: (NEW) * Slight adjustment for iothreadsched to allow for "any" id value. This code stores iothread id's as bitmap entries, so it didn't have the same issues as the iothreadspin code Patch 6-7: Unchanged Patch 8: * Adjusted the search for the new thread code to use existing alias * Use the virDomainIOThreadIDAdd returned pointer * Comment adjustments from code review * Removal of erroneously cut-n-pasted code in Delete path * Use the ->dst for the message * Changes based on having cpumask in the iothrid data Patch 9: No changes John Ferlan (9): conf: Add new domain XML element 'iothreadids' qemu: Use domain iothreadids to IOThread's 'thread_id' conf: Move virDomainPinIsDuplicate and make static Move iothreadspin information into iothreadids conf: Adjust the iothreadsched expectations Implement virDomainAddIOThread and virDomainDelIOThread remote: Add support for AddIOThread and DelIOThread qemu: Add support to Add/Delete IOThreads virsh: Add iothreadadd and iothreaddel commands docs/formatdomain.html.in | 46 +- docs/schemas/domaincommon.rng | 12 + include/libvirt/libvirt-domain.h | 6 + src/conf/domain_audit.c | 9 + src/conf/domain_audit.h | 6 + src/conf/domain_conf.c | 340 ++++++++++---- src/conf/domain_conf.h | 25 +- src/driver-hypervisor.h | 12 + src/libvirt-domain.c | 118 +++++ src/libvirt_private.syms | 6 +- src/libvirt_public.syms | 6 + src/qemu/qemu_cgroup.c | 31 +- src/qemu/qemu_command.c | 38 +- src/qemu/qemu_command.h | 3 + src/qemu/qemu_domain.c | 36 -- src/qemu/qemu_domain.h | 3 - src/qemu/qemu_driver.c | 511 ++++++++++++++++++--- src/qemu/qemu_process.c | 40 +- src/remote/remote_driver.c | 2 + src/remote/remote_protocol.x | 30 +- src/remote_protocol-structs | 12 + .../qemuxml2argv-cputune-iothreadsched-toomuch.xml | 1 + .../qemuxml2argv-iothreads-ids-partial.args | 10 + .../qemuxml2argv-iothreads-ids-partial.xml | 33 ++ .../qemuxml2argv-iothreads-ids.args | 8 + .../qemuxml2argv-iothreads-ids.xml | 33 ++ tests/qemuxml2argvtest.c | 2 + tests/qemuxml2xmltest.c | 2 + tools/virsh-domain.c | 164 +++++++ tools/virsh.pod | 31 ++ 30 files changed, 1320 insertions(+), 256 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids-partial.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids-partial.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids.xml -- 2.1.0

2 26

[libvirt] [PATCH] build: avoid obsolete index()
by Eric Blake 23 Apr '15

23 Apr '15

Commit 2a530a3e5 is not portable to mingw, which intentionally avoids declaring the obsolete index(). See also: https://bugzilla.redhat.com/show_bug.cgi?id=1214605 * src/util/virstring.c (virStringStripControlChars): Use strchr. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. src/util/virstring.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/virstring.c b/src/util/virstring.c index 1cd4987..7b0cad7 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2014 Red Hat, Inc. + * Copyright (C) 2012-2015 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1003,7 +1003,7 @@ virStringStripControlChars(char *str) len = strlen(str); for (i = 0, j = 0; i < len; i++) { - if (index(control_chars, str[i])) + if (strchr(control_chars, str[i])) continue; str[j++] = str[i]; -- 2.1.0

1 0

[libvirt] [PATCH] parallels: implement .domainGetMaxMemory
by Dmitry Guryanov 23 Apr '15

23 Apr '15

Since we haven't implemented balloon parameters tuning we can just return amount of memory in this function. Signed-off-by: Dmitry Guryanov <dguryanov(a)parallels.com> --- src/parallels/parallels_driver.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/parallels/parallels_driver.c b/src/parallels/parallels_driver.c index 391e927..d13a4e2 100644 --- a/src/parallels/parallels_driver.c +++ b/src/parallels/parallels_driver.c @@ -1089,6 +1089,24 @@ parallelsDomainManagedSaveRemove(virDomainPtr domain, unsigned int flags) return ret; } +static unsigned long long +parallelsDomainGetMaxMemory(virDomainPtr domain) +{ + parallelsConnPtr privconn = domain->conn->privateData; + virDomainObjPtr dom = NULL; + int ret = -1; + + dom = virDomainObjListFindByUUID(privconn->domains, domain->uuid); + if (dom == NULL) { + parallelsDomNotFoundError(domain); + return -1; + } + + ret = dom->def->mem.max_balloon; + virObjectUnlock(dom); + return ret; +} + static virHypervisorDriver parallelsDriver = { .name = "Parallels", .connectOpen = parallelsConnectOpen, /* 0.10.0 */ @@ -1133,6 +1151,7 @@ static virHypervisorDriver parallelsDriver = { .domainHasManagedSaveImage = parallelsDomainHasManagedSaveImage, /* 1.2.13 */ .domainManagedSave = parallelsDomainManagedSave, /* 1.2.14 */ .domainManagedSaveRemove = parallelsDomainManagedSaveRemove, /* 1.2.14 */ + .domainGetMaxMemory = parallelsDomainGetMaxMemory, /* 1.2.14 */ }; static virConnectDriver parallelsConnectDriver = { -- 2.1.0

2 3

[libvirt] [PATCH 0/2] parallels: some fixes
by Maxim Nestratov 23 Apr '15

23 Apr '15

Maxim Nestratov (2): parallels: fix crash in prlsdkAddNet in case of CT definition parallels: fix IS_CT macro

2 5

[libvirt] [PATCH 0/4] Introduce parallelsDomObjFromDomain()
by Michal Privoznik 23 Apr '15

23 Apr '15

We have such wrapper in other drivers too: qemu, lxc, network, ... Michal Privoznik (4): struct _parallelsConn: Mark @domains as immutable pointer parallels: Introduce parallelsDomObjFromDomain() parallels_driver: Utilize parallelsDomObjFromDomain() parallels_sdk: Utilize parallelsDomObjFromDomain() src/parallels/parallels_driver.c | 93 ++++++---------------------------------- src/parallels/parallels_sdk.c | 5 +-- src/parallels/parallels_utils.c | 32 ++++++++++++++ src/parallels/parallels_utils.h | 5 +++ 4 files changed, 51 insertions(+), 84 deletions(-) -- 2.0.5

3 7

[libvirt] [PATCH] qemu: lock: unlock vm during qemuBuildCommandLine
by zhang bo 23 Apr '15

23 Apr '15

The function qemuBuildCommandLine() may take a long time, for example if we configure tens of vifs for the guest, each may cost hundrands of milliseconds to create tap dev, senconds in total. Thus, unlock vm before calling it. Signed-off-by: Zhang Bo <oscar.zhangbo(a)huawei.com> Signed-off-by: Zhou Yimin <zhouyimin(a)huawei.com> --- src/qemu/qemu_process.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 753afe8..d1aaaec 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4628,14 +4628,18 @@ int qemuProcessStart(virConnectPtr conn, } VIR_DEBUG("Building emulator command line"); + virObjectUnlock(vm); if (!(cmd = qemuBuildCommandLine(conn, driver, vm->def, priv->monConfig, priv->monJSON, priv->qemuCaps, migrateFrom, stdin_fd, snapshot, vmop, &buildCommandLineCallbacks, false, qemuCheckFips(), priv->autoNodeset, - &nnicindexes, &nicindexes))) + &nnicindexes, &nicindexes))) { + virObjectLock(vm); goto cleanup; + } + virObjectLock(vm); /* now that we know it is about to start call the hook if present */ if (virHookPresent(VIR_HOOK_DRIVER_QEMU)) { -- 1.7.12.4

4 11

[libvirt] [RFCv2 PoCv1 PATCH 00/15] Just Admin API
by Martin Kletzander 23 Apr '15

23 Apr '15

*** BLURB *** ... Just kidding :) Sooo... After very very VERY long time, here's a draft of an admin interface that is supposed to open up new possibilities to be done on a live daemon. The aim here is to create some first inches of that API in order to open up the possibility of new API function creation to more people. I already spent so much time explaining so much of that that I don't know what else to point at in here. Maybe the fact that last three patches are just an example on how this might work. Of course there won't be any functions like listClientIDs with the need of getting each client info by another API. There's going to be e.g. virAdmClientInfo and virAdmGetClients() will return the list of them, etc. Long story short, let's not repeat past mistakes ;) With all that said, feel free to hate, love, comment or just try out compiling this series and let me know how many things I've missed and screwed up (hopefully zero). Martin Kletzander (15): util: add virJSONValueCopy util: Add virabstracts file for keeping abstract classes datatypes: Use abstract connect class in virConnect Break virNetServer into virNetSubServers Teach gendispatch how to handle admin dispatching files Add admin protocol Build client headers for admin protocol Add admin error domain Add libvirt-admin library Add XML files with admin API specification Add configuration options for permissions on daemon's admin socket Add support for admin API in libvirt daemon rpc: Add virNetSubServerGetNClients admin: Add virAdmHello function Example virt-admin .gitignore | 5 + Makefile.am | 4 +- cfg.mk | 11 +- configure.ac | 19 +- daemon/Makefile.am | 33 +- daemon/admin_server.c | 119 +++++ daemon/admin_server.h | 36 ++ daemon/libvirtd-config.c | 5 +- daemon/libvirtd-config.h | 1 + daemon/libvirtd.aug | 1 + daemon/libvirtd.c | 138 ++++-- daemon/libvirtd.conf | 8 + daemon/libvirtd.h | 14 +- daemon/remote.c | 194 ++++----- daemon/test_libvirtd.aug.in | 1 + docs/Makefile.am | 23 +- docs/apibuild.py | 10 +- include/libvirt/Makefile.am | 6 +- include/libvirt/libvirt-admin.h | 63 +++ include/libvirt/virterror.h | 3 +- libvirt-admin.pc.in | 13 + libvirt.spec.in | 10 + po/POTFILES.in | 3 + src/Makefile.am | 134 +++++- src/admin/admin_protocol.x | 73 ++++ src/admin_protocol-structs | 17 + src/datatypes.c | 39 +- src/datatypes.h | 45 +- src/internal.h | 1 + src/libvirt-admin.c | 363 ++++++++++++++++ src/libvirt-host.c | 3 +- src/libvirt_admin.syms | 19 + src/libvirt_private.syms | 6 + src/libvirt_remote.syms | 17 +- src/locking/lock_daemon.c | 40 +- src/locking/lock_daemon_dispatch.c | 18 +- src/lxc/lxc_controller.c | 18 +- src/rpc/gendispatch.pl | 141 +++--- src/rpc/virnetserver.c | 859 +++++++++++++------------------------ src/rpc/virnetserver.h | 61 +-- src/rpc/virnetserverprogram.c | 12 +- src/rpc/virnetserverprogram.h | 9 +- src/rpc/virnetsubserver.c | 672 +++++++++++++++++++++++++++++ src/rpc/virnetsubserver.h | 78 ++++ src/util/virabstracts.c | 100 +++++ src/util/virabstracts.h | 57 +++ src/util/virerror.c | 95 ++-- src/util/virerror.h | 4 +- src/util/virjson.c | 65 ++- src/util/virjson.h | 4 +- tests/confdata/libvirtd.conf | 6 + tests/confdata/libvirtd.out | 5 + tests/jsontest.c | 111 +++++ tools/virt-admin/Makefile.am | 70 +++ tools/virt-admin/virt-admin.c | 68 +++ tools/virt-admin/virt-admin.pod | 43 ++ 56 files changed, 3092 insertions(+), 881 deletions(-) create mode 100644 daemon/admin_server.c create mode 100644 daemon/admin_server.h create mode 100644 include/libvirt/libvirt-admin.h create mode 100644 libvirt-admin.pc.in create mode 100644 src/admin/admin_protocol.x create mode 100644 src/admin_protocol-structs create mode 100644 src/libvirt-admin.c create mode 100644 src/libvirt_admin.syms create mode 100644 src/rpc/virnetsubserver.c create mode 100644 src/rpc/virnetsubserver.h create mode 100644 src/util/virabstracts.c create mode 100644 src/util/virabstracts.h create mode 100644 tools/virt-admin/Makefile.am create mode 100644 tools/virt-admin/virt-admin.c create mode 100644 tools/virt-admin/virt-admin.pod -- 2.3.5

4 29

[libvirt] [PATCH] rng: fix port number range validation
by Daniel P. Berrange 23 Apr '15

23 Apr '15

The PortNumber data type is declared to derive from 'short'. Unfortunately this is an signed type, so validates the range [-32,768, 32,767] which excludes valid port numbers between 32767 and 65535. We can't use 'unsignedShort', since we need -1 to be a valid port number too. This change is to use 'int' and set an explicit max boundary instead of relying on the data types' built-in max. One of the existing tests is changed to use a high port number to validate the schema. https://bugzilla.redhat.com/show_bug.cgi?id=1214664 Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- docs/schemas/basictypes.rng | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.xml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/schemas/basictypes.rng b/docs/schemas/basictypes.rng index f086ad2..a83063a 100644 --- a/docs/schemas/basictypes.rng +++ b/docs/schemas/basictypes.rng @@ -349,8 +349,9 @@ </define> <define name="PortNumber"> - <data type="short"> + <data type="int"> <param name="minInclusive">-1</param> + <param name="maxInclusive">65535</param> </data> </define> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args index 1b61fcf..34dc767 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args @@ -1,4 +1,4 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ /usr/bin/qemu -S -M pc -m 214 -smp 1 -monitor unix:/tmp/test-monitor,server,nowait \ -no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 \ --net none -serial none -parallel none -vnc 127.0.0.1:0,share=allow-exclusive +-net none -serial none -parallel none -vnc 127.0.0.1:59630,share=allow-exclusive diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.xml index f78ff48..4b88e49 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.xml @@ -25,7 +25,7 @@ <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> - <graphics type='vnc' port='5900' autoport='no' listen='127.0.0.1' sharePolicy='allow-exclusive'> + <graphics type='vnc' port='65530' autoport='no' listen='127.0.0.1' sharePolicy='allow-exclusive'> <listen type='address' address='127.0.0.1'/> </graphics> <video> -- 2.1.0

2 1

[libvirt] [PATCH 0/2] Apparmor PCI passthrough fixes
by Cédric Bosdonnat 23 Apr '15

23 Apr '15

Hi all, These two simple patches intend to fix apparmor profiles for PCI passthrough with the qemu driver. Cédric Bosdonnat (2): Allow access to vendor and device file for PCI device passthrough Apparmor: allow reading block-rbd.so examples/apparmor/libvirt-qemu | 1 + src/util/virpci.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) -- 2.1.4

2 3

[libvirt] [PATCH] util: string: Avoid use of deprecated function index()
by Peter Krempa 23 Apr '15

23 Apr '15

--- src/util/virstring.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/util/virstring.c b/src/util/virstring.c index 1cd4987..e48c29a 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -976,6 +976,21 @@ static const char control_chars[] = "\x10\x11\x12\x13\x14\x15\x16\x17" "\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F"; + +static bool +virStringIsControlChar(char c) +{ + const char *cch; + + for (cch = control_chars; *cch; cch++) { + if (*cch == c) + return true; + } + + return false; +} + + bool virStringHasControlChars(const char *str) { @@ -1003,7 +1018,7 @@ virStringStripControlChars(char *str) len = strlen(str); for (i = 0, j = 0; i < len; i++) { - if (index(control_chars, str[i])) + if (virStringIsControlChar(str[i])) continue; str[j++] = str[i]; -- 2.3.5

2 1

[libvirt] [PATCH] qemu: Don't fail to reboot domains with unresponsive agent
by zhang bo 23 Apr '15

23 Apr '15

just as what b8e25c35d7f80a2fadc0e51e95318e39db3d1687 did, we fall back to the ACPI method when the guest agent is unresponsive in qemuDomainReboot. Signed-off-by: YueWenyuan <yuewenyuan(a)huawei.com> Signed-off-by: Zhang Bo <oscar.zhangbo(a)huawei.com> --- src/qemu/qemu_driver.c | 67 +++++++++++++++++++++++++------------------------- 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6fc9696..964a9c5 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2002,21 +2002,14 @@ qemuDomainReboot(virDomainPtr dom, unsigned int flags) virDomainObjPtr vm; int ret = -1; qemuDomainObjPrivatePtr priv; - bool useAgent = false; + bool useAgent = false, agentRequested, acpiRequested; bool isReboot = true; + bool agentForced; int agentFlag = QEMU_AGENT_SHUTDOWN_REBOOT; virCheckFlags(VIR_DOMAIN_REBOOT_ACPI_POWER_BTN | VIR_DOMAIN_REBOOT_GUEST_AGENT, -1); - /* At most one of these two flags should be set. */ - if ((flags & VIR_DOMAIN_REBOOT_ACPI_POWER_BTN) && - (flags & VIR_DOMAIN_REBOOT_GUEST_AGENT)) { - virReportInvalidArg(flags, "%s", - _("flags for acpi power button and guest agent are mutually exclusive")); - return -1; - } - if (!(vm = qemuDomObjFromDomain(dom))) goto cleanup; @@ -2028,38 +2021,25 @@ qemuDomainReboot(virDomainPtr dom, unsigned int flags) } priv = vm->privateData; + agentRequested = flags & VIR_DOMAIN_REBOOT_GUEST_AGENT; + acpiRequested = flags & VIR_DOMAIN_REBOOT_ACPI_POWER_BTN; if (virDomainRebootEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; - if ((flags & VIR_DOMAIN_REBOOT_GUEST_AGENT) || - (!(flags & VIR_DOMAIN_REBOOT_ACPI_POWER_BTN) && - priv->agent)) + /* Prefer agent unless we were requested to not to. */ + if (agentRequested || (!flags && priv->agent)) useAgent = true; - if (!useAgent) { -#if WITH_YAJL - if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MONITOR_JSON)) { - if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_NO_SHUTDOWN)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Reboot is not supported with this QEMU binary")); - goto cleanup; - } - } else { -#endif - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("Reboot is not supported without the JSON monitor")); - goto cleanup; -#if WITH_YAJL - } -#endif - } - if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) goto cleanup; - if (useAgent && !qemuDomainAgentAvailable(vm, true)) - goto endjob; + agentForced = agentRequested && !acpiRequested; + if (useAgent && !qemuDomainAgentAvailable(vm, true)) { + if (agentForced) + goto endjob; + useAgent = false; + } if (!virDomainObjIsActive(vm)) { virReportError(VIR_ERR_OPERATION_INVALID, @@ -2071,7 +2051,28 @@ qemuDomainReboot(virDomainPtr dom, unsigned int flags) qemuDomainObjEnterAgent(vm); ret = qemuAgentShutdown(priv->agent, agentFlag); qemuDomainObjExitAgent(vm); - } else { + } + + /* If we are not enforced to use just an agent, try ACPI + * shutdown as well in case agent did not succeed. + */ + if ((!useAgent) || + (ret < 0 && (acpiRequested || !flags))) { +#if WITH_YAJL + if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MONITOR_JSON)) { + if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_NO_SHUTDOWN)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("ACPI reboot is not supported with this QEMU binary")); + goto endjob; + } + } else { +#endif + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("ACPI reboot is not supported without the JSON monitor")); + goto endjob; +#if WITH_YAJL + } +#endif qemuDomainObjEnterMonitor(driver, vm); ret = qemuMonitorSystemPowerdown(priv->mon); if (qemuDomainObjExitMonitor(driver, vm) < 0) -- 1.7.12.4

2 1

[libvirt] [PATCH] bhyve: fix build in tests
by Roman Bogorodskiy 23 Apr '15

23 Apr '15

Commit 835cf84 dropped expectedVirtTypes argument for virDomainDefParse*() functions, however bhyve tests still try to pass that to virDomainDefParseFile(), therefore build fails. Fix build by fixing virDomainDefParseFile() usage. --- tests/bhyvexml2argvtest.c | 1 - tests/bhyvexml2xmltest.c | 1 - 2 files changed, 2 deletions(-) diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index c5b0681..26d0075 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -32,7 +32,6 @@ static int testCompareXMLToArgvFiles(const char *xml, goto out; if (!(vmdef = virDomainDefParseFile(xml, driver.caps, driver.xmlopt, - 1 << VIR_DOMAIN_VIRT_BHYVE, VIR_DOMAIN_DEF_PARSE_INACTIVE))) goto out; diff --git a/tests/bhyvexml2xmltest.c b/tests/bhyvexml2xmltest.c index a1a3701..2e742cf 100644 --- a/tests/bhyvexml2xmltest.c +++ b/tests/bhyvexml2xmltest.c @@ -27,7 +27,6 @@ testCompareXMLToXMLFiles(const char *inxml, const char *outxml) goto fail; if (!(def = virDomainDefParseString(inXmlData, driver.caps, driver.xmlopt, - 1 << VIR_DOMAIN_VIRT_BHYVE, VIR_DOMAIN_DEF_PARSE_INACTIVE))) goto fail; -- 2.3.5

2 2

[libvirt] [PATCH] configure: Report --with-loader-nvram value in summary
by Cole Robinson 23 Apr '15

23 Apr '15

--- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index 7f6fd7c..d5fb71d 100644 --- a/configure.ac +++ b/configure.ac @@ -2980,6 +2980,7 @@ AC_MSG_NOTICE([ XML Catalog: $XML_CATALOG_FILE]) AC_MSG_NOTICE([ Init script: $with_init_script]) AC_MSG_NOTICE([Char device locks: $with_chrdev_lock_files]) AC_MSG_NOTICE([ Default Editor: $DEFAULT_EDITOR]) +AC_MSG_NOTICE([ Loader/NVRAM: $with_loader_nvram]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([Developer Tools]) AC_MSG_NOTICE([]) -- 2.3.5

2 4

[libvirt] [PATCH V2 0/2] Support libvirt's lock manager in the libxl driver
by Jim Fehlig 23 Apr '15

23 Apr '15

V2 of https://www.redhat.com/archives/libvir-list/2015-April/msg00845.html Patch 2 has been ACKed and pushed since it is independent of the lock manager integration. Patch 1 has been changed to address Daniel's comments. Patch 2 (was patch 3 in V1) is unchanged for the time being. Jim Fehlig (2): locking: relax PID requirement libxl: provide integration with lock manager 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 | 47 ++++++++++++++++++++++++++++++++++-- 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 + src/locking/lock_daemon.c | 2 +- src/locking/lock_daemon_dispatch.c | 16 ++++++------ src/locking/lock_driver_lockd.c | 7 ++---- 13 files changed, 133 insertions(+), 16 deletions(-) -- 1.8.4.5

2 4

[libvirt] [PATCH] spec: Fix libxl build with driver modules
by Cole Robinson 23 Apr '15

23 Apr '15

--- Pushed as build breaker libvirt.spec.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 5d8a9d4..c5c6608 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -2127,6 +2127,9 @@ exit 0 %if %{with_libxl} %files daemon-driver-libxl %defattr(-, root, root) +%config(noreplace) %{_sysconfdir}/libvirt/libxl.conf +%{_datadir}/augeas/lenses/libvirtd_libxl.aug +%{_datadir}/augeas/lenses/tests/test_libvirtd_libxl.aug %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/libxl/ %ghost %dir %{_localstatedir}/run/libvirt/libxl/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/ -- 2.3.5

1 0

[libvirt] [PATCH] configure: Fix --loader-nvram typo
by Cole Robinson 23 Apr '15

23 Apr '15

--- Pushed as trivial configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index aed0934..7f6fd7c 100644 --- a/configure.ac +++ b/configure.ac @@ -2776,7 +2776,7 @@ AC_ARG_WITH([loader-nvram], fi AC_DEFINE_UNQUOTED([DEFAULT_LOADER_NVRAM], ["$withval"], - [List of laoder:nvram pairs])]) + [List of loader:nvram pairs])]) # Some GNULIB base64 symbols clash with a kerberos library AC_DEFINE_UNQUOTED([isbase64],[libvirt_gl_isbase64],[Hack to avoid symbol clash]) -- 2.3.5

1 0

[libvirt] [PATCH] parallels: don't forget to unlock domain after successful virDomainObjListFindByUUID call
by Maxim Nestratov 23 Apr '15

23 Apr '15

Also a typo is fixed (s/detached/attached/) Signed-off-by: Maxim Nestratov mnestratov(a)parallels.com --- src/parallels/parallels_driver.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/parallels/parallels_driver.c b/src/parallels/parallels_driver.c index 46e6c3e..41908a5 100644 --- a/src/parallels/parallels_driver.c +++ b/src/parallels/parallels_driver.c @@ -1081,7 +1081,7 @@ static int parallelsDomainAttachDeviceFlags(virDomainPtr dom, const char *xml, privdom = virDomainObjListFindByUUID(privconn->domains, dom->uuid); if (privdom == NULL) { parallelsDomNotFoundError(dom); - goto cleanup; + return -1; } if (!(flags & VIR_DOMAIN_AFFECT_CONFIG)) { @@ -1120,13 +1120,14 @@ static int parallelsDomainAttachDeviceFlags(virDomainPtr dom, const char *xml, break; default: virReportError(VIR_ERR_OPERATION_UNSUPPORTED, - _("device type '%s' cannot be detached"), + _("device type '%s' cannot be attached"), virDomainDeviceTypeToString(dev->type)); break; } ret = 0; cleanup: + virObjectUnlock(privdom); return ret; } -- 1.7.1

2 2

[libvirt] [PATCH 0/3] Support libvirt's lock manager in the libxl driver
by Jim Fehlig 22 Apr '15

22 Apr '15

Patch 1 relaxes the requirement of PID != 0 in the locking code. danpb and I discussed this on IRC: danpb: jimfehlig: it wouldn't be the end of the world if you leave pid as 0 danpb: jimfehlig: it'd just loose some safety sanity check in that scenario Patch 2 introduces a config file for the libxl driver, with the lone config entry 'autoballoon'. I thought this would make review easier, vs adding all the config file support in patch 3, which is fairly large as is. Jim Fehlig (3): locking: relax PID requirement libxl: Introduce configuration file for libxl driver libxl: provide integration with lock manager libvirt.spec.in | 8 ++++ src/Makefile.am | 36 ++++++++++++++++- src/libxl/libvirtd_libxl.aug | 44 +++++++++++++++++++++ src/libxl/libxl.conf | 22 +++++++++++ src/libxl/libxl_conf.c | 75 +++++++++++++++++++++++++++++++++--- src/libxl/libxl_conf.h | 11 ++++++ src/libxl/libxl_domain.c | 47 +++++++++++++++++++++- src/libxl/libxl_domain.h | 1 + src/libxl/libxl_driver.c | 34 ++++++++++++++++ src/libxl/libxl_migration.c | 6 +++ src/libxl/test_libvirtd_libxl.aug.in | 6 +++ src/locking/lock_daemon.c | 2 +- src/locking/lock_daemon_dispatch.c | 49 +++++++---------------- src/locking/lock_driver_lockd.c | 7 +--- 14 files changed, 298 insertions(+), 50 deletions(-) create mode 100644 src/libxl/libvirtd_libxl.aug create mode 100644 src/libxl/libxl.conf create mode 100644 src/libxl/test_libvirtd_libxl.aug.in -- 1.8.4.5

2 10

[libvirt] [PATCH 0/2] Add tox.ini to run tests with tox
by Victor Stinner 22 Apr '15

22 Apr '15

Tox is a convinient tool creating virtual environment to install dependencies and run tests. To run all tests, just type "tox". To only test a specific Python version, use "tox -e py34" (Python 3.4). Victor Stinner (2): sanitytest.py parameters are now optional Add tox.ini to run tests on Python 2.6, 2.7 & 3.4 .gitignore | 1 + sanitytest.py | 23 ++++++++++++++++++----- tox.ini | 10 ++++++++++ 3 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 tox.ini -- 2.1.0

4 8

[libvirt] [PATCH v2] libvirt-python: add classifiers to setup.py
by Victor Stinner 22 Apr '15

22 Apr '15

Add the Python 3 classifier, needed by the caniusepython3 tool to check if dependencies of a projects are Python 3 compatible: https://caniusepython3.com/ --- setup.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 79b048f..a8e9e86 100755 --- a/setup.py +++ b/setup.py @@ -325,4 +325,13 @@ setup(name = 'libvirt-python', 'sdist': my_sdist, 'rpm': my_rpm, 'test': my_test - }) + }, + classifiers = [ + "Development Status :: 5 - Production/Stable", + "Intended Audience :: Developers", + "License :: OSI Approved :: GNU Lesser General Public License v2 or later (LGPLv2+)", + "Programming Language :: Python", + "Programming Language :: Python :: 2", + "Programming Language :: Python :: 3", + ] +) -- 2.1.0

2 1

[libvirt] [PATCH] vircommand: fix polling in virCommandProcessIO
by Roman Bogorodskiy 22 Apr '15

22 Apr '15

When running on FreeBSD, there's a bug in virCommandProcessIO polling that is triggered by the commandtest. A test that triggers EPIPE in commandtest (named "test20") hungs forever on FreeBSD. Apparently, this happens because FreeBSD sets POLLHUP flag on revents when stdin in closed. And as the current implementation only checks for POLLOUT and POLLERR, it ends up looping forever inside virCommandProcessIO and not trying to do one more write() that would trigger EPIPE. To fix that check for the POLLHUP flag along with POLLOUT and POLLERR. --- src/util/vircommand.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 648f5ed..f9b3c3f 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -2097,7 +2097,7 @@ virCommandProcessIO(virCommandPtr cmd) } } - if (fds[i].revents & (POLLOUT | POLLERR) && + if (fds[i].revents & (POLLOUT | POLLHUP | POLLERR) && fds[i].fd == cmd->inpipe) { int done; -- 2.3.5

2 2

[libvirt] [PATCH] schemas: capability: Add ostype 'aix'
by Cole Robinson 22 Apr '15

22 Apr '15

--- docs/schemas/capability.rng | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng index 5f3ec70..3868ee2 100644 --- a/docs/schemas/capability.rng +++ b/docs/schemas/capability.rng @@ -266,6 +266,7 @@ <value>hvm</value>  <value>exe</value>  <value>uml</value>  + <value>aix</value>  </choice> </element> </define> -- 2.3.5

3 3

[libvirt] [PATCH] libvirt-python: add classifiers to setup.py
by Victor Stinner 22 Apr '15

22 Apr '15

Add the Python 3 classifier, needed by the caniusepython3 tool to check if dependencies of a projects are Python 3 compatible: https://caniusepython3.com/ --- setup.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 79b048f..116b3c0 100755 --- a/setup.py +++ b/setup.py @@ -325,4 +325,12 @@ setup(name = 'libvirt-python', 'sdist': my_sdist, 'rpm': my_rpm, 'test': my_test - }) + }, + classifiers = [ + "Development Status :: 5 - Production/Stable", + "Intended Audience :: Developers", + "License :: OSI Approved :: GNU Lesser General Public License v2 or later (LGPLv2+)", + "Programming Language :: Python", + "Programming Language :: Python :: 3", + ] +) -- 2.1.0

2 1

[libvirt] [PATCHv2]rework the check for the numa cpus
by Luyao Huang 22 Apr '15

22 Apr '15

V1 discussion: https://www.redhat.com/archives/libvir-list/2015-April/msg00919.html new for v2: remove 1/2 because no need introduce a new flag to avoid the broken introduced by the new check. We introduce a check for numa cpu total count in 5f7b71, But seems this check cannot work well. There are some scenarioes: 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'/> the cpus '100' exceed maxvcpus, this setting is not valid (although qemu do not output error). 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'/> I guess nobody will use this setting if he really want use numa in his vm. (qemu not output error, but we can find some interesting things in vm, all cpus have bind in one numa node) 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'/> No need forbid this scenario if scenario 2 is a 'valid' setting. However add new check during parse xml will make vm has broken settings disappear after update libvirtd, so possible solutions: 1. add new check when parse xml, i chose this way in this version. 2. add new check when start vm. I think this is a configuration issue, so no need report it so late. 3. just remove this check and do not add new check... :) Luyao Huang (1): conf: rework the cpu check for vm numa settings src/conf/domain_conf.c | 6 +----- src/conf/numa_conf.c | 37 ++++++++++++++++++++++++++++++------- src/conf/numa_conf.h | 2 +- 3 files changed, 32 insertions(+), 13 deletions(-) -- 1.8.3.1

2 3

[libvirt] [PATCH 0/3] util: storage: fix indexed access to backing store
by Peter Krempa 22 Apr '15

22 Apr '15

Improve error reporting when an index can't be found in the backing chain. Peter Krempa (3): util: storage: Fix possible crash when source path is NULL util: storage: Add hint to error message that indexed access was used util: storage: Improve error message when requesting image above 'start' src/util/virstoragefile.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) -- 2.3.5

2 7

[libvirt] [PATCH 0/2] misc cleanups
by Peter Krempa 22 Apr '15

22 Apr '15

Peter Krempa (2): qemu: migration: Refactor hostdev validation in migration check util: command: Deduplicate code in virCommandNewArgList src/qemu/qemu_migration.c | 15 ++++----------- src/util/vircommand.c | 10 +++------- 2 files changed, 7 insertions(+), 18 deletions(-) -- 2.3.5

2 4

[libvirt] libvirt-0.10.2-46 compress failed
by 饶俊明 22 Apr '15

22 Apr '15

Hello When compress libvirt-0.10.2-46.el6.src.rpm to support rbd, then failed; Error log: cc1: warnings being treated as errors storage/storage_backend_rbd.c: In function 'virStorageBackendRBDRefreshPool': storage/storage_backend_rbd.c:284: error: declaration of 'stat' shadows a global declaration [-Wshadow] /usr/include/sys/stat.h:455: error: shadowed declaration is here [-Wshadow] At top level: cc1: error: unrecognized command line option "-Wno-suggest-attribute=const" cc1: error: unrecognized command line option "-Wno-suggest-attribute=pure" make[3]: *** [libvirt_driver_storage_impl_la-storage_backend_rbd.lo] Error 1 make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory `/home/ada/rpmbuild/BUILD/libvirt-0.10.2/src' make[2]: *** [all] Error 2 make[2]: Leaving directory `/home/ada/rpmbuild/BUILD/libvirt-0.10.2/src' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/home/ada/rpmbuild/BUILD/libvirt-0.10.2' make: *** [all] Error 2 error: Bad exit status from /var/tmp/rpm-tmp.g0IuFq (%build) RPM build errors: Bad exit status from /var/tmp/rpm-tmp.g0IuFq (%build) 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 3

[libvirt] [PATCH] util: fix build on non-Linux
by Roman Bogorodskiy 22 Apr '15

22 Apr '15

Build fails on non-Linux systems with this error: CC util/libvirt_util_la-virnetdev.lo util/virnetdev.c:364:1: error: unused function 'virNetDevReplaceMacAddress' [-Werror,-Wunused-function] virNetDevReplaceMacAddress(const char *linkdev, ^ util/virnetdev.c:406:1: error: unused function 'virNetDevRestoreMacAddress' [-Werror,-Wunused-function] virNetDevRestoreMacAddress(const char *linkdev, ^ 2 errors generated. The virNetDev{Restore,Replace}MacAddress() functions are only used by VF-related routines that are available on Linux only. So move these functions under the same #ifdef. --- src/util/virnetdev.c | 176 ++++++++++++++++++++++++++------------------------- 1 file changed, 89 insertions(+), 87 deletions(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index b7ea524..5069064 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -351,93 +351,6 @@ int virNetDevGetMAC(const char *ifname, -/** - * virNetDevReplaceMacAddress: - * @macaddress: new MAC address for interface - * @linkdev: name of interface - * @stateDir: directory to store old MAC address - * - * Returns 0 on success, -1 on failure - * - */ -static int -virNetDevReplaceMacAddress(const char *linkdev, - const virMacAddr *macaddress, - const char *stateDir) -{ - virMacAddr oldmac; - char *path = NULL; - char macstr[VIR_MAC_STRING_BUFLEN]; - int ret = -1; - - if (virNetDevGetMAC(linkdev, &oldmac) < 0) - return -1; - - if (virAsprintf(&path, "%s/%s", - stateDir, - linkdev) < 0) - return -1; - virMacAddrFormat(&oldmac, macstr); - if (virFileWriteStr(path, macstr, O_CREAT|O_TRUNC|O_WRONLY) < 0) { - virReportSystemError(errno, _("Unable to preserve mac for %s"), - linkdev); - goto cleanup; - } - - if (virNetDevSetMAC(linkdev, macaddress) < 0) - goto cleanup; - - ret = 0; - - cleanup: - VIR_FREE(path); - return ret; -} - -/** - * virNetDevRestoreMacAddress: - * @linkdev: name of interface - * @stateDir: directory containing old MAC address - * - * Returns 0 on success, -errno on failure. - * - */ -static int -virNetDevRestoreMacAddress(const char *linkdev, - const char *stateDir) -{ - int rc = -1; - char *oldmacname = NULL; - char *macstr = NULL; - char *path = NULL; - virMacAddr oldmac; - - if (virAsprintf(&path, "%s/%s", - stateDir, - linkdev) < 0) - return -1; - - if (virFileReadAll(path, VIR_MAC_STRING_BUFLEN, &macstr) < 0) - goto cleanup; - - if (virMacAddrParse(macstr, &oldmac) != 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Cannot parse MAC address from '%s'"), - oldmacname); - goto cleanup; - } - - /*reset mac and remove file-ignore results*/ - rc = virNetDevSetMAC(linkdev, &oldmac); - ignore_value(unlink(path)); - - cleanup: - VIR_FREE(macstr); - VIR_FREE(path); - return rc; -} - - #if defined(SIOCGIFMTU) && defined(HAVE_STRUCT_IFREQ) /** * virNetDevGetMTU: @@ -1923,6 +1836,95 @@ virNetDevSysfsFile(char **pf_sysfs_device_link ATTRIBUTE_UNUSED, #endif /* !__linux__ */ #if defined(__linux__) && defined(HAVE_LIBNL) && defined(IFLA_VF_MAX) + +/** + * virNetDevReplaceMacAddress: + * @macaddress: new MAC address for interface + * @linkdev: name of interface + * @stateDir: directory to store old MAC address + * + * Returns 0 on success, -1 on failure + * + */ +static int +virNetDevReplaceMacAddress(const char *linkdev, + const virMacAddr *macaddress, + const char *stateDir) +{ + virMacAddr oldmac; + char *path = NULL; + char macstr[VIR_MAC_STRING_BUFLEN]; + int ret = -1; + + if (virNetDevGetMAC(linkdev, &oldmac) < 0) + return -1; + + if (virAsprintf(&path, "%s/%s", + stateDir, + linkdev) < 0) + return -1; + virMacAddrFormat(&oldmac, macstr); + if (virFileWriteStr(path, macstr, O_CREAT|O_TRUNC|O_WRONLY) < 0) { + virReportSystemError(errno, _("Unable to preserve mac for %s"), + linkdev); + goto cleanup; + } + + if (virNetDevSetMAC(linkdev, macaddress) < 0) + goto cleanup; + + ret = 0; + + cleanup: + VIR_FREE(path); + return ret; +} + +/** + * virNetDevRestoreMacAddress: + * @linkdev: name of interface + * @stateDir: directory containing old MAC address + * + * Returns 0 on success, -errno on failure. + * + */ +static int +virNetDevRestoreMacAddress(const char *linkdev, + const char *stateDir) +{ + int rc = -1; + char *oldmacname = NULL; + char *macstr = NULL; + char *path = NULL; + virMacAddr oldmac; + + if (virAsprintf(&path, "%s/%s", + stateDir, + linkdev) < 0) + return -1; + + if (virFileReadAll(path, VIR_MAC_STRING_BUFLEN, &macstr) < 0) + goto cleanup; + + if (virMacAddrParse(macstr, &oldmac) != 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Cannot parse MAC address from '%s'"), + oldmacname); + goto cleanup; + } + + /*reset mac and remove file-ignore results*/ + rc = virNetDevSetMAC(linkdev, &oldmac); + ignore_value(unlink(path)); + + cleanup: + VIR_FREE(macstr); + VIR_FREE(path); + return rc; +} + + + static struct nla_policy ifla_vf_policy[IFLA_VF_MAX+1] = { [IFLA_VF_MAC] = { .type = NLA_UNSPEC, .maxlen = sizeof(struct ifla_vf_mac) }, -- 2.3.5

2 2

[libvirt] [PATCHv2] qemu: Fix issues with maxMemory in qemuDomainSetMemoryFlags()
by Peter Krempa 22 Apr '15

22 Apr '15

From: Luyao Huang <lhuang(a)redhat.com> qemuDomainSetMemoryFlags() would allow to set the initial memory greater than the <maxMemory> field. While the configuration would not work as memory hotplug requires NUMA to be enabled and the qemuDomainSetMemoryFlags() API does not work on NUMA guests this just fixes a corner case. The fix is still worth though as it allows to induce an invalid configuration and make the VM vanish on libvirt restart. Additionally this tweaks error message to be more accurate. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- Version 2 tweaks the error messages to be (possibly) more descriptive. src/qemu/qemu_driver.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6700fc9..d15931c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2319,11 +2319,19 @@ static int qemuDomainSetMemoryFlags(virDomainPtr dom, unsigned long newmem, * is no way to change the individual node sizes with this API */ if (virDomainNumaGetNodeCount(persistentDef->numa) > 0) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("maximum memory size of a domain with NUMA " + _("initial memory size of a domain with NUMA " "nodes cannot be modified with this API")); goto endjob; } + if (persistentDef->mem.max_memory && + persistentDef->mem.max_memory < newmem) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("cannot set initial memory size biger than " + "the maximum memory size")); + goto endjob; + } + virDomainDefSetMemoryInitial(persistentDef, newmem); if (persistentDef->mem.cur_balloon > newmem) -- 2.2.2

2 2

Re: [libvirt] Plan for next release
by Daniel Veillard 22 Apr '15

22 Apr '15

So if we want to push the next release for May 1st, it seems we should enter freeze over the w.e. or early Monday morning. Unless there is disagreement I plan to proceed that way, hopefully getting next release on time :-) 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] [PATCH 00/11] caps: various internal cleanups
by Cole Robinson 22 Apr '15

22 Apr '15

First two patches are straight bug fixes. The rest is a bunch of internal cleanup I felt compelled to do. Summary is - Switch caps and domain to use an enum for os.type value (hvm, xen, exe, ...) - Switch caps to use VIR_DOMAIN_VIRT* internally - Add a single function for looking up domain XML relevant values from capabilities, and test the crap out of it. - Use that function to simplfy and improve a lot of code. Thanks, Cole Cole Robinson (11): domain: conf: Better errors on bad os <type> values domain: conf: Don't validate VM ostype/arch at daemon startup caps: Use an enum internally for ostype value caps: Switch AddGuest to take VIR_DOMAIN_OSTYPE value domain: Convert os.type to VIR_DOMAIN_OSTYPE enum caps: Convert to use VIR_DOMAIN_VIRT internally caps: Add virCapabilitiesDomainDataLookup domain: conf: Do ostype/arch/machine parsing earlier domain: conf: Use CapabilitiesDomainDataLookup for caps validation caps: Use DomainDataLookup to replace GuestDefault* domain: conf: Drop expectedVirtTypes src/bhyve/bhyve_capabilities.c | 6 +- src/bhyve/bhyve_driver.c | 5 - src/conf/capabilities.c | 307 ++++++++++++-------------- src/conf/capabilities.h | 50 ++--- src/conf/domain_audit.c | 2 +- src/conf/domain_conf.c | 331 +++++++++++------------------ src/conf/domain_conf.h | 25 ++- src/conf/snapshot_conf.c | 18 +- src/conf/snapshot_conf.h | 2 - src/esx/esx_driver.c | 12 +- src/hyperv/hyperv_driver.c | 4 +- src/libvirt_private.syms | 6 +- src/libxl/libxl_conf.c | 14 +- src/libxl/libxl_domain.c | 7 +- src/libxl/libxl_driver.c | 8 +- src/libxl/libxl_migration.c | 2 - src/lxc/lxc_conf.c | 8 +- src/lxc/lxc_controller.c | 1 - src/lxc/lxc_driver.c | 7 +- src/lxc/lxc_native.c | 4 +- src/openvz/openvz_conf.c | 7 +- src/openvz/openvz_driver.c | 7 +- src/parallels/parallels_driver.c | 23 +- src/parallels/parallels_sdk.c | 6 +- src/parallels/parallels_utils.h | 2 +- src/phyp/phyp_driver.c | 10 +- src/qemu/qemu_capabilities.c | 21 +- src/qemu/qemu_command.c | 29 +-- src/qemu/qemu_domain.c | 1 - src/qemu/qemu_domain.h | 6 - src/qemu/qemu_driver.c | 14 +- src/qemu/qemu_migration.c | 5 +- src/security/virt-aa-helper.c | 9 +- src/test/test_driver.c | 12 +- src/uml/uml_conf.c | 4 +- src/uml/uml_driver.c | 6 +- src/util/virerror.c | 5 +- src/vbox/vbox_common.c | 23 +- src/vmware/vmware_conf.c | 8 +- src/vmware/vmware_driver.c | 4 +- src/vmx/vmx.c | 3 +- src/xen/xen_driver.c | 5 +- src/xen/xen_hypervisor.c | 4 +- src/xen/xend_internal.c | 6 +- src/xenapi/xenapi_driver.c | 20 +- src/xenapi/xenapi_utils.c | 4 +- src/xenconfig/xen_common.c | 64 +++--- src/xenconfig/xen_sxpr.c | 5 +- src/xenconfig/xen_xl.c | 17 +- src/xenconfig/xen_xm.c | 12 +- tests/Makefile.am | 8 +- tests/domainconftest.c | 3 +- tests/domainsnapshotxml2xmltest.c | 1 - tests/lxcxml2xmltest.c | 1 - tests/openvzutilstest.c | 2 +- tests/qemuagenttest.c | 1 - tests/qemuhotplugtest.c | 1 - tests/qemuxml2argvtest.c | 1 - tests/qemuxml2xmltest.c | 3 +- tests/qemuxmlnstest.c | 1 - tests/securityselinuxlabeldata/chardev.xml | 2 +- tests/securityselinuxlabeldata/disks.xml | 2 +- tests/securityselinuxlabeldata/kernel.xml | 2 +- tests/securityselinuxlabeldata/nfs.xml | 2 +- tests/securityselinuxlabeltest.c | 4 +- tests/testutils.c | 8 +- tests/testutilslxc.c | 10 +- tests/testutilsqemu.c | 38 ++-- tests/testutilsxen.c | 18 +- tests/vircapstest.c | 209 +++++++++++++++++- tests/vmx2xmltest.c | 8 +- tests/xlconfigtest.c | 1 - tests/xmconfigtest.c | 1 - tests/xml2sexprtest.c | 1 - tests/xml2vmxtest.c | 9 +- 75 files changed, 742 insertions(+), 756 deletions(-) -- 2.3.5

3 22

[libvirt] [PATCH v3 0/6] Implement Add/Del IOThreads
by John Ferlan 22 Apr '15

22 Apr '15

v2: http://www.redhat.com/archives/libvir-list/2015-April/msg00426.html Differences: Patch 1 (old patch 3): - virDomainIOThreadIDDefParseXML: - Fix error message for <id> (was element, change to attribute for <iothread> element) - Silently bump the 'def->iothreads' count if there are a more <iothreadid> elements found than def->iothreads defined rather than causing an error - virDomainIOThreadIDAdd - Just use VIR_APPEND_ELEMENT - no need for empty array check - Remove virDomainIOThreadIDIsDuplicate - Since it was doing essentially the same as virDomainIOThreadIDFind - Replace callers of IDIsDuplicate with the IDFind - Remove 'name' from _virDomainIOThreadIDDef causes ripple effect... - formatdomain.html.in and docs/schemas/domaincommon.rng - No need for virDomainIOThreadIDDefFree - Change of parameters to virDomainIOThreadIDAdd - Remove parse in virDomainIOThreadIDDefParseXML - Remove format in virDomainDefFormatInternal - Remove virDomainIOThreadIDDefFree - Unnecessary since 'name' is removed Patch 2 (merged old patch 4 & 5) - Add 'thread_id' to virDomainIOThreadIDDef and remove from _qemuDomainObjPrivate. Adjust qemuDomainObjPrivateFree, qemuDomainObjPrivateXMLFormat, and qemuDomainObjPrivateXMLParse to remove the the iothreadpids usage. Rely on saved domain XML for the 'live' data. - Use vm->def->niothreadids instead of priv->niothreadpids - Remove a couple of (now) unnecessary checks where priv->[n]iothreadpids was referenced. Now we now that at XMLParse we've created the [vm->]def->iothreadids with enough elements to satisfy the maximum of def->iothreads and def->niothreadids, so no need to check if it exists like we had to for priv->iothreadpids Patch 3 (old patch 6) - Remove 'name' from virDomainAddIOThread - Fix comments in virDomainIOThreadAdd and virDomainIOThreadDel - Remove if ((unsigned short) iothread_id != iothread_id) check Patch 4 (old patch 7) - Remove 'name' from remote_domain_add_iothread_args and remote_domain_add_iothread_args Patch 5 (old patch 8) - Split qemuDomainHotplugIOThread into qemuDomainHotplugAddIOThread and qemuDomainHotplugDelIOThread - Removed extraneous comments - Moved active domain check to after job starts and only for LIVE - Removed the virResetLastError if qemuMonitorGetIOThreads fails - Didn't touch the Numatune change - that can be resolved separately - For the Add case, there was a comment about already having the data which while true, we don't know where in the returned qemu iothreads list the new IOThread was added, so we have to find it in the list so we can get the thread_id so save once we create the element in the iothreadids list. - Moved where the virDomainLiveConfigHelperMethod was called - For an inactive config - we can add iothreads and iothreadids, when/if someone starts the guest, then they'll get the bad news if the right emulator wasn't available. - Handling LIVE before CONFIG just seemed to be the norm for commands that I looked at, so I left it that way. Patch 6 (old patch 9) - Remove "name" (avoided the one comment from the review) John Ferlan (6): conf: Add new domain XML element 'iothreadids' qemu: Use domain iothreadids to IOThread's 'thread_id' Implement virDomainAddIOThread and virDomainDelIOThread remote: Add support for AddIOThread and DelIOThread qemu: Add support to Add/Delete IOThreads virsh: Add iothreadadd and iothreaddel commands docs/formatdomain.html.in | 30 ++ docs/schemas/domaincommon.rng | 12 + include/libvirt/libvirt-domain.h | 6 + src/conf/domain_audit.c | 9 + src/conf/domain_audit.h | 6 + src/conf/domain_conf.c | 190 ++++++++- src/conf/domain_conf.h | 16 + src/driver-hypervisor.h | 12 + src/libvirt-domain.c | 118 ++++++ src/libvirt_private.syms | 4 + src/libvirt_public.syms | 6 + src/qemu/qemu_cgroup.c | 22 +- src/qemu/qemu_command.c | 38 +- src/qemu/qemu_command.h | 3 + src/qemu/qemu_domain.c | 36 -- src/qemu/qemu_domain.h | 3 - src/qemu/qemu_driver.c | 466 ++++++++++++++++++++- src/qemu/qemu_process.c | 37 +- src/remote/remote_driver.c | 2 + src/remote/remote_protocol.x | 30 +- src/remote_protocol-structs | 12 + .../qemuxml2argv-iothreads-ids-partial.args | 10 + .../qemuxml2argv-iothreads-ids-partial.xml | 33 ++ .../qemuxml2argv-iothreads-ids.args | 8 + .../qemuxml2argv-iothreads-ids.xml | 33 ++ tests/qemuxml2argvtest.c | 2 + tests/qemuxml2xmltest.c | 2 + tools/virsh-domain.c | 164 ++++++++ tools/virsh.pod | 31 ++ 29 files changed, 1239 insertions(+), 102 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids-partial.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids-partial.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids.xml -- 2.1.0

2 13

[libvirt] [PATCH v2 0/2] QoS: Adapt to changing MAC
by Michal Privoznik 22 Apr '15

22 Apr '15

Diff to v1: - Laine's comments worked in Michal Privoznik (2): virDomainActualNetDefContentsFormat: Format class_id only for status XML processNicRxFilterChangedEvent: Take appropriate actions for NET_TYPE_NETWORK too src/conf/domain_conf.c | 3 ++- src/qemu/qemu_driver.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) -- 2.0.5

2 4

[libvirt] [PATCH] spec: If installing default network, reload libvirtd (bz 867546)
by Cole Robinson 21 Apr '15

21 Apr '15

If libvirt-daemon-config-network is installed while libvirtd is already running, the daemon needs to be restarted to pick up the change. Instead let's trigger a daemon reload when the package is first installed. Then the default network is available immediately if libvirtd was already running. https://bugzilla.redhat.com/show_bug.cgi?id=867546 --- libvirt.spec.in | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index e08c9e7..ada0257 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1770,6 +1770,14 @@ if test $1 -eq 1 && test ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml ; < %{_datadir}/libvirt/networks/default.xml \ > %{_sysconfdir}/libvirt/qemu/networks/default.xml ln -s ../default.xml %{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml + + # Make sure libvirt picks up the new network defininiton + %if %{with_systemd} + /bin/systemctl reload libvirtd.service >/dev/null 2>&1 ||: + %else + /sbin/service libvirtd reload > /dev/null 2>&1 || : + %endif + fi %endif -- 2.3.5

3 4

[libvirt] [PATCH] qemu: Always refresh capabilities if no <guests> found (bz 1000116)
by Cole Robinson 21 Apr '15

21 Apr '15

- Remove all qemu emulators - Restart libvirtd - Install qemu emulators - Call 'virsh version' -> errors The only thing that will force the qemu driver to refresh it's cached capablities info is an explict API call to GetCapabilities. However in the case when the initial caps lookup at driver connect didn't find a single qemu emulator to poll, the driver is effectively useless and really can't do anything until it's populated some qemu capabilities info. With the above steps, the user would have to either know about the magic refresh capabilities call, or restart libvirtd to pick up the changes. Instead, this patch changes things so that every time a part of th driver requests access to capabilities info, check to see if we've previously seen any emulators. If not, force a refresh. In the case of 'still no emulators found', this is still very quick, so I can't think of a downside. https://bugzilla.redhat.com/show_bug.cgi?id=1000116 --- src/qemu/qemu_conf.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 2cf3905..b662b69 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -965,6 +965,13 @@ virCapsPtr virQEMUDriverGetCapabilities(virQEMUDriverPtr driver, qemuDriverLock(driver); } + if (driver->caps->nguests == 0 && !refresh) { + VIR_DEBUG("Capabilities didn't detect any guests. Forcing a " + "refresh."); + qemuDriverUnlock(driver); + return virQEMUDriverGetCapabilities(driver, true); + } + ret = virObjectRef(driver->caps); qemuDriverUnlock(driver); return ret; -- 2.3.5

2 2

[libvirt] [PATCH] vircapstest: fix build without LXC
by Roman Bogorodskiy 21 Apr '15

21 Apr '15

When building without lxc support enabled, build fails with: CLD vircapstest vircapstest.o: In function `test_virCapsDomainDataLookupLXC': vircapstest.c:(.text+0x9ef): undefined reference to `testLXCCapsInit' Fix that by hiding LXC tests under appropriate #ifdef. --- tests/vircapstest.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/vircapstest.c b/tests/vircapstest.c index 3e5038b..b2c321e 100644 --- a/tests/vircapstest.c +++ b/tests/vircapstest.c @@ -289,6 +289,7 @@ test_virCapsDomainDataLookupXen(const void *data ATTRIBUTE_UNUSED) return ret; } +#ifdef WITH_LXC static int test_virCapsDomainDataLookupLXC(const void *data ATTRIBUTE_UNUSED) { @@ -311,6 +312,7 @@ test_virCapsDomainDataLookupLXC(const void *data ATTRIBUTE_UNUSED) virObjectUnref(caps); return ret; } +#endif /* WITH_LXC */ static int mymain(void) @@ -326,9 +328,11 @@ mymain(void) if (virtTestRun("virCapsDomainDataLookupXen", test_virCapsDomainDataLookupXen, NULL) < 0) ret = -1; +#ifdef WITH_LXC if (virtTestRun("virCapsDomainDataLookupLXC", test_virCapsDomainDataLookupLXC, NULL) < 0) ret = -1; +#endif /* WITH_LXC */ return ret; } -- 2.3.5

2 1

[libvirt] [PATCH v4 0/4] storage: handle scsi/iscsi error paths better
by John Ferlan 21 Apr '15

21 Apr '15

v3 here: http://www.redhat.com/archives/libvir-list/2015-April/msg00240.html changes: Patch 1: (prior patch 1) Adjustments from code review - mostly just creating a new function using the "const char *" path instead of pool pointer. Called only from virStorageBackendStablePath Patch 2: (prior patch 3) Rather than continue to try to talk through the v3, here's the latest changes. These will just check in the SCSINewLun if the source pool target path doesn't start with /dev, then to just fail. This includes if the path is "/dev" or "/dev/". Theory for failure is that even if we allowed "/dev" or "/dev/" to continue down into the call to virStorageBackendStablePath all we'd get back was the duplicated 'devpath' which we'd claim was non-fatal. Patch 3: (NEW) Adjust virStorageBackendSCSIFindLUs to return a count of LU's found rather than the current "0" or -1" with a setting of the boolean found (which gets ignored in most cases). By returning a count, 0, or -1 the caller can decide what to do with the data. Patch 4: (prior patch 4) Couple of minor changes regarding comments and the use of a goto instead of if then else in processLU retval checks. Kept the flow as previous including using 'retval' in virStorageBackendSCSIFindLUs rather than creating yet another local status that would need to be checked. John Ferlan (4): storage: Split out the valid path check scsi: Adjust return value for virStorageBackendSCSINewLun scsi: Change return values for virStorageBackendSCSIFindLUs scsi: Adjust return values from processLU src/storage/storage_backend.c | 26 +++++----- src/storage/storage_backend.h | 1 + src/storage/storage_backend_scsi.c | 101 ++++++++++++++++++++++++------------- 3 files changed, 79 insertions(+), 49 deletions(-) -- 2.1.0

3 16

[libvirt] [PATCH] xend: Remove a couple of unused function prototypes.
by Richard W.M. Jones 21 Apr '15

21 Apr '15

Commit 70f446631f142ae92b4d4eb349fcf11408171556 (from 2008) introduced some functions for testing whether xend was returning correct sound models. Those functions have long gone, but the function prototypes remain. This commit removes the unused prototypes. Signed-off-by: Richard W.M. Jones <rjones(a)redhat.com> --- src/xen/xend_internal.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/xen/xend_internal.h b/src/xen/xend_internal.h index 814330d..9064b47 100644 --- a/src/xen/xend_internal.h +++ b/src/xen/xend_internal.h @@ -84,10 +84,6 @@ xenDaemonDomainFetch(virConnectPtr xend, const char *cpus); - int is_sound_model_valid(const char *model); - int is_sound_model_conflict(const char *model, const char *soundstr); - - /* refactored ones */ int xenDaemonOpen(virConnectPtr conn, virConnectAuthPtr auth, unsigned int flags); -- 2.3.1

2 1

[libvirt] [PATCH 0/2] rework the check for the numa cpus
by Luyao Huang 21 Apr '15

21 Apr '15

We introduce a check for numa cpu total count in 5f7b71, But seems this check cannot work well. There are some scenarioes: 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'/> the cpus '100' exceed maxvcpus, this setting is not valid (although qemu do not output error). 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'/> I guess nobody will use this setting if he really want use numa in his vm. (qemu not output error, but we can find some interesting things in vm, all cpus have bind in one numa node) 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'/> No need forbid this scenario if scenario 2 is a 'valid' setting. However add new check during parse xml will make vm has broken settings disappear after update libvirtd, so possible solutions: 1. add new check when parse xml, and find a way to avoid vm evaporate. I chose this way and i don't think just drop the invalid settings is a good idea for numa cpus, so i add a new function. 2. add new check when start vm. I think this is a configuration issue, so no need report it so late. 3. just remove this check and do not add new check... :) Luyao Huang (2): conf: introduce a new function to add check avoid losing track conf: rework the cpu check for vm numa settings src/bhyve/bhyve_driver.c | 4 ++-- src/conf/domain_conf.c | 21 ++++++++++++++------- src/conf/domain_conf.h | 1 + src/conf/numa_conf.c | 37 ++++++++++++++++++++++++++++++------- src/conf/numa_conf.h | 2 +- src/esx/esx_driver.c | 2 +- src/libxl/libxl_driver.c | 4 ++-- src/lxc/lxc_driver.c | 4 ++-- src/openvz/openvz_driver.c | 4 ++-- src/parallels/parallels_driver.c | 2 +- src/phyp/phyp_driver.c | 2 +- src/qemu/qemu_driver.c | 4 ++-- src/test/test_driver.c | 4 ++-- src/uml/uml_driver.c | 4 ++-- src/vbox/vbox_common.c | 2 +- src/vmware/vmware_driver.c | 4 ++-- src/xen/xen_driver.c | 4 ++-- src/xenapi/xenapi_driver.c | 4 ++-- 18 files changed, 70 insertions(+), 39 deletions(-) -- 1.8.3.1

3 4

[libvirt] [PATCH] lxc: fix 2 issue around cpuset
by Luyao Huang 21 Apr '15

21 Apr '15

There are two bugs in this function: 1. cannot start a vm with cpuset but without numatune settings # virsh -c lxc:/// start helloworld error: Failed to start domain helloworld error: internal error: guest failed to start: Invalid value '1-3' for 'cpuset.mems': Invalid argument we don't free &mask after use it for virCgroupSetCpusetCpus() and then virDomainNumatuneMaybeFormatNodeset() do not get a new &mask, then we use it in virCgroupSetCpusetMems(). 2. when start a lxc with numatune memory mode not strict # virsh -c lxc:/// start helloworld error: Failed to start domain helloworld error: internal error: guest failed to start: Unknown failure in libvirt_lxc startup We shouldn't set anything in cpuset.mems for these mode. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/lxc/lxc_cgroup.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c index c1813e2..5e959a2 100644 --- a/src/lxc/lxc_cgroup.c +++ b/src/lxc/lxc_cgroup.c @@ -77,11 +77,15 @@ static int virLXCCgroupSetupCpusetTune(virDomainDefPtr def, if (virCgroupSetCpusetCpus(cgroup, mask) < 0) goto cleanup; + /* free mask to make sure we won't use it in a wrong way later */ + VIR_FREE(mask); } if (virDomainNumatuneGetMode(def->numa, -1) != - VIR_DOMAIN_NUMATUNE_MEM_STRICT) + VIR_DOMAIN_NUMATUNE_MEM_STRICT) { + ret = 0; goto cleanup; + } if (virDomainNumatuneMaybeFormatNodeset(def->numa, nodemask, &mask, -1) < 0) -- 1.8.3.1

3 2

[libvirt] [PATCH] qemu: set macvtap physdevs online when macvtap is set online
by Laine Stump 21 Apr '15

21 Apr '15

A further fix for: https://bugzilla.redhat.com/show_bug.cgi?id=1113474 Since there is no possibility that any type of macvtap will work if the parent physdev it's attached to is offline, we should bring the physdev online at the same time as the macvtap. When taking the macvtap offline, it's also necessary to take the physdev offline for macvtap passthrough mode (because the physdev has the same MAC address as the macvtap device, so could potentially cause problems with misdirected packets during migration, as outlined in commits 829770 and 879c13). We can't set the physdev offline for other macvtap modes 1) because there may be other macvtap devices attached to the same physdev in the other modes whereas passthrough mode is exclusive to one macvtap at a time, and 2) there's no practical reason to do so anyway. --- src/qemu/qemu_hotplug.c | 8 +++----- src/qemu/qemu_interface.c | 29 +++++++++++++++++++++++++++-- 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 2f0549e..9be2ea3 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3931,11 +3931,9 @@ qemuDomainDetachNetDevice(virQEMUDriverPtr driver, VIR_WARN("cannot clear bandwidth setting for device : %s", detach->ifname); - /* deactivate the tap/macvtap device on the host (currently this - * isn't necessary, as everything done in - * qemuInterfaceStopDevice() is made meaningless when the device - * is deleted anyway, but in the future it may be important, and - * doesn't hurt anything for now) + /* deactivate the tap/macvtap device on the host, which could also + * affect the parent device (e.g. macvtap passthrough mode sets + * the parent device offline) */ ignore_value(qemuInterfaceStopDevice(detach)); diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c index 201a7dd..01226ac 100644 --- a/src/qemu/qemu_interface.c +++ b/src/qemu/qemu_interface.c @@ -63,7 +63,20 @@ qemuInterfaceStartDevice(virDomainNetDefPtr net) goto cleanup; } break; - case VIR_DOMAIN_NET_TYPE_DIRECT: + + case VIR_DOMAIN_NET_TYPE_DIRECT: { + const char *physdev = virDomainNetGetActualDirectDev(net); + bool isOnline = true; + + /* set the physdev online if necessary. It may already be up, + * in which case we shouldn't re-up it just in case that causes + * some sort of "blip" in the physdev's status. + */ + if (physdev && virNetDevGetOnline(physdev, &isOnline) < 0) + goto cleanup; + if (!isOnline && virNetDevSetOnline(physdev, true) < 0) + goto cleanup; + /* macvtap devices share their MAC address with the guest * domain, and if they are set online prior to the domain CPUs * being started, the host may send out traffic from this @@ -79,6 +92,7 @@ qemuInterfaceStartDevice(virDomainNetDefPtr net) if (virNetDevSetOnline(net->ifname, true) < 0) goto cleanup; break; + } case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_ETHERNET: @@ -146,7 +160,9 @@ qemuInterfaceStopDevice(virDomainNetDefPtr net) } break; - case VIR_DOMAIN_NET_TYPE_DIRECT: + case VIR_DOMAIN_NET_TYPE_DIRECT: { + const char *physdev = virDomainNetGetActualDirectDev(net); + /* macvtap interfaces need to be marked !IFF_UP (ie "down") to * prevent any host-generated traffic sent from this interface * from putting bad info into the arp caches of other machines @@ -154,7 +170,16 @@ qemuInterfaceStopDevice(virDomainNetDefPtr net) */ if (virNetDevSetOnline(net->ifname, false) < 0) goto cleanup; + + /* also mark the physdev down for passthrough macvtap, as the + * physdev has the same MAC address as the macvtap device. + */ + if (virDomainNetGetActualDirectMode(net) == + VIR_NETDEV_MACVLAN_MODE_PASSTHRU && + physdev && virNetDevSetOnline(physdev, false) < 0) + goto cleanup; break; + } case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_ETHERNET: -- 2.1.0

2 3

[libvirt] [PATCH 0/7] QoS: Adapt to changing MAC
by Michal Privoznik 21 Apr '15

21 Apr '15

While we taught libvirt to listen to MAC address changes from guests we forgot to update our QoS hierarchy accordingly. The first 3 patches are pure bug fixes and can go in regardless of state of the rest. The 4th patch is a slight improvement as it makes filter priority predictable. Then, patches 5-7 actually fix the bug. Michal Privoznik (7): virNetDevBandwidthPlug: Update function description RNG schema: allow plain @floor to <bandwidth/> virDomainActualNetDefContentsFormat: Format class_id more frequently virNetDevBandwidthSet: Add priority to filter virnetdevbandwidth.c: Separate tc filter creation to a function Introduce virNetDevBandwidthUpdateFilter processNicRxFilterChangedEvent: Take appropriate actions for NET_TYPE_NETWORK too docs/schemas/networkcommon.rng | 8 +- src/conf/domain_conf.c | 3 +- src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 22 +++ src/util/virnetdevbandwidth.c | 186 ++++++++++++++++----- src/util/virnetdevbandwidth.h | 6 + .../qemuxml2argv-net-bandwidth2.xml | 65 +++++++ tests/qemuxml2xmltest.c | 1 + tests/virnetdevbandwidthtest.c | 4 +- 9 files changed, 250 insertions(+), 46 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-bandwidth2.xml -- 2.0.5

2 17

[libvirt] [PATCH] parallels: make device addressing consistent
by Nikolay Shirokovskiy 21 Apr '15

21 Apr '15

In Parallels we do not support device name hints aka <target dev=../> option and full-fledged device disk device addressing through <address type=.. controller=.. bus=.. target=.. unit=../> and have only one index instead. In this situation to be consistent we can only take one-to-one mapping from some reasonable subset of full address. Values outside this subset are invalid to create Parallels VMs. Reasonable mapping is default one defined in virDomainDiskDefAssignAddress. Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)parallels.com> --- src/parallels/parallels_sdk.c | 72 ++++++++++++++++++++++++++++++++++------ 1 files changed, 61 insertions(+), 11 deletions(-) diff --git a/src/parallels/parallels_sdk.c b/src/parallels/parallels_sdk.c index d199898..80e9d00 100644 --- a/src/parallels/parallels_sdk.c +++ b/src/parallels/parallels_sdk.c @@ -462,7 +462,7 @@ prlsdkGetDiskInfo(PRL_HANDLE prldisk, PRL_UINT32 emulatedType; PRL_UINT32 ifType; PRL_UINT32 pos; - PRL_UINT32 prldiskIndex; + virDomainDeviceDriveAddressPtr address; int ret = -1; pret = PrlVmDev_GetEmulatedType(prldisk, &emulatedType); @@ -499,15 +499,32 @@ prlsdkGetDiskInfo(PRL_HANDLE prldisk, pret = PrlVmDev_GetIfaceType(prldisk, &ifType); prlsdkCheckRetGoto(pret, cleanup); + + pret = PrlVmDev_GetStackIndex(prldisk, &pos); + prlsdkCheckRetGoto(pret, cleanup); + + address = &disk->info.addr.drive; switch (ifType) { case PMS_IDE_DEVICE: disk->bus = VIR_DOMAIN_DISK_BUS_IDE; + disk->dst = virIndexToDiskName(pos, "hd"); + address->bus = pos / 2; + address->target = 0; + address->unit = pos % 2; break; case PMS_SCSI_DEVICE: disk->bus = VIR_DOMAIN_DISK_BUS_SCSI; + disk->dst = virIndexToDiskName(pos, "sd"); + address->bus = 0; + address->target = 0; + address->unit = pos; break; case PMS_SATA_DEVICE: disk->bus = VIR_DOMAIN_DISK_BUS_SATA; + disk->dst = virIndexToDiskName(pos, "sd"); + address->bus = 0; + address->target = 0; + address->unit = pos; break; default: virReportError(VIR_ERR_INTERNAL_ERROR, @@ -516,17 +533,10 @@ prlsdkGetDiskInfo(PRL_HANDLE prldisk, break; } - pret = PrlVmDev_GetStackIndex(prldisk, &pos); - prlsdkCheckRetGoto(pret, cleanup); + if (!disk->dst) + goto cleanup; disk->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE; - disk->info.addr.drive.target = pos; - - pret = PrlVmDev_GetIndex(prldisk, &prldiskIndex); - prlsdkCheckRetGoto(pret, cleanup); - - if (!(disk->dst = virIndexToDiskName(prldiskIndex, "sd"))) - goto cleanup; ret = 0; @@ -2852,6 +2862,7 @@ static int prlsdkAddDisk(PRL_HANDLE sdkdom, virDomainDiskDefPtr disk, bool bootD virDomainDeviceDriveAddressPtr drive; PRL_UINT32 devIndex; PRL_DEVICE_TYPE devType; + char *dst = NULL; if (prlsdkCheckDiskUnsupportedParams(disk) < 0) return -1; @@ -2909,22 +2920,50 @@ static int prlsdkAddDisk(PRL_HANDLE sdkdom, virDomainDiskDefPtr disk, bool bootD /* We have only one controller of each type */ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Invalid drive " "address of disk %s, Parallels Cloud Server has " - "only one controller."), disk->src->path); + "only one controller."), disk->dst); + goto cleanup; + } + + if (drive->target > 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Invalid drive " + "address of disk %s, Parallels Cloud Server has " + "only target 0."), disk->dst); goto cleanup; } switch (disk->bus) { case VIR_DOMAIN_DISK_BUS_IDE: + if (drive->unit > 1) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Invalid drive " + "address of disk %s, Parallels Cloud Server has " + "only units 0-1 for IDE bus."), disk->dst); + goto cleanup; + } sdkbus = PMS_IDE_DEVICE; idx = 2 * drive->bus + drive->unit; + dst = virIndexToDiskName(idx, "hd"); break; case VIR_DOMAIN_DISK_BUS_SCSI: + if (drive->bus > 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Invalid drive " + "address of disk %s, Parallels Cloud Server has " + "only bus 0 for SCSI bus."), disk->dst); + goto cleanup; + } sdkbus = PMS_SCSI_DEVICE; idx = drive->unit; + dst = virIndexToDiskName(idx, "sd"); break; case VIR_DOMAIN_DISK_BUS_SATA: + if (drive->bus > 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Invalid drive " + "address of disk %s, Parallels Cloud Server has " + "only bus 0 for SATA bus."), disk->dst); + goto cleanup; + } sdkbus = PMS_SATA_DEVICE; idx = drive->unit; + dst = virIndexToDiskName(idx, "sd"); break; default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -2933,6 +2972,16 @@ static int prlsdkAddDisk(PRL_HANDLE sdkdom, virDomainDiskDefPtr disk, bool bootD goto cleanup; } + if (!dst) + goto cleanup; + + if (STRNEQ(dst, disk->dst)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Invalid drive " + "address of disk %s, Parallels Cloud Server supports " + "only defaults address to logical device name."), disk->dst); + goto cleanup; + } + pret = PrlVmDev_SetIfaceType(sdkdisk, sdkbus); prlsdkCheckRetGoto(pret, cleanup); @@ -2968,6 +3017,7 @@ static int prlsdkAddDisk(PRL_HANDLE sdkdom, virDomainDiskDefPtr disk, bool bootD return 0; cleanup: PrlHandle_Free(sdkdisk); + VIR_FREE(dst); return ret; } -- 1.7.1

2 1

[libvirt] [PATCH] parallels: fix return status for parallelsConnectOpen
by Nikolay Shirokovskiy 21 Apr '15

21 Apr '15

We should return VIR_DRV_OPEN_ERROR in case if we handle scheme in query but some error occur. Previously we sometimes return VIR_DRV_OPEN_DECLINE. Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)parallels.com> --- src/parallels/parallels_network.c | 2 +- src/parallels/parallels_storage.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/parallels/parallels_network.c b/src/parallels/parallels_network.c index 47f4886..42ef836 100644 --- a/src/parallels/parallels_network.c +++ b/src/parallels/parallels_network.c @@ -349,7 +349,7 @@ parallelsNetworkOpen(virConnectPtr conn, error: virObjectUnref(privconn->networks); privconn->networks = NULL; - return VIR_DRV_OPEN_DECLINED; + return VIR_DRV_OPEN_ERROR; } int parallelsNetworkClose(virConnectPtr conn) diff --git a/src/parallels/parallels_storage.c b/src/parallels/parallels_storage.c index 6397601..4091124 100644 --- a/src/parallels/parallels_storage.c +++ b/src/parallels/parallels_storage.c @@ -494,7 +494,7 @@ parallelsStorageOpen(virConnectPtr conn, error: parallelsStorageUnlock(storageState); parallelsStorageClose(conn); - return -1; + return VIR_DRV_OPEN_ERROR; } static int -- 1.7.1

2 1

[libvirt] [PATCH v2] parallels: use SDK disks system names for paths
by Nikolay Shirokovskiy 21 Apr '15

21 Apr '15

For block devices SDK friendly name do not refer to block device path but rather some description while system name refer to device path. For ploop devices both names refer to image path. Thus system name is better choice. Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)parallels.com> --- src/parallels/parallels_sdk.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/parallels/parallels_sdk.c b/src/parallels/parallels_sdk.c index 72c1773..e1ba7cf 100644 --- a/src/parallels/parallels_sdk.c +++ b/src/parallels/parallels_sdk.c @@ -485,13 +485,13 @@ prlsdkGetDiskInfo(PRL_HANDLE prldisk, disk->device = VIR_DOMAIN_DISK_DEVICE_DISK; } - pret = PrlVmDev_GetFriendlyName(prldisk, NULL, &buflen); + pret = PrlVmDev_GetSysName(prldisk, NULL, &buflen); prlsdkCheckRetGoto(pret, cleanup); if (VIR_ALLOC_N(buf, buflen) < 0) goto cleanup; - pret = PrlVmDev_GetFriendlyName(prldisk, buf, &buflen); + pret = PrlVmDev_GetSysName(prldisk, buf, &buflen); prlsdkCheckRetGoto(pret, cleanup); if (virDomainDiskSetSource(disk, buf) < 0) -- 1.7.1

2 1

[libvirt] [PATCH] domtop: Properly free cpu status
by Michal Privoznik 21 Apr '15

21 Apr '15

So, in the example the cpu stats are collected within a function called do_top. At the beginning of the function we ask the daemon for how much vCPUs can we get stats, and how many stats for a vCPU can we get. This is because it's how our API works - users are required to preallocate a chunk of memory for the results. Now, at the end, we try to free the allocated array, but we are not doing it correctly. There's this virTypedParamsFree() function which gets a pointer to the array and the length of the array. However, if there was an error in getting vCPU stats we pass a negative number instead of the originally computed value. This flaw results in SIGSEGV: libvirt: QEMU Driver error : Requested operation is not valid: domain is not running ERROR do_top:333 : Unable to get cpu stats ==29201== Invalid read of size 4 ==29201== at 0x4F1DF8B: virTypedParamsClear (virtypedparam.c:1145) ==29201== by 0x4F1DFEB: virTypedParamsFree (virtypedparam.c:1165) ==29201== by 0x4023C3: do_top (domtop.c:349) ==29201== by 0x40260B: main (domtop.c:386) ==29201== Address 0x131cd7c0 is 16 bytes after a block of size 768 alloc'd ==29201== at 0x4C2C070: calloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==29201== by 0x401FF1: do_top (domtop.c:295) ==29201== by 0x40260B: main (domtop.c:386) Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- examples/domtop/domtop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/domtop/domtop.c b/examples/domtop/domtop.c index e50988e..2283994 100644 --- a/examples/domtop/domtop.c +++ b/examples/domtop/domtop.c @@ -346,8 +346,8 @@ do_top(virConnectPtr conn, ret = 0; cleanup: - virTypedParamsFree(now_params, now_nparams * max_id); - virTypedParamsFree(then_params, then_nparams * max_id); + virTypedParamsFree(now_params, nparams * max_id); + virTypedParamsFree(then_params, nparams * max_id); if (dom) virDomainFree(dom); return ret; -- 2.0.5

2 1

[libvirt] [PATCH 0/5] Add vmport feature (v3)
by Marc-André Lureau 20 Apr '15

20 Apr '15

Hi, The QEMU machine vmport option allows to set the VMWare IO port emulation. This emulation is useful for absolute pointer input when the guest has vmware input drivers, and is enabled by default for kvm. However it is unnecessary for Spice-enabled VM, since the agent already handles absolute pointer and multi-monitors. Furthermore, it prevents Spice from switching to relative input since the regular ps/2 pointer driver is replaced by the vmware driver. It is thus advised to disable vmport when using a Spice VM. This will permit the Spice client to switch from absolute to relative pointer, as it may be required for certain games or applications. The following patch series allows to configure the vmport feature. The first version sent used a domain attribute, Daniel Berrange suggested to use a feature instead. I sent a second version that didn't receive reviews. Hopefully this one will stand more chances! cheers Marc-André Lureau (5): docs: add domain vmport feature domain/conf: add VIR_DOMAIN_FEATURE_VMPORT qemu: add QEMU_CAPS_MACHINE_VMPORT_OPT qemu: add machine vmport argument tests: add machine-vmport-opt qemu test docs/formatdomain.html.in | 6 +++++ docs/schemas/domaincommon.rng | 9 +++++++ src/conf/domain_conf.c | 5 +++- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 6 +++++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 14 +++++++++++ .../qemuxml2argv-machine-vmport-opt.args | 6 +++++ .../qemuxml2argv-machine-vmport-opt.xml | 28 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 2 ++ 10 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-vmport-opt.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-vmport-opt.xml -- 2.1.0

4 19

[libvirt] Building libvirt under Windows
by Pavel Fedin 20 Apr '15

20 Apr '15

Hello! I am currently building libvirt under Windows64, and i would like to ask for correct way to do it. The first thing to resolve is absence of RPC XDR library. From configure source i figured out that portablexdr library may help. I have downloaded it, but it comes with a different RPC code generator named portable-rpcgen. I managed to use it, but i had to patch both libvirt (in order to recognize this generator and handle it properly) and portable-rpcgen (in order to correctly work under Windows, as well as get rid of some crashes). Initially i wanted to upstream portablexdr fixes and emailed the author. But the author replied that he is not going to fix portablexdr because it's now deprecated, since original XDR code comes under free license now. So, i have all necessary fixes in my own fork. He suggested me to come here to ask about these things. So, guys, how do you do it ? I cannot find any rpcgen package usable under Windows (MinGW, not Cygwin). Kind regards, Pavel Fedin Expert Engineer Samsung Electronics Research center Russia

2 2

Re: [libvirt] [libvirt-php] memory overflow when using libvirt_list_networks
by Kash Pande 20 Apr '15

20 Apr '15

On 18/04/15 04:25 AM, Michal Novotny wrote: > Hi Kash, > > there were no patches for libvirt-php for a long time. Are you sure > this is libvirt-php related and not a bug in libvirt itself? > > Thanks, > Michal > I've just started using libvirt-php this week but I've been using libvirt for ages. I did learn last night, the difference between my two systems that is relevant is that the overflow system ran Gentoo while the "working" system ran Debian. I was missing a USE flag for "virt-network" on the Gentoo machine. It is a development environment that I am attempting to create a supported configuration with, so these kinds of missing USE flags and other things are just facts of life I must accept. Unfortunately, it was kind-of difficult to get this information or even workaround it without rebuilding libvirt on the Gentoo machine, which means I won't be able to give a proper error message to users who encounter this problem as well. It's a problem in libvirt-php to overflow when requesting libvirt_networks_list on a machine without networking support compiled in. The PHP bindings should error out properly, not memory overflow and put errors in httpd log with cryptic results in the interpreter :-) I do like the PHP bindings but they appear to be lacking attention. Am I the only one using it? ;-) Kash Pande Jentu Technologies, Inc http://jentu-networks.com

2 1

[libvirt] [PATCH] parallels: use SDK disks system names for paths
by Nikolay Shirokovskiy 20 Apr '15

20 Apr '15

For block devices SDK friendly name do not refer to block device path but rather some description while system name refer to device path. For ploop devices both names refer to image path. Thus system name is better choice. Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)parallels.com> --- src/parallels/parallels_sdk.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/parallels/parallels_sdk.c b/src/parallels/parallels_sdk.c index 72c1773..e1ba7cf 100644 --- a/src/parallels/parallels_sdk.c +++ b/src/parallels/parallels_sdk.c @@ -485,13 +485,13 @@ prlsdkGetDiskInfo(PRL_HANDLE prldisk, disk->device = VIR_DOMAIN_DISK_DEVICE_DISK; } - pret = PrlVmDev_GetFriendlyName(prldisk, NULL, &buflen); + pret = PrlVmDev_GetSysName(prldisk, NULL, &buflen); prlsdkCheckRetGoto(pret, cleanup); if (VIR_ALLOC_N(buf, buflen) < 0) goto cleanup; - pret = PrlVmDev_GetFriendlyName(prldisk, buf, &buflen); + pret = PrlVmDev_GetSysName(prldisk, buf, &buflen); prlsdkCheckRetGoto(pret, cleanup); if (virDomainDiskSetSource(disk, buf) < 0) -- 1.7.1

1 0