- Devel - libvirt List Archives

[libvirt] [PATCH] qemu: Exempt video model 'none' from getting a PCI address on Q35
by Erik Skultety 31 Jul '18

31 Jul '18

Commit d48813e8 made sure we wouldn't get one for i440fx, but not for Q35 machine type. If the primary video didn't get the assumed 0:0:1.0 PCI address, the evaluation then failed with: "Cannot automatically add a new PCI bus for a device with connect flags 00" https://bugzilla.redhat.com/show_bug.cgi?id=1609087 Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- src/qemu/qemu_domain_address.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 1210d4acdd..0d27e6ce9c 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -1701,10 +1701,11 @@ qemuDomainValidateDevicePCISlotsQ35(virDomainDefPtr def, goto cleanup; } - if (def->nvideos > 0) { + if (def->nvideos > 0 && + def->videos[0]->type != VIR_DOMAIN_VIDEO_TYPE_NONE) { /* NB: unlike the pc machinetypes, on q35 machinetypes the * integrated devices are at slot 0x1f, so when qemu looks for - * the first free lot for the first VGA, it will always be at + * the first free slot for the first VGA, it will always be at * slot 1 (which was used up by the integrated PIIX3 devices * on pc machinetypes). */ -- 2.14.4

2 2

[libvirt] [jenkins-ci PATCH] projects: restrict virt-viewer RPMs to Fedora >= 28
by Daniel P. Berrangé 30 Jul '18

30 Jul '18

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- projects/virt-viewer.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/projects/virt-viewer.yaml b/projects/virt-viewer.yaml index 12335f3..25474f2 100644 --- a/projects/virt-viewer.yaml +++ b/projects/virt-viewer.yaml @@ -13,7 +13,9 @@ parent_jobs: 'virt-viewer-master-syntax-check' - autotools-rpm-job: parent_jobs: 'virt-viewer-master-check' - machines: '{rpm_machines}' + machines: + - libvirt-fedora-28 + - libvirt-fedora-rawhide - autotools-build-job: parent_jobs: 'libvirt-glib-master-build-mingw32' variant: -mingw32 -- 2.17.1

2 1

[libvirt] [PATCH for v4.6.0] cgroups: Don't leave stale pointers around after virCgroupFree
by Michal Privoznik 30 Jul '18

30 Jul '18

One of the attributes that original virCgroupFree() had was it set passed pointer to NULL. For instance in the following code the latter call would be practically a no-op: virCgroupFree(&var); virCgroupFree(&var); However, this behaviour of the function was changed in 0f80c71822d824 but corresponding 'var = NULL' lines were not added leading to double free: Invalid read of size 8 at 0x52CA3DA: virFree (viralloc.c:582) by 0x52D5272: virCgroupFree (vircgroup.c:1700) by 0x230CE113: qemuDomainObjPrivateDataClear (qemu_domain.c:1923) by 0x230CE2F3: qemuDomainObjPrivateFree (qemu_domain.c:1973) by 0x53922D7: virDomainObjDispose (domain_conf.c:3192) by 0x533B8ED: virObjectUnref (virobject.c:350) by 0x533BE39: virObjectFreeHashData (virobject.c:591) by 0x5305C23: virHashFree (virhash.c:304) by 0x53EAFA7: virDomainObjListDispose (virdomainobjlist.c:92) by 0x533B8ED: virObjectUnref (virobject.c:350) by 0x2315E2AE: qemuStateCleanup (qemu_driver.c:1067) by 0x557CFF6: virStateCleanup (libvirt.c:699) Address 0x29fbbdd0 is 16 bytes inside a block of size 328 free'd at 0x4C2E13B: free (vg_replace_malloc.c:530) by 0x52CA3E4: virFree (viralloc.c:582) by 0x52D52D4: virCgroupFree (vircgroup.c:1706) by 0x230CE113: qemuDomainObjPrivateDataClear (qemu_domain.c:1923) by 0x2311CFE9: qemuProcessStop (qemu_process.c:7144) by 0x2311BF1C: qemuProcessStart (qemu_process.c:6745) by 0x2316E634: qemuDomainObjStart (qemu_driver.c:7293) by 0x2316E8A2: qemuDomainCreateWithFlags (qemu_driver.c:7346) by 0x2316E925: qemuDomainCreate (qemu_driver.c:7365) by 0x5594E9F: virDomainCreate (libvirt-domain.c:6534) by 0x1367D1: remoteDispatchDomainCreate (remote_daemon_dispatch_stubs.h:4434) by 0x1366EA: remoteDispatchDomainCreateHelper (remote_daemon_dispatch_stubs.h:4410) Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/lxc/lxc_process.c | 1 + src/qemu/qemu_cgroup.c | 2 ++ src/qemu/qemu_domain.c | 1 + src/util/vircgroup.c | 5 +++++ 4 files changed, 9 insertions(+) diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 5d8fa63c67..4d118cb6fd 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -221,6 +221,7 @@ static void virLXCProcessCleanup(virLXCDriverPtr driver, if (priv->cgroup) { virCgroupRemove(priv->cgroup); virCgroupFree(priv->cgroup); + priv->cgroup = NULL; } /* Get machined to terminate the machine as it may not have cleaned it diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 8a00ffcd45..cd1e01262b 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -921,6 +921,7 @@ qemuInitCgroup(virDomainObjPtr vm, goto done; virCgroupFree(priv->cgroup); + priv->cgroup = NULL; if (!vm->def->resource) { virDomainResourceDefPtr res; @@ -1058,6 +1059,7 @@ qemuConnectCgroup(virDomainObjPtr vm) goto done; virCgroupFree(priv->cgroup); + priv->cgroup = NULL; if (virCgroupNewDetectMachine(vm->def->name, "qemu", diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index bda53814a3..bfffd3da27 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1921,6 +1921,7 @@ qemuDomainObjPrivateDataClear(qemuDomainObjPrivatePtr priv) priv->qemuDevices = NULL; virCgroupFree(priv->cgroup); + priv->cgroup = NULL; virPerfFree(priv->perf); priv->perf = NULL; diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 472a8167f5..6e2e06bae3 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -1371,6 +1371,7 @@ virCgroupNewDomainPartition(virCgroupPtr partition, VIR_CGROUP_MEM_HIERACHY) < 0) { virCgroupRemove(*group); virCgroupFree(*group); + *group = NULL; return -1; } @@ -1428,6 +1429,7 @@ virCgroupNewThread(virCgroupPtr domain, if (virCgroupMakeGroup(domain, *group, create, VIR_CGROUP_NONE) < 0) { virCgroupRemove(*group); virCgroupFree(*group); + *group = NULL; return -1; } @@ -1466,6 +1468,7 @@ virCgroupNewDetectMachine(const char *name, VIR_DEBUG("Failed to validate machine name for '%s' driver '%s'", name, drivername); virCgroupFree(*group); + *group = NULL; return 0; } @@ -1566,6 +1569,7 @@ virCgroupNewMachineSystemd(const char *name, virErrorPtr saved = virSaveLastError(); virCgroupRemove(*group); virCgroupFree(*group); + *group = NULL; if (saved) { virSetError(saved); virFreeError(saved); @@ -1617,6 +1621,7 @@ virCgroupNewMachineManual(const char *name, virErrorPtr saved = virSaveLastError(); virCgroupRemove(*group); virCgroupFree(*group); + *group = NULL; if (saved) { virSetError(saved); virFreeError(saved); -- 2.16.4

4 6

[libvirt] [PATCH for 4.6.0 0/3] Revert VIR_AUTOPTR work in cgroup
by Michal Privoznik 30 Jul '18

30 Jul '18

Turns out, our code relies on virCgroupFree(&var) setting var = NULL. Otherwise a double free can occur: https://www.redhat.com/archives/libvir-list/2018-July/msg02004.html Rather than inserting var = NULL after each virCgroupFree() call lets revert the patches. The ideal solution would be to use virCgroupFree both directly and as attribute cleanup. Michal Prívozník (3): Revert "util: cgroup: use VIR_AUTOPTR for aggregate types" Revert "util: cgroup: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC" Revert "util: cgroup: modify virCgroupFree to take virCgroupPtr" src/libvirt-lxc.c | 4 +- src/lxc/lxc_cgroup.c | 4 +- src/lxc/lxc_container.c | 2 +- src/lxc/lxc_controller.c | 2 +- src/lxc/lxc_domain.c | 2 +- src/lxc/lxc_process.c | 10 +- src/qemu/qemu_cgroup.c | 16 ++-- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_driver.c | 34 +++---- src/qemu/qemu_process.c | 2 +- src/util/vircgroup.c | 233 +++++++++++++++++++++++++++++------------------ src/util/vircgroup.h | 11 +-- src/util/vircgrouppriv.h | 2 +- tests/vircgrouptest.c | 42 ++++----- 14 files changed, 209 insertions(+), 157 deletions(-) -- 2.16.4

2 4

[libvirt] [jenkins-ci PATCH] hosts_vars: drop virt-viewer from platforms with old spice-gtk
by Daniel P. Berrangé 30 Jul '18

30 Jul '18

git master requires spice-gtk >= 0.35 Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- guests/host_vars/libvirt-centos-7/main.yml | 1 - guests/host_vars/libvirt-debian-8/main.yml | 1 - guests/host_vars/libvirt-debian-9/main.yml | 1 - guests/host_vars/libvirt-debian-sid/main.yml | 1 - guests/host_vars/libvirt-fedora-27/main.yml | 1 - guests/host_vars/libvirt-freebsd-10/main.yml | 1 - guests/host_vars/libvirt-freebsd-11/main.yml | 1 - guests/host_vars/libvirt-freebsd-current/main.yml | 1 - guests/host_vars/libvirt-ubuntu-14/main.yml | 1 - guests/host_vars/libvirt-ubuntu-16/main.yml | 1 - guests/host_vars/libvirt-ubuntu-18/main.yml | 1 - 11 files changed, 11 deletions(-) diff --git a/guests/host_vars/libvirt-centos-7/main.yml b/guests/host_vars/libvirt-centos-7/main.yml index c147830..19e905e 100644 --- a/guests/host_vars/libvirt-centos-7/main.yml +++ b/guests/host_vars/libvirt-centos-7/main.yml @@ -12,4 +12,3 @@ projects: - libvirt-sandbox - osinfo-db - osinfo-db-tools - - virt-viewer diff --git a/guests/host_vars/libvirt-debian-8/main.yml b/guests/host_vars/libvirt-debian-8/main.yml index 954a037..62abfd3 100644 --- a/guests/host_vars/libvirt-debian-8/main.yml +++ b/guests/host_vars/libvirt-debian-8/main.yml @@ -10,4 +10,3 @@ projects: - libvirt-tck - osinfo-db - osinfo-db-tools - - virt-viewer diff --git a/guests/host_vars/libvirt-debian-9/main.yml b/guests/host_vars/libvirt-debian-9/main.yml index a588c09..032572f 100644 --- a/guests/host_vars/libvirt-debian-9/main.yml +++ b/guests/host_vars/libvirt-debian-9/main.yml @@ -13,4 +13,3 @@ projects: - osinfo-db - osinfo-db-tools - virt-manager - - virt-viewer diff --git a/guests/host_vars/libvirt-debian-sid/main.yml b/guests/host_vars/libvirt-debian-sid/main.yml index a588c09..032572f 100644 --- a/guests/host_vars/libvirt-debian-sid/main.yml +++ b/guests/host_vars/libvirt-debian-sid/main.yml @@ -13,4 +13,3 @@ projects: - osinfo-db - osinfo-db-tools - virt-manager - - virt-viewer diff --git a/guests/host_vars/libvirt-fedora-27/main.yml b/guests/host_vars/libvirt-fedora-27/main.yml index 00b0848..bc13420 100644 --- a/guests/host_vars/libvirt-fedora-27/main.yml +++ b/guests/host_vars/libvirt-fedora-27/main.yml @@ -14,4 +14,3 @@ projects: - osinfo-db - osinfo-db-tools - virt-manager - - virt-viewer diff --git a/guests/host_vars/libvirt-freebsd-10/main.yml b/guests/host_vars/libvirt-freebsd-10/main.yml index 2ad4584..903dd45 100644 --- a/guests/host_vars/libvirt-freebsd-10/main.yml +++ b/guests/host_vars/libvirt-freebsd-10/main.yml @@ -14,4 +14,3 @@ projects: - osinfo-db - osinfo-db-tools - virt-manager - - virt-viewer diff --git a/guests/host_vars/libvirt-freebsd-11/main.yml b/guests/host_vars/libvirt-freebsd-11/main.yml index 2ad4584..903dd45 100644 --- a/guests/host_vars/libvirt-freebsd-11/main.yml +++ b/guests/host_vars/libvirt-freebsd-11/main.yml @@ -14,4 +14,3 @@ projects: - osinfo-db - osinfo-db-tools - virt-manager - - virt-viewer diff --git a/guests/host_vars/libvirt-freebsd-current/main.yml b/guests/host_vars/libvirt-freebsd-current/main.yml index 2ad4584..903dd45 100644 --- a/guests/host_vars/libvirt-freebsd-current/main.yml +++ b/guests/host_vars/libvirt-freebsd-current/main.yml @@ -14,4 +14,3 @@ projects: - osinfo-db - osinfo-db-tools - virt-manager - - virt-viewer diff --git a/guests/host_vars/libvirt-ubuntu-14/main.yml b/guests/host_vars/libvirt-ubuntu-14/main.yml index 839c668..8b59152 100644 --- a/guests/host_vars/libvirt-ubuntu-14/main.yml +++ b/guests/host_vars/libvirt-ubuntu-14/main.yml @@ -7,4 +7,3 @@ projects: - libvirt-tck - osinfo-db - osinfo-db-tools - - virt-viewer diff --git a/guests/host_vars/libvirt-ubuntu-16/main.yml b/guests/host_vars/libvirt-ubuntu-16/main.yml index a588c09..032572f 100644 --- a/guests/host_vars/libvirt-ubuntu-16/main.yml +++ b/guests/host_vars/libvirt-ubuntu-16/main.yml @@ -13,4 +13,3 @@ projects: - osinfo-db - osinfo-db-tools - virt-manager - - virt-viewer diff --git a/guests/host_vars/libvirt-ubuntu-18/main.yml b/guests/host_vars/libvirt-ubuntu-18/main.yml index a588c09..032572f 100644 --- a/guests/host_vars/libvirt-ubuntu-18/main.yml +++ b/guests/host_vars/libvirt-ubuntu-18/main.yml @@ -13,4 +13,3 @@ projects: - osinfo-db - osinfo-db-tools - virt-manager - - virt-viewer -- 2.17.1

2 2

[libvirt] [PATCH] Remove unnecessary virQEMUDriverPtr arguments
by Steven Albertson 30 Jul '18

30 Jul '18

Signed-off-by Steven Albertson <sralbert42(a)gmail.com> --- src/qemu/qemu_block.c | 15 +++++++-------- src/qemu/qemu_block.h | 6 ++---- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 66e6301210..8081bced9d 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -339,8 +339,7 @@ qemuBlockDiskDetectNodes(virDomainDiskDefPtr disk, int -qemuBlockNodeNamesDetect(virQEMUDriverPtr driver, - virDomainObjPtr vm, +qemuBlockNodeNamesDetect(virDomainObjPtr vm, qemuDomainAsyncJob asyncJob) { qemuDomainObjPrivatePtr priv = vm->privateData; @@ -354,13 +353,13 @@ qemuBlockNodeNamesDetect(virQEMUDriverPtr driver, if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_QUERY_NAMED_BLOCK_NODES)) return 0; - if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) + if (qemuDomainObjEnterMonitorAsync(priv->driver, vm, asyncJob) < 0) return -1; data = qemuMonitorQueryNamedBlockNodes(qemuDomainGetMonitor(vm)); blockstats = qemuMonitorQueryBlockstats(qemuDomainGetMonitor(vm), false); - if (qemuDomainObjExitMonitor(driver, vm) < 0 || !data || !blockstats) + if (qemuDomainObjExitMonitor(priv->driver, vm) < 0 || !data || !blockstats) goto cleanup; if (!(disktable = qemuBlockNodeNameGetBackingChain(data, blockstats))) @@ -1689,14 +1688,14 @@ qemuBlockStorageSourceAttachRollback(qemuMonitorPtr mon, * monitor internally. */ int -qemuBlockStorageSourceDetachOneBlockdev(virQEMUDriverPtr driver, - virDomainObjPtr vm, +qemuBlockStorageSourceDetachOneBlockdev(virDomainObjPtr vm, qemuDomainAsyncJob asyncJob, virStorageSourcePtr src) { + qemuDomainObjPrivatePtr priv = vm->privateData; int ret; - if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) + if (qemuDomainObjEnterMonitorAsync(priv->driver, vm, asyncJob) < 0) return -1; ret = qemuMonitorBlockdevDel(qemuDomainGetMonitor(vm), src->nodeformat); @@ -1704,7 +1703,7 @@ qemuBlockStorageSourceDetachOneBlockdev(virQEMUDriverPtr driver, if (ret == 0) ret = qemuMonitorBlockdevDel(qemuDomainGetMonitor(vm), src->nodestorage); - if (qemuDomainObjExitMonitor(driver, vm) < 0) + if (qemuDomainObjExitMonitor(priv->driver, vm) < 0) return -1; return ret; diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h index fd8984e60b..725ce936d5 100644 --- a/src/qemu/qemu_block.h +++ b/src/qemu/qemu_block.h @@ -47,8 +47,7 @@ qemuBlockNodeNameGetBackingChain(virJSONValuePtr namednodesdata, virJSONValuePtr blockstats); int -qemuBlockNodeNamesDetect(virQEMUDriverPtr driver, - virDomainObjPtr vm, +qemuBlockNodeNamesDetect(virDomainObjPtr vm, qemuDomainAsyncJob asyncJob); virHashTablePtr @@ -112,8 +111,7 @@ qemuBlockStorageSourceAttachRollback(qemuMonitorPtr mon, qemuBlockStorageSourceAttachDataPtr data); int -qemuBlockStorageSourceDetachOneBlockdev(virQEMUDriverPtr driver, - virDomainObjPtr vm, +qemuBlockStorageSourceDetachOneBlockdev(virDomainObjPtr vm, qemuDomainAsyncJob asyncJob, virStorageSourcePtr src); -- 2.17.1

2 1

[libvirt] [PATCH] qemu:Fix snapshot creating with vm xml persistent
by Bobo Du 30 Jul '18

30 Jul '18

Bobo Du (1): qemu:Fix snapshot creating with vm xml persistent src/qemu/qemu_blockjob.c | 2 +- src/qemu/qemu_driver.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) -- 1.8.3.1

2 2

[libvirt] libvirt-dbus build for virt-preview
by Vasiliy Tolstov 28 Jul '18

28 Jul '18

Hi! Does it possible to add libvirt-dbus building for virt-preview repo? My use case - get latest libvirt-dbus in current fedora stable release. -- Vasiliy Tolstov, e-mail: v.tolstov(a)selfip.ru

2 2

[libvirt] [PATCH v2 00/17] Introduce RDT memory bandwidth allocation support
by bing.niu＠intel.com 28 Jul '18

28 Jul '18

From: Bing Niu <bing.niu(a)intel.com> This series is to introduce RDT memory bandwidth allocation support by extending current virresctrl implementation. The Memory Bandwidth Allocation (MBA) feature provides indirect and approximate control over memory bandwidth available per-core. This feature provides a method to control applications which may be over-utilizing bandwidth relative to their priority in environments such as the data-center. The details can be found in Intel's SDM 17.19.7. Kernel supports MBA through resctrl file system same as CAT. Each resctrl group have a MB parameter to control how much memory bandwidth it can utilize in unit of percentage. In this series, MBA is enabled by enhancing existing virresctrl implementation. The policy employed for MBA is similar with CAT: The sum of each MBA group's bandwidth dose not exceed 100%. The enhancement of virresctrl include two main parts: Part 1: Add two new structures virResctrlInfoMemMB and virResctrlAllocMemBW for collecting host system MBA capability and domain memory bandwidth allocation. Those two structures are the extension of existing virResctrlInfo and virResctrlAlloc. With them, virresctrl framework can support MBA and CAT concurrently. Each virResctrlAlloc represent a resource allocation including CAT, or MBA, or CAT&MBA. The policy of MBA is that: total memory bandwidth of each resctrl group, created by virresctrl, does not exceed to 100%. Part 2: On XML part, add new elements to host capabilities query and domain allocation to support memory bandwidth allocation. --------------------------------------------------------------------------------------------- For host capabilities XML, new XML format like below example, <host> ..... <memory_bandwidth> <node id='0' cpus='0-19'> <control granularity='10' min ='10' maxAllocs='8'/> </node> </memory_bandwidth> </host> granularity --- memory bandwidth granularity min --- minimum memory bandwidth allowed maxAllocs --- maximum concurrent memory bandwidth allocation allowed. --------------------------------------------------------------------------------------------- For domain XML, new format as below example <domain type='kvm' id='2'> ...... <cputune> ...... <shares>1024</shares> <memorytune vcpus='0-1'> <node id='0' bandwidth='20'/> </memorytune> </cputune> ...... </domain> id --- node where memory bandwidth allocation will happen bandwidth --- bandwidth allocated in percentage ---------------------------------------------------------------------------------------------- With this extension of the virresctrl, the overall working follow of CAT and MBA is described by below picture. XML parser will aggregate MBA and CAT configuration and represents it in one virresctrl object. The methods of virresctrl class will manipulate resctrl interface to allocate corresponding resources. <memorytune cpus='0-3'> +---------+ | <cachetune vcpus='0-3'> XML | + parser +-----------+ | | +------------------------------+ | | internal object +------v--------------+ virResctrlAlloc | backing object | +------+--------------+ | | +------------------------------+ | +--v-------+ | | | schemata | /sys/fs/resctrl | tasks | | . | | . | | | +----------+ --------------------------------------------------------------------- previous versions and discussion can be found at v1: https://www.redhat.com/archives/libvir-list/2018-July/msg01144.html RFC v2: https://www.redhat.com/archives/libvir-list/2018-June/msg01268.html RFC v1: https://www.redhat.com/archives/libvir-list/2018-May/msg02101.html Changelog: v1 -> this: John's comment: 1. Split calculation of number of memory bandwidth control to one patch. 2. Split virResctrlAllocMemBW relating methods to 5 patch, each provides one kind of function, eg: schemata processing, memory bandwidth calculation..... 3. Use resctrl to replace cachetune in domain conf. 4. Split refactor virDomainCachetuneDefParse into 3 patches. And adjust some logic, eg: use %s format error log, renaming functions..... 5. Complete doc description. eg: update cachetune part about vcpus overlapping with memorytune, update libvirt version info for memory bandwidth control availability. 6. Some coding style fix. RFC_v2->v1: John's comment: 1. use name MemBW to replace MB for a more clear description. 2. split rename patch and put refactor function part separately. 3. split virResctrlInfoMemMB and virResctrlAllocMemBW to different patches. 4. add docs/schemas/*.rng for XML related patches. 5. some cleanup for coding conventions. RFC_ v1->RFC_v2: Jano's comment: 1. put renaming parts into separated patches. 2. set the initial return value as -1. 3. using full name in structure definition. 4. do not use VIR_CACHE_TYPE_LAST for memory bandwidth allocation formatting. Pavel's comment: 1. add host capabilities XML for memory bandwidth allocation. 2. do not mix use cachetune section in XML for memory bandwidth allocation in domain XML. define a dedicated one for memory bandwidth allocation. Bing Niu (17): util: Rename some functions of virresctrl util: Refactor virResctrlGetInfo in virresctrl util: Refactor virResctrlAllocFormat of virresctrl util: Add MBA capability information query to resctrl util: Add MBA check to virResctrlInfoGetCache util: Add MBA allocation to virresctrl util: Add MBA schemata parse and format methods util: Add support to calculate MBA utilization util: Introduce virResctrlAllocForeachMemory util: Introduce virResctrlAllocSetMemoryBandwidth conf: Rename cachetune to resctrl conf: Factor out vcpus parsing part from virDomainCachetuneDefParse conf: Factor out vcpus overlapping from virDomainCachetuneDefParse conf: Factor out virDomainResctrlDef update from virDomainCachetuneDefParse conf: Add support for memorytune XML processing for resctrl MBA conf: Add return value check to virResctrlAllocForeachCache conf: Add memory bandwidth allocation capability of host docs/formatdomain.html.in | 39 +- docs/schemas/capability.rng | 33 ++ docs/schemas/domaincommon.rng | 17 + src/conf/capabilities.c | 107 ++++ src/conf/capabilities.h | 11 + src/conf/domain_conf.c | 427 +++++++++++--- src/conf/domain_conf.h | 10 +- src/libvirt_private.syms | 6 +- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_process.c | 18 +- src/util/virresctrl.c | 611 +++++++++++++++++++-- src/util/virresctrl.h | 55 +- .../memorytune-colliding-allocs.xml | 30 + .../memorytune-colliding-cachetune.xml | 32 ++ tests/genericxml2xmlindata/memorytune.xml | 33 ++ tests/genericxml2xmltest.c | 5 + .../linux-resctrl/resctrl/info/MB/bandwidth_gran | 1 + .../linux-resctrl/resctrl/info/MB/min_bandwidth | 1 + .../linux-resctrl/resctrl/info/MB/num_closids | 1 + tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml | 8 + tests/virresctrldata/resctrl.schemata | 1 + 21 files changed, 1279 insertions(+), 169 deletions(-) create mode 100644 tests/genericxml2xmlindata/memorytune-colliding-allocs.xml create mode 100644 tests/genericxml2xmlindata/memorytune-colliding-cachetune.xml create mode 100644 tests/genericxml2xmlindata/memorytune.xml create mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/info/MB/bandwidth_gran create mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/info/MB/min_bandwidth create mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/info/MB/num_closids -- 2.7.4

1 17

[libvirt] [PATCH 0/9] Introduce RDT memory bandwidth allocation support
by bing.niu＠intel.com 28 Jul '18

28 Jul '18

From: Bing Niu <bing.niu(a)intel.com> This series is to introduce RDT memory bandwidth allocation support by extending current virresctrl implementation. The Memory Bandwidth Allocation (MBA) feature provides indirect and approximate control over memory bandwidth available per-core. This feature provides a method to control applications which may be over-utilizing bandwidth relative to their priority in environments such as the data-center. The details can be found in Intel's SDM 17.19.7. Kernel supports MBA through resctrl file system same as CAT. Each resctrl group have a MB parameter to control how much memory bandwidth it can utilize in unit of percentage. In this series, MBA is enabled by enhancing existing virresctrl implementation. The policy employed for MBA is similar with CAT: The sum of each MBA group's bandwidth dose not exceed 100%. The enhancement of virresctrl include two main parts: Part 1: Add two new structures virResctrlInfoMemMB and virResctrlAllocMemBW for collecting host system MBA capability and domain memory bandwidth allocation. Those two structures are the extension of existing virResctrlInfo and virResctrlAlloc. With them, virresctrl framework can support MBA and CAT concurrently. Each virResctrlAlloc represent a resource allocation including CAT, or MBA, or CAT&MBA. The policy of MBA is that: total memory bandwidth of each resctrl group, created by virresctrl, does not exceed to 100%. Part 2: On XML part, add new elements to host capabilities query and domain allocation to support memory bandwidth allocation. --------------------------------------------------------------------------------------------- For host capabilities XML, new XML format like below example, <host> ..... <memory_bandwidth> <node id='0' cpus='0-19'> <control granularity='10' min ='10' maxAllocs='8'/> </node> </memory_bandwidth> </host> granularity --- memory bandwidth granularity min --- minimum memory bandwidth allowed maxAllocs --- maximum concurrent memory bandwidth allocation allowed. --------------------------------------------------------------------------------------------- For domain XML, new format as below example <domain type='kvm' id='2'> ...... <cputune> ...... <shares>1024</shares> <memorytune vcpus='0-1'> <node id='0' bandwidth='20'/> </memorytune> </cputune> ...... </domain> id --- node where memory bandwidth allocation will happen bandwidth --- bandwidth allocated in percentage ---------------------------------------------------------------------------------------------- With this extension of the virresctrl, the overall working follow of CAT and MBA is described by below picture. XML parser will aggregate MBA and CAT configuration and represents it in one virresctrl object. The methods of virresctrl class will manipulate resctrl interface to allocate corresponding resources. <memorytune cpus='0-3'> +---------+ | <cachetune vcpus='0-3'> XML | + parser +-----------+ | | +------------------------------+ | | internal object +------v--------------+ virResctrlAlloc | backing object | +------+--------------+ | | +------------------------------+ | +--v-------+ | | | schemata | /sys/fs/resctrl | tasks | | . | | . | | | +----------+ --------------------------------------------------------------------- previous RFC versions and discussion can be found at v2: https://www.redhat.com/archives/libvir-list/2018-June/msg01268.html v1: https://www.redhat.com/archives/libvir-list/2018-May/msg02101.html Changelog: RFC_v2->this: John's comment: 1. use name MemBW to replace MB for a more clear description. 2. split rename patch and put refactor function part separately. 3. split virResctrlInfoMemMB and virResctrlAllocMemBW to different patches. 4. add docs/schemas/*.rng for XML related patches. 5. some cleanup for coding conventions. RFC_ v1->RFC_v2: Jano's comment: 1. put renaming parts into separated patches. 2. set the initial return value as -1. 3. using full name in structure definition. 4. do not use VIR_CACHE_TYPE_LAST for memory bandwidth allocation formatting. Pavel's comment: 1. add host capabilities XML for memory bandwidth allocation. 2. do not mix use cachetune section in XML for memory bandwidth allocation in domain XML. define a dedicated one for memory bandwidth allocation. Bing Niu (9): util: Rename some functions of virresctrl util: Refactor virResctrlGetInfo in virresctrl util: Refactor virResctrlAllocFormat of virresctrl util: Add MBA capability information query to resctrl util: Add MBA allocation to virresctrl conf: Rename cachetune to restune conf: Refactor virDomainCachetuneDefParse conf: Introduce cputune/memorytune to support memory bandwidth allocation conf: Add memory bandwidth allocation capability of host docs/formatdomain.html.in | 35 ++ docs/schemas/capability.rng | 33 ++ docs/schemas/domaincommon.rng | 17 + src/conf/capabilities.c | 108 ++++ src/conf/capabilities.h | 11 + src/conf/domain_conf.c | 408 ++++++++++++--- src/conf/domain_conf.h | 10 +- src/libvirt_private.syms | 4 +- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_process.c | 18 +- src/util/virresctrl.c | 574 +++++++++++++++++++-- src/util/virresctrl.h | 54 +- .../memorytune-colliding-allocs.xml | 30 ++ .../memorytune-colliding-cachetune.xml | 32 ++ tests/genericxml2xmlindata/memorytune.xml | 33 ++ tests/genericxml2xmltest.c | 5 + .../linux-resctrl/resctrl/info/MB/bandwidth_gran | 1 + .../linux-resctrl/resctrl/info/MB/min_bandwidth | 1 + .../linux-resctrl/resctrl/info/MB/num_closids | 1 + tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml | 8 + tests/virresctrldata/resctrl.schemata | 1 + 21 files changed, 1233 insertions(+), 153 deletions(-) create mode 100644 tests/genericxml2xmlindata/memorytune-colliding-allocs.xml create mode 100644 tests/genericxml2xmlindata/memorytune-colliding-cachetune.xml create mode 100644 tests/genericxml2xmlindata/memorytune.xml create mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/info/MB/bandwidth_gran create mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/info/MB/min_bandwidth create mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/info/MB/num_closids -- 2.7.4

4 33

[libvirt] [PATCH v2] util: clang is failing to compile due to unused variables.
by Julio Faracco 28 Jul '18

28 Jul '18

After some recent patches, clang is throwing some errors related to unused variables. This is not happening when we use GCC with -Werror enabled. Only clang reports this warning. make[3]: Entering directory '/home/julio/Desktop/virt/libvirt/src' CC util/libvirt_util_la-virscsivhost.lo CC util/libvirt_util_la-virusb.lo CC util/libvirt_util_la-virmdev.lo util/virmdev.c:373:36: error: unused variable 'ret' [-Werror,-Wunused-variable] VIR_AUTOPTR(virMediatedDevice) ret = virMediatedDeviceListSteal(list, dev); ^ 1 error generated. Makefile:11579: recipe for target 'util/libvirt_util_la-virmdev.lo' failed make[3]: *** [util/libvirt_util_la-virmdev.lo] Error 1 make[3]: *** Waiting for unfinished jobs.... util/virscsivhost.c:112:37: error: unused variable 'tmp' [-Werror,-Wunused-variable] VIR_AUTOPTR(virSCSIVHostDevice) tmp = virSCSIVHostDeviceListSteal(list, dev); ^ 1 error generated. Makefile:11411: recipe for target 'util/libvirt_util_la-virscsivhost.lo' failed make[3]: *** [util/libvirt_util_la-virscsivhost.lo] Error 1 util/virusb.c:511:31: error: unused variable 'ret' [-Werror,-Wunused-variable] VIR_AUTOPTR(virUSBDevice) ret = virUSBDeviceListSteal(list, dev); Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/util/virmdev.c | 2 +- src/util/virscsivhost.c | 2 +- src/util/virusb.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/util/virmdev.c b/src/util/virmdev.c index 4050835cc1..4492fd673e 100644 --- a/src/util/virmdev.c +++ b/src/util/virmdev.c @@ -370,7 +370,7 @@ void virMediatedDeviceListDel(virMediatedDeviceListPtr list, virMediatedDevicePtr dev) { - VIR_AUTOPTR(virMediatedDevice) ret = virMediatedDeviceListSteal(list, dev); + virMediatedDeviceListSteal(list, dev); } diff --git a/src/util/virscsivhost.c b/src/util/virscsivhost.c index 280d0dc2fd..1a069e67ff 100644 --- a/src/util/virscsivhost.c +++ b/src/util/virscsivhost.c @@ -109,7 +109,7 @@ void virSCSIVHostDeviceListDel(virSCSIVHostDeviceListPtr list, virSCSIVHostDevicePtr dev) { - VIR_AUTOPTR(virSCSIVHostDevice) tmp = virSCSIVHostDeviceListSteal(list, dev); + virSCSIVHostDeviceListSteal(list, dev); } diff --git a/src/util/virusb.c b/src/util/virusb.c index 609d54836f..d14b7623cc 100644 --- a/src/util/virusb.c +++ b/src/util/virusb.c @@ -508,7 +508,7 @@ void virUSBDeviceListDel(virUSBDeviceListPtr list, virUSBDevicePtr dev) { - VIR_AUTOPTR(virUSBDevice) ret = virUSBDeviceListSteal(list, dev); + virUSBDeviceListSteal(list, dev); } virUSBDevicePtr -- 2.17.1

2 1

[libvirt] [PATCH] util: clang is failing due to unused variables.
by Julio Faracco 27 Jul '18

27 Jul '18

After some recent patches, clang is throwing some errors related to unused variables. This is not happening when we use GCC with -Werror enabled. Only clang reports this warning. make[3]: Entering directory '/home/julio/Desktop/virt/libvirt/src' CC util/libvirt_util_la-virscsivhost.lo CC util/libvirt_util_la-virusb.lo CC util/libvirt_util_la-virmdev.lo util/virmdev.c:373:36: error: unused variable 'ret' [-Werror,-Wunused-variable] VIR_AUTOPTR(virMediatedDevice) ret = virMediatedDeviceListSteal(list, dev); ^ 1 error generated. Makefile:11579: recipe for target 'util/libvirt_util_la-virmdev.lo' failed make[3]: *** [util/libvirt_util_la-virmdev.lo] Error 1 make[3]: *** Waiting for unfinished jobs.... util/virscsivhost.c:112:37: error: unused variable 'tmp' [-Werror,-Wunused-variable] VIR_AUTOPTR(virSCSIVHostDevice) tmp = virSCSIVHostDeviceListSteal(list, dev); ^ 1 error generated. Makefile:11411: recipe for target 'util/libvirt_util_la-virscsivhost.lo' failed make[3]: *** [util/libvirt_util_la-virscsivhost.lo] Error 1 util/virusb.c:511:31: error: unused variable 'ret' [-Werror,-Wunused-variable] VIR_AUTOPTR(virUSBDevice) ret = virUSBDeviceListSteal(list, dev); Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/util/virmdev.c | 3 ++- src/util/virscsivhost.c | 3 ++- src/util/virusb.c | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/util/virmdev.c b/src/util/virmdev.c index 4050835cc1..63df4e40d8 100644 --- a/src/util/virmdev.c +++ b/src/util/virmdev.c @@ -370,7 +370,8 @@ void virMediatedDeviceListDel(virMediatedDeviceListPtr list, virMediatedDevicePtr dev) { - VIR_AUTOPTR(virMediatedDevice) ret = virMediatedDeviceListSteal(list, dev); + VIR_AUTOPTR(virMediatedDevice) ret ATTRIBUTE_UNUSED + = virMediatedDeviceListSteal(list, dev); } diff --git a/src/util/virscsivhost.c b/src/util/virscsivhost.c index 280d0dc2fd..e07cd46ba9 100644 --- a/src/util/virscsivhost.c +++ b/src/util/virscsivhost.c @@ -109,7 +109,8 @@ void virSCSIVHostDeviceListDel(virSCSIVHostDeviceListPtr list, virSCSIVHostDevicePtr dev) { - VIR_AUTOPTR(virSCSIVHostDevice) tmp = virSCSIVHostDeviceListSteal(list, dev); + VIR_AUTOPTR(virSCSIVHostDevice) tmp ATTRIBUTE_UNUSED + = virSCSIVHostDeviceListSteal(list, dev); } diff --git a/src/util/virusb.c b/src/util/virusb.c index 609d54836f..73a1041097 100644 --- a/src/util/virusb.c +++ b/src/util/virusb.c @@ -508,7 +508,8 @@ void virUSBDeviceListDel(virUSBDeviceListPtr list, virUSBDevicePtr dev) { - VIR_AUTOPTR(virUSBDevice) ret = virUSBDeviceListSteal(list, dev); + VIR_AUTOPTR(virUSBDevice) ret ATTRIBUTE_UNUSED + = virUSBDeviceListSteal(list, dev); } virUSBDevicePtr -- 2.17.1

3 3

[libvirt] [PATCH] audit: Share virtType fallback logic
by Cole Robinson 27 Jul '18

27 Jul '18

Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/conf/domain_audit.c | 91 +++++++++++++---------------------------- 1 file changed, 28 insertions(+), 63 deletions(-) diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c index d9be638f05..fc13338d64 100644 --- a/src/conf/domain_audit.c +++ b/src/conf/domain_audit.c @@ -68,6 +68,21 @@ virDomainAuditGetRdev(const char *path ATTRIBUTE_UNUSED) #endif +static const char * +virDomainAuditGetVirtType(virDomainDefPtr def) +{ + const char *virt; + + if (!(virt = virDomainVirtTypeToString(def->virtType))) { + VIR_WARN("Unexpected virt type %d while encoding audit message", + def->virtType); + virt = "?"; + } + + return virt; +} + + static void virDomainAuditGenericDev(virDomainObjPtr vm, const char *type, @@ -82,7 +97,7 @@ virDomainAuditGenericDev(virDomainObjPtr vm, char *vmname = NULL; char *oldsrc = NULL; char *newsrc = NULL; - const char *virt; + const char *virt = virDomainAuditGetVirtType(vm->def); /* if both new and old source aren't provided don't log anything */ if (!newsrcpath && !oldsrcpath) @@ -99,12 +114,6 @@ virDomainAuditGenericDev(virDomainObjPtr vm, if (!(vmname = virAuditEncode("vm", vm->def->name))) goto no_memory; - if (!(virt = virDomainVirtTypeToString(vm->def->virtType))) { - VIR_WARN("Unexpected virt type %d while encoding audit message", - vm->def->virtType); - virt = "?"; - } - if (!(newsrc = virAuditEncode(newdev, VIR_AUDIT_STR(newsrcpath)))) goto no_memory; @@ -312,7 +321,7 @@ virDomainAuditNetDevice(virDomainDefPtr vmDef, virDomainNetDefPtr netDef, char *vmname; char *dev_name = NULL; char *rdev; - const char *virt; + const char *virt = virDomainAuditGetVirtType(vmDef); virUUIDFormat(vmDef->uuid, uuidstr); virMacAddrFormat(&netDef->mac, macstr); @@ -324,11 +333,6 @@ virDomainAuditNetDevice(virDomainDefPtr vmDef, virDomainNetDefPtr netDef, goto cleanup; } - if (!(virt = virDomainVirtTypeToString(vmDef->virtType))) { - VIR_WARN("Unexpected virt type %d while encoding audit message", vmDef->virtType); - virt = "?"; - } - VIR_AUDIT(VIR_AUDIT_RECORD_RESOURCE, success, "virt=%s resrc=net reason=open %s uuid=%s net=%s %s rdev=%s", virt, vmname, uuidstr, macstr, dev_name, VIR_AUDIT_STR(rdev)); @@ -356,7 +360,8 @@ virDomainAuditHostdev(virDomainObjPtr vm, virDomainHostdevDefPtr hostdev, char *vmname; char *address = NULL; char *device = NULL; - const char *virt; + const char *virt = virDomainAuditGetVirtType(vm->def); + virDomainHostdevSubsysUSBPtr usbsrc = &hostdev->source.subsys.u.usb; virDomainHostdevSubsysPCIPtr pcisrc = &hostdev->source.subsys.u.pci; virDomainHostdevSubsysSCSIPtr scsisrc = &hostdev->source.subsys.u.scsi; @@ -369,11 +374,6 @@ virDomainAuditHostdev(virDomainObjPtr vm, virDomainHostdevDefPtr hostdev, return; } - if (!(virt = virDomainVirtTypeToString(vm->def->virtType))) { - VIR_WARN("Unexpected virt type %d while encoding audit message", vm->def->virtType); - virt = "?"; - } - switch ((virDomainHostdevMode) hostdev->mode) { case VIR_DOMAIN_HOSTDEV_MODE_SUBSYS: switch ((virDomainHostdevSubsysType) hostdev->source.subsys.type) { @@ -509,7 +509,7 @@ virDomainAuditRedirdev(virDomainObjPtr vm, virDomainRedirdevDefPtr redirdev, char *vmname; char *address = NULL; char *device = NULL; - const char *virt; + const char *virt = virDomainAuditGetVirtType(vm->def); virUUIDFormat(vm->def->uuid, uuidstr); if (!(vmname = virAuditEncode("vm", vm->def->name))) { @@ -517,11 +517,6 @@ virDomainAuditRedirdev(virDomainObjPtr vm, virDomainRedirdevDefPtr redirdev, return; } - if (!(virt = virDomainVirtTypeToString(vm->def->virtType))) { - VIR_WARN("Unexpected virt type %d while encoding audit message", vm->def->virtType); - virt = "?"; - } - switch (redirdev->bus) { case VIR_DOMAIN_REDIRDEV_BUS_USB: if (VIR_STRDUP_QUIET(address, "USB redirdev") < 0) { @@ -571,7 +566,7 @@ virDomainAuditTPM(virDomainObjPtr vm, virDomainTPMDefPtr tpm, char *vmname; char *path = NULL; char *device = NULL; - const char *virt; + const char *virt = virDomainAuditGetVirtType(vm->def); virUUIDFormat(vm->def->uuid, uuidstr); if (!(vmname = virAuditEncode("vm", vm->def->name))) { @@ -579,11 +574,6 @@ virDomainAuditTPM(virDomainObjPtr vm, virDomainTPMDefPtr tpm, return; } - if (!(virt = virDomainVirtTypeToString(vm->def->virtType))) { - VIR_WARN("Unexpected virt type %d while encoding audit message", vm->def->virtType); - virt = "?"; - } - switch (tpm->type) { case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH: path = tpm->data.passthrough.source.data.file.path; @@ -639,7 +629,7 @@ virDomainAuditCgroup(virDomainObjPtr vm, virCgroupPtr cgroup, char *vmname; char *controller = NULL; char *detail; - const char *virt; + const char *virt = virDomainAuditGetVirtType(vm->def); virUUIDFormat(vm->def->uuid, uuidstr); if (!(vmname = virAuditEncode("vm", vm->def->name))) { @@ -647,11 +637,6 @@ virDomainAuditCgroup(virDomainObjPtr vm, virCgroupPtr cgroup, return; } - if (!(virt = virDomainVirtTypeToString(vm->def->virtType))) { - VIR_WARN("Unexpected virt type %d while encoding audit message", vm->def->virtType); - virt = "?"; - } - ignore_value(virCgroupPathOfController(cgroup, VIR_CGROUP_CONTROLLER_DEVICES, NULL, &controller)); @@ -757,7 +742,7 @@ virDomainAuditResource(virDomainObjPtr vm, const char *resource, { char uuidstr[VIR_UUID_STRING_BUFLEN]; char *vmname; - const char *virt; + const char *virt = virDomainAuditGetVirtType(vm->def); virUUIDFormat(vm->def->uuid, uuidstr); if (!(vmname = virAuditEncode("vm", vm->def->name))) { @@ -765,11 +750,6 @@ virDomainAuditResource(virDomainObjPtr vm, const char *resource, return; } - if (!(virt = virDomainVirtTypeToString(vm->def->virtType))) { - VIR_WARN("Unexpected virt type %d while encoding audit message", vm->def->virtType); - virt = "?"; - } - VIR_AUDIT(VIR_AUDIT_RECORD_RESOURCE, success, "virt=%s resrc=%s reason=%s %s uuid=%s old-%s=%lld new-%s=%lld", virt, resource, reason, vmname, uuidstr, @@ -809,7 +789,7 @@ virDomainAuditLifecycle(virDomainObjPtr vm, const char *op, { char uuidstr[VIR_UUID_STRING_BUFLEN]; char *vmname; - const char *virt; + const char *virt = virDomainAuditGetVirtType(vm->def); virUUIDFormat(vm->def->uuid, uuidstr); @@ -818,11 +798,6 @@ virDomainAuditLifecycle(virDomainObjPtr vm, const char *op, return; } - if (!(virt = virDomainVirtTypeToString(vm->def->virtType))) { - VIR_WARN("Unexpected virt type %d while encoding audit message", vm->def->virtType); - virt = "?"; - } - VIR_AUDIT(VIR_AUDIT_RECORD_MACHINE_CONTROL, success, "virt=%s op=%s reason=%s %s uuid=%s vm-pid=%lld", virt, op, reason, vmname, uuidstr, (long long)vm->pid); @@ -909,7 +884,7 @@ virDomainAuditInit(virDomainObjPtr vm, { char uuidstr[VIR_UUID_STRING_BUFLEN]; char *vmname; - const char *virt; + const char *virt = virDomainAuditGetVirtType(vm->def); virUUIDFormat(vm->def->uuid, uuidstr); @@ -918,11 +893,6 @@ virDomainAuditInit(virDomainObjPtr vm, return; } - if (!(virt = virDomainVirtTypeToString(vm->def->virtType))) { - VIR_WARN("Unexpected virt type %d while encoding audit message", vm->def->virtType); - virt = "?"; - } - VIR_AUDIT(VIR_AUDIT_RECORD_MACHINE_CONTROL, true, "virt=%s op=init %s uuid=%s vm-pid=%lld init-pid=%lld pid-ns=%lld", virt, vmname, uuidstr, (long long)vm->pid, (long long)initpid, @@ -942,8 +912,8 @@ virDomainAuditSecurityLabel(virDomainObjPtr vm, bool success) { char uuidstr[VIR_UUID_STRING_BUFLEN]; char *vmname; - const char *virt; size_t i; + const char *virt = virDomainAuditGetVirtType(vm->def); virUUIDFormat(vm->def->uuid, uuidstr); if (!(vmname = virAuditEncode("vm", vm->def->name))) { @@ -951,11 +921,6 @@ virDomainAuditSecurityLabel(virDomainObjPtr vm, bool success) return; } - if (!(virt = virDomainVirtTypeToString(vm->def->virtType))) { - VIR_WARN("Unexpected virt type %d while encoding audit message", vm->def->virtType); - virt = "?"; - } - for (i = 0; i < vm->def->nseclabels; i++) { VIR_AUDIT(VIR_AUDIT_RECORD_MACHINE_ID, success, "virt=%s %s uuid=%s vm-ctx=%s img-ctx=%s model=%s", @@ -976,7 +941,7 @@ virDomainAuditShmem(virDomainObjPtr vm, char uuidstr[VIR_UUID_STRING_BUFLEN]; char *vmname = virAuditEncode("vm", vm->def->name); const char *srcpath = virDomainChrSourceDefGetPath(&def->server.chr); - const char *virt = virDomainVirtTypeToString(vm->def->virtType); + const char *virt = virDomainAuditGetVirtType(vm->def); char *shmpath = NULL; virUUIDFormat(vm->def->uuid, uuidstr); @@ -1018,7 +983,7 @@ virDomainAuditInput(virDomainObjPtr vm, { char uuidstr[VIR_UUID_STRING_BUFLEN]; char *vmname; - const char *virt = virDomainVirtTypeToString(vm->def->virtType); + const char *virt = virDomainAuditGetVirtType(vm->def); virUUIDFormat(vm->def->uuid, uuidstr); -- 2.17.1

2 1

[libvirt] [PATCH] virpci: Drop unused @ret in virPCIDeviceListDel
by Michal Privoznik 27 Jul '18

27 Jul '18

So after 00dc991ca16730 the function is one line long and the line is declaring a variable which is never used in fact. Replace it with actual free() call instead of autofree. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under build breaker rule as this is causing clang to complain. Huh, who uses that? :-P src/util/virpci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virpci.c b/src/util/virpci.c index 634df8d35f..6cf2acf2d1 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -2003,7 +2003,7 @@ void virPCIDeviceListDel(virPCIDeviceListPtr list, virPCIDevicePtr dev) { - VIR_AUTOPTR(virPCIDevice) ret = virPCIDeviceListSteal(list, dev); + virPCIDeviceFree(virPCIDeviceListSteal(list, dev)); } int -- 2.16.4

1 0

[libvirt] [PATCH v2 00/41] use GNU C's cleanup attribute in src/util (batch II)
by Sukrit Bhatnagar 27 Jul '18

27 Jul '18

This second series of patches also modifies a few files in src/util to use VIR_AUTOFREE and VIR_AUTOPTR for automatic freeing of memory and get rid of some VIR_FREE macro invocations and *Free function calls. The argument type of virCgroupFree is changed from virCgroupPtr * to virCgroupPtr and that of virUSBDeviceListAdd is changed to take a double pointer to virUSBDevice. Sukrit Bhatnagar (41): util: error: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: buffer: typedef for struct _virBufferEscapePair util: buffer: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: buffer: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: buffer: use VIR_AUTOPTR for aggregate types util: hash: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: cgroup: modify virCgroupFree to take virCgroupPtr util: cgroup: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: cgroup: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: cgroup: use VIR_AUTOPTR for aggregate types util: mdev: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: mdev: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: mdev: use VIR_AUTOPTR for aggregate types util: firewall: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: firewall: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: firewall: use VIR_AUTOPTR for aggregate types util: hook: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: hook: use VIR_AUTOPTR for aggregate types util: pci: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: pci: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: pci: use VIR_AUTOPTR for aggregate types util: usb: modify virUSBDeviceListAdd to take double pointer util: usb: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: usb: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: usb: use VIR_AUTOPTR for aggregate types util: scsi: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: scsi: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: scsi: use VIR_AUTOPTR for aggregate types util: scsivhost: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: scsivhost: use VIR_AUTOPTR for aggregate types util: netdevvlan: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: hostdev: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: hostdev: use VIR_AUTOPTR for aggregate types util: hostmem: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: iptables: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: iscsi: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: iscsi: use VIR_AUTOPTR for aggregate types util: kmod: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: kmod: use VIR_AUTOPTR for aggregate types util: lease: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: lease: use VIR_AUTOPTR for aggregate types src/libvirt-lxc.c | 4 +- src/lxc/lxc_cgroup.c | 4 +- src/lxc/lxc_container.c | 2 +- src/lxc/lxc_controller.c | 2 +- src/lxc/lxc_domain.c | 2 +- src/lxc/lxc_process.c | 10 +- src/qemu/qemu_cgroup.c | 16 +- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_driver.c | 34 +-- src/qemu/qemu_process.c | 2 +- src/util/virbuffer.c | 38 ++- src/util/virbuffer.h | 9 +- src/util/vircgroup.c | 746 +++++++++++++++++------------------------------ src/util/vircgroup.h | 11 +- src/util/vircgrouppriv.h | 2 +- src/util/virerror.c | 1 - src/util/virerror.h | 3 + src/util/virfirewall.c | 53 ++-- src/util/virfirewall.h | 3 + src/util/virhash.c | 1 - src/util/virhash.h | 4 + src/util/virhook.c | 26 +- src/util/virhostdev.c | 168 ++++------- src/util/virhostmem.c | 57 ++-- src/util/viriptables.c | 52 ++-- src/util/viriscsi.c | 89 ++---- src/util/virkmod.c | 38 +-- src/util/virlease.c | 82 ++---- src/util/virmdev.c | 84 ++---- src/util/virmdev.h | 4 + src/util/virnetdevvlan.c | 1 - src/util/virnetdevvlan.h | 4 + src/util/virpci.c | 352 ++++++++-------------- src/util/virpci.h | 7 + src/util/virscsi.c | 63 ++-- src/util/virscsi.h | 3 + src/util/virscsivhost.c | 19 +- src/util/virscsivhost.h | 3 + src/util/virusb.c | 42 ++- src/util/virusb.h | 5 +- tests/vircgrouptest.c | 42 +-- tests/virusbtest.c | 4 +- 42 files changed, 800 insertions(+), 1294 deletions(-) -- 1.8.3.1

2 47

[libvirt] [PATCH 0/3] lxc: Simplify virLXCProcessStart a tiny bit
by Michal Privoznik 27 Jul '18

27 Jul '18

These are basically follow up patches as suggested by Erik in his review: https://www.redhat.com/archives/libvir-list/2018-July/msg01767.html Michal Prívozník (3): util: Rework virStringListAdd lxc: Turn @veths into a string list in virLXCProcessStart lxc: Use VIR_AUTOPTR for @veths in virLXCProcessStart src/lxc/lxc_process.c | 25 +++++++++---------------- src/util/virmacmap.c | 8 ++------ src/util/virstring.c | 34 ++++++++++++++-------------------- src/util/virstring.h | 4 ++-- tests/virstringtest.c | 6 +----- 5 files changed, 28 insertions(+), 49 deletions(-) -- 2.16.4

2 9

[libvirt] Plans for next release
by Daniel Veillard 27 Jul '18

27 Jul '18

So we are getting very close to the end of the month, I suggest to enter freeze tomorrow morning, then plan for an RC2 on Tuesday, that way if everythiong goes well next release would be on Thursday 2nd Aug, I hope this is fine with everyone's schedule, thanks, Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH] news: Usb and sata for virsh attach-disk --address
by Han Han 27 Jul '18

27 Jul '18

Signed-off-by: Han Han <hhan(a)redhat.com> --- docs/news.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index fc7924ad5f..a68ef2dc1c 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -76,6 +76,16 @@ using attach-disk or attach-interface commands. </description> </change> + <change> + <summary> + virsh: Support usb and sata address to attach-disk + </summary> + <description> + Usb or sata address could be used when attach-disk with --address. + For example, use usb address as usb:<bus>.<port>, use + sata address as <controller>.<bus>.<unit>. + </description> + </change> </section> <section title="Bug fixes"> </section> -- 2.18.0

2 1

[libvirt] [dbus PATCH] gitignore: Ignore Vim swap files
by Andrea Bolognani 27 Jul '18

27 Jul '18

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index e89a5d3..b4abf66 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ *.log *.o *.pyc +*.swp *.trs *Makefile *Makefile.in -- 2.17.1

1 0

[libvirt] [PATCH] lxc: Don't return early in virLXCProcessSetupInterfaces
by Michal Privoznik 27 Jul '18

27 Jul '18

There are two places in the loop body that just return instead of jumping onto the cleanup label. The problem is the cleanup code is not ran in those cases. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial rule. src/lxc/lxc_process.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index d021a890f7..442756a6f1 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -544,7 +544,7 @@ static int virLXCProcessSetupInterfaces(virConnectPtr conn, net = def->nets[i]; if (virLXCProcessValidateInterface(net) < 0) - return -1; + goto cleanup; if (virDomainNetAllocateActualDevice(def, net) < 0) goto cleanup; @@ -612,7 +612,7 @@ static int virLXCProcessSetupInterfaces(virConnectPtr conn, /* Make sure all net definitions will have a name in the container */ if (!net->ifname_guest) { if (virAsprintf(&net->ifname_guest, "eth%zu", niface) < 0) - return -1; + goto cleanup; niface++; } } -- 2.16.4

1 0

[libvirt] [PATCH RFC 0/2] util: Add VIR_ENUM_IMPL_LABEL
by Cole Robinson 27 Jul '18

27 Jul '18

This series adds VIR_ENUM_IMPL_LABEL and a demo conversion. VIR_ENUM_IMPL_LABEL allows passing in a string that briefly describes the value the enum represents, which we use to generate error messages for FromString and ToString function failures. This will allow us to drop a lot of code and unique strings that need translating. Patch 2 is an example usage, converting virDomainVirtType enum. It's not a full conversion for this particular enum, just a demo. The enum creation now looks like VIR_ENUM_IMPL_LABEL(virDomainVirt, "domain type", VIR_DOMAIN_VIRT_LAST, ... FromString failure reports this error for value 'zzzz' invalid argument: Unknown 'domain type' value 'zzzz' ToString failure reports this error for unknown type=83 internal error: Unknown 'domain type' internal value '83' Seems like a win to me but I'm interested in other opinions. This could also be a good BiteSizedTask for converting existing enums Cole Robinson (2): util: Add VIR_ENUM_IMPL_LABEL conf: Convert virDomainVirtType to VIR_ENUM_IMPL_LABEL src/conf/domain_conf.c | 10 ++-------- src/util/virutil.c | 20 ++++++++++++++++---- src/util/virutil.h | 15 ++++++++++----- 3 files changed, 28 insertions(+), 17 deletions(-) -- 2.17.1

3 5

[libvirt] [PATCH 0/8] Work-in-progress: Incremental Backup API additions
by Eric Blake 26 Jul '18

26 Jul '18

I'm offline the rest of this week, but wanted to post the progress I've made on patches towards the Incremental Backup RFC: https://www.redhat.com/archives/libvir-list/2018-May/msg01403.html Comments welcome, including any naming suggestions Still to go: - Add .rng file for validating the XML format used in virDomainBackupBegin() - Add flags for validating XML - Add src/conf/checkpoint_conf.c mirroring src/conf/snapshot_conf.c for tracking tree of checkpoints - Add virsh wrappers for calling everything - Add qemu implementation - my first addition will probably just be for push model full backups, then additional patches to expand into pull model (on the qemu list, I still need to review and incorporate Vladimir's patches for exporting a bitmap over NBD) - Bug fixes (but why would there be any bugs in the first place? :) I've got portions of the qemu code working locally, but not polished enough to post as a patch yet; my end goal is to have a working demo against current qemu.git showing the use of virDomainBackupBegin() for incremental backups with the push model prior to the code freeze for 4.5.0 this month, even if that code doesn't get checked into libvirt until later when the qemu code is changed to drop x- prefixes. (That is, I'm hoping to demo that my API is sound, and thus we can include the entrypoints in the libvirt.so for this release, even if the libvirt code for driving pull mode over qemu waits until after a qemu release where the pieces are promoted to a stable form.) Eric Blake (8): snapshots: Avoid term 'checkpoint' for full system snapshot backup: Document nuances between different state capture APIs backup: Introduce virDomainCheckpointPtr backup: Document new XML for backups backup: Introduce virDomainCheckpoint APIs backup: Introduce virDomainBackup APIs backup: Add new domain:checkpoint access control backup: Implement backup APIs for remote driver docs/Makefile.am | 3 + docs/apibuild.py | 2 + docs/docs.html.in | 9 +- docs/domainstatecapture.html.in | 190 ++++++ docs/formatcheckpoint.html.in | 273 +++++++++ docs/formatsnapshot.html.in | 16 +- docs/schemas/domaincheckpoint.rng | 89 +++ include/libvirt/libvirt-domain-checkpoint.h | 158 +++++ include/libvirt/libvirt-domain-snapshot.h | 10 +- include/libvirt/libvirt-domain.h | 14 +- include/libvirt/libvirt.h | 3 +- include/libvirt/virterror.h | 5 +- libvirt.spec.in | 2 + mingw-libvirt.spec.in | 4 + po/POTFILES | 1 + src/Makefile.am | 2 + src/access/viraccessperm.c | 5 +- src/access/viraccessperm.h | 8 +- src/conf/snapshot_conf.c | 2 +- src/datatypes.c | 62 +- src/datatypes.h | 31 +- src/driver-hypervisor.h | 74 ++- src/libvirt-domain-checkpoint.c | 908 ++++++++++++++++++++++++++++ src/libvirt-domain-snapshot.c | 4 +- src/libvirt-domain.c | 8 +- src/libvirt_private.syms | 2 + src/libvirt_public.syms | 19 + src/qemu/qemu_driver.c | 12 +- src/remote/remote_daemon_dispatch.c | 15 + src/remote/remote_driver.c | 31 +- src/remote/remote_protocol.x | 237 +++++++- src/remote_protocol-structs | 129 ++++ src/rpc/gendispatch.pl | 32 +- src/util/virerror.c | 15 +- tests/domaincheckpointxml2xmlin/empty.xml | 1 + tests/domaincheckpointxml2xmlout/empty.xml | 10 + tests/virschematest.c | 2 + tools/virsh-domain.c | 3 +- tools/virsh-snapshot.c | 2 +- tools/virsh.pod | 14 +- 40 files changed, 2347 insertions(+), 60 deletions(-) create mode 100644 docs/domainstatecapture.html.in create mode 100644 docs/formatcheckpoint.html.in create mode 100644 docs/schemas/domaincheckpoint.rng create mode 100644 include/libvirt/libvirt-domain-checkpoint.h create mode 100644 src/libvirt-domain-checkpoint.c create mode 100644 tests/domaincheckpointxml2xmlin/empty.xml create mode 100644 tests/domaincheckpointxml2xmlout/empty.xml -- 2.14.4

5 28

[libvirt] [PATCH v2 0/1] conf: Add validation of input devices
by Han Han 26 Jul '18

26 Jul '18

v1: https://www.redhat.com/archives/libvir-list/2018-July/msg00658.html Han Han (1): conf: Add validation of input devices src/conf/domain_conf.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) -- 2.18.0

2 2

[libvirt] [PATCH] conf: fix virtType FromString check
by Cole Robinson 26 Jul '18

26 Jul '18

In the domain definition, virtType is virDomainVirtType which is unsigned, so comparing against -1 doesn't work. Cast to int first Fixes 8e2982b5767 Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- This regressed in the past as well, when virtType was changed to virDomainVirtType in 7383b8cc068, fixed by the follow up 5e06a4f063. It's strange that virDomainVirtType is unsigned but VirtTypeFromString can return -1... it should probably either work like virArch, or we should switch virDomainVirtType to int in the DomainDef, but that requires fixing a few other places too src/conf/domain_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index c27c874d9e..30806d1e59 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -19140,7 +19140,7 @@ virDomainDefParseCaps(virDomainDefPtr def, "%s", _("missing domain type attribute")); goto cleanup; } - if ((def->virtType = virDomainVirtTypeFromString(virttype)) < 0) { + if ((int)(def->virtType = virDomainVirtTypeFromString(virttype)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("invalid domain type %s"), virttype); goto cleanup; -- 2.17.1

2 1

[libvirt] [PATCH] conf: don't use virDomainVirtType in struct field
by Daniel P. Berrangé 26 Jul '18

26 Jul '18

Use of enum types for struct fields is generally avoided since it causes warnings if the compiler assumes the enum is unsigned. For example commit 8e2982b5767a25e5da6533c65bfdc648c95b3c69 Author: Cole Robinson <crobinso(a)redhat.com> Date: Tue Jul 24 16:27:54 2018 -0400 conf: Clean up virDomainDefParseCaps Introduced a line: if ((def->virtType = virDomainVirtTypeFromString(virttype)) < 0) { which causes a build failure with CLang conf/domain_conf.c:19143:65: error: comparison of unsigned enum expression < 0 is always false [-Werror,-Wtautological-compare] as the compiler is free to optimize away the "< 0" check due to the assumption that the enum type is unsigned and always in range. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/conf/domain_conf.c | 2 +- src/conf/domain_conf.h | 2 +- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_process.c | 4 +++- 4 files changed, 6 insertions(+), 4 deletions(-) Pushing as a build fix for CLang diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index c27c874d9e..f94a90fbcc 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -15075,7 +15075,7 @@ virDomainVideoDefaultRAM(const virDomainDef *def, int virDomainVideoDefaultType(const virDomainDef *def) { - switch (def->virtType) { + switch ((virDomainVirtType)def->virtType) { case VIR_DOMAIN_VIRT_TEST: case VIR_DOMAIN_VIRT_XEN: if (def->os.type == VIR_DOMAIN_OSTYPE_XEN || diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index a804e86f6c..c1dfa37fdf 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2386,7 +2386,7 @@ struct _virDomainVirtioOptions { typedef struct _virDomainDef virDomainDef; typedef virDomainDef *virDomainDefPtr; struct _virDomainDef { - virDomainVirtType virtType; + int virtType; /* enum virDomainVirtType */ int id; unsigned char uuid[VIR_UUID_BUFLEN]; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ae45c45b7f..d148db90fa 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7163,7 +7163,7 @@ qemuBuildMachineCommandLine(virCommandPtr cmd, virCommandAddArg(cmd, "-machine"); virBufferAdd(&buf, def->os.machine, -1); - switch (def->virtType) { + switch ((virDomainVirtType)def->virtType) { case VIR_DOMAIN_VIRT_QEMU: virBufferAddLit(&buf, ",accel=tcg"); break; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 27bd8b9465..c4e33723d1 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7191,6 +7191,7 @@ int qemuProcessAttach(virConnectPtr conn ATTRIBUTE_UNUSED, virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); virCapsPtr caps = NULL; bool active = false; + virDomainVirtType virtType; VIR_DEBUG("Beginning VM attach process"); @@ -7342,8 +7343,9 @@ int qemuProcessAttach(virConnectPtr conn ATTRIBUTE_UNUSED, goto exit_monitor; if (qemuMonitorGetStatus(priv->mon, &running, &reason) < 0) goto exit_monitor; - if (qemuMonitorGetVirtType(priv->mon, &vm->def->virtType) < 0) + if (qemuMonitorGetVirtType(priv->mon, &virtType) < 0) goto exit_monitor; + vm->def->virtType = virtType; if (qemuDomainObjExitMonitor(driver, vm) < 0) goto error; -- 2.17.1

1 0

[libvirt] [PATCH] qemu_monitor: Fix regression in getting disk capacity
by Michal Privoznik 26 Jul '18

26 Jul '18

In dbf990fd31e8 the qemuMonitorJSONBlockStatsUpdateCapacityOne() was split. However, due to a bug the return value was never set to something meaningful. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_monitor_json.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 75d0738b5d..9acf62e0bb 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2492,14 +2492,15 @@ qemuMonitorJSONBlockStatsUpdateCapacityOne(virJSONValuePtr image, goto cleanup; if (backingChain && - (backing = virJSONValueObjectGetObject(image, "backing-image"))) { - ret = qemuMonitorJSONBlockStatsUpdateCapacityOne(backing, - dev_name, - depth + 1, - stats, - true); - } + (backing = virJSONValueObjectGetObject(image, "backing-image")) && + qemuMonitorJSONBlockStatsUpdateCapacityOne(backing, + dev_name, + depth + 1, + stats, + true) < 0) + goto cleanup; + ret = 0; cleanup: VIR_FREE(entry_name); return ret; -- 2.16.4

2 1

[libvirt] [PATCH] conf: Fix typo in error msg of virDomainVideoDefValidate
by Han Han 26 Jul '18

26 Jul '18

https://bugzilla.redhat.com/show_bug.cgi?id=1607825 Fix typo of error msg when 'none' type is not the only video device defined in VM. Signed-off-by: Han Han <hhan(a)redhat.com> --- src/conf/domain_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 33b0b4ab68..c2ccbcca91 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5687,7 +5687,7 @@ virDomainVideoDefValidate(const virDomainVideoDef *video, if (def->videos[i]->type == VIR_DOMAIN_VIDEO_TYPE_NONE && def->nvideos > 1) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("a '%s' video type must be the only video device " + _("a 'none' video type must be the only video device " "defined for the domain")); return -1; } -- 2.18.0

2 1

[libvirt] [PATCH 0/7] conf: Replace SKIP_OSTYPE with SKIP_VALIDATE
by Cole Robinson 26 Jul '18

26 Jul '18

The SKIP_OSTYPE domain parse flag is largely redundant nowadays since we have SKIP_VALIDATE. This series smoothes out some of the SKIP_OSTYPE weirdness so we can drop it Cole Robinson (7): conf: Break out virDomainDefParseCaps conf: Clean up virDomainDefParseCaps tests: qemuhotplug: Fix segfault when XML loading fails conf: Drop unneccessary caps parsing logic conf: Sync caps data even when SKIP_OSTYPE_CHECKS tests: Remove redundant lxc test conf: Replace SKIP_OSTYPE_CHECKS with SKIP_VALIDATE src/conf/domain_conf.c | 175 +++++++++++---------- src/conf/domain_conf.h | 13 +- src/conf/snapshot_conf.c | 2 - src/conf/virdomainobjlist.c | 2 - tests/lxcxml2xmltest.c | 2 - tests/qemuhotplugtest.c | 2 + tests/qemuxml2argvdata/missing-machine.xml | 2 +- tests/qemuxml2argvtest.c | 5 +- tests/qemuxml2xmltest.c | 1 - tests/testutils.c | 13 +- tests/testutilsqemu.c | 18 +++ tests/vircapstest.c | 2 - 12 files changed, 132 insertions(+), 105 deletions(-) -- 2.17.1

2 12

[libvirt] [dbus PATCH v2 0/2] Make correct use of setup fixtures & cleanup
by Katerina Koukiou 26 Jul '18

26 Jul '18

diff from v1: * fixtures patch merged * fixed reminder flake8 issues * added patch introducing syntax-check target in the Makefile Katerina Koukiou (2): tests: fix all coding style issues to comply with flake8 Add syntax-check target in Makefile.am HACKING.md | 9 ++++++++- Makefile.am | 6 ++++++ tests/libvirttest.py | 9 +++++---- tests/test_connect.py | 2 +- tests/test_domain.py | 5 +++-- tests/test_interface.py | 12 +++++++----- tests/test_network.py | 8 ++++---- tests/test_storage.py | 1 + 8 files changed, 35 insertions(+), 17 deletions(-) -- 2.17.1

2 4

[libvirt] [dbus PATCH 0/2] Make correct use of setup fixtures & cleanup
by Katerina Koukiou 26 Jul '18

26 Jul '18

Katerina Koukiou (2): tests: {interface, node_device}_create should be used as setup fixtures tests: fix all coding style issues to comply with pep8 tests/libvirttest.py | 1 + tests/test_connect.py | 9 +++++---- tests/test_domain.py | 5 +++-- tests/test_interface.py | 23 +++++++++++++---------- tests/test_network.py | 8 ++++---- tests/test_nodedev.py | 16 ++++++++-------- tests/test_storage.py | 1 + 7 files changed, 35 insertions(+), 28 deletions(-) -- 2.17.1

2 5

[libvirt] [PATCH 0/5] Couple of LXC fixes & improvements
by Michal Privoznik 26 Jul '18

26 Jul '18

*** BLURB HERE *** Michal Prívozník (5): lxc: Refresh capabilities on virConnectGetCapabilities lxc: Report supported huge pages lxc: Enable under valgrind again lxc: Don't leak @veths in virLXCProcessStart lxc: Don't mangle @cfg refs in virLXCProcessBuildControllerCmd src/lxc/lxc_conf.c | 4 ++++ src/lxc/lxc_driver.c | 13 +------------ src/lxc/lxc_process.c | 15 +++++++++------ 3 files changed, 14 insertions(+), 18 deletions(-) -- 2.16.4

2 10

[libvirt] [PATCH] networkGetDHCPLeases: Don't always report error if unable to read leases file
by Michal Privoznik 26 Jul '18

26 Jul '18

https://bugzilla.redhat.com/show_bug.cgi?id=1600468 If we are unable to read leases file (no matter what the reason is), we return 0 - just like if there were no leases. However, because we use virFileReadAll() an error is printed into the log. Note that not all networks have leases file - only those for which we start dnsmasq. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/network/bridge_driver.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index a7826e9b63..5839021caf 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -4235,13 +4235,20 @@ networkGetDHCPLeases(virNetworkPtr net, custom_lease_file = networkDnsmasqLeaseFileNameCustom(driver, def->bridge); /* Read entire contents */ - if ((custom_lease_file_len = virFileReadAll(custom_lease_file, - VIR_NETWORK_DHCP_LEASE_FILE_SIZE_MAX, - &lease_entries)) < 0) { - /* Even though src/network/leaseshelper.c guarantees the existence of - * leases file (even if no leases are present), and the control reaches - * here, instead of reporting error, return 0 leases */ - rv = 0; + if ((custom_lease_file_len = virFileReadAllQuiet(custom_lease_file, + VIR_NETWORK_DHCP_LEASE_FILE_SIZE_MAX, + &lease_entries)) < 0) { + /* Not all networks are guaranteed to have leases file. + * Only those which run dnsmasq. Therefore, if we failed + * to read the leases file, don't report error. Return 0 + * leases instead. */ + if (errno != ENOENT) { + virReportSystemError(errno, + _("Unable to read leases file: %s"), + custom_lease_file); + } else { + rv = 0; + } goto error; } -- 2.16.4

2 2

[libvirt] [PATCH v1 00/40] use GNU C's cleanup attribute in src/util (batch II)
by Sukrit Bhatnagar 26 Jul '18

26 Jul '18

This second series of patches also modifies a few files in src/util to use VIR_AUTOFREE and VIR_AUTOPTR for automatic freeing of memory and get rid of some VIR_FREE macro invocations and *Free function calls. The argument type of virCgroupFree is changed from virCgroupPtr * to virCgroupPtr. Sukrit Bhatnagar (40): util: cgroup: modify virCgroupFree to take virCgroupPtr util: error: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: buffer: typedef and Free helper for struct _virBufferEscapePair util: buffer: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: buffer: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: buffer: use VIR_AUTOPTR for aggregate types util: hash: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: cgroup: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: cgroup: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: cgroup: use VIR_AUTOPTR for aggregate types util: mdev: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: mdev: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: mdev: use VIR_AUTOPTR for aggregate types util: firewall: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: firewall: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: firewall: use VIR_AUTOPTR for aggregate types util: hook: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: hook: use VIR_AUTOPTR for aggregate types util: pci: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: pci: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: pci: use VIR_AUTOPTR for aggregate types util: netdevvlan: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: usb: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: usb: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: usb: use VIR_AUTOPTR for aggregate types util: scsi: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: scsi: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: scsi: use VIR_AUTOPTR for aggregate types util: scsivhost: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: scsivhost: use VIR_AUTOPTR for aggregate types util: hostdev: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: hostdev: use VIR_AUTOPTR for aggregate types util: hostmem: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: iptables: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: iscsi: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: iscsi: use VIR_AUTOPTR for aggregate types util: kmod: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: kmod: use VIR_AUTOPTR for aggregate types util: lease: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: lease: use VIR_AUTOPTR for aggregate types src/libvirt-lxc.c | 4 +- src/lxc/lxc_cgroup.c | 4 +- src/lxc/lxc_container.c | 2 +- src/lxc/lxc_controller.c | 2 +- src/lxc/lxc_domain.c | 2 +- src/lxc/lxc_process.c | 10 +- src/qemu/qemu_cgroup.c | 16 +- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_driver.c | 34 ++- src/qemu/qemu_process.c | 2 +- src/util/virbuffer.c | 34 ++- src/util/virbuffer.h | 9 +- src/util/vircgroup.c | 718 +++++++++++++++++------------------------------ src/util/vircgroup.h | 11 +- src/util/vircgrouppriv.h | 2 +- src/util/virerror.c | 1 - src/util/virerror.h | 3 + src/util/virfirewall.c | 53 ++-- src/util/virfirewall.h | 3 + src/util/virhash.c | 1 - src/util/virhash.h | 4 + src/util/virhook.c | 20 +- src/util/virhostdev.c | 162 ++++------- src/util/virhostmem.c | 57 ++-- src/util/viriptables.c | 52 ++-- src/util/viriscsi.c | 89 ++---- src/util/virkmod.c | 38 +-- src/util/virlease.c | 82 ++---- src/util/virmdev.c | 84 ++---- src/util/virmdev.h | 4 + src/util/virnetdevvlan.c | 1 - src/util/virnetdevvlan.h | 4 + src/util/virpci.c | 323 +++++++-------------- src/util/virpci.h | 4 + src/util/virscsi.c | 64 ++--- src/util/virscsi.h | 3 + src/util/virscsivhost.c | 8 +- src/util/virscsivhost.h | 3 + src/util/virusb.c | 22 +- src/util/virusb.h | 3 + tests/vircgrouptest.c | 42 +-- 41 files changed, 739 insertions(+), 1243 deletions(-) -- 1.8.3.1

3 92

[libvirt] [PATCH] conf: Don't parse edev of non-passthrough input device
by Han Han 26 Jul '18

26 Jul '18

In input devices, edev attribute is only for passthrough devices. Don't parse this for other input devices. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1591151 Signed-off-by: Han Han <hhan(a)redhat.com> --- src/conf/domain_conf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 7396616eda..ea2e796b78 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13050,7 +13050,8 @@ virDomainInputDefParseXML(virDomainXMLOptionPtr xmlopt, goto error; } - if ((evdev = virXPathString("string(./source/@evdev)", ctxt))) + if ((evdev = virXPathString("string(./source/@evdev)", ctxt)) && + (def->type == VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH)) def->source.evdev = virFileSanitizePath(evdev); if (def->type == VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH && !def->source.evdev) { virReportError(VIR_ERR_XML_ERROR, "%s", -- 2.17.1

2 2

[libvirt] [PATCH] nwfilter: Resolve SEGV for NWFilter Snoop processing
by John Ferlan 26 Jul '18

26 Jul '18

https://bugzilla.redhat.com/show_bug.cgi?id=1599973 Commit id fca9afa08 changed the @req->ifname to use @req->binding->portdevname fillingin the @req->binding in a similar way that @req->ifname would have been filled in during virNWFilterDHCPSnoopReq processing. However, in doing so it did not take into account some code paths where the @req->binding should be checked instead of @req->binding->portdevname. These checks led to SEGVs in some cases during libvirtd reload processing in virNWFilterSnoopRemAllReqIter (for stop during nwfilterStateCleanup processing) and virNWFilterSnoopReqLeaseDel (for start during nwfilterStateInitialize processing). In particular, when reading the nwfilter.leases file a new @req is created, but the @req->binding is not filled in. That's left to virNWFilterDHCPSnoopReq processing which checks if the @req already exists in the @virNWFilterSnoopState.snoopReqs hash table after adding a virNWFilterSnoopState.ifnameToKey entry for the @req->binding->portdevname by a @ref->ikey value. NB: virNWFilterSnoopIPLeaseInstallRule and virNWFilterDHCPSnoopThread do not need the req->binding check since they can only be called after the filter->binding is created/assigned. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/nwfilter/nwfilter_dhcpsnoop.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c index c7fd370598..2330ba0479 100644 --- a/src/nwfilter/nwfilter_dhcpsnoop.c +++ b/src/nwfilter/nwfilter_dhcpsnoop.c @@ -846,7 +846,7 @@ virNWFilterSnoopReqLeaseDel(virNWFilterSnoopReqPtr req, int ret = 0; virNWFilterSnoopIPLeasePtr ipl; char *ipstr = NULL; - int ipAddrLeft; + int ipAddrLeft = 0; /* protect req->start, req->ifname and the lease */ virNWFilterSnoopReqLock(req); @@ -867,7 +867,8 @@ virNWFilterSnoopReqLeaseDel(virNWFilterSnoopReqPtr req, if (update_leasefile) virNWFilterSnoopLeaseFileSave(ipl); - ipAddrLeft = virNWFilterIPAddrMapDelIPAddr(req->binding->portdevname, ipstr); + if (req->binding) + ipAddrLeft = virNWFilterIPAddrMapDelIPAddr(req->binding->portdevname, ipstr); if (!req->threadkey || !instantiate) goto skip_instantiate; @@ -2037,7 +2038,7 @@ virNWFilterSnoopRemAllReqIter(const void *payload, /* protect req->binding->portdevname */ virNWFilterSnoopReqLock(req); - if (req->binding->portdevname) { + if (req->binding && req->binding->portdevname) { ignore_value(virHashRemoveEntry(virNWFilterSnoopState.ifnameToKey, req->binding->portdevname)); -- 2.17.1

2 1

[libvirt] interactions between virDomainSetVcpusFlags and NUMA/pinning?
by Chris Friesen 25 Jul '18

25 Jul '18

Hi, Just wondering about interactions between virDomainSetVcpusFlags() and virDomainPinVcpuFlags() and the domain XML. 1) If I add a vCPU to a domain, do I need to pin it after or does it respect the vCPU-to-pCPU mapping specified in the domain XML? 2) Are vCPUs added/removed in strict numerical order such that at any given time the active vCPUs are numbered 0-(N-1) where N is the number of active vCPUs? 3) Will the newly-added vCPUs respect the NUMA topology specified in the domain XML? Thanks, Chris

1 0

[libvirt] [PATCH v3 0/3] Alter qemu live/cold device attach algorithm
by John Ferlan 25 Jul '18

25 Jul '18

v2: https://www.redhat.com/archives/libvir-list/2018-July/msg00361.html Differences to v2: Patch1: NEW - As a result of code review the suggestion was to utilize the virDomainDefCompatibleDevice in order to make the check more generic to include <disk>'s which were also afflicted with the same problem that I was trying to solve with the former patch1 just for <hostdev>'s. However, this led me down into the abyss of more changes since <disk>'s have multiple <address type='drive'...> target bus types (IDE and SCSI). That means we need to have a mechanism to pass the target bus along so that a SCSI drive address doesn't inadvertently match an IDE drive address. All that is complicated by the way virDomainDefHasDeviceAddress iterates through all the device lists. Whether there are more similar devices I'm assuming will fall out of code review. Patch2: This moves the virDomainDefHasDeviceAddress into the more common config checking virDomainDefCompatibleDevice method, but now needs to also account for the disk bus issue. This theoretically could be combined with Patch1, but keeping them separate I would hope makes for simpler code review. I could also move code out of virDomainDefHasDeviceAddressIterator into patch2, but if just felt better in patch1. Patch3: No changes were made (amazingly so). In the end quite a bit more complicated John Ferlan (3): conf: Add @target_bus to virDomainDefHasDeviceAddress qemu: Check for existing address when cold attach device qemu: Use the correct vm def on cold attach src/conf/domain_conf.c | 54 +++++++++++++++++++++++++++++++++++--- src/conf/domain_conf.h | 3 ++- src/qemu/qemu_driver.c | 59 ++++++++++++++++-------------------------- 3 files changed, 75 insertions(+), 41 deletions(-) -- 2.17.1

3 8

[libvirt] [PATCH 0/2] Allow for further expected failures when listening on sockets
by Daniel P. Berrangé 25 Jul '18

25 Jul '18

Daniel P. Berrangé (2): socket: preserve real errno when socket/bind calls fail rpc: treat EADDRNOTAVAIL as non-fatal when listening src/rpc/virnetsocket.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) -- 2.17.1

2 5

[libvirt] [PATCH v3 0/2] Support network stats for VF representor interface
by Jai Singh Rana 25 Jul '18

25 Jul '18

With availability of switchdev model in linux, it is possible to capture stats for SR-IOV device with interface_type as 'hostdev' provided device supports VF represontor in switchdev mode[1] on host. These stats are supported by adding helper APIs for getting/verifying VF representor name based on PCI Bus:Device:Function information in domains 'hostdev' structure and querying required net sysfs directory and file entries on host according to switchdev model. These helper APIs are then used in qemu/conf to get the interface stats for VF representor on host of pci SR-IOV device. [1] https://www.kernel.org/doc/Documentation/networking/switchdev.txt V2 https://www.redhat.com/archives/libvir-list/2018-February/msg00561.html Jai Singh Rana (2): util: Add helper APIs to get/verify VF Representor name qemu: conf: Network stats support for VF Representors docs/news.xml | 9 ++ po/POTFILES.in | 1 + src/conf/domain_conf.c | 15 ++ src/libvirt_private.syms | 7 + src/qemu/qemu_driver.c | 33 +++- src/util/Makefile.inc.am | 2 + src/util/virhostdev.c | 2 +- src/util/virhostdev.h | 8 + src/util/virnetdevhostdev.c | 374 ++++++++++++++++++++++++++++++++++++++++++++ src/util/virnetdevhostdev.h | 35 +++++ 10 files changed, 481 insertions(+), 5 deletions(-) create mode 100644 src/util/virnetdevhostdev.c create mode 100644 src/util/virnetdevhostdev.h -- 2.13.6

3 5

[libvirt] [PATCHv3] replace 'if' type conditions with 'switch' for VIR_NETWORK_FORWARD_
by Shi Lei 25 Jul '18

25 Jul '18

Signed-off-by: Shi Lei <shilei.massclouds(a)gmx.com> --- v2 here: https://www.redhat.com/archives/libvir-list/2018-July/msg01423.html since v2: - typecast def->forward.type to virNetworkForwardType explicitly in all the switches rather than change its type to enum in the struct definition v1 here: https://www.redhat.com/archives/libvir-list/2018-July/msg01314.html since v1: - Change the type declaration of _virNetworkForwardDef.type from int to virNetworkForwardType - use the default case to report out of range error with virReportEnumRangeError src/conf/domain_conf.c | 49 ++++--- src/conf/network_conf.c | 75 +++++++--- src/conf/virnetworkobj.c | 24 +++- src/esx/esx_network_driver.c | 19 ++- src/libvirt_private.syms | 1 + src/network/bridge_driver.c | 317 ++++++++++++++++++++++++++++--------------- src/qemu/qemu_process.c | 10 +- 7 files changed, 334 insertions(+), 161 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 178c6d2..33b0b4a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -29975,40 +29975,49 @@ virDomainNetResolveActualType(virDomainNetDefPtr iface) if (!(def = virNetworkDefParseString(xml))) goto cleanup; - if ((def->forward.type == VIR_NETWORK_FORWARD_NONE) || - (def->forward.type == VIR_NETWORK_FORWARD_NAT) || - (def->forward.type == VIR_NETWORK_FORWARD_ROUTE) || - (def->forward.type == VIR_NETWORK_FORWARD_OPEN)) { + switch ((virNetworkForwardType) def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: /* for these forward types, the actual net type really *is* * NETWORK; we just keep the info from the portgroup in * iface->data.network.actual */ ret = VIR_DOMAIN_NET_TYPE_NETWORK; + break; - } else if ((def->forward.type == VIR_NETWORK_FORWARD_BRIDGE) && - def->bridge) { - - /* <forward type='bridge'/> <bridge name='xxx'/> - * is VIR_DOMAIN_NET_TYPE_BRIDGE - */ - - ret = VIR_DOMAIN_NET_TYPE_BRIDGE; - - } else if (def->forward.type == VIR_NETWORK_FORWARD_HOSTDEV) { - + case VIR_NETWORK_FORWARD_HOSTDEV: ret = VIR_DOMAIN_NET_TYPE_HOSTDEV; + break; - } else if ((def->forward.type == VIR_NETWORK_FORWARD_BRIDGE) || - (def->forward.type == VIR_NETWORK_FORWARD_PRIVATE) || - (def->forward.type == VIR_NETWORK_FORWARD_VEPA) || - (def->forward.type == VIR_NETWORK_FORWARD_PASSTHROUGH)) { + case VIR_NETWORK_FORWARD_BRIDGE: + if (def->bridge) { + /* <forward type='bridge'/> <bridge name='xxx'/> + * is VIR_DOMAIN_NET_TYPE_BRIDGE + */ + ret = VIR_DOMAIN_NET_TYPE_BRIDGE; + break; + } + + /* intentionally fall through to the direct case for + * VIR_NETWORK_FORWARD_BRIDGE with no bridge device defined + */ + ATTRIBUTE_FALLTHROUGH; + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: /* <forward type='bridge|private|vepa|passthrough'> are all * VIR_DOMAIN_NET_TYPE_DIRECT. */ - ret = VIR_DOMAIN_NET_TYPE_DIRECT; + break; + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.type); + goto cleanup; } cleanup: diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 630a87f..c08456b 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1874,7 +1874,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) /* Validate some items in the main NetworkDef that need to align * with the chosen forward mode. */ - switch (def->forward.type) { + switch ((virNetworkForwardType) def->forward.type) { case VIR_NETWORK_FORWARD_NONE: break; @@ -1955,21 +1955,40 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) goto error; } break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.type); + goto error; } VIR_FREE(stp); - if (def->mtu && - (def->forward.type != VIR_NETWORK_FORWARD_NONE && - def->forward.type != VIR_NETWORK_FORWARD_NAT && - def->forward.type != VIR_NETWORK_FORWARD_ROUTE && - def->forward.type != VIR_NETWORK_FORWARD_OPEN)) { - virReportError(VIR_ERR_XML_ERROR, - _("mtu size only allowed in open, route, nat, " - "and isolated mode, not in %s (network '%s')"), - virNetworkForwardTypeToString(def->forward.type), - def->name); - goto error; + if (def->mtu) { + switch ((virNetworkForwardType) def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: + break; + + case VIR_NETWORK_FORWARD_BRIDGE: + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: + case VIR_NETWORK_FORWARD_HOSTDEV: + virReportError(VIR_ERR_XML_ERROR, + _("mtu size only allowed in open, route, nat, " + "and isolated mode, not in %s (network '%s')"), + virNetworkForwardTypeToString(def->forward.type), + def->name); + goto error; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.type); + goto error; + } } /* Extract custom metadata */ @@ -2349,6 +2368,7 @@ virNetworkDefFormatBuf(virBufferPtr buf, char uuidstr[VIR_UUID_STRING_BUFLEN]; size_t i; bool shortforward; + bool hasbridge = false; virBufferAddLit(buf, "<network"); if (!(flags & VIR_NETWORK_XML_INACTIVE) && (def->connections > 0)) @@ -2469,22 +2489,33 @@ virNetworkDefFormatBuf(virBufferPtr buf, virBufferAddLit(buf, "</forward>\n"); } + switch ((virNetworkForwardType) def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: + hasbridge = true; + break; - if (def->forward.type == VIR_NETWORK_FORWARD_NONE || - def->forward.type == VIR_NETWORK_FORWARD_NAT || - def->forward.type == VIR_NETWORK_FORWARD_ROUTE || - def->forward.type == VIR_NETWORK_FORWARD_OPEN || - def->bridge || def->macTableManager) { + case VIR_NETWORK_FORWARD_BRIDGE: + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: + case VIR_NETWORK_FORWARD_HOSTDEV: + break; + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.type); + goto error; + } + + if (hasbridge || def->bridge || def->macTableManager) { virBufferAddLit(buf, "<bridge"); virBufferEscapeString(buf, " name='%s'", def->bridge); - if (def->forward.type == VIR_NETWORK_FORWARD_NONE || - def->forward.type == VIR_NETWORK_FORWARD_NAT || - def->forward.type == VIR_NETWORK_FORWARD_ROUTE || - def->forward.type == VIR_NETWORK_FORWARD_OPEN) { + if (hasbridge) virBufferAsprintf(buf, " stp='%s' delay='%ld'", def->stp ? "on" : "off", def->delay); - } if (def->macTableManager) { virBufferAsprintf(buf, " macTableManager='%s'", virNetworkBridgeMACTableManagerTypeToString(def->macTableManager)); diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index e00c8a7..b13e5a7 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -1009,19 +1009,31 @@ virNetworkLoadConfig(virNetworkObjListPtr nets, goto error; } - if (def->forward.type == VIR_NETWORK_FORWARD_NONE || - def->forward.type == VIR_NETWORK_FORWARD_NAT || - def->forward.type == VIR_NETWORK_FORWARD_ROUTE || - def->forward.type == VIR_NETWORK_FORWARD_OPEN) { - + switch ((virNetworkForwardType) def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: if (!def->mac_specified) { virNetworkSetBridgeMacAddr(def); virNetworkSaveConfig(configDir, def); } - } else { + break; + + case VIR_NETWORK_FORWARD_BRIDGE: + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: + case VIR_NETWORK_FORWARD_HOSTDEV: /* Throw away MAC address for other forward types, * which could have been generated by older libvirt RPMs */ def->mac_specified = false; + break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.type); + goto error; } if (!(obj = virNetworkObjAssignDef(nets, def, 0))) diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c index 04118b4..31bceb7 100644 --- a/src/esx/esx_network_driver.c +++ b/src/esx/esx_network_driver.c @@ -326,12 +326,27 @@ esxNetworkDefineXML(virConnectPtr conn, const char *xml) } /* FIXME: Add support for NAT */ - if (def->forward.type != VIR_NETWORK_FORWARD_NONE && - def->forward.type != VIR_NETWORK_FORWARD_BRIDGE) { + switch ((virNetworkForwardType) def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_BRIDGE: + break; + + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: + case VIR_NETWORK_FORWARD_HOSTDEV: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported forward mode '%s'"), virNetworkForwardTypeToString(def->forward.type)); goto cleanup; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.type); + goto cleanup; } /* Verify that specified HostPortGroups don't exist already */ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 1a4cf98..fc386e1 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2369,6 +2369,7 @@ virNetDevMacVLanCreate; virNetDevMacVLanCreateWithVPortProfile; virNetDevMacVLanDelete; virNetDevMacVLanDeleteWithVPortProfile; +virNetDevMacVLanModeTypeFromString; virNetDevMacVLanReleaseName; virNetDevMacVLanReserveName; virNetDevMacVLanRestartWithVPortProfile; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index da3c32e..ed8a8bf 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -446,7 +446,7 @@ networkUpdateState(virNetworkObjPtr obj, } def = virNetworkObjGetDef(obj); - switch (def->forward.type) { + switch ((virNetworkForwardType) def->forward.type) { case VIR_NETWORK_FORWARD_NONE: case VIR_NETWORK_FORWARD_NAT: case VIR_NETWORK_FORWARD_ROUTE: @@ -485,6 +485,11 @@ networkUpdateState(virNetworkObjPtr obj, case VIR_NETWORK_FORWARD_HOSTDEV: /* so far no extra checks */ break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.type); + goto cleanup; } /* Try and read dnsmasq/radvd pids of active networks */ @@ -2088,20 +2093,37 @@ networkRefreshDaemonsHelper(virNetworkObjPtr obj, virObjectLock(obj); def = virNetworkObjGetDef(obj); - if (virNetworkObjIsActive(obj) && - ((def->forward.type == VIR_NETWORK_FORWARD_NONE) || - (def->forward.type == VIR_NETWORK_FORWARD_NAT) || - (def->forward.type == VIR_NETWORK_FORWARD_ROUTE) || - (def->forward.type == VIR_NETWORK_FORWARD_OPEN))) { - /* Only the three L3 network types that are configured by - * libvirt will have a dnsmasq or radvd daemon associated - * with them. Here we send a SIGHUP to an existing - * dnsmasq and/or radvd, or restart them if they've - * disappeared. - */ - networkRefreshDhcpDaemon(driver, obj); - networkRefreshRadvd(driver, obj); + if (virNetworkObjIsActive(obj)) { + switch ((virNetworkForwardType) def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: + /* Only the three L3 network types that are configured by + * libvirt will have a dnsmasq or radvd daemon associated + * with them. Here we send a SIGHUP to an existing + * dnsmasq and/or radvd, or restart them if they've + * disappeared. + */ + networkRefreshDhcpDaemon(driver, obj); + networkRefreshRadvd(driver, obj); + break; + + case VIR_NETWORK_FORWARD_BRIDGE: + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: + case VIR_NETWORK_FORWARD_HOSTDEV: + break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.type); + goto cleanup; + } } + + cleanup: virObjectUnlock(obj); return 0; } @@ -2128,20 +2150,37 @@ networkReloadFirewallRulesHelper(virNetworkObjPtr obj, virObjectLock(obj); def = virNetworkObjGetDef(obj); - if (virNetworkObjIsActive(obj) && - ((def->forward.type == VIR_NETWORK_FORWARD_NONE) || - (def->forward.type == VIR_NETWORK_FORWARD_NAT) || - (def->forward.type == VIR_NETWORK_FORWARD_ROUTE))) { - /* Only three of the L3 network types that are configured by - * libvirt need to have iptables rules reloaded. The 4th L3 - * network type, forward='open', doesn't need this because it - * has no iptables rules. - */ - networkRemoveFirewallRules(def); - if (networkAddFirewallRules(def) < 0) { - /* failed to add but already logged */ + if (virNetworkObjIsActive(obj)) { + switch ((virNetworkForwardType) def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + /* Only three of the L3 network types that are configured by + * libvirt need to have iptables rules reloaded. The 4th L3 + * network type, forward='open', doesn't need this because it + * has no iptables rules. + */ + networkRemoveFirewallRules(def); + /* No need to check return value since already logged internally */ + ignore_value(networkAddFirewallRules(def)); + break; + + case VIR_NETWORK_FORWARD_OPEN: + case VIR_NETWORK_FORWARD_BRIDGE: + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: + case VIR_NETWORK_FORWARD_HOSTDEV: + break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.type); + goto cleanup; } } + + cleanup: virObjectUnlock(obj); return 0; } @@ -2687,7 +2726,7 @@ networkCreateInterfacePool(virNetworkDefPtr netdef) virNetworkForwardIfDefPtr thisIf = &netdef->forward.ifs[netdef->forward.nifs]; - switch (netdef->forward.type) { + switch ((virNetworkForwardType) netdef->forward.type) { case VIR_NETWORK_FORWARD_BRIDGE: case VIR_NETWORK_FORWARD_PRIVATE: case VIR_NETWORK_FORWARD_VEPA: @@ -2719,9 +2758,13 @@ networkCreateInterfacePool(virNetworkDefPtr netdef) case VIR_NETWORK_FORWARD_NAT: case VIR_NETWORK_FORWARD_ROUTE: case VIR_NETWORK_FORWARD_OPEN: - case VIR_NETWORK_FORWARD_LAST: /* by definition these will never be encountered here */ break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, netdef->forward.type); + goto cleanup; } } @@ -2811,7 +2854,7 @@ networkStartNetwork(virNetworkDriverStatePtr driver, VIR_HOOK_SUBOP_BEGIN) < 0) goto cleanup; - switch (def->forward.type) { + switch ((virNetworkForwardType) def->forward.type) { case VIR_NETWORK_FORWARD_NONE: case VIR_NETWORK_FORWARD_NAT: @@ -2840,6 +2883,11 @@ networkStartNetwork(virNetworkDriverStatePtr driver, if (networkStartNetworkExternal(obj) < 0) goto cleanup; break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.type); + goto cleanup; } /* finally we can call the 'started' hook script if any */ @@ -2893,7 +2941,7 @@ networkShutdownNetwork(virNetworkDriverStatePtr driver, unlink(stateFile); VIR_FREE(stateFile); - switch (def->forward.type) { + switch ((virNetworkForwardType) def->forward.type) { case VIR_NETWORK_FORWARD_NONE: case VIR_NETWORK_FORWARD_NAT: @@ -2919,6 +2967,11 @@ networkShutdownNetwork(virNetworkDriverStatePtr driver, case VIR_NETWORK_FORWARD_HOSTDEV: ret = networkShutdownNetworkExternal(obj); break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.type); + return -1; } /* now that we know it's stopped call the hook if present */ @@ -3273,11 +3326,11 @@ networkValidate(virNetworkDriverStatePtr driver, /* Only the three L3 network types that are configured by libvirt * need to have a bridge device name / mac address provided */ - if (def->forward.type == VIR_NETWORK_FORWARD_NONE || - def->forward.type == VIR_NETWORK_FORWARD_NAT || - def->forward.type == VIR_NETWORK_FORWARD_ROUTE || - def->forward.type == VIR_NETWORK_FORWARD_OPEN) { - + switch ((virNetworkForwardType) def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: /* if no bridge name was given in the config, find a name * unused by any other libvirt networks and assign it. */ @@ -3285,7 +3338,13 @@ networkValidate(virNetworkDriverStatePtr driver, return -1; virNetworkSetBridgeMacAddr(def); - } else { + break; + + case VIR_NETWORK_FORWARD_BRIDGE: + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: + case VIR_NETWORK_FORWARD_HOSTDEV: /* They are also the only types that currently support setting * a MAC or IP address for the host-side device (bridge), DNS * configuration, or network-wide bandwidth limits. @@ -3331,6 +3390,12 @@ networkValidate(virNetworkDriverStatePtr driver, return -1; } bandwidthAllowed = false; + break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.type); + return -1; } /* we support configs with a single PF defined: @@ -3755,9 +3820,10 @@ networkUpdate(virNetworkPtr net, /* Take care of anything that must be done before updating the * live NetworkDef. */ - if (def->forward.type == VIR_NETWORK_FORWARD_NONE || - def->forward.type == VIR_NETWORK_FORWARD_NAT || - def->forward.type == VIR_NETWORK_FORWARD_ROUTE) { + switch ((virNetworkForwardType) def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: switch (section) { case VIR_NETWORK_SECTION_FORWARD: case VIR_NETWORK_SECTION_FORWARD_INTERFACE: @@ -3768,14 +3834,26 @@ networkUpdate(virNetworkPtr net, * old rules (and remember to load new ones after the * update). */ - if (def->forward.type != VIR_NETWORK_FORWARD_OPEN) { - networkRemoveFirewallRules(def); - needFirewallRefresh = true; - } + networkRemoveFirewallRules(def); + needFirewallRefresh = true; break; default: break; } + break; + + case VIR_NETWORK_FORWARD_OPEN: + case VIR_NETWORK_FORWARD_BRIDGE: + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: + case VIR_NETWORK_FORWARD_HOSTDEV: + break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.type); + goto cleanup; } } @@ -4440,10 +4518,11 @@ networkAllocateActualDevice(virDomainDefPtr dom, iface->data.network.actual->trustGuestRxFilters = netdef->trustGuestRxFilters; - if ((netdef->forward.type == VIR_NETWORK_FORWARD_NONE) || - (netdef->forward.type == VIR_NETWORK_FORWARD_NAT) || - (netdef->forward.type == VIR_NETWORK_FORWARD_ROUTE) || - (netdef->forward.type == VIR_NETWORK_FORWARD_OPEN)) { + switch ((virNetworkForwardType) netdef->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: /* for these forward types, the actual net type really *is* * NETWORK; we just keep the info from the portgroup in * iface->data.network.actual @@ -4463,46 +4542,9 @@ networkAllocateActualDevice(virDomainDefPtr dom, if (networkPlugBandwidth(obj, iface) < 0) goto error; + break; - } else if ((netdef->forward.type == VIR_NETWORK_FORWARD_BRIDGE) && - netdef->bridge) { - - /* <forward type='bridge'/> <bridge name='xxx'/> - * is VIR_DOMAIN_NET_TYPE_BRIDGE - */ - - iface->data.network.actual->type = actualType = VIR_DOMAIN_NET_TYPE_BRIDGE; - if (VIR_STRDUP(iface->data.network.actual->data.bridge.brname, - netdef->bridge) < 0) - goto error; - iface->data.network.actual->data.bridge.macTableManager - = netdef->macTableManager; - - /* merge virtualports from interface, network, and portgroup to - * arrive at actual virtualport to use - */ - if (virNetDevVPortProfileMerge3(&iface->data.network.actual->virtPortProfile, - iface->virtPortProfile, - netdef->virtPortProfile, - portgroup - ? portgroup->virtPortProfile : NULL) < 0) { - goto error; - } - virtport = iface->data.network.actual->virtPortProfile; - if (virtport) { - /* only type='openvswitch' is allowed for bridges */ - if (virtport->virtPortType != VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("<virtualport type='%s'> not supported for network " - "'%s' which uses a bridge device"), - virNetDevVPortTypeToString(virtport->virtPortType), - netdef->name); - goto error; - } - } - - } else if (netdef->forward.type == VIR_NETWORK_FORWARD_HOSTDEV) { - + case VIR_NETWORK_FORWARD_HOSTDEV: { virDomainHostdevSubsysPCIBackendType backend; iface->data.network.actual->type = actualType = VIR_DOMAIN_NET_TYPE_HOSTDEV; @@ -4575,32 +4617,67 @@ networkAllocateActualDevice(virDomainDefPtr dom, goto error; } } + break; + } + + case VIR_NETWORK_FORWARD_BRIDGE: + if (netdef->bridge) { + /* <forward type='bridge'/> <bridge name='xxx'/> + * is VIR_DOMAIN_NET_TYPE_BRIDGE + */ + + iface->data.network.actual->type = actualType = VIR_DOMAIN_NET_TYPE_BRIDGE; + if (VIR_STRDUP(iface->data.network.actual->data.bridge.brname, + netdef->bridge) < 0) + goto error; + iface->data.network.actual->data.bridge.macTableManager + = netdef->macTableManager; + + /* merge virtualports from interface, network, and portgroup to + * arrive at actual virtualport to use + */ + if (virNetDevVPortProfileMerge3(&iface->data.network.actual->virtPortProfile, + iface->virtPortProfile, + netdef->virtPortProfile, + portgroup + ? portgroup->virtPortProfile : NULL) < 0) { + goto error; + } + virtport = iface->data.network.actual->virtPortProfile; + if (virtport) { + /* only type='openvswitch' is allowed for bridges */ + if (virtport->virtPortType != VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("<virtualport type='%s'> not supported for network " + "'%s' which uses a bridge device"), + virNetDevVPortTypeToString(virtport->virtPortType), + netdef->name); + goto error; + } + } + break; + } - } else if ((netdef->forward.type == VIR_NETWORK_FORWARD_BRIDGE) || - (netdef->forward.type == VIR_NETWORK_FORWARD_PRIVATE) || - (netdef->forward.type == VIR_NETWORK_FORWARD_VEPA) || - (netdef->forward.type == VIR_NETWORK_FORWARD_PASSTHROUGH)) { + /* intentionally fall through to the direct case for + * VIR_NETWORK_FORWARD_BRIDGE with no bridge device defined + */ + ATTRIBUTE_FALLTHROUGH; + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: /* <forward type='bridge|private|vepa|passthrough'> are all * VIR_DOMAIN_NET_TYPE_DIRECT. */ /* Set type=direct and appropriate <source mode='xxx'/> */ iface->data.network.actual->type = actualType = VIR_DOMAIN_NET_TYPE_DIRECT; - switch (netdef->forward.type) { - case VIR_NETWORK_FORWARD_BRIDGE: - iface->data.network.actual->data.direct.mode = VIR_NETDEV_MACVLAN_MODE_BRIDGE; - break; - case VIR_NETWORK_FORWARD_PRIVATE: - iface->data.network.actual->data.direct.mode = VIR_NETDEV_MACVLAN_MODE_PRIVATE; - break; - case VIR_NETWORK_FORWARD_VEPA: - iface->data.network.actual->data.direct.mode = VIR_NETDEV_MACVLAN_MODE_VEPA; - break; - case VIR_NETWORK_FORWARD_PASSTHROUGH: - iface->data.network.actual->data.direct.mode = VIR_NETDEV_MACVLAN_MODE_PASSTHRU; - break; - } + + /* NO need to check the value returned from virNetDevMacVLanModeTypeFromString + * it must be valid for these forward type(bridge|private|vepa|passthrough) + */ + iface->data.network.actual->data.direct.mode = + virNetDevMacVLanModeTypeFromString(virNetworkForwardTypeToString(netdef->forward.type)); /* merge virtualports from interface, network, and portgroup to * arrive at actual virtualport to use @@ -4680,6 +4757,12 @@ networkAllocateActualDevice(virDomainDefPtr dom, dev->device.dev) < 0) goto error; } + break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, netdef->forward.type); + goto error; } if (virNetworkObjMacMgrAdd(obj, driver->dnsmasqStateDir, @@ -5037,13 +5120,27 @@ networkReleaseActualDevice(virDomainDefPtr dom, } netdef = virNetworkObjGetDef(obj); - if (iface->data.network.actual && - (netdef->forward.type == VIR_NETWORK_FORWARD_NONE || - netdef->forward.type == VIR_NETWORK_FORWARD_NAT || - netdef->forward.type == VIR_NETWORK_FORWARD_ROUTE || - netdef->forward.type == VIR_NETWORK_FORWARD_OPEN) && - networkUnplugBandwidth(obj, iface) < 0) + switch ((virNetworkForwardType) netdef->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: + if (iface->data.network.actual && networkUnplugBandwidth(obj, iface) < 0) + goto error; + break; + + case VIR_NETWORK_FORWARD_BRIDGE: + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: + case VIR_NETWORK_FORWARD_HOSTDEV: + break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, netdef->forward.type); goto error; + } if ((!iface->data.network.actual) || ((actualType != VIR_DOMAIN_NET_TYPE_DIRECT) && diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index bba157b..27bd8b9 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4545,7 +4545,7 @@ qemuProcessGetNetworkAddress(const char *netname, if (!netdef) goto cleanup; - switch (netdef->forward.type) { + switch ((virNetworkForwardType) netdef->forward.type) { case VIR_NETWORK_FORWARD_NONE: case VIR_NETWORK_FORWARD_NAT: case VIR_NETWORK_FORWARD_ROUTE: @@ -4582,6 +4582,14 @@ qemuProcessGetNetworkAddress(const char *netname, goto cleanup; } break; + + case VIR_NETWORK_FORWARD_HOSTDEV: + break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, netdef->forward.type); + goto cleanup; } if (dev_name) { -- 2.7.4

2 2

[libvirt] [go PATCH] travis: update some of the test matrix versions to moderize coverage
by Daniel P. Berrangé 25 Jul '18

25 Jul '18

Add latest go 1.10 to matrix and (arbitrarily) trim out 1.6 and 1.8 Add libvirt 4.5.0 and (arbitrarily) trim out 1.2.10 Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1bdb48f..7cd7587 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,17 +5,16 @@ sudo: require go: - 1.5 - - 1.6 - 1.7 - - 1.8 - 1.9 + - 1.10 env: - LIBVIRT=1.2.0 EXT=gz - - LIBVIRT=1.2.10 EXT=gz - LIBVIRT=1.2.20 EXT=gz - LIBVIRT=2.5.0 EXT=xz - LIBVIRT=3.6.0 EXT=xz + - LIBVIRT=4.5.0 EXT=xz install: - sudo apt-get -qqy build-dep libvirt -- 2.17.1

2 3

[libvirt] [PATCH] util: Fix virStorageBackendIQNFound() to work on FreeBSD
by Andrea Bolognani 25 Jul '18

25 Jul '18

Despite being standardized in POSIX.1-2008, the 'm' sscanf() modifier is currently not available on FreeBSD. Reimplement parsing without sscanf() to work around the issue. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/util/viriscsi.c | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/src/util/viriscsi.c b/src/util/viriscsi.c index e2c80acaaa..96934df948 100644 --- a/src/util/viriscsi.c +++ b/src/util/viriscsi.c @@ -146,8 +146,10 @@ virStorageBackendIQNFound(const char *initiatoriqn, line = outbuf; while (line && *line) { + char *current = line; char *newline; - int num; + char *next; + int i; if (!(newline = strchr(line, '\n'))) break; @@ -156,15 +158,29 @@ virStorageBackendIQNFound(const char *initiatoriqn, VIR_FREE(iface); VIR_FREE(iqn); - num = sscanf(line, "%ms %*[^,],%*[^,],%*[^,],%*[^,],%ms", &iface, &iqn); - if (num != 2) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("malformed output of %s: %s"), - ISCSIADM, line); + /* Find the first space, copy everything up to that point into + * iface and move past it to continue processing */ + if (!(next = strchr(current, ' '))) + goto error; + + if (VIR_STRNDUP(iface, current, (next - current)) < 0) goto cleanup; + + current = next + 1; + + /* There are five comma separated fields after iface and we only + * care about the last one, so we need to skip four commas and + * copy whatever's left into iqn */ + for (i = 0; i < 4; i++) { + if (!(next = strchr(current, ','))) + goto error; + current = next + 1; } + if (VIR_STRDUP(iqn, current) < 0) + goto cleanup; + if (STREQ(iqn, initiatoriqn)) { VIR_STEAL_PTR(*ifacename, iface); @@ -186,6 +202,12 @@ virStorageBackendIQNFound(const char *initiatoriqn, VIR_FREE(outbuf); virCommandFree(cmd); return ret; + + error: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("malformed output of %s: %s"), + ISCSIADM, line); + goto cleanup; } -- 2.17.1

3 3

[libvirt] [PATCH] esx storage: Fix typo lsilogic -> lsiLogic
by Marcos Paulo de Souza 25 Jul '18

25 Jul '18

Commit 77298458d027db4d3e082213355e2d792f65158d changed the esx storage adapter from busLogic to lsilogic, introducing a typo. Changing it back to lsiLogic (with capital L) solves the issue. With this change, libvirt can now create volumes in ESX again. Thanks to Jaroslav Suchanek who figured out what was the issue in the first place. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1571759 Signed-off-by: Marcos Paulo de Souza <marcos.souza.org(a)gmail.com> --- src/esx/esx_storage_backend_vmfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/esx/esx_storage_backend_vmfs.c b/src/esx/esx_storage_backend_vmfs.c index 630a6aa8c9..bb2de4b69f 100644 --- a/src/esx/esx_storage_backend_vmfs.c +++ b/src/esx/esx_storage_backend_vmfs.c @@ -967,9 +967,9 @@ esxStorageVolCreateXML(virStoragePoolPtr pool, /* * FIXME: The adapter type is a required parameter, but there is no * way to let the user specify it in the volume XML config. Therefore, - * default to 'lsilogic' here. + * default to 'lsiLogic' here. */ - virtualDiskSpec->adapterType = (char *)"lsilogic"; + virtualDiskSpec->adapterType = (char *)"lsiLogic"; virtualDiskSpec->capacityKb->value = VIR_DIV_UP(def->target.capacity, 1024); /* Scale from byte to kilobyte */ -- 2.17.0

2 1

[libvirt] [PATCH] IGNORE. Testing patchew.org syntax-check reporting
by Daniel P. Berrangé 25 Jul '18

25 Jul '18

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/libvirt.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index aeb8804714..ed4ec062e7 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -21,8 +21,6 @@ * Daniel Veillard <veillard(a)redhat.com> */ -#include <config.h> - #include <stdio.h> #include <stdlib.h> #include <string.h> -- 2.17.1

2 1

[libvirt] [dbus PATCH] tests: Fix sha-bang for test_interface.py
by Andrea Bolognani 25 Jul '18

25 Jul '18

We need to call python3 through /usr/bin/env so that the script will work on platforms, such as FreeBSD, where the interpreter is installed under a different path. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed under the build-breaker rule. tests/test_interface.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_interface.py b/tests/test_interface.py index 9503eef..3b8b344 100755 --- a/tests/test_interface.py +++ b/tests/test_interface.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 import dbus import libvirttest -- 2.17.1

1 0

[libvirt] [PATCH] news: Add --alias to virsh attach-disk and attach-interface
by Han Han 25 Jul '18

25 Jul '18

Signed-off-by: Han Han <hhan(a)redhat.com> --- docs/news.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index 20c2ff7a6f..1e632eb378 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -67,6 +67,15 @@ only rendering devices within the guest. </description> </change> + <change> + <summary> + virsh: Add --alias to attach-disk and attach-interface command. + </summary> + <description> + Add option --alias to set customized device alias name when + attach-disk or attach-interface. + </description> + </change> </section> <section title="Bug fixes"> </section> -- 2.18.0

2 1

Re: [libvirt] [PATCH] util: Fix virStorageBackendIQNFound() to work on FreeBSD
by Andrea Bolognani 25 Jul '18

25 Jul '18

On Wed, 2018-07-25 at 02:49 -0700, no-reply(a)patchew.org wrote: > Hi, > > This series was run against 'syntax-check' test by patchew.org, > which failed, please find the details below: [...] > src/util/viriscsi.c:152: int i; > maint.mk: use size_t, not int/unsigned int for loop vars i, j, k > make: *** [cfg.mk:573: sc_prohibit_int_ijk] Error 1 My bad. Consider the diff below squashed in. diff --git a/src/util/viriscsi.c b/src/util/viriscsi.c index 96934df948..653b4fd932 100644 --- a/src/util/viriscsi.c +++ b/src/util/viriscsi.c @@ -149,7 +149,7 @@ virStorageBackendIQNFound(const char *initiatoriqn, char *current = line; char *newline; char *next; - int i; + size_t i; if (!(newline = strchr(line, '\n'))) break; -- Andrea Bolognani / Red Hat / Virtualization

1 0

[libvirt] [jenkins-ci PATCH] guests: Make mappings more future proof
by Andrea Bolognani 25 Jul '18

25 Jul '18

We can reasonably expect the next major release of CentOS to be somewhat close to current Fedora releases in terms of packaging, and to ditch the soon-to-be-unsupported Python 2 in favor of Python 3. Rewrite some of the mappings based on these expectations. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- guests/vars/mappings.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index 92822cb..454afe5 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -651,12 +651,12 @@ mappings: python3: default: python3 - CentOS: + CentOS7: python3-dbus: default: python3-dbus FreeBSD: py36-dbus - CentOS: + CentOS7: python3-devel: deb: python3-dev @@ -667,34 +667,34 @@ mappings: deb: python3-gi pkg: py36-gobject3 rpm: python3-gobject - CentOS: + CentOS7: python3-libxml2: default: python3-libxml2 FreeBSD: py36-libxml2 - CentOS: + CentOS7: Debian8: Ubuntu16: python3-lxml: default: python3-lxml FreeBSD: py36-lxml - CentOS: + CentOS7: python3-nose: default: python3-nose FreeBSD: py36-nose - CentOS: + CentOS7: python3-pytest: default: python3-pytest FreeBSD: py36-pytest - CentOS: + CentOS7: python3-requests: default: python3-requests FreeBSD: py36-requests - CentOS: + CentOS7: qemu-img: default: qemu-utils @@ -711,7 +711,7 @@ mappings: rpcgen: deb: libc-dev-bin rpm: rpcgen - CentOS: glibc-common + CentOS7: glibc-common Fedora26: glibc-common Fedora27: glibc-common FreeBSD: -- 2.17.1

3 4

[libvirt] [PATCH] use model "qemu" for s390 tcg cpu-model-expansion
by Collin Walling 25 Jul '18

25 Jul '18

When calling the query-cpu-model-expansion command via libvirt, we pass in model name "max" when using TCG. However, this model name is not supported for s390 on TCG. Let's use the model name "qemu" as an alternative. QEMU Results: When executing query-cpu-model-expansion via QEMU on s390 with TCG, the name "max" results in this error: { "execute": "query-cpu-model-expansion", "arguments": {"type": "static", "model": {"name": "max"}}} -> {"error": {"class": "GenericError", "desc": "The CPU definition 'max' is unknown."}} An alternative is to use model name "qemu." On a z13.2 machine: { "execute": "query-cpu-model-expansion", "arguments": {"type": "static", "model": {"name": "qemu"}}} -> {"return": {"model": {"name": "zEC12.2-base", "props": {"dateh2": false, "aen": true, "kmac-tdea-192": false, "kmc-tdea-192": false, "parseh": false, "csske": false, "hfpm": false, "hfpue": false, "dfp": false, "km-dea": false, "emon": false, "kimd-sha-1": false, "cmpsceh": false, "dfpzc": false, "dfphp": false, "kmc-dea": false, "klmd-sha-1": false, "asnlxr": false, "km-tdea-192": false, "km-tdea-128": false, "fpe": false, "kmac-dea": false, "kmc-tdea-128": false, "ais": true, "kmac-tdea-128": false, "nonqks": false, "pfpo": false, "msa4-base": true, "msa3-base": true, "tods": false}}}} I am by all means *not* an expert in TCG, but I noticed this error while I was messing around with things on my system. Thanks! Collin Walling (1): qemu: caps: use model "qemu" for s390 tcg cpu-model-expansion src/qemu/qemu_capabilities.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- 2.7.4

5 10

[libvirt] [PATCH v2] qemuDomainSaveMemory: Don't enforce dynamicOwnership
by Michal Privoznik 25 Jul '18

25 Jul '18

https://bugzilla.redhat.com/show_bug.cgi?id=1589115 When doing a memory snapshot qemuOpenFile() is used. This means that the file where memory is saved is firstly attempted to be created under root:root (because that's what libvirtd is running under) and if this fails the second attempt is done under domain's uid:gid. This does not make much sense - qemu is given opened FD so it does not need to access the file. Moreover, if dynamicOwnership is set in qemu.conf and the file lives on a squashed NFS this is deadly combination and very likely to fail. The fix consists of using: qemuOpenFileAs(fallback_uid = cfg->user, fallback_gid = cfg->group, dynamicOwnership = false) In other words, dynamicOwnership is turned off for memory snapshot (chown() will still be attempted if the file does not live on NFS) and instead of using domain DAC label, configured user:group is set as fallback. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Diff to v1: - Fix doCoreDump too (raised in review by John). src/qemu/qemu_driver.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 9a35e04a85..86674e519b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3185,6 +3185,7 @@ qemuDomainSaveMemory(virQEMUDriverPtr driver, unsigned int flags, qemuDomainAsyncJob asyncJob) { + virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); bool needUnlink = false; int ret = -1; int fd = -1; @@ -3202,9 +3203,10 @@ qemuDomainSaveMemory(virQEMUDriverPtr driver, goto cleanup; } } - fd = qemuOpenFile(driver, vm, path, - O_WRONLY | O_TRUNC | O_CREAT | directFlag, - &needUnlink); + + fd = qemuOpenFileAs(cfg->user, cfg->group, false, path, + O_WRONLY | O_TRUNC | O_CREAT | directFlag, + &needUnlink); if (fd < 0) goto cleanup; @@ -3244,6 +3246,7 @@ qemuDomainSaveMemory(virQEMUDriverPtr driver, cleanup: VIR_FORCE_CLOSE(fd); virFileWrapperFdFree(wrapperFd); + virObjectUnref(cfg); if (ret < 0 && needUnlink) unlink(path); @@ -3793,9 +3796,9 @@ doCoreDump(virQEMUDriverPtr driver, /* Core dumps usually imply last-ditch analysis efforts are * desired, so we intentionally do not unlink even if a file was * created. */ - if ((fd = qemuOpenFile(driver, vm, path, - O_CREAT | O_TRUNC | O_WRONLY | directFlag, - NULL)) < 0) + if ((fd = qemuOpenFileAs(cfg->user, cfg->group, false, path, + O_CREAT | O_TRUNC | O_WRONLY | directFlag, + NULL)) < 0) goto cleanup; if (!(wrapperFd = virFileWrapperFdNew(&fd, path, flags))) -- 2.16.4

2 3

[libvirt] [PATCH v2 00/10] viriscsi: Couple of fixes
by Michal Privoznik 25 Jul '18

25 Jul '18

v2 of: https://www.redhat.com/archives/libvir-list/2018-June/msg01861.html diff to v1: - fixed misleading while() loop in 03/10 - Introduced some tests - patch 06/10 is new, while writing the tests I've noticed that errors from testIscsiadmCb were not propagated properly. Patches 01,02,04 and 05 are ACKed already. Even though John suggested merging 04 and 05 together I haven't done that because I believe "iscsi --interface" and "iscsi --op nonpersistent" are orthogonal and even though we currently treat them as mutually exclusive (in storage backend) the util/viriscsi.c API should not suffer because of that. Michal Privoznik (10): virStorageBackendIQNFound: Fix ret value assignment virStorageBackendIQNFound: Rename out label virStorageBackendIQNFound: Rework iscsiadm output parsing virISCSIScanTargets: Honour iSCSI interface virISCSIScanTargets: Allow making targets persistent virCommandWait: Propagate dryRunCallback return value properly viriscsitest: Test virISCSIConnectionLogin viriscsitest: Move testSessionInfo struct viriscsitest: Introduce testIscsiadmCbData struct viriscsitest: Extend virISCSIConnectionLogin test src/storage/storage_backend_iscsi.c | 5 +- src/util/vircommand.c | 2 + src/util/viriscsi.c | 196 ++++++++++++++++++++++++------------ src/util/viriscsi.h | 2 + tests/viriscsitest.c | 145 ++++++++++++++++++++++++-- 5 files changed, 272 insertions(+), 78 deletions(-) -- 2.16.4

3 38

[libvirt] [RFC] proposal for libiscsi storage pool
by Clementine Hayat 25 Jul '18

25 Jul '18

Hi everybody! I am starting this thread to discuss a new storage pool backend for iSCSI using libiSCSI. There already is an iSCSI backend, however, it uses iscsiadm binary to execute the desired operation. The binary can be spawned multiple times during single execution of an API. This is suboptimal. Moreover the iscsi storage pool is mapped by the kernel into a block device in /dev/. Iscsiadm makes operations directly on that block device. Libiscsi on the other hand is sending the commands directly to a remote iscsi portal. According to that, to be able to use a storage pool using libiscsi we have to implement the storage pool backend entirely. What we would have: Pool XML using iscsiadm: <pool type="iscsi" mode="host"> <name>virtimages</name> <source> <host name="iscsi.example.com"/> <device path="iqn.2013-06.com.example:iscsi-pool"/> <auth type='chap' username='myuser'> <secret usage='libvirtiscsi'/> </auth> </source> <target> <path>/dev/disk/by-path</path> </target> </pool> Pool XML using libiscsi: <pool type="iscsi" mode="direct"> <name>virtimages</name> <source> <host name="iscsi.example.com"/> <device path="iqn.2013-06.com.example:iscsi-pool"/> <auth type='chap' username='myuser'> <secret usage='libvirtiscsi'/> </auth> </source> </pool> The change that occurs is having a direct mode that will lead to the libiscsi backend and the host mode that will lead to the actual backend using iscsiadm. To tie the backend to the front was thinking about adding something like VIR_STORAGE_POOL_LIBISCSI to storage_conf. About the domain XML only accept: <disk type='volume' device='disk'> <driver name='qemu' type='raw'/> <source pool='iscsi-pool' volume='unit:0:0:2' mode='direct'/> <target dev='vdc' bus='virtio'/> </disk> would be great using a switch case on VIR_STORAGE_POOL_LIBISCSI inside domain_conf. Best regards, -- Clementine Hayat

8 24

[libvirt] [PATCH] run: Fix LIBVIRTD_PATH
by Cole Robinson 24 Jul '18

24 Jul '18

It wasn't updated when libvirt was moved from daemon/ to src/ Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- run.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run.in b/run.in index cbef61a674..06ad54b62b 100644 --- a/run.in +++ b/run.in @@ -63,7 +63,7 @@ export PKG_CONFIG_PATH export LIBVIRT_DRIVER_DIR="$b/src/.libs" export LIBVIRT_LOCK_MANAGER_PLUGIN_DIR="$b/src/.libs" export VIRTLOCKD_PATH="$b/src" -export LIBVIRTD_PATH="$b/daemon" +export LIBVIRTD_PATH="$b/src" # This is a cheap way to find some use-after-free and uninitialized # read problems when using glibc. -- 2.17.1

2 1

[libvirt] [PATCH 0/2] Make it easier to track feature deprecation
by Markus Armbruster 24 Jul '18

24 Jul '18

Markus Armbruster (2): qemu-doc: Move appendix "Deprecated features" to its own file MAINTAINERS: New section "Incompatible changes", copy libvir-list MAINTAINERS | 4 + qemu-deprecated.texi | 234 ++++++++++++++++++++++++++++++++++++++++++ qemu-doc.texi | 235 +------------------------------------------ 3 files changed, 239 insertions(+), 234 deletions(-) create mode 100644 qemu-deprecated.texi -- 2.17.1

5 11

[libvirt] [dbus PATCH] connect: fix calls to virtDBusConnectOpen
by Anya Harter 24 Jul '18

24 Jul '18

Signed-off-by: Anya Harter <aharter(a)redhat.com> --- src/domain.c | 2 +- src/interface.c | 2 +- src/network.c | 2 +- src/nodedev.c | 2 +- src/nwfilter.c | 2 +- src/secret.c | 2 +- src/storagepool.c | 2 +- src/storagevol.c | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/domain.c b/src/domain.c index 5c5e6da..e8b1a0e 100644 --- a/src/domain.c +++ b/src/domain.c @@ -152,7 +152,7 @@ virtDBusDomainGetVirDomain(virtDBusConnect *connect, { virDomainPtr domain; - if (virtDBusConnectOpen(connect, error) < 0) + if (!virtDBusConnectOpen(connect, error)) return NULL; domain = virtDBusUtilVirDomainFromBusPath(connect->connection, diff --git a/src/interface.c b/src/interface.c index 191b8be..6c24885 100644 --- a/src/interface.c +++ b/src/interface.c @@ -10,7 +10,7 @@ virtDBusInterfaceGetVirInterface(virtDBusConnect *connect, { virInterfacePtr interface; - if (virtDBusConnectOpen(connect, error) < 0) + if (!virtDBusConnectOpen(connect, error)) return NULL; interface = virtDBusUtilVirInterfaceFromBusPath(connect->connection, diff --git a/src/network.c b/src/network.c index 3957ee6..f3d5472 100644 --- a/src/network.c +++ b/src/network.c @@ -21,7 +21,7 @@ virtDBusNetworkGetVirNetwork(virtDBusConnect *connect, { virNetworkPtr network; - if (virtDBusConnectOpen(connect, error) < 0) + if (!virtDBusConnectOpen(connect, error)) return NULL; network = virtDBusUtilVirNetworkFromBusPath(connect->connection, diff --git a/src/nodedev.c b/src/nodedev.c index aa649c6..04fe29c 100644 --- a/src/nodedev.c +++ b/src/nodedev.c @@ -10,7 +10,7 @@ virtDBusNodeDeviceGetVirNodeDevice(virtDBusConnect *connect, { virNodeDevicePtr dev; - if (virtDBusConnectOpen(connect, error) < 0) + if (!virtDBusConnectOpen(connect, error)) return NULL; dev = virtDBusUtilVirNodeDeviceFromBusPath(connect->connection, diff --git a/src/nwfilter.c b/src/nwfilter.c index 3fc6e12..d101778 100644 --- a/src/nwfilter.c +++ b/src/nwfilter.c @@ -10,7 +10,7 @@ virtDBusNWFilterGetVirNWFilter(virtDBusConnect *connect, { virNWFilterPtr nwfilter; - if (virtDBusConnectOpen(connect, error) < 0) + if (!virtDBusConnectOpen(connect, error)) return NULL; nwfilter = virtDBusUtilVirNWFilterFromBusPath(connect->connection, diff --git a/src/secret.c b/src/secret.c index 903cfc2..85982f1 100644 --- a/src/secret.c +++ b/src/secret.c @@ -10,7 +10,7 @@ virtDBusSecretGetVirSecret(virtDBusConnect *connect, { virSecretPtr secret; - if (virtDBusConnectOpen(connect, error) < 0) + if (!virtDBusConnectOpen(connect, error)) return NULL; secret = virtDBusUtilVirSecretFromBusPath(connect->connection, diff --git a/src/storagepool.c b/src/storagepool.c index 6eb6f27..b4d4f93 100644 --- a/src/storagepool.c +++ b/src/storagepool.c @@ -10,7 +10,7 @@ virtDBusStoragePoolGetVirStoragePool(virtDBusConnect *connect, { virStoragePoolPtr storagePool; - if (virtDBusConnectOpen(connect, error) < 0) + if (!virtDBusConnectOpen(connect, error)) return NULL; storagePool = virtDBusUtilVirStoragePoolFromBusPath(connect->connection, diff --git a/src/storagevol.c b/src/storagevol.c index e5d1686..6ddff47 100644 --- a/src/storagevol.c +++ b/src/storagevol.c @@ -10,7 +10,7 @@ virtDBusStorageVolGetVirStorageVol(virtDBusConnect *connect, { virStorageVolPtr storageVol; - if (virtDBusConnectOpen(connect, error) < 0) + if (!virtDBusConnectOpen(connect, error)) return NULL; storageVol = virtDBusUtilVirStorageVolFromBusPath(connect->connection, -- 2.17.1

2 1

[libvirt] [PATCH v2 0/3] qemu: Support vhost-vsock-ccw
by Boris Fiuczynski 24 Jul '18

24 Jul '18

Support the vhost-vsock-ccw device on S390. Since v1 - adjusted vsock command line generation (Ján Tomko) - added CAPS_LATEST test coverage to s390 (Ján Tomko) - adjusted new vsock tests to use CAPS_LATEST Bjoern Walk (1): tests: qemuxml2argv: make CAPS_LATEST arch generic Boris Fiuczynski (2): qemu: Add ccw support for vhost-vsock news: Update for vhost-vsock-ccw support docs/news.xml | 8 ++ src/qemu/qemu_command.c | 8 +- src/qemu/qemu_domain.c | 10 +- src/qemu/qemu_domain_address.c | 7 +- .../vhost-vsock-ccw-auto.s390x-latest.args | 32 ++++++ .../qemuxml2argvdata/vhost-vsock-ccw-auto.xml | 25 +++++ .../vhost-vsock-ccw.s390x-latest.args | 32 ++++++ tests/qemuxml2argvdata/vhost-vsock-ccw.xml | 32 ++++++ tests/qemuxml2argvtest.c | 98 +++++++++++-------- .../vhost-vsock-ccw-auto.xml | 32 ++++++ tests/qemuxml2xmloutdata/vhost-vsock-ccw.xml | 1 + tests/qemuxml2xmltest.c | 5 + 12 files changed, 243 insertions(+), 47 deletions(-) create mode 100644 tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args create mode 100644 tests/qemuxml2argvdata/vhost-vsock-ccw-auto.xml create mode 100644 tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args create mode 100644 tests/qemuxml2argvdata/vhost-vsock-ccw.xml create mode 100644 tests/qemuxml2xmloutdata/vhost-vsock-ccw-auto.xml create mode 120000 tests/qemuxml2xmloutdata/vhost-vsock-ccw.xml -- 2.17.0

2 5

[libvirt] [dbus PATCH v2 00/17] Implement and Test Interface APIs
by Anya Harter 24 Jul '18

24 Jul '18

original patch series cover letter: https://www.redhat.com/archives/libvir-list/2018-July/msg00364.html changes since v1: * all commits "make" and "make check" * MACString property => MAC property * various corrections * add tests for all but virConnectListAllInterfaces, virInterfaceChangeBegin, virInterfaceChangeCommit, and virInterfaceChangeRollback * commits were reordered to introduce functions before they are needed by the test suite https://libvirt.org/html/libvirt-libvirt-interface.html The following functions have been implemented: - virConnectListAllInterfaces (connect method) - virInterfaceChangeBegin (connect method) - virInterfaceChangeCommit (connect method) - virInterfaceChangeRollback (connect method) - virInterfaceCreate (interface method) - virInterfaceDefineXML (connect method) - virInterfaceDestroy (interface method) - virInterfaceGetMACString (property) - virInterfaceGetName (property) - virInterfaceGetXMLDesc (interface method) - virInterfaceIsActive (property) - virInterfaceLookupByMACString (connect method) - virInterfaceLookupByName (connect method) - virInterfaceUndefine (interface method) Anya Harter (17): Introduce Interface Interface Implement InterfaceDefineXML method for Connect Interface Implement Create method for Interface Interface Implement Destroy method for Interface Interface Introduce Interface Tests & Test Create method for Interface Interface Test Destroy method for Interface Interface Implement Undefine method for Interface Interface Implement GetXMLDesc method for Interface Interface Implement Name property for Interface Interface Implement MAC property for Interface Interface Implement Active property for Interface Interface Implement ListInterfaces method for Connect Interface Implement InterfaceChangeBegin method for Connect Interface Implement InterfaceChangeCommit method for Connect Interface Implement InterfaceChangeRollback method for Connect Interface Implement InterfaceLookupByName method for Connect Interface Implement InterfaceLookupByMAC method for Connect Interface data/Makefile.am | 1 + data/org.libvirt.Connect.xml | 40 ++++++ data/org.libvirt.Interface.xml | 42 ++++++ src/Makefile.am | 2 + src/connect.c | 198 ++++++++++++++++++++++++++ src/connect.h | 1 + src/interface.c | 249 +++++++++++++++++++++++++++++++++ src/interface.h | 9 ++ src/util.c | 35 +++++ src/util.h | 15 ++ tests/Makefile.am | 1 + tests/libvirttest.py | 12 ++ tests/test_connect.py | 17 +++ tests/test_interface.py | 39 ++++++ tests/xmldata.py | 12 ++ 15 files changed, 673 insertions(+) create mode 100644 data/org.libvirt.Interface.xml create mode 100644 src/interface.c create mode 100644 src/interface.h create mode 100755 tests/test_interface.py -- 2.17.1

4 35

[libvirt] [PATCH v2] conf: virDomainDefValidateInternal prohibit some characters in shmem name
by Simon Kobyda 23 Jul '18

23 Jul '18

XML shmem name will not include character '/', and will not be equal to strings "." or "..", as shmem name is used in a path. https://bugzilla.redhat.com/show_bug.cgi?id=1192400 --- Changes in V2 - Added error reports - Error situation will happen only if shmem name is equal to "." or "..", however their occurence in a name compromised of more characters is allowed. src/conf/domain_conf.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 7ab2953d83..6b34c17de4 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6107,6 +6107,8 @@ virDomainDefLifecycleActionValidate(const virDomainDef *def) static int virDomainDefValidateInternal(const virDomainDef *def) { + size_t i; + if (virDomainDefCheckDuplicateDiskInfo(def) < 0) return -1; @@ -6136,6 +6138,26 @@ virDomainDefValidateInternal(const virDomainDef *def) return -1; } + for (i = 0; i < def->nshmems; i++) { + if (strchr(def->shmems[i]->name, '/')) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("shmem name cannot include '/' character")); + return -1; + } + + if (STREQ(def->shmems[i]->name, ".")) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("shmem name cannot be equal to '.'")); + return -1; + } + + if (STREQ(def->shmems[i]->name, "..")) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("shmem name cannot be equal to '..'")); + return -1; + } + } + if (virDomainDefLifecycleActionValidate(def) < 0) return -1; -- 2.17.1

2 2

[libvirt] [PATCH v2 0/5] Don't touch user data from tests
by Michal Privoznik 23 Jul '18

23 Jul '18

This is a v2 of: https://www.redhat.com/archives/libvir-list/2018-July/msg00425.html diff to v1: - Patch 1/6 from original series was ACKed and thus pushed, - Patch 2/6 from original series is replaced with 1/5, - The rest of the patches remained unreviewed, therefore I'm resending them. Michal Prívozník (5): qemuxml2argvtest: Set more fake drivers Forget last daemon/ dir artefacts virtestmock: Track connect() too check-file-access: Allow specifying action virtestmock: Track action Makefile.am | 2 +- run.in | 2 +- tests/check-file-access.pl | 32 ++++++++++++++++++---- tests/file_access_whitelist.txt | 15 +++++++---- tests/libvirtd-fail | 4 +-- tests/qemuxml2argvtest.c | 6 +++++ tests/virtestmock.c | 59 ++++++++++++++++++++++++++++++----------- 7 files changed, 90 insertions(+), 30 deletions(-) -- 2.16.4

4 19

[libvirt] [PATCH v2 0/2] Minor fixes for virTypedParams(De)Serialize
by Marc Hartmayer 23 Jul '18

23 Jul '18

Changelog: + v1->v2: - Removed the the allocation change in virTypedParams(De)Serialize (John's comment) Marc Hartmayer (2): virTypedParamsSerialize: set remote_params_len at the end virTypedParamsDeserialize: set nparams to 0 in case of an error src/util/virtypedparam.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- 2.13.4

2 3

[libvirt] [PATCH v2 0/2] Add alias support in sub-commands of virsh
by Han Han 23 Jul '18

23 Jul '18

Fix make syntax-check failure in v1. v1 link: https://www.redhat.com/archives/libvir-list/2018-July/msg00929.html Han Han (2): virsh: Support alias in attach-disk virsh: Support alias in attach-interface tools/virsh-domain.c | 30 ++++++++++++++++++++++++++++-- tools/virsh.pod | 7 +++++-- 2 files changed, 33 insertions(+), 4 deletions(-) -- 2.17.1

2 8

[libvirt] [go PATCH 00/37] Fix error reporting thread safety wrt goroutine rescheduling
by Daniel P. Berrangé 23 Jul '18

23 Jul '18

The Libvirt C API provides the virGetLastError() function to let callers aquire the error information after a function fails. This function uses a thread local, and so must be called in the same OS thread as the function that failed originally. eg you could call char *xml = virDomainGetXMLDesc(dom); if (!xml) { virErrorPtr err = virGetLastError(); ....do stuff with err... } This is all fine, but there is a subtle problem that was overlooked when the Go bindings were first created. Specifically a native C API call is a goroutine re-scheduling point. So when the Go code does var xml = C.virDomainGetXMLDesc(dom); if (xml == nil) { C.virErrorPtr err = C.virGetLastError(); ....do stuff with err... } All that code runs in the same goroutine, but at the call entry to C.virGetLastError, the goroutine might get switched to a different OS level thread. As a result virGetLastError() will return either no error at all, or an error from a completely different libvirt API call. We need to prevent the OS level thread being changed in between the call to the real function and the virGetLastError() function. Naively you might think we could put a LockOSThread() / UnlockOSThread() call around this block of Go code, but that is a very bad idea in reality. Until Go 1.10, the LockOSThread() calls did not ref count, so if some other code has already locked the thread, when libvirt called UnlockOSThread it could do bad things. In addition, after calling UnlockOSThread() the Go runtime doesn't trust the OS thread state anymore, so will terminate the thread and spawn a new one. IOW using LockOSThread() would mean every single libvirt API call would create and destroy a new thread which is horrible for performance. Thus this patch series takes a different approach. We create a wrapper function for every C API exposed by libvirt, that has a 'virErrorPtr' parameter. So the Go code can do var C.virErrorPtr err var xml = C.virDomainGetXMLDescWrapper(dom, &err) if (xml == nil) { ...do stuff with err... } The wrapper function is responsible for calling virGetLastError() and since this is C code, we're guaranteed its all in the same OS level thread. Daniel P. Berrangé (37): error: add helper for converting libvirt to go error objects storage volume: add missin blank line Rename *cfuncs.{go,h} to *wrapper.{go,h} Use "Wrapper" or "Helper" as suffix for C functions Change "Compat" suffix to "Wrapper" to have standard naming scheme connect: move wrapper functions out of compat header network: move wrapper functions out of compat header nwfilter binding: move wrapper functions out of compat header node device: move wrapper functions out of compat header secret: move wrapper functions out of compat header stream: move wrapper functions out of compat header storage volume: move wrapper functions out of compat header storage pool: move wrapper functions out of compat header qemu: move wrapper functions out of compat header lxc: move wrapper functions out of compat header domain: move wrapper functions out of compat header make the XXX_wrapper.h header files self-contained Add XXX_wrapper.{h,go} for every remaining file Standardize formatting in all wrapper headers storage vol: fix error reporting thread safety storage pool: fix error reporting thread safety stream: fix error reporting thread safety secret: fix error reporting thread safety nwfilter: fix error reporting thread safety nwfilter binding: fix error reporting thread safety node device: fix error reporting thread safety network: fix error reporting thread safety interface: fix error reporting thread safety domain snapshot: fix error reporting thread safety connect: fix error reporting thread safety domain: fix error reporting thread safety qemu: fix error reporting thread safety lxc: fix error reporting thread safety events: fix error reporting thread safety error: remove GetLastError() function error: make GetNotImplementedError private connect: add missing references on domain object in stats records api_test.go | 5 +- callbacks.go | 4 +- callbacks_cfuncs.go => callbacks_wrapper.go | 6 +- callbacks_cfuncs.h => callbacks_wrapper.h | 8 +- connect.go | 741 +++--- connect_cfuncs.h | 34 - connect_compat.go | 206 -- connect_compat.h | 81 - connect_wrapper.go | 1766 +++++++++++++ connect_wrapper.h | 730 ++++++ domain.go | 1083 ++++---- domain_compat.go | 384 --- domain_compat.h | 141 - domain_events.go | 235 +- domain_events_cfuncs.h | 124 - ...ents_cfuncs.go => domain_events_wrapper.go | 85 +- domain_events_wrapper.h | 207 ++ domain_snapshot.go | 65 +- domain_snapshot_wrapper.go | 215 ++ domain_snapshot_wrapper.h | 102 + domain_wrapper.go | 2330 +++++++++++++++++ domain_wrapper.h | 986 +++++++ error.go | 17 +- error_test.go | 44 - events.go | 45 +- events_cfuncs.h | 39 - events_cfuncs.go => events_wrapper.go | 89 +- events_wrapper.h | 82 + interface.go | 48 +- interface_wrapper.go | 158 ++ interface_wrapper.h | 76 + lxc.go | 27 +- lxc_compat.go | 51 - lxc_wrapper.go | 101 + lxc_compat.h => lxc_wrapper.h | 33 +- network.go | 88 +- network_compat.h | 10 - network_events.go | 23 +- network_events_cfuncs.h | 38 - ...nts_cfuncs.go => network_events_wrapper.go | 41 +- network_compat.go => network_events_wrapper.h | 51 +- network_wrapper.go | 267 ++ network_wrapper.h | 119 + node_device.go | 66 +- node_device_compat.go | 46 - node_device_compat.h | 3 - node_device_events.go | 32 +- node_device_events_cfuncs.h | 40 - ...cfuncs.go => node_device_events_wrapper.go | 46 +- ..._cfuncs.go => node_device_events_wrapper.h | 73 +- node_device_wrapper.go | 184 ++ node_device_wrapper.h | 88 + nwfilter.go | 38 +- nwfilter_binding.go | 46 +- nwfilter_binding_compat.h | 11 - ...g_compat.go => nwfilter_binding_wrapper.go | 66 +- nwfilter_binding_wrapper.h | 60 + nwfilter_wrapper.go | 122 + nwfilter_wrapper.h | 65 + qemu.go | 43 +- qemu_cfuncs.go | 64 - qemu_cfuncs.h | 39 - qemu_compat.go | 48 - qemu_compat.h | 3 - qemu_wrapper.go | 133 + qemu_wrapper.h | 78 + secret.go | 54 +- secret_compat.h | 3 - secret_events.go | 34 +- secret_events_cfuncs.h | 40 - ...ents_cfuncs.go => secret_events_wrapper.go | 45 +- secret_compat.go => secret_events_wrapper.h | 41 +- secret_wrapper.go | 175 ++ secret_wrapper.h | 86 + storage_pool.go | 121 +- storage_pool_compat.h | 4 - storage_pool_events.go | 34 +- storage_pool_events_cfuncs.h | 40 - ...funcs.go => storage_pool_events_wrapper.go | 46 +- ...compat.go => storage_pool_events_wrapper.h | 43 +- storage_pool_wrapper.go | 343 +++ storage_pool_wrapper.h | 150 ++ storage_volume.go | 86 +- storage_volume_compat.go | 47 - storage_volume_compat.h | 4 - storage_volume_wrapper.go | 249 ++ storage_volume_wrapper.h | 116 + stream.go | 95 +- stream_cfuncs.go | 132 - stream_cfuncs.h | 37 - stream_compat.go | 69 - stream_compat.h | 13 - stream_wrapper.go | 331 +++ stream_wrapper.h | 120 + 94 files changed, 11619 insertions(+), 3318 deletions(-) rename callbacks_cfuncs.go => callbacks_wrapper.go (90%) rename callbacks_cfuncs.h => callbacks_wrapper.h (87%) delete mode 100644 connect_cfuncs.h delete mode 100644 connect_compat.go create mode 100644 connect_wrapper.go create mode 100644 connect_wrapper.h delete mode 100644 domain_compat.go delete mode 100644 domain_events_cfuncs.h rename domain_events_cfuncs.go => domain_events_wrapper.go (75%) create mode 100644 domain_events_wrapper.h create mode 100644 domain_snapshot_wrapper.go create mode 100644 domain_snapshot_wrapper.h create mode 100644 domain_wrapper.go create mode 100644 domain_wrapper.h delete mode 100644 error_test.go delete mode 100644 events_cfuncs.h rename events_cfuncs.go => events_wrapper.go (72%) create mode 100644 events_wrapper.h create mode 100644 interface_wrapper.go create mode 100644 interface_wrapper.h delete mode 100644 lxc_compat.go create mode 100644 lxc_wrapper.go rename lxc_compat.h => lxc_wrapper.h (53%) delete mode 100644 network_events_cfuncs.h rename network_events_cfuncs.go => network_events_wrapper.go (59%) rename network_compat.go => network_events_wrapper.h (57%) create mode 100644 network_wrapper.go create mode 100644 network_wrapper.h delete mode 100644 node_device_compat.go delete mode 100644 node_device_events_cfuncs.h rename node_device_events_cfuncs.go => node_device_events_wrapper.go (59%) rename connect_cfuncs.go => node_device_events_wrapper.h (52%) create mode 100644 node_device_wrapper.go create mode 100644 node_device_wrapper.h rename nwfilter_binding_compat.go => nwfilter_binding_wrapper.go (54%) create mode 100644 nwfilter_binding_wrapper.h create mode 100644 nwfilter_wrapper.go create mode 100644 nwfilter_wrapper.h delete mode 100644 qemu_cfuncs.go delete mode 100644 qemu_cfuncs.h delete mode 100644 qemu_compat.go create mode 100644 qemu_wrapper.go create mode 100644 qemu_wrapper.h delete mode 100644 secret_events_cfuncs.h rename secret_events_cfuncs.go => secret_events_wrapper.go (61%) rename secret_compat.go => secret_events_wrapper.h (54%) create mode 100644 secret_wrapper.go create mode 100644 secret_wrapper.h delete mode 100644 storage_pool_events_cfuncs.h rename storage_pool_events_cfuncs.go => storage_pool_events_wrapper.go (60%) rename storage_pool_compat.go => storage_pool_events_wrapper.h (51%) create mode 100644 storage_pool_wrapper.go create mode 100644 storage_pool_wrapper.h delete mode 100644 storage_volume_compat.go create mode 100644 storage_volume_wrapper.go create mode 100644 storage_volume_wrapper.h delete mode 100644 stream_cfuncs.go delete mode 100644 stream_cfuncs.h delete mode 100644 stream_compat.go create mode 100644 stream_wrapper.go create mode 100644 stream_wrapper.h -- 2.17.1

1 38

[libvirt] [PATCH] tests: also skip qemuagenttest with old jansson
by Ján Tomko 23 Jul '18

23 Jul '18

qemuagenttest also depends on JSON object key ordering: Invalid value of argument 'vcpus' of command 'guest-set-vcpus': expected '[{"logical-id":1,"online":false}]' got '[{"online":false,"logical-id":1}]' Skip it as well. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- Pushed as a build breaker fix for Debian 8. tests/qemuagenttest.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c index 232b34f9cd..b3d737d8a8 100644 --- a/tests/qemuagenttest.c +++ b/tests/qemuagenttest.c @@ -907,8 +907,8 @@ mymain(void) { int ret = 0; -#if !WITH_JANSSON - fputs("libvirt not compiled with JSON support, skipping this test\n", stderr); +#if !WITH_STABLE_ORDERING_JANSSON + fputs("libvirt not compiled with recent enough Jansson, skipping this test\n", stderr); return EXIT_AM_SKIP; #endif -- 2.16.1

1 0

[libvirt] [PATCH] qemu: hotplug: Don't leak saved error on failure in qemuHotplugRemoveManagedPR
by Peter Krempa 23 Jul '18

23 Jul '18

If we'd fail to enter or exit the monitor the saved error would be leaked. Introduced in 8498a1e2221 . Pointed out by coverity. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_hotplug.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index fe703ab4bd..1488f0a7c2 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -354,22 +354,26 @@ qemuHotplugRemoveManagedPR(virQEMUDriverPtr driver, { qemuDomainObjPrivatePtr priv = vm->privateData; virErrorPtr orig_err; - virErrorPreserveLast(&orig_err); + int ret = -1; if (!priv->prDaemonRunning || virDomainDefHasManagedPR(vm->def)) return 0; + virErrorPreserveLast(&orig_err); + if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) - return -1; + goto cleanup; ignore_value(qemuMonitorDelObject(priv->mon, qemuDomainGetManagedPRAlias())); if (qemuDomainObjExitMonitor(driver, vm) < 0) - return -1; + goto cleanup; qemuProcessKillManagedPRDaemon(vm); - virErrorRestore(&orig_err); - return 0; + ret = 0; + cleanup: + virErrorRestore(&orig_err); + return ret; } -- 2.16.2

2 1

[libvirt] [python PATCH 0/3] rpm: misc updates to modernize spec
by Daniel P. Berrangé 23 Jul '18

23 Jul '18

Daniel P. Berrangé (3): rpm: use the versioned python2 macro names rpm: add BuildRequires on gcc rpm: update min required rhel/fedora libvirt-python.spec.in | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) -- 2.17.1

2 4

[libvirt] [PATCH] vmx: add support for hostonly interfaces
by Javier Uruen Val 23 Jul '18

23 Jul '18

Vmware fusion allows you to configure a network interface as "hostonly". This uses a private network that is not normally accessible from the physical networks on the Mac/PC. We map "hostonly" in the vmx configuration to "network" in the domain configuration. Some comments in vmx.c seem to point towards using this mapping and not other such as "internal" or something else. Added tests and configuration files from actual vmx machines configured with "hostonly". Signed-off-by: Javier Uruen Val <javi.uruen(a)gmail.com> --- src/vmx/vmx.c | 19 ++- .../vmx2xml-fusion-in-the-wild-2.vmx | 115 ++++++++++++++++++ .../vmx2xml-fusion-in-the-wild-2.xml | 34 ++++++ tests/vmx2xmltest.c | 1 + .../xml2vmx-fusion-in-the-wild-2.vmx | 36 ++++++ .../xml2vmx-fusion-in-the-wild-2.xml | 31 +++++ tests/xml2vmxtest.c | 1 + 7 files changed, 231 insertions(+), 6 deletions(-) create mode 100644 tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-2.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-2.xml create mode 100755 tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-2.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-2.xml diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index fe24b060d7..c812a8fb33 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -2650,6 +2650,7 @@ virVMXParseEthernet(virConfPtr conf, int controller, virDomainNetDefPtr *def) /* vmx:networkName -> def:data.bridge.brname */ if (connectionType == NULL || STRCASEEQ(connectionType, "bridged") || + STRCASEEQ(connectionType, "hostonly") || STRCASEEQ(connectionType, "custom")) { if (virVMXGetConfigString(conf, networkName_name, &networkName, true) < 0) @@ -2674,11 +2675,12 @@ virVMXParseEthernet(virConfPtr conf, int controller, virDomainNetDefPtr *def) virtualDev = NULL; networkName = NULL; } else if (STRCASEEQ(connectionType, "hostonly")) { - /* FIXME */ - virReportError(VIR_ERR_INTERNAL_ERROR, - _("No yet handled value '%s' for VMX entry '%s'"), - connectionType, connectionType_name); - goto cleanup; + (*def)->type = VIR_DOMAIN_NET_TYPE_NETWORK; + (*def)->model = virtualDev; + (*def)->data.network.name = networkName; + + virtualDev = NULL; + networkName = NULL; } else if (STRCASEEQ(connectionType, "nat")) { (*def)->type = VIR_DOMAIN_NET_TYPE_USER; (*def)->model = virtualDev; @@ -3783,6 +3785,12 @@ virVMXFormatEthernet(virDomainNetDefPtr def, int controller, case VIR_DOMAIN_NET_TYPE_USER: virBufferAsprintf(buffer, "ethernet%d.connectionType = \"nat\"\n", controller); + + break; + + case VIR_DOMAIN_NET_TYPE_NETWORK: + virBufferAsprintf(buffer, "ethernet%d.connectionType = \"hostonly\"\n", + controller); break; case VIR_DOMAIN_NET_TYPE_ETHERNET: @@ -3790,7 +3798,6 @@ virVMXFormatEthernet(virDomainNetDefPtr def, int controller, case VIR_DOMAIN_NET_TYPE_SERVER: case VIR_DOMAIN_NET_TYPE_CLIENT: case VIR_DOMAIN_NET_TYPE_MCAST: - case VIR_DOMAIN_NET_TYPE_NETWORK: case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_DIRECT: case VIR_DOMAIN_NET_TYPE_HOSTDEV: diff --git a/tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-2.vmx b/tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-2.vmx new file mode 100644 index 0000000000..c871cca540 --- /dev/null +++ b/tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-2.vmx @@ -0,0 +1,115 @@ +.encoding = "UTF-8" +config.version = "8" +virtualHW.version = "12" +vcpu.hotadd = "TRUE" +scsi0.present = "TRUE" +scsi0.virtualDev = "lsilogic" +sata0.present = "TRUE" +memsize = "4996" +mem.hotadd = "TRUE" +scsi0:0.present = "TRUE" +scsi0:0.fileName = "Virtual Disk.vmdk" +sata0:1.present = "TRUE" +sata0:1.autodetect = "TRUE" +sata0:1.deviceType = "cdrom-image" +sata0:1.startConnected = "FALSE" +ethernet0.present = "TRUE" +ethernet0.connectionType = "hostonly" +ethernet0.virtualDev = "e1000" +ethernet0.wakeOnPcktRcv = "FALSE" +ethernet0.addressType = "generated" +ethernet0.linkStatePropagation.enable = "FALSE" +usb.present = "TRUE" +ehci.present = "TRUE" +ehci.pciSlotNumber = "35" +sound.present = "TRUE" +sound.fileName = "-1" +sound.autodetect = "TRUE" +mks.enable3d = "TRUE" +svga.graphicsMemoryKB = "786432" +pciBridge0.present = "TRUE" +pciBridge4.present = "TRUE" +pciBridge4.virtualDev = "pcieRootPort" +pciBridge4.functions = "8" +pciBridge5.present = "TRUE" +pciBridge5.virtualDev = "pcieRootPort" +pciBridge5.functions = "8" +pciBridge6.present = "TRUE" +pciBridge6.virtualDev = "pcieRootPort" +pciBridge6.functions = "8" +pciBridge7.present = "TRUE" +pciBridge7.virtualDev = "pcieRootPort" +pciBridge7.functions = "8" +vmci0.present = "TRUE" +hpet0.present = "TRUE" +usb.vbluetooth.startConnected = "TRUE" +tools.syncTime = "TRUE" +displayName = "Ubuntu16.04" +guestOS = "ubuntu-64" +nvram = "Ubuntu16.04.nvram" +virtualHW.productCompatibility = "hosted" +tools.upgrade.policy = "upgradeAtPowerCycle" +powerType.powerOff = "soft" +powerType.powerOn = "soft" +powerType.suspend = "soft" +powerType.reset = "soft" +extendedConfigFile = "Ubuntu16.04.vmxf" +uuid.bios = "56 4d 97 36 09 cb ba 6f-20 57 e7 01 50 72 7f 3f" +uuid.location = "56 4d 97 36 09 cb ba 6f-20 57 e7 01 50 72 7f 3f" +migrate.hostlog = "./Ubuntu16.04-7a77148b.hlog" +scsi0:0.redo = "" +pciBridge0.pciSlotNumber = "17" +pciBridge4.pciSlotNumber = "21" +pciBridge5.pciSlotNumber = "22" +pciBridge6.pciSlotNumber = "23" +pciBridge7.pciSlotNumber = "24" +scsi0.pciSlotNumber = "16" +usb.pciSlotNumber = "32" +ethernet0.pciSlotNumber = "33" +sound.pciSlotNumber = "34" +vmci0.pciSlotNumber = "36" +sata0.pciSlotNumber = "37" +ethernet0.generatedAddress = "00:0C:29:72:7F:3F" +ethernet0.generatedAddressOffset = "0" +vmci0.id = "1349680959" +monitor.phys_bits_used = "42" +vmotion.checkpointFBSize = "4194304" +vmotion.checkpointSVGAPrimarySize = "67108864" +cleanShutdown = "FALSE" +softPowerOff = "FALSE" +usb:1.speed = "2" +usb:1.present = "TRUE" +usb:1.deviceType = "hub" +usb:1.port = "1" +usb:1.parent = "-1" +checkpoint.vmState = "" +sata0:1.fileName = "/Users/johndoe/Downloads/ubuntu-16.04.3-desktop-amd64.iso" +gui.lastPoweredViewMode = "windowed" +svga.guestBackedPrimaryAware = "TRUE" +gui.viewModeAtPowerOn = "windowed" +tools.remindInstall = "FALSE" +toolsInstallManager.updateCounter = "2" +toolsInstallManager.lastInstallError = "0" +keyboardAndMouseProfile = "52506018-92dd-7b40-6bc7-085ea95583f4" +isolation.tools.hgfs.disable = "false" +hgfs.mapRootShare = "true" +hgfs.linkRootShare = "true" +sharedFolder0.present = "true" +sharedFolder0.enabled = "TRUE" +sharedFolder0.readAccess = "true" +sharedFolder0.writeAccess = "true" +sharedFolder0.hostPath = "/Users/johndoe/dev/vmware-shared" +sharedFolder0.guestName = "vmware-shared" +sharedFolder0.expiration = "never" +sharedFolder.maxNum = "1" +gui.exitOnCLIHLT = "TRUE" +serial0.present = "FALSE" +floppy0.present = "FALSE" +usb:0.present = "TRUE" +usb:0.deviceType = "hid" +usb:0.port = "0" +usb:0.parent = "-1" +ehci:0.present = "TRUE" +ehci:0.deviceType = "video" +ehci:0.port = "0" +ehci:0.parent = "-1" diff --git a/tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-2.xml b/tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-2.xml new file mode 100644 index 0000000000..2e0bf504f0 --- /dev/null +++ b/tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-2.xml @@ -0,0 +1,34 @@ +<domain type='vmware'> + <name>Ubuntu16.04</name> + <uuid>564d9736-09cb-ba6f-2057-e70150727f3f</uuid> + <memory unit='KiB'>5115904</memory> + <currentMemory unit='KiB'>5115904</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64'>hvm</type> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <disk type='file' device='disk'> + <source file='[datastore] directory/Virtual Disk.vmdk'/> + <target dev='sda' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='scsi' index='0' model='lsilogic'/> + <filesystem type='mount' accessmode='passthrough'> + <source dir='/Users/johndoe/dev/vmware-shared'/> + <target dir='vmware-shared'/> + </filesystem> + <interface type='network'> + <mac address='00:0c:29:72:7f:3f'/> + <source network=''/> + <model type='e1000'/> + </interface> + <video> + <model type='vmvga' vram='4096' primary='yes'/> + </video> + </devices> +</domain> diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c index 7289dc91e3..0db4702519 100644 --- a/tests/vmx2xmltest.c +++ b/tests/vmx2xmltest.c @@ -280,6 +280,7 @@ mymain(void) DO_TEST("ws-in-the-wild-2", "ws-in-the-wild-2"); DO_TEST("fusion-in-the-wild-1", "fusion-in-the-wild-1"); + DO_TEST("fusion-in-the-wild-2", "fusion-in-the-wild-2"); DO_TEST("annotation", "annotation"); diff --git a/tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-2.vmx b/tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-2.vmx new file mode 100755 index 0000000000..a5dbf5244c --- /dev/null +++ b/tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-2.vmx @@ -0,0 +1,36 @@ +.encoding = "UTF-8" +config.version = "8" +virtualHW.version = "9" +guestOS = "other-64" +uuid.bios = "56 4d 08 c1 40 dd 13 95-85 01 b3 af 47 74 24 7d" +displayName = "Windows 10 x64" +memsize = "6728" +numvcpus = "1" +scsi0.present = "true" +scsi0.virtualDev = "lsisas1068" +scsi0:0.present = "true" +scsi0:0.deviceType = "scsi-hardDisk" +scsi0:0.fileName = "/data/vmware/disk.vmdk" +floppy0.present = "false" +floppy1.present = "false" +ethernet0.present = "true" +ethernet0.virtualDev = "e1000" +ethernet0.connectionType = "hostonly" +ethernet0.addressType = "static" +ethernet0.address = "00:90:b9:dc:ea:81" +ethernet0.checkMACAddress = "false" +svga.vramSize = "4194304" +pciBridge0.present = "true" +pciBridge4.present = "true" +pciBridge4.virtualDev = "pcieRootPort" +pciBridge4.functions = "8" +pciBridge5.present = "true" +pciBridge5.virtualDev = "pcieRootPort" +pciBridge5.functions = "8" +pciBridge6.present = "true" +pciBridge6.virtualDev = "pcieRootPort" +pciBridge6.functions = "8" +pciBridge7.present = "true" +pciBridge7.virtualDev = "pcieRootPort" +pciBridge7.functions = "8" +vmci0.present = "true" diff --git a/tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-2.xml b/tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-2.xml new file mode 100644 index 0000000000..be988e1bd9 --- /dev/null +++ b/tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-2.xml @@ -0,0 +1,31 @@ +<domain type='vmware'> + <name>Windows 10 x64</name> + <uuid>564d08c1-40dd-1395-8501-b3af4774247d</uuid> + <memory unit='KiB'>6889472</memory> + <currentMemory unit='KiB'>6889472</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <disk type='file' device='disk'> + <source file='/data/vmware/disk.vmdk'/> + <target dev='sda' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='scsi' index='0' model='lsisas1068'/> + <interface type='network'> + <mac address='00:90:b9:dc:ea:81'/> + <source network=''/> + <model type='e1000'/> + </interface> + <video> + <model type='vmvga' vram='4096' primary='yes'/> + </video> + </devices> +</domain> diff --git a/tests/xml2vmxtest.c b/tests/xml2vmxtest.c index f6bcd7b012..e9bde580eb 100644 --- a/tests/xml2vmxtest.c +++ b/tests/xml2vmxtest.c @@ -290,6 +290,7 @@ mymain(void) DO_TEST("ws-in-the-wild-2", "ws-in-the-wild-2", 8); DO_TEST("fusion-in-the-wild-1", "fusion-in-the-wild-1", 9); + DO_TEST("fusion-in-the-wild-2", "fusion-in-the-wild-2", 9); DO_TEST("annotation", "annotation", 4); -- 2.17.1

2 1

[libvirt] [PATCH 00/24] tests: qemu: Clean up disk testing (blockdev-add saga)
by Peter Krempa 23 Jul '18

23 Jul '18

Clean up many test files and add CAPS_LATEST versions of tests which will change when we switch from -drive to -blockdev This series removes many duplicated and obsolete tests and adds much more useful CAPS_LATEST testing Peter Krempa (24): tests: qemu: Drop 'drive' from disk tests tests: qemuxml2xml: Remove duplicate test disk-copy-on-read.xml tests: qemuxml2argv: Add 'CAPS_LATEST' version of "disk-copy_on_read" tests: qemuxml2argv: Remove tests obsoleted by assuming support for '-device' tests: qemuxml2argv: Unify network cdrom source testing tests: qemuxml2argv: Unify testing of local cdroms tests: qemuxml2argv: Add 'CAPS_LATEST' data for disk-cdrom* tests tests: qemuxml2argv: Add 'CAPS_LATEST' version for 'disk-detect-zeroes' tests: qemuxml2argv: Add 'CAPS_LATEST' version of 'disk-aio' test tests: qemuxml2argv: Rename disk-write-cache test do disk-cache tests: qemu: Add xml2xml and minimal version of 'disk-cache' test tests: qemu: Unify disk cache testing tests: qemu: Unify iscsi disk source testing tests: qemuxml2argv: Add 'CAPS_LATEST' version of 'disk-network-iscsi' tests: qemu: Unify nbd disk source testing tests: qemuxml2argv: Add 'CAPS_LATEST' version of 'disk-network-nbd' tests: qemu: Remove pointless 'disk-networ-ceph-env' test tests: qemuxml2argv: Unify testing of 'disk-network-rbd' tests: qemu: Remove pointless 'disks-many' test tests: qemuxml2argv: Add CAPS_LATEST version of 'disk-floppy' and 'floppy-drive-fat' tests: qemuxml2argv: Add CAPS_LATEST version of 'disk-readonly' and 'disk-shared' tests: qemuxml2argv: Add CAPS_LATEST version of 'disk-network-gluster' tests: qemuxml2argv: Add CAPS_LATEST version of 'disk-network-sheepdog' tests: qemuxml2argv: Add CAPS_LATEST version of security-related tests ...ress-conflict.xml => disk-address-conflict.xml} | 0 tests/qemuxml2argvdata/disk-aio.x86_64-latest.args | 37 +++++++ ...-drive-boot-cdrom.args => disk-boot-cdrom.args} | 0 ...sk-drive-boot-cdrom.xml => disk-boot-cdrom.xml} | 0 ...sk-drive-boot-disk.args => disk-boot-disk.args} | 0 ...disk-drive-boot-disk.xml => disk-boot-disk.xml} | 0 tests/qemuxml2argvdata/disk-cache.args | 41 ++++++++ ..._64-2.6.0.args => disk-cache.x86_64-2.6.0.args} | 3 + ..._64-2.7.0.args => disk-cache.x86_64-2.7.0.args} | 4 + ...4-latest.args => disk-cache.x86_64-latest.args} | 4 + .../{disk-drive-write-cache.xml => disk-cache.xml} | 6 ++ tests/qemuxml2argvdata/disk-cdrom-empty.args | 28 ------ tests/qemuxml2argvdata/disk-cdrom-empty.xml | 36 ------- tests/qemuxml2argvdata/disk-cdrom-network-ftp.args | 27 ----- tests/qemuxml2argvdata/disk-cdrom-network-ftp.xml | 36 ------- .../qemuxml2argvdata/disk-cdrom-network-ftps.args | 27 ----- tests/qemuxml2argvdata/disk-cdrom-network-ftps.xml | 36 ------- .../qemuxml2argvdata/disk-cdrom-network-http.args | 27 ----- tests/qemuxml2argvdata/disk-cdrom-network-http.xml | 36 ------- .../qemuxml2argvdata/disk-cdrom-network-tftp.args | 27 ----- tests/qemuxml2argvdata/disk-cdrom-network-tftp.xml | 36 ------- ...-network-https.args => disk-cdrom-network.args} | 9 ++ .../disk-cdrom-network.x86_64-latest.args | 41 ++++++++ ...om-network-https.xml => disk-cdrom-network.xml} | 27 +++++ .../disk-cdrom-tray-no-device-cap.args | 29 ------ .../disk-cdrom-tray-no-device-cap.xml | 32 ------ .../disk-cdrom-tray.x86_64-latest.args | 39 +++++++ tests/qemuxml2argvdata/disk-cdrom.args | 4 +- .../qemuxml2argvdata/disk-cdrom.x86_64-latest.args | 35 +++++++ tests/qemuxml2argvdata/disk-cdrom.xml | 6 ++ .../disk-copy_on_read.x86_64-latest.args | 41 ++++++++ ...-detect-zeroes.args => disk-detect-zeroes.args} | 0 .../disk-detect-zeroes.x86_64-latest.args | 37 +++++++ ...ve-detect-zeroes.xml => disk-detect-zeroes.xml} | 0 .../{disk-drive-discard.args => disk-discard.args} | 0 .../{disk-drive-discard.xml => disk-discard.xml} | 0 .../disk-drive-cache-directsync.args | 30 ------ .../disk-drive-cache-directsync.xml | 37 ------- .../qemuxml2argvdata/disk-drive-cache-unsafe.args | 30 ------ tests/qemuxml2argvdata/disk-drive-cache-unsafe.xml | 37 ------- .../qemuxml2argvdata/disk-drive-cache-v2-none.args | 30 ------ .../qemuxml2argvdata/disk-drive-cache-v2-none.xml | 37 ------- tests/qemuxml2argvdata/disk-drive-cache-v2-wb.args | 30 ------ tests/qemuxml2argvdata/disk-drive-cache-v2-wb.xml | 37 ------- tests/qemuxml2argvdata/disk-drive-cache-v2-wt.args | 30 ------ tests/qemuxml2argvdata/disk-drive-cache-v2-wt.xml | 37 ------- tests/qemuxml2argvdata/disk-drive-copy-on-read.xml | 30 ------ .../disk-drive-network-iscsi-lun.args | 29 ------ .../disk-drive-network-iscsi-lun.xml | 28 ------ .../qemuxml2argvdata/disk-drive-network-iscsi.args | 32 ------ .../qemuxml2argvdata/disk-drive-network-iscsi.xml | 37 ------- .../disk-drive-network-nbd-export.args | 30 ------ .../disk-drive-network-nbd-export.xml | 37 ------- .../disk-drive-network-nbd-ipv6-export.args | 29 ------ .../disk-drive-network-nbd-ipv6-export.xml | 37 ------- .../disk-drive-network-nbd-ipv6.args | 29 ------ .../disk-drive-network-nbd-ipv6.xml | 37 ------- .../disk-drive-network-nbd-unix.args | 30 ------ .../disk-drive-network-nbd-unix.xml | 37 ------- tests/qemuxml2argvdata/disk-drive-network-nbd.args | 29 ------ tests/qemuxml2argvdata/disk-drive-network-nbd.xml | 37 ------- .../disk-drive-network-rbd-auth-AES.xml | 55 ---------- .../disk-drive-network-rbd-auth.args | 32 ------ .../disk-drive-network-rbd-auth.xml | 42 -------- .../disk-drive-network-rbd-ceph-env.args | 25 ----- .../disk-drive-network-rbd-ceph-env.xml | 39 ------- .../disk-drive-network-rbd-ipv6.args | 31 ------ .../disk-drive-network-rbd-ipv6.xml | 40 -------- .../disk-drive-readonly-no-device.args | 30 ------ .../disk-drive-readonly-no-device.xml | 32 ------ ...ve-error-policy.args => disk-error-policy.args} | 0 ...t.args => disk-error-policy.x86_64-latest.args} | 0 ...rive-error-policy.xml => disk-error-policy.xml} | 0 .../disk-floppy-tray-no-device-cap.xml | 37 ------- ...ice-cap.args => disk-floppy.x86_64-latest.args} | 20 ++-- .../{disk-drive-fmt-cow.xml => disk-fmt-cow.xml} | 0 .../{disk-drive-fmt-dir.xml => disk-fmt-dir.xml} | 0 .../{disk-drive-fmt-iso.xml => disk-fmt-iso.xml} | 0 ...disk-drive-fmt-qcow.args => disk-fmt-qcow.args} | 0 .../{disk-drive-fmt-qcow.xml => disk-fmt-qcow.xml} | 0 ...sk-ide-drive-split.args => disk-ide-split.args} | 0 ...disk-ide-drive-split.xml => disk-ide-split.xml} | 0 tests/qemuxml2argvdata/disk-many.args | 32 ------ tests/qemuxml2argvdata/disk-many.xml | 48 --------- ...work-gluster.args => disk-network-gluster.args} | 0 .../disk-network-gluster.x86_64-latest.args | 44 ++++++++ ...etwork-gluster.xml => disk-network-gluster.xml} | 0 ...disk-network-iscsi-auth-secrettype-invalid.xml} | 0 ...> disk-network-iscsi-auth-wrong-secrettype.xml} | 0 ...ork-iscsi-auth.args => disk-network-iscsi.args} | 25 +++-- .../disk-network-iscsi.x86_64-latest.args | 63 ++++++++++++ ...twork-iscsi-auth.xml => disk-network-iscsi.xml} | 26 ++++- ...rive-network-rbd.args => disk-network-nbd.args} | 21 ++-- .../disk-network-nbd.x86_64-latest.args | 46 +++++++++ tests/qemuxml2argvdata/disk-network-nbd.xml | 59 +++++++++++ ...-no-colon.xml => disk-network-rbd-no-colon.xml} | 0 .../disk-network-rbd.x86_64-2.5.0.args | 55 ++++++++++ .../disk-network-rbd.x86_64-latest.args | 61 +++++++++++ ...-drive-network-rbd.xml => disk-network-rbd.xml} | 28 ++++-- ...rk-sheepdog.args => disk-network-sheepdog.args} | 0 .../disk-network-sheepdog.x86_64-latest.args | 35 +++++++ ...work-sheepdog.xml => disk-network-sheepdog.xml} | 0 ...-both.xml => disk-network-source-auth-both.xml} | 0 ...rce-auth.args => disk-network-source-auth.args} | 0 ...=> disk-network-source-auth.x86_64-latest.args} | 38 +++---- ...ource-auth.xml => disk-network-source-auth.xml} | 0 ...work-tlsx509.args => disk-network-tlsx509.args} | 0 .../disk-network-tlsx509.x86_64-latest.args | 59 +++++++++++ ...etwork-tlsx509.xml => disk-network-tlsx509.xml} | 0 ...ve-network-vxhs.args => disk-network-vxhs.args} | 0 ...rive-network-vxhs.xml => disk-network-vxhs.xml} | 0 .../{disk-drive-no-boot.args => disk-no-boot.args} | 0 .../{disk-drive-no-boot.xml => disk-no-boot.xml} | 0 ...-readonly-disk.args => disk-readonly-disk.args} | 0 .../disk-readonly-disk.x86_64-latest.args | 34 +++++++ ...ve-readonly-disk.xml => disk-readonly-disk.xml} | 0 ...hared-locking.args => disk-shared-locking.args} | 0 ...-shared-locking.xml => disk-shared-locking.xml} | 0 ...-drive-shared-qcow.xml => disk-shared-qcow.xml} | 0 .../{disk-drive-shared.args => disk-shared.args} | 0 .../disk-shared.x86_64-latest.args | 37 +++++++ .../{disk-drive-shared.xml => disk-shared.xml} | 0 ...o-drive-queues.args => disk-virtio-queues.args} | 0 ...tio-drive-queues.xml => disk-virtio-queues.xml} | 0 .../floppy-drive-fat.x86_64-latest.args | 33 ++++++ tests/qemuxml2argvtest.c | 112 ++++++++++----------- ...sk-drive-boot-cdrom.xml => disk-boot-cdrom.xml} | 0 ...disk-drive-boot-disk.xml => disk-boot-disk.xml} | 0 .../{disk-many.xml => disk-cache.xml} | 36 ++++--- tests/qemuxml2xmloutdata/disk-cdrom-empty.xml | 40 -------- tests/qemuxml2xmloutdata/disk-cdrom.xml | 6 ++ tests/qemuxml2xmloutdata/disk-detect-zeroes.xml | 1 + .../{disk-drive-discard.xml => disk-discard.xml} | 0 .../disk-drive-cache-directsync.xml | 41 -------- .../qemuxml2xmloutdata/disk-drive-cache-unsafe.xml | 41 -------- .../disk-drive-cache-v2-none.xml | 41 -------- .../qemuxml2xmloutdata/disk-drive-cache-v2-wb.xml | 41 -------- .../qemuxml2xmloutdata/disk-drive-cache-v2-wt.xml | 41 -------- .../qemuxml2xmloutdata/disk-drive-copy-on-read.xml | 36 ------- .../disk-drive-detect-zeroes.xml | 1 - .../disk-drive-network-iscsi.xml | 41 -------- .../disk-drive-network-nbd-export.xml | 42 -------- .../disk-drive-network-nbd-ipv6-export.xml | 42 -------- .../disk-drive-network-nbd-ipv6.xml | 42 -------- .../disk-drive-network-nbd-unix.xml | 42 -------- .../qemuxml2xmloutdata/disk-drive-network-nbd.xml | 42 -------- .../disk-drive-network-rbd-auth.xml | 47 --------- .../disk-drive-network-rbd-ceph-env.xml | 44 -------- .../disk-drive-network-rbd-ipv6.xml | 45 --------- ...rive-error-policy.xml => disk-error-policy.xml} | 0 .../{disk-drive-fat.xml => disk-fat.xml} | 0 .../{disk-drive-fmt-qcow.xml => disk-fmt-qcow.xml} | 0 ...etwork-gluster.xml => disk-network-gluster.xml} | 0 ...twork-iscsi-auth.xml => disk-network-iscsi.xml} | 35 ++++++- tests/qemuxml2xmloutdata/disk-network-nbd.xml | 68 +++++++++++++ ...-drive-network-rbd.xml => disk-network-rbd.xml} | 30 ++++-- ...work-sheepdog.xml => disk-network-sheepdog.xml} | 0 ...ource-auth.xml => disk-network-source-auth.xml} | 0 ...etwork-tlsx509.xml => disk-network-tlsx509.xml} | 0 ...rive-network-vxhs.xml => disk-network-vxhs.xml} | 0 ...tio-drive-queues.xml => disk-virtio-queues.xml} | 0 tests/qemuxml2xmltest.c | 47 +++------ 162 files changed, 1184 insertions(+), 2481 deletions(-) rename tests/qemuxml2argvdata/{disk-drive-address-conflict.xml => disk-address-conflict.xml} (100%) create mode 100644 tests/qemuxml2argvdata/disk-aio.x86_64-latest.args rename tests/qemuxml2argvdata/{disk-drive-boot-cdrom.args => disk-boot-cdrom.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-boot-cdrom.xml => disk-boot-cdrom.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-boot-disk.args => disk-boot-disk.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-boot-disk.xml => disk-boot-disk.xml} (100%) create mode 100644 tests/qemuxml2argvdata/disk-cache.args rename tests/qemuxml2argvdata/{disk-drive-write-cache.x86_64-2.6.0.args => disk-cache.x86_64-2.6.0.args} (90%) rename tests/qemuxml2argvdata/{disk-drive-write-cache.x86_64-2.7.0.args => disk-cache.x86_64-2.7.0.args} (90%) rename tests/qemuxml2argvdata/{disk-drive-write-cache.x86_64-latest.args => disk-cache.x86_64-latest.args} (90%) rename tests/qemuxml2argvdata/{disk-drive-write-cache.xml => disk-cache.xml} (86%) delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-empty.args delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-empty.xml delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-ftp.args delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-ftp.xml delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-ftps.args delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-ftps.xml delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-http.args delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-http.xml delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-tftp.args delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-tftp.xml rename tests/qemuxml2argvdata/{disk-cdrom-network-https.args => disk-cdrom-network.args} (58%) create mode 100644 tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args rename tests/qemuxml2argvdata/{disk-cdrom-network-https.xml => disk-cdrom-network.xml} (52%) delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-tray-no-device-cap.args delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-tray-no-device-cap.xml create mode 100644 tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args rename tests/qemuxml2argvdata/{disk-drive-detect-zeroes.args => disk-detect-zeroes.args} (100%) create mode 100644 tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args rename tests/qemuxml2argvdata/{disk-drive-detect-zeroes.xml => disk-detect-zeroes.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-discard.args => disk-discard.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-discard.xml => disk-discard.xml} (100%) delete mode 100644 tests/qemuxml2argvdata/disk-drive-cache-directsync.args delete mode 100644 tests/qemuxml2argvdata/disk-drive-cache-directsync.xml delete mode 100644 tests/qemuxml2argvdata/disk-drive-cache-unsafe.args delete mode 100644 tests/qemuxml2argvdata/disk-drive-cache-unsafe.xml delete mode 100644 tests/qemuxml2argvdata/disk-drive-cache-v2-none.args delete mode 100644 tests/qemuxml2argvdata/disk-drive-cache-v2-none.xml delete mode 100644 tests/qemuxml2argvdata/disk-drive-cache-v2-wb.args delete mode 100644 tests/qemuxml2argvdata/disk-drive-cache-v2-wb.xml delete mode 100644 tests/qemuxml2argvdata/disk-drive-cache-v2-wt.args delete mode 100644 tests/qemuxml2argvdata/disk-drive-cache-v2-wt.xml delete mode 100644 tests/qemuxml2argvdata/disk-drive-copy-on-read.xml delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-iscsi-lun.args delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-iscsi-lun.xml delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-iscsi.args delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-iscsi.xml delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-nbd-export.args delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-nbd-export.xml delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-nbd-ipv6-export.args delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-nbd-ipv6-export.xml delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-nbd-ipv6.args delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-nbd-ipv6.xml delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-nbd-unix.args delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-nbd-unix.xml delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-nbd.args delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-nbd.xml delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-rbd-auth-AES.xml delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-rbd-auth.args delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-rbd-auth.xml delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-rbd-ceph-env.args delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-rbd-ceph-env.xml delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-rbd-ipv6.args delete mode 100644 tests/qemuxml2argvdata/disk-drive-network-rbd-ipv6.xml delete mode 100644 tests/qemuxml2argvdata/disk-drive-readonly-no-device.args delete mode 100644 tests/qemuxml2argvdata/disk-drive-readonly-no-device.xml rename tests/qemuxml2argvdata/{disk-drive-error-policy.args => disk-error-policy.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-error-policy.x86_64-latest.args => disk-error-policy.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-error-policy.xml => disk-error-policy.xml} (100%) delete mode 100644 tests/qemuxml2argvdata/disk-floppy-tray-no-device-cap.xml rename tests/qemuxml2argvdata/{disk-floppy-tray-no-device-cap.args => disk-floppy.x86_64-latest.args} (53%) rename tests/qemuxml2argvdata/{disk-drive-fmt-cow.xml => disk-fmt-cow.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-fmt-dir.xml => disk-fmt-dir.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-fmt-iso.xml => disk-fmt-iso.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-fmt-qcow.args => disk-fmt-qcow.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-fmt-qcow.xml => disk-fmt-qcow.xml} (100%) rename tests/qemuxml2argvdata/{disk-ide-drive-split.args => disk-ide-split.args} (100%) rename tests/qemuxml2argvdata/{disk-ide-drive-split.xml => disk-ide-split.xml} (100%) delete mode 100644 tests/qemuxml2argvdata/disk-many.args delete mode 100644 tests/qemuxml2argvdata/disk-many.xml rename tests/qemuxml2argvdata/{disk-drive-network-gluster.args => disk-network-gluster.args} (100%) create mode 100644 tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args rename tests/qemuxml2argvdata/{disk-drive-network-gluster.xml => disk-network-gluster.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-iscsi-auth-secrettype-invalid.xml => disk-network-iscsi-auth-secrettype-invalid.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-iscsi-auth-wrong-secrettype.xml => disk-network-iscsi-auth-wrong-secrettype.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-iscsi-auth.args => disk-network-iscsi.args} (54%) create mode 100644 tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args rename tests/qemuxml2argvdata/{disk-drive-network-iscsi-auth.xml => disk-network-iscsi.xml} (63%) rename tests/qemuxml2argvdata/{disk-drive-network-rbd.args => disk-network-nbd.args} (56%) create mode 100644 tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-network-nbd.xml rename tests/qemuxml2argvdata/{disk-drive-network-rbd-no-colon.xml => disk-network-rbd-no-colon.xml} (100%) create mode 100644 tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args create mode 100644 tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args rename tests/qemuxml2argvdata/{disk-drive-network-rbd.xml => disk-network-rbd.xml} (71%) rename tests/qemuxml2argvdata/{disk-drive-network-sheepdog.args => disk-network-sheepdog.args} (100%) create mode 100644 tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args rename tests/qemuxml2argvdata/{disk-drive-network-sheepdog.xml => disk-network-sheepdog.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-source-auth-both.xml => disk-network-source-auth-both.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-source-auth.args => disk-network-source-auth.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-rbd-auth-AES.args => disk-network-source-auth.x86_64-latest.args} (51%) rename tests/qemuxml2argvdata/{disk-drive-network-source-auth.xml => disk-network-source-auth.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-tlsx509.args => disk-network-tlsx509.args} (100%) create mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args rename tests/qemuxml2argvdata/{disk-drive-network-tlsx509.xml => disk-network-tlsx509.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-vxhs.args => disk-network-vxhs.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-network-vxhs.xml => disk-network-vxhs.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-no-boot.args => disk-no-boot.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-no-boot.xml => disk-no-boot.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-readonly-disk.args => disk-readonly-disk.args} (100%) create mode 100644 tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args rename tests/qemuxml2argvdata/{disk-drive-readonly-disk.xml => disk-readonly-disk.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-shared-locking.args => disk-shared-locking.args} (100%) rename tests/qemuxml2argvdata/{disk-drive-shared-locking.xml => disk-shared-locking.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-shared-qcow.xml => disk-shared-qcow.xml} (100%) rename tests/qemuxml2argvdata/{disk-drive-shared.args => disk-shared.args} (100%) create mode 100644 tests/qemuxml2argvdata/disk-shared.x86_64-latest.args rename tests/qemuxml2argvdata/{disk-drive-shared.xml => disk-shared.xml} (100%) rename tests/qemuxml2argvdata/{disk-virtio-drive-queues.args => disk-virtio-queues.args} (100%) rename tests/qemuxml2argvdata/{disk-virtio-drive-queues.xml => disk-virtio-queues.xml} (100%) create mode 100644 tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args rename tests/qemuxml2xmloutdata/{disk-drive-boot-cdrom.xml => disk-boot-cdrom.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-boot-disk.xml => disk-boot-disk.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-many.xml => disk-cache.xml} (54%) delete mode 100644 tests/qemuxml2xmloutdata/disk-cdrom-empty.xml create mode 120000 tests/qemuxml2xmloutdata/disk-detect-zeroes.xml rename tests/qemuxml2xmloutdata/{disk-drive-discard.xml => disk-discard.xml} (100%) delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-cache-directsync.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-cache-unsafe.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-cache-v2-none.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-cache-v2-wb.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-cache-v2-wt.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-copy-on-read.xml delete mode 120000 tests/qemuxml2xmloutdata/disk-drive-detect-zeroes.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-network-iscsi.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-network-nbd-export.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-network-nbd-ipv6-export.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-network-nbd-ipv6.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-network-nbd-unix.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-network-nbd.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-network-rbd-auth.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-network-rbd-ceph-env.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-drive-network-rbd-ipv6.xml rename tests/qemuxml2xmloutdata/{disk-drive-error-policy.xml => disk-error-policy.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-fat.xml => disk-fat.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-fmt-qcow.xml => disk-fmt-qcow.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-gluster.xml => disk-network-gluster.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-iscsi-auth.xml => disk-network-iscsi.xml} (59%) create mode 100644 tests/qemuxml2xmloutdata/disk-network-nbd.xml rename tests/qemuxml2xmloutdata/{disk-drive-network-rbd.xml => disk-network-rbd.xml} (72%) rename tests/qemuxml2xmloutdata/{disk-drive-network-sheepdog.xml => disk-network-sheepdog.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-source-auth.xml => disk-network-source-auth.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-tlsx509.xml => disk-network-tlsx509.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-drive-network-vxhs.xml => disk-network-vxhs.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-virtio-drive-queues.xml => disk-virtio-queues.xml} (100%) -- 2.16.2

2 48

[libvirt] [PATCH] libvirt_iohelper: record the libvirt_iohelper's error message at virFileWrapperFdFree
by xinhua.Cao 23 Jul '18

23 Jul '18

Currently iohelper's error log is recorded in virFileWrapperFdClose. In qemuDomainSaveMemory, it usually fails at qemuMigrationSrcToFile, and then goto cleanup, so the iohelper error log is not recorded, and so is the another placement. We now record the error log of iohelper by move it to the virFileWrapperFdFree record. There is another problem here, that is, virCommandWait is also not called, but I can't evaluate this impact. So no changes have been made here. --- src/util/virfile.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index 1faeebb..30456ab 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -330,9 +330,6 @@ virFileWrapperFdClose(virFileWrapperFdPtr wfd) return 0; ret = virCommandWait(wfd->cmd, NULL); - if (wfd->err_msg && *wfd->err_msg) - VIR_WARN("iohelper reports: %s", wfd->err_msg); - return ret; } @@ -351,6 +348,9 @@ virFileWrapperFdFree(virFileWrapperFdPtr wfd) if (!wfd) return; + if (wfd->err_msg && *wfd->err_msg) + VIR_WARN("iohelper reports: %s", wfd->err_msg); + VIR_FREE(wfd->err_msg); virCommandFree(wfd->cmd); -- 2.8.3

2 2

[libvirt] [PATCH v2 0/8] virStr*cpy*() related fixes and cleanups
by Andrea Bolognani 23 Jul '18

23 Jul '18

Changes from [v1]: * catch a bunch more suboptimal uses of the original API; * improve the API so that it's both more sensible and fits better with the rest of libvirt. [v1] https://www.redhat.com/archives/libvir-list/2018-July/msg01044.html Andrea Bolognani (8): src: Use virStrcpyStatic() to avoid truncation src: Use virStrcpyStatic() wherever possible src: Use VIR_STRDUP() wherever possible src: Use virStrcpy() wherever possible src: Don't rely on strncpy()-like behavior src: Make virStr*cpy*() functions return an int esx: Use memcpy() in esxVI_CURL_Debug() util: Improve virStrncpy() implementation docs/hacking.html.in | 29 +++++----- src/conf/capabilities.c | 2 +- src/conf/netdev_vport_profile_conf.c | 2 +- src/conf/nwfilter_conf.c | 3 +- src/esx/esx_driver.c | 8 +-- src/esx/esx_vi.c | 6 +- src/esx/esx_vi_types.c | 2 +- src/hyperv/hyperv_driver.c | 3 +- src/libxl/libxl_conf.c | 2 +- src/locking/lock_driver_sanlock.c | 25 ++++---- src/lxc/lxc_driver.c | 8 +-- src/nwfilter/nwfilter_dhcpsnoop.c | 2 +- src/nwfilter/nwfilter_ebiptables_driver.c | 6 +- src/nwfilter/nwfilter_learnipaddr.c | 2 +- src/openvz/openvz_conf.c | 8 +-- src/qemu/qemu_agent.c | 2 +- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_monitor.c | 2 +- src/remote/remote_daemon_dispatch.c | 4 +- src/remote/remote_driver.c | 4 +- src/rpc/virnetlibsshsession.c | 4 +- src/rpc/virnetsocket.c | 4 +- src/security/security_apparmor.c | 2 +- src/security/virt-aa-helper.c | 2 +- src/test/test_driver.c | 4 +- src/uml/uml_driver.c | 4 +- src/util/virfdstream.c | 4 +- src/util/virhostcpu.c | 4 +- src/util/virhostmem.c | 6 +- src/util/virlog.c | 5 +- src/util/virnetdev.c | 12 ++-- src/util/virnetdevbridge.c | 6 +- src/util/virnetdevtap.c | 4 +- src/util/virnetdevvportprofile.c | 6 +- src/util/virstring.c | 70 +++++++++++++++-------- src/util/virstring.h | 4 +- src/util/virtypedparam.c | 8 +-- src/xenapi/xenapi_driver.c | 4 +- src/xenconfig/xen_common.c | 38 ++++++------ src/xenconfig/xen_sxpr.c | 2 +- src/xenconfig/xen_xl.c | 41 ++++++------- src/xenconfig/xen_xm.c | 2 +- 42 files changed, 179 insertions(+), 179 deletions(-) -- 2.17.1

2 9

[libvirt] [PATCH] tests: fix TLS handshake failure with TLS 1.3
by Daniel P. Berrangé 23 Jul '18

23 Jul '18

When gnutls negotiates TLS 1.3 instead of 1.2, the order of messages sent by the handshake changes. This exposed a logic bug in the test suite which caused us to wait for the server to see handshake completion, but not wait for the client to see completion. The result was the client didn't receive the certificate for verification and the test failed. This is exposed in Fedora 29 rawhide which has just enabled TLS 1.3 in its GNUTLS builds. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- tests/virnettlssessiontest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/virnettlssessiontest.c b/tests/virnettlssessiontest.c index 7e85607181..375cc1bb02 100644 --- a/tests/virnettlssessiontest.c +++ b/tests/virnettlssessiontest.c @@ -180,7 +180,7 @@ static int testTLSSessionInit(const void *opaque) if (rv == VIR_NET_TLS_HANDSHAKE_COMPLETE) clientShake = true; } - } while (!clientShake && !serverShake); + } while (!clientShake || !serverShake); /* Finally make sure the server validation does what -- 2.17.1

2 1

[libvirt] [PATCHv4 00/15] Switch from yajl to Jansson
by Ján Tomko 23 Jul '18

23 Jul '18

Per the discussion here: https://www.redhat.com/archives/libvir-list/2017-November/msg00225.html Switch from using yajl to Jansson. v1: https://www.redhat.com/archives/libvir-list/2018-March/msg01781.html v2: https://www.redhat.com/archives/libvir-list/2018-May/msg00695.html v3: https://www.redhat.com/archives/libvir-list/2018-May/msg00850.html v4: Introduce a separate check for Jansson >= 2.8, which preserves ordering of object keys. For older platforms (e.g. Debian 8), skip tests that depend on stable ordering. All patches except for 12/15 (trivial) and 15/15 (new) were ACK'd already by either Peter or Andrea. Tested on Debian 8 with libjansson-dev 2.7. Also available on my repo: http://repo.or.cz/libvirt/jtomko.git/ jansson-skip Ján Tomko (15): build: add --with-jansson build: undef WITH_JANSSON for SETUID_RPC_CLIENT Switch from yajl to Jansson FIXUP: fix tests FIXUP: Deprecate building --with-yajl FIXUP: make nss depend on Jansson instead of yajl FIXUP: compile and link with Jansson instead of yajl FIXUP: s/WITH_YAJL/WITH_JANSSON/ FIXUP: libvirt.spec: use jansson instead of yajl Remove functions using yajl build: remove references to WITH_YAJL for SETUID_RPC_CLIENT Remove virJSONValueNewStringLen build: switch --with-qemu default from yes to check build: require Jansson if QEMU driver is enabled m4: Introduce STABLE_ORDERING_JANSSON config-post.h | 3 +- configure.ac | 3 + libvirt.spec.in | 4 +- m4/virt-driver-qemu.m4 | 9 +- m4/virt-jansson.m4 | 32 ++ m4/virt-nss.m4 | 4 +- m4/virt-yajl.m4 | 27 +- src/Makefile.am | 8 +- src/libvirt_private.syms | 1 - src/qemu/qemu_driver.c | 2 +- src/util/Makefile.inc.am | 4 +- src/util/virjson.c | 616 +++++++------------------------ src/util/virjson.h | 1 - tests/Makefile.am | 12 +- tests/cputest.c | 16 +- tests/libxlxml2domconfigtest.c | 4 +- tests/qemuagenttest.c | 2 +- tests/qemublocktest.c | 6 + tests/qemucapabilitiestest.c | 7 +- tests/qemucaps2xmltest.c | 2 +- tests/qemucommandutiltest.c | 7 +- tests/qemuhotplugtest.c | 7 +- tests/qemumigparamsdata/empty.json | 4 +- tests/qemumigparamsdata/unsupported.json | 4 +- tests/qemumigparamstest.c | 7 +- tests/qemumonitorjsontest.c | 7 +- tests/virjsontest.c | 5 + tests/virmacmaptest.c | 5 + tests/virmacmaptestdata/empty.json | 4 +- tests/virmocklibxl.c | 4 +- tests/virnetdaemontest.c | 7 +- tests/virstoragetest.c | 4 +- 32 files changed, 274 insertions(+), 554 deletions(-) create mode 100644 m4/virt-jansson.m4 -- 2.16.1

5 26

[libvirt] [PATCHv2] replace 'if' type conditions with 'switch' for VIR_NETWORK_FORWARD_
by Shi Lei 23 Jul '18

23 Jul '18

v1 patch here: https://www.redhat.com/archives/libvir-list/2018-July/msg01314.html since v1: 1. Change the type declaration of _virNetworkForwardDef.type from int to virNetworkForwardType 2. use the default case to report out of range error with virReportEnumRangeError Signed-off-by: Shi Lei <shilei.massclouds(a)gmx.com> --- src/conf/domain_conf.c | 49 ++++--- src/conf/network_conf.c | 73 +++++++--- src/conf/network_conf.h | 2 +- src/conf/virnetworkobj.c | 24 +++- src/esx/esx_network_driver.c | 19 ++- src/libvirt_private.syms | 1 + src/network/bridge_driver.c | 309 ++++++++++++++++++++++++++++--------------- src/qemu/qemu_process.c | 8 ++ 8 files changed, 329 insertions(+), 156 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 178c6d2..de08788 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -29975,40 +29975,49 @@ virDomainNetResolveActualType(virDomainNetDefPtr iface) if (!(def = virNetworkDefParseString(xml))) goto cleanup; - if ((def->forward.type == VIR_NETWORK_FORWARD_NONE) || - (def->forward.type == VIR_NETWORK_FORWARD_NAT) || - (def->forward.type == VIR_NETWORK_FORWARD_ROUTE) || - (def->forward.type == VIR_NETWORK_FORWARD_OPEN)) { + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: /* for these forward types, the actual net type really *is* * NETWORK; we just keep the info from the portgroup in * iface->data.network.actual */ ret = VIR_DOMAIN_NET_TYPE_NETWORK; + break; - } else if ((def->forward.type == VIR_NETWORK_FORWARD_BRIDGE) && - def->bridge) { - - /* <forward type='bridge'/> <bridge name='xxx'/> - * is VIR_DOMAIN_NET_TYPE_BRIDGE - */ - - ret = VIR_DOMAIN_NET_TYPE_BRIDGE; - - } else if (def->forward.type == VIR_NETWORK_FORWARD_HOSTDEV) { - + case VIR_NETWORK_FORWARD_HOSTDEV: ret = VIR_DOMAIN_NET_TYPE_HOSTDEV; + break; - } else if ((def->forward.type == VIR_NETWORK_FORWARD_BRIDGE) || - (def->forward.type == VIR_NETWORK_FORWARD_PRIVATE) || - (def->forward.type == VIR_NETWORK_FORWARD_VEPA) || - (def->forward.type == VIR_NETWORK_FORWARD_PASSTHROUGH)) { + case VIR_NETWORK_FORWARD_BRIDGE: + if (def->bridge) { + /* <forward type='bridge'/> <bridge name='xxx'/> + * is VIR_DOMAIN_NET_TYPE_BRIDGE + */ + ret = VIR_DOMAIN_NET_TYPE_BRIDGE; + break; + } + + /* intentionally fall through to the direct case for + * VIR_NETWORK_FORWARD_BRIDGE with no bridge device defined + */ + ATTRIBUTE_FALLTHROUGH; + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: /* <forward type='bridge|private|vepa|passthrough'> are all * VIR_DOMAIN_NET_TYPE_DIRECT. */ - ret = VIR_DOMAIN_NET_TYPE_DIRECT; + break; + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.type); + goto cleanup; } cleanup: diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 630a87f..526291c 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1955,21 +1955,40 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) goto error; } break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.type); + goto error; } VIR_FREE(stp); - if (def->mtu && - (def->forward.type != VIR_NETWORK_FORWARD_NONE && - def->forward.type != VIR_NETWORK_FORWARD_NAT && - def->forward.type != VIR_NETWORK_FORWARD_ROUTE && - def->forward.type != VIR_NETWORK_FORWARD_OPEN)) { - virReportError(VIR_ERR_XML_ERROR, - _("mtu size only allowed in open, route, nat, " - "and isolated mode, not in %s (network '%s')"), - virNetworkForwardTypeToString(def->forward.type), - def->name); - goto error; + if (def->mtu) { + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: + break; + + case VIR_NETWORK_FORWARD_BRIDGE: + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: + case VIR_NETWORK_FORWARD_HOSTDEV: + virReportError(VIR_ERR_XML_ERROR, + _("mtu size only allowed in open, route, nat, " + "and isolated mode, not in %s (network '%s')"), + virNetworkForwardTypeToString(def->forward.type), + def->name); + goto error; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.type); + goto error; + } } /* Extract custom metadata */ @@ -2349,6 +2368,7 @@ virNetworkDefFormatBuf(virBufferPtr buf, char uuidstr[VIR_UUID_STRING_BUFLEN]; size_t i; bool shortforward; + bool hasbridge = false; virBufferAddLit(buf, "<network"); if (!(flags & VIR_NETWORK_XML_INACTIVE) && (def->connections > 0)) @@ -2469,22 +2489,33 @@ virNetworkDefFormatBuf(virBufferPtr buf, virBufferAddLit(buf, "</forward>\n"); } + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: + hasbridge = true; + break; + + case VIR_NETWORK_FORWARD_BRIDGE: + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: + case VIR_NETWORK_FORWARD_HOSTDEV: + break; - if (def->forward.type == VIR_NETWORK_FORWARD_NONE || - def->forward.type == VIR_NETWORK_FORWARD_NAT || - def->forward.type == VIR_NETWORK_FORWARD_ROUTE || - def->forward.type == VIR_NETWORK_FORWARD_OPEN || - def->bridge || def->macTableManager) { + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.type); + goto error; + } + if (hasbridge || def->bridge || def->macTableManager) { virBufferAddLit(buf, "<bridge"); virBufferEscapeString(buf, " name='%s'", def->bridge); - if (def->forward.type == VIR_NETWORK_FORWARD_NONE || - def->forward.type == VIR_NETWORK_FORWARD_NAT || - def->forward.type == VIR_NETWORK_FORWARD_ROUTE || - def->forward.type == VIR_NETWORK_FORWARD_OPEN) { + if (hasbridge) virBufferAsprintf(buf, " stp='%s' delay='%ld'", def->stp ? "on" : "off", def->delay); - } if (def->macTableManager) { virBufferAsprintf(buf, " macTableManager='%s'", virNetworkBridgeMACTableManagerTypeToString(def->macTableManager)); diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index 54c8ed1..8fa8114 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -199,7 +199,7 @@ struct _virNetworkForwardPfDef { typedef struct _virNetworkForwardDef virNetworkForwardDef; typedef virNetworkForwardDef *virNetworkForwardDefPtr; struct _virNetworkForwardDef { - int type; /* One of virNetworkForwardType constants */ + virNetworkForwardType type; bool managed; /* managed attribute for hostdev mode */ int driverName; /* enum virNetworkForwardDriverNameType */ diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index e00c8a7..81b53e8 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -1009,19 +1009,31 @@ virNetworkLoadConfig(virNetworkObjListPtr nets, goto error; } - if (def->forward.type == VIR_NETWORK_FORWARD_NONE || - def->forward.type == VIR_NETWORK_FORWARD_NAT || - def->forward.type == VIR_NETWORK_FORWARD_ROUTE || - def->forward.type == VIR_NETWORK_FORWARD_OPEN) { - + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: if (!def->mac_specified) { virNetworkSetBridgeMacAddr(def); virNetworkSaveConfig(configDir, def); } - } else { + break; + + case VIR_NETWORK_FORWARD_BRIDGE: + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: + case VIR_NETWORK_FORWARD_HOSTDEV: /* Throw away MAC address for other forward types, * which could have been generated by older libvirt RPMs */ def->mac_specified = false; + break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.type); + goto error; } if (!(obj = virNetworkObjAssignDef(nets, def, 0))) diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c index 04118b4..4d1b3cd 100644 --- a/src/esx/esx_network_driver.c +++ b/src/esx/esx_network_driver.c @@ -326,12 +326,27 @@ esxNetworkDefineXML(virConnectPtr conn, const char *xml) } /* FIXME: Add support for NAT */ - if (def->forward.type != VIR_NETWORK_FORWARD_NONE && - def->forward.type != VIR_NETWORK_FORWARD_BRIDGE) { + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_BRIDGE: + break; + + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: + case VIR_NETWORK_FORWARD_HOSTDEV: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported forward mode '%s'"), virNetworkForwardTypeToString(def->forward.type)); goto cleanup; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.type); + goto cleanup; } /* Verify that specified HostPortGroups don't exist already */ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 1a4cf98..fc386e1 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2369,6 +2369,7 @@ virNetDevMacVLanCreate; virNetDevMacVLanCreateWithVPortProfile; virNetDevMacVLanDelete; virNetDevMacVLanDeleteWithVPortProfile; +virNetDevMacVLanModeTypeFromString; virNetDevMacVLanReleaseName; virNetDevMacVLanReserveName; virNetDevMacVLanRestartWithVPortProfile; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index da3c32e..a6c9111 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -485,6 +485,11 @@ networkUpdateState(virNetworkObjPtr obj, case VIR_NETWORK_FORWARD_HOSTDEV: /* so far no extra checks */ break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.type); + goto cleanup; } /* Try and read dnsmasq/radvd pids of active networks */ @@ -2088,20 +2093,37 @@ networkRefreshDaemonsHelper(virNetworkObjPtr obj, virObjectLock(obj); def = virNetworkObjGetDef(obj); - if (virNetworkObjIsActive(obj) && - ((def->forward.type == VIR_NETWORK_FORWARD_NONE) || - (def->forward.type == VIR_NETWORK_FORWARD_NAT) || - (def->forward.type == VIR_NETWORK_FORWARD_ROUTE) || - (def->forward.type == VIR_NETWORK_FORWARD_OPEN))) { - /* Only the three L3 network types that are configured by - * libvirt will have a dnsmasq or radvd daemon associated - * with them. Here we send a SIGHUP to an existing - * dnsmasq and/or radvd, or restart them if they've - * disappeared. - */ - networkRefreshDhcpDaemon(driver, obj); - networkRefreshRadvd(driver, obj); + if (virNetworkObjIsActive(obj)) { + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: + /* Only the three L3 network types that are configured by + * libvirt will have a dnsmasq or radvd daemon associated + * with them. Here we send a SIGHUP to an existing + * dnsmasq and/or radvd, or restart them if they've + * disappeared. + */ + networkRefreshDhcpDaemon(driver, obj); + networkRefreshRadvd(driver, obj); + break; + + case VIR_NETWORK_FORWARD_BRIDGE: + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: + case VIR_NETWORK_FORWARD_HOSTDEV: + break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.type); + goto cleanup; + } } + + cleanup: virObjectUnlock(obj); return 0; } @@ -2128,20 +2150,37 @@ networkReloadFirewallRulesHelper(virNetworkObjPtr obj, virObjectLock(obj); def = virNetworkObjGetDef(obj); - if (virNetworkObjIsActive(obj) && - ((def->forward.type == VIR_NETWORK_FORWARD_NONE) || - (def->forward.type == VIR_NETWORK_FORWARD_NAT) || - (def->forward.type == VIR_NETWORK_FORWARD_ROUTE))) { - /* Only three of the L3 network types that are configured by - * libvirt need to have iptables rules reloaded. The 4th L3 - * network type, forward='open', doesn't need this because it - * has no iptables rules. - */ - networkRemoveFirewallRules(def); - if (networkAddFirewallRules(def) < 0) { - /* failed to add but already logged */ + if (virNetworkObjIsActive(obj)) { + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + /* Only three of the L3 network types that are configured by + * libvirt need to have iptables rules reloaded. The 4th L3 + * network type, forward='open', doesn't need this because it + * has no iptables rules. + */ + networkRemoveFirewallRules(def); + /* No need to check return value since already logged internally */ + ignore_value(networkAddFirewallRules(def)); + break; + + case VIR_NETWORK_FORWARD_OPEN: + case VIR_NETWORK_FORWARD_BRIDGE: + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: + case VIR_NETWORK_FORWARD_HOSTDEV: + break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.type); + goto cleanup; } } + + cleanup: virObjectUnlock(obj); return 0; } @@ -2719,9 +2758,13 @@ networkCreateInterfacePool(virNetworkDefPtr netdef) case VIR_NETWORK_FORWARD_NAT: case VIR_NETWORK_FORWARD_ROUTE: case VIR_NETWORK_FORWARD_OPEN: - case VIR_NETWORK_FORWARD_LAST: /* by definition these will never be encountered here */ break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, netdef->forward.type); + goto cleanup; } } @@ -2840,6 +2883,11 @@ networkStartNetwork(virNetworkDriverStatePtr driver, if (networkStartNetworkExternal(obj) < 0) goto cleanup; break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.type); + goto cleanup; } /* finally we can call the 'started' hook script if any */ @@ -2919,6 +2967,11 @@ networkShutdownNetwork(virNetworkDriverStatePtr driver, case VIR_NETWORK_FORWARD_HOSTDEV: ret = networkShutdownNetworkExternal(obj); break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.type); + return -1; } /* now that we know it's stopped call the hook if present */ @@ -3273,11 +3326,11 @@ networkValidate(virNetworkDriverStatePtr driver, /* Only the three L3 network types that are configured by libvirt * need to have a bridge device name / mac address provided */ - if (def->forward.type == VIR_NETWORK_FORWARD_NONE || - def->forward.type == VIR_NETWORK_FORWARD_NAT || - def->forward.type == VIR_NETWORK_FORWARD_ROUTE || - def->forward.type == VIR_NETWORK_FORWARD_OPEN) { - + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: /* if no bridge name was given in the config, find a name * unused by any other libvirt networks and assign it. */ @@ -3285,7 +3338,13 @@ networkValidate(virNetworkDriverStatePtr driver, return -1; virNetworkSetBridgeMacAddr(def); - } else { + break; + + case VIR_NETWORK_FORWARD_BRIDGE: + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: + case VIR_NETWORK_FORWARD_HOSTDEV: /* They are also the only types that currently support setting * a MAC or IP address for the host-side device (bridge), DNS * configuration, or network-wide bandwidth limits. @@ -3331,6 +3390,12 @@ networkValidate(virNetworkDriverStatePtr driver, return -1; } bandwidthAllowed = false; + break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.type); + return -1; } /* we support configs with a single PF defined: @@ -3755,9 +3820,10 @@ networkUpdate(virNetworkPtr net, /* Take care of anything that must be done before updating the * live NetworkDef. */ - if (def->forward.type == VIR_NETWORK_FORWARD_NONE || - def->forward.type == VIR_NETWORK_FORWARD_NAT || - def->forward.type == VIR_NETWORK_FORWARD_ROUTE) { + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: switch (section) { case VIR_NETWORK_SECTION_FORWARD: case VIR_NETWORK_SECTION_FORWARD_INTERFACE: @@ -3768,14 +3834,26 @@ networkUpdate(virNetworkPtr net, * old rules (and remember to load new ones after the * update). */ - if (def->forward.type != VIR_NETWORK_FORWARD_OPEN) { - networkRemoveFirewallRules(def); - needFirewallRefresh = true; - } + networkRemoveFirewallRules(def); + needFirewallRefresh = true; break; default: break; } + break; + + case VIR_NETWORK_FORWARD_OPEN: + case VIR_NETWORK_FORWARD_BRIDGE: + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: + case VIR_NETWORK_FORWARD_HOSTDEV: + break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.type); + goto cleanup; } } @@ -4440,10 +4518,11 @@ networkAllocateActualDevice(virDomainDefPtr dom, iface->data.network.actual->trustGuestRxFilters = netdef->trustGuestRxFilters; - if ((netdef->forward.type == VIR_NETWORK_FORWARD_NONE) || - (netdef->forward.type == VIR_NETWORK_FORWARD_NAT) || - (netdef->forward.type == VIR_NETWORK_FORWARD_ROUTE) || - (netdef->forward.type == VIR_NETWORK_FORWARD_OPEN)) { + switch (netdef->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: /* for these forward types, the actual net type really *is* * NETWORK; we just keep the info from the portgroup in * iface->data.network.actual @@ -4463,46 +4542,9 @@ networkAllocateActualDevice(virDomainDefPtr dom, if (networkPlugBandwidth(obj, iface) < 0) goto error; + break; - } else if ((netdef->forward.type == VIR_NETWORK_FORWARD_BRIDGE) && - netdef->bridge) { - - /* <forward type='bridge'/> <bridge name='xxx'/> - * is VIR_DOMAIN_NET_TYPE_BRIDGE - */ - - iface->data.network.actual->type = actualType = VIR_DOMAIN_NET_TYPE_BRIDGE; - if (VIR_STRDUP(iface->data.network.actual->data.bridge.brname, - netdef->bridge) < 0) - goto error; - iface->data.network.actual->data.bridge.macTableManager - = netdef->macTableManager; - - /* merge virtualports from interface, network, and portgroup to - * arrive at actual virtualport to use - */ - if (virNetDevVPortProfileMerge3(&iface->data.network.actual->virtPortProfile, - iface->virtPortProfile, - netdef->virtPortProfile, - portgroup - ? portgroup->virtPortProfile : NULL) < 0) { - goto error; - } - virtport = iface->data.network.actual->virtPortProfile; - if (virtport) { - /* only type='openvswitch' is allowed for bridges */ - if (virtport->virtPortType != VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("<virtualport type='%s'> not supported for network " - "'%s' which uses a bridge device"), - virNetDevVPortTypeToString(virtport->virtPortType), - netdef->name); - goto error; - } - } - - } else if (netdef->forward.type == VIR_NETWORK_FORWARD_HOSTDEV) { - + case VIR_NETWORK_FORWARD_HOSTDEV: { virDomainHostdevSubsysPCIBackendType backend; iface->data.network.actual->type = actualType = VIR_DOMAIN_NET_TYPE_HOSTDEV; @@ -4575,32 +4617,67 @@ networkAllocateActualDevice(virDomainDefPtr dom, goto error; } } + break; + } - } else if ((netdef->forward.type == VIR_NETWORK_FORWARD_BRIDGE) || - (netdef->forward.type == VIR_NETWORK_FORWARD_PRIVATE) || - (netdef->forward.type == VIR_NETWORK_FORWARD_VEPA) || - (netdef->forward.type == VIR_NETWORK_FORWARD_PASSTHROUGH)) { + case VIR_NETWORK_FORWARD_BRIDGE: + if (netdef->bridge) { + /* <forward type='bridge'/> <bridge name='xxx'/> + * is VIR_DOMAIN_NET_TYPE_BRIDGE + */ + iface->data.network.actual->type = actualType = VIR_DOMAIN_NET_TYPE_BRIDGE; + if (VIR_STRDUP(iface->data.network.actual->data.bridge.brname, + netdef->bridge) < 0) + goto error; + iface->data.network.actual->data.bridge.macTableManager + = netdef->macTableManager; + + /* merge virtualports from interface, network, and portgroup to + * arrive at actual virtualport to use + */ + if (virNetDevVPortProfileMerge3(&iface->data.network.actual->virtPortProfile, + iface->virtPortProfile, + netdef->virtPortProfile, + portgroup + ? portgroup->virtPortProfile : NULL) < 0) { + goto error; + } + virtport = iface->data.network.actual->virtPortProfile; + if (virtport) { + /* only type='openvswitch' is allowed for bridges */ + if (virtport->virtPortType != VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("<virtualport type='%s'> not supported for network " + "'%s' which uses a bridge device"), + virNetDevVPortTypeToString(virtport->virtPortType), + netdef->name); + goto error; + } + } + break; + } + + /* intentionally fall through to the direct case for + * VIR_NETWORK_FORWARD_BRIDGE with no bridge device defined + */ + ATTRIBUTE_FALLTHROUGH; + + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: /* <forward type='bridge|private|vepa|passthrough'> are all * VIR_DOMAIN_NET_TYPE_DIRECT. */ /* Set type=direct and appropriate <source mode='xxx'/> */ iface->data.network.actual->type = actualType = VIR_DOMAIN_NET_TYPE_DIRECT; - switch (netdef->forward.type) { - case VIR_NETWORK_FORWARD_BRIDGE: - iface->data.network.actual->data.direct.mode = VIR_NETDEV_MACVLAN_MODE_BRIDGE; - break; - case VIR_NETWORK_FORWARD_PRIVATE: - iface->data.network.actual->data.direct.mode = VIR_NETDEV_MACVLAN_MODE_PRIVATE; - break; - case VIR_NETWORK_FORWARD_VEPA: - iface->data.network.actual->data.direct.mode = VIR_NETDEV_MACVLAN_MODE_VEPA; - break; - case VIR_NETWORK_FORWARD_PASSTHROUGH: - iface->data.network.actual->data.direct.mode = VIR_NETDEV_MACVLAN_MODE_PASSTHRU; - break; - } + + /* NO need to check the value returned from virNetDevMacVLanModeTypeFromString + * it must be valid for these forward type(bridge|private|vepa|passthrough) + */ + iface->data.network.actual->data.direct.mode = + virNetDevMacVLanModeTypeFromString(virNetworkForwardTypeToString(netdef->forward.type)); /* merge virtualports from interface, network, and portgroup to * arrive at actual virtualport to use @@ -4680,6 +4757,12 @@ networkAllocateActualDevice(virDomainDefPtr dom, dev->device.dev) < 0) goto error; } + break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, netdef->forward.type); + goto error; } if (virNetworkObjMacMgrAdd(obj, driver->dnsmasqStateDir, @@ -5037,13 +5120,27 @@ networkReleaseActualDevice(virDomainDefPtr dom, } netdef = virNetworkObjGetDef(obj); - if (iface->data.network.actual && - (netdef->forward.type == VIR_NETWORK_FORWARD_NONE || - netdef->forward.type == VIR_NETWORK_FORWARD_NAT || - netdef->forward.type == VIR_NETWORK_FORWARD_ROUTE || - netdef->forward.type == VIR_NETWORK_FORWARD_OPEN) && - networkUnplugBandwidth(obj, iface) < 0) + switch (netdef->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: + if (iface->data.network.actual && networkUnplugBandwidth(obj, iface) < 0) + goto error; + break; + + case VIR_NETWORK_FORWARD_BRIDGE: + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: + case VIR_NETWORK_FORWARD_HOSTDEV: + break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, netdef->forward.type); goto error; + } if ((!iface->data.network.actual) || ((actualType != VIR_DOMAIN_NET_TYPE_DIRECT) && diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index bba157b..1946a28 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4582,6 +4582,14 @@ qemuProcessGetNetworkAddress(const char *netname, goto cleanup; } break; + + case VIR_NETWORK_FORWARD_HOSTDEV: + break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, netdef->forward.type); + goto cleanup; } if (dev_name) { -- 2.7.4

2 2

[libvirt] [PATCH v2 0/6] Fixes for segfault and deadlock
by Marc Hartmayer 21 Jul '18

21 Jul '18

One way to reproduce the bugs is to set admin_max_workers=0 in libvirtd.conf, restart libvirtd, and then call: $ virt-admin server-threadpool-info admin Changelog: v1->v2: - Worked in Daniel Berrangé's comments that: 1. max_workers=0 should not be allowed for the libvirtd (patch 3) 2. it shouldn't be allowed to switch between zero and non-zero max_workers (patch 4) - Changed the deadlock fix (patch 1) - Added two small fixes (patch 5 and 6) Marc Hartmayer (6): rpc: Fix deadlock if there is no worker pool available rpc: Initialize a worker pool for max_workers=0 as well virThreadPool: Prevent switching between zero and non-zero maxWorkers daemon: Raise an error if 'max_workers' < 1 in libvirtd.conf virt-admin: Fix two error messages rpc: Fix name of include guard src/libvirt_private.syms | 4 ++ src/remote/remote_daemon_config.c | 5 +++ src/rpc/virnetserver.c | 28 ++++++++------ src/rpc/virnetserverprogram.h | 4 +- src/util/virthreadpool.c | 81 ++++++++++++++++++++++++++++++--------- src/util/virthreadpool.h | 8 ++++ tools/virt-admin.c | 5 ++- 7 files changed, 101 insertions(+), 34 deletions(-) -- 2.13.4

2 17

[libvirt] [PATCH 00/10] qemu: hotplug: Refactor for -blockdev support (blockdev-add saga)
by Peter Krempa 21 Jul '18

21 Jul '18

A bunch of refactors which could be separated from my blockdev add branch. The patches modify the disk hotplug/unplug and media change code so that we can easily add support for -blockdev later on. Peter Krempa (10): qemu: hotplug: Reuse qemuHotplugPrepareDiskAccess in qemuDomainRemoveDiskDevice qemu: hotplug: Remove pointless variable qemu: hotplug: Don't format NULL in %s in qemuHotplugPrepareDiskAccess qemu: hotplug: Prepare for multiple backing chain member hotplug qemu: hotplug: Don't leak 'disk' if VM crashes during unplug finishing qemu: hotplug: Reuse qemuHotplugDiskSourceRemove for disk backend removal qemu: hotplug: Simplify removal of managed PR infrastructure on unplug qemu: hotplug: Refactor/simplify PR managed addition to VM qemu: hotplug: Extract legacy disk media changing bits qemu: hotplug: Make qemuHotplugWaitForTrayEject reusable src/qemu/qemu_hotplug.c | 508 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 358 insertions(+), 150 deletions(-) -- 2.16.2

3 24

[libvirt] [PATCH] src: Fix memory leak in virNWFilterBindingDispose
by John Ferlan 20 Jul '18

20 Jul '18

https://bugzilla.redhat.com/show_bug.cgi?id=1603025 Commit b57a9aec neglected to VIR_FREE(binding->filtername) as seen in the following valgrind report ==6423== 17,328 bytes in 1,083 blocks are definitely lost in loss record 2,275 of 2,297 ==6423== at 0x4C29BC3: malloc (vg_replace_malloc.c:299) ==6423== by 0x83B20C9: strdup (in /usr/lib64/libc-2.17.so) ==6423== by 0x533C144: virStrdup (virstring.c:977) ==6423== by 0x54BDD53: virGetNWFilterBinding (datatypes.c:865) ==6423== by 0x318D633C: nwfilterBindingCreateXML (nwfilter_driver.c:767) ==6423== by 0x54F3FC5: virNWFilterBindingCreateXML (libvirt-nwfilter.c:701) ==6423== by 0x539CE29: virDomainConfNWFilterInstantiate (domain_nwfilter.c:116) ==6423== by 0x31E516C2: qemuInterfaceBridgeConnect (qemu_interface.c:589) ==6423== by 0x31D98B56: qemuBuildInterfaceCommandLine (qemu_command.c:8418) ==6423== by 0x31D9F783: qemuBuildNetCommandLine (qemu_command.c:8673) ==6423== by 0x31D9F783: qemuBuildCommandLine (qemu_command.c:10354) ==6423== by 0x31DE355F: qemuProcessLaunch (qemu_process.c:6292) ==6423== by 0x31DE7881: qemuProcessStart (qemu_process.c:6686) and ==6423== 17,328 bytes in 1,083 blocks are definitely lost in loss record 2,276 of 2,297 ==6423== at 0x4C29BC3: malloc (vg_replace_malloc.c:299) ==6423== by 0x83B20C9: strdup (in /usr/lib64/libc-2.17.so) ==6423== by 0x533C144: virStrdup (virstring.c:977) ==6423== by 0x54BDD53: virGetNWFilterBinding (datatypes.c:865) ==6423== by 0x318D641F: nwfilterBindingLookupByPortDev (nwfilter_driver.c:678) ==6423== by 0x54F3B63: virNWFilterBindingLookupByPortDev (libvirt-nwfilter.c:593) ==6423== by 0x539CBC5: virDomainConfNWFilterTeardownImpl.isra.0 (domain_nwfilter.c:136) ==6423== by 0x539CFA5: virDomainConfVMNWFilterTeardown (domain_nwfilter.c:170) ==6423== by 0x31DE5651: qemuProcessStop (qemu_process.c:6912) ==6423== by 0x31E37974: qemuDomainDestroyFlags (qemu_driver.c:2229) ==6423== by 0x54C24BB: virDomainDestroy (libvirt-domain.c:475) ==6423== by 0x1589A2: remoteDispatchDomainDestroy (remote_daemon_dispatch_stubs.h:4827) ==6423== by 0x1589A2: remoteDispatchDomainDestroyHelper (remote_daemon_dispatch_stubs.h:4803) Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/datatypes.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/datatypes.c b/src/datatypes.c index 878a1c5b5f..caf035f178 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -893,6 +893,7 @@ virNWFilterBindingDispose(void *obj) VIR_DEBUG("release binding %p %s", binding, binding->portdev); VIR_FREE(binding->portdev); + VIR_FREE(binding->filtername); virObjectUnref(binding->conn); } -- 2.17.1

2 1

[libvirt] [PATCH 0/2] rpm: modernize the spec file for RHEL
by Daniel P. Berrangé 20 Jul '18

20 Jul '18

Drop conditionals for RHEL-6 and assume systemd is present Daniel P. Berrangé (2): rpm: increase min required RHEL to 7 rpm: remove conditionals for systemd libvirt.spec.in | 246 ++++-------------------------------------------- 1 file changed, 20 insertions(+), 226 deletions(-) -- 2.17.1

3 4

[libvirt] [PATCH 0/9] qemu: stats/misc refactors (blockdev-add saga)
by Peter Krempa 20 Jul '18

20 Jul '18

Last lot of refactors which could be split of prior to starting it for real. Peter Krempa (9): qemu: driver: Reuse qemuDomainBlocksStatsGather in qemuDomainGetBlockInfo qemu: domain: Move out clearing of backing chain in qemuDomainDetermineDiskChain qemu: domain: Add helper for getting the disk backend alias qemu: command: use qemuDomainDiskGetBackendAlias in commandline building qemu: monitor: Add the 'query-nodes' argument for query-blockstats qemu: json: Extract gathering of block statistics qemu: monitor: Split out code to gather data from 'query-block' utils: storage: Add helper for checking if storage source is the same qemu: Replace qemuDomainDiskSourceDiffers by virStorageSourceIsSameLocation src/libvirt_private.syms | 1 + src/qemu/qemu_block.c | 2 +- src/qemu/qemu_blockjob.c | 4 +- src/qemu/qemu_command.c | 24 ++++++---- src/qemu/qemu_domain.c | 66 ++++++++++++--------------- src/qemu/qemu_domain.h | 10 +++-- src/qemu/qemu_driver.c | 47 +++++++------------- src/qemu/qemu_hotplug.c | 2 +- src/qemu/qemu_monitor.c | 8 +++- src/qemu/qemu_monitor.h | 3 +- src/qemu/qemu_monitor_json.c | 103 ++++++++++++++++++++++++++++--------------- src/qemu/qemu_monitor_json.h | 3 +- src/qemu/qemu_process.c | 7 ++- src/util/virstoragefile.c | 43 ++++++++++++++++++ src/util/virstoragefile.h | 3 ++ 15 files changed, 198 insertions(+), 128 deletions(-) -- 2.16.2

2 18

[libvirt] [PATCH] utils: storage: Add copying of PR definition to virStorageSource
by Peter Krempa 20 Jul '18

20 Jul '18

Despite the warning that virStorageSourceCopy needs to be populated on additions to the structure commit 687730540e4 neglected to implement the copy function. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/util/virstoragefile.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 58f67278da..b6a2b415e9 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -2041,6 +2041,29 @@ virStorageSourceChainHasManagedPR(virStorageSourcePtr src) } +static virStoragePRDefPtr +virStoragePRDefCopy(virStoragePRDefPtr src) +{ + virStoragePRDefPtr copy = NULL; + virStoragePRDefPtr ret = NULL; + + if (VIR_ALLOC(copy) < 0) + return NULL; + + copy->managed = src->managed; + + if (VIR_STRDUP(copy->path, src->path) < 0 || + VIR_STRDUP(copy->mgralias, src->mgralias) < 0) + goto cleanup; + + VIR_STEAL_PTR(ret, copy); + + cleanup: + virStoragePRDefFree(copy); + return ret; +} + + virSecurityDeviceLabelDefPtr virStorageSourceGetSecurityLabelDef(virStorageSourcePtr src, const char *model) @@ -2245,6 +2268,10 @@ virStorageSourceCopy(const virStorageSource *src, !(ret->auth = virStorageAuthDefCopy(src->auth))) goto error; + if (src->pr && + !(ret->pr = virStoragePRDefCopy(src->pr))) + goto error; + if (backingChain && src->backingStore) { if (!(ret->backingStore = virStorageSourceCopy(src->backingStore, true))) -- 2.16.2

2 1

[libvirt] [PATCH] replace 'if' type conditions with 'switch' for VIR_NETWORK_FORWARD_*
by Shi Lei 20 Jul '18

20 Jul '18

Hi, everyone! For VIR_NETWORK_FORWARD_*, I try to replace 'if' type conditions with typed 'switch()'. It might be more clear. Signed-off-by: Shi Lei <shilei.massclouds(a)gmx.com> --- src/conf/domain_conf.c | 46 +++++----- src/conf/network_conf.c | 49 ++++++----- src/conf/virnetworkobj.c | 15 ++-- src/esx/esx_network_driver.c | 8 +- src/network/bridge_driver.c | 203 +++++++++++++++++++++++-------------------- 5 files changed, 178 insertions(+), 143 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 178c6d2..c02543f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -29975,40 +29975,44 @@ virDomainNetResolveActualType(virDomainNetDefPtr iface) if (!(def = virNetworkDefParseString(xml))) goto cleanup; - if ((def->forward.type == VIR_NETWORK_FORWARD_NONE) || - (def->forward.type == VIR_NETWORK_FORWARD_NAT) || - (def->forward.type == VIR_NETWORK_FORWARD_ROUTE) || - (def->forward.type == VIR_NETWORK_FORWARD_OPEN)) { + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: /* for these forward types, the actual net type really *is* * NETWORK; we just keep the info from the portgroup in * iface->data.network.actual */ ret = VIR_DOMAIN_NET_TYPE_NETWORK; + break; - } else if ((def->forward.type == VIR_NETWORK_FORWARD_BRIDGE) && - def->bridge) { - - /* <forward type='bridge'/> <bridge name='xxx'/> - * is VIR_DOMAIN_NET_TYPE_BRIDGE - */ - - ret = VIR_DOMAIN_NET_TYPE_BRIDGE; - - } else if (def->forward.type == VIR_NETWORK_FORWARD_HOSTDEV) { - + case VIR_NETWORK_FORWARD_HOSTDEV: ret = VIR_DOMAIN_NET_TYPE_HOSTDEV; + break; + + case VIR_NETWORK_FORWARD_BRIDGE: + if (def->bridge) { + /* <forward type='bridge'/> <bridge name='xxx'/> + * is VIR_DOMAIN_NET_TYPE_BRIDGE + */ + ret = VIR_DOMAIN_NET_TYPE_BRIDGE; + break; + } - } else if ((def->forward.type == VIR_NETWORK_FORWARD_BRIDGE) || - (def->forward.type == VIR_NETWORK_FORWARD_PRIVATE) || - (def->forward.type == VIR_NETWORK_FORWARD_VEPA) || - (def->forward.type == VIR_NETWORK_FORWARD_PASSTHROUGH)) { + /* intentionally fall through to the direct case for + * VIR_NETWORK_FORWARD_BRIDGE with no bridge device defined + */ + ATTRIBUTE_FALLTHROUGH; + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: /* <forward type='bridge|private|vepa|passthrough'> are all * VIR_DOMAIN_NET_TYPE_DIRECT. */ - ret = VIR_DOMAIN_NET_TYPE_DIRECT; - + break; } cleanup: diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 630a87f..bafc1d3 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1959,17 +1959,22 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) VIR_FREE(stp); - if (def->mtu && - (def->forward.type != VIR_NETWORK_FORWARD_NONE && - def->forward.type != VIR_NETWORK_FORWARD_NAT && - def->forward.type != VIR_NETWORK_FORWARD_ROUTE && - def->forward.type != VIR_NETWORK_FORWARD_OPEN)) { - virReportError(VIR_ERR_XML_ERROR, - _("mtu size only allowed in open, route, nat, " - "and isolated mode, not in %s (network '%s')"), - virNetworkForwardTypeToString(def->forward.type), - def->name); - goto error; + if (def->mtu) { + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: + break; + + default: + virReportError(VIR_ERR_XML_ERROR, + _("mtu size only allowed in open, route, nat, " + "and isolated mode, not in %s (network '%s')"), + virNetworkForwardTypeToString(def->forward.type), + def->name); + goto error; + } } /* Extract custom metadata */ @@ -2349,6 +2354,7 @@ virNetworkDefFormatBuf(virBufferPtr buf, char uuidstr[VIR_UUID_STRING_BUFLEN]; size_t i; bool shortforward; + bool hasbridge = false; virBufferAddLit(buf, "<network"); if (!(flags & VIR_NETWORK_XML_INACTIVE) && (def->connections > 0)) @@ -2469,22 +2475,21 @@ virNetworkDefFormatBuf(virBufferPtr buf, virBufferAddLit(buf, "</forward>\n"); } + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: + hasbridge = true; + break; + } - if (def->forward.type == VIR_NETWORK_FORWARD_NONE || - def->forward.type == VIR_NETWORK_FORWARD_NAT || - def->forward.type == VIR_NETWORK_FORWARD_ROUTE || - def->forward.type == VIR_NETWORK_FORWARD_OPEN || - def->bridge || def->macTableManager) { - + if (hasbridge || def->bridge || def->macTableManager) { virBufferAddLit(buf, "<bridge"); virBufferEscapeString(buf, " name='%s'", def->bridge); - if (def->forward.type == VIR_NETWORK_FORWARD_NONE || - def->forward.type == VIR_NETWORK_FORWARD_NAT || - def->forward.type == VIR_NETWORK_FORWARD_ROUTE || - def->forward.type == VIR_NETWORK_FORWARD_OPEN) { + if (hasbridge) virBufferAsprintf(buf, " stp='%s' delay='%ld'", def->stp ? "on" : "off", def->delay); - } if (def->macTableManager) { virBufferAsprintf(buf, " macTableManager='%s'", virNetworkBridgeMACTableManagerTypeToString(def->macTableManager)); diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index e00c8a7..7706817 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -1009,19 +1009,22 @@ virNetworkLoadConfig(virNetworkObjListPtr nets, goto error; } - if (def->forward.type == VIR_NETWORK_FORWARD_NONE || - def->forward.type == VIR_NETWORK_FORWARD_NAT || - def->forward.type == VIR_NETWORK_FORWARD_ROUTE || - def->forward.type == VIR_NETWORK_FORWARD_OPEN) { - + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: if (!def->mac_specified) { virNetworkSetBridgeMacAddr(def); virNetworkSaveConfig(configDir, def); } - } else { + break; + + default: /* Throw away MAC address for other forward types, * which could have been generated by older libvirt RPMs */ def->mac_specified = false; + break; } if (!(obj = virNetworkObjAssignDef(nets, def, 0))) diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c index 04118b4..8ea1079 100644 --- a/src/esx/esx_network_driver.c +++ b/src/esx/esx_network_driver.c @@ -326,8 +326,12 @@ esxNetworkDefineXML(virConnectPtr conn, const char *xml) } /* FIXME: Add support for NAT */ - if (def->forward.type != VIR_NETWORK_FORWARD_NONE && - def->forward.type != VIR_NETWORK_FORWARD_BRIDGE) { + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_BRIDGE: + break; + + default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported forward mode '%s'"), virNetworkForwardTypeToString(def->forward.type)); diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index da3c32e..5e885b5 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -2088,19 +2088,22 @@ networkRefreshDaemonsHelper(virNetworkObjPtr obj, virObjectLock(obj); def = virNetworkObjGetDef(obj); - if (virNetworkObjIsActive(obj) && - ((def->forward.type == VIR_NETWORK_FORWARD_NONE) || - (def->forward.type == VIR_NETWORK_FORWARD_NAT) || - (def->forward.type == VIR_NETWORK_FORWARD_ROUTE) || - (def->forward.type == VIR_NETWORK_FORWARD_OPEN))) { - /* Only the three L3 network types that are configured by - * libvirt will have a dnsmasq or radvd daemon associated - * with them. Here we send a SIGHUP to an existing - * dnsmasq and/or radvd, or restart them if they've - * disappeared. - */ - networkRefreshDhcpDaemon(driver, obj); - networkRefreshRadvd(driver, obj); + if (virNetworkObjIsActive(obj)) { + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: + /* Only the three L3 network types that are configured by + * libvirt will have a dnsmasq or radvd daemon associated + * with them. Here we send a SIGHUP to an existing + * dnsmasq and/or radvd, or restart them if they've + * disappeared. + */ + networkRefreshDhcpDaemon(driver, obj); + networkRefreshRadvd(driver, obj); + break; + } } virObjectUnlock(obj); return 0; @@ -2128,18 +2131,21 @@ networkReloadFirewallRulesHelper(virNetworkObjPtr obj, virObjectLock(obj); def = virNetworkObjGetDef(obj); - if (virNetworkObjIsActive(obj) && - ((def->forward.type == VIR_NETWORK_FORWARD_NONE) || - (def->forward.type == VIR_NETWORK_FORWARD_NAT) || - (def->forward.type == VIR_NETWORK_FORWARD_ROUTE))) { - /* Only three of the L3 network types that are configured by - * libvirt need to have iptables rules reloaded. The 4th L3 - * network type, forward='open', doesn't need this because it - * has no iptables rules. - */ - networkRemoveFirewallRules(def); - if (networkAddFirewallRules(def) < 0) { - /* failed to add but already logged */ + if (virNetworkObjIsActive(obj)) { + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + /* Only three of the L3 network types that are configured by + * libvirt need to have iptables rules reloaded. The 4th L3 + * network type, forward='open', doesn't need this because it + * has no iptables rules. + */ + networkRemoveFirewallRules(def); + if (networkAddFirewallRules(def) < 0) { + /* failed to add but already logged */ + } + break; } } virObjectUnlock(obj); @@ -3273,11 +3279,11 @@ networkValidate(virNetworkDriverStatePtr driver, /* Only the three L3 network types that are configured by libvirt * need to have a bridge device name / mac address provided */ - if (def->forward.type == VIR_NETWORK_FORWARD_NONE || - def->forward.type == VIR_NETWORK_FORWARD_NAT || - def->forward.type == VIR_NETWORK_FORWARD_ROUTE || - def->forward.type == VIR_NETWORK_FORWARD_OPEN) { - + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: /* if no bridge name was given in the config, find a name * unused by any other libvirt networks and assign it. */ @@ -3285,7 +3291,9 @@ networkValidate(virNetworkDriverStatePtr driver, return -1; virNetworkSetBridgeMacAddr(def); - } else { + break; + + default: /* They are also the only types that currently support setting * a MAC or IP address for the host-side device (bridge), DNS * configuration, or network-wide bandwidth limits. @@ -3331,6 +3339,7 @@ networkValidate(virNetworkDriverStatePtr driver, return -1; } bandwidthAllowed = false; + break; } /* we support configs with a single PF defined: @@ -3755,9 +3764,10 @@ networkUpdate(virNetworkPtr net, /* Take care of anything that must be done before updating the * live NetworkDef. */ - if (def->forward.type == VIR_NETWORK_FORWARD_NONE || - def->forward.type == VIR_NETWORK_FORWARD_NAT || - def->forward.type == VIR_NETWORK_FORWARD_ROUTE) { + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: switch (section) { case VIR_NETWORK_SECTION_FORWARD: case VIR_NETWORK_SECTION_FORWARD_INTERFACE: @@ -3768,14 +3778,13 @@ networkUpdate(virNetworkPtr net, * old rules (and remember to load new ones after the * update). */ - if (def->forward.type != VIR_NETWORK_FORWARD_OPEN) { - networkRemoveFirewallRules(def); - needFirewallRefresh = true; - } + networkRemoveFirewallRules(def); + needFirewallRefresh = true; break; default: break; } + break; } } @@ -4440,10 +4449,11 @@ networkAllocateActualDevice(virDomainDefPtr dom, iface->data.network.actual->trustGuestRxFilters = netdef->trustGuestRxFilters; - if ((netdef->forward.type == VIR_NETWORK_FORWARD_NONE) || - (netdef->forward.type == VIR_NETWORK_FORWARD_NAT) || - (netdef->forward.type == VIR_NETWORK_FORWARD_ROUTE) || - (netdef->forward.type == VIR_NETWORK_FORWARD_OPEN)) { + switch (netdef->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: /* for these forward types, the actual net type really *is* * NETWORK; we just keep the info from the portgroup in * iface->data.network.actual @@ -4463,46 +4473,9 @@ networkAllocateActualDevice(virDomainDefPtr dom, if (networkPlugBandwidth(obj, iface) < 0) goto error; + break; - } else if ((netdef->forward.type == VIR_NETWORK_FORWARD_BRIDGE) && - netdef->bridge) { - - /* <forward type='bridge'/> <bridge name='xxx'/> - * is VIR_DOMAIN_NET_TYPE_BRIDGE - */ - - iface->data.network.actual->type = actualType = VIR_DOMAIN_NET_TYPE_BRIDGE; - if (VIR_STRDUP(iface->data.network.actual->data.bridge.brname, - netdef->bridge) < 0) - goto error; - iface->data.network.actual->data.bridge.macTableManager - = netdef->macTableManager; - - /* merge virtualports from interface, network, and portgroup to - * arrive at actual virtualport to use - */ - if (virNetDevVPortProfileMerge3(&iface->data.network.actual->virtPortProfile, - iface->virtPortProfile, - netdef->virtPortProfile, - portgroup - ? portgroup->virtPortProfile : NULL) < 0) { - goto error; - } - virtport = iface->data.network.actual->virtPortProfile; - if (virtport) { - /* only type='openvswitch' is allowed for bridges */ - if (virtport->virtPortType != VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("<virtualport type='%s'> not supported for network " - "'%s' which uses a bridge device"), - virNetDevVPortTypeToString(virtport->virtPortType), - netdef->name); - goto error; - } - } - - } else if (netdef->forward.type == VIR_NETWORK_FORWARD_HOSTDEV) { - + case VIR_NETWORK_FORWARD_HOSTDEV: { virDomainHostdevSubsysPCIBackendType backend; iface->data.network.actual->type = actualType = VIR_DOMAIN_NET_TYPE_HOSTDEV; @@ -4575,12 +4548,55 @@ networkAllocateActualDevice(virDomainDefPtr dom, goto error; } } + break; + } + + case VIR_NETWORK_FORWARD_BRIDGE: + if (netdef->bridge) { + /* <forward type='bridge'/> <bridge name='xxx'/> + * is VIR_DOMAIN_NET_TYPE_BRIDGE + */ + + iface->data.network.actual->type = actualType = VIR_DOMAIN_NET_TYPE_BRIDGE; + if (VIR_STRDUP(iface->data.network.actual->data.bridge.brname, + netdef->bridge) < 0) + goto error; + iface->data.network.actual->data.bridge.macTableManager + = netdef->macTableManager; + + /* merge virtualports from interface, network, and portgroup to + * arrive at actual virtualport to use + */ + if (virNetDevVPortProfileMerge3(&iface->data.network.actual->virtPortProfile, + iface->virtPortProfile, + netdef->virtPortProfile, + portgroup + ? portgroup->virtPortProfile : NULL) < 0) { + goto error; + } + virtport = iface->data.network.actual->virtPortProfile; + if (virtport) { + /* only type='openvswitch' is allowed for bridges */ + if (virtport->virtPortType != VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("<virtualport type='%s'> not supported for network " + "'%s' which uses a bridge device"), + virNetDevVPortTypeToString(virtport->virtPortType), + netdef->name); + goto error; + } + } + break; + } - } else if ((netdef->forward.type == VIR_NETWORK_FORWARD_BRIDGE) || - (netdef->forward.type == VIR_NETWORK_FORWARD_PRIVATE) || - (netdef->forward.type == VIR_NETWORK_FORWARD_VEPA) || - (netdef->forward.type == VIR_NETWORK_FORWARD_PASSTHROUGH)) { + /* intentionally fall through to the direct case for + * VIR_NETWORK_FORWARD_BRIDGE with no bridge device defined + */ + ATTRIBUTE_FALLTHROUGH; + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: /* <forward type='bridge|private|vepa|passthrough'> are all * VIR_DOMAIN_NET_TYPE_DIRECT. */ @@ -4680,6 +4696,7 @@ networkAllocateActualDevice(virDomainDefPtr dom, dev->device.dev) < 0) goto error; } + break; } if (virNetworkObjMacMgrAdd(obj, driver->dnsmasqStateDir, @@ -5037,13 +5054,15 @@ networkReleaseActualDevice(virDomainDefPtr dom, } netdef = virNetworkObjGetDef(obj); - if (iface->data.network.actual && - (netdef->forward.type == VIR_NETWORK_FORWARD_NONE || - netdef->forward.type == VIR_NETWORK_FORWARD_NAT || - netdef->forward.type == VIR_NETWORK_FORWARD_ROUTE || - netdef->forward.type == VIR_NETWORK_FORWARD_OPEN) && - networkUnplugBandwidth(obj, iface) < 0) - goto error; + switch (netdef->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: + if (iface->data.network.actual && networkUnplugBandwidth(obj, iface) < 0) + goto error; + break; + } if ((!iface->data.network.actual) || ((actualType != VIR_DOMAIN_NET_TYPE_DIRECT) && -- 2.7.4

2 2

[libvirt] [PATCH] tools: Fix typo generating adapter_wwpn field
by John Ferlan 20 Jul '18

20 Jul '18

https://bugzilla.redhat.com/show_bug.cgi?id=1601377 Fix typo from commit id d45bee449 for the parent_wwpn field resulting in parent_wwnn being printed twice. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- tools/virsh-pool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c index cc49a5b96d..6faff781b2 100644 --- a/tools/virsh-pool.c +++ b/tools/virsh-pool.c @@ -371,7 +371,7 @@ virshBuildPoolXML(vshControl *ctl, if (adapterParent) virBufferAsprintf(&buf, " parent='%s'", adapterParent); else if (adapterParentWwnn && adapterParentWwpn) - virBufferAsprintf(&buf, " parent_wwnn='%s' parent_wwnn='%s'", + virBufferAsprintf(&buf, " parent_wwnn='%s' parent_wwpn='%s'", adapterParentWwnn, adapterParentWwpn); else if (adapterParentFabricWwn) virBufferAsprintf(&buf, " parent_fabric_wwn='%s'", -- 2.17.1

2 1

[libvirt] [PATCH v2] util: set OOM in virCopyLastError if error is not set
by Nikolay Shirokovskiy 20 Jul '18

20 Jul '18

virCopyLastError is intended to be used after last error is set. However due to virLastErrorObject failures (very unlikely through as thread local error is allocated on first use) we can have zero fields in a copy as a result. In particular code field can be set to VIR_ERR_OK. In some places (qemu monitor, qemu agent and qemu migaration code for example) we use copy result as a flag and this leads to bugs. Let's set OOM-like error in copy in case of virLastErrorObject failures. Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com> --- Changes from v1: - check @to - set OMM error instead of using virErrorGenericFailure src/util/virerror.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/util/virerror.c b/src/util/virerror.c index f198f27..737ea92 100644 --- a/src/util/virerror.c +++ b/src/util/virerror.c @@ -366,19 +366,25 @@ virSetError(virErrorPtr newerr) * * One will need to free the result with virResetError() * - * Returns 0 if no error was found and the error code otherwise and -1 in case - * of parameter error. + * Returns error code or -1 in case of parameter error. */ int virCopyLastError(virErrorPtr to) { virErrorPtr err = virLastErrorObject(); + + if (!to) + return -1; + /* We can't guarantee caller has initialized it to zero */ memset(to, 0, sizeof(*to)); - if (err) + if (err) { virCopyError(err, to); - else - virResetError(to); + } else { + to->code = VIR_ERR_NO_MEMORY; + to->domain = VIR_FROM_NONE; + to->level = VIR_ERR_ERROR; + } return to->code; } -- 1.8.3.1

2 6

[libvirt] [PATCH] build: Fix accidental revert of .gnulib update
by John Ferlan 19 Jul '18

19 Jul '18

Commit id 1bff5bbe25eb7a7e7a4e0067c4ca7cbc1cb34999 accidentally reverted .gnulib back to d6397dde2e127e246e3eeb5254a21f42cac783c8 which was two updates ago. Update to the latest 68df637b5f1b5c10370f6981d2a43a5cf74368df which includes three changes since the previous fetch of cdbf3d385a32ff904c96f20c26f3470bd8345248. > autoupdate > hard-locale: simplify by removing hard-locale.m4 > gnulib-tool: limit line length for git send-email Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Pushing under this I know fixes some previous build breaking issue and of course it's a .gnulib maint, so that's reason #2. .gnulib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gnulib b/.gnulib index d6397dde2e..68df637b5f 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit d6397dde2e127e246e3eeb5254a21f42cac783c8 +Subproject commit 68df637b5f1b5c10370f6981d2a43a5cf74368df -- 2.17.1

1 0

[libvirt] [PATCH] virt-xml-validate: Add schema for nwfilterbinding
by Han Han 19 Jul '18

19 Jul '18

Add nwfilterbinding schema in virt-xml-validate for autoprobing. Add document of nwfilterbinding schema in tools/virt-xml-validate.pod. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1600330 Signed-off-by: Han Han <hhan(a)redhat.com> --- tools/virt-xml-validate.in | 3 +++ tools/virt-xml-validate.pod | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/tools/virt-xml-validate.in b/tools/virt-xml-validate.in index 81fde4d832..7513413189 100644 --- a/tools/virt-xml-validate.in +++ b/tools/virt-xml-validate.in @@ -77,6 +77,9 @@ if [ -z "$TYPE" ]; then *device*) TYPE="nodedev" ;; + *filterbinding*) + TYPE="nwfilterbinding" + ;; *filter*) TYPE="nwfilter" ;; diff --git a/tools/virt-xml-validate.pod b/tools/virt-xml-validate.pod index f8e67503fd..a51a57002a 100644 --- a/tools/virt-xml-validate.pod +++ b/tools/virt-xml-validate.pod @@ -52,6 +52,10 @@ The schema for the XML format used to declare driver capabilities The schema for the XML format used by network traffic filters +=item C<nwfilterbinding> + +The schema for XML format used by network filter bindings. + =item C<secret> The schema for the XML format used by secrets descriptions -- 2.17.1

2 1

[libvirt] [java PATCH 0/1] *** Add support for sendng Qemu Guest Agent Commands ***
by Wido den Hollander 19 Jul '18

19 Jul '18

*** BLURB HERE *** Wido den Hollander (1): Add support for Qemu Guest Agent commands src/main/java/org/libvirt/Domain.java | 34 ++++++ src/main/java/org/libvirt/Library.java | 3 + .../java/org/libvirt/jna/LibvirtQemu.java | 16 +++ .../java/org/libvirt/qemu/QemuCommand.java | 106 ++++++++++++++++++ .../org/libvirt/qemu/TestQemuCommand.java | 24 ++++ 5 files changed, 183 insertions(+) create mode 100644 src/main/java/org/libvirt/jna/LibvirtQemu.java create mode 100644 src/main/java/org/libvirt/qemu/QemuCommand.java create mode 100644 src/test/java/org/libvirt/qemu/TestQemuCommand.java -- 2.17.1

1 1

[libvirt] [dockerfiles PATCH] Refresh after switch from yajl to jansson
by Andrea Bolognani 19 Jul '18

19 Jul '18

The corresponding libvirt-jenkins-ci commit is d2bbe1eee61a. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed under the Dockerfile refresh rule. buildenv-centos-7.Dockerfile | 4 ++-- buildenv-debian-8.Dockerfile | 2 +- buildenv-debian-9.Dockerfile | 2 +- buildenv-debian-sid.Dockerfile | 2 +- buildenv-fedora-27.Dockerfile | 2 +- buildenv-fedora-28.Dockerfile | 2 +- buildenv-fedora-rawhide.Dockerfile | 2 +- buildenv-ubuntu-16.Dockerfile | 2 +- buildenv-ubuntu-18.Dockerfile | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/buildenv-centos-7.Dockerfile b/buildenv-centos-7.Dockerfile index 5d92bfa..2c4c26d 100644 --- a/buildenv-centos-7.Dockerfile +++ b/buildenv-centos-7.Dockerfile @@ -23,6 +23,7 @@ ENV PACKAGES audit-libs-devel \ gnutls-devel \ iproute \ iscsi-initiator-utils \ + jansson-devel \ libacl-devel \ libattr-devel \ libblkid-devel \ @@ -63,8 +64,7 @@ ENV PACKAGES audit-libs-devel \ scrub \ sudo \ systemtap-sdt-devel \ - vim \ - yajl-devel + vim RUN yum install -y ${PACKAGES} && \ yum autoremove -y && \ yum clean all -y diff --git a/buildenv-debian-8.Dockerfile b/buildenv-debian-8.Dockerfile index 0766cc9..8a8c3b0 100644 --- a/buildenv-debian-8.Dockerfile +++ b/buildenv-debian-8.Dockerfile @@ -29,6 +29,7 @@ ENV PACKAGES augeas-tools \ libdevmapper-dev \ libfuse-dev \ libgnutls28-dev \ + libjansson-dev \ libnetcf-dev \ libnl-3-dev \ libnl-route-3-dev \ @@ -50,7 +51,6 @@ ENV PACKAGES augeas-tools \ libxen-dev \ libxml2-dev \ libxml2-utils \ - libyajl-dev \ lvm2 \ make \ nfs-common \ diff --git a/buildenv-debian-9.Dockerfile b/buildenv-debian-9.Dockerfile index e106574..c3af421 100644 --- a/buildenv-debian-9.Dockerfile +++ b/buildenv-debian-9.Dockerfile @@ -29,6 +29,7 @@ ENV PACKAGES augeas-tools \ libdevmapper-dev \ libfuse-dev \ libgnutls28-dev \ + libjansson-dev \ libnetcf-dev \ libnl-3-dev \ libnl-route-3-dev \ @@ -50,7 +51,6 @@ ENV PACKAGES augeas-tools \ libxen-dev \ libxml2-dev \ libxml2-utils \ - libyajl-dev \ lvm2 \ make \ nfs-common \ diff --git a/buildenv-debian-sid.Dockerfile b/buildenv-debian-sid.Dockerfile index c3a18be..a922457 100644 --- a/buildenv-debian-sid.Dockerfile +++ b/buildenv-debian-sid.Dockerfile @@ -29,6 +29,7 @@ ENV PACKAGES augeas-tools \ libdevmapper-dev \ libfuse-dev \ libgnutls28-dev \ + libjansson-dev \ libnetcf-dev \ libnl-3-dev \ libnl-route-3-dev \ @@ -50,7 +51,6 @@ ENV PACKAGES augeas-tools \ libxen-dev \ libxml2-dev \ libxml2-utils \ - libyajl-dev \ lvm2 \ make \ nfs-common \ diff --git a/buildenv-fedora-27.Dockerfile b/buildenv-fedora-27.Dockerfile index 4e5173f..2f35a2e 100644 --- a/buildenv-fedora-27.Dockerfile +++ b/buildenv-fedora-27.Dockerfile @@ -27,6 +27,7 @@ ENV PACKAGES audit-libs-devel \ iproute \ iproute-tc \ iscsi-initiator-utils \ + jansson-devel \ libacl-devel \ libattr-devel \ libblkid-devel \ @@ -71,7 +72,6 @@ ENV PACKAGES audit-libs-devel \ vim \ wireshark-devel \ xen-devel \ - yajl-devel \ zfs-fuse RUN yum install -y ${PACKAGES} && \ yum autoremove -y && \ diff --git a/buildenv-fedora-28.Dockerfile b/buildenv-fedora-28.Dockerfile index d051d65..f4f7198 100644 --- a/buildenv-fedora-28.Dockerfile +++ b/buildenv-fedora-28.Dockerfile @@ -26,6 +26,7 @@ ENV PACKAGES audit-libs-devel \ iproute \ iproute-tc \ iscsi-initiator-utils \ + jansson-devel \ libacl-devel \ libattr-devel \ libblkid-devel \ @@ -71,7 +72,6 @@ ENV PACKAGES audit-libs-devel \ vim \ wireshark-devel \ xen-devel \ - yajl-devel \ zfs-fuse RUN yum install -y ${PACKAGES} && \ yum autoremove -y && \ diff --git a/buildenv-fedora-rawhide.Dockerfile b/buildenv-fedora-rawhide.Dockerfile index 56d59a1..189ea59 100644 --- a/buildenv-fedora-rawhide.Dockerfile +++ b/buildenv-fedora-rawhide.Dockerfile @@ -26,6 +26,7 @@ ENV PACKAGES audit-libs-devel \ iproute \ iproute-tc \ iscsi-initiator-utils \ + jansson-devel \ libacl-devel \ libattr-devel \ libblkid-devel \ @@ -95,7 +96,6 @@ ENV PACKAGES audit-libs-devel \ vim \ wireshark-devel \ xen-devel \ - yajl-devel \ zfs-fuse RUN yum install -y ${PACKAGES} && \ yum autoremove -y && \ diff --git a/buildenv-ubuntu-16.Dockerfile b/buildenv-ubuntu-16.Dockerfile index d2ece05..bc387a1 100644 --- a/buildenv-ubuntu-16.Dockerfile +++ b/buildenv-ubuntu-16.Dockerfile @@ -29,6 +29,7 @@ ENV PACKAGES augeas-tools \ libdevmapper-dev \ libfuse-dev \ libgnutls28-dev \ + libjansson-dev \ libnetcf-dev \ libnl-3-dev \ libnl-route-3-dev \ @@ -51,7 +52,6 @@ ENV PACKAGES augeas-tools \ libxen-dev \ libxml2-dev \ libxml2-utils \ - libyajl-dev \ lvm2 \ make \ nfs-common \ diff --git a/buildenv-ubuntu-18.Dockerfile b/buildenv-ubuntu-18.Dockerfile index fdf97eb..2a15f14 100644 --- a/buildenv-ubuntu-18.Dockerfile +++ b/buildenv-ubuntu-18.Dockerfile @@ -29,6 +29,7 @@ ENV PACKAGES augeas-tools \ libdevmapper-dev \ libfuse-dev \ libgnutls28-dev \ + libjansson-dev \ libnetcf-dev \ libnl-3-dev \ libnl-route-3-dev \ @@ -51,7 +52,6 @@ ENV PACKAGES augeas-tools \ libxen-dev \ libxml2-dev \ libxml2-utils \ - libyajl-dev \ lvm2 \ make \ nfs-common \ -- 2.17.1

1 0

[libvirt] [jenkins-ci PATCH 0/4] guests: Replace yajl with jansson
by Andrea Bolognani 19 Jul '18

19 Jul '18

Andrea Bolognani (4): guests: Install jansson for libvirt guests: Don't install yajl for libvirt guests: Remove yajl mapping guests: Remove yajl kludge guests/tasks/kludges.yml | 2 -- guests/vars/mappings.yml | 10 +++++----- guests/vars/projects/libvirt.yml | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) -- 2.17.1

2 5

[libvirt] [PATCH v4] qemu: fix broken autostart symlink after renaming domain.
by Julio Faracco 19 Jul '18

19 Jul '18

If a domain is configured to start on boot, it has a symlink to the domain definition inside the autostart directory. If you rename this domain, the definition is renamed too. The symlink need to be pointed to this renamed file. This commit recreates the symlink after renaming the XML file. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1594985 Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/qemu/qemu_driver.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 25170f6f26..09af231dfc 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -20917,6 +20917,8 @@ qemuDomainRenameCallback(virDomainObjPtr vm, char *old_dom_name = NULL; char *new_dom_cfg_file = NULL; char *old_dom_cfg_file = NULL; + char *new_dom_autostart_link = NULL; + char *old_dom_autostart_link = NULL; virCheckFlags(0, ret); @@ -20937,6 +20939,14 @@ qemuDomainRenameCallback(virDomainObjPtr vm, vm->def->name))) goto cleanup; + if (vm->autostart) { + if (!(new_dom_autostart_link = virDomainConfigFile(cfg->autostartDir, + new_dom_name)) || + !(old_dom_autostart_link = virDomainConfigFile(cfg->autostartDir, + vm->def->name))) + goto cleanup; + } + event_old = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_UNDEFINED, VIR_DOMAIN_EVENT_UNDEFINED_RENAMED); @@ -20949,6 +20959,23 @@ qemuDomainRenameCallback(virDomainObjPtr vm, if (virDomainSaveConfig(cfg->configDir, driver->caps, vm->def) < 0) goto rollback; + if (vm->autostart) { + if (virFileIsLink(old_dom_autostart_link) && + unlink(old_dom_autostart_link) < 0) { + virReportSystemError(errno, + _("Failed to delete symlink '%s'"), + old_dom_autostart_link); + goto rollback; + } + + if (symlink(new_dom_cfg_file, new_dom_autostart_link) < 0) { + virReportSystemError(errno, + _("Failed to create symlink '%s to '%s'"), + new_dom_autostart_link, new_dom_cfg_file); + goto rollback; + } + } + if (virFileExists(old_dom_cfg_file) && unlink(old_dom_cfg_file) < 0) { virReportSystemError(errno, @@ -20963,6 +20990,8 @@ qemuDomainRenameCallback(virDomainObjPtr vm, ret = 0; cleanup: + VIR_FREE(old_dom_autostart_link); + VIR_FREE(new_dom_autostart_link); VIR_FREE(old_dom_cfg_file); VIR_FREE(new_dom_cfg_file); VIR_FREE(old_dom_name); @@ -20982,6 +21011,11 @@ qemuDomainRenameCallback(virDomainObjPtr vm, if (virFileExists(new_dom_cfg_file)) unlink(new_dom_cfg_file); + if (vm->autostart) { + if (virFileExists(new_dom_autostart_link)) + unlink(new_dom_autostart_link); + } + goto cleanup; } -- 2.17.1

2 1

[libvirt] [dockerfiles PATCH] refresh: Add refresh script
by Andrea Bolognani 19 Jul '18

19 Jul '18

This calls lcitool, part of the libvirt-jenkins-ci project, to refresh the Dockerfiles so that they contain up to date information about build requirements. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- refresh | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100755 refresh diff --git a/refresh b/refresh new file mode 100755 index 0000000..7aa2151 --- /dev/null +++ b/refresh @@ -0,0 +1,30 @@ +#!/bin/sh + +die() { + test "$1" && echo "$1" >&2 + exit 1 +} + +me="$0" +here=$(pwd) + +ci_repo="$1" + +cd "$ci_repo/guests/" >/dev/null 2>&1 || { + die "Usage: $me path/to/libvirt-jenkins-ci.git" +} + +for host in $(./lcitool -a hosts) +do + projects="libvirt" + dockerfile="$here/buildenv-${host#libvirt-}.Dockerfile" + + case "$host" in + libvirt-fedora-rawhide) projects="libvirt,libvirt+mingw" ;; + libvirt-freebsd-*) continue ;; + esac + + ./lcitool -a dockerfile -h "$host" -p "$projects" >"$dockerfile" || { + die "$me: Failed to refresh Dockerfile for $host" + } +done -- 2.17.1

2 1

[libvirt] CPU Support
by Hetz Ben Hamo 19 Jul '18

19 Jul '18

Hi, I've been looking at the CPU list and although I see lots of CPU's, I cannot find 2 CPU families: * AMD Ryzen * AMD Threadripper Although EPYC has been added recently. Are there any missing details which preventing adding those CPU's to the list? Thanks

5 4

[libvirt] [RFC PATCHv2 00/10] x86 RDT Cache Monitoring Technology (CMT)
by Wang Huaqiang 19 Jul '18

19 Jul '18

This is the V2 of RFC and the POC source code for introducing x86 RDT CMT feature, thanks Martin Kletzander for his review and constructive suggestion for V1. This series is trying to provide the similar functions of the perf event based CMT, MBMT and MBML features in reporting cache occupancy, total memory bandwidth utilization and local memory bandwidth utilization information in livirt. Firstly we focus on cmt. x86 RDT Cache Monitoring Technology (CMT) provides a medthod to track the cache occupancy information per CPU thread. We are leveraging the implementation of kernel resctrl filesystem and create our patches on top of that. Describing the functionality from a high level: 1. Extend the output of 'domstats' and report CMT inforamtion. Comparing with perf event based CMT implementation in libvirt, this series extends the output of command 'domstat' and reports cache occupancy information like these: <pre> [root@dl-c200 libvirt]# virsh domstats vm3 --cpu-resource Domain: 'vm3' cpu.cacheoccupancy.vcpus_2.value=4415488 cpu.cacheoccupancy.vcpus_2.vcpus=2 cpu.cacheoccupancy.vcpus_1.value=7839744 cpu.cacheoccupancy.vcpus_1.vcpus=1 cpu.cacheoccupancy.vcpus_0,3.value=53796864 cpu.cacheoccupancy.vcpus_0,3.vcpus=0,3 </pre> The vcpus have been arragned into three monitoring groups, these three groups cover vcpu 1, vcpu 2 and vcpus 0,3 respectively. Take an example, the 'cpu.cacheoccupancy.vcpus_0,3.value' reports the cache occupancy information for vcpu 0 and vcpu 3, the 'cpu.cacheoccupancy.vcpus_0,3.vcpus' represents the vcpu group information. To address Martin's suggestion "beware as 1-4 is something else than 1,4 so you need to differentiate that.", the content of 'vcpus' (cpu.cacheoccupancy.<groupname>.vcpus=xxx) has been specially processed, if vcpus is a continous range, e.g. 0-2, then the output of cpu.cacheoccupancy.vcpus_0-2.vcpus will be like 'cpu.cacheoccupancy.vcpus_0-2.vcpus=0,1,2' instead of 'cpu.cacheoccupancy.vcpus_0-2.vcpus=0-2'. Please note that 'vcpus_0-2' is a name of this monitoring group, could be specified any other word from the XML configuration file or lively changed with the command introduced in following part. 2. A new command 'cpu-resource' for live changing CMT groups. A virsh tool has been introduced in this series to dynamically create, destroy monitoring groups as well as showing the existing grouping status. The general command interface is like this: <pre> [root@dl-c200 libvirt]# virsh help cpu-resource NAME cpu-resource - get or set hardware CPU RDT monitoring group SYNOPSIS cpu-resource <domain> [--group-name <string>] [--vcpulist <string>] [--create] [--destroy] [--live] [--config] [--current] DESCRIPTION Create or destroy CPU resource monitoring group. To get current CPU resource monitoring group status: virsh # cpu-resource [domain] OPTIONS [--domain] <string> domain name, id or uuid --group-name <string> group name to manipulate --vcpulist <string> ids of vcpus to manipulate --create Create CPU resctrl monitoring group for functions such as monitoring cache occupancy --destroy Destroy CPU resctrl monitoring group --live modify/get running state --config modify/get persistent configuration --current affect current domain </pre> This command provides live interface of changing resource monitoring group and keeping the result in persistent domain XML configuration file. 3. XML configuration changes for keeping CMT groups. To keep the monitoring group information and monitoring CPU cache resource utilization information at launch time, XML configuration file has been changed by adding a new element <resmongroup>: <pre> # Add a new element <cputune> <resmongroup vcpus='0-2'/> <resmongroup vcpus='3'/> </cputune> </pre> 4. About the naming used in this series for RDT CMT technology. About the wording and naming used in this series for Intel RDT CMT technology, 'RDT', 'CMT' and 'resctrl' are currently used names in Intel documents and kernel namespace in the context of CPU resource, but they are pretty confusing for system administrator. But 'Resource Control' or 'Monitoring' is a not good choice either, the scope of these two phrases are too big which normally cover lots of aspects other than CPU cache and memory hbandwidth. Intel 'RDT' is technology emphasizing on the resource allocation and monitoring within the scope CPU, I would like to use the term 'cpu-resource' here to describe the technology that these patches' are trying to address. This series is focusing on CPU cache occupancy monitoring(CMT), and this naming seems has a wider scope than CMT, we could add the similar resource monitoring part for technologies of MBML and MBMT under the framework that introduced in these patches. This naming is also applicable to technology of CPU resource allocation, it is possible to add some command by adding some arguments to allocate cache or memory bandwidth at run time. 5. About emulator and io threads CMT Currently, it is not possible to allocate an dedicated amount of cache or memory bandwidth for emulator or io threads. so the resource monitoring for emulator or io threads is not considered in this series. Could be planned in next stage. Changes since v1: A lot of things changed, mainly * report cache occupancy information based on vcpu group instead of whole domain. * be possible to destroy vcpu group at run time * XML configuration file changed * change naming for describing 'RDT CMT' to 'cpu-resource' Wang Huaqiang (10): util: add Intel x86 RDT/CMT support conf: introduce <resmongroup> element tests: add tests for validating <resmongroup> libvirt: add public APIs for resource monitoring group qemu: enable resctrl monitoring at booting stage remote: add remote protocol for resctrl monitoring qemu: add interfaces for dynamically manupulating resctl mon groups tool: add command cpuresource to interact with cpu resources tools: show cpu cache occupancy information in domstats news: add Intel x86 RDT CMT feature docs/formatdomain.html.in | 17 + docs/news.xml | 10 + docs/schemas/domaincommon.rng | 14 + include/libvirt/libvirt-domain.h | 14 + src/conf/domain_conf.c | 320 ++++++++++++++++++ src/conf/domain_conf.h | 25 ++ src/driver-hypervisor.h | 13 + src/libvirt-domain.c | 96 ++++++ src/libvirt_private.syms | 13 + src/libvirt_public.syms | 6 + src/qemu/qemu_driver.c | 357 +++++++++++++++++++++ src/qemu/qemu_process.c | 45 ++- src/remote/remote_daemon_dispatch.c | 45 +++ src/remote/remote_driver.c | 4 +- src/remote/remote_protocol.x | 31 +- src/remote_protocol-structs | 16 + src/util/virresctrl.c | 338 +++++++++++++++++++ src/util/virresctrl.h | 40 +++ tests/genericxml2xmlindata/cachetune-cdp.xml | 3 + tests/genericxml2xmlindata/cachetune-small.xml | 2 + tests/genericxml2xmlindata/cachetune.xml | 2 + .../resmongroup-colliding-cachetune.xml | 34 ++ tests/genericxml2xmltest.c | 3 + tools/virsh-domain-monitor.c | 7 + tools/virsh-domain.c | 139 ++++++++ 25 files changed, 1588 insertions(+), 6 deletions(-) create mode 100644 tests/genericxml2xmlindata/resmongroup-colliding-cachetune.xml -- 2.7.4

4 19

[libvirt] [PATCH v3 0/2] Change virFileIsCDROM to check cdrom status
by Han Han 18 Jul '18

18 Jul '18

v2: https://www.redhat.com/archives/libvir-list/2018-July/msg00655.html v1: https://www.redhat.com/archives/libvir-list/2018-July/msg00103.html Rename virFileIsCDROM to virFileCheckCDROM and add new argument filled with cdrom status. Now it could be used to get cdrom status. In libvirt, it gives general Input/Output error when reading a not ready cdrom backend vol. This error should be replaced with warning just like the warning of lacking backing file. Han Han (2): util: Refactor virFileIsCDROM to virFileCheckCDROM storage: Improve error handling on cdrom backend src/libvirt_private.syms | 2 +- src/qemu/qemu_domain.c | 4 ++-- src/storage/storage_util.c | 8 ++++++++ src/util/virfile.c | 41 ++++++++++++++++++++++++++++++++------ src/util/virfile.h | 13 +++++++++++- 5 files changed, 58 insertions(+), 10 deletions(-) -- 2.17.1

2 4

[libvirt] [PATCH] locking: don't create qemu-sanlock.conf file when QEMU isn't enabled
by Daniel P. Berrangé 18 Jul '18

18 Jul '18

The test targets result in the qemu-sanlock.conf file being created when sanlock is enabled, even if QEMU is not enabled. As a result it never gets cleaned up when distclean is run, breaking distcheck. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/locking/Makefile.inc.am | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) Pushed as a build fix for when jansson isn't available (which turns off QEMU) diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index 649c769e00..f2eb2efb7b 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -156,10 +156,10 @@ sanlock_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF) sanlock_la_LIBADD = -lsanlock_client libvirt.la ../gnulib/lib/libgnu.la augeas_DATA += locking/libvirt_sanlock.aug -augeastest_DATA += test_libvirt_sanlock.aug -CLEANFILES += test_libvirt_sanlock.aug if WITH_QEMU +augeastest_DATA += test_libvirt_sanlock.aug +CLEANFILES += test_libvirt_sanlock.aug nodist_conf_DATA += locking/qemu-sanlock.conf BUILT_SOURCES += locking/qemu-sanlock.conf DISTCLEANFILES += locking/qemu-sanlock.conf @@ -213,6 +213,7 @@ if WITH_SANLOCK endif WITH_SANLOCK if WITH_SANLOCK +if WITH_QEMU test_libvirt_sanlock.aug: locking/test_libvirt_sanlock.aug.in \ locking/qemu-sanlock.conf $(AUG_GENTEST) $(AM_V_GEN)$(AUG_GENTEST) locking/qemu-sanlock.conf $< $@ @@ -221,6 +222,9 @@ check-augeas-sanlock: test_libvirt_sanlock.aug $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ '$(AUGPARSE)' -I $(srcdir)/locking test_libvirt_sanlock.aug; \ fi +else ! WITH_QEMU +check-augeas-sanlock: +endif ! WITH_QEMU else ! WITH_SANLOCK check-augeas-sanlock: endif ! WITH_SANLOCK -- 2.17.1

1 0

[libvirt] [PATCH v2 0/3] Introduce new video model type 'none'
by Erik Skultety 18 Jul '18

18 Jul '18

v1 here https://www.redhat.com/archives/libvir-list/2018-June/msg01793.html Since v1: - there were only small fixes needed as per the review - decided not to split the patch as requested by the reviewer because the first patch would contain 90% of the changes, both in qemu driver and domain_conf to make the test suite happy (PCI address auto-assignment issues) and a single hunk in qemu_command.c in the second patch to actually enable the feature - this just wasn't worth doing, better keep it together in this case - added some tiny reword patch 1 - added a news update Erik Skultety (3): docs: Rephrase the mediated devices hostdev section a bit conf: Introduce new video type 'none' docs: news: Provide an update about the video type 'none' docs/formatdomain.html.in | 23 ++++++--- docs/news.xml | 14 ++++++ docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 55 ++++++++++++++++------ src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 14 ++++-- src/qemu/qemu_domain.c | 3 ++ src/qemu/qemu_domain_address.c | 10 ++++ tests/domaincapsschemadata/full.xml | 1 + .../video-invalid-multiple-devices.xml | 33 +++++++++++++ tests/qemuxml2argvdata/video-none-device.args | 27 +++++++++++ tests/qemuxml2argvdata/video-none-device.xml | 39 +++++++++++++++ tests/qemuxml2argvtest.c | 4 +- tests/qemuxml2xmloutdata/video-none-device.xml | 42 +++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 15 files changed, 243 insertions(+), 25 deletions(-) create mode 100644 tests/qemuxml2argvdata/video-invalid-multiple-devices.xml create mode 100644 tests/qemuxml2argvdata/video-none-device.args create mode 100644 tests/qemuxml2argvdata/video-none-device.xml create mode 100644 tests/qemuxml2xmloutdata/video-none-device.xml -- 2.14.4

2 9

[libvirt] [PATCH v4 00/10] Enable vfio-pci 'property' for mediated device
by Erik Skultety 18 Jul '18

18 Jul '18

RFC here: https://www.redhat.com/archives/libvir-list/2018-May/msg02218.html Since v1 [1]: - remodeled egl-headless to be a standalone graphics element instead of a result of some automagic with graphic's <gl> element - pushed the first 5 simple fixes that were RB'd - fixed some nits raised during review Since v2 [2] - converted the 'display' and 'egl-headless' PostParse callbacks in patches 2 and 6 to Validate callbacks as they should have been since the beginning (see the RFC) - some minor nits - added a standalone patch substituting some 'error' labels with 'cleanup' as requested during review Since v3 [3]: - all of the patches got a RB, but there were some comments that made me send another version - the only major change was to move the default 'display' choice from qemu_command.c back to a PostParse callback, so now we format display='off' by default to every domain that utilized an mdev [1] https://www.redhat.com/archives/libvir-list/2018-June/msg01740.html [2] https://www.redhat.com/archives/libvir-list/2018-July/msg00485.html [3] https://www.redhat.com/archives/libvir-list/2018-July/msg00698.html Erik Skultety (9): qemu: qemuBuildHostdevCommandLine: Use a helper variable mdevsrc qemu: caps: Introduce a capability for egl-headless qemu: Introduce a new graphics display type 'headless' qemu: caps: Add vfio-pci.display capability conf: Introduce virDomainGraphicsDefHasOpenGL helper conf: Replace 'error' with 'cleanup' in virDomainHostdevDefParseXMLSubsys conf: Introduce new <hostdev> attribute 'display' qemu: command: Enable formatting vfio-pci.display option onto cmdline docs: Update news about the VNC console enablement for mdevs Katerina Koukiou (1): docs: formatdomain: unify naming for CPUs/vCPUs docs/formatdomain.html.in | 137 ++++++++++++------ docs/news.xml | 10 ++ docs/schemas/domaincommon.rng | 8 ++ src/conf/domain_conf.c | 106 +++++++++++--- src/conf/domain_conf.h | 5 + src/libvirt_private.syms | 1 + src/libxl/libxl_conf.c | 1 + src/qemu/qemu_capabilities.c | 10 ++ src/qemu/qemu_capabilities.h | 4 + src/qemu/qemu_command.c | 23 ++- src/qemu/qemu_domain.c | 154 ++++++++++++++++++++- src/qemu/qemu_driver.c | 2 + src/qemu/qemu_hotplug.c | 1 + src/qemu/qemu_process.c | 4 + src/vmx/vmx.c | 1 + tests/domaincapsschemadata/full.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 2 + tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 2 + tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 2 + tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 2 + tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 2 + tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 2 + tests/qemuxml2argvdata/graphics-egl-headless.args | 26 ++++ tests/qemuxml2argvdata/graphics-egl-headless.xml | 31 +++++ .../qemuxml2argvdata/graphics-sdl-egl-headless.xml | 35 +++++ .../graphics-spice-egl-headless.args | 31 +++++ .../graphics-spice-egl-headless.xml | 36 +++++ .../graphics-spice-invalid-egl-headless.xml | 37 +++++ .../graphics-vnc-egl-headless.args | 28 ++++ .../qemuxml2argvdata/graphics-vnc-egl-headless.xml | 37 +++++ .../hostdev-mdev-display-missing-graphics.xml | 35 +++++ ...v-display-spice-egl-headless.x86_64-latest.args | 37 +++++ .../hostdev-mdev-display-spice-egl-headless.xml | 40 ++++++ ...ev-mdev-display-spice-opengl.x86_64-latest.args | 36 +++++ .../hostdev-mdev-display-spice-opengl.xml | 41 ++++++ ...dev-display-vnc-egl-headless.x86_64-latest.args | 37 +++++ .../hostdev-mdev-display-vnc-egl-headless.xml | 40 ++++++ .../hostdev-mdev-display-vnc.x86_64-latest.args | 36 +++++ .../qemuxml2argvdata/hostdev-mdev-display-vnc.xml | 39 ++++++ tests/qemuxml2argvdata/hostdev-mdev-display.xml | 39 ++++++ tests/qemuxml2argvtest.c | 24 ++++ .../graphics-spice-egl-headless.xml | 44 ++++++ .../graphics-vnc-egl-headless.xml | 42 ++++++ tests/qemuxml2xmloutdata/hostdev-mdev-display.xml | 47 +++++++ tests/qemuxml2xmltest.c | 3 + 51 files changed, 1214 insertions(+), 73 deletions(-) create mode 100644 tests/qemuxml2argvdata/graphics-egl-headless.args create mode 100644 tests/qemuxml2argvdata/graphics-egl-headless.xml create mode 100644 tests/qemuxml2argvdata/graphics-sdl-egl-headless.xml create mode 100644 tests/qemuxml2argvdata/graphics-spice-egl-headless.args create mode 100644 tests/qemuxml2argvdata/graphics-spice-egl-headless.xml create mode 100644 tests/qemuxml2argvdata/graphics-spice-invalid-egl-headless.xml create mode 100644 tests/qemuxml2argvdata/graphics-vnc-egl-headless.args create mode 100644 tests/qemuxml2argvdata/graphics-vnc-egl-headless.xml create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-missing-graphics.xml create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.xml create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.xml create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.xml create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-vnc.xml create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display.xml create mode 100644 tests/qemuxml2xmloutdata/graphics-spice-egl-headless.xml create mode 100644 tests/qemuxml2xmloutdata/graphics-vnc-egl-headless.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-mdev-display.xml -- 2.14.4

3 19

[libvirt] [PATCH] Add DOMAIN_MEMORY_STAT_DISK_CACHES constant
by Daniel P. Berrangé 18 Jul '18

18 Jul '18

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- domain.go | 1 + domain_compat.h | 6 ++++++ 2 files changed, 7 insertions(+) Pushed as a build fix diff --git a/domain.go b/domain.go index cc0285b..6a9e2a1 100644 --- a/domain.go +++ b/domain.go @@ -377,6 +377,7 @@ const ( DOMAIN_MEMORY_STAT_RSS = DomainMemoryStatTags(C.VIR_DOMAIN_MEMORY_STAT_RSS) DOMAIN_MEMORY_STAT_USABLE = DomainMemoryStatTags(C.VIR_DOMAIN_MEMORY_STAT_USABLE) DOMAIN_MEMORY_STAT_LAST_UPDATE = DomainMemoryStatTags(C.VIR_DOMAIN_MEMORY_STAT_LAST_UPDATE) + DOMAIN_MEMORY_STAT_DISK_CACHES = DomainMemoryStatTags(C.VIR_DOMAIN_MEMORY_STAT_DISK_CACHES) DOMAIN_MEMORY_STAT_NR = DomainMemoryStatTags(C.VIR_DOMAIN_MEMORY_STAT_NR) ) diff --git a/domain_compat.h b/domain_compat.h index 345505c..f23670c 100644 --- a/domain_compat.h +++ b/domain_compat.h @@ -1046,4 +1046,10 @@ int virDomainGetLaunchSecurityInfoCompat(virDomainPtr domain, #define VIR_DOMAIN_LAUNCH_SECURITY_SEV_MEASUREMENT "sev-measurement" #endif +/* 4.6.0 */ + +#ifndef VIR_DOMAIN_MEMORY_STAT_DISK_CACHES +#define VIR_DOMAIN_MEMORY_STAT_DISK_CACHES 10 +#endif + #endif /* LIBVIRT_GO_DOMAIN_COMPAT_H__ */ -- 2.17.1

1 1

[libvirt] [perl PATCH] Add VIR_DOMAIN_MEMORY_STAT_DISK_CACHES constant
by Daniel P. Berrangé 18 Jul '18

18 Jul '18

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Changes | 2 +- lib/Sys/Virt.xs | 5 +++++ lib/Sys/Virt/Domain.pm | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) Pushed as a build fix diff --git a/Changes b/Changes index 74bbb22..4c77425 100644 --- a/Changes +++ b/Changes @@ -2,7 +2,7 @@ Revision history for perl module Sys::Virt 4.6.0 2018-00-00 - - XXX + - Add VIR_DOMAIN_MEMORY_STAT_DISK_CACHES 4.5.0 2018-07-03 diff --git a/lib/Sys/Virt.xs b/lib/Sys/Virt.xs index 40134d3..14967d7 100644 --- a/lib/Sys/Virt.xs +++ b/lib/Sys/Virt.xs @@ -5850,6 +5850,10 @@ memory_stats(dom, flags=0) case VIR_DOMAIN_MEMORY_STAT_USABLE: (void)hv_store (RETVAL, "usable", 6, virt_newSVll(stats[i].val), 0); break; + + case VIR_DOMAIN_MEMORY_STAT_DISK_CACHES: + (void)hv_store (RETVAL, "disk_caches", 11, virt_newSVll(stats[i].val), 0); + break; } } Safefree(stats); @@ -9040,6 +9044,7 @@ BOOT: REGISTER_CONSTANT(VIR_DOMAIN_MEMORY_STAT_RSS, MEMORY_STAT_RSS); REGISTER_CONSTANT(VIR_DOMAIN_MEMORY_STAT_LAST_UPDATE, MEMORY_STAT_LAST_UPDATE); REGISTER_CONSTANT(VIR_DOMAIN_MEMORY_STAT_USABLE, MEMORY_STAT_USABLE); + REGISTER_CONSTANT(VIR_DOMAIN_MEMORY_STAT_DISK_CACHES, MEMORY_STAT_DISK_CACHES); REGISTER_CONSTANT_STR(VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC, BLOCK_IOTUNE_TOTAL_BYTES_SEC); diff --git a/lib/Sys/Virt/Domain.pm b/lib/Sys/Virt/Domain.pm index 284c38c..8eee18c 100644 --- a/lib/Sys/Virt/Domain.pm +++ b/lib/Sys/Virt/Domain.pm @@ -3903,6 +3903,10 @@ Amount of usable memory Time of last stats refresh from guest +=item Sys::Virt::Domain::MEMORY_STAT_DISK_CACHES + +Disk cache size + =back =head2 DOMAIN LIST CONSTANTS -- 2.17.1

1 0

[libvirt] [PATCH] test: Implement virConnectListAllInterfaces
by Cole Robinson 18 Jul '18

18 Jul '18

This adds some generic virinterfaceobj code, roughly matching what is used by other stateful drivers like network, storage, etc. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/conf/virinterfaceobj.c | 105 +++++++++++++++++++++++++++++++++++++ src/conf/virinterfaceobj.h | 7 +++ src/libvirt_private.syms | 1 + src/test/test_driver.c | 15 ++++++ 4 files changed, 128 insertions(+) diff --git a/src/conf/virinterfaceobj.c b/src/conf/virinterfaceobj.c index a1d7346eb2..87ce188117 100644 --- a/src/conf/virinterfaceobj.c +++ b/src/conf/virinterfaceobj.c @@ -241,6 +241,111 @@ virInterfaceObjListFindByName(virInterfaceObjListPtr interfaces, return obj; } +#define MATCH(FLAG) (flags & (FLAG)) +static bool +virInterfaceMatch(virInterfaceObjPtr obj, + unsigned int flags) +{ + /* filter by active state */ + if (MATCH(VIR_CONNECT_LIST_INTERFACES_FILTERS_ACTIVE) && + !((MATCH(VIR_CONNECT_LIST_INTERFACES_ACTIVE) && + virInterfaceObjIsActive(obj)) || + (MATCH(VIR_CONNECT_LIST_INTERFACES_INACTIVE) && + !virInterfaceObjIsActive(obj)))) + return false; + + return true; +} +#undef MATCH + + +struct virInterfaceObjListData { + virConnectPtr conn; + virInterfacePtr *ifaces; + virInterfaceObjListFilter filter; + unsigned int flags; + int nifaces; + bool error; +}; + +static int +virInterfaceObjListPopulate(void *payload, + const void *name ATTRIBUTE_UNUSED, + void *opaque) +{ + struct virInterfaceObjListData *data = opaque; + virInterfaceObjPtr obj = payload; + virInterfacePtr iface = NULL; + + if (data->error) + return 0; + + virObjectLock(obj); + + if (data->filter && + !data->filter(data->conn, obj->def)) + goto cleanup; + + if (!virInterfaceMatch(obj, data->flags)) + goto cleanup; + + if (!data->ifaces) { + data->nifaces++; + goto cleanup; + } + + if (!(iface = virGetInterface(data->conn, obj->def->name, obj->def->mac))) { + data->error = true; + goto cleanup; + } + + data->ifaces[data->nifaces++] = iface; + + cleanup: + virObjectUnlock(obj); + return 0; +} + + +int +virInterfaceObjListExport(virConnectPtr conn, + virInterfaceObjListPtr ifaceobjs, + virInterfacePtr **ifaces, + virInterfaceObjListFilter filter, + unsigned int flags) +{ + int ret = -1; + struct virInterfaceObjListData data = { + .conn = conn, .ifaces = NULL, .filter = filter, .flags = flags, + .nifaces = 0, .error = false }; + + virObjectRWLockRead(ifaceobjs); + if (ifaces && VIR_ALLOC_N(data.ifaces, + virHashSize(ifaceobjs->objsName) + 1) < 0) + goto cleanup; + + virHashForEach(ifaceobjs->objsName, virInterfaceObjListPopulate, &data); + + if (data.error) + goto cleanup; + + if (data.ifaces) { + /* trim the array to the final size */ + ignore_value(VIR_REALLOC_N(data.ifaces, data.nifaces + 1)); + *ifaces = data.ifaces; + data.ifaces = NULL; + } + + ret = data.nifaces; + cleanup: + virObjectRWUnlock(ifaceobjs); + while (data.ifaces && data.nifaces) + virObjectUnref(data.ifaces[--data.nifaces]); + + VIR_FREE(data.ifaces); + return ret; +} + void virInterfaceObjListDispose(void *obj) diff --git a/src/conf/virinterfaceobj.h b/src/conf/virinterfaceobj.h index 799d38038f..33d2dda05d 100644 --- a/src/conf/virinterfaceobj.h +++ b/src/conf/virinterfaceobj.h @@ -82,4 +82,11 @@ virInterfaceObjListGetNames(virInterfaceObjListPtr interfaces, char **const names, int maxnames); +int +virInterfaceObjListExport(virConnectPtr conn, + virInterfaceObjListPtr ifaceobjs, + virInterfacePtr **ifaces, + virInterfaceObjListFilter filter, + unsigned int flags); + #endif /* __VIRINTERFACEOBJ_H__ */ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index e688981c3e..ec5ed0cc81 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -961,6 +961,7 @@ virInterfaceObjGetDef; virInterfaceObjIsActive; virInterfaceObjListAssignDef; virInterfaceObjListClone; +virInterfaceObjListExport; virInterfaceObjListFindByMACString; virInterfaceObjListFindByName; virInterfaceObjListGetNames; diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 5494d51017..951d9c4151 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -3828,6 +3828,20 @@ testConnectListDefinedInterfaces(virConnectPtr conn, } +static int +testConnectListAllInterfaces(virConnectPtr conn, + virInterfacePtr **ifaces, + unsigned int flags) +{ + testDriverPtr privconn = conn->privateData; + + virCheckFlags(VIR_CONNECT_LIST_INTERFACES_FILTERS_ACTIVE, -1); + + return virInterfaceObjListExport(conn, privconn->ifaces, ifaces, + NULL, flags); +} + + static virInterfacePtr testInterfaceLookupByName(virConnectPtr conn, const char *name) @@ -6944,6 +6958,7 @@ static virInterfaceDriver testInterfaceDriver = { .connectListInterfaces = testConnectListInterfaces, /* 0.7.0 */ .connectNumOfDefinedInterfaces = testConnectNumOfDefinedInterfaces, /* 0.7.0 */ .connectListDefinedInterfaces = testConnectListDefinedInterfaces, /* 0.7.0 */ + .connectListAllInterfaces = testConnectListAllInterfaces, /* 4.6.0 */ .interfaceLookupByName = testInterfaceLookupByName, /* 0.7.0 */ .interfaceLookupByMACString = testInterfaceLookupByMACString, /* 0.7.0 */ .interfaceGetXMLDesc = testInterfaceGetXMLDesc, /* 0.7.0 */ -- 2.17.1

2 1

[libvirt] [PATCHv2] examples: Add clean-traffic-gateway into nwfilters
by Ales Musil 18 Jul '18

18 Jul '18

The filter purpose is to simulate isolated private VLAN. The behavior can be achieved by limiting network traffic to traffic between VM and gateway. Because there is no concept of the PVLAN in the linux bridge. The filter also contains parts from clean-traffic to prevent VM from spoofing its IP and MAC address. To use this filter the user just needs to set the GATEWAY_MAC variable to gateway MAC address. Signed-off-by: Ales Musil <amusil(a)redhat.com> --- examples/xml/nwfilter/clean-traffic-gateway.xml | 34 +++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 examples/xml/nwfilter/clean-traffic-gateway.xml diff --git a/examples/xml/nwfilter/clean-traffic-gateway.xml b/examples/xml/nwfilter/clean-traffic-gateway.xml new file mode 100644 index 0000000..b8c2040 --- /dev/null +++ b/examples/xml/nwfilter/clean-traffic-gateway.xml @@ -0,0 +1,34 @@ +<filter name='clean-traffic-gateway'> +  + <filterref filter='no-mac-spoofing'/> + +  + <filterref filter='no-ip-spoofing'/> + +  + <filterref filter='no-arp-spoofing'/> + +  + <rule action='accept' direction='inout' priority='-500'> + <mac protocolid='arp'/> + </rule> + +  + <rule action='accept' direction='in'> + <mac match='yes' srcmacaddr='$GATEWAY_MAC'/> + </rule> + +  + <rule action='accept' direction='out'> + <mac match='yes' dstmacaddr='$GATEWAY_MAC'/> + </rule> + +  + <filterref filter='no-other-l2-traffic'/> + +  + <filterref filter='qemu-announce-self'/> +</filter> -- 1.8.3.1

2 1

[libvirt] [PATCH 0/3] support VLan for virtual network based on 8021q kernel module
by Shi Lei 18 Jul '18

18 Jul '18

Support VLan for virtual network based on 8021q kernel module other than ovs backend. Insert vlan-device into the datapath of the network traffic: (outside of host) <--> physical_interface <--> vlan-dev(with VLAN-Tag) <--> bridge <--> guests Then VLAN-Tag will be applied to the guest's network traffic. The VLan network acts as real layer-2 switch which provides 'access' port to guest. 1. Create VLan network by setting mode='vlan' on the forward element, for example: ... <network> <name>vlan10</name> <forward mode="vlan" dev="eth0"/> <vlan> <tag id="10"/> </vlan> </network> ... The mode attribute of <forward> should be 'vlan' (this patch added). The dev attribute of <forward> specifies a physical interface which forwards traffice between this VLan-network and outside. The id attribue of the vlan tag indicates VLAN-Tag. Both vlan element and tag element should be unique in this xml. A guest connects to this VLan network by setting its xml like this: <interface type='network'> <source network='vlan10'/> </interface> 2. We can enable dhcp for VLan network according to the current way, for example: ... <network> ... <ip address="192.168.126.2" netmask="255.255.255.0"> <dhcp> <range start="192.168.126.120" end="192.168.126.129"/> </dhcp> </ip> </network> ... 3. This can help to build Cross-Host VLan network for guests. We can simplify the work to implement vlan-net of management app (e.g. OpenStack). 1) Distribute the xml of VLan network to all hosts, then 'virsh net-create ...' on each host locally. 2) Makesure the outside switch's port linked to the physical interface (specified by the dev of <forward>) is 'trunk' mode. 3) For each VLan network, ONLY one host can 'net-create' network with ip and dhcp element to avoid dhcp conflict. Shi Lei (3): add functions: load(verify) 8021q module, create/destroy vlan-dev support new forward mode of vlan for virtual network fix other functions to add VIR_NETWORK_FORWARD_VLAN configure.ac | 5 +- src/conf/domain_conf.c | 1 + src/conf/network_conf.c | 12 ++- src/conf/network_conf.h | 1 + src/conf/virnetworkobj.c | 1 + src/libvirt_private.syms | 4 + src/network/bridge_driver.c | 80 ++++++++++++++++-- src/qemu/qemu_process.c | 1 + src/util/virnetdev.c | 195 ++++++++++++++++++++++++++++++++++++++++++++ src/util/virnetdev.h | 14 ++++ 10 files changed, 301 insertions(+), 13 deletions(-) -- 2.7.4

2 10

[libvirt] [PATCH 0/4] qemu: vnc: switch to tls-creds-x509
by Ján Tomko 18 Jul '18

18 Jul '18

Ján Tomko (4): tests: qemu: Remove disk from graphics-vnc-tls FIXDOWN: copy graphics-vnc-tls args to versioned paths tests: qemu: test more versions for graphics-vnc-tls qemu: vnc: switch to tls-creds-x509 src/qemu/qemu_command.c | 26 +++++++++++++---- tests/qemuxml2argvdata/graphics-vnc-tls.args | 2 -- .../graphics-vnc-tls.x86_64-2.4.0.args | 28 ++++++++++++++++++ .../graphics-vnc-tls.x86_64-latest.args | 33 ++++++++++++++++++++++ tests/qemuxml2argvdata/graphics-vnc-tls.xml | 6 ---- tests/qemuxml2argvtest.c | 2 ++ tests/qemuxml2xmloutdata/graphics-vnc-tls.xml | 6 ---- 7 files changed, 83 insertions(+), 20 deletions(-) create mode 100644 tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args create mode 100644 tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args -- 2.16.1

3 10