- Devel - libvirt List Archives

[libvirt] [PATCH 0/9] qemu: stats/misc refactors (blockdev-add saga)
by Peter Krempa 20 Jul '18

20 Jul '18

Last lot of refactors which could be split of prior to starting it for real. Peter Krempa (9): qemu: driver: Reuse qemuDomainBlocksStatsGather in qemuDomainGetBlockInfo qemu: domain: Move out clearing of backing chain in qemuDomainDetermineDiskChain qemu: domain: Add helper for getting the disk backend alias qemu: command: use qemuDomainDiskGetBackendAlias in commandline building qemu: monitor: Add the 'query-nodes' argument for query-blockstats qemu: json: Extract gathering of block statistics qemu: monitor: Split out code to gather data from 'query-block' utils: storage: Add helper for checking if storage source is the same qemu: Replace qemuDomainDiskSourceDiffers by virStorageSourceIsSameLocation src/libvirt_private.syms | 1 + src/qemu/qemu_block.c | 2 +- src/qemu/qemu_blockjob.c | 4 +- src/qemu/qemu_command.c | 24 ++++++---- src/qemu/qemu_domain.c | 66 ++++++++++++--------------- src/qemu/qemu_domain.h | 10 +++-- src/qemu/qemu_driver.c | 47 +++++++------------- src/qemu/qemu_hotplug.c | 2 +- src/qemu/qemu_monitor.c | 8 +++- src/qemu/qemu_monitor.h | 3 +- src/qemu/qemu_monitor_json.c | 103 ++++++++++++++++++++++++++++--------------- src/qemu/qemu_monitor_json.h | 3 +- src/qemu/qemu_process.c | 7 ++- src/util/virstoragefile.c | 43 ++++++++++++++++++ src/util/virstoragefile.h | 3 ++ 15 files changed, 198 insertions(+), 128 deletions(-) -- 2.16.2

2 18

[libvirt] [PATCH] utils: storage: Add copying of PR definition to virStorageSource
by Peter Krempa 20 Jul '18

20 Jul '18

Despite the warning that virStorageSourceCopy needs to be populated on additions to the structure commit 687730540e4 neglected to implement the copy function. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/util/virstoragefile.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 58f67278da..b6a2b415e9 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -2041,6 +2041,29 @@ virStorageSourceChainHasManagedPR(virStorageSourcePtr src) } +static virStoragePRDefPtr +virStoragePRDefCopy(virStoragePRDefPtr src) +{ + virStoragePRDefPtr copy = NULL; + virStoragePRDefPtr ret = NULL; + + if (VIR_ALLOC(copy) < 0) + return NULL; + + copy->managed = src->managed; + + if (VIR_STRDUP(copy->path, src->path) < 0 || + VIR_STRDUP(copy->mgralias, src->mgralias) < 0) + goto cleanup; + + VIR_STEAL_PTR(ret, copy); + + cleanup: + virStoragePRDefFree(copy); + return ret; +} + + virSecurityDeviceLabelDefPtr virStorageSourceGetSecurityLabelDef(virStorageSourcePtr src, const char *model) @@ -2245,6 +2268,10 @@ virStorageSourceCopy(const virStorageSource *src, !(ret->auth = virStorageAuthDefCopy(src->auth))) goto error; + if (src->pr && + !(ret->pr = virStoragePRDefCopy(src->pr))) + goto error; + if (backingChain && src->backingStore) { if (!(ret->backingStore = virStorageSourceCopy(src->backingStore, true))) -- 2.16.2

2 1

[libvirt] [PATCH] replace 'if' type conditions with 'switch' for VIR_NETWORK_FORWARD_*
by Shi Lei 20 Jul '18

20 Jul '18

Hi, everyone! For VIR_NETWORK_FORWARD_*, I try to replace 'if' type conditions with typed 'switch()'. It might be more clear. Signed-off-by: Shi Lei <shilei.massclouds(a)gmx.com> --- src/conf/domain_conf.c | 46 +++++----- src/conf/network_conf.c | 49 ++++++----- src/conf/virnetworkobj.c | 15 ++-- src/esx/esx_network_driver.c | 8 +- src/network/bridge_driver.c | 203 +++++++++++++++++++++++-------------------- 5 files changed, 178 insertions(+), 143 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 178c6d2..c02543f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -29975,40 +29975,44 @@ virDomainNetResolveActualType(virDomainNetDefPtr iface) if (!(def = virNetworkDefParseString(xml))) goto cleanup; - if ((def->forward.type == VIR_NETWORK_FORWARD_NONE) || - (def->forward.type == VIR_NETWORK_FORWARD_NAT) || - (def->forward.type == VIR_NETWORK_FORWARD_ROUTE) || - (def->forward.type == VIR_NETWORK_FORWARD_OPEN)) { + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: /* for these forward types, the actual net type really *is* * NETWORK; we just keep the info from the portgroup in * iface->data.network.actual */ ret = VIR_DOMAIN_NET_TYPE_NETWORK; + break; - } else if ((def->forward.type == VIR_NETWORK_FORWARD_BRIDGE) && - def->bridge) { - - /* <forward type='bridge'/> <bridge name='xxx'/> - * is VIR_DOMAIN_NET_TYPE_BRIDGE - */ - - ret = VIR_DOMAIN_NET_TYPE_BRIDGE; - - } else if (def->forward.type == VIR_NETWORK_FORWARD_HOSTDEV) { - + case VIR_NETWORK_FORWARD_HOSTDEV: ret = VIR_DOMAIN_NET_TYPE_HOSTDEV; + break; + + case VIR_NETWORK_FORWARD_BRIDGE: + if (def->bridge) { + /* <forward type='bridge'/> <bridge name='xxx'/> + * is VIR_DOMAIN_NET_TYPE_BRIDGE + */ + ret = VIR_DOMAIN_NET_TYPE_BRIDGE; + break; + } - } else if ((def->forward.type == VIR_NETWORK_FORWARD_BRIDGE) || - (def->forward.type == VIR_NETWORK_FORWARD_PRIVATE) || - (def->forward.type == VIR_NETWORK_FORWARD_VEPA) || - (def->forward.type == VIR_NETWORK_FORWARD_PASSTHROUGH)) { + /* intentionally fall through to the direct case for + * VIR_NETWORK_FORWARD_BRIDGE with no bridge device defined + */ + ATTRIBUTE_FALLTHROUGH; + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: /* <forward type='bridge|private|vepa|passthrough'> are all * VIR_DOMAIN_NET_TYPE_DIRECT. */ - ret = VIR_DOMAIN_NET_TYPE_DIRECT; - + break; } cleanup: diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 630a87f..bafc1d3 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1959,17 +1959,22 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) VIR_FREE(stp); - if (def->mtu && - (def->forward.type != VIR_NETWORK_FORWARD_NONE && - def->forward.type != VIR_NETWORK_FORWARD_NAT && - def->forward.type != VIR_NETWORK_FORWARD_ROUTE && - def->forward.type != VIR_NETWORK_FORWARD_OPEN)) { - virReportError(VIR_ERR_XML_ERROR, - _("mtu size only allowed in open, route, nat, " - "and isolated mode, not in %s (network '%s')"), - virNetworkForwardTypeToString(def->forward.type), - def->name); - goto error; + if (def->mtu) { + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: + break; + + default: + virReportError(VIR_ERR_XML_ERROR, + _("mtu size only allowed in open, route, nat, " + "and isolated mode, not in %s (network '%s')"), + virNetworkForwardTypeToString(def->forward.type), + def->name); + goto error; + } } /* Extract custom metadata */ @@ -2349,6 +2354,7 @@ virNetworkDefFormatBuf(virBufferPtr buf, char uuidstr[VIR_UUID_STRING_BUFLEN]; size_t i; bool shortforward; + bool hasbridge = false; virBufferAddLit(buf, "<network"); if (!(flags & VIR_NETWORK_XML_INACTIVE) && (def->connections > 0)) @@ -2469,22 +2475,21 @@ virNetworkDefFormatBuf(virBufferPtr buf, virBufferAddLit(buf, "</forward>\n"); } + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: + hasbridge = true; + break; + } - if (def->forward.type == VIR_NETWORK_FORWARD_NONE || - def->forward.type == VIR_NETWORK_FORWARD_NAT || - def->forward.type == VIR_NETWORK_FORWARD_ROUTE || - def->forward.type == VIR_NETWORK_FORWARD_OPEN || - def->bridge || def->macTableManager) { - + if (hasbridge || def->bridge || def->macTableManager) { virBufferAddLit(buf, "<bridge"); virBufferEscapeString(buf, " name='%s'", def->bridge); - if (def->forward.type == VIR_NETWORK_FORWARD_NONE || - def->forward.type == VIR_NETWORK_FORWARD_NAT || - def->forward.type == VIR_NETWORK_FORWARD_ROUTE || - def->forward.type == VIR_NETWORK_FORWARD_OPEN) { + if (hasbridge) virBufferAsprintf(buf, " stp='%s' delay='%ld'", def->stp ? "on" : "off", def->delay); - } if (def->macTableManager) { virBufferAsprintf(buf, " macTableManager='%s'", virNetworkBridgeMACTableManagerTypeToString(def->macTableManager)); diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index e00c8a7..7706817 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -1009,19 +1009,22 @@ virNetworkLoadConfig(virNetworkObjListPtr nets, goto error; } - if (def->forward.type == VIR_NETWORK_FORWARD_NONE || - def->forward.type == VIR_NETWORK_FORWARD_NAT || - def->forward.type == VIR_NETWORK_FORWARD_ROUTE || - def->forward.type == VIR_NETWORK_FORWARD_OPEN) { - + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: if (!def->mac_specified) { virNetworkSetBridgeMacAddr(def); virNetworkSaveConfig(configDir, def); } - } else { + break; + + default: /* Throw away MAC address for other forward types, * which could have been generated by older libvirt RPMs */ def->mac_specified = false; + break; } if (!(obj = virNetworkObjAssignDef(nets, def, 0))) diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c index 04118b4..8ea1079 100644 --- a/src/esx/esx_network_driver.c +++ b/src/esx/esx_network_driver.c @@ -326,8 +326,12 @@ esxNetworkDefineXML(virConnectPtr conn, const char *xml) } /* FIXME: Add support for NAT */ - if (def->forward.type != VIR_NETWORK_FORWARD_NONE && - def->forward.type != VIR_NETWORK_FORWARD_BRIDGE) { + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_BRIDGE: + break; + + default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported forward mode '%s'"), virNetworkForwardTypeToString(def->forward.type)); diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index da3c32e..5e885b5 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -2088,19 +2088,22 @@ networkRefreshDaemonsHelper(virNetworkObjPtr obj, virObjectLock(obj); def = virNetworkObjGetDef(obj); - if (virNetworkObjIsActive(obj) && - ((def->forward.type == VIR_NETWORK_FORWARD_NONE) || - (def->forward.type == VIR_NETWORK_FORWARD_NAT) || - (def->forward.type == VIR_NETWORK_FORWARD_ROUTE) || - (def->forward.type == VIR_NETWORK_FORWARD_OPEN))) { - /* Only the three L3 network types that are configured by - * libvirt will have a dnsmasq or radvd daemon associated - * with them. Here we send a SIGHUP to an existing - * dnsmasq and/or radvd, or restart them if they've - * disappeared. - */ - networkRefreshDhcpDaemon(driver, obj); - networkRefreshRadvd(driver, obj); + if (virNetworkObjIsActive(obj)) { + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: + /* Only the three L3 network types that are configured by + * libvirt will have a dnsmasq or radvd daemon associated + * with them. Here we send a SIGHUP to an existing + * dnsmasq and/or radvd, or restart them if they've + * disappeared. + */ + networkRefreshDhcpDaemon(driver, obj); + networkRefreshRadvd(driver, obj); + break; + } } virObjectUnlock(obj); return 0; @@ -2128,18 +2131,21 @@ networkReloadFirewallRulesHelper(virNetworkObjPtr obj, virObjectLock(obj); def = virNetworkObjGetDef(obj); - if (virNetworkObjIsActive(obj) && - ((def->forward.type == VIR_NETWORK_FORWARD_NONE) || - (def->forward.type == VIR_NETWORK_FORWARD_NAT) || - (def->forward.type == VIR_NETWORK_FORWARD_ROUTE))) { - /* Only three of the L3 network types that are configured by - * libvirt need to have iptables rules reloaded. The 4th L3 - * network type, forward='open', doesn't need this because it - * has no iptables rules. - */ - networkRemoveFirewallRules(def); - if (networkAddFirewallRules(def) < 0) { - /* failed to add but already logged */ + if (virNetworkObjIsActive(obj)) { + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + /* Only three of the L3 network types that are configured by + * libvirt need to have iptables rules reloaded. The 4th L3 + * network type, forward='open', doesn't need this because it + * has no iptables rules. + */ + networkRemoveFirewallRules(def); + if (networkAddFirewallRules(def) < 0) { + /* failed to add but already logged */ + } + break; } } virObjectUnlock(obj); @@ -3273,11 +3279,11 @@ networkValidate(virNetworkDriverStatePtr driver, /* Only the three L3 network types that are configured by libvirt * need to have a bridge device name / mac address provided */ - if (def->forward.type == VIR_NETWORK_FORWARD_NONE || - def->forward.type == VIR_NETWORK_FORWARD_NAT || - def->forward.type == VIR_NETWORK_FORWARD_ROUTE || - def->forward.type == VIR_NETWORK_FORWARD_OPEN) { - + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: /* if no bridge name was given in the config, find a name * unused by any other libvirt networks and assign it. */ @@ -3285,7 +3291,9 @@ networkValidate(virNetworkDriverStatePtr driver, return -1; virNetworkSetBridgeMacAddr(def); - } else { + break; + + default: /* They are also the only types that currently support setting * a MAC or IP address for the host-side device (bridge), DNS * configuration, or network-wide bandwidth limits. @@ -3331,6 +3339,7 @@ networkValidate(virNetworkDriverStatePtr driver, return -1; } bandwidthAllowed = false; + break; } /* we support configs with a single PF defined: @@ -3755,9 +3764,10 @@ networkUpdate(virNetworkPtr net, /* Take care of anything that must be done before updating the * live NetworkDef. */ - if (def->forward.type == VIR_NETWORK_FORWARD_NONE || - def->forward.type == VIR_NETWORK_FORWARD_NAT || - def->forward.type == VIR_NETWORK_FORWARD_ROUTE) { + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: switch (section) { case VIR_NETWORK_SECTION_FORWARD: case VIR_NETWORK_SECTION_FORWARD_INTERFACE: @@ -3768,14 +3778,13 @@ networkUpdate(virNetworkPtr net, * old rules (and remember to load new ones after the * update). */ - if (def->forward.type != VIR_NETWORK_FORWARD_OPEN) { - networkRemoveFirewallRules(def); - needFirewallRefresh = true; - } + networkRemoveFirewallRules(def); + needFirewallRefresh = true; break; default: break; } + break; } } @@ -4440,10 +4449,11 @@ networkAllocateActualDevice(virDomainDefPtr dom, iface->data.network.actual->trustGuestRxFilters = netdef->trustGuestRxFilters; - if ((netdef->forward.type == VIR_NETWORK_FORWARD_NONE) || - (netdef->forward.type == VIR_NETWORK_FORWARD_NAT) || - (netdef->forward.type == VIR_NETWORK_FORWARD_ROUTE) || - (netdef->forward.type == VIR_NETWORK_FORWARD_OPEN)) { + switch (netdef->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: /* for these forward types, the actual net type really *is* * NETWORK; we just keep the info from the portgroup in * iface->data.network.actual @@ -4463,46 +4473,9 @@ networkAllocateActualDevice(virDomainDefPtr dom, if (networkPlugBandwidth(obj, iface) < 0) goto error; + break; - } else if ((netdef->forward.type == VIR_NETWORK_FORWARD_BRIDGE) && - netdef->bridge) { - - /* <forward type='bridge'/> <bridge name='xxx'/> - * is VIR_DOMAIN_NET_TYPE_BRIDGE - */ - - iface->data.network.actual->type = actualType = VIR_DOMAIN_NET_TYPE_BRIDGE; - if (VIR_STRDUP(iface->data.network.actual->data.bridge.brname, - netdef->bridge) < 0) - goto error; - iface->data.network.actual->data.bridge.macTableManager - = netdef->macTableManager; - - /* merge virtualports from interface, network, and portgroup to - * arrive at actual virtualport to use - */ - if (virNetDevVPortProfileMerge3(&iface->data.network.actual->virtPortProfile, - iface->virtPortProfile, - netdef->virtPortProfile, - portgroup - ? portgroup->virtPortProfile : NULL) < 0) { - goto error; - } - virtport = iface->data.network.actual->virtPortProfile; - if (virtport) { - /* only type='openvswitch' is allowed for bridges */ - if (virtport->virtPortType != VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("<virtualport type='%s'> not supported for network " - "'%s' which uses a bridge device"), - virNetDevVPortTypeToString(virtport->virtPortType), - netdef->name); - goto error; - } - } - - } else if (netdef->forward.type == VIR_NETWORK_FORWARD_HOSTDEV) { - + case VIR_NETWORK_FORWARD_HOSTDEV: { virDomainHostdevSubsysPCIBackendType backend; iface->data.network.actual->type = actualType = VIR_DOMAIN_NET_TYPE_HOSTDEV; @@ -4575,12 +4548,55 @@ networkAllocateActualDevice(virDomainDefPtr dom, goto error; } } + break; + } + + case VIR_NETWORK_FORWARD_BRIDGE: + if (netdef->bridge) { + /* <forward type='bridge'/> <bridge name='xxx'/> + * is VIR_DOMAIN_NET_TYPE_BRIDGE + */ + + iface->data.network.actual->type = actualType = VIR_DOMAIN_NET_TYPE_BRIDGE; + if (VIR_STRDUP(iface->data.network.actual->data.bridge.brname, + netdef->bridge) < 0) + goto error; + iface->data.network.actual->data.bridge.macTableManager + = netdef->macTableManager; + + /* merge virtualports from interface, network, and portgroup to + * arrive at actual virtualport to use + */ + if (virNetDevVPortProfileMerge3(&iface->data.network.actual->virtPortProfile, + iface->virtPortProfile, + netdef->virtPortProfile, + portgroup + ? portgroup->virtPortProfile : NULL) < 0) { + goto error; + } + virtport = iface->data.network.actual->virtPortProfile; + if (virtport) { + /* only type='openvswitch' is allowed for bridges */ + if (virtport->virtPortType != VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("<virtualport type='%s'> not supported for network " + "'%s' which uses a bridge device"), + virNetDevVPortTypeToString(virtport->virtPortType), + netdef->name); + goto error; + } + } + break; + } - } else if ((netdef->forward.type == VIR_NETWORK_FORWARD_BRIDGE) || - (netdef->forward.type == VIR_NETWORK_FORWARD_PRIVATE) || - (netdef->forward.type == VIR_NETWORK_FORWARD_VEPA) || - (netdef->forward.type == VIR_NETWORK_FORWARD_PASSTHROUGH)) { + /* intentionally fall through to the direct case for + * VIR_NETWORK_FORWARD_BRIDGE with no bridge device defined + */ + ATTRIBUTE_FALLTHROUGH; + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: /* <forward type='bridge|private|vepa|passthrough'> are all * VIR_DOMAIN_NET_TYPE_DIRECT. */ @@ -4680,6 +4696,7 @@ networkAllocateActualDevice(virDomainDefPtr dom, dev->device.dev) < 0) goto error; } + break; } if (virNetworkObjMacMgrAdd(obj, driver->dnsmasqStateDir, @@ -5037,13 +5054,15 @@ networkReleaseActualDevice(virDomainDefPtr dom, } netdef = virNetworkObjGetDef(obj); - if (iface->data.network.actual && - (netdef->forward.type == VIR_NETWORK_FORWARD_NONE || - netdef->forward.type == VIR_NETWORK_FORWARD_NAT || - netdef->forward.type == VIR_NETWORK_FORWARD_ROUTE || - netdef->forward.type == VIR_NETWORK_FORWARD_OPEN) && - networkUnplugBandwidth(obj, iface) < 0) - goto error; + switch (netdef->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: + if (iface->data.network.actual && networkUnplugBandwidth(obj, iface) < 0) + goto error; + break; + } if ((!iface->data.network.actual) || ((actualType != VIR_DOMAIN_NET_TYPE_DIRECT) && -- 2.7.4

2 2

[libvirt] [PATCH] tools: Fix typo generating adapter_wwpn field
by John Ferlan 20 Jul '18

20 Jul '18

https://bugzilla.redhat.com/show_bug.cgi?id=1601377 Fix typo from commit id d45bee449 for the parent_wwpn field resulting in parent_wwnn being printed twice. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- tools/virsh-pool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c index cc49a5b96d..6faff781b2 100644 --- a/tools/virsh-pool.c +++ b/tools/virsh-pool.c @@ -371,7 +371,7 @@ virshBuildPoolXML(vshControl *ctl, if (adapterParent) virBufferAsprintf(&buf, " parent='%s'", adapterParent); else if (adapterParentWwnn && adapterParentWwpn) - virBufferAsprintf(&buf, " parent_wwnn='%s' parent_wwnn='%s'", + virBufferAsprintf(&buf, " parent_wwnn='%s' parent_wwpn='%s'", adapterParentWwnn, adapterParentWwpn); else if (adapterParentFabricWwn) virBufferAsprintf(&buf, " parent_fabric_wwn='%s'", -- 2.17.1

2 1

[libvirt] [PATCH v2] util: set OOM in virCopyLastError if error is not set
by Nikolay Shirokovskiy 20 Jul '18

20 Jul '18

virCopyLastError is intended to be used after last error is set. However due to virLastErrorObject failures (very unlikely through as thread local error is allocated on first use) we can have zero fields in a copy as a result. In particular code field can be set to VIR_ERR_OK. In some places (qemu monitor, qemu agent and qemu migaration code for example) we use copy result as a flag and this leads to bugs. Let's set OOM-like error in copy in case of virLastErrorObject failures. Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com> --- Changes from v1: - check @to - set OMM error instead of using virErrorGenericFailure src/util/virerror.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/util/virerror.c b/src/util/virerror.c index f198f27..737ea92 100644 --- a/src/util/virerror.c +++ b/src/util/virerror.c @@ -366,19 +366,25 @@ virSetError(virErrorPtr newerr) * * One will need to free the result with virResetError() * - * Returns 0 if no error was found and the error code otherwise and -1 in case - * of parameter error. + * Returns error code or -1 in case of parameter error. */ int virCopyLastError(virErrorPtr to) { virErrorPtr err = virLastErrorObject(); + + if (!to) + return -1; + /* We can't guarantee caller has initialized it to zero */ memset(to, 0, sizeof(*to)); - if (err) + if (err) { virCopyError(err, to); - else - virResetError(to); + } else { + to->code = VIR_ERR_NO_MEMORY; + to->domain = VIR_FROM_NONE; + to->level = VIR_ERR_ERROR; + } return to->code; } -- 1.8.3.1

2 6

[libvirt] [PATCH] build: Fix accidental revert of .gnulib update
by John Ferlan 19 Jul '18

19 Jul '18

Commit id 1bff5bbe25eb7a7e7a4e0067c4ca7cbc1cb34999 accidentally reverted .gnulib back to d6397dde2e127e246e3eeb5254a21f42cac783c8 which was two updates ago. Update to the latest 68df637b5f1b5c10370f6981d2a43a5cf74368df which includes three changes since the previous fetch of cdbf3d385a32ff904c96f20c26f3470bd8345248. > autoupdate > hard-locale: simplify by removing hard-locale.m4 > gnulib-tool: limit line length for git send-email Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Pushing under this I know fixes some previous build breaking issue and of course it's a .gnulib maint, so that's reason #2. .gnulib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gnulib b/.gnulib index d6397dde2e..68df637b5f 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit d6397dde2e127e246e3eeb5254a21f42cac783c8 +Subproject commit 68df637b5f1b5c10370f6981d2a43a5cf74368df -- 2.17.1

1 0

[libvirt] [PATCH] virt-xml-validate: Add schema for nwfilterbinding
by Han Han 19 Jul '18

19 Jul '18

Add nwfilterbinding schema in virt-xml-validate for autoprobing. Add document of nwfilterbinding schema in tools/virt-xml-validate.pod. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1600330 Signed-off-by: Han Han <hhan(a)redhat.com> --- tools/virt-xml-validate.in | 3 +++ tools/virt-xml-validate.pod | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/tools/virt-xml-validate.in b/tools/virt-xml-validate.in index 81fde4d832..7513413189 100644 --- a/tools/virt-xml-validate.in +++ b/tools/virt-xml-validate.in @@ -77,6 +77,9 @@ if [ -z "$TYPE" ]; then *device*) TYPE="nodedev" ;; + *filterbinding*) + TYPE="nwfilterbinding" + ;; *filter*) TYPE="nwfilter" ;; diff --git a/tools/virt-xml-validate.pod b/tools/virt-xml-validate.pod index f8e67503fd..a51a57002a 100644 --- a/tools/virt-xml-validate.pod +++ b/tools/virt-xml-validate.pod @@ -52,6 +52,10 @@ The schema for the XML format used to declare driver capabilities The schema for the XML format used by network traffic filters +=item C<nwfilterbinding> + +The schema for XML format used by network filter bindings. + =item C<secret> The schema for the XML format used by secrets descriptions -- 2.17.1

2 1

[libvirt] [java PATCH 0/1] *** Add support for sendng Qemu Guest Agent Commands ***
by Wido den Hollander 19 Jul '18

19 Jul '18

*** BLURB HERE *** Wido den Hollander (1): Add support for Qemu Guest Agent commands src/main/java/org/libvirt/Domain.java | 34 ++++++ src/main/java/org/libvirt/Library.java | 3 + .../java/org/libvirt/jna/LibvirtQemu.java | 16 +++ .../java/org/libvirt/qemu/QemuCommand.java | 106 ++++++++++++++++++ .../org/libvirt/qemu/TestQemuCommand.java | 24 ++++ 5 files changed, 183 insertions(+) create mode 100644 src/main/java/org/libvirt/jna/LibvirtQemu.java create mode 100644 src/main/java/org/libvirt/qemu/QemuCommand.java create mode 100644 src/test/java/org/libvirt/qemu/TestQemuCommand.java -- 2.17.1

1 1

[libvirt] [dockerfiles PATCH] Refresh after switch from yajl to jansson
by Andrea Bolognani 19 Jul '18

19 Jul '18

The corresponding libvirt-jenkins-ci commit is d2bbe1eee61a. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed under the Dockerfile refresh rule. buildenv-centos-7.Dockerfile | 4 ++-- buildenv-debian-8.Dockerfile | 2 +- buildenv-debian-9.Dockerfile | 2 +- buildenv-debian-sid.Dockerfile | 2 +- buildenv-fedora-27.Dockerfile | 2 +- buildenv-fedora-28.Dockerfile | 2 +- buildenv-fedora-rawhide.Dockerfile | 2 +- buildenv-ubuntu-16.Dockerfile | 2 +- buildenv-ubuntu-18.Dockerfile | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/buildenv-centos-7.Dockerfile b/buildenv-centos-7.Dockerfile index 5d92bfa..2c4c26d 100644 --- a/buildenv-centos-7.Dockerfile +++ b/buildenv-centos-7.Dockerfile @@ -23,6 +23,7 @@ ENV PACKAGES audit-libs-devel \ gnutls-devel \ iproute \ iscsi-initiator-utils \ + jansson-devel \ libacl-devel \ libattr-devel \ libblkid-devel \ @@ -63,8 +64,7 @@ ENV PACKAGES audit-libs-devel \ scrub \ sudo \ systemtap-sdt-devel \ - vim \ - yajl-devel + vim RUN yum install -y ${PACKAGES} && \ yum autoremove -y && \ yum clean all -y diff --git a/buildenv-debian-8.Dockerfile b/buildenv-debian-8.Dockerfile index 0766cc9..8a8c3b0 100644 --- a/buildenv-debian-8.Dockerfile +++ b/buildenv-debian-8.Dockerfile @@ -29,6 +29,7 @@ ENV PACKAGES augeas-tools \ libdevmapper-dev \ libfuse-dev \ libgnutls28-dev \ + libjansson-dev \ libnetcf-dev \ libnl-3-dev \ libnl-route-3-dev \ @@ -50,7 +51,6 @@ ENV PACKAGES augeas-tools \ libxen-dev \ libxml2-dev \ libxml2-utils \ - libyajl-dev \ lvm2 \ make \ nfs-common \ diff --git a/buildenv-debian-9.Dockerfile b/buildenv-debian-9.Dockerfile index e106574..c3af421 100644 --- a/buildenv-debian-9.Dockerfile +++ b/buildenv-debian-9.Dockerfile @@ -29,6 +29,7 @@ ENV PACKAGES augeas-tools \ libdevmapper-dev \ libfuse-dev \ libgnutls28-dev \ + libjansson-dev \ libnetcf-dev \ libnl-3-dev \ libnl-route-3-dev \ @@ -50,7 +51,6 @@ ENV PACKAGES augeas-tools \ libxen-dev \ libxml2-dev \ libxml2-utils \ - libyajl-dev \ lvm2 \ make \ nfs-common \ diff --git a/buildenv-debian-sid.Dockerfile b/buildenv-debian-sid.Dockerfile index c3a18be..a922457 100644 --- a/buildenv-debian-sid.Dockerfile +++ b/buildenv-debian-sid.Dockerfile @@ -29,6 +29,7 @@ ENV PACKAGES augeas-tools \ libdevmapper-dev \ libfuse-dev \ libgnutls28-dev \ + libjansson-dev \ libnetcf-dev \ libnl-3-dev \ libnl-route-3-dev \ @@ -50,7 +51,6 @@ ENV PACKAGES augeas-tools \ libxen-dev \ libxml2-dev \ libxml2-utils \ - libyajl-dev \ lvm2 \ make \ nfs-common \ diff --git a/buildenv-fedora-27.Dockerfile b/buildenv-fedora-27.Dockerfile index 4e5173f..2f35a2e 100644 --- a/buildenv-fedora-27.Dockerfile +++ b/buildenv-fedora-27.Dockerfile @@ -27,6 +27,7 @@ ENV PACKAGES audit-libs-devel \ iproute \ iproute-tc \ iscsi-initiator-utils \ + jansson-devel \ libacl-devel \ libattr-devel \ libblkid-devel \ @@ -71,7 +72,6 @@ ENV PACKAGES audit-libs-devel \ vim \ wireshark-devel \ xen-devel \ - yajl-devel \ zfs-fuse RUN yum install -y ${PACKAGES} && \ yum autoremove -y && \ diff --git a/buildenv-fedora-28.Dockerfile b/buildenv-fedora-28.Dockerfile index d051d65..f4f7198 100644 --- a/buildenv-fedora-28.Dockerfile +++ b/buildenv-fedora-28.Dockerfile @@ -26,6 +26,7 @@ ENV PACKAGES audit-libs-devel \ iproute \ iproute-tc \ iscsi-initiator-utils \ + jansson-devel \ libacl-devel \ libattr-devel \ libblkid-devel \ @@ -71,7 +72,6 @@ ENV PACKAGES audit-libs-devel \ vim \ wireshark-devel \ xen-devel \ - yajl-devel \ zfs-fuse RUN yum install -y ${PACKAGES} && \ yum autoremove -y && \ diff --git a/buildenv-fedora-rawhide.Dockerfile b/buildenv-fedora-rawhide.Dockerfile index 56d59a1..189ea59 100644 --- a/buildenv-fedora-rawhide.Dockerfile +++ b/buildenv-fedora-rawhide.Dockerfile @@ -26,6 +26,7 @@ ENV PACKAGES audit-libs-devel \ iproute \ iproute-tc \ iscsi-initiator-utils \ + jansson-devel \ libacl-devel \ libattr-devel \ libblkid-devel \ @@ -95,7 +96,6 @@ ENV PACKAGES audit-libs-devel \ vim \ wireshark-devel \ xen-devel \ - yajl-devel \ zfs-fuse RUN yum install -y ${PACKAGES} && \ yum autoremove -y && \ diff --git a/buildenv-ubuntu-16.Dockerfile b/buildenv-ubuntu-16.Dockerfile index d2ece05..bc387a1 100644 --- a/buildenv-ubuntu-16.Dockerfile +++ b/buildenv-ubuntu-16.Dockerfile @@ -29,6 +29,7 @@ ENV PACKAGES augeas-tools \ libdevmapper-dev \ libfuse-dev \ libgnutls28-dev \ + libjansson-dev \ libnetcf-dev \ libnl-3-dev \ libnl-route-3-dev \ @@ -51,7 +52,6 @@ ENV PACKAGES augeas-tools \ libxen-dev \ libxml2-dev \ libxml2-utils \ - libyajl-dev \ lvm2 \ make \ nfs-common \ diff --git a/buildenv-ubuntu-18.Dockerfile b/buildenv-ubuntu-18.Dockerfile index fdf97eb..2a15f14 100644 --- a/buildenv-ubuntu-18.Dockerfile +++ b/buildenv-ubuntu-18.Dockerfile @@ -29,6 +29,7 @@ ENV PACKAGES augeas-tools \ libdevmapper-dev \ libfuse-dev \ libgnutls28-dev \ + libjansson-dev \ libnetcf-dev \ libnl-3-dev \ libnl-route-3-dev \ @@ -51,7 +52,6 @@ ENV PACKAGES augeas-tools \ libxen-dev \ libxml2-dev \ libxml2-utils \ - libyajl-dev \ lvm2 \ make \ nfs-common \ -- 2.17.1

1 0

[libvirt] [jenkins-ci PATCH 0/4] guests: Replace yajl with jansson
by Andrea Bolognani 19 Jul '18

19 Jul '18

Andrea Bolognani (4): guests: Install jansson for libvirt guests: Don't install yajl for libvirt guests: Remove yajl mapping guests: Remove yajl kludge guests/tasks/kludges.yml | 2 -- guests/vars/mappings.yml | 10 +++++----- guests/vars/projects/libvirt.yml | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) -- 2.17.1

2 5