February 2019 - Devel - libvirt List Archives

[libvirt] [PATCH 0/2] ui: support for authorization control on TLS connections
by Daniel P. Berrangé 07 Mar '19

07 Mar '19

This series provides the VNC parts of the authorization control series previously posted as: v1: https://lists.gnu.org/archive/html/qemu-devel/2018-06/msg04482.html v2: https://lists.gnu.org/archive/html/qemu-devel/2018-06/msg05727.html v3: https://lists.gnu.org/archive/html/qemu-devel/2018-10/msg01639.html v4: https://lists.gnu.org/archive/html/qemu-devel/2019-02/msg04319.html The core authz framework is now merged & these patches have all had positive review. Thus these VNC parts are ready to go into the VNC maintainer's tree, should the maintainer consider them acceptable. Note the 2nd patch is modifying the HMP, but I considered it part of ui/vnc, since that's the only bit of QEMU which ever used these HMP commands, and it has a dependancy on the first patch merging first. Daniel P. Berrangé (2): vnc: allow specifying a custom authorization object name monitor: deprecate acl_show, acl_reset, acl_policy, acl_add, acl_remove monitor.c | 23 ++++++++++++++++++ qemu-deprecated.texi | 11 +++++++++ qemu-options.hx | 35 ++++++++++++++++++-------- ui/vnc.c | 58 +++++++++++++++++++++++++++++++++++++------- 4 files changed, 108 insertions(+), 19 deletions(-) -- 2.20.1

2 5

[libvirt] [PATCH 0/8] qemu: separate out deprecated capabilities
by Ján Tomko 07 Mar '19

07 Mar '19

Ján Tomko (8): DO NOT PUSH: allow skipping selected lines in group-qemu-caps.pl Introduce virQEMUCapsDeprecated array Split out virQEMUCapsSetFromNodes Use virQEMUCapsSetFromNodes where possible qemustatusxml2xmltests: remove deprecated qemu capabilities virQEMUCapsSetFromNodes: Skip setting deprecated flags Delete deprecated qemu capabilities from the enum DO NOT PUSH: fix capabilities grouping src/qemu/qemu_capabilities.c | 452 +++++++++--------- src/qemu/qemu_capabilities.h | 305 ++++-------- src/qemu/qemu_domain.c | 16 +- tests/group-qemu-caps.pl | 21 + tests/qemucaps2xmltest.c | 17 +- .../blockjob-mirror-in.xml | 1 - .../disk-secinfo-upgrade-out.xml | 51 -- .../migration-in-params-in.xml | 53 -- .../migration-out-nbd-out.xml | 51 -- .../migration-out-nbd-tls-in.xml | 51 -- .../migration-out-params-in.xml | 53 -- tests/qemustatusxml2xmldata/modern-in.xml | 51 -- .../qemustatusxml2xmldata/vcpus-multi-in.xml | 1 - 13 files changed, 339 insertions(+), 784 deletions(-) -- 2.19.2

4 19

[libvirt] [PATCH 0/4] implement cgroups v2 cpuset controller support
by Pavel Hrdina 07 Mar '19

07 Mar '19

Pavel Hrdina (4): util: implement virCgroupV2(Set|Get)CpusetMems util: implement virCgroupV2(Set|Get)CpusetMemoryMigrate util: implement virCgroupV2(Set|Get)CpusetCpus util: enable cgroups v2 cpuset controller for threads src/util/vircgroupv2.c | 74 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) -- 2.20.1

2 5

[libvirt] [PATCH] Drop some useless comparisons and checks
by Michal Privoznik 07 Mar '19

07 Mar '19

In these cases the check that is removed has been done a few lines above already (as can even be seen in the context). Drop them. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- examples/dommigrate/dommigrate.c | 3 +-- src/conf/nwfilter_conf.c | 4 +--- src/qemu/qemu_command.c | 3 +-- src/qemu/qemu_hotplug.c | 20 +++++++++----------- src/util/virresctrl.c | 2 +- tools/virsh-snapshot.c | 5 ++--- 6 files changed, 15 insertions(+), 22 deletions(-) diff --git a/examples/dommigrate/dommigrate.c b/examples/dommigrate/dommigrate.c index 1b6072d138..60cfb3fb83 100644 --- a/examples/dommigrate/dommigrate.c +++ b/examples/dommigrate/dommigrate.c @@ -37,51 +37,50 @@ int main(int argc, char *argv[]) { char *src_uri, *dst_uri, *domname; int ret = 0; virConnectPtr conn = NULL; virDomainPtr dom = NULL; if (argc < 4) { ret = usage(argv[0], 1); goto out; } src_uri = argv[1]; dst_uri = argv[2]; domname = argv[3]; printf("Attempting to connect to the source hypervisor...\n"); conn = virConnectOpenAuth(src_uri, virConnectAuthPtrDefault, 0); if (!conn) { ret = 1; fprintf(stderr, "No connection to the source hypervisor: %s.\n", virGetLastErrorMessage()); goto out; } printf("Attempting to retrieve domain %s...\n", domname); dom = virDomainLookupByName(conn, domname); if (!dom) { fprintf(stderr, "Failed to find domain %s.\n", domname); goto cleanup; } printf("Attempting to migrate %s to %s...\n", domname, dst_uri); if ((ret = virDomainMigrateToURI(dom, dst_uri, VIR_MIGRATE_PEER2PEER, NULL, 0)) != 0) { fprintf(stderr, "Failed to migrate domain %s.\n", domname); goto cleanup; } printf("Migration finished with success.\n"); cleanup: if (dom != NULL) virDomainFree(dom); - if (conn != NULL) - virConnectClose(conn); + virConnectClose(conn); out: return ret; } diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index 7cad3ccc57..3f28c7b451 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -2610,128 +2610,126 @@ static virNWFilterDefPtr virNWFilterDefParseXML(xmlXPathContextPtr ctxt) { virNWFilterDefPtr ret; xmlNodePtr curr = ctxt->node; char *uuid = NULL; char *chain = NULL; char *chain_pri_s = NULL; virNWFilterEntryPtr entry; int chain_priority; const char *name_prefix; if (VIR_ALLOC(ret) < 0) return NULL; ret->name = virXPathString("string(./@name)", ctxt); if (!ret->name) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("filter has no name")); goto cleanup; } chain_pri_s = virXPathString("string(./@priority)", ctxt); if (chain_pri_s) { if (virStrToLong_i(chain_pri_s, NULL, 10, &chain_priority) < 0) { virReportError(VIR_ERR_INVALID_ARG, _("Could not parse chain priority '%s'"), chain_pri_s); goto cleanup; } if (chain_priority < NWFILTER_MIN_FILTER_PRIORITY || chain_priority > NWFILTER_MAX_FILTER_PRIORITY) { virReportError(VIR_ERR_INVALID_ARG, _("Priority '%d' is outside valid " "range of [%d,%d]"), chain_priority, NWFILTER_MIN_FILTER_PRIORITY, NWFILTER_MAX_FILTER_PRIORITY); goto cleanup; } } chain = virXPathString("string(./@chain)", ctxt); if (chain) { name_prefix = virNWFilterIsAllowedChain(chain); if (name_prefix == NULL) goto cleanup; ret->chainsuffix = chain; if (chain_pri_s) { ret->chainPriority = chain_priority; } else { /* assign default priority if none can be found via lookup */ - if (!name_prefix || - intMapGetByString(chain_priorities, name_prefix, 0, - &ret->chainPriority) < 0) { + if (intMapGetByString(chain_priorities, name_prefix, 0, &ret->chainPriority) < 0) { /* assign default chain priority */ ret->chainPriority = (NWFILTER_MAX_FILTER_PRIORITY + NWFILTER_MIN_FILTER_PRIORITY) / 2; } } chain = NULL; } else { if (VIR_STRDUP(ret->chainsuffix, virNWFilterChainSuffixTypeToString(VIR_NWFILTER_CHAINSUFFIX_ROOT)) < 0) goto cleanup; } uuid = virXPathString("string(./uuid)", ctxt); ret->uuid_specified = (uuid != NULL); if (uuid == NULL) { if (virUUIDGenerate(ret->uuid) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("unable to generate uuid")); goto cleanup; } } else { if (virUUIDParse(uuid, ret->uuid) < 0) { virReportError(VIR_ERR_XML_ERROR, "%s", _("malformed uuid element")); goto cleanup; } VIR_FREE(uuid); } curr = curr->children; while (curr != NULL) { if (curr->type == XML_ELEMENT_NODE) { if (VIR_ALLOC(entry) < 0) goto cleanup; if (virXMLNodeNameEqual(curr, "rule")) { if (!(entry->rule = virNWFilterRuleParse(curr))) { virNWFilterEntryFree(entry); goto cleanup; } } else if (virXMLNodeNameEqual(curr, "filterref")) { if (!(entry->include = virNWFilterIncludeParse(curr))) { virNWFilterEntryFree(entry); goto cleanup; } } if (entry->rule || entry->include) { if (VIR_APPEND_ELEMENT_COPY(ret->filterEntries, ret->nentries, entry) < 0) { virNWFilterEntryFree(entry); goto cleanup; } } else { virNWFilterEntryFree(entry); } } curr = curr->next; } VIR_FREE(chain); VIR_FREE(chain_pri_s); return ret; cleanup: virNWFilterDefFree(ret); VIR_FREE(chain); VIR_FREE(uuid); VIR_FREE(chain_pri_s); return NULL; } diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 74f34af292..ee70444bd4 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4201,31 +4201,30 @@ static int qemuBuildNVRAMCommandLine(virCommandPtr cmd, const virDomainDef *def, virQEMUCapsPtr qemuCaps) { if (!def->nvram) return 0; if (qemuDomainIsPSeries(def)) { if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_NVRAM)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("nvram device is not supported by " "this QEMU binary")); return -1; } char *optstr; virCommandAddArg(cmd, "-global"); optstr = qemuBuildNVRAMDevStr(def->nvram); if (!optstr) return -1; - if (optstr) - virCommandAddArg(cmd, optstr); + virCommandAddArg(cmd, optstr); VIR_FREE(optstr); } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("nvram device is only supported for PPC64")); return -1; } return 0; } diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 00dbff6b2a..19b7e6e8ea 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3502,52 +3502,50 @@ static int qemuDomainChangeNetBridge(virDomainObjPtr vm, virDomainNetDefPtr olddev, virDomainNetDefPtr newdev) { int ret = -1; const char *oldbridge = virDomainNetGetActualBridgeName(olddev); const char *newbridge = virDomainNetGetActualBridgeName(newdev); if (!oldbridge || !newbridge) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Missing bridge name")); goto cleanup; } VIR_DEBUG("Change bridge for interface %s: %s -> %s", olddev->ifname, oldbridge, newbridge); if (virNetDevExists(newbridge) != 1) { virReportError(VIR_ERR_OPERATION_FAILED, _("bridge %s doesn't exist"), newbridge); goto cleanup; } - if (oldbridge) { - ret = virNetDevBridgeRemovePort(oldbridge, olddev->ifname); - virDomainAuditNet(vm, olddev, NULL, "detach", ret == 0); - if (ret < 0) { - /* warn but continue - possibly the old network - * had been destroyed and reconstructed, leaving the - * tap device orphaned. - */ - VIR_WARN("Unable to detach device %s from bridge %s", - olddev->ifname, oldbridge); - } + ret = virNetDevBridgeRemovePort(oldbridge, olddev->ifname); + virDomainAuditNet(vm, olddev, NULL, "detach", ret == 0); + if (ret < 0) { + /* warn but continue - possibly the old network + * had been destroyed and reconstructed, leaving the + * tap device orphaned. + */ + VIR_WARN("Unable to detach device %s from bridge %s", + olddev->ifname, oldbridge); } ret = virNetDevBridgeAddPort(newbridge, olddev->ifname); virDomainAuditNet(vm, NULL, newdev, "attach", ret == 0); if (ret < 0) { ret = virNetDevBridgeAddPort(oldbridge, olddev->ifname); virDomainAuditNet(vm, NULL, olddev, "attach", ret == 0); if (ret < 0) { virReportError(VIR_ERR_OPERATION_FAILED, _("unable to recover former state by adding port " "to bridge %s"), oldbridge); } goto cleanup; } /* caller will replace entire olddev with newdev in domain nets list */ ret = 0; cleanup: return ret; } diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c index 97891b2f8f..0857d4e882 100644 --- a/src/util/virresctrl.c +++ b/src/util/virresctrl.c @@ -2111,57 +2111,57 @@ static int virResctrlAllocMemoryBandwidth(virResctrlInfoPtr resctrl, virResctrlAllocPtr alloc, virResctrlAllocPtr free) { size_t i; virResctrlAllocMemBWPtr mem_bw_alloc = alloc->mem_bw; virResctrlAllocMemBWPtr mem_bw_free = free->mem_bw; virResctrlInfoMemBWPtr mem_bw_info = resctrl->membw_info; if (!mem_bw_alloc) return 0; - if (mem_bw_alloc && !mem_bw_info) { + if (!mem_bw_info) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("RDT Memory Bandwidth allocation unsupported")); return -1; } for (i = 0; i < mem_bw_alloc->nbandwidths; i++) { if (!mem_bw_alloc->bandwidths[i]) continue; if (*(mem_bw_alloc->bandwidths[i]) % mem_bw_info->bandwidth_granularity) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Memory Bandwidth allocation of size " "%u is not divisible by granularity %u"), *(mem_bw_alloc->bandwidths[i]), mem_bw_info->bandwidth_granularity); return -1; } if (*(mem_bw_alloc->bandwidths[i]) < mem_bw_info->min_bandwidth) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Memory Bandwidth allocation of size " "%u is smaller than the minimum " "allowed allocation %u"), *(mem_bw_alloc->bandwidths[i]), mem_bw_info->min_bandwidth); return -1; } if (i > mem_bw_info->max_id) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("bandwidth controller id %zd does not " "exist, max controller id %u"), i, mem_bw_info->max_id); return -1; } if (*(mem_bw_alloc->bandwidths[i]) > *(mem_bw_free->bandwidths[i])) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Not enough room for allocation of %u%% " "bandwidth on node %zd, available bandwidth %u%%"), *(mem_bw_alloc->bandwidths[i]), i, *(mem_bw_free->bandwidths[i])); return -1; } } return 0; } diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index e38ebb1f28..025321c58e 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -1046,323 +1046,322 @@ static virshSnapshotListPtr virshSnapshotListCollect(vshControl *ctl, virDomainPtr dom, virDomainSnapshotPtr from, unsigned int orig_flags, bool tree) { size_t i; char **names = NULL; int count = -1; bool descendants = false; bool roots = false; virDomainSnapshotPtr *snaps; virshSnapshotListPtr snaplist = vshMalloc(ctl, sizeof(*snaplist)); virshSnapshotListPtr ret = NULL; const char *fromname = NULL; int start_index = -1; int deleted = 0; bool filter_fallback = false; unsigned int flags = orig_flags; virshControlPtr priv = ctl->privData; /* Try the interface available in 0.9.13 and newer. */ if (!priv->useSnapshotOld) { if (from) count = virDomainSnapshotListAllChildren(from, &snaps, flags); else count = virDomainListAllSnapshots(dom, &snaps, flags); /* If we failed because of flags added in 1.0.1, we can do * fallback filtering. */ if (count < 0 && last_error->code == VIR_ERR_INVALID_ARG && flags & (VIR_DOMAIN_SNAPSHOT_FILTERS_STATUS | VIR_DOMAIN_SNAPSHOT_FILTERS_LOCATION)) { flags &= ~(VIR_DOMAIN_SNAPSHOT_FILTERS_STATUS | VIR_DOMAIN_SNAPSHOT_FILTERS_LOCATION); vshResetLibvirtError(); filter_fallback = true; if (from) count = virDomainSnapshotListAllChildren(from, &snaps, flags); else count = virDomainListAllSnapshots(dom, &snaps, flags); } } if (count >= 0) { /* When mixing --from and --tree, we also want a copy of from * in the list, but with no parent for that one entry. */ snaplist->snaps = vshCalloc(ctl, count + (tree && from), sizeof(*snaplist->snaps)); snaplist->nsnaps = count; for (i = 0; i < count; i++) snaplist->snaps[i].snap = snaps[i]; VIR_FREE(snaps); if (tree) { for (i = 0; i < count; i++) { if (virshGetSnapshotParent(ctl, snaplist->snaps[i].snap, &snaplist->snaps[i].parent) < 0) goto cleanup; } if (from) { snaplist->snaps[snaplist->nsnaps++].snap = from; virDomainSnapshotRef(from); } } goto success; } /* Assume that if we got this far, then the --no-leaves and * --no-metadata flags were not supported. Disable groups that * have no impact. */ /* XXX should we emulate --no-leaves? */ if (flags & VIR_DOMAIN_SNAPSHOT_LIST_NO_LEAVES && flags & VIR_DOMAIN_SNAPSHOT_LIST_LEAVES) flags &= ~(VIR_DOMAIN_SNAPSHOT_LIST_NO_LEAVES | VIR_DOMAIN_SNAPSHOT_LIST_LEAVES); if (flags & VIR_DOMAIN_SNAPSHOT_LIST_NO_METADATA && flags & VIR_DOMAIN_SNAPSHOT_LIST_METADATA) flags &= ~(VIR_DOMAIN_SNAPSHOT_LIST_NO_METADATA | VIR_DOMAIN_SNAPSHOT_LIST_METADATA); if (flags & VIR_DOMAIN_SNAPSHOT_LIST_NO_METADATA) { /* We can emulate --no-metadata if --metadata was supported, * since it was an all-or-none attribute on old servers. */ count = virDomainSnapshotNum(dom, VIR_DOMAIN_SNAPSHOT_LIST_METADATA); if (count < 0) goto cleanup; if (count > 0) return snaplist; flags &= ~VIR_DOMAIN_SNAPSHOT_LIST_NO_METADATA; } if (flags & (VIR_DOMAIN_SNAPSHOT_FILTERS_STATUS | VIR_DOMAIN_SNAPSHOT_FILTERS_LOCATION)) { flags &= ~(VIR_DOMAIN_SNAPSHOT_FILTERS_STATUS | VIR_DOMAIN_SNAPSHOT_FILTERS_LOCATION); filter_fallback = true; } /* This uses the interfaces available in 0.8.0-0.9.6 * (virDomainSnapshotListNames, global list only) and in * 0.9.7-0.9.12 (addition of virDomainSnapshotListChildrenNames * for child listing, and new flags), as follows, with [*] by the * combinations that need parent info (either for filtering * purposes or for the resulting tree listing): * old new * list global as-is global as-is * list --roots *global + filter global + flags * list --from *global + filter child as-is * list --from --descendants *global + filter child + flags * list --tree *global as-is *global as-is * list --tree --from *global + filter *child + flags * * Additionally, when --tree and --from are both used, from is * added to the final list as the only element without a parent. * Otherwise, --from does not appear in the final list. */ if (from) { fromname = virDomainSnapshotGetName(from); if (!fromname) { vshError(ctl, "%s", _("Could not get snapshot name")); goto cleanup; } descendants = (flags & VIR_DOMAIN_SNAPSHOT_LIST_DESCENDANTS) || tree; if (tree) flags |= VIR_DOMAIN_SNAPSHOT_LIST_DESCENDANTS; /* Determine if we can use the new child listing API. */ if (priv->useSnapshotOld || ((count = virDomainSnapshotNumChildren(from, flags)) < 0 && last_error->code == VIR_ERR_NO_SUPPORT)) { /* We can emulate --from. */ /* XXX can we also emulate --leaves? */ vshResetLibvirtError(); priv->useSnapshotOld = true; flags &= ~VIR_DOMAIN_SNAPSHOT_LIST_DESCENDANTS; goto global; } if (tree && count >= 0) count++; } else { global: /* Global listing (including fallback when --from failed with * child listing). */ count = virDomainSnapshotNum(dom, flags); /* Fall back to simulation if --roots was unsupported. */ /* XXX can we also emulate --leaves? */ if (!from && count < 0 && last_error->code == VIR_ERR_INVALID_ARG && (flags & VIR_DOMAIN_SNAPSHOT_LIST_ROOTS)) { vshResetLibvirtError(); roots = true; flags &= ~VIR_DOMAIN_SNAPSHOT_LIST_ROOTS; count = virDomainSnapshotNum(dom, flags); } } if (count < 0) { if (!last_error) vshError(ctl, _("failed to collect snapshot list")); goto cleanup; } if (!count) goto success; names = vshCalloc(ctl, sizeof(*names), count); /* Now that we have a count, collect the list. */ if (from && !priv->useSnapshotOld) { if (tree) { - if (count) - count = virDomainSnapshotListChildrenNames(from, names + 1, - count - 1, flags); + count = virDomainSnapshotListChildrenNames(from, names + 1, + count - 1, flags); if (count >= 0) { count++; names[0] = vshStrdup(ctl, fromname); } } else { count = virDomainSnapshotListChildrenNames(from, names, count, flags); } } else { count = virDomainSnapshotListNames(dom, names, count, flags); } if (count < 0) goto cleanup; snaplist->snaps = vshCalloc(ctl, sizeof(*snaplist->snaps), count); snaplist->nsnaps = count; for (i = 0; i < count; i++) { snaplist->snaps[i].snap = virDomainSnapshotLookupByName(dom, names[i], 0); if (!snaplist->snaps[i].snap) goto cleanup; } /* Collect parents when needed. With the new API, --tree and * --from together put from as the first element without a parent; * with the old API we still need to do a post-process filtering * based on all parent information. */ if (tree || (from && priv->useSnapshotOld) || roots) { for (i = (from && !priv->useSnapshotOld); i < count; i++) { if (from && priv->useSnapshotOld && STREQ(names[i], fromname)) { start_index = i; if (tree) continue; } if (virshGetSnapshotParent(ctl, snaplist->snaps[i].snap, &snaplist->snaps[i].parent) < 0) goto cleanup; if ((from && ((tree && !snaplist->snaps[i].parent) || (!descendants && STRNEQ_NULLABLE(fromname, snaplist->snaps[i].parent)))) || (roots && snaplist->snaps[i].parent)) { virshDomainSnapshotFree(snaplist->snaps[i].snap); snaplist->snaps[i].snap = NULL; VIR_FREE(snaplist->snaps[i].parent); deleted++; } } } if (tree) goto success; if (priv->useSnapshotOld && descendants) { bool changed = false; bool remaining = false; /* Make multiple passes over the list - first pass finds * direct children and NULLs out all roots and from, remaining * passes NULL out any undecided entry whose parent is not * still in list. We mark known descendants by clearing * snaps[i].parents. Sorry, this is O(n^3) - hope your * hierarchy isn't huge. XXX Is it worth making O(n^2 log n) * by using qsort and bsearch? */ if (start_index < 0) { vshError(ctl, _("snapshot %s disappeared from list"), fromname); goto cleanup; } for (i = 0; i < count; i++) { if (i == start_index || !snaplist->snaps[i].parent) { VIR_FREE(names[i]); virshDomainSnapshotFree(snaplist->snaps[i].snap); snaplist->snaps[i].snap = NULL; VIR_FREE(snaplist->snaps[i].parent); deleted++; } else if (STREQ(snaplist->snaps[i].parent, fromname)) { VIR_FREE(snaplist->snaps[i].parent); changed = true; } else { remaining = true; } } if (!changed) { ret = vshMalloc(ctl, sizeof(*snaplist)); goto cleanup; } while (changed && remaining) { changed = remaining = false; for (i = 0; i < count; i++) { bool found_parent = false; size_t j; if (!names[i] || !snaplist->snaps[i].parent) continue; for (j = 0; j < count; j++) { if (!names[j] || i == j) continue; if (STREQ(snaplist->snaps[i].parent, names[j])) { found_parent = true; if (!snaplist->snaps[j].parent) VIR_FREE(snaplist->snaps[i].parent); else remaining = true; break; } } if (!found_parent) { changed = true; VIR_FREE(names[i]); virshDomainSnapshotFree(snaplist->snaps[i].snap); snaplist->snaps[i].snap = NULL; VIR_FREE(snaplist->snaps[i].parent); deleted++; } } } } success: if (filter_fallback) { /* Older API didn't filter on status or location, but the * information is available in domain XML. */ if (!(orig_flags & VIR_DOMAIN_SNAPSHOT_FILTERS_STATUS)) orig_flags |= VIR_DOMAIN_SNAPSHOT_FILTERS_STATUS; if (!(orig_flags & VIR_DOMAIN_SNAPSHOT_FILTERS_LOCATION)) orig_flags |= VIR_DOMAIN_SNAPSHOT_FILTERS_LOCATION; for (i = 0; i < snaplist->nsnaps; i++) { switch (virshSnapshotFilter(ctl, snaplist->snaps[i].snap, orig_flags)) { case 1: break; case 0: virshDomainSnapshotFree(snaplist->snaps[i].snap); snaplist->snaps[i].snap = NULL; VIR_FREE(snaplist->snaps[i].parent); deleted++; break; default: goto cleanup; } } } qsort(snaplist->snaps, snaplist->nsnaps, sizeof(*snaplist->snaps), virshSnapSorter); snaplist->nsnaps -= deleted; VIR_STEAL_PTR(ret, snaplist); cleanup: virshSnapshotListFree(snaplist); if (names && count > 0) for (i = 0; i < count; i++) VIR_FREE(names[i]); VIR_FREE(names); return ret; } -- 2.19.2

2 1

[libvirt] [PATCH 00/10] domcaps: use virTristateBool
by Cole Robinson 06 Mar '19

06 Mar '19

Extending domaincapabilities with new XML schema is currently a bit of a maintenance pain. Consider the case of adding a new enum for listing <sound> models. I want to output this info for the qemu driver. Internally in the domaincapabilities plumbing, whether a <device> is supported= is tracked with boolean true/false. If I extend that pattern for <sound> devices and fill in data for the qemu driver, the other domcaps implementations will now automatically output a new XML element: <sound supported='no'> Now, for bhyve I can 'git grep' confirm that it doesn't have any <sound> support, but for xen/libxl it _is_ supported. So if I don't fill in accurate support in the xen driver, I've just made their domcaps report blatantly incorrect info. Ideally I would make these <sound> changes and the other drivers output would _not_ change. xen output would now be incomplete, but not obviously wrong, which is easier on me the developer, and safer for the API consumer. This moves domcaps plumbing in that direction. It switches most internal 'supported' fields to virTristateBool so we can track an ABSENT state and map that to outputting no XML. Explicit supported='no' values are filled in where needed to ensure existing driver XML doesn't change. cpu and sev supported= values are left unconverted, but they require semi-special handling anyways so aren't really affected by the problem I laid out above. Cole Robinson (10): tests: domcaps: Add a default 'empty' test tests: domcaps: Remove unused typedef tests: domcaps: Remove 'full' test conf: domcaps: Add single line formatting macro conf: domcaps: use virTristateBool for 'supported' qemu: domcaps: fill in explicit supported BOOL_NO libxl: domcaps: fill in explicit supported BOOL_NO bhyve: domcaps: fill in explicit supported BOOL_NO schemas: domcaps: Make more elements optional conf: domcaps: Don't output XML on tristate ABSENT docs/schemas/domaincaps.rng | 20 +++++-- src/bhyve/bhyve_capabilities.c | 20 +++++-- src/conf/domain_capabilities.c | 26 ++++++---- src/conf/domain_capabilities.h | 20 +++---- src/libxl/libxl_capabilities.c | 18 ++++--- src/qemu/qemu_capabilities.c | 26 ++++++---- tests/domaincapsschemadata/empty.xml | 16 ++++++ tests/domaincapstest.c | 78 ++-------------------------- 8 files changed, 103 insertions(+), 121 deletions(-) create mode 100644 tests/domaincapsschemadata/empty.xml -- 2.20.1

2 12

[libvirt] [PATCH v2 00/17] Add support to list Storage Driver backend capabilities
by John Ferlan 06 Mar '19

06 Mar '19

v1: https://www.redhat.com/archives/libvir-list/2019-January/msg00479.html Changes since v1: * The first 4 patches were already R-by'd and pushed. * From v1, rework patch 5 & 6 into what now is patches 8 & 9. The format of the output for what results in the output for the connectGetCapabilities (virConnectGetCapabilities). * From v1, drop patch 7 * In v2, patches 1-7 are new as a result of work done for patches 10-17. patches 1-5 were posted upstream, but left unreviewed: https://www.redhat.com/archives/libvir-list/2019-February/msg00333.html These essentially ensure the volOptions and poolOptions don't list or use something unexpected per documentation. The doc patch is a simple update to add some missing text and fix an entry * Patches 10-17 are new to implement the ability to get/format the Storage Driver backend capabilities via: storageConnectGetStoragePoolCapabilities virConnectGetStoragePoolCapabilities similar to how virConnectGetDomainCapabilities returns domain specific output. The output is essentially what is provided in the poolOptions and volOptions from storage_conf as valid values for format type fields for pool and/or volume as well as an enumerated list for the required source elements for creation. Whether the latter is useful or not was not clear, but since it is something that can cause a creation error when missing, I figured it'd be useful. The new virsh command follows then domcapabilities nomenclature. John Ferlan (17): conf: Remove volOptions for VIR_STORAGE_POOL_SHEEPDOG conf: Remove volOptions for VIR_STORAGE_POOL_RBD conf: Remove volOptions for VIR_STORAGE_POOL_SCSI conf: Remove volOptions for VIR_STORAGE_POOL_ISCSI[_DIRECT] conf: Remove volOptions for VIR_STORAGE_POOL_MPATH conf: Remove defaultFormat from VIR_STORAGE_POOL_ZFS docs: Fix a few storage.html.in typos conf: Introduce storage pool functions into capabilities storage: Process storage pool capabilities docs: Add schema for storage pool capabilities conf: Add storage pool capability formatting tests: Introduce storage pool capabilites test docs: Add description for Storage Pool Capabilities libvirt: Introduce virConnectGetStoragePoolCapabilities storage: Introduce storageConnectGetStoragePoolCapabilities virsh: Expose virConnectGetStoragePoolCapabilities docs: Add news article docs/docs.html.in | 1 + docs/format.html.in | 1 + docs/formatstoragecaps.html.in | 108 +++++++ docs/index.html.in | 1 + docs/news.xml | 12 + docs/schemas/storagepoolcaps.rng | 88 ++++++ docs/storage.html.in | 8 +- include/libvirt/libvirt-storage.h | 4 + libvirt.spec.in | 1 + mingw-libvirt.spec.in | 2 + src/conf/Makefile.inc.am | 2 + src/conf/capabilities.c | 74 +++++ src/conf/capabilities.h | 15 + src/conf/storage_capabilities.c | 135 +++++++++ src/conf/storage_capabilities.h | 41 +++ src/conf/storage_conf.c | 131 +++++++-- src/conf/storage_conf.h | 7 + src/conf/virstorageobj.h | 5 + src/driver-storage.h | 5 + src/libvirt-storage.c | 40 +++ src/libvirt_private.syms | 8 + src/libvirt_public.syms | 5 + src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 15 +- src/remote_protocol-structs | 7 + src/storage/storage_backend.c | 16 ++ src/storage/storage_backend.h | 3 + src/storage/storage_driver.c | 44 +++ tests/Makefile.am | 7 + .../storagepoolcapsschemadata/poolcaps-fs.xml | 268 ++++++++++++++++++ .../poolcaps-full.xml | 268 ++++++++++++++++++ tests/storagepoolcapstest.c | 124 ++++++++ tests/storagevolxml2xmlout/vol-sheepdog.xml | 1 - tests/virschematest.c | 1 + tools/virsh-pool.c | 42 +++ tools/virsh.pod | 7 + 36 files changed, 1473 insertions(+), 25 deletions(-) create mode 100644 docs/formatstoragecaps.html.in create mode 100644 docs/schemas/storagepoolcaps.rng create mode 100644 src/conf/storage_capabilities.c create mode 100644 src/conf/storage_capabilities.h create mode 100644 tests/storagepoolcapsschemadata/poolcaps-fs.xml create mode 100644 tests/storagepoolcapsschemadata/poolcaps-full.xml create mode 100644 tests/storagepoolcapstest.c -- 2.20.1

3 24

[libvirt] [PATCH for-4.0 v4 0/2] virtio: Provide version-specific variants of virtio PCI devices
by Eduardo Habkost 06 Mar '19

06 Mar '19

Existing modern-only device types are not being touched by v3, as they don't need separate variants. However, I plan to implement separate cleanups in the code that calls virtio_pci_force_virtio_1(), first, and then propose additional changes (e.g. deprecating disable-legacy and disable-modern in those device types). Changes v3 -> v4: * Trivial comment fixes (Cornelia Huck) * Test code update (Caio Carrara) Changes v2 -> v3: * Split into two separate patches (type registration helper and introduction of new types) * Rewrote virtio_pci_types_register() completely: * Replaced magic generation of type names with explicit fields in VirtioPCIDeviceTypeInfo * Removed modern_only field (not necessary anymore) * Don't register a separate base type unless necessary Changes v1 -> v2: * Removed *-0.9 devices. Nobody will want to use them, if transitional devices work with legacy drivers (Gerd Hoffmann, Michael S. Tsirkin) * Drop virtio version from name: rename -1.0-transitional to -transitional (Michael S. Tsirkin) * Renamed -1.0 to -non-transitional * Don't add any extra variants to modern-only device types (they don't need it) * Fix typo on TYPE_VIRTIO_INPUT_HOST_PCI (crash reported by Cornelia Huck) * No need to change cast macros for modern-only devices * Rename virtio_register_types() to virtio_pci_types_register() Original patch description: Many of the current virtio-*-pci device types actually represent 3 different types of devices: * virtio 1.0 non-transitional devices * virtio 1.0 transitional devices * virtio 0.9 ("legacy device" in virtio 1.0 terminology) That would be just an annoyance if it didn't break our device/bus compatibility QMP interfaces. With this multi-purpose device type, there's no way to tell management software that transitional devices and legacy devices require a Conventional PCI bus. The multi-purpose device types would also prevent us from telling management software what's the PCI vendor/device ID for them, because their PCI IDs change at runtime depending on the bus where they were plugged. This patch adds separate device types for each of those virtio device flavors: * virtio-*-pci: the existing multi-purpose device types * virtio-*-pci-transitional: virtio-1.0 device supporting legacy drivers * virtio-*-pci-non-transitional: modern-only Reference to previous discussion that originated this idea: https://www.mail-archive.com/qemu-devel@nongnu.org/msg558389.html Eduardo Habkost (2): virtio: Helper for registering virtio device types virtio: Provide version-specific variants of virtio PCI devices hw/virtio/virtio-pci.h | 78 +++++++-- hw/display/virtio-gpu-pci.c | 7 +- hw/display/virtio-vga.c | 7 +- hw/virtio/virtio-crypto-pci.c | 7 +- hw/virtio/virtio-pci.c | 267 ++++++++++++++++++++++------- tests/acceptance/virtio_version.py | 176 +++++++++++++++++++ 6 files changed, 452 insertions(+), 90 deletions(-) create mode 100644 tests/acceptance/virtio_version.py -- 2.18.0.rc1.1.g3f1ff2140

9 13

[libvirt] domXML modeling question
by Jim Fehlig 06 Mar '19

06 Mar '19

There have been a few requests [1][2] to support Xen's max_grant_frames setting in libvirt domXML, but I'm not quite sure how to model it. The documentation [3] on this setting states: Specify the maximum number of grant frames the domain is allowed to have. This value controls how many pages the domain is able to grant access to for other domains, needed e.g. for the operation of paravirtualized devices. The default is settable via xl.conf(5). It smells of a <memtune> setting, e.g. the amount of memory a domain can share, but doesn't map to any of the existing settings. A new subelement <shared_limit> doesn't feel right. Does anyone suggest a better way of modeling max_grant_frames? Another option I considered is setting the value based on number of PV devices, but I think that flies in the face of libvirt's policy of not dictating policy. Regardless of domain config modeling I can work on a driver-wide setting in libxl.conf, similar to Xen's xl.conf(5) global. Regards, Jim [1] https://www.redhat.com/archives/libvir-list/2018-April/msg00216.html [2] https://www.redhat.com/archives/libvirt-users/2019-January/msg00011.html [3] http://xenbits.xen.org/gitweb/?p=xen.git;a=blob;f=docs/man/xl.cfg.5.pod.in;…

3 3

[libvirt] [PATCH v1 00/15] Firmware auto selection
by Michal Privoznik 05 Mar '19

05 Mar '19

Libvirt allows specifying firmware for domains for quite some time now. However, problem for mgmt applications is that they do not know which firmware to chose as all they see are their paths and from that it's impossible to tell whether one of them supports say secure boot. This problem was addressed by qemu where Lazslo and Daniel created a document, specification which describes metadata for each individual firmware image. In the description (which itself is a JSON file for easy machine parsing) then it's specified whether the firmware it's describing supports secureboot, s3/s4 states, it it's bios or efi, and so on. These patches take advantage of that, and even though the description files are not picked up by that many distributions yet, it allows users to not care about putting specific firmware path into their domain XML. It's as easy as: <os firmware='efi'> <loader secure='yes'/> </os> to have libvirt pick up OVMF image with secure enabled boot (and enabled System Management Mode at the same time). The metadata specification lives under qemu.git/docs/interop/firmware.json and I highly recommend you go and read it before reviewing (unless you're Laszlo or Daniel in which case you already know what the document says). As usual, you can find my patches at my github: https://github.com/zippy2/libvirt/commits/firmware_v1 Michal Prívozník (15): virmock: Initialize both symbols in VIR_MOCK_REAL_INIT_ALT qemu_domain: Separate NVRAM VAR store file name generation qemu_capabilities: Expose qemu <-> libvirt arch translators virDomainLoaderDefParseXML: Allow loader path to be NULL conf: Introduce VIR_DOMAIN_LOADER_TYPE_NONE conf: Introduce firmware attribute to <os/> qemu: Introduce basic skeleton for parsing firmware description test: Introduce qemufirmwaretest qemu_firmware: Introduce qemuFirmwareFetchConfigs qemufirmwaretest: Test qemuFirmwareFetchConfigs() qemu_firmware: Introduce qemuFirmwareFillDomain() qemu_process: Call qemuFirmwareFillDomain qemuDomainDefValidate: Don't require SMM if automatic firmware selection enabled qemu: Enable firmware autoselection qemuxml2argvtest: Test os.firmware autoselection docs/formatdomain.html.in | 22 +- docs/schemas/domaincommon.rng | 12 +- src/conf/domain_conf.c | 113 +- src/conf/domain_conf.h | 15 +- src/libvirt_private.syms | 2 + src/qemu/Makefile.inc.am | 2 + src/qemu/qemu_capabilities.c | 4 +- src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_command.c | 1 + src/qemu/qemu_domain.c | 34 +- src/qemu/qemu_domain.h | 4 + src/qemu/qemu_firmware.c | 1285 +++++++++++++++++ src/qemu/qemu_firmware.h | 50 + src/qemu/qemu_process.c | 5 + tests/Makefile.am | 14 +- tests/domaincapsschemadata/full.xml | 1 + .../etc/qemu/firmware/40-ovmf-sb.json | 1 + .../etc/qemu/firmware/60-ovmf.json | 0 .../user/.config/qemu/firmware/10-bios.json | 0 .../usr/share/qemu/firmware/40-bios.json | 35 + .../usr/share/qemu/firmware/50-ovmf-sb.json | 36 + .../usr/share/qemu/firmware/60-ovmf.json | 35 + .../usr/share/qemu/firmware/70-aavmf.json | 35 + tests/qemufirmwaretest.c | 129 ++ ...arch64-os-firmware-efi.aarch64-latest.args | 37 + .../aarch64-os-firmware-efi.xml | 30 + .../os-firmware-bios.x86_64-latest.args | 39 + tests/qemuxml2argvdata/os-firmware-bios.xml | 68 + ...os-firmware-efi-secboot.x86_64-latest.args | 42 + .../os-firmware-efi-secboot.xml | 68 + .../os-firmware-efi.x86_64-latest.args | 42 + tests/qemuxml2argvdata/os-firmware-efi.xml | 68 + tests/qemuxml2argvtest.c | 17 + .../aarch64-os-firmware-efi.xml | 1 + tests/qemuxml2xmloutdata/os-firmware-bios.xml | 1 + .../os-firmware-efi-secboot.xml | 1 + tests/qemuxml2xmloutdata/os-firmware-efi.xml | 1 + tests/qemuxml2xmltest.c | 27 + tests/virmock.h | 5 +- 39 files changed, 2255 insertions(+), 30 deletions(-) create mode 100644 src/qemu/qemu_firmware.c create mode 100644 src/qemu/qemu_firmware.h create mode 120000 tests/qemufirmwaredata/etc/qemu/firmware/40-ovmf-sb.json create mode 100644 tests/qemufirmwaredata/etc/qemu/firmware/60-ovmf.json create mode 100644 tests/qemufirmwaredata/home/user/.config/qemu/firmware/10-bios.json create mode 100644 tests/qemufirmwaredata/usr/share/qemu/firmware/40-bios.json create mode 100644 tests/qemufirmwaredata/usr/share/qemu/firmware/50-ovmf-sb.json create mode 100644 tests/qemufirmwaredata/usr/share/qemu/firmware/60-ovmf.json create mode 100644 tests/qemufirmwaredata/usr/share/qemu/firmware/70-aavmf.json create mode 100644 tests/qemufirmwaretest.c create mode 100644 tests/qemuxml2argvdata/aarch64-os-firmware-efi.aarch64-latest.args create mode 100644 tests/qemuxml2argvdata/aarch64-os-firmware-efi.xml create mode 100644 tests/qemuxml2argvdata/os-firmware-bios.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/os-firmware-bios.xml create mode 100644 tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/os-firmware-efi-secboot.xml create mode 100644 tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/os-firmware-efi.xml create mode 120000 tests/qemuxml2xmloutdata/aarch64-os-firmware-efi.xml create mode 120000 tests/qemuxml2xmloutdata/os-firmware-bios.xml create mode 120000 tests/qemuxml2xmloutdata/os-firmware-efi-secboot.xml create mode 120000 tests/qemuxml2xmloutdata/os-firmware-efi.xml -- 2.19.2

3 37

[libvirt] [PATCH 0/3] tests: Clean up qemuxml2xml a bit
by Andrea Bolognani 05 Mar '19

05 Mar '19

Just your average yak shaving, really. Andrea Bolognani (3): tests: Rename some qemuxml2xml output files for clarity tests: Use WHEN_BOTH in qemuxml2xml whenever possible tests: Add -inactive suffix when appropriate for qemuxml2xml ...ml => channel-unix-source-path-active.xml} | 3 + ... => channel-unix-source-path-inactive.xml} | 0 ...mmit.xml => disk-active-commit-active.xml} | 0 ...it.xml => disk-active-commit-inactive.xml} | 8 +- .../disk-backing-chains-noindex-inactive.xml | 156 ------------------ ...ve.xml => disk-backing-chains-noindex.xml} | 0 ...ror-old.xml => disk-mirror-old-active.xml} | 0 ...> seclabel-dynamic-baselabel-inactive.xml} | 0 ...> seclabel-dynamic-labelskip-inactive.xml} | 0 ...eclabel-dynamic-none-relabel-inactive.xml} | 0 ...=> seclabel-dynamic-override-inactive.xml} | 0 ... => seclabel-dynamic-relabel-inactive.xml} | 0 ...l => seclabel-static-labelskip-active.xml} | 0 ...=> seclabel-static-labelskip-inactive.xml} | 5 +- tests/qemuxml2xmltest.c | 6 +- 15 files changed, 11 insertions(+), 167 deletions(-) copy tests/qemuxml2xmloutdata/{channel-unix-source-path.xml => channel-unix-source-path-active.xml} (86%) rename tests/qemuxml2xmloutdata/{channel-unix-source-path.xml => channel-unix-source-path-inactive.xml} (100%) copy tests/qemuxml2xmloutdata/{disk-active-commit.xml => disk-active-commit-active.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-active-commit.xml => disk-active-commit-inactive.xml} (86%) delete mode 100644 tests/qemuxml2xmloutdata/disk-backing-chains-noindex-inactive.xml rename tests/qemuxml2xmloutdata/{disk-backing-chains-noindex-active.xml => disk-backing-chains-noindex.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-mirror-old.xml => disk-mirror-old-active.xml} (100%) rename tests/qemuxml2xmloutdata/{seclabel-dynamic-baselabel.xml => seclabel-dynamic-baselabel-inactive.xml} (100%) copy tests/qemuxml2xmloutdata/{seclabel-dynamic-labelskip.xml => seclabel-dynamic-labelskip-inactive.xml} (100%) rename tests/qemuxml2xmloutdata/{seclabel-dynamic-none-relabel.xml => seclabel-dynamic-none-relabel-inactive.xml} (100%) rename tests/qemuxml2xmloutdata/{seclabel-dynamic-override.xml => seclabel-dynamic-override-inactive.xml} (100%) rename tests/qemuxml2xmloutdata/{seclabel-dynamic-relabel.xml => seclabel-dynamic-relabel-inactive.xml} (100%) rename tests/qemuxml2xmloutdata/{seclabel-static-labelskip.xml => seclabel-static-labelskip-active.xml} (100%) rename tests/qemuxml2xmloutdata/{seclabel-dynamic-labelskip.xml => seclabel-static-labelskip-inactive.xml} (90%) -- 2.20.1

2 8

[libvirt] [jenkins-ci PATCH v6 0/4] Add support for cross compiling libvirt via Debian
by Daniel P. Berrangé 01 Mar '19

01 Mar '19

Changed in v6: - Use a static mapping for arch info - Split out data file changes from code changes - Change arch suffix to a prefix Changed in v5: - Remove redundant formatter class - Update commit message - Update readme - Move misplaced patch chunk - Dont set "dest" in arg when not needed - Use metavar for subparser Changed in v4: - Pull in change to use argparse sub-parsers - Refactor way architecture specific package rules are stored to be in the main package mappings data Changed in v3: - Remove sheepdog more generally - Use .format() style printf - Split config to cross-build.yml - Make glusterfs name per-distro customized - Misc code style changes - Rename fields in cross-build.yml - Don't use crossbuild-essential packages Changed in v2: - Fix multiple package name mistakes - Modify lcitool to generate cross-arch docker files - Add --no-install-recommended flag to apt-get - Add DEBIAN_FRONTEND=noninteractive env to apt-get - Improve error reporting in lcitool - Add make rule for generating dockerfiles locally Daniel P. Berrangé (4): mappings: extend mapping to allow per-arch entries mappings: filter arch usage for libnuma / xen lcitool: support generating cross compiler dockerfiles mappings: mark packages using foreign arch for cross builds guests/lcitool | 117 ++++++++++++++++++++- guests/playbooks/update/tasks/packages.yml | 32 ++++++ guests/vars/mappings.yml | 106 ++++++++++++++++++- 3 files changed, 249 insertions(+), 6 deletions(-) -- 2.20.1

2 10

[libvirt] [PATCH 00/26] cpu_x86: Add multiple signatures for CPU models
by Jiri Denemark 01 Mar '19

01 Mar '19

CPU signatures in the cpu_map serve as a hint for CPUID to CPU model matching algorithm. If the CPU signatures matches any CPU model in the cpu_map, this model will be the preferred one. This works out well and solved several mismatches, but in real world CPUs which should match a single CPU model may be produced with several different signatures. For example, low voltage Broadwell CPUs for laptops and Broadwell CPUs for servers differ in CPU model numbers while we should detect them all as Broadwell CPU model. This patch adds support for storing several signatures for a single CPU model to make this hint useful for more CPUs. Later commits will provide additional signatures for existing CPU models, which will correct some results in our CPU test suite. The list of signatures corresponding to each CPU model were generated by consulting the following sites: https://en.wikichip.org/wiki/intel/cpuid http://www.cpu-world.com/cgi-bin/CPUID.pl https://ark.intel.com/content/www/us/en/ark.html Jiri Denemark (26): cputest: Make sure generated files pass syntax-check cputest: Add data for Intel(R) Xeon(R) CPU E5-2630 v4 cputest: Add data for Intel(R) Core(TM) i7-7600U cputest: Add data for Intel(R) Xeon(R) CPU E7540 cputest: Add data for Intel(R) Xeon(R) CPU E5-2650 cpu_x86: Separate ancestor model parsing from x86ModelParse cpu_x86: Separate signature parsing from x86ModelParse cpu_x86: Separate vendor parsing from x86ModelParse cpu_x86: Separate feature list parsing from x86ModelParse cpu_x86: Make sure CPU model names are unique in cpu_map cpu_x86: Allow multiple signatures for a CPU model qemu_capabilities: Inroduce virQEMUCapsGetCPUModelX86Data qemu_capabilities: Introduce virQEMUCapsGetCPUModelInfo qemu_capabilities: Use virQEMUCapsGetCPUModelInfo cpu_x86: Add virCPUx86DataGetSignature for tests cpu_map: Add hex representation of signatures cputest: Test CPU signatures cpu_map: Add more signatures for Conroe CPU model cpu_map: Add more signatures for Penryn CPU model cpu_map: Add more signatures for Nehalem CPU models cpu_map: Add more signatures for Westmere CPU model cpu_map: Add more signatures for SandyBridge CPU models cpu_map: Add more signatures for IvyBridge CPU models cpu_map: Add more signatures for Haswell CPU models cpu_map: Add more signatures for Broadwell CPU models cpu_map: Add more signatures for Skylake-Client CPU models src/cpu/cpu_x86.c | 345 +++-- src/cpu/cpu_x86.h | 5 + src/cpu_map/x86_Broadwell-IBRS.xml | 5 +- src/cpu_map/x86_Broadwell-noTSX-IBRS.xml | 5 +- src/cpu_map/x86_Broadwell-noTSX.xml | 5 +- src/cpu_map/x86_Broadwell.xml | 5 +- src/cpu_map/x86_Conroe.xml | 3 +- src/cpu_map/x86_EPYC-IBRS.xml | 2 +- src/cpu_map/x86_EPYC.xml | 2 +- src/cpu_map/x86_Haswell-IBRS.xml | 5 +- src/cpu_map/x86_Haswell-noTSX-IBRS.xml | 5 +- src/cpu_map/x86_Haswell-noTSX.xml | 5 +- src/cpu_map/x86_Haswell.xml | 5 +- src/cpu_map/x86_Icelake-Client.xml | 2 +- src/cpu_map/x86_Icelake-Server.xml | 2 +- src/cpu_map/x86_IvyBridge-IBRS.xml | 3 +- src/cpu_map/x86_IvyBridge.xml | 3 +- src/cpu_map/x86_Nehalem-IBRS.xml | 5 +- src/cpu_map/x86_Nehalem.xml | 5 +- src/cpu_map/x86_Opteron_G1.xml | 2 +- src/cpu_map/x86_Opteron_G2.xml | 2 +- src/cpu_map/x86_Opteron_G3.xml | 2 +- src/cpu_map/x86_Opteron_G4.xml | 2 +- src/cpu_map/x86_Opteron_G5.xml | 2 +- src/cpu_map/x86_Penryn.xml | 3 +- src/cpu_map/x86_SandyBridge-IBRS.xml | 3 +- src/cpu_map/x86_SandyBridge.xml | 3 +- src/cpu_map/x86_Skylake-Client-IBRS.xml | 7 +- src/cpu_map/x86_Skylake-Client.xml | 7 +- src/cpu_map/x86_Skylake-Server-IBRS.xml | 2 +- src/cpu_map/x86_Skylake-Server.xml | 2 +- src/cpu_map/x86_Westmere-IBRS.xml | 2 +- src/cpu_map/x86_Westmere.xml | 4 +- src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 91 +- src/qemu/qemu_capspriv.h | 8 + tests/cputest.c | 96 ++ tests/cputestdata/cpu-reformat.py | 2 +- tests/cputestdata/x86_64-cpuid-A10-5800K.sig | 4 + tests/cputestdata/x86_64-cpuid-Atom-D510.sig | 4 + tests/cputestdata/x86_64-cpuid-Atom-N450.sig | 4 + .../cputestdata/x86_64-cpuid-Core-i5-2500.sig | 4 + .../x86_64-cpuid-Core-i5-2540M.sig | 4 + .../x86_64-cpuid-Core-i5-4670T.sig | 4 + .../x86_64-cpuid-Core-i5-650-json.xml | 9 +- .../cputestdata/x86_64-cpuid-Core-i5-650.sig | 4 + .../cputestdata/x86_64-cpuid-Core-i5-6600.sig | 4 + .../x86_64-cpuid-Core-i7-2600-xsaveopt.sig | 4 + .../cputestdata/x86_64-cpuid-Core-i7-2600.sig | 4 + .../x86_64-cpuid-Core-i7-3520M.sig | 4 + .../x86_64-cpuid-Core-i7-3740QM.sig | 4 + .../cputestdata/x86_64-cpuid-Core-i7-3770.sig | 4 + .../x86_64-cpuid-Core-i7-4510U.sig | 4 + .../x86_64-cpuid-Core-i7-4600U.sig | 4 + .../x86_64-cpuid-Core-i7-5600U-arat.sig | 4 + .../x86_64-cpuid-Core-i7-5600U-ibrs.sig | 4 + .../x86_64-cpuid-Core-i7-5600U.sig | 4 + .../x86_64-cpuid-Core-i7-7600U-disabled.xml | 6 + .../x86_64-cpuid-Core-i7-7600U-enabled.xml | 8 + .../x86_64-cpuid-Core-i7-7600U-guest.xml | 28 + .../x86_64-cpuid-Core-i7-7600U-host.xml | 29 + .../x86_64-cpuid-Core-i7-7600U-json.xml | 13 + .../x86_64-cpuid-Core-i7-7600U.json | 755 +++++++++++ .../x86_64-cpuid-Core-i7-7600U.sig | 4 + .../x86_64-cpuid-Core-i7-7600U.xml | 47 + .../cputestdata/x86_64-cpuid-Core-i7-7700.sig | 4 + .../cputestdata/x86_64-cpuid-Core2-E6850.sig | 4 + .../cputestdata/x86_64-cpuid-Core2-Q9500.sig | 4 + .../x86_64-cpuid-EPYC-7601-32-Core-ibpb.sig | 4 + .../x86_64-cpuid-EPYC-7601-32-Core.sig | 4 + tests/cputestdata/x86_64-cpuid-FX-8150.sig | 4 + .../cputestdata/x86_64-cpuid-Opteron-1352.sig | 4 + .../cputestdata/x86_64-cpuid-Opteron-2350.sig | 4 + .../cputestdata/x86_64-cpuid-Opteron-6234.sig | 4 + .../cputestdata/x86_64-cpuid-Opteron-6282.sig | 4 + .../x86_64-cpuid-Pentium-P6100-guest.xml | 10 +- .../x86_64-cpuid-Pentium-P6100.sig | 4 + tests/cputestdata/x86_64-cpuid-Phenom-B95.sig | 4 + .../x86_64-cpuid-Ryzen-7-1800X-Eight-Core.sig | 4 + tests/cputestdata/x86_64-cpuid-Xeon-5110.sig | 4 + .../x86_64-cpuid-Xeon-E3-1245-v5.sig | 4 + .../x86_64-cpuid-Xeon-E5-2609-v3.sig | 4 + .../x86_64-cpuid-Xeon-E5-2623-v4-guest.xml | 11 +- .../x86_64-cpuid-Xeon-E5-2623-v4-json.xml | 11 +- .../x86_64-cpuid-Xeon-E5-2623-v4.sig | 4 + .../x86_64-cpuid-Xeon-E5-2630-v3.sig | 4 + .../x86_64-cpuid-Xeon-E5-2630-v4-disabled.xml | 7 + .../x86_64-cpuid-Xeon-E5-2630-v4-enabled.xml | 8 + .../x86_64-cpuid-Xeon-E5-2630-v4-guest.xml | 34 + .../x86_64-cpuid-Xeon-E5-2630-v4-host.xml | 35 + .../x86_64-cpuid-Xeon-E5-2630-v4-json.xml | 14 + .../x86_64-cpuid-Xeon-E5-2630-v4.json | 596 +++++++++ .../x86_64-cpuid-Xeon-E5-2630-v4.sig | 4 + .../x86_64-cpuid-Xeon-E5-2630-v4.xml | 43 + .../x86_64-cpuid-Xeon-E5-2650-disabled.xml | 5 + .../x86_64-cpuid-Xeon-E5-2650-enabled.xml | 8 + .../x86_64-cpuid-Xeon-E5-2650-guest.xml | 29 + .../x86_64-cpuid-Xeon-E5-2650-host.xml | 30 + .../x86_64-cpuid-Xeon-E5-2650-json.xml | 14 + .../x86_64-cpuid-Xeon-E5-2650-v3.sig | 4 + .../x86_64-cpuid-Xeon-E5-2650-v4-guest.xml | 11 +- .../x86_64-cpuid-Xeon-E5-2650-v4-json.xml | 11 +- .../x86_64-cpuid-Xeon-E5-2650-v4.sig | 4 + .../x86_64-cpuid-Xeon-E5-2650.json | 931 ++++++++++++++ .../cputestdata/x86_64-cpuid-Xeon-E5-2650.sig | 4 + .../cputestdata/x86_64-cpuid-Xeon-E5-2650.xml | 34 + .../x86_64-cpuid-Xeon-E7-4820-guest.xml | 8 +- .../x86_64-cpuid-Xeon-E7-4820-json.xml | 8 +- .../cputestdata/x86_64-cpuid-Xeon-E7-4820.sig | 4 + .../x86_64-cpuid-Xeon-E7-4830-json.xml | 9 +- .../cputestdata/x86_64-cpuid-Xeon-E7-4830.sig | 4 + .../x86_64-cpuid-Xeon-E7-8890-v3.sig | 4 + .../x86_64-cpuid-Xeon-E7540-disabled.xml | 5 + .../x86_64-cpuid-Xeon-E7540-enabled.xml | 7 + .../x86_64-cpuid-Xeon-E7540-guest.xml | 25 + .../x86_64-cpuid-Xeon-E7540-host.xml | 26 + .../x86_64-cpuid-Xeon-E7540-json.xml | 14 + .../cputestdata/x86_64-cpuid-Xeon-E7540.json | 1117 +++++++++++++++++ tests/cputestdata/x86_64-cpuid-Xeon-E7540.sig | 4 + tests/cputestdata/x86_64-cpuid-Xeon-E7540.xml | 30 + .../x86_64-cpuid-Xeon-Gold-5115.sig | 4 + .../x86_64-cpuid-Xeon-Gold-6148.sig | 4 + tests/cputestdata/x86_64-cpuid-Xeon-W3520.sig | 4 + tests/cputestdata/x86_64-cpuid-Xeon-X5460.sig | 4 + 124 files changed, 4634 insertions(+), 206 deletions(-) create mode 100644 tests/cputestdata/x86_64-cpuid-A10-5800K.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Atom-D510.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Atom-N450.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i5-2500.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i5-2540M.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i5-4670T.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i5-650.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i5-6600.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-2600.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-3520M.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-3740QM.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-3770.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-4510U.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-4600U.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-5600U.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-7600U-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-7600U-enabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-7600U-guest.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-7600U-json.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-7600U.json create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-7600U.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-7600U.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-7700.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Core2-E6850.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Core2-Q9500.sig create mode 100644 tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb.sig create mode 100644 tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core.sig create mode 100644 tests/cputestdata/x86_64-cpuid-FX-8150.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Opteron-1352.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Opteron-2350.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Opteron-6234.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Opteron-6282.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Pentium-P6100.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Phenom-B95.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-5110.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-enabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-guest.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-json.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4.json create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-enabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-guest.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-json.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.json create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7-4820.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7-4830.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7540-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7540-enabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7540-guest.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7540-host.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7540-json.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7540.json create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7540.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7540.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-W3520.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-X5460.sig -- 2.21.0

2 54

[libvirt] [PATCH v2 0/6] Alter domain_conf to make use of autofree
by John Ferlan 01 Mar '19

01 Mar '19

v1: https://www.redhat.com/archives/libvir-list/2019-February/msg01160.html Changes since v1: * Push patch 1 * Split patch 2 to follow code review guidance: * (Patch1) Pull out virDomainEmulatorPinDefParseXML changes to use VIR_STEAL_PTR * (Patch2) Use VIR_AUTOPTR(virBitmap) * (Patch3) Handle a couple cases where goto's no longer necessary * Drop Patch 3 * Split Patch 4 to follow code review guidance: * (Patch4) Remove unused variables * (Patch5) Just use VIR_AUTOFREE * (Patch6) Handle the removal of goto logic that's no longer necessary John Ferlan (6): conf: Rework virDomainEmulatorPinDefParseXML conf: Use VIR_AUTOPTR(virBitmap) in domain_conf conf: Clean up some unnecessary goto paths conf: Remove a few unused variables in domain_conf conf: Use VIR_AUTOFREE in domain_conf conf: Clean up some unnecessary goto paths src/conf/domain_conf.c | 1937 ++++++++++++++-------------------------- 1 file changed, 676 insertions(+), 1261 deletions(-) -- 2.20.1

2 16

[libvirt] [jenkins-ci PATCH v5 0/5] Add support for cross compiling libvirt via Debian
by Daniel P. Berrangé 01 Mar '19

01 Mar '19

Changed in v5: - Remove redundant formatter class - Update commit message - Update readme - Move misplaced patch chunk - Dont set "dest" in arg when not needed - Use metavar for subparser Changed in v4: - Pull in change to use argparse sub-parsers - Refactor way architecture specific package rules are stored to be in the main package mappings data Changed in v3: - Remove sheepdog more generally - Use .format() style printf - Split config to cross-build.yml - Make glusterfs name per-distro customized - Misc code style changes - Rename fields in cross-build.yml - Don't use crossbuild-essential packages Changed in v2: - Fix multiple package name mistakes - Modify lcitool to generate cross-arch docker files - Add --no-install-recommended flag to apt-get - Add DEBIAN_FRONTEND=noninteractive env to apt-get - Improve error reporting in lcitool - Add make rule for generating dockerfiles locally Daniel P. Berrangé (5): lcitool: use subparsers for commands lcitool: avoid repetition when expanding package mappings lcitool: avoid intermediate list of packages mappings: extend mapping to allow per-arch entries lcitool: support generating cross compiler dockerfiles guests/README.markdown | 18 +- guests/host_vars/libvirt-debian-9/main.yml | 44 ++++ guests/host_vars/libvirt-debian-sid/main.yml | 45 ++++ guests/lcitool | 230 +++++++++++++------ guests/playbooks/update/tasks/packages.yml | 32 +++ guests/vars/mappings.yml | 101 +++++++- 6 files changed, 381 insertions(+), 89 deletions(-) -- 2.20.1

2 16

[libvirt] [PATCH] util: Use VIR_AUTOUNREF for virstoragefile
by John Ferlan 01 Mar '19

01 Mar '19

Let's make use of the auto __cleanup capabilities cleaning up any now unnecessary goto paths. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- BTW: I did try this with a linked travis-ci and github branch, and it worked for me. I'm avoiding altering virStorageFileMetadataNew... src/util/virstoragefile.c | 130 +++++++++++++++----------------------- 1 file changed, 52 insertions(+), 78 deletions(-) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index b2e308d81d..003183bf76 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1205,11 +1205,11 @@ virStorageFileGetMetadataFromFD(const char *path, { virStorageSourcePtr ret = NULL; - virStorageSourcePtr meta = NULL; ssize_t len = VIR_STORAGE_MAX_HEADER; struct stat sb; int dummy; VIR_AUTOFREE(char *) buf = NULL; + VIR_AUTOUNREF(virStorageSourcePtr) meta = NULL; if (!backingFormat) backingFormat = &dummy; @@ -1231,21 +1231,21 @@ virStorageFileGetMetadataFromFD(const char *path, meta->type = VIR_STORAGE_TYPE_DIR; meta->format = VIR_STORAGE_FILE_DIR; VIR_STEAL_PTR(ret, meta); - goto cleanup; + return ret; } if (lseek(fd, 0, SEEK_SET) == (off_t)-1) { virReportSystemError(errno, _("cannot seek to start of '%s'"), meta->path); - goto cleanup; + return NULL; } if ((len = virFileReadHeaderFD(fd, len, &buf)) < 0) { virReportSystemError(errno, _("cannot read header '%s'"), meta->path); - goto cleanup; + return NULL; } if (virStorageFileGetMetadataInternal(meta, buf, len, backingFormat) < 0) - goto cleanup; + return NULL; if (S_ISREG(sb.st_mode)) meta->type = VIR_STORAGE_TYPE_FILE; @@ -1253,9 +1253,6 @@ virStorageFileGetMetadataFromFD(const char *path, meta->type = VIR_STORAGE_TYPE_BLOCK; VIR_STEAL_PTR(ret, meta); - - cleanup: - virObjectUnref(meta); return ret; } @@ -2243,7 +2240,8 @@ virStorageSourcePtr virStorageSourceCopy(const virStorageSource *src, bool backingChain) { - virStorageSourcePtr def = NULL; + virStorageSourcePtr ret = NULL; + VIR_AUTOUNREF(virStorageSourcePtr) def = NULL; if (!(def = virStorageSourceNew())) return NULL; @@ -2282,60 +2280,57 @@ virStorageSourceCopy(const virStorageSource *src, VIR_STRDUP(def->compat, src->compat) < 0 || VIR_STRDUP(def->tlsAlias, src->tlsAlias) < 0 || VIR_STRDUP(def->tlsCertdir, src->tlsCertdir) < 0) - goto error; + return NULL; if (src->nhosts) { if (!(def->hosts = virStorageNetHostDefCopy(src->nhosts, src->hosts))) - goto error; + return NULL; def->nhosts = src->nhosts; } if (src->srcpool && !(def->srcpool = virStorageSourcePoolDefCopy(src->srcpool))) - goto error; + return NULL; if (src->features && !(def->features = virBitmapNewCopy(src->features))) - goto error; + return NULL; if (src->encryption && !(def->encryption = virStorageEncryptionCopy(src->encryption))) - goto error; + return NULL; if (src->perms && !(def->perms = virStoragePermsCopy(src->perms))) - goto error; + return NULL; if (src->timestamps && !(def->timestamps = virStorageTimestampsCopy(src->timestamps))) - goto error; + return NULL; if (virStorageSourceSeclabelsCopy(def, src) < 0) - goto error; + return NULL; if (src->auth && !(def->auth = virStorageAuthDefCopy(src->auth))) - goto error; + return NULL; if (src->pr && !(def->pr = virStoragePRDefCopy(src->pr))) - goto error; + return NULL; if (virStorageSourceInitiatorCopy(&def->initiator, &src->initiator)) - goto error; + return NULL; if (backingChain && src->backingStore) { if (!(def->backingStore = virStorageSourceCopy(src->backingStore, true))) - goto error; + return NULL; } - return def; - - error: - virObjectUnref(def); - return NULL; + VIR_STEAL_PTR(ret, def); + return ret; } @@ -2601,27 +2596,28 @@ static virStorageSourcePtr virStorageSourceNewFromBackingRelative(virStorageSourcePtr parent, const char *rel) { - virStorageSourcePtr def; + virStorageSourcePtr ret = NULL; VIR_AUTOFREE(char *) dirname = NULL; + VIR_AUTOUNREF(virStorageSourcePtr) def = NULL; if (!(def = virStorageSourceNew())) return NULL; /* store relative name */ if (VIR_STRDUP(def->relPath, parent->backingStoreRaw) < 0) - goto error; + return NULL; if (!(dirname = mdir_name(parent->path))) { virReportOOMError(); - goto error; + return NULL; } if (STRNEQ(dirname, "/")) { if (virAsprintf(&def->path, "%s/%s", dirname, rel) < 0) - goto error; + return NULL; } else { if (virAsprintf(&def->path, "/%s", rel) < 0) - goto error; + return NULL; } if (virStorageSourceGetActualType(parent) == VIR_STORAGE_TYPE_NETWORK) { @@ -2632,25 +2628,20 @@ virStorageSourceNewFromBackingRelative(virStorageSourcePtr parent, if (parent->nhosts) { if (!(def->hosts = virStorageNetHostDefCopy(parent->nhosts, parent->hosts))) - goto error; + return NULL; def->nhosts = parent->nhosts; } if (VIR_STRDUP(def->volume, parent->volume) < 0) - goto error; + return NULL; } else { /* set the type to _FILE, the caller shall update it to the actual type */ def->type = VIR_STORAGE_TYPE_FILE; } - cleanup: - return def; - - error: - virObjectUnref(def); - def = NULL; - goto cleanup; + VIR_STEAL_PTR(ret, def); + return ret; } @@ -3648,8 +3639,9 @@ virStorageSourcePtr virStorageSourceNewFromBackingAbsolute(const char *path) { const char *json; - virStorageSourcePtr def; + virStorageSourcePtr ret = NULL; int rc; + VIR_AUTOUNREF(virStorageSourcePtr) def = NULL; if (!(def = virStorageSourceNew())) return NULL; @@ -3658,7 +3650,7 @@ virStorageSourceNewFromBackingAbsolute(const char *path) def->type = VIR_STORAGE_TYPE_FILE; if (VIR_STRDUP(def->path, path) < 0) - goto error; + return NULL; } else { def->type = VIR_STORAGE_TYPE_NETWORK; @@ -3673,7 +3665,7 @@ virStorageSourceNewFromBackingAbsolute(const char *path) rc = virStorageSourceParseBackingColon(def, path); if (rc < 0) - goto error; + return NULL; virStorageSourceNetworkAssignDefaultPorts(def); @@ -3686,11 +3678,8 @@ virStorageSourceNewFromBackingAbsolute(const char *path) } } - return def; - - error: - virObjectUnref(def); - return NULL; + VIR_STEAL_PTR(ret, def); + return ret; } @@ -3698,7 +3687,8 @@ virStorageSourcePtr virStorageSourceNewFromBacking(virStorageSourcePtr parent) { struct stat st; - virStorageSourcePtr def; + virStorageSourcePtr ret = NULL; + VIR_AUTOUNREF(virStorageSourcePtr) def = NULL; if (virStorageIsRelative(parent->backingStoreRaw)) def = virStorageSourceNewFromBackingRelative(parent, @@ -3721,17 +3711,14 @@ virStorageSourceNewFromBacking(virStorageSourcePtr parent) /* copy parent's labelling and other top level stuff */ if (virStorageSourceInitChainElement(def, parent, true) < 0) - goto error; + return NULL; def->readonly = true; def->detected = true; } - return def; - - error: - virObjectUnref(def); - return NULL; + VIR_STEAL_PTR(ret, def); + return ret; } @@ -3872,9 +3859,8 @@ virStorageSourceUpdateCapacity(virStorageSourcePtr src, ssize_t len, bool probe) { - int ret = -1; - virStorageSourcePtr meta = NULL; int format = src->format; + VIR_AUTOUNREF(virStorageSourcePtr) meta = NULL; /* Raw files: capacity is physical size. For all other files: if * the metadata has a capacity, use that, otherwise fall back to @@ -3884,12 +3870,12 @@ virStorageSourceUpdateCapacity(virStorageSourcePtr src, virReportError(VIR_ERR_INTERNAL_ERROR, _("no disk format for %s and probing is disabled"), src->path); - goto cleanup; + return -1; } if ((format = virStorageFileProbeFormatFromBuf(src->path, buf, len)) < 0) - goto cleanup; + return -1; src->format = format; } @@ -3902,17 +3888,13 @@ virStorageSourceUpdateCapacity(virStorageSourcePtr src, if (src->encryption && meta->encryption) src->encryption->payload_offset = meta->encryption->payload_offset; } else { - goto cleanup; + return -1; } if (src->encryption && src->encryption->payload_offset != -1) src->capacity -= src->encryption->payload_offset * 512; - ret = 0; - - cleanup: - virObjectUnref(meta); - return ret; + return 0; } @@ -4849,10 +4831,10 @@ virStorageFileGetMetadataRecurse(virStorageSourcePtr src, int ret = -1; const char *uniqueName; ssize_t headerLen; - virStorageSourcePtr backingStore = NULL; int backingFormat; int rv; VIR_AUTOFREE(char *) buf = NULL; + VIR_AUTOUNREF(virStorageSourcePtr) backingStore = NULL; VIR_DEBUG("path=%s format=%d uid=%u gid=%u", src->path, src->format, @@ -4935,7 +4917,6 @@ virStorageFileGetMetadataRecurse(virStorageSourcePtr src, if (virStorageSourceHasBacking(src)) src->backingStore->id = depth; virStorageFileDeinit(src); - virObjectUnref(backingStore); return ret; } @@ -5004,11 +4985,10 @@ int virStorageFileGetBackingStoreStr(virStorageSourcePtr src, char **backing) { - virStorageSourcePtr tmp = NULL; ssize_t headerLen; - int ret = -1; int rv; VIR_AUTOFREE(char *) buf = NULL; + VIR_AUTOUNREF(virStorageSourcePtr) tmp = NULL; *backing = NULL; @@ -5032,17 +5012,11 @@ virStorageFileGetBackingStoreStr(virStorageSourcePtr src, } if (!(tmp = virStorageSourceCopy(src, false))) - goto cleanup; + return -1; if (virStorageFileGetMetadataInternal(tmp, buf, headerLen, NULL) < 0) - goto cleanup; + return -1; VIR_STEAL_PTR(*backing, tmp->backingStoreRaw); - - ret = 0; - - cleanup: - virObjectUnref(tmp); - - return ret; + return 0; } -- 2.20.1

2 2

[libvirt] [PATCH v2 0/7] fix snapshot --redefine bugs (incremental backup saga)
by Eric Blake 01 Mar '19

01 Mar '19

John pointed out that patch 2 of my original bug fix did too much in one patch. Now that we are in freeze for 5.1, I've proposed two variants of the same fix: patch 1 is the bare minimum to fix the bug and nothing else, while patches 3-7 are more in line with my v1 patch at doing other refactoring work along the way (but now split into multiple logical steps) that will prove useful for my other pending snapshot improvements (https://www.redhat.com/archives/libvir-list/2019-February/msg01350.html, but now 5.2 material). I'm proposing both variants for comparison, although I already suspect the answer will be 'use patch 1 for 5.1, then rebase what remains of patches 3-7 into the other snapshot cleanups for 5.2'. variant2 is cleaner than my v1 patch 2/2 in that I no longer have to use a default: label to hack around gcc's enum sanity checking within a switch statement, but it required introducing a large mechanical rename of all use of snapshot state values. Eric Blake (7): qemu: Fix snapshot redefine vs. domain state bug Revert "qemu: Fix snapshot redefine vs. domain state bug" qemu: Refactor check for _LIVE vs. _REDEFINE qemu: Factor out qemuDomainSnapshotValidate() helper snapshot: Rework virDomainSnapshotState enum qemu: Use virDomainSnapshotState for switch statements qemu: Fix snapshot redefine vs. domain state bug src/conf/snapshot_conf.h | 21 ++++- src/conf/snapshot_conf.c | 28 +++---- src/qemu/qemu_driver.c | 160 +++++++++++++++++++++++---------------- src/test/test_driver.c | 20 ++--- src/vbox/vbox_common.c | 4 +- 5 files changed, 137 insertions(+), 96 deletions(-) -- 2.20.1

2 10

[libvirt] [PATCH] xml: nodedev: add class info for pci capability
by Nikolay Shirokovskiy 28 Feb '19

28 Feb '19

This info can be useful to filter devices visible to mgmt clients so that they won't see devices that unsafe/not meaningful to pass thru. Provide class info the way it is provided by udev or kernel that is as single 6-digit hexadecimal. Class element is not optional. I guess this should not break users that use virNodeDeviceCreateXML because they probably specify only scsi_host capability on input and then node device driver gets other capabilities from udev after device appeared. HAL driver does not get support for the new element in this patch. Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com> --- docs/formatnode.html.in | 5 +++++ docs/schemas/nodedev.rng | 5 +++++ src/conf/node_device_conf.c | 13 +++++++++++++ tests/nodedevschemadata/pci_0000_00_02_0_header_type.xml | 1 + tests/nodedevschemadata/pci_0000_00_1c_0_header_type.xml | 1 + tests/nodedevschemadata/pci_0000_02_10_7_mdev_types.xml | 1 + tests/nodedevschemadata/pci_0000_02_10_7_sriov.xml | 1 + .../nodedevschemadata/pci_0000_02_10_7_sriov_pf_vfs_all.xml | 1 + .../pci_0000_02_10_7_sriov_pf_vfs_all_header_type.xml | 1 + tests/nodedevschemadata/pci_0000_02_10_7_sriov_vfs.xml | 1 + .../pci_0000_02_10_7_sriov_zero_vfs_max_count.xml | 1 + tests/nodedevschemadata/pci_1002_71c4.xml | 1 + tests/nodedevschemadata/pci_8086_0c0c_snd_hda_intel.xml | 1 + tests/nodedevschemadata/pci_8086_10c9_sriov_pf.xml | 1 + tests/nodedevschemadata/pci_8086_4238_pcie_wireless.xml | 1 + tests/nodedevschemadata/pci_82579LM_network_adapter.xml | 1 + 16 files changed, 36 insertions(+) diff --git a/docs/formatnode.html.in b/docs/formatnode.html.in index 29244a8..b72d7db 100644 --- a/docs/formatnode.html.in +++ b/docs/formatnode.html.in @@ -70,6 +70,10 @@ <dd>Describes a device on the host's PCI bus. Sub-elements include: <dl> + <dt><code>class</code></dt> + <dd>Combined class, subclass and + programming interface codes as 6-digit hexadecimal number. + <span class="since">Since 5.1.0</span></dd> <dt><code>domain</code></dt> <dd>Which domain the device belongs to.</dd> <dt><code>bus</code></dt> @@ -381,6 +385,7 @@ <name>igb</name> </driver> <capability type='pci'> + <class>0x020000</class> <domain>0</domain> <bus>2</bus> <slot>0</slot> diff --git a/docs/schemas/nodedev.rng b/docs/schemas/nodedev.rng index 0498489..0f45d79 100644 --- a/docs/schemas/nodedev.rng +++ b/docs/schemas/nodedev.rng @@ -133,6 +133,11 @@ <value>pci</value> </attribute> + <element name='class'> + <data type="string"> + <param name="pattern">0x[0-9a-fA-F]{6}</param> + </data> + </element> <element name='domain'> <ref name='unsignedLong'/> </element> diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 1b1f57d..d2f5183 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -208,6 +208,7 @@ virNodeDeviceCapPCIDefFormat(virBufferPtr buf, { size_t i; + virBufferAsprintf(buf, "<class>0x%.6x</class>\n", data->pci_dev.class); virBufferAsprintf(buf, "<domain>%d</domain>\n", data->pci_dev.domain); virBufferAsprintf(buf, "<bus>%d</bus>\n", data->pci_dev.bus); @@ -1644,6 +1645,18 @@ virNodeDevCapPCIDevParseXML(xmlXPathContextPtr ctxt, orignode = ctxt->node; ctxt->node = node; + if (virNodeDevCapsDefParseHexId("string(./class[1])", ctxt, + &pci_dev->class, def, + _("no PCI class supplied for '%s'"), + _("invalid PCI class supplied for '%s'")) < 0) + goto out; + + if (pci_dev->class > 0xFFFFFF) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("invalid PCI class supplied for '%s'"), def->name); + goto out; + } + if (virNodeDevCapsDefParseULong("number(./domain[1])", ctxt, &pci_dev->domain, def, _("no PCI domain ID supplied for '%s'"), diff --git a/tests/nodedevschemadata/pci_0000_00_02_0_header_type.xml b/tests/nodedevschemadata/pci_0000_00_02_0_header_type.xml index 5150fd1..387fce7 100644 --- a/tests/nodedevschemadata/pci_0000_00_02_0_header_type.xml +++ b/tests/nodedevschemadata/pci_0000_00_02_0_header_type.xml @@ -2,6 +2,7 @@ <name>pci_0000_00_02_0</name> <parent>computer</parent> <capability type='pci'> + <class>0xffffff</class> <domain>0</domain> <bus>0</bus> <slot>2</slot> diff --git a/tests/nodedevschemadata/pci_0000_00_1c_0_header_type.xml b/tests/nodedevschemadata/pci_0000_00_1c_0_header_type.xml index c1be9f7..b07d14f 100644 --- a/tests/nodedevschemadata/pci_0000_00_1c_0_header_type.xml +++ b/tests/nodedevschemadata/pci_0000_00_1c_0_header_type.xml @@ -2,6 +2,7 @@ <name>pci_0000_00_1c_0</name> <parent>computer</parent> <capability type='pci'> + <class>0xffffff</class> <domain>0</domain> <bus>0</bus> <slot>28</slot> diff --git a/tests/nodedevschemadata/pci_0000_02_10_7_mdev_types.xml b/tests/nodedevschemadata/pci_0000_02_10_7_mdev_types.xml index a2d5756..8e71e3f 100644 --- a/tests/nodedevschemadata/pci_0000_02_10_7_mdev_types.xml +++ b/tests/nodedevschemadata/pci_0000_02_10_7_mdev_types.xml @@ -2,6 +2,7 @@ <name>pci_0000_02_10_7</name> <parent>pci_0000_00_04_0</parent> <capability type='pci'> + <class>0xffffff</class> <domain>0</domain> <bus>2</bus> <slot>16</slot> diff --git a/tests/nodedevschemadata/pci_0000_02_10_7_sriov.xml b/tests/nodedevschemadata/pci_0000_02_10_7_sriov.xml index 8f243b4..6fa2b40 100644 --- a/tests/nodedevschemadata/pci_0000_02_10_7_sriov.xml +++ b/tests/nodedevschemadata/pci_0000_02_10_7_sriov.xml @@ -2,6 +2,7 @@ <name>pci_0000_02_10_7</name> <parent>pci_0000_00_04_0</parent> <capability type='pci'> + <class>0xffffff</class> <domain>0</domain> <bus>2</bus> <slot>16</slot> diff --git a/tests/nodedevschemadata/pci_0000_02_10_7_sriov_pf_vfs_all.xml b/tests/nodedevschemadata/pci_0000_02_10_7_sriov_pf_vfs_all.xml index 9e8dace..74036a6 100644 --- a/tests/nodedevschemadata/pci_0000_02_10_7_sriov_pf_vfs_all.xml +++ b/tests/nodedevschemadata/pci_0000_02_10_7_sriov_pf_vfs_all.xml @@ -2,6 +2,7 @@ <name>pci_0000_02_10_7</name> <parent>pci_0000_00_04_0</parent> <capability type='pci'> + <class>0xffffff</class> <domain>0</domain> <bus>2</bus> <slot>16</slot> diff --git a/tests/nodedevschemadata/pci_0000_02_10_7_sriov_pf_vfs_all_header_type.xml b/tests/nodedevschemadata/pci_0000_02_10_7_sriov_pf_vfs_all_header_type.xml index 4e6323a..c30c0d0 100644 --- a/tests/nodedevschemadata/pci_0000_02_10_7_sriov_pf_vfs_all_header_type.xml +++ b/tests/nodedevschemadata/pci_0000_02_10_7_sriov_pf_vfs_all_header_type.xml @@ -2,6 +2,7 @@ <name>pci_0000_02_10_7</name> <parent>pci_0000_00_04_0</parent> <capability type='pci'> + <class>0xffffff</class> <domain>0</domain> <bus>2</bus> <slot>16</slot> diff --git a/tests/nodedevschemadata/pci_0000_02_10_7_sriov_vfs.xml b/tests/nodedevschemadata/pci_0000_02_10_7_sriov_vfs.xml index 355eaaa..096055e 100644 --- a/tests/nodedevschemadata/pci_0000_02_10_7_sriov_vfs.xml +++ b/tests/nodedevschemadata/pci_0000_02_10_7_sriov_vfs.xml @@ -2,6 +2,7 @@ <name>pci_0000_02_10_7</name> <parent>pci_0000_00_04_0</parent> <capability type='pci'> + <class>0xffffff</class> <domain>0</domain> <bus>2</bus> <slot>16</slot> diff --git a/tests/nodedevschemadata/pci_0000_02_10_7_sriov_zero_vfs_max_count.xml b/tests/nodedevschemadata/pci_0000_02_10_7_sriov_zero_vfs_max_count.xml index e9eb122..8259cd0 100644 --- a/tests/nodedevschemadata/pci_0000_02_10_7_sriov_zero_vfs_max_count.xml +++ b/tests/nodedevschemadata/pci_0000_02_10_7_sriov_zero_vfs_max_count.xml @@ -2,6 +2,7 @@ <name>pci_0000_02_10_7</name> <parent>pci_0000_00_04_0</parent> <capability type='pci'> + <class>0xffffff</class> <domain>0</domain> <bus>2</bus> <slot>16</slot> diff --git a/tests/nodedevschemadata/pci_1002_71c4.xml b/tests/nodedevschemadata/pci_1002_71c4.xml index 6d5d85b..2039e22 100644 --- a/tests/nodedevschemadata/pci_1002_71c4.xml +++ b/tests/nodedevschemadata/pci_1002_71c4.xml @@ -2,6 +2,7 @@ <name>pci_1002_71c4</name> <parent>pci_8086_27a1</parent> <capability type='pci'> + <class>0xffffff</class> <domain>0</domain> <bus>1</bus> <slot>0</slot> diff --git a/tests/nodedevschemadata/pci_8086_0c0c_snd_hda_intel.xml b/tests/nodedevschemadata/pci_8086_0c0c_snd_hda_intel.xml index 8e89900..3ffe53b 100644 --- a/tests/nodedevschemadata/pci_8086_0c0c_snd_hda_intel.xml +++ b/tests/nodedevschemadata/pci_8086_0c0c_snd_hda_intel.xml @@ -2,6 +2,7 @@ <name>pci_0000_00_03_0</name> <parent>computer</parent> <capability type='pci'> + <class>0xffffff</class> <domain>0</domain> <bus>0</bus> <slot>3</slot> diff --git a/tests/nodedevschemadata/pci_8086_10c9_sriov_pf.xml b/tests/nodedevschemadata/pci_8086_10c9_sriov_pf.xml index 6e1dc86..6bd1292 100644 --- a/tests/nodedevschemadata/pci_8086_10c9_sriov_pf.xml +++ b/tests/nodedevschemadata/pci_8086_10c9_sriov_pf.xml @@ -2,6 +2,7 @@ <name>pci_0000_02_00_0</name> <parent>pci_0000_00_04_0</parent> <capability type='pci'> + <class>0xffffff</class> <domain>0</domain> <bus>2</bus> <slot>0</slot> diff --git a/tests/nodedevschemadata/pci_8086_4238_pcie_wireless.xml b/tests/nodedevschemadata/pci_8086_4238_pcie_wireless.xml index 18172e9..59f5ec8 100644 --- a/tests/nodedevschemadata/pci_8086_4238_pcie_wireless.xml +++ b/tests/nodedevschemadata/pci_8086_4238_pcie_wireless.xml @@ -2,6 +2,7 @@ <name>pci_0000_03_00_0</name> <parent>pci_0000_00_1c_1</parent> <capability type='pci'> + <class>0xffffff</class> <domain>0</domain> <bus>3</bus> <slot>0</slot> diff --git a/tests/nodedevschemadata/pci_82579LM_network_adapter.xml b/tests/nodedevschemadata/pci_82579LM_network_adapter.xml index 6e154d6..96a4c51 100644 --- a/tests/nodedevschemadata/pci_82579LM_network_adapter.xml +++ b/tests/nodedevschemadata/pci_82579LM_network_adapter.xml @@ -5,6 +5,7 @@ <name>e1000e</name> </driver> <capability type='pci'> + <class>0xffffff</class> <domain>0</domain> <bus>0</bus> <slot>25</slot> -- 1.8.3.1

2 1

[libvirt] [PATCH v2] storage: Fix iscsi-direct volume size for volumes > 4GiB
by Jiri Denemark 28 Feb '19

28 Feb '19

Both block_size and nb_block are unit32_t and multiplying them overflows at 4GiB. Moreover, the iscsi_*10_* APIs use 32bit number of blocks and thus they can only address images up to 2TiB with 512B blocks. Let's use 64b iscsi_*16_* APIs instead. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- Notes: Version 2: - also fix volumes > 2TiB src/storage/storage_backend_iscsi_direct.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/storage/storage_backend_iscsi_direct.c b/src/storage/storage_backend_iscsi_direct.c index 32ceb592d9..786663534d 100644 --- a/src/storage/storage_backend_iscsi_direct.c +++ b/src/storage/storage_backend_iscsi_direct.c @@ -245,7 +245,7 @@ static int virISCSIDirectGetVolumeCapacity(struct iscsi_context *iscsi, int lun, uint32_t *block_size, - uint32_t *nb_block) + uint64_t *nb_block) { struct scsi_task *task = NULL; struct scsi_inquiry_standard *inq = NULL; @@ -267,12 +267,12 @@ virISCSIDirectGetVolumeCapacity(struct iscsi_context *iscsi, } if (inq->device_type == SCSI_INQUIRY_PERIPHERAL_DEVICE_TYPE_DIRECT_ACCESS) { - struct scsi_readcapacity10 *rc10 = NULL; + struct scsi_readcapacity16 *rc16 = NULL; scsi_free_scsi_task(task); task = NULL; - if (!(task = iscsi_readcapacity10_sync(iscsi, lun, 0, 0)) || + if (!(task = iscsi_readcapacity16_sync(iscsi, lun)) || task->status != SCSI_STATUS_GOOD) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to get capacity of lun: %s"), @@ -280,15 +280,15 @@ virISCSIDirectGetVolumeCapacity(struct iscsi_context *iscsi, goto cleanup; } - if (!(rc10 = scsi_datain_unmarshall(task))) { + if (!(rc16 = scsi_datain_unmarshall(task))) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to unmarshall reply: %s"), iscsi_get_error(iscsi)); goto cleanup; } - *block_size = rc10->block_size; - *nb_block = rc10->lba; + *block_size = rc16->block_length; + *nb_block = rc16->returned_lba; } @@ -306,7 +306,7 @@ virISCSIDirectRefreshVol(virStoragePoolObjPtr pool, { virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); uint32_t block_size; - uint32_t nb_block; + uint64_t nb_block; VIR_AUTOPTR(virStorageVolDef) vol = NULL; if (virISCSIDirectTestUnitReady(iscsi, lun) < 0) @@ -627,9 +627,9 @@ static int virStorageBackendISCSIDirectVolWipeZero(virStorageVolDefPtr vol, struct iscsi_context *iscsi) { - uint32_t lba = 0; + uint64_t lba = 0; uint32_t block_size; - uint32_t nb_block; + uint64_t nb_block; struct scsi_task *task = NULL; int lun = 0; int ret = -1; @@ -647,14 +647,14 @@ virStorageBackendISCSIDirectVolWipeZero(virStorageVolDefPtr vol, while (lba < nb_block) { if (nb_block - lba > block_size * BLOCK_PER_PACKET) { - if (!(task = iscsi_write10_sync(iscsi, lun, lba, data, + if (!(task = iscsi_write16_sync(iscsi, lun, lba, data, block_size * BLOCK_PER_PACKET, block_size, 0, 0, 0, 0, 0))) return -1; scsi_free_scsi_task(task); lba += BLOCK_PER_PACKET; } else { - if (!(task = iscsi_write10_sync(iscsi, lun, lba, data, block_size, + if (!(task = iscsi_write16_sync(iscsi, lun, lba, data, block_size, block_size, 0, 0, 0, 0, 0))) return -1; scsi_free_scsi_task(task); -- 2.21.0

2 1

[libvirt] [PATCH] news: Trivial style fixes
by Andrea Bolognani 28 Feb '19

28 Feb '19

Some of the recent entries deviated from the established style used throughout the file, so let's fix them. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. docs/news.xml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/news.xml b/docs/news.xml index b86943ab47..4c4ca5f0b9 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -48,7 +48,7 @@ </change> <change> <summary> - network: support setting a firewalld "zone" for virtual network bridges + network: Support setting a firewalld "zone" for virtual network bridges </summary> <description> All libvirt virtual networks with bridges managed by libvirt @@ -61,7 +61,7 @@ </change> <change> <summary> - bhyve: support for ignoring unknown MSRs reads and writes + bhyve: Support for ignoring unknown MSRs reads and writes </summary> <description> A new <features> element <msrs unknown='ignore'/> was @@ -71,12 +71,12 @@ </change> <change> <summary> - QEMU: add support for encrypted VNC TLS keys + qemu: Add support for encrypted VNC TLS keys </summary> <description> Use the password stored in the secret driver under the uuid specified by the <code>vnc_tls_x509_secret_uuid</code> option - in QEMU.conf. + in qemu.conf. </description> </change> <change> @@ -90,7 +90,7 @@ </change> <change> <summary> - QEMU: Add support for setting post-copy migration bandwidth + qemu: Add support for setting post-copy migration bandwidth </summary> <description> Users can now limit the bandwidth of post-copy migration, e.g. @@ -134,7 +134,7 @@ </change> <change> <summary> - Allocate QEMU memory at the configured NUMA nodes from start + qemu: Allocate memory at the configured NUMA nodes from start </summary> <description> Libvirt used to just start QEMU, let it allocate memory for @@ -194,7 +194,7 @@ </change> <change> <summary> - network: fix virtual networks on systems using firewalld+nftables + network: Fix virtual networks on systems using firewalld+nftables </summary> <description> Because of the transitional state of firewalld's new support @@ -221,7 +221,7 @@ </change> <change> <summary> - QEMU: Fix i6300esb watchdog hotplug on Q35 + qemu: Fix i6300esb watchdog hotplug on Q35 </summary> <description> Ensure that libvirt allocates a PCI address for the device so @@ -252,7 +252,7 @@ </change> <change> <summary> - QEMU: Fix guestfwd hotplug/hotunplug + qemu: Fix guestfwd hotplug/hotunplug </summary> <description> Fixed the generation of the guestfwd hotplug/unplug command @@ -262,7 +262,7 @@ </change> <change> <summary> - QEMU: Forbid CDROMs on virtio bus + qemu: Forbid CDROMs on virtio bus </summary> <description> Attempting to create an empty virtio-blk drive or attempting @@ -272,7 +272,7 @@ </change> <change> <summary> - QEMU: Use 'raw' for 'volume' disks without format + qemu: Use 'raw' for 'volume' disks without format </summary> <description> Storage pools might want to specify format of the image when @@ -284,7 +284,7 @@ </change> <change> <summary> - QEMU: domain: Assume 'raw' default storage format also for network storage + qemu: Assume 'raw' default storage format also for network storage </summary> <description> Post parse callback adds the 'raw' type only for local files. @@ -294,7 +294,7 @@ </change> <change> <summary> - QEMU: Fix block job progress reporting and advocate for READY event + qemu: Fix block job progress reporting and advocate for READY event </summary> <description> In some cases QEMU can get to 100% and still not reach the @@ -306,7 +306,7 @@ </change> <change> <summary> - QEMU: Don't format image properties for empty drive + qemu: Don't format image properties for empty drive </summary> <description> If a <code>-drive</code> has no image, then formatting -- 2.20.1

2 1

[libvirt] [PATCH] virISCSIDirectRefreshVol: Don't clear volumes in each run
by Michal Privoznik 28 Feb '19

28 Feb '19

When fetching LUNs from iscsi server the virISCSIDirectReportLuns() is called. This function does some libiscsi calls and then calls virISCSIDirectRefreshVol() over each LUN found. It's unfortunate that the latter calls virStoragePoolObjClearVols() as we lose all LUNs processed in previous iterations. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/storage/storage_backend_iscsi_direct.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/storage/storage_backend_iscsi_direct.c b/src/storage/storage_backend_iscsi_direct.c index 20997d5c5d..32ceb592d9 100644 --- a/src/storage/storage_backend_iscsi_direct.c +++ b/src/storage/storage_backend_iscsi_direct.c @@ -309,7 +309,6 @@ virISCSIDirectRefreshVol(virStoragePoolObjPtr pool, uint32_t nb_block; VIR_AUTOPTR(virStorageVolDef) vol = NULL; - virStoragePoolObjClearVols(pool); if (virISCSIDirectTestUnitReady(iscsi, lun) < 0) return -1; @@ -376,6 +375,7 @@ virISCSIDirectReportLuns(virStoragePoolObjPtr pool, def->capacity = 0; def->allocation = 0; + virStoragePoolObjClearVols(pool); for (i = 0; i < list->num; i++) { if (virISCSIDirectRefreshVol(pool, iscsi, list->luns[i], portal) < 0) goto cleanup; -- 2.19.2

2 1

[libvirt] [PATCH] storage: Fix iscsi-direct volume size for volumes > 4GiB
by Jiri Denemark 28 Feb '19

28 Feb '19

Both block_size and nb_block are unit32_t. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/storage/storage_backend_iscsi_direct.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/storage/storage_backend_iscsi_direct.c b/src/storage/storage_backend_iscsi_direct.c index 20997d5c5d..78dc4bd100 100644 --- a/src/storage/storage_backend_iscsi_direct.c +++ b/src/storage/storage_backend_iscsi_direct.c @@ -321,8 +321,8 @@ virISCSIDirectRefreshVol(virStoragePoolObjPtr pool, if (virISCSIDirectGetVolumeCapacity(iscsi, lun, &block_size, &nb_block) < 0) return -1; - vol->target.capacity = block_size * nb_block; - vol->target.allocation = block_size * nb_block; + vol->target.capacity = (unsigned long long)block_size * nb_block; + vol->target.allocation = (unsigned long long)block_size * nb_block; def->capacity += vol->target.capacity; def->allocation += vol->target.allocation; -- 2.21.0

1 1

[libvirt] [PATCH v2 0/4] Get rid of VIR_AUTOPTR(virString)
by Peter Krempa 28 Feb '19

28 Feb '19

Peter Krempa (4): util: string: Introduce macro for automatic string lists util: string: Use VIR_AUTOSTRINGLIST instead of VIR_AUTOPTR(virString) util: string: Remove the 'virString' type util: alloc: Note that VIR_AUTOPTR/VIR_AUTOCLEAN must not be used with vectors src/libvirt_private.syms | 1 + src/lxc/lxc_process.c | 2 +- src/qemu/qemu_conf.c | 8 ++++---- src/storage/storage_backend_sheepdog.c | 4 ++-- src/storage/storage_backend_zfs.c | 10 +++++----- src/util/viralloc.h | 6 ++++++ src/util/vircommand.c | 2 +- src/util/virfirewall.c | 2 +- src/util/virprocess.c | 2 +- src/util/virstoragefile.c | 10 +++++----- src/util/virstring.c | 10 ++++++++++ src/util/virstring.h | 12 +++++++++--- src/xenconfig/xen_common.c | 14 +++++++------- 13 files changed, 53 insertions(+), 30 deletions(-) -- 2.20.1

4 15

[libvirt] [PATCH v4 00/20] Incremental Backup API additions
by Eric Blake 28 Feb '19

28 Feb '19

The following is the latest version of my API proposal for incremental backups, and follows along from the demo I presented as part of my KVM Forum 2018 talk: https://kvmforum2018.sched.com/event/FzuB/facilitating-incremental-backup-e… The patches are also available via https://repo.or.cz/libvirt/ericb.git at the tag backup-v4. Integration with external snapshots is still not included in these patches, although I have been playing more with that locally, and I still haven't gotten a working demonstration of a push-mode incremental backup. At this point, I'm posting mainly because there have been enough changes in qemu (the backup APIs are now stable! and in qemu.git in time for 4.0) and libvirt (several releases and code cleanups in between, such that the v3 no longer applies easily), while I continue to work locally on more features, addressing the review comments I got on v3, and remove the 'wip' tag on several of the later patches. Among other things, I still haven't determined how we want to integrate checkpoints with external snapshots; we could either have: virDomainSnapshotCreateXML("<domainsnapshot>...") # existing virDomainBackupBegin("<domainbackup>...", "<domaincheckpoint>...") # this series virDomainSnapshotCheckpointCreateXML("<domainsnapshot>...", "<domaincheckpoint>...") # new or to make checkpoint creation part of the snapshot and backup XML, as in: virDomainSnapshotCreateXML("<domainsnapshot><domaincheckpoint>...</domainsnapshot>") # extension of existing virDomainBackupBegin("<domainbackup><domaincheckpoint>...</domainbackup>") # tweak to this series I'm also planning to add an API to query which job ids are currently running (right now, the code only supports one job at a time, and always calls it job 1, but that is not future-friendly) and an update to the redefine XML command to make it easier to redefine multiple checkpoints in one API call. Since v3: 001/20:[----] [--] 'snapshots: Avoid term 'checkpoint' for full system snapshot' 002/20:[----] [--] 'domain_conf: Expose virDomainStorageNetworkParseHost' 003/20:[----] [--] 'qemu: Allow optional export name during NBD export' 004/20:[----] [--] 'backup: Document nuances between different state capture APIs' 005/20:[0032] [FC] 'backup: Introduce virDomainCheckpointPtr' 006/20:[----] [--] 'backup: Document new XML for backups' 007/20:[0013] [FC] 'backup: Introduce virDomainCheckpoint APIs' 008/20:[0017] [FC] 'backup: Introduce virDomainBackup APIs' 009/20:[----] [--] 'backup: Add new domain:checkpoint access control' 010/20:[0104] [FC] 'backup: Implement backup APIs for remote driver' 011/20:[0034] [FC] 'wip: backup: Parse and output checkpoint XML' 012/20:[0013] [FC] 'wip: backup: Parse and output backup XML' 013/20:[0006] [FC] 'backup: Implement virsh support for checkpoints' 014/20:[----] [--] 'wip: backup: virsh support for backup' 015/20:[0126] [FC] 'backup: Add new qemu monitor interactions' 016/20:[0072] [FC] 'backup: qemu: Implement metadata tracking for checkpoint APIs' 017/20:[0069] [FC] 'wip: backup: Wire up qemu checkpoint commands over QMP' 018/20:[0018] [FC] 'wip: backup: qemu: Implement framework for backup job APIs' 019/20:[0045] [FC] 'backup: Wire up qemu full pull backup commands over QMP' 020/20:[0051] [FC] 'backup: implement qemu incremental pull backup' Eric Blake (20): snapshots: Avoid term 'checkpoint' for full system snapshot domain_conf: Expose virDomainStorageNetworkParseHost qemu: Allow optional export name during NBD export backup: Document nuances between different state capture APIs backup: Introduce virDomainCheckpointPtr backup: Document new XML for backups backup: Introduce virDomainCheckpoint APIs backup: Introduce virDomainBackup APIs backup: Add new domain:checkpoint access control backup: Implement backup APIs for remote driver wip: backup: Parse and output checkpoint XML wip: backup: Parse and output backup XML backup: Implement virsh support for checkpoints wip: backup: virsh support for backup backup: Add new qemu monitor interactions backup: qemu: Implement metadata tracking for checkpoint APIs wip: backup: Wire up qemu checkpoint commands over QMP wip: backup: qemu: Implement framework for backup job APIs backup: Wire up qemu full pull backup commands over QMP backup: implement qemu incremental pull backup include/libvirt/virterror.h | 7 +- src/util/virerror.c | 12 +- include/libvirt/libvirt-domain-checkpoint.h | 176 ++ include/libvirt/libvirt-domain-snapshot.h | 2 +- include/libvirt/libvirt-domain.h | 17 +- include/libvirt/libvirt.h | 3 +- src/access/viraccessperm.h | 8 +- src/conf/checkpoint_conf.h | 215 +++ src/conf/domain_conf.h | 16 +- src/datatypes.h | 31 +- src/driver-hypervisor.h | 74 +- src/qemu/qemu_block.h | 3 + src/qemu/qemu_blockjob.h | 1 + src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_conf.h | 2 + src/qemu/qemu_domain.h | 29 +- src/qemu/qemu_monitor.h | 21 +- src/qemu/qemu_monitor_json.h | 19 +- tools/virsh-checkpoint.h | 29 + tools/virsh-completer.h | 4 + tools/virsh-util.h | 3 + tools/virsh.h | 1 + docs/Makefile.am | 3 + docs/apibuild.py | 2 + docs/docs.html.in | 9 +- docs/domainstatecapture.html.in | 314 ++++ docs/format.html.in | 1 + docs/formatcheckpoint.html.in | 291 +++ docs/formatsnapshot.html.in | 33 +- docs/index.html.in | 3 +- docs/schemas/domainbackup.rng | 185 ++ docs/schemas/domaincheckpoint.rng | 94 + examples/object-events/event-test.c | 3 + libvirt.spec.in | 3 + mingw-libvirt.spec.in | 6 + po/POTFILES | 3 + src/Makefile.am | 2 + src/access/viraccessperm.c | 5 +- src/conf/Makefile.inc.am | 2 + src/conf/checkpoint_conf.c | 1533 ++++++++++++++++ src/conf/domain_conf.c | 52 +- src/conf/snapshot_conf.c | 4 +- src/datatypes.c | 62 +- src/libvirt-domain-checkpoint.c | 925 ++++++++++ src/libvirt-domain-snapshot.c | 7 +- src/libvirt-domain.c | 8 +- src/libvirt_private.syms | 30 + src/libvirt_public.syms | 23 + src/qemu/qemu_block.c | 12 + src/qemu/qemu_capabilities.c | 4 + src/qemu/qemu_conf.c | 5 + src/qemu/qemu_domain.c | 217 ++- src/qemu/qemu_driver.c | 1552 +++++++++++++++- src/qemu/qemu_migration.c | 2 +- src/qemu/qemu_monitor.c | 65 +- src/qemu/qemu_monitor_json.c | 197 +- src/qemu/qemu_process.c | 7 + src/remote/remote_daemon_dispatch.c | 22 +- src/remote/remote_driver.c | 33 +- src/remote/remote_protocol.x | 238 ++- src/remote_protocol-structs | 129 ++ src/rpc/gendispatch.pl | 32 +- tests/Makefile.am | 15 +- tests/domainbackupxml2xmlin/backup-pull.xml | 9 + tests/domainbackupxml2xmlin/backup-push.xml | 9 + tests/domainbackupxml2xmlin/empty.xml | 1 + tests/domainbackupxml2xmlout/backup-pull.xml | 9 + tests/domainbackupxml2xmlout/backup-push.xml | 9 + tests/domainbackupxml2xmlout/empty.xml | 7 + tests/domaincheckpointxml2xmlin/empty.xml | 1 + tests/domaincheckpointxml2xmlin/sample.xml | 7 + tests/domaincheckpointxml2xmlout/empty.xml | 10 + tests/domaincheckpointxml2xmlout/sample.xml | 16 + tests/domaincheckpointxml2xmltest.c | 231 +++ .../caps_4.0.0.riscv32.xml | 2 + .../caps_4.0.0.riscv64.xml | 2 + tests/qemumonitorjsontest.c | 2 +- tests/virschematest.c | 4 + tools/Makefile.am | 3 +- tools/virsh-checkpoint.c | 1578 +++++++++++++++++ tools/virsh-completer.c | 52 +- tools/virsh-domain.c | 8 +- tools/virsh-snapshot.c | 2 +- tools/virsh-util.c | 11 + tools/virsh.c | 2 + tools/virsh.pod | 14 +- 86 files changed, 8674 insertions(+), 123 deletions(-) create mode 100644 include/libvirt/libvirt-domain-checkpoint.h create mode 100644 src/conf/checkpoint_conf.h create mode 100644 tools/virsh-checkpoint.h create mode 100644 docs/domainstatecapture.html.in create mode 100644 docs/formatcheckpoint.html.in create mode 100644 docs/schemas/domainbackup.rng create mode 100644 docs/schemas/domaincheckpoint.rng create mode 100644 src/conf/checkpoint_conf.c create mode 100644 src/libvirt-domain-checkpoint.c create mode 100644 tests/domainbackupxml2xmlin/backup-pull.xml create mode 100644 tests/domainbackupxml2xmlin/backup-push.xml create mode 100644 tests/domainbackupxml2xmlin/empty.xml create mode 100644 tests/domainbackupxml2xmlout/backup-pull.xml create mode 100644 tests/domainbackupxml2xmlout/backup-push.xml create mode 100644 tests/domainbackupxml2xmlout/empty.xml create mode 100644 tests/domaincheckpointxml2xmlin/empty.xml create mode 100644 tests/domaincheckpointxml2xmlin/sample.xml create mode 100644 tests/domaincheckpointxml2xmlout/empty.xml create mode 100644 tests/domaincheckpointxml2xmlout/sample.xml create mode 100644 tests/domaincheckpointxml2xmltest.c create mode 100644 tools/virsh-checkpoint.c -- 2.20.1

4 55

[libvirt] [PATCH for 5.1.0] news: Update for 5.1.0 release
by Michal Privoznik 28 Feb '19

28 Feb '19

Not exhaustive list of new features, improvements and bugfixes. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- docs/news.xml | 201 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index 9c5ae7e8a3..813f1a93e3 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -69,8 +69,104 @@ Model Specific Registers (MSRs) reads and writes. </description> </change> + <change> + <summary> + qemu: add support for encrypted VNC TLS keys + </summary> + <description> + Use the password stored in the secret driver under the uuid + specified by the vnc_tls_x509_secret_uuid option in qemu.conf. + </description> + </change> + <change> + <summary> + Add storage pool namespace options + </summary> + <description> + Allow for adjustment of RBD configuration options via Storage + Pool XML Namespace adjustments. + </description> + </change> + <change> + <summary> + qemu: Add support for setting post-copy migration bandwidth + </summary> + <description> + Users can now limit the bandwidth of post-copy migration, e.g. + via <code>virsh migrate --postcopy-bandwidth</code>. + </description> + </change> </section> <section title="Improvements"> + <change> + <summary> + Create private chains for virtual network firewall rules + </summary> + <description> + Historically firewall rules for virtual networks were added + straight into the base chains. This works but has a number of + bugs and design limitations. To address them, libvirt now puts + firewall rules into its own chains. + </description> + </change> + <change> + <summary> + Detect CEPH and GPFS as shared FS + </summary> + <description> + When starting a migration libvirt does some sanity checks to + make sure domain will be able to run on destination. One of + requirements is that disk has to either be migrated too or + live on network filesystem. CEPH and GPFS weren't detected as + a network filesystem. + </description> + </change> + <change> + <summary> + Advertise network MTU via DHCP when specified + </summary> + <description> + If network MTU is set and the network has DHCP enabled, + advertise the MTU in DHCP transaction too so that clients can + adjust their link accordingly. + </description> + </change> + <change> + <summary> + Allocate qemu memory at the configured NUMA nodes from start + </summary> + <description> + Libvirt used to just start qemu, let it allocate memory for + the guest and then use CGroups to move the memory to + configured NUMA nodes. This is suboptimal as huge chunks of + memory have to be moved. Moreover, this relies on ability to + move memory later which is not always true. Set process + affinity corretly from the start so that memory is allocated + on the configured nodes from the beginning. + </description> + </change> + <change> + <summary> + Support for newer wireshark + </summary> + <description> + Wireshark supports out of tree builds of dissectors since its + 2.5.0 release. Adapt libvirt to that. This affects minimal + required version then too. + </description> + </change> + <change> + <summary> + More use of VIR_AUTOFREE() and friends + </summary> + <description> + Usuaully, this would be viewed as an internal change that + should not concern users. However, since libvirt is written in + memory unsafe language some memory leaks might have been + actually fixed by using VIR_AUTOFREE(). It is definitely step + towards defensive programming. + </description> + </change> </section> <section title="Bug fixes"> <change> @@ -133,6 +229,111 @@ attribute of the network bridge element). </description> </change> + <change> + <summary> + Refresh block jobs on daemon restart + </summary> + <description> + In case the daemon is restarted it now fetches new state of + blockjobs. This means that libvirt does not lose track of + block jobs anymore. + </description> + </change> + <change> + <summary> + qemu: Fix i6300esb watchdog hotplug on Q35 + </summary> + <description> + Due to a bug libvirt was not allocating PCI address for + watchdog device nor it was telling it to qemu. This lead qemu + to chose one (the lowest one) which might not be hotpluggable. + </description> + </change> + <change> + <summary> + lxc: Don't reboot host on virDomainReboot + </summary> + <description> + If the container is really a simple one (init is just bash and + the whole root is passed through) then virDomainReboot and + virDomainShutdown would reboot or shutdown the host. The + solution is to use different method to reboot or shutdown the + container in that case (e.g. signal). + </description> + </change> + <change> + <summary> + rpc: Various stream fixes + </summary> + <description> + One particular race was fixed, one locking problem and error + reporting from streams was made better. + </description> + </change> + <change> + <summary> + qemu: Fix guestfwd hotplug/hotunplug + </summary> + <description> + Unaware to libvirt developers whether somebody actually uses + guestfwd, it's hotplug and hotunplug was fixed. Libvirt used + to use incorrect monitor command. + </description> + </change> + <change> + <summary> + qemu: Forbid cdroms on virtio bus + </summary> + <description> + Attempting to create an empty virtio-blk drive or attempting + to eject it results into an error. Forbid configurations + where users would attempt to use cdroms in virtio bus. + </description> + </change> + <change> + <summary> + qemu: Use 'raw' for 'volume' disks without format + </summary> + <description> + Storage pools might want to specify format of the image when + translating the volume thus libvirt can't add any default + format when parsing the XML. Add an explicit format when + starting the VM and format is not present neither by user + specifying it nor by the storage pool translation function. + </description> + </change> + <change> + <summary> + qemu: domain: Assume 'raw' default storage format also for network storage + </summary> + <description> + Post parse callback adds the 'raw' type only for local files. + Remote files can also have backing store (even local) so we + should do this also for network backed storage. + </description> + </change> + <change> + <summary> + qemu: Fix block job progress reporting and advocate for READY event + </summary> + <description> + In some cases qemu can get to 100% and still not reach the + synchronised phase. Initiating a pivot in that case will fail. + Therefore it is strongly adviced to wait for + VIR_DOMAIN_BLOCK_JOB_READY event which does not suffer from + this problem. + </description> + </change> + <change> + <summary> + qemu: Don't format image properties for empty -drive + </summary> + <description> + If a -drive has no image, using image properties makes qemu + whine that they should not be used. Stop formatting attributes + like cache/readonly/... in that case. + </description> + </change> </section> </release> <release version="v5.0.0" date="2019-01-15"> -- 2.19.2

4 5

[libvirt] [PATCH] iscsi_direct: Reset pool capacity and allocation just before refresh
by Michal Privoznik 28 Feb '19

28 Feb '19

Jirka reported a bug that with every 'virsh pool-refresh' an iscsi-direct pool would grow and grow. The problem is that virISCSIDirectRefreshVol() only adds to def->capacity and def->allocation but nothing clears it out to begin with. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/storage/storage_backend_iscsi_direct.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/storage/storage_backend_iscsi_direct.c b/src/storage/storage_backend_iscsi_direct.c index 4ac4ad471c..20997d5c5d 100644 --- a/src/storage/storage_backend_iscsi_direct.c +++ b/src/storage/storage_backend_iscsi_direct.c @@ -341,6 +341,7 @@ virISCSIDirectReportLuns(virStoragePoolObjPtr pool, struct iscsi_context *iscsi, char *portal) { + virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); struct scsi_task *task = NULL; struct scsi_reportluns_list *list = NULL; int full_size; @@ -373,6 +374,8 @@ virISCSIDirectReportLuns(virStoragePoolObjPtr pool, goto cleanup; } + def->capacity = 0; + def->allocation = 0; for (i = 0; i < list->num; i++) { if (virISCSIDirectRefreshVol(pool, iscsi, list->luns[i], portal) < 0) goto cleanup; -- 2.19.2

2 1