- Devel - libvirt List Archives

[libvirt] [perl PATCH] Add support for virNetworkPortPtr and its APIs
by Daniel P. Berrangé 18 Jun '19

18 Jun '19

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Changes | 2 +- lib/Sys/Virt.pm | 1 + lib/Sys/Virt.xs | 179 ++++++++++++++++++++++++++++++++++++ lib/Sys/Virt/Error.pm | 12 +++ lib/Sys/Virt/Network.pm | 39 ++++++++ lib/Sys/Virt/NetworkPort.pm | 177 +++++++++++++++++++++++++++++++++++ t/030-api-coverage.t | 2 +- typemap | 14 +++ 8 files changed, 424 insertions(+), 2 deletions(-) create mode 100644 lib/Sys/Virt/NetworkPort.pm diff --git a/Changes b/Changes index 0fb13d5..e13c3b3 100644 --- a/Changes +++ b/Changes @@ -2,7 +2,7 @@ Revision history for perl module Sys::Virt 5.5.0 2019-07-00 - - XXX + - Add support for virNetworkPortPtr object and its APIs 5.4.0 2019-06-12 diff --git a/lib/Sys/Virt.pm b/lib/Sys/Virt.pm index b6553aa..2e01fd6 100644 --- a/lib/Sys/Virt.pm +++ b/lib/Sys/Virt.pm @@ -69,6 +69,7 @@ use warnings; use Sys::Virt::Error; use Sys::Virt::Domain; use Sys::Virt::Network; +use Sys::Virt::NetworkPort; use Sys::Virt::StoragePool; use Sys::Virt::StorageVol; use Sys::Virt::NodeDevice; diff --git a/lib/Sys/Virt.xs b/lib/Sys/Virt.xs index 9586be8..ccd5ba0 100644 --- a/lib/Sys/Virt.xs +++ b/lib/Sys/Virt.xs @@ -6828,6 +6828,27 @@ PREINIT: free(leases); +void +list_all_ports(net, flags=0) + virNetworkPtr net; + unsigned int flags; + PREINIT: + virNetworkPortPtr *ports; + int i, nport; + SV *portrv; + PPCODE: + if ((nport = virNetworkListAllPorts(net, &ports, flags)) < 0) + _croak_error(); + + EXTEND(SP, nport); + for (i = 0 ; i < nport ; i++) { + portrv = sv_newmortal(); + sv_setref_pv(portrv, "Sys::Virt::NetworkPort", ports[i]); + PUSHs(portrv); + } + free(ports); + + void destroy(net_rv) SV *net_rv; @@ -6852,6 +6873,150 @@ DESTROY(net_rv) } +MODULE = Sys::Virt::NetworkPort PACKAGE = Sys::Virt::NetworkPort + + +virNetworkPortPtr +_create_xml(net, xml, flags=0) + virNetworkPtr net; + const char *xml; + unsigned int flags; + CODE: + if (!(RETVAL = virNetworkPortCreateXML(net, xml, flags))) + _croak_error(); + OUTPUT: + RETVAL + + +virNetworkPortPtr +_lookup_by_uuid(net, uuid) + virNetworkPtr net; + const unsigned char *uuid; + CODE: + if (!(RETVAL = virNetworkPortLookupByUUID(net, uuid))) + _croak_error(); + OUTPUT: + RETVAL + + +virNetworkPortPtr +_lookup_by_uuid_string(net, uuid) + virNetworkPtr net; + const char *uuid; + CODE: + if (!(RETVAL = virNetworkPortLookupByUUIDString(net, uuid))) + _croak_error(); + + OUTPUT: + RETVAL + + +SV * +get_uuid(port) + virNetworkPortPtr port; + PREINIT: + unsigned char rawuuid[VIR_UUID_BUFLEN]; + CODE: + if ((virNetworkPortGetUUID(port, rawuuid)) < 0) + _croak_error(); + + RETVAL = newSVpv((char*)rawuuid, sizeof(rawuuid)); + OUTPUT: + RETVAL + + +SV * +get_uuid_string(port) + virNetworkPortPtr port; + PREINIT: + char uuid[VIR_UUID_STRING_BUFLEN]; + CODE: + if ((virNetworkPortGetUUIDString(port, uuid)) < 0) + _croak_error(); + + RETVAL = newSVpv(uuid, 0); + OUTPUT: + RETVAL + + +SV * +get_xml_description(port, flags=0) + virNetworkPortPtr port; + unsigned int flags; + PREINIT: + char *xml; + CODE: + if (!(xml = virNetworkPortGetXMLDesc(port, flags))) + _croak_error(); + + RETVAL = newSVpv(xml, 0); + free(xml); + OUTPUT: + RETVAL + + +HV * +get_parameters(port, flags=0) + virNetworkPortPtr port; + unsigned int flags; + PREINIT: + virTypedParameterPtr params = NULL; + int nparams = 0; + CODE: + if (virNetworkPortGetParameters(port, &params, &nparams, flags) < 0) { + vir_typed_param_safe_free(params, nparams); + _croak_error(); + } + + RETVAL = vir_typed_param_to_hv(params, nparams); + vir_typed_param_safe_free(params, nparams); + OUTPUT: + RETVAL + + +void +set_parameters(port, newparams, flags=0) + virNetworkPortPtr port; + HV *newparams; + unsigned int flags; + PREINIT: + virTypedParameterPtr params = NULL; + int nparams = 0; + PPCODE: + if (virNetworkPortGetParameters(port, &params, &nparams, 0) < 0) { + vir_typed_param_safe_free(params, nparams); + _croak_error(); + } + + nparams = vir_typed_param_from_hv(newparams, params, nparams); + + if (virNetworkPortSetParameters(port, params, nparams, flags) < 0) + _croak_error(); + vir_typed_param_safe_free(params, nparams); + + +void +delete(port, flags=0) + virNetworkPortPtr port; + unsigned int flags; + PPCODE: + if (virNetworkPortDelete(port, flags) < 0) + _croak_error(); + + +void +DESTROY(port_rv) + SV *port_rv; + PREINIT: + virNetworkPortPtr port; + PPCODE: + port = (virNetworkPortPtr)SvIV((SV*)SvRV(port_rv)); + if (port) { + virNetworkPortFree(port); + sv_setiv((SV*)SvRV(port_rv), 0); + } + + MODULE = Sys::Virt::StoragePool PACKAGE = Sys::Virt::StoragePool @@ -9577,6 +9742,17 @@ BOOT: REGISTER_CONSTANT(VIR_NETWORK_EVENT_STOPPED, EVENT_STOPPED); + stash = gv_stashpv( "Sys::Virt::NetworkPort", TRUE ); + REGISTER_CONSTANT(VIR_NETWORK_PORT_CREATE_RECLAIM, CREATE_RECLAIM); + + REGISTER_CONSTANT_STR(VIR_NETWORK_PORT_BANDWIDTH_IN_AVERAGE, BANDWIDTH_IN_AVERAGE); + REGISTER_CONSTANT_STR(VIR_NETWORK_PORT_BANDWIDTH_IN_BURST, BANDWIDTH_IN_BURST); + REGISTER_CONSTANT_STR(VIR_NETWORK_PORT_BANDWIDTH_IN_FLOOR, BANDWIDTH_IN_FLOOR); + REGISTER_CONSTANT_STR(VIR_NETWORK_PORT_BANDWIDTH_IN_PEAK, BANDWIDTH_IN_PEAK); + REGISTER_CONSTANT_STR(VIR_NETWORK_PORT_BANDWIDTH_OUT_AVERAGE, BANDWIDTH_OUT_AVERAGE); + REGISTER_CONSTANT_STR(VIR_NETWORK_PORT_BANDWIDTH_OUT_BURST, BANDWIDTH_OUT_BURST); + REGISTER_CONSTANT_STR(VIR_NETWORK_PORT_BANDWIDTH_OUT_PEAK, BANDWIDTH_OUT_PEAK); + stash = gv_stashpv( "Sys::Virt::Interface", TRUE ); REGISTER_CONSTANT(VIR_INTERFACE_XML_INACTIVE, XML_INACTIVE); @@ -9863,4 +10039,7 @@ BOOT: REGISTER_CONSTANT(VIR_ERR_INVALID_DOMAIN_CHECKPOINT, ERR_INVALID_DOMAIN_CHECKPOINT); REGISTER_CONSTANT(VIR_ERR_NO_DOMAIN_BACKUP, ERR_NO_DOMAIN_BACKUP); REGISTER_CONSTANT(VIR_ERR_NO_DOMAIN_CHECKPOINT, ERR_NO_DOMAIN_CHECKPOINT); + REGISTER_CONSTANT(VIR_ERR_NO_NETWORK_PORT, ERR_NO_NETWORK_PORT); + REGISTER_CONSTANT(VIR_ERR_INVALID_NETWORK_PORT, ERR_INVALID_NETWORK_PORT); + REGISTER_CONSTANT(VIR_ERR_NETWORK_PORT_EXIST, ERR_NETWORK_PORT_EXIST); } diff --git a/lib/Sys/Virt/Error.pm b/lib/Sys/Virt/Error.pm index d65ceb5..3f48769 100644 --- a/lib/Sys/Virt/Error.pm +++ b/lib/Sys/Virt/Error.pm @@ -844,6 +844,18 @@ Domain checkpoint not found Domain backup job id not found +=item Sys::Virt::Error::ERR_NO_NETWORK_PORT + +No matching network port + +=item Sys::Virt::Error::ERR_INVALID_NETWORK_PORT + +Invalid network port object + +=item Sys::Virt::Error::ERR_NETWORK_PORT_EXIST + +Network port already exists + =back =head1 AUTHORS diff --git a/lib/Sys/Virt/Network.pm b/lib/Sys/Virt/Network.pm index 415e629..e4b54da 100644 --- a/lib/Sys/Virt/Network.pm +++ b/lib/Sys/Virt/Network.pm @@ -193,6 +193,45 @@ The client ID or DUID =back +=item @port = $net->list_all_ports($flags=0) + +List all ports associated with the network. The return array elements +are instances of the C<Sys::Virt::NetworkPort> class. + +=item $port = $net->create_port($xml, $flags=0) + +Create a new network port from the given C<$xml> description. The C<$flags> +parameter can optionally taken one or more of the network port creation +constants. The returned C<$port> object is an instance of the +C<Sys::Virt::NetworkPort> class. + +=cut + +sub create_port { + my $self = shift; + my $xml = shift; + my $flags = shift || 0; + + return Sys::Virt::NetworkPort->_new(net => $self, xml => $xml, flags => $flags); +} + + +=item $port = $net->get_port_by_uuid($uuid); + +Lookup a network port from a raw or printable UUID. +The returned C<$port> object is an instance of the C<Sys::Virt::NetworkPort> +class. + +=cut + +sub get_port_by_uuid { + my $self = shift; + my $uuid = shift; + + return Sys::Virt::NetworkPort->_new(net => $self, uuid => $uuid); +} + + =back =head1 CONSTANTS diff --git a/lib/Sys/Virt/NetworkPort.pm b/lib/Sys/Virt/NetworkPort.pm new file mode 100644 index 0000000..9e9bf37 --- /dev/null +++ b/lib/Sys/Virt/NetworkPort.pm @@ -0,0 +1,177 @@ +# -*- perl -*- +# +# Copyright (C) 2019 Red Hat +# +# This program is free software; You can redistribute it and/or modify +# it under either: +# +# a) the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version, +# +# or +# +# b) the "Artistic License" +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions of the two licenses. + +=pod + +=head1 NAME + +Sys::Virt::NetworkPort - Represent & manage a libvirt virtual network port + +=head1 DESCRIPTION + +The C<Sys::Virt::NetworkPort> module represents a port in a virtual network. + +=head1 METHODS + +=over 4 + +=cut + +package Sys::Virt::NetworkPort; + +use strict; +use warnings; + + +sub _new { + my $proto = shift; + my $class = ref($proto) || $proto; + my %params = @_; + + my $net = exists $params{network} ? $params{network} : die "network parameter is required"; + my $self; + if (exists $params{uuid}) { + if (length($params{uuid}) == 16) { + $self = Sys::Virt::NetworkPort::_lookup_by_uuid($net, $params{uuid}); + } elsif (length($params{uuid}) == 32 || + length($params{uuid}) == 36) { + $self = Sys::Virt::NetworkPort::_lookup_by_uuid_string($net, $params{uuid}); + } else { + die "UUID must be either 16 unsigned bytes, or 32/36 hex characters long"; + } + } elsif (exists $params{xml}) { + my $flags = $params{flags} || 0; + $self = Sys::Virt::NetworkPort::_create_xml($net, $params{xml}, $flags); + } else { + die "uuid or xml parameters are required"; + } + + bless $self, $class; + + return $self; +} + + +=item my $uuid = $net->get_uuid() + +Returns a 16 byte long string containing the raw globally unique identifier +(UUID) for the network port. + +=item my $uuid = $net->get_uuid_string() + +Returns a printable string representation of the raw UUID, in the format +'XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX'. + +=item my $xml = $net->get_xml_description() + +Returns an XML document containing a complete description of +the network port's configuration + +=item $net->delete() + +Delete the network port from the managed network. + +=item my $params = $net->get_parameters($flags=0); + +Get tunable parameters associated with the network port. The C<$flags> +parameter is currently unused and defaults to zero. The returned +C<$params> is a hash reference whose keys are one or more of the +following constants: + +=over 4 + +=item Sys::Virt::NetworkPort::BANDWIDTH_IN_AVERAGE + +The average inbound bandwidth + +=item Sys::Virt::NetworkPort::BANDWIDTH_IN_BURST + +The burstable inbound bandwidth + +=item Sys::Virt::NetworkPort::BANDWIDTH_IN_FLOOR + +The minimum inbound bandwidth + +=item Sys::Virt::NetworkPort::BANDWIDTH_IN_PEAK + +The peak inbound bandwidth + +=item Sys::Virt::NetworkPort::BANDWIDTH_OUT_AVERAGE + +The average outbound bandwidth + +=item Sys::Virt::NetworkPort::BANDWIDTH_OUT_BURST + +The burstable outbound bandwidth + +=item Sys::Virt::NetworkPort::BANDWIDTH_OUT_PEAK + +The peak outbound bandwidth + +=back + +=item $net->set_parameters($params, $flags=0); + +Set tunable parameters associated with the network port. The C<$flags> +parameter is currently unused and defaults to zero. The C<$params> +parameter is a hash reference whose keys are one or more of the +constants listed for C<get_parameters>. + +=back + +=head2 NETWORK PORT CREATION CONSTANTS + +When creating network ports zero or more of the following +constants may be used + +=over 4 + +=item Sys::Virt::NetworkPort::CREATE_RECLAIM + +Providing configuration reclaiming a pre-existing network port. + +=back + + +=cut + + +1; + + +=head1 AUTHORS + +Daniel P. Berrange <berrange(a)redhat.com> + +=head1 COPYRIGHT + +Copyright (C) 2019 Red Hat + +=head1 LICENSE + +This program is free software; you can redistribute it and/or modify +it under the terms of either the GNU General Public License as published +by the Free Software Foundation (either version 2 of the License, or at +your option any later version), or, the Artistic License, as specified +in the Perl README file. + +=head1 SEE ALSO + +L<Sys::Virt>, L<Sys::Virt::Network>, L<Sys::Virt::Error>, C<http://libvirt.org> + +=cut diff --git a/t/030-api-coverage.t b/t/030-api-coverage.t index 15d4a77..0b6592a 100644 --- a/t/030-api-coverage.t +++ b/t/030-api-coverage.t @@ -152,7 +152,7 @@ virNetworkDHCPLeaseFree ); foreach my $func (sort { $a cmp $b } @functions) { - if ($func =~ /(GetConnect|Ref|GetDomain)$/ || + if ($func =~ /(GetConnect|Ref|GetDomain|GetNetwork)$/ || grep {/$func/ } @blacklist) { ok(1, $func); next; diff --git a/typemap b/typemap index 9784094..b316aa2 100644 --- a/typemap +++ b/typemap @@ -4,6 +4,7 @@ const unsigned char * T_PV virConnectPtr O_OBJECT_connect virDomainPtr O_OBJECT_domain virNetworkPtr O_OBJECT_network +virNetworkPortPtr O_OBJECT_network_port virNWFilterPtr O_OBJECT_nwfilter virNWFilterBindingPtr O_OBJECT_nwfilter_binding virInterfacePtr O_OBJECT_interface @@ -55,6 +56,19 @@ OUTPUT O_OBJECT_network sv_setref_pv( $arg, "Sys::Virt::Network", (void*)$var ); +INPUT +O_OBJECT_network_port + if (sv_isobject($arg) && (SvTYPE(SvRV($arg)) == SVt_PVMG)) + $var = INT2PTR($type, SvIV((SV*)SvRV( $arg ))); + else { + warn( \"${Package}::$func_name() -- $var is not a blessed SV reference\" ); + XSRETURN_UNDEF; + } + +OUTPUT +O_OBJECT_network_port + sv_setref_pv( $arg, "Sys::Virt::NetworkPort", (void*)$var ); + INPUT O_OBJECT_storagepool -- 2.21.0

2 1

[libvirt] [PATCH 0/4] docs: Use CDNJS, update JavaScript libraries
by Andrea Bolognani 18 Jun '19

18 Jun '19

We're carrying around embedded copies of a few JavaScript libraries for use in our homepage, and we've been unforgivably bad at keeping them up to date. Instead of serving JavaScript from libvirt.org, use CDNJS so that users will get better performance and the load on our Web server will decrease (win-win!); at the same time, move from the positively ancient versions we're currently using to the freshest ones available. Andrea Bolognani (4): docs: Use CDNJS for Moment.js docs: Use CDNJS for jquery.rss docs: Use CDNJS for jQuery docs: Update JavaScript libraries docs/Makefile.am | 4 +--- docs/index.html.in | 6 +++--- docs/js/jquery-3.1.1.min.js | 4 ---- docs/js/jquery.rss.min.js | 11 ----------- docs/js/moment.min.js | 7 ------- 5 files changed, 4 insertions(+), 28 deletions(-) delete mode 100644 docs/js/jquery-3.1.1.min.js delete mode 100644 docs/js/jquery.rss.min.js delete mode 100644 docs/js/moment.min.js -- 2.21.0

4 15

[libvirt] [PATCH 0/5] docs: drvqemu: Clean up documentation regarding XML<->native conversion
by Peter Krempa 18 Jun '19

18 Jun '19

This is a follow up to the series for dropping qemu command line parsing. This fixes the qemu driver documentation. Note that the patches removing the outdated examples can be skipped if we wish to keep them around. I did not see a point in doing so though. Peter Krempa (5): docs: drvqemu: Clarify caveats of domxml-to-native docs: drvqemu: Remove outdated example of virsh domxml-from-native docs: css: Add style for ... docs: drvqemu: Add note about deprecation of domxml-from-native docs: drvqemu: Drop old example for domxml-to-native docs/drvqemu.html.in | 77 +++++--------------------------------------- docs/libvirt.css | 6 ++++ 2 files changed, 14 insertions(+), 69 deletions(-) -- 2.21.0

2 6

[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