- Devel - libvirt List Archives

[libvirt] [PATCH] conf: Drop unused variable
by Andrea Bolognani 19 Mar '19

19 Mar '19

The refresh_volume_allocation variable in virStoragePoolDefParseXML() has been unused since its introduction in commit 669018bc9cb1, and Clang rightfully complains about this fact. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed under the build breaker rule. src/conf/storage_conf.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 653602f7be..b797a405f7 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -849,7 +849,6 @@ virStoragePoolDefParseXML(xmlXPathContextPtr ctxt) VIR_AUTOFREE(char *) type = NULL; VIR_AUTOFREE(char *) uuid = NULL; VIR_AUTOFREE(char *) target_path = NULL; - VIR_AUTOFREE(char *) refresh_volume_allocation = NULL; if (VIR_ALLOC(def) < 0) return NULL; -- 2.20.1

1 0

[libvirt] [PATCH] spec: Only call ldconfig on RHEL7
by Cole Robinson 19 Mar '19

19 Mar '19

Since Fedora 28 (our minimum supported build), ldconfig is called automatically for us: https://fedoraproject.org/wiki/Changes/Removing_ldconfig_scriptlets These changes appear to be implemented for rhel > 7 as well, so only run ldconfig on rhel7 Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- libvirt.spec.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 1497cad3d2..445fddc801 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1477,12 +1477,16 @@ exit 0 %post client +%if 0%{?rhel} == 7 /sbin/ldconfig +%endif %systemd_post libvirt-guests.service %postun client +%if 0%{?rhel} == 7 /sbin/ldconfig +%endif %systemd_postun libvirt-guests.service %triggerun client -- libvirt < 0.9.4 -- 2.21.0

2 5

[libvirt] [PATCH v3 0/3] rbd: improvements to actual disk-usage calculation
by jdillama＠redhat.com 19 Mar '19

19 Mar '19

From: Jason Dillaman <dillaman(a)redhat.com> The RBD fast-diff feature can vastly reduce the amount of time needed to calculate actual disk usage of volumes, but it might still be a slow operation for large RBD pools or pools with large RBD images. Therefore, this feature should be able to be optionally disabled if needed. Additionally, the fast-diff feature can only be used if the fast-diff map isn't flagged as invalid. Otherwise, librbd will silently perform a costly block-by-block scan to calculate the disk usage. since v1: - Moved RBD-unique refresh volume allocation override to shared storage pool attribute sice v2: - Moved attribute under new "<refresh><volume allocation='...'/></refresh>" elements. Jason Dillaman (3): rbd: do not attempt to use fast-diff if it's marked invalid storage: optional 'refresh' elemement on pool rbd: optionally compute volume allocation from capacity docs/formatstorage.html.in | 27 ++++++++++++ docs/schemas/storagecommon.rng | 7 ++++ docs/schemas/storagepool.rng | 23 ++++++++++ src/conf/storage_conf.c | 27 ++++++++++++ src/conf/storage_conf.h | 9 ++++ src/storage/storage_backend_rbd.c | 42 +++++++++++++++++-- .../pool-rbd-refresh-volume-allocation.xml | 15 +++++++ .../pool-rbd-refresh-volume-allocation.xml | 18 ++++++++ tests/storagepoolxml2xmltest.c | 1 + 9 files changed, 165 insertions(+), 4 deletions(-) create mode 100644 tests/storagepoolxml2xmlin/pool-rbd-refresh-volume-allocation.xml create mode 100644 tests/storagepoolxml2xmlout/pool-rbd-refresh-volume-allocation.xml -- 2.20.1

2 7

[libvirt] [PATCH 00/34] conf: refactor virStorageSource parsing and formatting (blockdev-add saga)
by Peter Krempa 19 Mar '19

19 Mar '19

Simplify parsing and formatting of virStorageSource into/from XML. This series contains the refactors which unify the various parsers into one with a neat cleanup. The plan is to reuse the parser for parsing job backing chains when the disk frontend will be unplugged by the guest so that we don't lose track of the backing chain members. This series adds support for backing chain of the <mirror> subelement which has a similar reason. If we open a user-formatted file (--reuse-external) and do a shallow copy into it we will need to keep around the backing chain for that as well. It feels fitting to format the backing chain under <mirror> as it might become the disk source later. Peter Krempa (34): conf: Invert 'skipSeclabels' argument of virDomainDiskSourceFormatInternal conf: Move formatting of 'index' and 'startupPolicy' for virStorageSource conf: Introduce virDomainStorageSourceFormatFull qemu: domain: Replace qemuDomainObjPrivateXMLFormatNBDMigrationSource conf: Unexport virDomainStorageSourceFormat conf: domain: Merge virDomainDiskSourceFormatInternal into the wrapper conf: Simplify control flow in virDomainDiskSourceFormat conf: Avoid temporary variable in virDomainDiskBackingStoreFormat conf: Use virXMLFormatElement in virDomainDiskBackingStoreFormat conf: Move virDomainDiskBackingStoreFormat up to avoid forward declarations conf: Move backingStore formating into virDomainDiskSourceFormat conf: Add possibility to format full chain with virDomainStorageSourceFormatFull conf: Simplify error paths in storage source component parsers cleanup error path in virDomainStorageSourceParse util: xml: Introduce VIR_AUTOPTR functions for xmlDoc and xmlXPathContext tests: Use full force of our VIR_AUTO* machinery in testBackingXMLjsonXML tests: Refactor control flow in testBackingXMLjsonXML conf: Refactor control flow in virDomainDiskBackingStoreParse conf: Fold private data parsing into virDomainStorageSourceParse conf: Introduce modular parser for virStorageSource qemu: Use virDomainStorageSourceParseFull when parsing NBD migration data conf: Unexport virDomainStorageSourceParse tests: qemublock: Use new source formatter and parser in testBackingXMLjsonXML conf: snapshot: Use virDomainStorageSourceParseFull for snapshots conf: Replace virDomainDiskSourceParse by virDomainStorageSourceParse conf: Use virDomainStorageSourceParseFull in virDomainDiskBackingStoreParse conf: Use virDomainStorageSourceParseFull to parse disk source in virDomainDiskDefParseXML conf: Use virDomainStorageSourceParseFull in virDomainDiskDefMirrorParse conf: Parse <backingStore> in virDomainStorageSourceParseFull conf: Parse and format 'backingStore' for disk <mirror> conf: Add 'index' attribute for <disk><mirror><source> conf: Format seclabels for <backingStore> conf: Remove @seclabels from virDomainDiskSourceFormat conf: Remove @seclabels from virDomainStorageSourceFormat docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 494 ++++++++++-------- src/conf/domain_conf.h | 32 +- src/conf/snapshot_conf.c | 40 +- src/libvirt_private.syms | 4 +- src/qemu/qemu_domain.c | 104 +--- src/util/virxml.h | 3 + tests/qemublocktest.c | 179 +++---- .../blockjob-mirror-in.xml | 13 + .../qemuxml2argvdata/disk-backing-chains.xml | 6 +- tests/qemuxml2argvdata/disk-mirror.xml | 8 +- .../disk-backing-chains-active.xml | 6 +- .../disk-backing-chains-inactive.xml | 6 +- .../qemuxml2xmloutdata/disk-mirror-active.xml | 8 +- tests/virstoragetest.c | 2 +- 15 files changed, 443 insertions(+), 463 deletions(-) -- 2.20.1

2 68

[libvirt] [PATCH 0/2] numa: deprecate -numa node, mem and default memory distribution
by Igor Mammedov 19 Mar '19

19 Mar '19

1) "I'm considering to deprecating -mem-path/prealloc CLI options and replacing them with a single memdev Machine property to allow interested users to pick used backend for initial RAM (fixes mixed -mem-path+hostmem backends issues) and as a transition step to modeling initial as a Device instead of (ab)using MemoryRegion APIs." (for more details see: https://www.mail-archive.com/qemu-devel@nongnu.org/msg596314.html) However there is a couple of roadblocks on the way (s390x and numa memory handling). I think I finally thought out a way to hack s390x in migration compatible manner, but I don't see a way to do it for -numa node,mem and default RAM assignement to nodes. Considering both numa usecases aren't meaningfully using NUMA (aside guest side testing), and could be replaced with explicitly used memdev parameter, I'd like to propose removing these fake NUMA friends, hence this deprecation. As result of removing deprecated options and replacing initial RAM allocation with 'memdev's (1), QEMU will allocate guest RAM in consistent way, fixing mixed use-case and allowing boards to move towards modelling initial RAM as Device(s). Which in its own turn should allow to cleanup NUMA/HMP/memory accounting code more by dropping ad-hoc node_mem tracking and reusing device enumeration instead. Igor Mammedov (2): numa: deprecate 'mem' parameter of '-numa node' option numa: deprecate implict memory distribution between nodes numa.c | 5 +++++ qemu-deprecated.texi | 21 +++++++++++++++++++++ 2 files changed, 26 insertions(+) -- 2.7.4

6 39

[libvirt] [PATCH v2 0/3] rbd: improvements to actual disk-usage calculation
by jdillama＠redhat.com 19 Mar '19

19 Mar '19

From: Jason Dillaman <dillaman(a)redhat.com> The RBD fast-diff feature can vastly reduce the amount of time needed to calculate actual disk usage of volumes, but it might still be a slow operation for large RBD pools or pools with large RBD images. Therefore, this feature should be able to be optionally disabled if needed. Additionally, the fast-diff feature can only be used if the fast-diff map isn't flagged as invalid. Otherwise, librbd will silently perform a costly block-by-block scan to calculate the disk usage. since v1: - Moved RBD-unique refresh volume allocation override to shared storage pool attribute Jason Dillaman (3): rbd: do not attempt to use fast-diff if it's marked invalid storage: optional 'refresh_volume_allocation' attribute on pool rbd: optionally compute volume allocation from capacity docs/formatstorage.html.in | 15 +++++-- docs/schemas/storagecommon.rng | 7 ++++ docs/schemas/storagepool.rng | 5 +++ src/conf/storage_conf.c | 23 ++++++++++ src/conf/storage_conf.h | 9 ++++ src/storage/storage_backend_rbd.c | 42 +++++++++++++++++-- .../pool-rbd-refresh-volume-allocation.xml | 12 ++++++ .../pool-rbd-refresh-volume-allocation.xml | 15 +++++++ tests/storagepoolxml2xmltest.c | 1 + 9 files changed, 122 insertions(+), 7 deletions(-) create mode 100644 tests/storagepoolxml2xmlin/pool-rbd-refresh-volume-allocation.xml create mode 100644 tests/storagepoolxml2xmlout/pool-rbd-refresh-volume-allocation.xml -- 2.20.1

3 7

[libvirt] [PATCH] network: avoid trying to create global firewall rules if unprivileged
by Daniel P. Berrangé 19 Mar '19

19 Mar '19

The unprivileged libvirtd does not have permission to create firewall rules, or bridge devices, or do anything to the host network in general. Historically we still activate the network driver though and let the network start API call fail. The startup code path which reloads firewall rules on active networks would thus effectively be a no-op when unprivileged as it is impossible for there to be any active networks With the change to use a global set of firewall chains, however, we now have code that is run unconditionally. Ideally we would not register the network driver at all when unprivileged, but the entanglement with the virt drivers currently makes that impractical. As a temporary hack, we just make the firewall reload into a no-op. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/network/bridge_driver.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index c3e1381124..7d95675623 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -2095,6 +2095,10 @@ static void networkReloadFirewallRules(virNetworkDriverStatePtr driver, bool startup) { VIR_INFO("Reloading iptables rules"); + /* Ideally we'd not even register the driver when unprivilegd + * but until we untangle the virt driver that's not viable */ + if (!driver->privileged) + return; if (networkPreReloadFirewallRules(startup) < 0) return; virNetworkObjListForEach(driver->networks, -- 2.20.1

2 2

[libvirt] [PATCH 0/2] network: improve firewall rule creation error handling
by Daniel P. Berrangé 19 Mar '19

19 Mar '19

This is a different approach to solving the problem describd in: https://www.redhat.com/archives/libvir-list/2019-March/msg00584.html That patch would treat each chain creation attempt as non-fatal. This means ipv4 chains still get created if ipv6 is missing, or if a subset of ip[6]tables modules are missing (eg "mangle" chain). This series takes a different approach of splitting IPv4 and IPv6 chain creation. Setup for either address family can succeed/fail independently, however, within an address family everything must still succeed. Improved error reporting means that users will see the root cause error when trying to start an error. So with this series, 'mangle' support is still compulsory for any address family, but if IPv6 lacks mangle support, this won't break IPv4 support. This is good for the default network which only does IPv4 out of the box. Daniel P. Berrangé (2): network: improve error report when firewall chain creation fails network: split setup of ipv4 and ipv6 top level chains src/network/bridge_driver.c | 3 +- src/network/bridge_driver_linux.c | 51 ++++++++++++++++++++++++---- src/network/bridge_driver_nop.c | 3 +- src/network/bridge_driver_platform.h | 2 +- src/util/viriptables.c | 14 +++----- src/util/viriptables.h | 2 +- 6 files changed, 53 insertions(+), 22 deletions(-) -- 2.20.1

3 5

[libvirt] [PATCH] spec: Remove libvirt < 0.9.4 upgrade compat
by Cole Robinson 19 Mar '19

19 Mar '19

These blocks are only triggered when updating from a libvirt version less than 0.9.4, which was released in august 2011. I think it's been long enough that we can say this upgrade path is unsupported without an intermediate step Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- libvirt.spec.in | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 1497cad3d2..dd725baf24 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1444,16 +1444,6 @@ fi rm -rf %{_localstatedir}/lib/rpm-state/libvirt || : -%triggerun -- libvirt < 0.9.4 -%{_bindir}/systemd-sysv-convert --save libvirtd >/dev/null 2>&1 ||: - -# If the package is allowed to autostart: -/bin/systemctl --no-reload enable libvirtd.service >/dev/null 2>&1 ||: - -# Run these because the SysV package being removed won't do them -/sbin/chkconfig --del libvirtd >/dev/null 2>&1 || : -/bin/systemctl try-restart libvirtd.service >/dev/null 2>&1 || : - %if %{with_qemu} %pre daemon-driver-qemu # We want soft static allocation of well-known ids, as disk images @@ -1485,15 +1475,6 @@ exit 0 /sbin/ldconfig %systemd_postun libvirt-guests.service -%triggerun client -- libvirt < 0.9.4 -%{_bindir}/systemd-sysv-convert --save libvirt-guests >/dev/null 2>&1 ||: - -# If the package is allowed to autostart: -/bin/systemctl --no-reload enable libvirt-guests.service >/dev/null 2>&1 ||: - -# Run this because the SysV package being removed won't do them -/sbin/chkconfig --del libvirt-guests >/dev/null 2>&1 || : - %if %{with_sanlock} %post lock-sanlock if getent group sanlock > /dev/null ; then -- 2.21.0

2 1

[libvirt] [PATCH v2 00/36] network: refactor to decouple virt drivers from network driver
by Daniel P. Berrangé 19 Mar '19

19 Mar '19

An update to v1: https://www.redhat.com/archives/libvir-list/2018-December/msg00681.html Currently the network driver registers a set of callbacks with the virt driver in order to handle allocating/releasing network ports associated with guest NICs. This series introduces a virNetworkPortPtr object and associated XML that describes a network port. The virt drivers now call public APIs associated with this new object to create/delete ports for guest NICs. Changed in v2: - Fix many bugs related to upgrades with running VMs - Convert over bandwidth controls to the new APIs - Handle reconnecting VIFs to bridges during startup - Much much more that I can't remember Daniel P. Berrangé (36): network: restrict usage of port management APIs network: pass a virNetworkPtr to port management APIs conf: simplify link from hostdev back to network device network: add missing bandwidth limits for bridge forward type network: use 'bridge' as actual type instead of 'network' util: add helper method for re-attaching a tap device to a bridge network: use virNetDevTapReattachBridge API virt drivers: don't handle type=network after resolving actual network type network: move re-attach of bridge device out of network driver network: move fixup for domain actual net def out of network driver network: unconditionally merge port profiles conf: don't pass interface type into virNetDevBandwidthParse conf: introduce virNetworkPortDefPtr struct and XML support network: stop passing virDomainNetDefPtr into bandwidth functions network: make networkLogAllocation independent of domain conf util: add API for copying virtual port profile data conf: add APIs to convert virDomainNetDef to virNetworkPortDef network: convert networkAllocateActualDevice to virNetworkPortDef network: convert networkNotifyActualDevice to virNetworkPortDef network: convert networkReleaseActualDevice to virNetworkPortDef network: convert hook script to take a network port XML network: remove the virDomainNetBandwidthChangeAllowed callback network: introduce networkAllocatePort network: introduce networkNotifyPort network: introduce networkReleasePort network: introduce networkUpdatePortBandwidth network: add public APIs for network port object access: add permissions for network port objects remote: add support for new network port APIs virsh: add support for network port APIs conf: support recording ports against virNetworkObjPtr network: add implementation of network port APIs lxc, libxl: notify network driver of NICs during reconnect lxc, libxl: save domain status after reconnect conf: record a portid against the domain conf conf: switch over to use network port APIs for virt drivers docs/formatdomain.html.in | 8 + docs/hooks.html.in | 24 +- docs/schemas/domaincommon.rng | 5 + include/libvirt/libvirt-network.h | 122 ++ include/libvirt/virterror.h | 3 + src/access/genpolkit.pl | 2 +- src/access/viraccessdriver.h | 6 + src/access/viraccessdrivernop.c | 11 + src/access/viraccessdriverpolkit.c | 26 + src/access/viraccessdriverstack.c | 25 + src/access/viraccessmanager.c | 16 + src/access/viraccessmanager.h | 6 + src/access/viraccessperm.c | 6 + src/access/viraccessperm.h | 44 + src/conf/Makefile.inc.am | 2 + src/conf/domain_conf.c | 558 ++++++- src/conf/domain_conf.h | 63 +- src/conf/netdev_bandwidth_conf.c | 22 +- src/conf/netdev_bandwidth_conf.h | 2 +- src/conf/network_conf.c | 4 +- src/conf/virnetworkobj.c | 303 ++++ src/conf/virnetworkobj.h | 34 + src/conf/virnetworkportdef.c | 514 +++++++ src/conf/virnetworkportdef.h | 112 ++ src/datatypes.c | 60 + src/datatypes.h | 41 + src/driver-network.h | 41 + src/libvirt-network.c | 444 ++++++ src/libvirt_private.syms | 24 +- src/libvirt_public.syms | 16 + src/libxl/libxl_conf.c | 21 +- src/libxl/libxl_domain.c | 28 +- src/libxl/libxl_driver.c | 60 +- src/lxc/lxc_driver.c | 37 +- src/lxc/lxc_process.c | 56 +- src/network/bridge_driver.c | 1364 +++++++++-------- src/qemu/qemu_command.c | 11 +- src/qemu/qemu_domain_address.c | 4 +- src/qemu/qemu_driver.c | 10 +- src/qemu/qemu_hotplug.c | 84 +- src/qemu/qemu_hotplug.h | 2 +- src/qemu/qemu_interface.c | 12 +- src/qemu/qemu_process.c | 32 +- src/remote/remote_daemon_dispatch.c | 73 + src/remote/remote_driver.c | 69 + src/remote/remote_protocol.x | 124 +- src/remote_protocol-structs | 69 + src/rpc/gendispatch.pl | 18 +- src/util/virerror.c | 9 + src/util/virhook.c | 4 +- src/util/virhook.h | 4 +- src/util/virhostdev.c | 17 +- src/util/virnetdevtap.c | 69 + src/util/virnetdevtap.h | 12 + src/util/virnetdevvportprofile.c | 16 + src/util/virnetdevvportprofile.h | 2 + tests/Makefile.am | 7 + .../net-virtio-network-portgroup.xml | 6 +- tests/virnetdevbandwidthtest.c | 2 +- .../plug-bridge-mactbl.xml | 9 + .../virnetworkportxml2xmldata/plug-bridge.xml | 12 + .../virnetworkportxml2xmldata/plug-direct.xml | 12 + .../plug-hostdev-pci.xml | 12 + tests/virnetworkportxml2xmldata/plug-none.xml | 8 + tests/virnetworkportxml2xmltest.c | 104 ++ tools/virsh-completer.c | 51 + tools/virsh-completer.h | 4 + tools/virsh-network.c | 399 ++++- tools/virsh-network.h | 5 + 69 files changed, 4532 insertions(+), 850 deletions(-) create mode 100644 src/conf/virnetworkportdef.c create mode 100644 src/conf/virnetworkportdef.h create mode 100644 tests/virnetworkportxml2xmldata/plug-bridge-mactbl.xml create mode 100644 tests/virnetworkportxml2xmldata/plug-bridge.xml create mode 100644 tests/virnetworkportxml2xmldata/plug-direct.xml create mode 100644 tests/virnetworkportxml2xmldata/plug-hostdev-pci.xml create mode 100644 tests/virnetworkportxml2xmldata/plug-none.xml create mode 100644 tests/virnetworkportxml2xmltest.c -- 2.20.1

3 39

[libvirt] [PATCH v5] openvswitch: Add new port VLAN mode "802.1ad"
by ZhiPeng LU 18 Mar '19

18 Mar '19

This patch adds functionality to allow libvirt to configure the '802.1ad' modes(802.1ad double-tagged) on openvswitch networks. For example: <interface type='bridge'> <mac address='2c:da:41:1d:05:42'/> <source bridge='ovs0'/> <vlan> <tag id='41' nativeMode='dot1q-tunnel'/> </vlan> <virtualport type='openvswitch'> <parameters interfaceid='6401a152-0b99-40b5-92be-858810aa6d37'/> </virtualport> <model type='virtio'/> <driver name='vhost'/> <alias name='net0'/> </interface> Signed-off-by: ZhiPeng Lu <luzhipeng(a)uniudc.com> --- v1->v2: 1. Fix "make syntax-check" failure v2->v3: 1. remove other_config when updating vlan v3->v4: 1. add commit message that has a brief description of the new feature 2. add tests for 'dot1q-tunnel' vlan mode v4->v5: 1. modify some description and format v4-resend: https://www.redhat.com/archives/libvir-list/2019-February/msg00988.html docs/formatdomain.html.in | 33 +++++++++++++++------- docs/formatnetwork.html.in | 26 ++++++++++------- docs/schemas/networkcommon.rng | 1 + src/conf/netdev_vlan_conf.c | 2 +- src/util/virnetdevopenvswitch.c | 7 +++++ src/util/virnetdevvlan.h | 1 + tests/networkxml2xmlin/openvswitch-net.xml | 9 ++++++ tests/networkxml2xmlout/openvswitch-net.xml | 9 ++++++ .../openvswitch-net-modified.xml | 9 ++++++ .../openvswitch-net-more-portgroups.xml | 9 ++++++ .../openvswitch-net-without-alice.xml | 9 ++++++ 11 files changed, 94 insertions(+), 21 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index b848e53..253f329 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -6097,6 +6097,13 @@ qemu-kvm -net nic,model=? /dev/null </vlan> ... </interface> + <interface type='bridge'> + <vlan trunk='yes'> + <tag id='42'/> + <tag id='555' nativeMode='802.1ad'/> + </vlan> + ... + </interface> </devices> ...</pre> @@ -6132,16 +6139,22 @@ qemu-kvm -net nic,model=? /dev/null For network connections using Open vSwitch it is also possible - to configure 'native-tagged' and 'native-untagged' VLAN modes - Since 1.1.0. This is done with the - optional <code>nativeMode</code> attribute on - the <code><tag></code> subelement: <code>nativeMode</code> - may be set to 'tagged' or 'untagged'. The <code>id</code> - attribute of the <code><tag></code> subelement - containing <code>nativeMode</code> sets which VLAN is considered - to be the "native" VLAN for this interface, and - the <code>nativeMode</code> attribute determines whether or not - traffic for that VLAN will be tagged. + to configure the following VLAN modes: + + <ul> + <li>'tagged' Since 1.1.0.</li> + <li>'untagged' Since 1.1.0.</li> + <li>'802.1ad' Since 5.1.0.</li> + </ul> + + This is done with the optional <code>nativeMode</code> attribute + on the <code><tag></code> subelement. The attribute may be + set to a string from the above list. The <code>id</code> attribute + of the <code><tag></code> subelement containing + <code>nativeMode</code> sets which VLAN is considered to be the + "native" VLAN for this interface and the <code>nativeMode</code> + attribute determines whether or not traffic for that VLAN will be + tagged or 802.1ad double tagged. <h5><a id="elementLink">Modifying virtual link state</a></h5> diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index 509cca9..eea86f4 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -705,16 +705,22 @@ For network connections using Open vSwitch it is also possible - to configure 'native-tagged' and 'native-untagged' VLAN modes - Since 1.1.0. This is done with the - optional <code>nativeMode</code> attribute on - the <code><tag></code> subelement: <code>nativeMode</code> - may be set to 'tagged' or 'untagged'. The <code>id</code> - attribute of the <code><tag></code> subelement - containing <code>nativeMode</code> sets which VLAN is considered - to be the "native" VLAN for this interface, and - the <code>nativeMode</code> attribute determines whether or not - traffic for that VLAN will be tagged. + to configure the following VLAN modes: + + <ul> + <li>'tagged' Since 1.1.0.</li> + <li>'untagged' Since 1.1.0.</li> + <li>'802.1ad' Since 5.1.0.</li> + </ul> + + This is done with the optional <code>nativeMode</code> attribute + on the <code><tag></code> subelement. The attribute may be + set to a string from the above list. The <code>id</code> attribute + of the <code><tag></code> subelement containing + <code>nativeMode</code> sets which VLAN is considered to be the + "native" VLAN for this interface and the <code>nativeMode</code> + attribute determines whether or not traffic for that VLAN will be + tagged or 802.1ad double tagged. <code><vlan></code> elements can also be specified in diff --git a/docs/schemas/networkcommon.rng b/docs/schemas/networkcommon.rng index 2699555..7262783 100644 --- a/docs/schemas/networkcommon.rng +++ b/docs/schemas/networkcommon.rng @@ -223,6 +223,7 @@ <choice> <value>tagged</value> <value>untagged</value> + <value>802.1ad</value> </choice> </attribute> </optional> diff --git a/src/conf/netdev_vlan_conf.c b/src/conf/netdev_vlan_conf.c index 57d73ed..54e2b02 100644 --- a/src/conf/netdev_vlan_conf.c +++ b/src/conf/netdev_vlan_conf.c @@ -25,7 +25,7 @@ #define VIR_FROM_THIS VIR_FROM_NONE VIR_ENUM_IMPL(virNativeVlanMode, VIR_NATIVE_VLAN_MODE_LAST, - "default", "tagged", "untagged", + "default", "tagged", "untagged", "802.1ad", ); int diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index 4fa3a57..d8268bc 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -85,6 +85,11 @@ virNetDevOpenvswitchConstructVlans(virCommandPtr cmd, virNetDevVlanPtr virtVlan) virCommandAddArg(cmd, "vlan_mode=native-untagged"); virCommandAddArgFormat(cmd, "tag=%d", virtVlan->nativeTag); break; + case VIR_NATIVE_VLAN_MODE_8021AD: + virCommandAddArg(cmd, "vlan_mode=dot1q-tunnel"); + virCommandAddArg(cmd, "other_config:qinq-ethtype=802.1q"); + virCommandAddArgFormat(cmd, "tag=%d", virtVlan->nativeTag); + break; case VIR_NATIVE_VLAN_MODE_DEFAULT: default: break; @@ -498,6 +503,8 @@ int virNetDevOpenvswitchUpdateVlan(const char *ifname, "--", "--if-exists", "clear", "Port", ifname, "tag", "--", "--if-exists", "clear", "Port", ifname, "trunk", "--", "--if-exists", "clear", "Port", ifname, "vlan_mode", + "--", "--if-exists", "remove", "Port", ifname, + "other_config", "qinq-ethtype", "--", "--if-exists", "set", "Port", ifname, NULL); if (virNetDevOpenvswitchConstructVlans(cmd, virtVlan) < 0) diff --git a/src/util/virnetdevvlan.h b/src/util/virnetdevvlan.h index 2a13759..54109c6 100644 --- a/src/util/virnetdevvlan.h +++ b/src/util/virnetdevvlan.h @@ -27,6 +27,7 @@ typedef enum { VIR_NATIVE_VLAN_MODE_DEFAULT = 0, VIR_NATIVE_VLAN_MODE_TAGGED, VIR_NATIVE_VLAN_MODE_UNTAGGED, + VIR_NATIVE_VLAN_MODE_8021AD, VIR_NATIVE_VLAN_MODE_LAST } virNativeVlanMode; diff --git a/tests/networkxml2xmlin/openvswitch-net.xml b/tests/networkxml2xmlin/openvswitch-net.xml index 2f6084d..5734d36 100644 --- a/tests/networkxml2xmlin/openvswitch-net.xml +++ b/tests/networkxml2xmlin/openvswitch-net.xml @@ -30,4 +30,13 @@ <parameters profileid='native-profile'/> </virtualport> </portgroup> + <portgroup name='8021ad'> + <vlan trunk='yes'> + <tag id='555' nativeMode='802.1ad'/> + <tag id='666'/> + </vlan> + <virtualport> + <parameters profileid='8021ad-profile'/> + </virtualport> + </portgroup> </network> diff --git a/tests/networkxml2xmlout/openvswitch-net.xml b/tests/networkxml2xmlout/openvswitch-net.xml index 2f6084d..5734d36 100644 --- a/tests/networkxml2xmlout/openvswitch-net.xml +++ b/tests/networkxml2xmlout/openvswitch-net.xml @@ -30,4 +30,13 @@ <parameters profileid='native-profile'/> </virtualport> </portgroup> + <portgroup name='8021ad'> + <vlan trunk='yes'> + <tag id='555' nativeMode='802.1ad'/> + <tag id='666'/> + </vlan> + <virtualport> + <parameters profileid='8021ad-profile'/> + </virtualport> + </portgroup> </network> diff --git a/tests/networkxml2xmlupdateout/openvswitch-net-modified.xml b/tests/networkxml2xmlupdateout/openvswitch-net-modified.xml index cc0c344..ed605bf 100644 --- a/tests/networkxml2xmlupdateout/openvswitch-net-modified.xml +++ b/tests/networkxml2xmlupdateout/openvswitch-net-modified.xml @@ -30,4 +30,13 @@ <parameters profileid='native-profile'/> </virtualport> </portgroup> + <portgroup name='8021ad'> + <vlan trunk='yes'> + <tag id='555' nativeMode='802.1ad'/> + <tag id='666'/> + </vlan> + <virtualport> + <parameters profileid='8021ad-profile'/> + </virtualport> + </portgroup> </network> diff --git a/tests/networkxml2xmlupdateout/openvswitch-net-more-portgroups.xml b/tests/networkxml2xmlupdateout/openvswitch-net-more-portgroups.xml index 7c19ad9..0237e42 100644 --- a/tests/networkxml2xmlupdateout/openvswitch-net-more-portgroups.xml +++ b/tests/networkxml2xmlupdateout/openvswitch-net-more-portgroups.xml @@ -41,4 +41,13 @@ <parameters profileid='native-profile'/> </virtualport> </portgroup> + <portgroup name='8021ad'> + <vlan trunk='yes'> + <tag id='555' nativeMode='802.1ad'/> + <tag id='666'/> + </vlan> + <virtualport> + <parameters profileid='8021ad-profile'/> + </virtualport> + </portgroup> </network> diff --git a/tests/networkxml2xmlupdateout/openvswitch-net-without-alice.xml b/tests/networkxml2xmlupdateout/openvswitch-net-without-alice.xml index 4104424..cb9d12d 100644 --- a/tests/networkxml2xmlupdateout/openvswitch-net-without-alice.xml +++ b/tests/networkxml2xmlupdateout/openvswitch-net-without-alice.xml @@ -20,4 +20,13 @@ <parameters profileid='native-profile'/> </virtualport> </portgroup> + <portgroup name='8021ad'> + <vlan trunk='yes'> + <tag id='555' nativeMode='802.1ad'/> + <tag id='666'/> + </vlan> + <virtualport> + <parameters profileid='8021ad-profile'/> + </virtualport> + </portgroup> </network> -- 1.8.3.1

5 5

[libvirt] [PATCH] vz: build fix for virStorageBackendVzPoolStart
by Nikolay Shirokovskiy 18 Mar '19

18 Mar '19

Remove unused variable. Fix for [1] [1] 821dd6d8: storage: Use VIR_AUTOFREE for storage backends Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com> --- Pushed as trivial build fix. src/storage/storage_backend_vstorage.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/storage/storage_backend_vstorage.c b/src/storage/storage_backend_vstorage.c index df157a4..d446aa2 100644 --- a/src/storage/storage_backend_vstorage.c +++ b/src/storage/storage_backend_vstorage.c @@ -37,7 +37,6 @@ virStorageBackendVzPoolBuild(virStoragePoolObjPtr pool, static int virStorageBackendVzPoolStart(virStoragePoolObjPtr pool) { - int ret = -1; virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); VIR_AUTOFREE(char *) grp_name = NULL; VIR_AUTOFREE(char *) usr_name = NULL; -- 1.8.3.1

3 4

[libvirt] [PATCH v2 0/2] Facilitate running libvirt builds via docker containers
by Daniel P. Berrangé 18 Mar '19

18 Mar '19

For a while QEMU has provided simple make rules for building QEMU inside standard docker container environments. This provides an equivalent mechanism for libvirt inspired by QEMU's. QEMU actually builds the container images on developer's machines locally. Libvirt already hosts pre-built images on quay.io, so that is used directly as it is quicker to download them than to build them locally. This also ensures the container contents match what the live CI system is using, as opposed to building an image with newer packages. Changed in v2: - Drop cross-compilation patches temporarily. The cross-compiler images are not yet built on quay.io and rather than creating and bulding many more images manually, I'm working on script to automate setup of quay.io images - Many changes to the make rules to make it possible to use them from Travis CI to match its currently testing setup - Modify Travis CI config to use the new make rules for consistency Daniel P. Berrangé (2): tests: add targets for building libvirt inside docker containers travis: convert ubuntu, centos & mingw builds to use new make rules .gitignore | 1 + .travis.yml | 48 +++--------- Makefile.am | 2 + tests/Makefile.ci.inc | 174 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 187 insertions(+), 38 deletions(-) create mode 100644 tests/Makefile.ci.inc -- 2.20.1

2 11

[libvirt] [PATCH] tests: domaincapstest: Fix build on mingw
by Cole Robinson 18 Mar '19

18 Mar '19

fillStringValues is only used if WITH_QEMU || WITH_BHYVE Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- Pushed under build break rule tests/domaincapstest.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index 1aa8c023a2..2cccfbc8e2 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -24,6 +24,7 @@ #define VIR_FROM_THIS VIR_FROM_NONE +#if WITH_QEMU || WITH_BHYVE static int ATTRIBUTE_SENTINEL fillStringValues(virDomainCapsStringValuesPtr values, ...) { @@ -44,6 +45,7 @@ fillStringValues(virDomainCapsStringValuesPtr values, ...) return ret; } +#endif /* WITH_QEMU || WITH_BHYVE */ #if WITH_QEMU # include "testutilsqemu.h" -- 2.21.0

1 0

[libvirt] [PATCH] iptablesSetupPrivateChains: Be forgiving if a table does not exist
by Michal Privoznik 18 Mar '19

18 Mar '19

The way this function works is that for both iptables and ip6tables (or their firewalld friends) and for every table ("filter", "nat", "mangle") it lists chains defined for the table and then calls iptablesPrivateChainCreate() over the list. The callback is then supposed to find libvirt private chains and if not found create rules to add them. So far so good. Problem is if one of the tables doesn't exist (e.g. due to a module missing). For instance, on my system I don't have CONFIG_IP6_NF_MANGLE enabled therefore I'm lacking "mangle" table for ip6tables. This means that the whole operation of setting up private chains fails because the whole transaction is run as "do not ignore errors". The solution is to have two transactions, the first one which just lists chains can run ignoring errors, and the second one which then installs the private chains will run normally. In the code, this approach is pushed to another level - every table for which private chains are created is run as a separate transaction. The reason is that it saves us one more variable where we would track if the second transaction was started already or not; and also, it doesn't matter. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/viriptables.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/util/viriptables.c b/src/util/viriptables.c index d67b640a3b..ea24b03ec8 100644 --- a/src/util/viriptables.c +++ b/src/util/viriptables.c @@ -101,6 +101,16 @@ iptablesPrivateChainCreate(virFirewallPtr fw, tmp++; } + /* This function is running in the context of the very first transaction, + * which does nothing more than just lists current tables and chains. But + * since some tables might not be there (e.g. because of a module missing), + * the transaction is run with IGNORE_ERRORS flag. But obviously, we don't + * want to ignore errors here, where we are constructing our own chains and + * rules. The only way to resolve this is to start a new transaction so + * that all those AddRule() calls below add rules to new transaction/group. + */ + virFirewallStartTransaction(fw, 0); + for (i = 0; i < data->nchains; i++) { const char *from; if (!virHashLookup(chains, data->chains[i].child)) { @@ -160,7 +170,7 @@ iptablesSetupPrivateChains(void) fw = virFirewallNew(); - virFirewallStartTransaction(fw, 0); + virFirewallStartTransaction(fw, VIR_FIREWALL_TRANSACTION_IGNORE_ERRORS); for (i = 0; i < ARRAY_CARDINALITY(data); i++) virFirewallAddRuleFull(fw, data[i].layer, -- 2.19.2

3 6

[libvirt] [PATCH 0/2] virsh: man: Document quirks of detaching devices
by Peter Krempa 18 Mar '19

18 Mar '19

Peter Krempa (2): virsh: man: Document quirks of device-detach and friends virsh: man: Document asynchronous behaviour of detach-device-alias tools/virsh.pod | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) -- 2.20.1

4 6

[libvirt] [PATCH] tests: Document how to add new replies files
by Andrea Bolognani 18 Mar '19

18 Mar '19

We already document how to generate them, so might as well go the extra mile and document the remaining steps. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- tests/qemucapabilitiestest.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index 16c2832ffb..4c9b7c5322 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -230,6 +230,14 @@ mymain(void) * * If you manually edit replies files you can run * "tests/qemucapsfixreplies foo.replies" to fix the replies ids. + * + * Once a replies file has been generated and tweaked if necessary, + * you can drop it into tests/qemucapabilitiesdata/ (with a sensible + * name - look at what's already there for inspiration) and test + * programs will automatically pick it up. + * + * To generate the corresponding output files after a new replies + * file has been added, run "VIR_TEST_REGENERATE_OUTPUT=1 make check". */ testQemuDataReset(&data); -- 2.20.1

2 1

[libvirt] [PATCH v2 00/16] domcaps: use virTristateBool
by Cole Robinson 18 Mar '19

18 Mar '19

v1 posting: https://www.redhat.com/archives/libvir-list/2019-February/msg01088.html v2 changes: - Rebase to master - Remove the full.xml test in patch #3 - Add virCapsEnum 'format' and use it - Extend docs to explain optional XML v1 cover letter: Extending domaincapabilities with new XML schema is currently a bit of a maintenance pain. Consider the case of adding a new enum for listing <sound> models. I want to output this info for the qemu driver. Internally in the domaincapabilities plumbing, whether a <device> is supported= is tracked with boolean true/false. If I extend that pattern for <sound> devices and fill in data for the qemu driver, the other domcaps implementations will now automatically output a new XML element: <sound supported='no'> Now, for bhyve I can 'git grep' confirm that it doesn't have any <sound> support, but for xen/libxl it _is_ supported. So if I don't fill in accurate support in the xen driver, I've just made their domcaps report blatantly incorrect info. Ideally I would make these <sound> changes and the other drivers output would _not_ change. xen output would now be incomplete, but not obviously wrong, which is easier on me the developer, and safer for the API consumer. This moves domcaps plumbing in that direction. It switches most internal 'supported' fields to virTristateBool so we can track an ABSENT state and map that to outputting no XML. Explicit supported='no' values are filled in where needed to ensure existing driver XML doesn't change. cpu and sev supported= values are left unconverted, but they require semi-special handling anyways so aren't really affected by the problem I laid out above. In v2, I additionally added a mechanism to make <enum> values optionally formatted. Right now whenever a new <enum> is added, if the parent bit is supported (like <disk supported='yes'/>), the new <enum> is automatically formatted as well. This has the same problem described above with the @supported bit. Now drivers are required to set a virCapsPtr.report = true if they want the <enum> to be formatted. Existing drives have this value filled in to maintain back compat. Again, bhyve changes are untested. If someone can give them a spin that would be appreciated, otherwise I will try to get a freebsd build setup. Cole Robinson (16): tests: domcaps: Add a default 'empty' test tests: domcaps: Remove unused typedef tests: domcaps: Remove 'full' test conf: domcaps: Add single line formatting macro conf: domcaps: use virTristateBool for 'supported' qemu: domcaps: fill in explicit supported BOOL_NO libxl: domcaps: fill in explicit supported BOOL_NO bhyve: domcaps: fill in explicit supported BOOL_NO schemas: domcaps: Make more elements optional conf: domcaps: Don't output XML on tristate ABSENT conf: domcaps: Add virCapsEnum 'report' qemu: fill in virCapsEnum 'report' libxl: fill in virCapsEnum 'report' bhyve: fill in virCapsEnum 'report' conf: domcaps: Don't format XML on report=false docs: formatdomaincaps: Describe optional XML changes docs/formatdomaincaps.html.in | 11 +++ docs/schemas/domaincaps.rng | 20 ++++- src/bhyve/bhyve_capabilities.c | 27 ++++-- src/conf/domain_capabilities.c | 31 ++++--- src/conf/domain_capabilities.h | 21 ++--- src/libxl/libxl_capabilities.c | 31 +++++-- src/qemu/qemu_capabilities.c | 41 ++++++--- tests/domaincapsschemadata/empty.xml | 16 ++++ tests/domaincapsschemadata/full.xml | 123 --------------------------- tests/domaincapstest.c | 79 +---------------- 10 files changed, 155 insertions(+), 245 deletions(-) create mode 100644 tests/domaincapsschemadata/empty.xml delete mode 100644 tests/domaincapsschemadata/full.xml -- 2.20.1

2 20

[libvirt] [PATCH] node_device_hal.c: Follow _class -> klass rename
by Michal Privoznik 18 Mar '19

18 Mar '19

In 0eca80e60 _class was renamed to klass for variety of struct members. However, gather_usb_cap() was missed out in this rename leaving FreeBSD build broken. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial and build-breker rules. src/node_device/node_device_hal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c index b77c743305..d1eb6c7851 100644 --- a/src/node_device/node_device_hal.c +++ b/src/node_device/node_device_hal.c @@ -171,7 +171,7 @@ gather_usb_cap(LibHalContext *ctx, const char *udi, (void)get_int_prop(ctx, udi, "usb.interface.number", (int *)&d->usb_if.number); (void)get_int_prop(ctx, udi, "usb.interface.class", - (int *)&d->usb_if._class); + (int *)&d->usb_if.klass); (void)get_int_prop(ctx, udi, "usb.interface.subclass", (int *)&d->usb_if.subclass); (void)get_int_prop(ctx, udi, "usb.interface.protocol", -- 2.19.2

1 0

[libvirt] [PATCH 0/2] storage: fix rbd deprecations in ceph 14
by Daniel P. Berrangé 18 Mar '19

18 Mar '19

Latest ceph has deprecated the rbd_list API and this is present in Fedora 30/31-rawhide Technically this is a build breaker fix, but the patches are complex enough that they would benefit from review before pushing. Daniel P. Berrangé (2): storage: split off code for calling rbd_list storage: add support for new rbd_list2 method m4/virt-storage-rbd.m4 | 1 + src/storage/storage_backend_rbd.c | 116 +++++++++++++++++++++++------- 2 files changed, 92 insertions(+), 25 deletions(-) -- 2.20.1

2 4

[libvirt] [PATCH] Drop needless virtType validation
by Cole Robinson 18 Mar '19

18 Mar '19

This code originates from: commit d0aa10fdd6c108ad442886e4451b2629a3dc8b86 Author: Daniel P. Berrange <berrange(a)redhat.com> Date: Tue Mar 3 12:03:44 2009 +0000 QEMU security driver usage for sVirt support (James Morris, Dan Walsh, Daniel Berrange) Originally in the qemudDomainGetSecurityLabel function. It doesn't appear to have done anything useful back then either. The other two instances look like copy+paste Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/lxc/lxc_driver.c | 7 ------- src/qemu/qemu_driver.c | 14 -------------- 2 files changed, 21 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 760f9f8bdf..e981f8e901 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1268,13 +1268,6 @@ static int lxcDomainGetSecurityLabel(virDomainPtr dom, virSecurityLabelPtr secla if (virDomainGetSecurityLabelEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - if (!virDomainVirtTypeToString(vm->def->virtType)) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("unknown virt type in domain definition '%d'"), - vm->def->virtType); - goto cleanup; - } - /* * Theoretically, the pid can be replaced during this operation and * return the label of a different process. If atomicity is needed, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 3615270650..a16eab5467 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6445,13 +6445,6 @@ static int qemuDomainGetSecurityLabel(virDomainPtr dom, virSecurityLabelPtr secl if (virDomainGetSecurityLabelEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - if (!virDomainVirtTypeToString(vm->def->virtType)) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("unknown virt type in domain definition '%d'"), - vm->def->virtType); - goto cleanup; - } - /* * Theoretically, the pid can be replaced during this operation and * return the label of a different process. If atomicity is needed, @@ -6493,13 +6486,6 @@ static int qemuDomainGetSecurityLabelList(virDomainPtr dom, if (virDomainGetSecurityLabelListEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - if (!virDomainVirtTypeToString(vm->def->virtType)) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("unknown virt type in domain definition '%d'"), - vm->def->virtType); - goto cleanup; - } - /* * Check the comment in qemuDomainGetSecurityLabel function. */ -- 2.21.0

2 1

[libvirt] [PATCH] qemu: Compare group_names by STRNEQ not CHECK_EQ
by Han Han 18 Mar '19

18 Mar '19

Fix issue introduced by 047cfb05ee. Since group_name is str, use STRNEQ instead of CHECK_EQ to do comparition. Signed-off-by: Han Han <hhan(a)redhat.com> --- src/qemu/qemu_domain.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 86e80391e1..e6d0fbef04 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9387,9 +9387,14 @@ qemuDomainDiskChangeSupported(virDomainDiskDefPtr disk, CHECK_EQ(blkdeviotune.size_iops_sec, "blkdeviotune size_iops_sec", true); - CHECK_EQ(blkdeviotune.group_name, - "blkdeviotune group_name", - true); + if (disk->blkdeviotune.group_name) { + if (STRNEQ(disk->blkdeviotune.group_name, orig_disk->blkdeviotune.group_name)) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, + _("cannot modify field '%s' of the disk"), + "target"); + return false; + } + } if (disk->serial && STRNEQ_NULLABLE(disk->serial, orig_disk->serial)) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, -- 2.20.1

3 2

[libvirt] [PATCH v6 0/8] Incremental backups: virDomainSnapshot class
by Eric Blake 18 Mar '19

18 Mar '19

This is a respin of patch 4/20 in my larger series: https://www.redhat.com/archives/libvir-list/2019-March/msg00386.html As John pointed out, my v4/v5 posting had a LOT of duplicate code, including lots of poorly commented code managing a potential tree of checkpoints (even if the more immediate use tends to be a linear chain than a full-blown tree), all because I had copied-and-pasted from snapshot code. Copy-and-paste is technical debt; better is to get rid of the debt by refactoring the code for easy reuse. Here's as far as I got today, but hopefully reviewers agree that this glimpse of where things are headed is worthwhile, and I can start pushing these patches while continuing my cleanup work on the rest of the incremental backup stuff. Pre-series, virDomainSnapshotList() code in snapshot_conf.h can only compute a list of virDomainSnapshotPtrs; once this series is applied, that function will instead be changed to compute a list of virDomainMomentPtrs (which is then trivially cast to virDomainSnapshotPtr or virDomainCheckpointPtr as needed), so that all the code related to maintaining relationships between points in time can be shared rather than duplicated between snapshots and checkpoints. Eric Blake (8): snapshot: Split domain forward typedefs into new file snapshot: Sort virconftypes.h snapshot: Break out virDomainSnapshotObj into its own file snapshot: Export two functions prior to file split snapshot: Break out virDomainSnapshotObjList into its own file snapshot: Use accessors for virDomainSnapshot members snapshot: Create virDomainMoment base class backup: Introduce virDomainCheckpointPtr include/libvirt/virterror.h | 6 +- src/util/virerror.c | 12 +- include/libvirt/libvirt.h | 6 +- src/conf/domain_conf.h | 220 +--------- src/conf/snapshot_conf.h | 74 +--- src/conf/virconftypes.h | 281 +++++++++++++ src/conf/virdomainsnapshotobj.h | 50 +++ src/conf/virdomainsnapshotobjlist.h | 74 ++++ src/datatypes.h | 79 +++- src/conf/Makefile.inc.am | 5 + src/conf/domain_conf.c | 1 + src/conf/snapshot_conf.c | 608 +--------------------------- src/conf/virdomainobjlist.c | 1 + src/conf/virdomainsnapshotobj.c | 123 ++++++ src/conf/virdomainsnapshotobjlist.c | 553 +++++++++++++++++++++++++ src/datatypes.c | 132 ++++-- src/esx/esx_driver.c | 66 +-- src/libvirt-domain-snapshot.c | 26 +- src/libvirt_private.syms | 38 +- src/qemu/qemu_command.c | 1 + src/qemu/qemu_domain.c | 1 + src/qemu/qemu_driver.c | 41 +- src/qemu/qemu_migration.c | 1 + src/remote/remote_daemon_dispatch.c | 4 +- src/remote/remote_driver.c | 4 +- src/rpc/gendispatch.pl | 2 +- src/test/test_driver.c | 21 +- src/vbox/vbox_common.c | 56 +-- src/vz/vz_driver.c | 52 +-- 29 files changed, 1450 insertions(+), 1088 deletions(-) create mode 100644 src/conf/virconftypes.h create mode 100644 src/conf/virdomainsnapshotobj.h create mode 100644 src/conf/virdomainsnapshotobjlist.h create mode 100644 src/conf/virdomainsnapshotobj.c create mode 100644 src/conf/virdomainsnapshotobjlist.c -- 2.20.1

6 35

[libvirt] [PATCH] virQEMUDriverPtr clean up
by Humaid 18 Mar '19

18 Mar '19

From: Ubuntu <shbh(a)Ubuntu1.4obxdks5shaudmr0jmg1ainqgb.bx.internal.cloudapp.net> --- src/qemu/qemu_tpm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index 835a9caf46..b60e443f14 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -834,16 +834,16 @@ qemuExtTPMStartEmulator(virQEMUDriverPtr driver, int -qemuExtTPMStart(virQEMUDriverPtr driver, - virDomainObjPtr vm, +qemuExtTPMStart(virDomainObjPtr vm, qemuDomainLogContextPtr logCtxt) { int ret = 0; + qemuDomainObjPrivatePtr priv = vm->privateData; virDomainTPMDefPtr tpm = vm->def->tpm; switch (tpm->type) { case VIR_DOMAIN_TPM_TYPE_EMULATOR: - ret = qemuExtTPMStartEmulator(driver, vm, logCtxt); + ret = qemuExtTPMStartEmulator(priv->driver, vm, logCtxt); break; case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH: case VIR_DOMAIN_TPM_TYPE_LAST: -- 2.17.1

3 2

[libvirt] [PATCH v3 0/2] Couple of storage driver improvements
by Michal Privoznik 18 Mar '19

18 Mar '19

v3 of: https://www.redhat.com/archives/libvir-list/2019-March/msg00326.html diff to v2: - Patches acked in v2 are pushed now, - Patch 1/2 is a resurrection of patch 1/6 from v1. As Pavel found out we can't use writesame(), so let's simplify write() at least. - Patch 2/2 now checks for VSTORAGE too. Michal Prívozník (2): storage_backend_iscsi_direct: Simplify vol zeroing storageVolWipePattern: Don't take shortcut to refreshPool() src/storage/storage_backend_iscsi_direct.c | 26 ++++++++++++---------- src/storage/storage_driver.c | 15 ++++++++----- 2 files changed, 24 insertions(+), 17 deletions(-) -- 2.19.2

2 3