- Devel - libvirt List Archives

[libvirt] [PATCH] test_driver: implement virNetworkGetDHCPLeases
by Ilias Stamatis 18 Jun '19

18 Jun '19

Return infinite time DHCP leases for fixed IPV4 addresses. Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com> --- src/test/test_driver.c | 118 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 1aa79ce898..b7f8f6ecf2 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -3831,6 +3831,123 @@ testNetworkSetAutostart(virNetworkPtr net, } +static int +testNetworkGetDHCPLeases(virNetworkPtr net, + const char *mac, + virNetworkDHCPLeasePtr **leases, + unsigned int flags) +{ + int ret = -1; + int ndomains = 0; + size_t i, j; + size_t nleases = 0; + bool need_results = !!leases; + char *hostname = NULL; + char mac_str[VIR_MAC_STRING_BUFLEN]; + virMacAddr mac_addr; + virDomainObjPtr vm = NULL; + virDomainPtr *domains = NULL; + virDomainNetDefPtr inf = NULL; + virNetworkObjPtr obj = NULL; + virNetworkDefPtr obj_def = NULL; + virNetworkDHCPLeasePtr lease = NULL; + virNetworkDHCPLeasePtr *leases_ret = NULL; + testDriverPtr privconn = net->conn->privateData; + + virCheckFlags(0, -1); + + if (mac && virMacAddrParse(mac, &mac_addr) < 0) { + virReportError(VIR_ERR_INVALID_MAC, "%s", mac); + return -1; + } + + if (!(obj = testNetworkObjFindByName(privconn, net->name))) + goto cleanup; + obj_def = virNetworkObjGetDef(obj); + + ndomains = virDomainObjListExport(privconn->domains, net->conn, &domains, + NULL, VIR_CONNECT_LIST_DOMAINS_ACTIVE); + if (ndomains < 0) + goto cleanup; + + for (i = 0; i < ndomains; i++) { + /* the following must be called before testDomObjFromDomain */ + hostname = testDomainGetHostname(domains[i], 0); + + if (!(vm = testDomObjFromDomain(domains[i]))) + continue; + + for (j = 0; j < vm->def->nnets; j++) { + inf = vm->def->nets[j]; + if (STRNEQ(inf->data.network.name, obj_def->name)) + continue; + + virMacAddrFormat(&inf->mac, mac_str); + if (mac && virMacAddrCompare(mac, mac_str)) + continue; + + if (!need_results) { + nleases++; + continue; + } + + if (VIR_ALLOC(lease) < 0) + goto error; + + /* the lease is for infinite time */ + lease->expirytime = 0; + + if ((VIR_STRDUP(lease->mac, mac_str) < 0) || + (VIR_STRDUP(lease->iface, obj_def->bridge) < 0) || + (VIR_STRDUP(lease->hostname, hostname) < 0)) + goto error; + + lease->prefix = 24; + lease->type = VIR_IP_ADDR_TYPE_IPV4; + if (virAsprintf(&lease->ipaddr, "192.168.0.%zu", 1 + j) < 0) + goto error; + + lease->iaid = lease->clientid = NULL; + + if (VIR_INSERT_ELEMENT(leases_ret, nleases, nleases, lease) < 0) + goto error; + } + + VIR_FREE(hostname); + virDomainObjEndAPI(&vm); + } + + if (leases_ret) { + /* NULL terminated array */ + ignore_value(VIR_REALLOC_N(leases_ret, nleases + 1)); + VIR_STEAL_PTR(*leases, leases_ret); + } + + ret = nleases; + + cleanup: + for (i = 0; i < ndomains; i++) + virDomainFree(domains[i]); + VIR_FREE(domains); + + VIR_FREE(hostname); + virNetworkObjEndAPI(&obj); + return ret; + + error: + VIR_FREE(lease); + + if (leases_ret) { + for (i = 0; i < nleases; i++) + virNetworkDHCPLeaseFree(leases_ret[i]); + VIR_FREE(leases_ret); + } + + virDomainObjEndAPI(&vm); + goto cleanup; +} + + /* * Physical host interface routines */ @@ -7114,6 +7231,7 @@ static virNetworkDriver testNetworkDriver = { .networkGetBridgeName = testNetworkGetBridgeName, /* 0.3.2 */ .networkGetAutostart = testNetworkGetAutostart, /* 0.3.2 */ .networkSetAutostart = testNetworkSetAutostart, /* 0.3.2 */ + .networkGetDHCPLeases = testNetworkGetDHCPLeases, /* 5.5.0 */ .networkIsActive = testNetworkIsActive, /* 0.7.3 */ .networkIsPersistent = testNetworkIsPersistent, /* 0.7.3 */ }; -- 2.21.0

3 4

[libvirt] [PATCH v3] Produce more verbose error if cppi not found
by Michal Privoznik 18 Jun '19

18 Jun '19

It's fairly easy (especially for new contributors) to not spot the 'cppi not installed' line in the syntax-check output. Turn it into a banner that is more visible and at the same time add it as a build dependency. Unfortunately, RHEL doesn't ship cppi so we can add the dependency only for Fedora. Since it's v1 this has effectively became code copied over from Andrea's review suggestions. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- cfg.mk | 5 +++++ libvirt.spec.in | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/cfg.mk b/cfg.mk index 5074ef611a..c0c240b2c0 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1145,6 +1145,11 @@ ifneq ($(_gl-Makefile),) syntax-check: spacing-check test-wrap-argv \ prohibit-duplicate-header mock-noinline group-qemu-caps \ header-ifdef + @if ! cppi --version >/dev/null 2>&1; then \ + echo "*****************************************************" >&2; \ + echo "* cppi not installed, some checks have been skipped *" >&2; \ + echo "*****************************************************" >&2; \ + fi endif # Don't include duplicate header in the source (either *.c or *.h) diff --git a/libvirt.spec.in b/libvirt.spec.in index 3b5b4925fd..7019488711 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -271,6 +271,10 @@ BuildRequires: perl %endif BuildRequires: %{python} BuildRequires: systemd-units +# For 'make syntax-check' +%if 0%{?fedora} +BuildRequires: cppi +%endif %if %{with_libxl} BuildRequires: xen-devel %endif -- 2.21.0

3 4

[libvirt] [PATCH] test_driver: implement virDomainInterfaceAddresses
by Ilias Stamatis 17 Jun '19

17 Jun '19

Ignore @source in the case of the test driver and return fixed private IPv4 addresses for all the interfaces defined in the domain. Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com> --- The default config of the test driver has no guest interfaces defined, so this must be tested with a custom config. Maybe it would be a good idea to add one or more guest interfaces in the default config. I could send an additional patch for this. src/test/test_driver.c | 71 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index a4c17ef0df..3a81f51a88 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -3220,6 +3220,76 @@ static int testDomainBlockStats(virDomainPtr domain, return ret; } +static int +testDomainInterfaceAddresses(virDomainPtr dom, + virDomainInterfacePtr **ifaces, + unsigned int source ATTRIBUTE_UNUSED, + unsigned int flags) +{ + size_t i; + size_t ifaces_count = 0; + int ret = -1; + char ipaddr[32]; + char macaddr[VIR_MAC_STRING_BUFLEN]; + virDomainObjPtr vm = NULL; + virDomainInterfacePtr iface = NULL; + virDomainInterfacePtr *ifaces_ret = NULL; + + virCheckFlags(0, -1); + + if (!(vm = testDomObjFromDomain(dom))) + goto cleanup; + + if (virDomainObjCheckActive(vm) < 0) + goto cleanup; + + if (VIR_ALLOC_N(ifaces_ret, vm->def->nnets) < 0) + goto cleanup; + + for (i = 0; i < vm->def->nnets; i++) { + if (VIR_ALLOC(iface) < 0) + goto cleanup; + + if (VIR_STRDUP(iface->name, vm->def->nets[i]->ifname) < 0) + goto cleanup; + + virMacAddrFormat(&(vm->def->nets[i]->mac), macaddr); + if (VIR_STRDUP(iface->hwaddr, macaddr) < 0) + goto cleanup; + + if (VIR_ALLOC(iface->addrs) < 0) + goto cleanup; + + iface->addrs[0].type = VIR_IP_ADDR_TYPE_IPV4; + iface->addrs[0].prefix = 24; + + sprintf(ipaddr, "192.168.0.%ld", 100 + (i % 155)); + if (VIR_STRDUP(iface->addrs[0].addr, ipaddr) < 0) + goto cleanup; + + iface->naddrs = 1; + + VIR_STEAL_PTR(ifaces_ret[i], iface); + ifaces_count++; + } + + VIR_STEAL_PTR(*ifaces, ifaces_ret); + ret = ifaces_count; + + cleanup: + virDomainObjEndAPI(&vm); + + if (ifaces_ret) { + for (i = 0; i < ifaces_count; i++) + virDomainInterfaceFree(ifaces_ret[i]); + } + virDomainInterfaceFree(iface); + + VIR_FREE(ifaces_ret); + + return ret; +} + static int testDomainInterfaceStats(virDomainPtr domain, const char *device, @@ -6876,6 +6946,7 @@ static virHypervisorDriver testHypervisorDriver = { .domainSetSchedulerParameters = testDomainSetSchedulerParameters, /* 0.3.2 */ .domainSetSchedulerParametersFlags = testDomainSetSchedulerParametersFlags, /* 0.9.2 */ .domainBlockStats = testDomainBlockStats, /* 0.7.0 */ + .domainInterfaceAddresses = testDomainInterfaceAddresses, /* 5.4.0 */ .domainInterfaceStats = testDomainInterfaceStats, /* 0.7.0 */ .nodeGetCellsFreeMemory = testNodeGetCellsFreeMemory, /* 0.4.2 */ .connectDomainEventRegister = testConnectDomainEventRegister, /* 0.6.0 */ -- 2.21.0

3 5

[libvirt] [PATCH] docs: fix some typos in networkport documentation
by Ján Tomko 17 Jun '19

17 Jun '19

Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- docs/formatdomain.html.in | 4 ++-- docs/formatnetworkport.html.in | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 73a9cb6205..cf585d8e99 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -5310,12 +5310,12 @@ connections. Since 0.9.4. - When a guest is running and interface of type <code>network</code> + When a guest is running an interface of type <code>network</code> may include a <code>portid</code> attribute. This provides the UUID of an associated virNetworkPortPtr object that records the association between the domain interface and the network. This attribute is read-only since port objects are create and deleted automatically - during startup and shutdown. Since 5.1.0/ + during startup and shutdown. Since 5.1.0 Also, similar to <code>direct</code> network connections diff --git a/docs/formatnetworkport.html.in b/docs/formatnetworkport.html.in index 554e5c65fc..0425e069ce 100644 --- a/docs/formatnetworkport.html.in +++ b/docs/formatnetworkport.html.in @@ -9,8 +9,8 @@ This page provides an introduction to the network port XML format. - This stores information about the connection between an virtual - interface on a virtual domain's, and the virtual network it is + This stores information about the connection between a virtual + interface of a virtual domain, and the virtual network it is attached to. @@ -73,7 +73,7 @@ <h3><a id="elementsCommon">Common elements</a></h3> - The following elements are common to one of more of the plug + The following elements are common to one or more of the plug types listed later @@ -96,7 +96,7 @@ The <code>bandwidth</code> element and its child elements are described in the <a href="formatnetwork.html#elementQoS">QoS</a> section of the Network XML. In addition the <code>classID</code> attribute may - exist provide the ID of the traffic shaping class that is active. + exist to provide the ID of the traffic shaping class that is active. </dd> <dt><code>rxfilters</code></dt> <dd>The <code>rxfilters</code> element property @@ -136,7 +136,7 @@ <pre> ... - <plug type='network' bridge='virbr0'> + <plug type='network' bridge='virbr0'/> ...</pre> @@ -154,7 +154,7 @@ <pre> ... - <plug type='bridge' bridge='br2'> + <plug type='bridge' bridge='br2'/> ...</pre> -- 2.19.2

2 1

[libvirt] [PATCH v2] Produce more verbose error if cppi not found
by Michal Privoznik 17 Jun '19

17 Jun '19

It's fairly easy (especially for new contributors) to not spot the 'cppi not installed' line in the syntax-check output. Turn it into a banner that is more visible and at the same time add it as a build dependency. Unfortunately, RHEL doesn't ship cppi so we can add the dependency only for Fedora. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Diff to v1: - Instead of requiring cppi, produce more visible error - Require cppi in specfile cfg.mk | 9 +++++++-- libvirt.spec.in | 4 ++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/cfg.mk b/cfg.mk index 5074ef611a..2ee860a2c5 100644 --- a/cfg.mk +++ b/cfg.mk @@ -695,6 +695,11 @@ sc_require_whitespace_in_translation: { echo '$(ME): missing whitespace at line split' 1>&2; \ exit 1; } || : +cppi_banner = \ + " *****************************************************\n" \ + "* cppi not installed, some checks have been skipped *\n" \ + "*****************************************************" + # Enforce recommended preprocessor indentation style. sc_preprocessor_indentation: @if cppi --version >/dev/null 2>&1; then \ @@ -702,7 +707,7 @@ sc_preprocessor_indentation: || { echo '$(ME): incorrect preprocessor indentation' 1>&2; \ exit 1; }; \ else \ - echo '$(ME): skipping test $@: cppi not installed' 1>&2; \ + echo -e "$(ME): skipping test $@:\n"$(cppi_banner) 1>&2; \ fi # Enforce similar spec file indentation style, by running cppi on a @@ -719,7 +724,7 @@ sc_spec_indentation: || { echo '$(ME): incorrect preprocessor indentation' 1>&2; \ exit 1; }; \ else \ - echo '$(ME): skipping test $@: cppi not installed' 1>&2; \ + echo -e "$(ME): skipping test $@:\n"$(cppi_banner) 1>&2; \ fi # Nested conditionals are easier to understand if we enforce that endifs diff --git a/libvirt.spec.in b/libvirt.spec.in index 59a2a0cb24..1a9e92c4bc 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -271,6 +271,10 @@ BuildRequires: perl %endif BuildRequires: %{python} BuildRequires: systemd-units +# For 'make syntax-check' +%if 0%{?fedora} +BuildRequires: cppi +%endif %if %{with_libxl} BuildRequires: xen-devel %endif -- 2.21.0

2 2

[libvirt] [PATCH] virpcitest: Separate two functions properly
by Michal Privoznik 17 Jun '19

17 Jun '19

There is a missing empty line between two functions since its introduction in v1.2.0-rc1~150. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial rule. tests/virpcimock.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/virpcimock.c b/tests/virpcimock.c index 7f9cdaa9b8..beb5e1490d 100644 --- a/tests/virpcimock.c +++ b/tests/virpcimock.c @@ -696,6 +696,7 @@ pci_driver_handle_unbind(const char *path) cleanup: return ret; } + static int pci_driver_handle_new_id(const char *path) { -- 2.21.0

1 0

[libvirt] [PATCH v4 0/3] numa: deprecate '-numa node, mem' and default memory distribution
by Igor Mammedov 17 Jun '19

17 Jun '19

Changes since v3: - simplify series by dropping idea of showing property values in "qom-list-properties" and use MachineInfo in QAPI schema instead Changes since v2: - taking in account previous review, implement a way for mgmt to intospect if '-numa node,mem' is supported by machine type as suggested by Daniel at https://www.mail-archive.com/qemu-devel@nongnu.org/msg601220.html * ammend "qom-list-properties" to show property values * add "numa-mem-supported" machine property to reflect if '-numa node,mem=SZ' is supported. It culd be used with '-machine none' or at runtime with --preconfig before numa memory mapping are configured * minor fixes to deprecation documentation mentioning "numa-mem-supported" property 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 RAM 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 any 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 on new machine types, hence this deprecation. And once the last machie type that supported the option is removed we would be able to remove option altogether. 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 memory device enumeration instead. Reference to previous versions: * https://www.mail-archive.com/qemu-devel@nongnu.org/msg617694.html CC: libvir-list(a)redhat.com CC: ehabkost(a)redhat.com CC: pbonzini(a)redhat.com CC: berrange(a)redhat.com CC: armbru(a)redhat.com Igor Mammedov (3): machine: show if CLI option '-numa node,mem' is supported in QAPI schema numa: deprecate 'mem' parameter of '-numa node' option numa: deprecate implict memory distribution between nodes include/hw/boards.h | 3 +++ hw/arm/virt.c | 1 + hw/i386/pc.c | 1 + hw/ppc/spapr.c | 1 + numa.c | 5 +++++ qapi/misc.json | 5 ++++- qemu-deprecated.texi | 24 ++++++++++++++++++++++++ vl.c | 1 + 8 files changed, 40 insertions(+), 1 deletion(-) -- 2.7.4

4 15

[libvirt] [PATCH] build: Require cppi for syntax-check
by Michal Privoznik 17 Jun '19

17 Jun '19

Since its introduction in v0.8.0~314 we allowed for cppi to be not present for 'syntax-check' because the package did exist in Fedora Core 12. Well, we don't care anymore ¯\_(ツ)_/¯ All recent distros have it. Moreover, it's fairly easy to miss 'cppi not installed' message in sea of syntax-check output (esp. for newbies who probably benefit from it the most). Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- cfg.mk | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/cfg.mk b/cfg.mk index 5074ef611a..dd0a177fb3 100644 --- a/cfg.mk +++ b/cfg.mk @@ -697,30 +697,22 @@ sc_require_whitespace_in_translation: # Enforce recommended preprocessor indentation style. sc_preprocessor_indentation: - @if cppi --version >/dev/null 2>&1; then \ - $(VC_LIST_EXCEPT) | $(GREP) -E '\.[ch](\.in)?$$' | xargs cppi -a -c \ - || { echo '$(ME): incorrect preprocessor indentation' 1>&2; \ - exit 1; }; \ - else \ - echo '$(ME): skipping test $@: cppi not installed' 1>&2; \ - fi + @$(VC_LIST_EXCEPT) | $(GREP) -E '\.[ch](\.in)?$$' | xargs cppi -a -c \ + || { echo '$(ME): incorrect preprocessor indentation' 1>&2; \ + exit 1; }; # Enforce similar spec file indentation style, by running cppi on a # (comment-only) C file that mirrors the same layout as the spec file. sc_spec_indentation: - @if cppi --version >/dev/null 2>&1; then \ - for f in $$($(VC_LIST_EXCEPT) | $(GREP) '\.spec\.in$$'); do \ - $(SED) -e 's|#|// #|; s|%ifn*$arch$* |#if a // |' \ - -e 's/%$else\|endif\|define$/#\1/' \ - -e 's/^$ *$\1\1\1#/#\1/' \ - -e 's|^$ *[^#/ ]$|// \1|; s|^$ */[^/]$|// \1|' $$f \ - | cppi -a -c 2>&1 | $(SED) "s|standard input|$$f|"; \ - done | { if $(GREP) . >&2; then false; else :; fi; } \ - || { echo '$(ME): incorrect preprocessor indentation' 1>&2; \ - exit 1; }; \ - else \ - echo '$(ME): skipping test $@: cppi not installed' 1>&2; \ - fi + @for f in $$($(VC_LIST_EXCEPT) | $(GREP) '\.spec\.in$$'); do \ + $(SED) -e 's|#|// #|; s|%ifn*$arch$* |#if a // |' \ + -e 's/%$else\|endif\|define$/#\1/' \ + -e 's/^$ *$\1\1\1#/#\1/' \ + -e 's|^$ *[^#/ ]$|// \1|; s|^$ */[^/]$|// \1|' $$f \ + | cppi -a -c 2>&1 | $(SED) "s|standard input|$$f|"; \ + done | { if $(GREP) . >&2; then false; else :; fi; } \ + || { echo '$(ME): incorrect preprocessor indentation' 1>&2; \ + exit 1; }; # Nested conditionals are easier to understand if we enforce that endifs # can be paired back to the if -- 2.21.0

6 7

[libvirt] [PATCH 0/7] Validate spapr-vio addresses as 32-bit
by Andrea Bolognani 17 Jun '19

17 Jun '19

An alternative take on David Gibson's patch https://www.redhat.com/archives/libvir-list/2019-June/msg00061.html from earlier this month. Andrea Bolognani (7): docs: Fix validation of spapr-vio addresses qemu: Rework qemuDomainDeviceDefValidateAddress() qemu: Validate spapr-vio addresses tests: Add pseries-spaprvio-invalid conf: Format spapr-vio addresses as 32-bit qemu: Format spapr-vio addresses as 32-bit docs: Update documentation for spapr-vio addresses docs/formatdomain.html.in | 6 +-- docs/schemas/domaincommon.rng | 2 +- src/conf/domain_conf.c | 2 +- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_domain.c | 41 ++++++++++++++++++- tests/qemuargv2xmldata/nomachine-ppc64.xml | 2 +- tests/qemuargv2xmldata/pseries-disk.xml | 2 +- tests/qemuargv2xmldata/pseries-nvram.xml | 2 +- .../disk-scsi.x86_64-latest.args | 2 +- .../pseries-spaprvio-invalid.xml | 17 ++++++++ .../pseries-vio-user-assigned.args | 2 +- tests/qemuxml2argvdata/pseries-vio.args | 4 +- tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmloutdata/disk-scsi.xml | 2 +- tests/qemuxml2xmloutdata/pseries-nvram.xml | 2 +- 15 files changed, 73 insertions(+), 16 deletions(-) create mode 100644 tests/qemuxml2argvdata/pseries-spaprvio-invalid.xml -- 2.21.0

2 8

[libvirt] [PATCH 0/3] docs: storage: document 'lvm2' disk fun
by Ján Tomko 17 Jun '19

17 Jun '19

Ján Tomko (3): docs: storage: fix spacing when enumerating volume formats docs: storage: type out two docs: storage: document the 'lvm2' disk format oddness docs/storage.html.in | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) -- 2.20.1

2 4

[libvirt] [RFC PATCH 0/5] qemu: drop command line parsing
by Peter Krempa 17 Jun '19

17 Jun '19

All the code is mostly outdated and does not really help in most cases. Since this was already proposed and I did not see anything against here are the patches. As a follow up I'll refactor and move the rest of qemu_parse_command.c once this is out of the way. you can fetch this by git fetch https://github.com/pipo/libvirt.git parse-command-delete Peter Krempa (5): qemu: driver: Drop support for qemu-attach qemu: parse: Drop qemuParseCommandLinePid and friends qemu: driver: Remove support for native->XML conversion tests: Drop qemuargv2xmltest qemu: parse: Drop unused qemu command line parsing infrastructure src/check-aclrules.pl | 1 + src/qemu/qemu_domain.c | 2 + src/qemu/qemu_driver.c | 125 +- src/qemu/qemu_parse_command.c | 2714 +---------------- src/qemu/qemu_parse_command.h | 23 - tests/Makefile.am | 11 +- tests/qemuargv2xmldata/boot-cdrom.args | 22 - tests/qemuargv2xmldata/boot-cdrom.xml | 35 - tests/qemuargv2xmldata/boot-floppy.args | 23 - tests/qemuargv2xmldata/boot-floppy.xml | 41 - tests/qemuargv2xmldata/boot-network.args | 22 - tests/qemuargv2xmldata/boot-network.xml | 34 - tests/qemuargv2xmldata/clock-localtime.args | 23 - tests/qemuargv2xmldata/clock-localtime.xml | 34 - tests/qemuargv2xmldata/clock-utc.args | 22 - tests/qemuargv2xmldata/clock-utc.xml | 34 - tests/qemuargv2xmldata/console-compat.args | 22 - tests/qemuargv2xmldata/console-compat.xml | 42 - tests/qemuargv2xmldata/disk-cdrom-empty.args | 23 - tests/qemuargv2xmldata/disk-cdrom-empty.xml | 40 - tests/qemuargv2xmldata/disk-cdrom.args | 23 - tests/qemuargv2xmldata/disk-cdrom.xml | 41 - .../disk-drive-boot-cdrom.args | 23 - .../disk-drive-boot-cdrom.xml | 41 - .../disk-drive-boot-disk.args | 23 - .../qemuargv2xmldata/disk-drive-boot-disk.xml | 41 - .../disk-drive-cache-directsync.args | 24 - .../disk-drive-cache-directsync.xml | 41 - .../disk-drive-cache-unsafe.args | 24 - .../disk-drive-cache-unsafe.xml | 41 - .../disk-drive-cache-v2-none.args | 23 - .../disk-drive-cache-v2-none.xml | 41 - .../disk-drive-cache-v2-wb.args | 24 - .../disk-drive-cache-v2-wb.xml | 41 - .../disk-drive-cache-v2-wt.args | 24 - .../disk-drive-cache-v2-wt.xml | 41 - .../disk-drive-error-policy-enospace.args | 24 - .../disk-drive-error-policy-enospace.xml | 41 - .../disk-drive-error-policy-stop.args | 24 - .../disk-drive-error-policy-stop.xml | 41 - ...sk-drive-error-policy-wreport-rignore.args | 24 - ...isk-drive-error-policy-wreport-rignore.xml | 41 - .../qemuargv2xmldata/disk-drive-fmt-qcow.args | 23 - .../qemuargv2xmldata/disk-drive-fmt-qcow.xml | 41 - .../disk-drive-network-gluster.args | 25 - .../disk-drive-network-gluster.xml | 41 - .../disk-drive-network-iscsi-auth.args | 25 - .../disk-drive-network-iscsi-auth.xml | 44 - .../disk-drive-network-iscsi.args | 25 - .../disk-drive-network-iscsi.xml | 41 - .../disk-drive-network-nbd-export.args | 23 - .../disk-drive-network-nbd-export.xml | 42 - .../disk-drive-network-nbd-ipv6-export.args | 23 - .../disk-drive-network-nbd-ipv6-export.xml | 42 - .../disk-drive-network-nbd-ipv6.args | 23 - .../disk-drive-network-nbd-ipv6.xml | 42 - .../disk-drive-network-nbd-unix.args | 23 - .../disk-drive-network-nbd-unix.xml | 42 - .../disk-drive-network-nbd.args | 23 - .../disk-drive-network-nbd.xml | 42 - .../disk-drive-network-rbd-auth.args | 26 - .../disk-drive-network-rbd-auth.xml | 47 - .../disk-drive-network-rbd-ceph-env.args | 25 - .../disk-drive-network-rbd-ceph-env.xml | 44 - .../disk-drive-network-rbd-ipv6.args | 25 - .../disk-drive-network-rbd-ipv6.xml | 45 - .../disk-drive-network-rbd.args | 29 - .../disk-drive-network-rbd.xml | 72 - .../disk-drive-network-sheepdog.args | 23 - .../disk-drive-network-sheepdog.xml | 42 - tests/qemuargv2xmldata/disk-floppy.args | 24 - tests/qemuargv2xmldata/disk-floppy.xml | 47 - tests/qemuargv2xmldata/disk-many.args | 25 - tests/qemuargv2xmldata/disk-many.xml | 52 - tests/qemuargv2xmldata/disk-usb.args | 23 - tests/qemuargv2xmldata/disk-usb.xml | 39 - tests/qemuargv2xmldata/disk-virtio.args | 25 - tests/qemuargv2xmldata/disk-virtio.xml | 53 - .../graphics-sdl-fullscreen.args | 25 - .../graphics-sdl-fullscreen.xml | 39 - tests/qemuargv2xmldata/graphics-sdl.args | 24 - tests/qemuargv2xmldata/graphics-sdl.xml | 39 - .../qemuargv2xmldata/graphics-vnc-policy.args | 23 - .../qemuargv2xmldata/graphics-vnc-policy.xml | 41 - tests/qemuargv2xmldata/graphics-vnc-sasl.args | 24 - tests/qemuargv2xmldata/graphics-vnc-sasl.xml | 41 - .../qemuargv2xmldata/graphics-vnc-socket.args | 23 - .../qemuargv2xmldata/graphics-vnc-socket.xml | 41 - tests/qemuargv2xmldata/graphics-vnc-tls.args | 24 - tests/qemuargv2xmldata/graphics-vnc-tls.xml | 41 - .../graphics-vnc-websocket.args | 22 - .../graphics-vnc-websocket.xml | 32 - tests/qemuargv2xmldata/graphics-vnc.args | 23 - tests/qemuargv2xmldata/graphics-vnc.xml | 41 - .../qemuargv2xmldata/hostdev-pci-address.args | 23 - .../qemuargv2xmldata/hostdev-pci-address.xml | 40 - .../qemuargv2xmldata/hostdev-usb-address.args | 23 - .../qemuargv2xmldata/hostdev-usb-address.xml | 39 - tests/qemuargv2xmldata/hyperv-panic.args | 21 - tests/qemuargv2xmldata/hyperv-panic.xml | 29 - tests/qemuargv2xmldata/hyperv.args | 21 - tests/qemuargv2xmldata/hyperv.xml | 33 - tests/qemuargv2xmldata/input-usbmouse.args | 23 - tests/qemuargv2xmldata/input-usbmouse.xml | 35 - tests/qemuargv2xmldata/input-usbtablet.args | 23 - tests/qemuargv2xmldata/input-usbtablet.xml | 35 - tests/qemuargv2xmldata/kvm-features.args | 21 - tests/qemuargv2xmldata/kvm-features.xml | 31 - tests/qemuargv2xmldata/kvmclock.args | 22 - tests/qemuargv2xmldata/kvmclock.xml | 30 - .../machine-aeskeywrap-off-argv.args | 18 - .../machine-aeskeywrap-off-argv.xml | 23 - .../machine-aeskeywrap-on-argv.args | 18 - .../machine-aeskeywrap-on-argv.xml | 23 - tests/qemuargv2xmldata/machine-core-off.args | 22 - tests/qemuargv2xmldata/machine-core-off.xml | 34 - tests/qemuargv2xmldata/machine-core-on.args | 22 - tests/qemuargv2xmldata/machine-core-on.xml | 34 - .../machine-deakeywrap-off-argv.args | 18 - .../machine-deakeywrap-off-argv.xml | 23 - .../machine-deakeywrap-on-argv.args | 18 - .../machine-deakeywrap-on-argv.xml | 23 - .../machine-keywrap-none-argv.args | 18 - .../machine-keywrap-none-argv.xml | 20 - .../qemuargv2xmldata/mem-scale-maxmemory.args | 22 - .../qemuargv2xmldata/mem-scale-maxmemory.xml | 38 - tests/qemuargv2xmldata/mem-scale.args | 22 - tests/qemuargv2xmldata/mem-scale.xml | 37 - tests/qemuargv2xmldata/migrate.args | 23 - tests/qemuargv2xmldata/migrate.xml | 34 - tests/qemuargv2xmldata/misc-acpi.args | 21 - tests/qemuargv2xmldata/misc-acpi.xml | 37 - tests/qemuargv2xmldata/misc-disable-s3.args | 23 - tests/qemuargv2xmldata/misc-disable-s3.xml | 37 - .../misc-disable-suspends.args | 24 - .../misc-disable-suspends.xml | 38 - tests/qemuargv2xmldata/misc-enable-s4.args | 23 - tests/qemuargv2xmldata/misc-enable-s4.xml | 37 - tests/qemuargv2xmldata/misc-no-reboot.args | 23 - tests/qemuargv2xmldata/misc-no-reboot.xml | 34 - tests/qemuargv2xmldata/misc-uuid.args | 21 - tests/qemuargv2xmldata/misc-uuid.xml | 37 - tests/qemuargv2xmldata/net-eth-ifname.args | 23 - tests/qemuargv2xmldata/net-eth-ifname.xml | 41 - tests/qemuargv2xmldata/net-eth.args | 23 - tests/qemuargv2xmldata/net-eth.xml | 40 - tests/qemuargv2xmldata/net-user.args | 23 - tests/qemuargv2xmldata/net-user.xml | 39 - tests/qemuargv2xmldata/net-virtio.args | 23 - tests/qemuargv2xmldata/net-virtio.xml | 39 - .../nographics-vga-display.args | 23 - .../nographics-vga-display.xml | 34 - tests/qemuargv2xmldata/nographics-vga.args | 23 - tests/qemuargv2xmldata/nographics-vga.xml | 34 - tests/qemuargv2xmldata/nomachine-ppc64.args | 11 - tests/qemuargv2xmldata/nomachine-ppc64.xml | 50 - tests/qemuargv2xmldata/nomachine-x86_64.args | 11 - tests/qemuargv2xmldata/nomachine-x86_64.xml | 49 - tests/qemuargv2xmldata/nosharepages.args | 22 - tests/qemuargv2xmldata/nosharepages.xml | 37 - tests/qemuargv2xmldata/parallel-tcp.args | 22 - tests/qemuargv2xmldata/parallel-tcp.xml | 39 - tests/qemuargv2xmldata/pseries-disk.args | 18 - tests/qemuargv2xmldata/pseries-disk.xml | 50 - tests/qemuargv2xmldata/pseries-nvram.args | 22 - tests/qemuargv2xmldata/pseries-nvram.xml | 30 - tests/qemuargv2xmldata/qemu-ns-no-env.args | 23 - tests/qemuargv2xmldata/qemu-ns-no-env.xml | 38 - .../reboot-timeout-disabled.args | 21 - .../reboot-timeout-disabled.xml | 26 - .../reboot-timeout-enabled.args | 21 - .../reboot-timeout-enabled.xml | 26 - tests/qemuargv2xmldata/restore-v2.args | 23 - tests/qemuargv2xmldata/restore-v2.xml | 34 - tests/qemuargv2xmldata/serial-dev.args | 22 - tests/qemuargv2xmldata/serial-dev.xml | 44 - tests/qemuargv2xmldata/serial-file.args | 22 - tests/qemuargv2xmldata/serial-file.xml | 44 - tests/qemuargv2xmldata/serial-many.args | 23 - tests/qemuargv2xmldata/serial-many.xml | 48 - tests/qemuargv2xmldata/serial-pty.args | 22 - tests/qemuargv2xmldata/serial-pty.xml | 42 - tests/qemuargv2xmldata/serial-tcp-telnet.args | 22 - tests/qemuargv2xmldata/serial-tcp-telnet.xml | 46 - tests/qemuargv2xmldata/serial-tcp.args | 22 - tests/qemuargv2xmldata/serial-tcp.xml | 46 - tests/qemuargv2xmldata/serial-udp.args | 23 - tests/qemuargv2xmldata/serial-udp.xml | 52 - tests/qemuargv2xmldata/serial-unix.args | 22 - tests/qemuargv2xmldata/serial-unix.xml | 44 - tests/qemuargv2xmldata/serial-vc.args | 22 - tests/qemuargv2xmldata/serial-vc.xml | 42 - tests/qemuargv2xmldata/smp.args | 22 - tests/qemuargv2xmldata/smp.xml | 37 - tests/qemuargv2xmldata/sound.args | 23 - tests/qemuargv2xmldata/sound.xml | 42 - tests/qemuargv2xmldata/watchdog.args | 24 - tests/qemuargv2xmldata/watchdog.xml | 35 - tests/qemuargv2xmltest.c | 323 -- tests/virschematest.c | 2 +- 200 files changed, 18 insertions(+), 9093 deletions(-) delete mode 100644 tests/qemuargv2xmldata/boot-cdrom.args delete mode 100644 tests/qemuargv2xmldata/boot-cdrom.xml delete mode 100644 tests/qemuargv2xmldata/boot-floppy.args delete mode 100644 tests/qemuargv2xmldata/boot-floppy.xml delete mode 100644 tests/qemuargv2xmldata/boot-network.args delete mode 100644 tests/qemuargv2xmldata/boot-network.xml delete mode 100644 tests/qemuargv2xmldata/clock-localtime.args delete mode 100644 tests/qemuargv2xmldata/clock-localtime.xml delete mode 100644 tests/qemuargv2xmldata/clock-utc.args delete mode 100644 tests/qemuargv2xmldata/clock-utc.xml delete mode 100644 tests/qemuargv2xmldata/console-compat.args delete mode 100644 tests/qemuargv2xmldata/console-compat.xml delete mode 100644 tests/qemuargv2xmldata/disk-cdrom-empty.args delete mode 100644 tests/qemuargv2xmldata/disk-cdrom-empty.xml delete mode 100644 tests/qemuargv2xmldata/disk-cdrom.args delete mode 100644 tests/qemuargv2xmldata/disk-cdrom.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-boot-cdrom.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-boot-cdrom.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-boot-disk.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-boot-disk.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-cache-directsync.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-cache-directsync.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-cache-unsafe.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-cache-unsafe.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-cache-v2-none.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-cache-v2-none.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-cache-v2-wb.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-cache-v2-wb.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-cache-v2-wt.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-cache-v2-wt.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-error-policy-enospace.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-error-policy-enospace.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-error-policy-stop.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-error-policy-stop.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-error-policy-wreport-rignore.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-error-policy-wreport-rignore.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-fmt-qcow.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-fmt-qcow.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-gluster.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-gluster.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-iscsi-auth.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-iscsi-auth.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-iscsi.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-iscsi.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-nbd-export.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-nbd-export.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-nbd-ipv6-export.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-nbd-ipv6-export.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-nbd-ipv6.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-nbd-ipv6.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-nbd-unix.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-nbd-unix.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-nbd.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-nbd.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-rbd-auth.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-rbd-auth.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-rbd-ceph-env.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-rbd-ceph-env.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-rbd-ipv6.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-rbd-ipv6.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-rbd.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-rbd.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-sheepdog.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-sheepdog.xml delete mode 100644 tests/qemuargv2xmldata/disk-floppy.args delete mode 100644 tests/qemuargv2xmldata/disk-floppy.xml delete mode 100644 tests/qemuargv2xmldata/disk-many.args delete mode 100644 tests/qemuargv2xmldata/disk-many.xml delete mode 100644 tests/qemuargv2xmldata/disk-usb.args delete mode 100644 tests/qemuargv2xmldata/disk-usb.xml delete mode 100644 tests/qemuargv2xmldata/disk-virtio.args delete mode 100644 tests/qemuargv2xmldata/disk-virtio.xml delete mode 100644 tests/qemuargv2xmldata/graphics-sdl-fullscreen.args delete mode 100644 tests/qemuargv2xmldata/graphics-sdl-fullscreen.xml delete mode 100644 tests/qemuargv2xmldata/graphics-sdl.args delete mode 100644 tests/qemuargv2xmldata/graphics-sdl.xml delete mode 100644 tests/qemuargv2xmldata/graphics-vnc-policy.args delete mode 100644 tests/qemuargv2xmldata/graphics-vnc-policy.xml delete mode 100644 tests/qemuargv2xmldata/graphics-vnc-sasl.args delete mode 100644 tests/qemuargv2xmldata/graphics-vnc-sasl.xml delete mode 100644 tests/qemuargv2xmldata/graphics-vnc-socket.args delete mode 100644 tests/qemuargv2xmldata/graphics-vnc-socket.xml delete mode 100644 tests/qemuargv2xmldata/graphics-vnc-tls.args delete mode 100644 tests/qemuargv2xmldata/graphics-vnc-tls.xml delete mode 100644 tests/qemuargv2xmldata/graphics-vnc-websocket.args delete mode 100644 tests/qemuargv2xmldata/graphics-vnc-websocket.xml delete mode 100644 tests/qemuargv2xmldata/graphics-vnc.args delete mode 100644 tests/qemuargv2xmldata/graphics-vnc.xml delete mode 100644 tests/qemuargv2xmldata/hostdev-pci-address.args delete mode 100644 tests/qemuargv2xmldata/hostdev-pci-address.xml delete mode 100644 tests/qemuargv2xmldata/hostdev-usb-address.args delete mode 100644 tests/qemuargv2xmldata/hostdev-usb-address.xml delete mode 100644 tests/qemuargv2xmldata/hyperv-panic.args delete mode 100644 tests/qemuargv2xmldata/hyperv-panic.xml delete mode 100644 tests/qemuargv2xmldata/hyperv.args delete mode 100644 tests/qemuargv2xmldata/hyperv.xml delete mode 100644 tests/qemuargv2xmldata/input-usbmouse.args delete mode 100644 tests/qemuargv2xmldata/input-usbmouse.xml delete mode 100644 tests/qemuargv2xmldata/input-usbtablet.args delete mode 100644 tests/qemuargv2xmldata/input-usbtablet.xml delete mode 100644 tests/qemuargv2xmldata/kvm-features.args delete mode 100644 tests/qemuargv2xmldata/kvm-features.xml delete mode 100644 tests/qemuargv2xmldata/kvmclock.args delete mode 100644 tests/qemuargv2xmldata/kvmclock.xml delete mode 100644 tests/qemuargv2xmldata/machine-aeskeywrap-off-argv.args delete mode 100644 tests/qemuargv2xmldata/machine-aeskeywrap-off-argv.xml delete mode 100644 tests/qemuargv2xmldata/machine-aeskeywrap-on-argv.args delete mode 100644 tests/qemuargv2xmldata/machine-aeskeywrap-on-argv.xml delete mode 100644 tests/qemuargv2xmldata/machine-core-off.args delete mode 100644 tests/qemuargv2xmldata/machine-core-off.xml delete mode 100644 tests/qemuargv2xmldata/machine-core-on.args delete mode 100644 tests/qemuargv2xmldata/machine-core-on.xml delete mode 100644 tests/qemuargv2xmldata/machine-deakeywrap-off-argv.args delete mode 100644 tests/qemuargv2xmldata/machine-deakeywrap-off-argv.xml delete mode 100644 tests/qemuargv2xmldata/machine-deakeywrap-on-argv.args delete mode 100644 tests/qemuargv2xmldata/machine-deakeywrap-on-argv.xml delete mode 100644 tests/qemuargv2xmldata/machine-keywrap-none-argv.args delete mode 100644 tests/qemuargv2xmldata/machine-keywrap-none-argv.xml delete mode 100644 tests/qemuargv2xmldata/mem-scale-maxmemory.args delete mode 100644 tests/qemuargv2xmldata/mem-scale-maxmemory.xml delete mode 100644 tests/qemuargv2xmldata/mem-scale.args delete mode 100644 tests/qemuargv2xmldata/mem-scale.xml delete mode 100644 tests/qemuargv2xmldata/migrate.args delete mode 100644 tests/qemuargv2xmldata/migrate.xml delete mode 100644 tests/qemuargv2xmldata/misc-acpi.args delete mode 100644 tests/qemuargv2xmldata/misc-acpi.xml delete mode 100644 tests/qemuargv2xmldata/misc-disable-s3.args delete mode 100644 tests/qemuargv2xmldata/misc-disable-s3.xml delete mode 100644 tests/qemuargv2xmldata/misc-disable-suspends.args delete mode 100644 tests/qemuargv2xmldata/misc-disable-suspends.xml delete mode 100644 tests/qemuargv2xmldata/misc-enable-s4.args delete mode 100644 tests/qemuargv2xmldata/misc-enable-s4.xml delete mode 100644 tests/qemuargv2xmldata/misc-no-reboot.args delete mode 100644 tests/qemuargv2xmldata/misc-no-reboot.xml delete mode 100644 tests/qemuargv2xmldata/misc-uuid.args delete mode 100644 tests/qemuargv2xmldata/misc-uuid.xml delete mode 100644 tests/qemuargv2xmldata/net-eth-ifname.args delete mode 100644 tests/qemuargv2xmldata/net-eth-ifname.xml delete mode 100644 tests/qemuargv2xmldata/net-eth.args delete mode 100644 tests/qemuargv2xmldata/net-eth.xml delete mode 100644 tests/qemuargv2xmldata/net-user.args delete mode 100644 tests/qemuargv2xmldata/net-user.xml delete mode 100644 tests/qemuargv2xmldata/net-virtio.args delete mode 100644 tests/qemuargv2xmldata/net-virtio.xml delete mode 100644 tests/qemuargv2xmldata/nographics-vga-display.args delete mode 100644 tests/qemuargv2xmldata/nographics-vga-display.xml delete mode 100644 tests/qemuargv2xmldata/nographics-vga.args delete mode 100644 tests/qemuargv2xmldata/nographics-vga.xml delete mode 100644 tests/qemuargv2xmldata/nomachine-ppc64.args delete mode 100644 tests/qemuargv2xmldata/nomachine-ppc64.xml delete mode 100644 tests/qemuargv2xmldata/nomachine-x86_64.args delete mode 100644 tests/qemuargv2xmldata/nomachine-x86_64.xml delete mode 100644 tests/qemuargv2xmldata/nosharepages.args delete mode 100644 tests/qemuargv2xmldata/nosharepages.xml delete mode 100644 tests/qemuargv2xmldata/parallel-tcp.args delete mode 100644 tests/qemuargv2xmldata/parallel-tcp.xml delete mode 100644 tests/qemuargv2xmldata/pseries-disk.args delete mode 100644 tests/qemuargv2xmldata/pseries-disk.xml delete mode 100644 tests/qemuargv2xmldata/pseries-nvram.args delete mode 100644 tests/qemuargv2xmldata/pseries-nvram.xml delete mode 100644 tests/qemuargv2xmldata/qemu-ns-no-env.args delete mode 100644 tests/qemuargv2xmldata/qemu-ns-no-env.xml delete mode 100644 tests/qemuargv2xmldata/reboot-timeout-disabled.args delete mode 100644 tests/qemuargv2xmldata/reboot-timeout-disabled.xml delete mode 100644 tests/qemuargv2xmldata/reboot-timeout-enabled.args delete mode 100644 tests/qemuargv2xmldata/reboot-timeout-enabled.xml delete mode 100644 tests/qemuargv2xmldata/restore-v2.args delete mode 100644 tests/qemuargv2xmldata/restore-v2.xml delete mode 100644 tests/qemuargv2xmldata/serial-dev.args delete mode 100644 tests/qemuargv2xmldata/serial-dev.xml delete mode 100644 tests/qemuargv2xmldata/serial-file.args delete mode 100644 tests/qemuargv2xmldata/serial-file.xml delete mode 100644 tests/qemuargv2xmldata/serial-many.args delete mode 100644 tests/qemuargv2xmldata/serial-many.xml delete mode 100644 tests/qemuargv2xmldata/serial-pty.args delete mode 100644 tests/qemuargv2xmldata/serial-pty.xml delete mode 100644 tests/qemuargv2xmldata/serial-tcp-telnet.args delete mode 100644 tests/qemuargv2xmldata/serial-tcp-telnet.xml delete mode 100644 tests/qemuargv2xmldata/serial-tcp.args delete mode 100644 tests/qemuargv2xmldata/serial-tcp.xml delete mode 100644 tests/qemuargv2xmldata/serial-udp.args delete mode 100644 tests/qemuargv2xmldata/serial-udp.xml delete mode 100644 tests/qemuargv2xmldata/serial-unix.args delete mode 100644 tests/qemuargv2xmldata/serial-unix.xml delete mode 100644 tests/qemuargv2xmldata/serial-vc.args delete mode 100644 tests/qemuargv2xmldata/serial-vc.xml delete mode 100644 tests/qemuargv2xmldata/smp.args delete mode 100644 tests/qemuargv2xmldata/smp.xml delete mode 100644 tests/qemuargv2xmldata/sound.args delete mode 100644 tests/qemuargv2xmldata/sound.xml delete mode 100644 tests/qemuargv2xmldata/watchdog.args delete mode 100644 tests/qemuargv2xmldata/watchdog.xml delete mode 100644 tests/qemuargv2xmltest.c -- 2.21.0

3 12

[libvirt] [PATCH 00/12] tests: remove text monitor testing infrastructure
by Ján Tomko 17 Jun '19

17 Jun '19

Ján Tomko (12): tests: assume JSON monitor in qemuMonitorTestNewSimple tests: always assume JSON in qemuMonitorTestNew tests: qemuMonitorTestAddErrorResponse: use VIR_AUTOFREE tests: qemuMonitorTestProcessCommandDefaultValidate: simplify condition tests: assume JSON in qemuMonitorTestIO tests: qemuMonitorReportError: use tmp variable properly tests: remove text monitor testing infrastructure tests: qemuMonitorReportError: use VIR_AUTOFREE tests: refactor qemuMonitorTestProcessCommandDefault tests: refactor qemuMonitorTestProcessCommandDefaultValidate tests: qemuMonitorTestAddUnexpectedErrorResponse: VIR_AUTOFREE tests: qemuMonitorTestAddInvalidCommandResponse: VIR_AUTOFREE tests/qemuhotplugtest.c | 2 +- tests/qemumonitortestutils.c | 235 ++++++++++++----------------------- tests/qemumonitortestutils.h | 9 +- 3 files changed, 84 insertions(+), 162 deletions(-) -- 2.20.1

2 16

[libvirt] [PATCH 00/19] Use '#pragma once' in headers
by Jonathon Jongsma 14 Jun '19

14 Jun '19

Hi all, I'm trying to get up to speed with libvirt code, so I decided to start out with a slightly "mindless" task. I grabbed the '#pragma once' task from https://wiki.libvirt.org/page/BiteSizedTasks. This series covers the first part of the conversion. I chatted with Daniel Berrange briefly on IRC before starting, and he suggested that I should try to keep patches under 100k, and maybe each driver's source files as a single patch. I had a bit of difficulty deciding where to split the src/conf/ and src/util/ directories. So some of the files with more changes ended up being single-file patches. I tried to combine some related source files into patches, but at a certain point I ran out of obvious files to combine, so I combined a bunch of smaller miscellaneous files into one larger patch. It may not be ideal, but it's the best I could come up with. Alternative suggestions welcome. I'll follow up with the remaining changes if this division looks acceptable. Jonathon Jongsma (19): Use #pragma once in driver headers src/access: use #pragma once in headers src/admin: use #pragma once in headers src/bhyve: use #pragma once in headers conf: domain: use #pragma once in headers conf: network: use #pragma once in headers conf: nwfilter: use #pragma once in headers conf: node device: use #pragma once in headers conf: storage: use #pragma once in headers conf: misc: use #pragma once in headers src/cpu: use #pragma once in headers src/datatypes.h: use #pragma once src/esx: use #pragma once in headers src/hyperv: use #pragma once in headers src/interface: use #pragma once in headers src/internal.h: use #pragma once src/libvirt_internal.h: use #pragma once src/libxl: use #pragma once in headers src/logging: use #pragma once in headers src/access/viraccessdriver.h | 10 +- src/access/viraccessdrivernop.h | 7 +- src/access/viraccessdriverpolkit.h | 7 +- src/access/viraccessdriverstack.h | 7 +- src/access/viraccessmanager.h | 26 +-- src/access/viraccessperm.h | 11 +- src/admin/admin_server.h | 9 +- src/admin/admin_server_dispatch.h | 11 +- src/bhyve/bhyve_capabilities.h | 11 +- src/bhyve/bhyve_command.h | 15 +- src/bhyve/bhyve_conf.h | 7 +- src/bhyve/bhyve_device.h | 11 +- src/bhyve/bhyve_domain.h | 11 +- src/bhyve/bhyve_driver.h | 9 +- src/bhyve/bhyve_monitor.h | 11 +- src/bhyve/bhyve_parse_command.h | 5 +- src/bhyve/bhyve_process.h | 7 +- src/bhyve/bhyve_utils.h | 31 ++- src/conf/capabilities.h | 23 +-- src/conf/cpu_conf.h | 23 +-- src/conf/device_conf.h | 33 ++- src/conf/domain_addr.h | 16 +- src/conf/domain_audit.h | 10 +- src/conf/domain_capabilities.h | 15 +- src/conf/domain_conf.h | 91 ++++----- src/conf/domain_event.h | 11 +- src/conf/domain_nwfilter.h | 5 +- src/conf/interface_conf.h | 23 +-- src/conf/moment_conf.h | 11 +- src/conf/netdev_bandwidth_conf.h | 15 +- src/conf/netdev_vlan_conf.h | 13 +- src/conf/netdev_vport_profile_conf.h | 14 +- src/conf/network_conf.h | 52 +++-- src/conf/network_event.h | 11 +- src/conf/networkcommon_conf.h | 17 +- src/conf/node_device_conf.h | 31 ++- src/conf/node_device_event.h | 11 +- src/conf/node_device_util.h | 7 +- src/conf/numa_conf.h | 18 +- src/conf/nwfilter_conf.h | 93 ++++----- src/conf/nwfilter_ipaddrmap.h | 5 +- src/conf/nwfilter_params.h | 28 ++- src/conf/object_event.h | 11 +- src/conf/object_event_private.h | 7 +- src/conf/secret_conf.h | 15 +- src/conf/secret_event.h | 11 +- src/conf/snapshot_conf.h | 13 +- src/conf/storage_adapter_conf.h | 11 +- src/conf/storage_capabilities.h | 8 +- src/conf/storage_conf.h | 41 ++-- src/conf/storage_event.h | 11 +- src/conf/virchrdev.h | 9 +- src/conf/virconftypes.h | 5 +- src/conf/virdomainmomentobjlist.h | 17 +- src/conf/virdomainobjlist.h | 21 +- src/conf/virdomainsnapshotobjlist.h | 21 +- src/conf/virinterfaceobj.h | 7 +- src/conf/virnetworkobj.h | 9 +- src/conf/virnodedeviceobj.h | 13 +- src/conf/virnwfilterbindingdef.h | 13 +- src/conf/virnwfilterbindingobj.h | 11 +- src/conf/virnwfilterbindingobjlist.h | 8 +- src/conf/virnwfilterobj.h | 11 +- src/conf/virsavecookie.h | 13 +- src/conf/virsecretobj.h | 11 +- src/conf/virstorageobj.h | 11 +- src/cpu/cpu.h | 19 +- src/cpu/cpu_arm.h | 7 +- src/cpu/cpu_map.h | 7 +- src/cpu/cpu_ppc64.h | 7 +- src/cpu/cpu_ppc64_data.h | 8 +- src/cpu/cpu_s390.h | 7 +- src/cpu/cpu_x86.h | 9 +- src/cpu/cpu_x86_data.h | 58 +++--- src/datatypes.h | 89 ++++---- src/driver-hypervisor.h | 12 +- src/driver-interface.h | 12 +- src/driver-network.h | 12 +- src/driver-nodedev.h | 12 +- src/driver-nwfilter.h | 12 +- src/driver-secret.h | 12 +- src/driver-state.h | 12 +- src/driver-storage.h | 12 +- src/driver-stream.h | 12 +- src/driver.h | 37 ++-- src/esx/esx_driver.h | 5 +- src/esx/esx_interface_driver.h | 7 +- src/esx/esx_network_driver.h | 7 +- src/esx/esx_private.h | 15 +- src/esx/esx_storage_backend_iscsi.h | 7 +- src/esx/esx_storage_backend_vmfs.h | 7 +- src/esx/esx_storage_driver.h | 7 +- src/esx/esx_stream.h | 9 +- src/esx/esx_util.h | 13 +- src/esx/esx_vi.h | 37 ++-- src/esx/esx_vi_methods.h | 11 +- src/esx/esx_vi_types.h | 13 +- src/hyperv/hyperv_driver.h | 5 +- src/hyperv/hyperv_private.h | 13 +- src/hyperv/hyperv_util.h | 9 +- src/hyperv/hyperv_wmi.h | 21 +- src/hyperv/hyperv_wmi_classes.h | 27 ++- src/hyperv/openwsman.h | 35 ++-- src/interface/interface_driver.h | 5 +- src/internal.h | 295 +++++++++++++-------------- src/libvirt_internal.h | 7 +- src/libxl/libxl_capabilities.h | 29 ++- src/libxl/libxl_conf.h | 101 +++++---- src/libxl/libxl_domain.h | 29 ++- src/libxl/libxl_driver.h | 5 +- src/libxl/libxl_logger.h | 7 +- src/libxl/libxl_migration.h | 11 +- src/logging/log_daemon.h | 9 +- src/logging/log_daemon_config.h | 7 +- src/logging/log_daemon_dispatch.h | 7 +- src/logging/log_handler.h | 9 +- src/logging/log_manager.h | 9 +- 117 files changed, 928 insertions(+), 1296 deletions(-) -- 2.20.1

3 26

[libvirt] [PATCH] virNodeDeviceCapPCIDefFormat: Drop useless space before end of tags
by Michal Privoznik 14 Jun '19

14 Jun '19

Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial rule. src/conf/node_device_conf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 1db045d9ac..4ef92d5129 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -227,14 +227,14 @@ virNodeDeviceCapPCIDefFormat(virBufferPtr buf, virBufferEscapeString(buf, ">%s</product>\n", data->pci_dev.product_name); else - virBufferAddLit(buf, " />\n"); + virBufferAddLit(buf, "/>\n"); virBufferAsprintf(buf, "<vendor id='0x%04x'", data->pci_dev.vendor); if (data->pci_dev.vendor_name) virBufferEscapeString(buf, ">%s</vendor>\n", data->pci_dev.vendor_name); else - virBufferAddLit(buf, " />\n"); + virBufferAddLit(buf, "/>\n"); if (data->pci_dev.flags & VIR_NODE_DEV_CAP_FLAG_PCI_PHYSICAL_FUNCTION) { virBufferAddLit(buf, "<capability type='phys_function'>\n"); virBufferAdjustIndent(buf, 2); -- 2.21.0

1 0

[libvirt] [PATCH v2] qemu: fix pr-helper0 remain
by Jie Wang 13 Jun '19

13 Jun '19

If libvirt receive DISCONNECTED event and set prDaemonRunning to false, and qemuDomainRemoveDiskDevice is performing in the meantime. qemuDomainRemoveDiskDevice will return directly by prDaemonRunning check, so the pr-helper0 object will remain. In that case we should try harder and also kill the pr-helper process, so qemuProcessKillManagedPRDaemon could use the same treatment. Signed-off-by: Jie Wang <wangjie88(a)huawei.com> --- src/qemu/qemu_hotplug.c | 3 +-- src/qemu/qemu_process.c | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 34249bd..5e4a929 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -465,8 +465,7 @@ qemuHotplugRemoveManagedPR(virQEMUDriverPtr driver, virErrorPtr orig_err; int ret = -1; - if (!priv->prDaemonRunning || - virDomainDefHasManagedPR(vm->def)) + if (virDomainDefHasManagedPR(vm->def)) return 0; virErrorPreserveLast(&orig_err); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 47d8ca2..8070a09 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2746,9 +2746,6 @@ qemuProcessKillManagedPRDaemon(virDomainObjPtr vm) virErrorPtr orig_err; char *pidfile; - if (!priv->prDaemonRunning) - return; - if (!(pidfile = qemuProcessBuildPRHelperPidfilePath(vm))) { VIR_WARN("Unable to construct pr-helper pidfile path"); return; -- 2.8.3.windows.1

2 1

[libvirt] [PATCH] qemu: domain: Log some useful data in qemuDomainStorageSourceAccessModify
by Peter Krempa 13 Jun '19

13 Jun '19

Log the flags passed to the function in a exploded state so that it's easily visible what's happening to the image. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_domain.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 2095191cde..d28cfa4f42 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9339,6 +9339,9 @@ qemuDomainStorageSourceAccessModify(virQEMUDriverPtr driver, int ret = -1; virErrorPtr orig_err = NULL; bool chain = flags & QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_CHAIN; + bool force_ro = flags & QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_FORCE_READ_ONLY; + bool force_rw = flags & QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_FORCE_READ_WRITE; + bool revoke = flags & QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_REVOKE; int rc; bool was_readonly = src->readonly; bool revoke_cgroup = false; @@ -9346,14 +9349,18 @@ qemuDomainStorageSourceAccessModify(virQEMUDriverPtr driver, bool revoke_namespace = false; bool revoke_lockspace = false; - if (flags & QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_FORCE_READ_ONLY) + VIR_DEBUG("VM: '%s', src: '%s', readonly: '%d, force_ro: '%d', force_rw: '%d', revoke: '%d', chain: '%d'", + vm->def->name, NULLSTR(src->path), src->readonly, force_ro, + force_rw, revoke, chain); + + if (force_ro) src->readonly = true; - if (flags & QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_FORCE_READ_WRITE) + if (force_rw) src->readonly = false; /* just tear down the disk access */ - if (flags & QEMU_DOMAIN_STORAGE_SOURCE_ACCESS_REVOKE) { + if (revoke) { virErrorPreserveLast(&orig_err); revoke_cgroup = true; revoke_label = true; -- 2.21.0

3 4

[libvirt] [PATCH 0/3] tests: Include LDADDS in qemu_LDADDS
by Andrea Bolognani 12 Jun '19

12 Jun '19

Finally got around to implement the suggestion I made in https://www.redhat.com/archives/libvir-list/2019-May/msg00894.html Andrea Bolognani (3): tests: Tweak cputest_LDADDS tests: Tweak vircapstest_LDADD tests: Include LDADDS in qemu_LDADDS tests/Makefile.am | 44 +++++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 19 deletions(-) -- 2.21.0

2 6

[libvirt] [PATCH] qemu: Add support for overriding max threads per process limit
by Jim Fehlig 12 Jun '19

12 Jun '19

Some VM configurations may result in a large number of threads created by the associated qemu process which can exceed the system default limit. The maximum number of threads allowed per process is controlled by the pids cgroup controller and is set to 16k when creating VMs with systemd's machined service. The maximum number of threads per process is recorded in the pids.max file under the machine's pids controller cgroup hierarchy, e.g. $cgrp-mnt/pids/machine.slice/machine-qemu\\x2d1\\x2dtest.scope/pids.max Maximum threads per process is controlled with the TasksMax property of the systemd scope for the machine. This patch adds an option to qemu.conf which can be used to override the maximum number of threads allowed per qemu process. If the value of option is greater than zero, it will be set in the TasksMax property of the machine's scope after creating the machine. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/lxc/lxc_cgroup.c | 1 + src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 10 ++++++++++ src/qemu/qemu_cgroup.c | 1 + src/qemu/qemu_conf.c | 2 ++ src/qemu/qemu_conf.h | 1 + src/qemu/test_libvirtd_qemu.aug.in | 1 + src/util/vircgroup.c | 6 +++++- src/util/vircgroup.h | 1 + src/util/virsystemd.c | 24 +++++++++++++++++++++++- src/util/virsystemd.h | 3 ++- tests/virsystemdtest.c | 12 ++++++------ 12 files changed, 54 insertions(+), 9 deletions(-) diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c index d93a19d684..76014f3bfd 100644 --- a/src/lxc/lxc_cgroup.c +++ b/src/lxc/lxc_cgroup.c @@ -455,6 +455,7 @@ virCgroupPtr virLXCCgroupCreate(virDomainDefPtr def, nnicindexes, nicindexes, def->resource->partition, -1, + 0, &cgroup) < 0) goto cleanup; diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug index b311f02da6..c70b903fed 100644 --- a/src/qemu/libvirtd_qemu.aug +++ b/src/qemu/libvirtd_qemu.aug @@ -94,6 +94,7 @@ module Libvirtd_qemu = | limits_entry "max_core" | bool_entry "dump_guest_core" | str_entry "stdio_handler" + | int_entry "max_threads_per_process" let device_entry = bool_entry "mac_filter" | bool_entry "relaxed_acs_check" diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index 5a85789d81..ab044c9cf3 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -608,6 +608,16 @@ #max_processes = 0 #max_files = 0 +# If max_threads_per_process is set to a positive integer, libvirt +# will use it to set the maximum number of threads that can be +# created by a qemu process. Some VM configurations can result in +# qemu processes with tens of thousands of threads. systemd-based +# systems typically limit the number of threads per process to +# 16k. max_threads_per_process can be used to override default +# limits in the host OS. +# +#max_threads_per_process = 0 + # If max_core is set to a non-zero integer, then QEMU will be # permitted to create core dumps when it crashes, provided its # RAM size is smaller than the limit set. diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index ca76c4fdfa..9603f33e8a 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -930,6 +930,7 @@ qemuInitCgroup(virDomainObjPtr vm, nnicindexes, nicindexes, vm->def->resource->partition, cfg->cgroupControllers, + cfg->maxThreadsPerProc, &priv->cgroup) < 0) { if (virCgroupNewIgnoreError()) goto done; diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index daea11dacb..8ac2dc92b5 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -687,6 +687,8 @@ virQEMUDriverConfigLoadProcessEntry(virQEMUDriverConfigPtr cfg, return -1; if (virConfGetValueUInt(conf, "max_files", &cfg->maxFiles) < 0) return -1; + if (virConfGetValueUInt(conf, "max_threads_per_process", &cfg->maxThreadsPerProc) < 0) + return -1; if (virConfGetValueType(conf, "max_core") == VIR_CONF_STRING) { if (virConfGetValueString(conf, "max_core", &corestr) < 0) diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 983e74a3cf..48b8711cbd 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -171,6 +171,7 @@ struct _virQEMUDriverConfig { unsigned int maxProcesses; unsigned int maxFiles; + unsigned int maxThreadsPerProc; unsigned long long maxCore; bool dumpGuestCore; diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index fea1d308b7..ac7ad59ba8 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -75,6 +75,7 @@ module Test_libvirtd_qemu = { "set_process_name" = "1" } { "max_processes" = "0" } { "max_files" = "0" } +{ "max_threads_per_process" = "0" } { "max_core" = "unlimited" } { "dump_guest_core" = "1" } { "mac_filter" = "1" } diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index f58e336404..c31c34e5f8 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -1106,6 +1106,7 @@ virCgroupNewMachineSystemd(const char *name, int *nicindexes, const char *partition, int controllers, + unsigned int maxthreads, virCgroupPtr *group) { int rv; @@ -1122,7 +1123,8 @@ virCgroupNewMachineSystemd(const char *name, isContainer, nnicindexes, nicindexes, - partition)) < 0) + partition, + maxthreads)) < 0) return rv; if (controllers != -1) @@ -1234,6 +1236,7 @@ virCgroupNewMachine(const char *name, int *nicindexes, const char *partition, int controllers, + unsigned int maxthreads, virCgroupPtr *group) { int rv; @@ -1250,6 +1253,7 @@ virCgroupNewMachine(const char *name, nicindexes, partition, controllers, + maxthreads, group)) == 0) return 0; diff --git a/src/util/vircgroup.h b/src/util/vircgroup.h index 377e0fd870..3fb99f70ef 100644 --- a/src/util/vircgroup.h +++ b/src/util/vircgroup.h @@ -99,6 +99,7 @@ int virCgroupNewMachine(const char *name, int *nicindexes, const char *partition, int controllers, + unsigned int maxthreads, virCgroupPtr *group) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index 3f03e3bd63..497d100a5c 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -238,12 +238,14 @@ int virSystemdCreateMachine(const char *name, bool iscontainer, size_t nnicindexes, int *nicindexes, - const char *partition) + const char *partition, + unsigned int maxthreads) { int ret; DBusConnection *conn; char *creatorname = NULL; char *slicename = NULL; + char *scopename = NULL; static int hasCreateWithNetwork = 1; if ((ret = virSystemdHasMachined()) < 0) @@ -389,11 +391,31 @@ int virSystemdCreateMachine(const char *name, goto cleanup; } + if (maxthreads > 0) { + if (!(scopename = virSystemdMakeScopeName(name, drivername, false))) + goto cleanup; + + if (virDBusCallMethod(conn, + NULL, + NULL, + "org.freedesktop.systemd1", + "/org/freedesktop/systemd1", + "org.freedesktop.systemd1.Manager", + "SetUnitProperties", + "sba(sv)", + scopename, + true, + 1, + "TasksMax", "t", maxthreads) < 0) + goto cleanup; + } + ret = 0; cleanup: VIR_FREE(creatorname); VIR_FREE(slicename); + VIR_FREE(scopename); return ret; } diff --git a/src/util/virsystemd.h b/src/util/virsystemd.h index 7d9c0ebd62..bdce3b2e9d 100644 --- a/src/util/virsystemd.h +++ b/src/util/virsystemd.h @@ -37,7 +37,8 @@ int virSystemdCreateMachine(const char *name, bool iscontainer, size_t nnicindexes, int *nicindexes, - const char *partition); + const char *partition, + unsigned int maxthreads); int virSystemdTerminateMachine(const char *name); diff --git a/tests/virsystemdtest.c b/tests/virsystemdtest.c index 82c02decd1..478fa844fa 100644 --- a/tests/virsystemdtest.c +++ b/tests/virsystemdtest.c @@ -172,7 +172,7 @@ static int testCreateContainer(const void *opaque ATTRIBUTE_UNUSED) 123, true, 0, NULL, - "highpriority.slice") < 0) { + "highpriority.slice", 0) < 0) { fprintf(stderr, "%s", "Failed to create LXC machine\n"); return -1; } @@ -205,7 +205,7 @@ static int testCreateMachine(const void *opaque ATTRIBUTE_UNUSED) 123, false, 0, NULL, - NULL) < 0) { + NULL, 0) < 0) { fprintf(stderr, "%s", "Failed to create KVM machine\n"); return -1; } @@ -242,7 +242,7 @@ static int testCreateNoSystemd(const void *opaque ATTRIBUTE_UNUSED) 123, false, 0, NULL, - NULL)) == 0) { + NULL, 0)) == 0) { unsetenv("FAIL_NO_SERVICE"); fprintf(stderr, "%s", "Unexpected create machine success\n"); return -1; @@ -276,7 +276,7 @@ static int testCreateSystemdNotRunning(const void *opaque ATTRIBUTE_UNUSED) 123, false, 0, NULL, - NULL)) == 0) { + NULL, 0)) == 0) { unsetenv("FAIL_NOT_REGISTERED"); fprintf(stderr, "%s", "Unexpected create machine success\n"); return -1; @@ -310,7 +310,7 @@ static int testCreateBadSystemd(const void *opaque ATTRIBUTE_UNUSED) 123, false, 0, NULL, - NULL)) == 0) { + NULL, 0)) == 0) { unsetenv("FAIL_BAD_SERVICE"); fprintf(stderr, "%s", "Unexpected create machine success\n"); return -1; @@ -345,7 +345,7 @@ static int testCreateNetwork(const void *opaque ATTRIBUTE_UNUSED) 123, true, nnicindexes, nicindexes, - "highpriority.slice") < 0) { + "highpriority.slice", 0) < 0) { fprintf(stderr, "%s", "Failed to create LXC machine\n"); return -1; } -- 2.21.0

1 1

[libvirt] [PATCH] build: fix linking libqemutestdriver with LTO enabled
by Jim Fehlig 12 Jun '19

12 Jun '19

openSUSE Factory is in the process of enabling Link Time Optimization [0] and stumbled upon missing symbols when linking libqemutestdriver libtool: link: gcc -shared -fPIC -DPIC ../src/libvirt_qemu_probes.o \ -Wl,--whole-archive ../src/.libs/libvirt_driver_qemu_impl.a \ ../src/.libs/libvirt_driver_network_impl.a \ ../src/.libs/libvirt_driver_storage_impl.a -Wl,--no-whole-archive \ -lcap-ng -lgnutls -lnl-route-3 -lnl-3 -ldbus-1 -lselinux -lapparmor \ /usr/lib/libxml2.so -ldl -lz -llzma -lm -lblkid -ltirpc \ -fstack-protector-strong -O2 -fstack-protector-strong -flto=16 -g -O2 \ -fstack-protector-strong -flto=16 -g \ -Wl,-soname -Wl,libqemutestdriver.so -o .libs/libqemutestdriver.so ... /usr/lib/gcc/i586-suse-linux/9/../../../../i586-suse-linux/bin/ld: ./.libs/libqemutestdriver.so: undefined reference to `mdir_name' /usr/lib/gcc/i586-suse-linux/9/../../../../i586-suse-linux/bin/ld: ./.libs/libqemutestdriver.so: undefined reference to `rpl_ioctl' /usr/lib/gcc/i586-suse-linux/9/../../../../i586-suse-linux/bin/ld: ./.libs/libqemutestdriver.so: undefined reference to `rpl_pipe2' /usr/lib/gcc/i586-suse-linux/9/../../../../i586-suse-linux/bin/ld: ./.libs/libqemutestdriver.so: undefined reference to `recvfd' /usr/lib/gcc/i586-suse-linux/9/../../../../i586-suse-linux/bin/ld: ./.libs/libqemutestdriver.so: undefined reference to `c_strcasecmp' The missing symbols are provided by GNUlib. Add it when linking libqemutestdriver. [0] https://en.opensuse.org/openSUSE:LTO Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- tests/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 46d94d2236..1d80647c9f 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -557,7 +557,7 @@ endif WITH_DTRACE_PROBES libqemutestdriver_la_SOURCES = libqemutestdriver_la_LDFLAGS = $(DRIVERLIB_LDFLAGS) -libqemutestdriver_la_LIBADD = $(qemu_LDADDS) +libqemutestdriver_la_LIBADD = $(qemu_LDADDS) $(GNULIB_LIBS) qemucpumock_la_SOURCES = \ qemucpumock.c testutilshostcpus.h @@ -729,7 +729,7 @@ lxcconf2xmltest_SOURCES = \ lxcconf2xmltest_LDADD = $(lxc_LDADDS) else ! WITH_LXC EXTRA_DIST += lxcxml2xmltest.c testutilslxc.c testutilslxc.h -endif ! WITH_LXC +-endif ! WITH_LXC if WITH_OPENVZ openvzutilstest_SOURCES = \ -- 2.21.0

3 8

[libvirt] [PATCH] test_driver: implement virDomainGetLaunchSecurityInfo
by Ilias Stamatis 12 Jun '19

12 Jun '19

Since this is the test driver and this is tied to AMD CPUs at the moment, we can pretend that the domain doesn't have launch security and always return 0 parameters. Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com> --- src/test/test_driver.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 1aa79ce898..213f17808b 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -2284,6 +2284,18 @@ testDomainGetOSType(virDomainPtr dom ATTRIBUTE_UNUSED) } +static int +testDomainGetLaunchSecurityInfo(virDomainPtr domain ATTRIBUTE_UNUSED, + virTypedParameterPtr *params ATTRIBUTE_UNUSED, + int *nparams, + unsigned int flags) +{ + virCheckFlags(0, -1); + *nparams = 0; + return 0; +} + + static unsigned long long testDomainGetMaxMemory(virDomainPtr domain) { @@ -7011,6 +7023,7 @@ static virHypervisorDriver testHypervisorDriver = { .domainDestroy = testDomainDestroy, /* 0.1.1 */ .domainDestroyFlags = testDomainDestroyFlags, /* 4.2.0 */ .domainGetOSType = testDomainGetOSType, /* 0.1.9 */ + .domainGetLaunchSecurityInfo = testDomainGetLaunchSecurityInfo, /* 5.5.0 */ .domainGetMaxMemory = testDomainGetMaxMemory, /* 0.1.4 */ .domainSetMaxMemory = testDomainSetMaxMemory, /* 0.1.1 */ .domainSetMemory = testDomainSetMemory, /* 0.1.4 */ -- 2.21.0

2 1

[libvirt] [PATCH] tests: qemumonitorjson: Replace use of virReportError
by Peter Krempa 12 Jun '19

12 Jun '19

Use VIR_TEST_VERBOSE instead. This fixes the following syntax check problem: tests/qemumonitorjsontest.c:1409: virReportError(VIR_ERR_INTERNAL_ERROR, "arr should have been cleared"); Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- Pushed under the build-breaker rule. tests/qemumonitorjsontest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index 68b115fa89..e087d1c256 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -1406,7 +1406,7 @@ testQemuMonitorJSONqemuMonitorJSONMergeBitmaps(const void *opaque) return -1; if (arr) { - virReportError(VIR_ERR_INTERNAL_ERROR, "arr should have been cleared"); + VIR_TEST_VERBOSE("arr should have been cleared"); return -1; } -- 2.21.0

1 0

[libvirt] [PATCH 0/3] tests: uri: Improve uri testing and add test for urlencoded uris
by Peter Krempa 11 Jun '19

11 Jun '19

Peter Krempa (3): tests: uri: Use VIR_TEST_DEBUG instead of VIR_DEBUG tests: uri: Run all test cases on a single URI tests: uri: Add test for urlencoded URIs tests/viruritest.c | 80 +++++++++++++++++++++++++++------------------- 1 file changed, 47 insertions(+), 33 deletions(-) -- 2.21.0

2 4

[libvirt] [PATCH 0/3] qemu: Fix two block-job related regressions (blockdev-add saga)
by Peter Krempa 11 Jun '19

11 Jun '19

Peter Krempa (3): qemu: domain: Fix logic bug in qemuDomainStorageSourceAccessAllow qemu: domain: Allow overriding images to read-write in qemuDomainStorageSourceAccessAllow qemu: Use proper block job name when reconnecting to VM src/qemu/qemu_domain.c | 21 ++++++++++++++------- src/qemu/qemu_migration.c | 2 +- src/qemu/qemu_monitor.c | 7 ++++--- src/qemu/qemu_monitor.h | 3 ++- src/qemu/qemu_monitor_json.c | 12 ++++++++---- src/qemu/qemu_monitor_json.h | 3 ++- src/qemu/qemu_process.c | 2 +- 7 files changed, 32 insertions(+), 18 deletions(-) -- 2.21.0

2 6

[libvirt] [PATCH v2 0/4] test_driver: implement virDomainSaveImageGetXMLDesc and virDomainSaveImageDefineXML
by Ilias Stamatis 11 Jun '19

11 Jun '19

Changed in v2: * in testDomainSaveImageDefineXML check first that a saved image already exists before parsing the new file * reordered the arguments of testDomainSaveImageWrite in order for its signature to be consistent with testDomainSaveImageOpen While implementing virDomainSaveImageGetXMLDesc and virDomainSaveImageDefineXML for the test driver, I realized that there exists already code for saving and loading test images which can be reused. However, it needed to be extracted from testDomainSaveFlags and testDomainRestoreFlags into separate functions. The new functions are inspired by the corresponding QEMU driver code where e.g. qemuDomainSaveImageOpen serves as a helper used by other functions. This series of patches initially extracts the code mentioned above into separate functions and then provides the test driver with implementations for virDomainSaveImageGetXMLDesc and virDomainSaveImageDefineXML which make use of the newly introduced functions. Ilias Stamatis (4): test_driver: extract image saving code into a separate function test_driver: extract image loading code into a separate function test_driver: implement virDomainSaveImageDefineXML test_driver: implement virDomainSaveImageGetXMLDesc src/test/test_driver.c | 293 ++++++++++++++++++++++++++++------------- 1 file changed, 205 insertions(+), 88 deletions(-) -- 2.21.0

2 6

[libvirt] [jenkins-ci PATCH] lcitool: Don't warn when using package manager directly
by Andrea Bolognani 11 Jun '19

11 Jun '19

We only do this when performing operations that the corresponding Ansible module doesn't support, so we know what we're doing and don't want warnings to show up. Note that while only the dnf and yum modules complain at the moment, we might as well use warn=no everywhere so that we're already covered in case in the future the pkgng module starts detecting this as well. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- guests/playbooks/update/tasks/base.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/guests/playbooks/update/tasks/base.yml b/guests/playbooks/update/tasks/base.yml index 8fe114e..e0efe5d 100644 --- a/guests/playbooks/update/tasks/base.yml +++ b/guests/playbooks/update/tasks/base.yml @@ -52,11 +52,15 @@ - name: Update installed packages shell: '{{ package_manager }} update && {{ package_manager }} upgrade -y' + args: + warn: no when: - package_format == 'pkg' - name: Clean up packages after update shell: '{{ package_manager }} clean packages -y && {{ package_manager }} autoremove -y' + args: + warn: no when: - package_format == 'rpm' @@ -69,6 +73,8 @@ - name: Clean up packages after update shell: '{{ package_manager }} clean -y && {{ package_manager }} autoremove -y' + args: + warn: no when: - package_format == 'pkg' -- 2.21.0

2 4