November 2020 - Devel - libvirt List Archives

[libvirt PATCH] Revert "Revert "spec: Simplify setting features off by default""
by Andrea Bolognani 06 Nov '20

06 Nov '20

As explained in the original commit (31d687a3218c), these values are actually unaffected by the corresponding _without_* macros and so we can leave out the additional processing / obfuscation. This reverts commit ae23a87d85cfc2a964123d9bd44157a411428c0a. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- libvirt.spec.in | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 84515cc7de..2a4324b974 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -98,14 +98,14 @@ %define with_numactl 0%{!?_without_numactl:1} # A few optional bits off by default, we enable later -%define with_fuse 0%{!?_without_fuse:0} -%define with_sanlock 0%{!?_without_sanlock:0} -%define with_numad 0%{!?_without_numad:0} -%define with_firewalld_zone 0%{!?_without_firewalld:0} -%define with_libssh2 0%{!?_without_libssh2:0} -%define with_wireshark 0%{!?_without_wireshark:0} -%define with_libssh 0%{!?_without_libssh:0} -%define with_dmidecode 0%{!?_without_dmidecode:0} +%define with_fuse 0 +%define with_sanlock 0 +%define with_numad 0 +%define with_firewalld_zone 0 +%define with_libssh2 0 +%define with_wireshark 0 +%define with_libssh 0 +%define with_dmidecode 0 # Finally set the OS / architecture specific special cases -- 2.26.2

2 1

[PATCH v2 00/12] Replace virHashTable by GHashTable
by Peter Krempa 06 Nov '20

06 Nov '20

Our hash table API was surprisingly close to glibs. v2: - pushed ACK'd patch - typo fix - rebased on current master - hashing function not replaced as our has random initialization Peter Krempa (12): virhashtest: testHashGetItems: Remove test case for sorting by value util: hash: Rewrite sorting of elements in virHashGetItems util: hash: Introduce virHashForEachSorted Use virHashForEachSorted in tested code tests: remove virdeterministichashmock.so util: hash: Add delete-safe hash iterator util: hash: Use virHashForEachSafe in places which might delete the element util: hash: Don't use 'const' with virHashTablePtr util: hash: Reimplement virHashTable using GHashTable util: hash: Retire 'virHashTable' in favor of 'GHashTable' util: hash: Add deprecation notices for functions which have g_hash_table replacements tests: Remove 'virhashtest' src/conf/backup_conf.c | 2 +- src/conf/domain_addr.h | 2 +- src/conf/domain_conf.c | 12 +- src/conf/domain_conf.h | 2 +- src/conf/nwfilter_conf.h | 2 +- src/conf/nwfilter_ipaddrmap.c | 2 +- src/conf/nwfilter_params.c | 34 +- src/conf/nwfilter_params.h | 18 +- src/conf/snapshot_conf.c | 2 +- src/conf/virchrdev.c | 4 +- src/conf/virdomainmomentobjlist.c | 4 +- src/conf/virdomainobjlist.c | 6 +- src/conf/virinterfaceobj.c | 2 +- src/conf/virnetworkobj.c | 8 +- src/conf/virnodedeviceobj.c | 2 +- src/conf/virnwfilterbindingdef.h | 2 +- src/conf/virnwfilterbindingobjlist.c | 4 +- src/conf/virsecretobj.c | 2 +- src/conf/virstorageobj.c | 14 +- src/hyperv/hyperv_driver.c | 4 +- src/hyperv/hyperv_wmi.c | 18 +- src/hyperv/hyperv_wmi.h | 12 +- src/hypervisor/virclosecallbacks.c | 2 +- src/libvirt_private.syms | 2 + src/libxl/libxl_logger.c | 2 +- src/locking/lock_daemon.c | 4 +- src/nwfilter/nwfilter_dhcpsnoop.c | 6 +- src/nwfilter/nwfilter_ebiptables_driver.c | 19 +- src/nwfilter/nwfilter_gentech_driver.c | 36 +- src/nwfilter/nwfilter_gentech_driver.h | 2 +- src/nwfilter/nwfilter_learnipaddr.c | 4 +- src/nwfilter/nwfilter_tech_driver.h | 2 +- src/qemu/qemu_agent.c | 4 +- src/qemu/qemu_backup.c | 14 +- src/qemu/qemu_backup.h | 2 +- src/qemu/qemu_block.c | 42 +- src/qemu/qemu_block.h | 18 +- src/qemu/qemu_blockjob.c | 6 +- src/qemu/qemu_capabilities.c | 8 +- src/qemu/qemu_checkpoint.c | 6 +- src/qemu/qemu_checkpoint.h | 2 +- src/qemu/qemu_conf.c | 4 +- src/qemu/qemu_conf.h | 2 +- src/qemu/qemu_domain.c | 8 +- src/qemu/qemu_domain.h | 2 +- src/qemu/qemu_driver.c | 24 +- src/qemu/qemu_interop_config.c | 13 +- src/qemu/qemu_migration.c | 2 +- src/qemu/qemu_migration_cookie.c | 2 +- src/qemu/qemu_monitor.c | 28 +- src/qemu/qemu_monitor.h | 20 +- src/qemu/qemu_monitor_json.c | 50 +- src/qemu/qemu_monitor_json.h | 22 +- src/qemu/qemu_process.c | 18 +- src/qemu/qemu_qapi.c | 14 +- src/qemu/qemu_qapi.h | 6 +- src/qemu/qemu_snapshot.c | 16 +- src/rpc/virnetdaemon.c | 13 +- src/security/security_selinux.c | 2 +- src/util/virfilecache.c | 2 +- src/util/virhash.c | 571 ++++++++---------- src/util/virhash.h | 47 +- src/util/viriptables.c | 4 +- src/util/virlockspace.c | 4 +- src/util/virmacmap.c | 4 +- src/util/virstoragefile.c | 8 +- src/util/virsystemd.c | 2 +- tests/meson.build | 2 - tests/nwfilterxml2firewalltest.c | 24 +- tests/qemublocktest.c | 26 +- tests/qemuhotplugtest.c | 6 +- tests/qemumigparamstest.c | 4 +- tests/qemumonitorjsontest.c | 30 +- tests/qemumonitortestutils.c | 6 +- tests/qemumonitortestutils.h | 4 +- tests/qemusecuritymock.c | 4 +- .../blockjob-blockdev-in.xml | 116 ++-- tests/qemuxml2argvtest.c | 4 +- tests/qemuxml2xmltest.c | 5 +- tests/testutilsqemu.c | 6 +- tests/testutilsqemu.h | 4 +- tests/testutilsqemuschema.c | 10 +- tests/testutilsqemuschema.h | 8 +- tests/virdeterministichashmock.c | 36 -- tests/virhashdata.h | 284 --------- tests/virhashtest.c | 564 ----------------- tests/virmacmaptest.c | 2 +- 87 files changed, 690 insertions(+), 1682 deletions(-) delete mode 100644 tests/virdeterministichashmock.c delete mode 100644 tests/virhashdata.h delete mode 100644 tests/virhashtest.c -- 2.26.2

4 19

[PATCH] viridentitytest: Drop #if !WITH_SELINUX block
by Michal Privoznik 06 Nov '20

06 Nov '20

The whole test is built only if SELinux secdriver is enabled and thus the !WITH_SELINUX can't be satisfied really. Also, the block references @ret variable which exists no more after v5.9.0-rc1~269. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tests/viridentitytest.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/tests/viridentitytest.c b/tests/viridentitytest.c index fd01eeaa80..7a7101ba2a 100644 --- a/tests/viridentitytest.c +++ b/tests/viridentitytest.c @@ -85,14 +85,6 @@ static int testIdentityGetSystem(const void *data) const char *val; int rc; -#if !WITH_SELINUX - if (context) { - VIR_DEBUG("libvirt not compiled with SELinux, skipping this test"); - ret = EXIT_AM_SKIP; - return -1; - } -#endif - if (!(ident = virIdentityGetSystem())) { VIR_DEBUG("Unable to get system identity"); return -1; -- 2.26.2

3 2

[PATCH] util: xml: remove unused function virXMLChildElementCount
by Yi Li 06 Nov '20

06 Nov '20

--- src/libvirt_private.syms | 1 - src/util/virxml.c | 21 --------------------- src/util/virxml.h | 1 - 3 files changed, 23 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 9029ea4fa2..36ab84162c 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -3504,7 +3504,6 @@ virVsockSetGuestCid; # util/virxml.h virParseScaledValue; virXMLCheckIllegalChars; -virXMLChildElementCount; virXMLExtractNamespaceXML; virXMLFormatElement; virXMLNodeContentString; diff --git a/src/util/virxml.c b/src/util/virxml.c index 8a94de8fe4..a3b819d85c 100644 --- a/src/util/virxml.c +++ b/src/util/virxml.c @@ -934,27 +934,6 @@ virXMLSaveFile(const char *path, return virFileRewrite(path, S_IRUSR | S_IWUSR, virXMLRewriteFile, &data); } -/* Returns the number of children of node, or -1 on error. */ -long -virXMLChildElementCount(xmlNodePtr node) -{ - long ret = 0; - xmlNodePtr cur = NULL; - - /* xmlChildElementCount returns 0 on error, which isn't helpful; - * besides, it is not available in libxml2 2.6. */ - if (!node || node->type != XML_ELEMENT_NODE) - return -1; - cur = node->children; - while (cur) { - if (cur->type == XML_ELEMENT_NODE) - ret++; - cur = cur->next; - } - return ret; -} - - /** * virXMLNodeToString: convert an XML node ptr to an XML string * diff --git a/src/util/virxml.h b/src/util/virxml.h index b73591c3df..f73b8975ba 100644 --- a/src/util/virxml.h +++ b/src/util/virxml.h @@ -77,7 +77,6 @@ char * virXMLPropStringLimit(xmlNodePtr node, const char *name, size_t maxlen); char * virXMLNodeContentString(xmlNodePtr node); -long virXMLChildElementCount(xmlNodePtr node); /* Internal function; prefer the macros below. */ xmlDocPtr virXMLParseHelper(int domcode, -- 2.25.3

3 3

[libvirt PATCH] vircgrouppriv: fix ATTRIBUTE_NONNULL for virCgroupNewDomainPartition
by Pavel Hrdina 05 Nov '20

05 Nov '20

Commit <99d2c6519ad18651b5959fa0a3366bcb2c1e44f3> removed parameter from the function but did not modified ATTRIBUTE_NONNULL. Reported-by: John Ferlan <jferlan(a)redhat.com> Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Pushed under trivial rule. src/util/vircgrouppriv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/vircgrouppriv.h b/src/util/vircgrouppriv.h index 77e01519b0..baa84550f4 100644 --- a/src/util/vircgrouppriv.h +++ b/src/util/vircgrouppriv.h @@ -124,7 +124,7 @@ int virCgroupNewDomainPartition(virCgroupPtr partition, const char *driver, const char *name, virCgroupPtr *group) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(5); + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(4); int virCgroupRemoveRecursively(char *grppath); -- 2.26.2

1 0

[libvirt PATCH v3 0/2] Add script to sync from QEMU i386 cpu models
by Tim Wiederhake 05 Nov '20

05 Nov '20

This hopefully makes synchronization with QEMU faster and less error prone. Patch #2 showcases the changes to the cpu models the script suggests for qemu 8d90bfc5c31ad60f6049dd39be636b06bc00b652. V1: https://www.redhat.com/archives/libvir-list/2020-October/msg01008.html V2: https://www.redhat.com/archives/libvir-list/2020-October/msg01051.html Changes since last version: * Fix issues found by flake8 Tim Wiederhake (2): cpu_map: Add script to sync from QEMU i386 cpu models [DONTMERGE] Sample output of new sync script src/cpu_map/sync_qemu_i386.py | 369 ++++++++++++++++++ src/cpu_map/x86_486.xml | 8 + src/cpu_map/x86_Broadwell-IBRS.xml | 19 +- src/cpu_map/x86_Broadwell-noTSX-IBRS.xml | 19 +- src/cpu_map/x86_Broadwell-noTSX.xml | 19 +- src/cpu_map/x86_Broadwell.xml | 18 +- src/cpu_map/x86_Cascadelake-Server-noTSX.xml | 20 +- src/cpu_map/x86_Cascadelake-Server.xml | 17 +- src/cpu_map/x86_Conroe.xml | 10 +- src/cpu_map/x86_Cooperlake.xml | 8 +- src/cpu_map/x86_Denverton.xml | 74 ++++ src/cpu_map/x86_Dhyana.xml | 12 +- src/cpu_map/x86_EPYC-IBPB.xml | 19 +- src/cpu_map/x86_EPYC-Rome.xml | 9 + src/cpu_map/x86_EPYC.xml | 14 +- src/cpu_map/x86_Haswell-IBRS.xml | 20 +- src/cpu_map/x86_Haswell-noTSX-IBRS.xml | 20 +- src/cpu_map/x86_Haswell-noTSX.xml | 20 +- src/cpu_map/x86_Haswell.xml | 18 +- src/cpu_map/x86_Icelake-Client-noTSX.xml | 14 +- src/cpu_map/x86_Icelake-Client.xml | 11 +- src/cpu_map/x86_Icelake-Server-noTSX.xml | 29 +- src/cpu_map/x86_Icelake-Server.xml | 11 +- src/cpu_map/x86_IvyBridge-IBRS.xml | 13 +- src/cpu_map/x86_IvyBridge.xml | 12 +- src/cpu_map/x86_KnightsMill.xml | 77 ++++ src/cpu_map/x86_Nehalem-IBRS.xml | 14 +- src/cpu_map/x86_Nehalem.xml | 13 +- src/cpu_map/x86_Opteron_G1.xml | 9 +- src/cpu_map/x86_Opteron_G2.xml | 10 +- src/cpu_map/x86_Opteron_G3.xml | 10 +- src/cpu_map/x86_Opteron_G4.xml | 11 +- src/cpu_map/x86_Opteron_G5.xml | 11 +- src/cpu_map/x86_Penryn.xml | 10 +- src/cpu_map/x86_SandyBridge-IBRS.xml | 14 +- src/cpu_map/x86_SandyBridge.xml | 13 +- src/cpu_map/x86_Skylake-Client-IBRS.xml | 16 +- src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml | 18 +- src/cpu_map/x86_Skylake-Client.xml | 15 +- src/cpu_map/x86_Skylake-Server-IBRS.xml | 12 +- src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml | 15 +- src/cpu_map/x86_Skylake-Server.xml | 12 +- src/cpu_map/x86_Snowridge.xml | 79 ++++ src/cpu_map/x86_Westmere-IBRS.xml | 13 +- src/cpu_map/x86_Westmere.xml | 14 +- src/cpu_map/x86_athlon.xml | 8 + src/cpu_map/x86_core2duo.xml | 12 +- src/cpu_map/x86_coreduo.xml | 10 +- src/cpu_map/x86_kvm32.xml | 9 + src/cpu_map/x86_kvm64.xml | 9 + src/cpu_map/x86_n270.xml | 12 +- src/cpu_map/x86_pentium.xml | 9 + src/cpu_map/x86_pentium2.xml | 9 + src/cpu_map/x86_pentium3.xml | 9 + src/cpu_map/x86_phenom.xml | 17 +- src/cpu_map/x86_qemu32.xml | 8 + src/cpu_map/x86_qemu64.xml | 17 +- 57 files changed, 1188 insertions(+), 130 deletions(-) create mode 100755 src/cpu_map/sync_qemu_i386.py create mode 100644 src/cpu_map/x86_Denverton.xml create mode 100644 src/cpu_map/x86_KnightsMill.xml create mode 100644 src/cpu_map/x86_Snowridge.xml -- 2.26.2

2 3

[libvirt PATCH 00/25] cgroup related fixes and cleanup
by Pavel Hrdina 05 Nov '20

05 Nov '20

Pavel Hrdina (25): qemu_cgroup: remove unused @empty variable qemu: remove dead code that setup cgroups for helper processes qemu_dbus: use emulator cgroup for dbus-daemon vircgroupv2: properly detect empty tasks vircgroupv2: properly detect placement of running VM vircgroupv2: detect controllers enabled in parent cgroup vircgroup: remove useless cgroup->path variable vircgroup: introduce virCgroupSetBackends helper vircgroup: introduce virCgroupCopyMounts helper vircgroup: introduce virCgroupCopyPlacement helper vircgroup: introduce virCgroupValidatePlacement helper vircgroup: introduce virCgroupDetectControllers helper vircgroup: extract virCgroupNewDetect from virCgroupNew vircgroup: introduce virCgroupNewParent vircgroup: drop @parent from virCgroupNew vircgroup: virCgroupNew is now always called with absolute path vircgroup: expand virCgroupDetect into virCgroupNew vircgroup: no need to use PID in virCgroupEnableMissingControllers vircgroup: drop @pid argument from virCgroupNew vircgroup: introduce virCgroupSetPlacement vircgroup: drop @create from virCgroupNewDomainPartition vircgroup: refactor virCgroupEnableMissingControllers vircgroup: move parentPath declaration vircgroup: refactor virCgroupNewPartition vircgroup: drop condition for absolute path from copyPlacement callbacks src/qemu/qemu_cgroup.c | 5 +- src/qemu/qemu_dbus.c | 9 +- src/qemu/qemu_dbus.h | 3 +- src/qemu/qemu_extdevice.c | 2 +- src/qemu/qemu_slirp.c | 4 - src/util/vircgroup.c | 337 ++++++++++++++++++++++-------------- src/util/vircgroupbackend.h | 5 + src/util/vircgrouppriv.h | 7 +- src/util/vircgroupv1.c | 57 +++--- src/util/vircgroupv2.c | 61 ++++--- tests/vircgrouptest.c | 33 ++-- 11 files changed, 309 insertions(+), 214 deletions(-) -- 2.26.2

4 28

[RFC PATCH 0/2] Handle physical address bits
by Dario Faggioli 05 Nov '20

05 Nov '20

Hello everyone, These patches let one specify how wide the physical addresses are, in bits. Using current QEMU's default of 40 may limit the amount of RAM the guest can see (which is the reason why, in our packages, we bump that to 42; and as far as I've understood from reading some old mailing list threads on the subject, other downstreams do something similar). It also can cause other problems, such as the one described in: https://bugzilla.redhat.com/show_bug.cgi?id=1578278#c5 Basically, the VM thinking and reporting to the user that L1TF is unmitigated, because while its RAM may fits in MAX_PHYS_ADDR (e.g., equal to 42 or 40) it does not fit in MAX_PHYS_ADDR/2, which is necessary for PTE inversion to be effective. I've also mentioned this during my KVM Forum talk (slides 81, 82, from here: http://xenbits.xen.org/people/dariof/talks/Virtual%20Topology%20Friend%20or…) The series alleviates the problem by providing an user with an easy way to either specify an arbitrary number of physical address bits bits for the VM (with, e.g., <maxphysaddr mode='emulate' bits='42'/>) or just using the same number of bits of the host (with <maxphysaddr mode='passthrough'/>). This in theory is already possible, but only in an hack-ish way, such as adding: <qemu:commandline> <qemu:arg value='-cpu'/> <qemu:arg value='host,host-phys-bits=on'/> </qemu:commandline> But this is super inconvenient. :-) I have not done it such as host-phys-bits=on is automatically added when using cpu-passthrough as CPU model, as I think that that actually belongs in QEMU. Basically, this works and can be used very much like the <cache/> element. Ah, so, the series is RFC basically because the QEMU capability test is failing. I think I may be failing at understanding how things should work. Or maybe I "just" need to regenerate the files against which capabilities themselves are checked (and if this is the case, I need to understand how). Well, I'll keep looking into this, and try to figure it out (but, if anyone has any hint, that's much appreciated :-P). Feedback welcome. Thanks and Regards --- Dario Faggioli (2): Add support for specifying max physical address size. qemu: Add support for max physical address size src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 28 +++++++++++ src/qemu/qemu_domain.c | 46 +++++++++++++++++++ .../cpu-phys-bits-emulate.args | 29 ++++++++++++ .../cpu-phys-bits-emulate.xml | 20 ++++++++ .../cpu-phys-bits-emulate2.args | 30 ++++++++++++ .../cpu-phys-bits-emulate2.xml | 20 ++++++++ .../cpu-phys-bits-emulate3.err | 1 + .../cpu-phys-bits-emulate3.xml | 20 ++++++++ .../cpu-phys-bits-passthrough.args | 29 ++++++++++++ .../cpu-phys-bits-passthrough.xml | 20 ++++++++ .../cpu-phys-bits-passthrough2.err | 1 + .../cpu-phys-bits-passthrough2.xml | 20 ++++++++ .../cpu-phys-bits-passthrough3.err | 1 + .../cpu-phys-bits-passthrough3.xml | 20 ++++++++ tests/qemuxml2argvtest.c | 7 +++ 17 files changed, 295 insertions(+) create mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-emulate.args create mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-emulate.xml create mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-emulate2.args create mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-emulate2.xml create mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-emulate3.err create mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-emulate3.xml create mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args create mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-passthrough.xml create mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-passthrough2.err create mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-passthrough2.xml create mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-passthrough3.err create mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-passthrough3.xml -- Dario Faggioli, Ph.D http://about.me/dario.faggioli Virtualization Software Engineer SUSE Labs, SUSE https://www.suse.com/ ------------------------------------------------------------------- <<This happens because _I_ choose it to happen!>> (Raistlin Majere)

3 14

[PATCH 00/10] Make mdev_types generic and support it on CSS devices
by Boris Fiuczynski 05 Nov '20

05 Nov '20

Since channel subsystem devices can have the capability to create an mdev device they should expose this by listing the mdev_types capability. Many patches of this series is concerned with refactoring existing PCI code. Boris Fiuczynski (10): conf: node_device: fix mdev_types format and XML parsing code to match schema util: refactor mdev_types method from PCI to mdev util: refactor mdev_types methods return code usage conf: node_devive: refactor GetPCIMdevTypesCaps into GetMdevTypeCapes conf: node_device: refactor capability mdev_types formating conf: node_device: refactor mdev_types XML parsing conf: node_device: refactor CSS formating schema: refactor mdev_types out of PCI nodedev schema conf: node_device: cleanup virNodeDevCapCCWParseXML node_device: detecting mdev_types capability on CSS devices docs/drvnodedev.html.in | 5 +- docs/formatnode.html.in | 39 ++ docs/schemas/nodedev.rng | 52 ++- src/conf/node_device_conf.c | 365 ++++++++++++------ src/conf/node_device_conf.h | 11 + src/conf/virnodedeviceobj.c | 7 +- src/libvirt_private.syms | 3 +- src/node_device/node_device_udev.c | 3 + src/util/virmdev.c | 67 ++++ src/util/virmdev.h | 5 + src/util/virpci.c | 60 --- src/util/virpci.h | 3 - .../css_0_0_fffe_mdev_types.xml | 17 + tests/nodedevxml2xmltest.c | 1 + 14 files changed, 428 insertions(+), 210 deletions(-) create mode 100644 tests/nodedevschemadata/css_0_0_fffe_mdev_types.xml -- 2.25.1

3 21

[PATCH] virsh-domain: Remove unused virshNodeIsSuperset
by Yi Li 05 Nov '20

05 Nov '20

The function is marked as unused. Remove it from the tree until a new use case can be found. Signed-off-by: Yi Li <yili(a)winhong.com> --- tools/virsh-domain.c | 115 ------------------------------------------- 1 file changed, 115 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index ef347585e8..1ae936c6b2 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -11933,121 +11933,6 @@ cmdDomHostname(vshControl *ctl, const vshCmd *cmd) return true; } -/** - * Check if n1 is superset of n2, meaning n1 contains all elements and - * attributes as n2 at least. Including children. - * @n1 first node - * @n2 second node - * returns true in case n1 covers n2, false otherwise. - */ -G_GNUC_UNUSED -static bool -virshNodeIsSuperset(xmlNodePtr n1, xmlNodePtr n2) -{ - xmlNodePtr child1, child2; - xmlAttrPtr attr; - char *prop1, *prop2; - bool found; - bool visited; - bool ret = false; - long n1_child_size, n2_child_size, n1_iter; - virBitmapPtr bitmap; - - if (!n1 && !n2) - return true; - - if (!n1 || !n2) - return false; - - if (!xmlStrEqual(n1->name, n2->name)) - return false; - - /* Iterate over n2 attributes and check if n1 contains them */ - attr = n2->properties; - while (attr) { - if (attr->type == XML_ATTRIBUTE_NODE) { - prop1 = virXMLPropString(n1, (const char *) attr->name); - prop2 = virXMLPropString(n2, (const char *) attr->name); - if (STRNEQ_NULLABLE(prop1, prop2)) { - xmlFree(prop1); - xmlFree(prop2); - return false; - } - xmlFree(prop1); - xmlFree(prop2); - } - attr = attr->next; - } - - n1_child_size = virXMLChildElementCount(n1); - n2_child_size = virXMLChildElementCount(n2); - if (n1_child_size < 0 || n2_child_size < 0 || - n1_child_size < n2_child_size) - return false; - - if (n1_child_size == 0 && n2_child_size == 0) - return true; - - bitmap = virBitmapNew(n1_child_size); - - child2 = n2->children; - while (child2) { - if (child2->type != XML_ELEMENT_NODE) { - child2 = child2->next; - continue; - } - - child1 = n1->children; - n1_iter = 0; - found = false; - while (child1) { - if (child1->type != XML_ELEMENT_NODE) { - child1 = child1->next; - continue; - } - - if (virBitmapGetBit(bitmap, n1_iter, &visited) < 0) { - vshError(NULL, "%s", _("Bad child elements counting.")); - goto cleanup; - } - - if (visited) { - child1 = child1->next; - n1_iter++; - continue; - } - - if (xmlStrEqual(child1->name, child2->name)) { - found = true; - if (virBitmapSetBit(bitmap, n1_iter) < 0) { - vshError(NULL, "%s", _("Bad child elements counting.")); - goto cleanup; - } - - if (!virshNodeIsSuperset(child1, child2)) - goto cleanup; - - break; - } - - child1 = child1->next; - n1_iter++; - } - - if (!found) - goto cleanup; - - child2 = child2->next; - } - - ret = true; - - cleanup: - virBitmapFree(bitmap); - return ret; -} - - /* * "detach-device" command */ -- 2.25.3

2 1