June 2019 - 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