- Devel - libvirt List Archives

[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