- Devel - libvirt List Archives

[libvirt] [PATCH v3 0/4] qemu_process.c: GLib powered cleanup
by Daniel Henrique Barboza 17 Oct '19

17 Oct '19

changes from v2: - only use GLib macros - split the patches to separate the 'remove cleanup labels' patch from the most trivial stuff - added a new patch to change virAsprintf to g_stdup_printf v2: https://www.redhat.com/archives/libvir-list/2019-October/msg00929.html v1: https://www.redhat.com/archives/libvir-list/2019-September/msg01465.html Daniel Henrique Barboza (4): qemu_process.c: use g_autofree qemu_process.c: use g_autoptr() qemu_process.c: remove cleanup labels after g_auto*() changes qemu_process.c: use g_strdup_printf src/qemu/qemu_process.c | 449 +++++++++++++++------------------------- 1 file changed, 166 insertions(+), 283 deletions(-) -- 2.21.0

2 7

[libvirt] [PULL v2 00/19] Bitmaps patches
by John Snow 17 Oct '19

17 Oct '19

The following changes since commit c760cb77e511eb05094df67c1b30029a952efa35: Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20191011a' into staging (2019-10-14 16:09:52 +0100) are available in the Git repository at: https://github.com/jnsnow/qemu.git tags/bitmaps-pull-request for you to fetch changes up to b2ca29ee390743c42a6062d44ee3b10fb51f9fa6: dirty-bitmaps: remove deprecated autoload parameter (2019-10-14 15:28:17 -0400) ---------------------------------------------------------------- Pull request ---------------------------------------------------------------- John Snow (2): MAINTAINERS: Add Vladimir as a reviewer for bitmaps dirty-bitmaps: remove deprecated autoload parameter Vladimir Sementsov-Ogievskiy (17): util/hbitmap: strict hbitmap_reset block: move bdrv_can_store_new_dirty_bitmap to block/dirty-bitmap.c block/dirty-bitmap: return int from bdrv_remove_persistent_dirty_bitmap block/qcow2: proper locking on bitmap add/remove paths block/dirty-bitmap: drop meta block/dirty-bitmap: add bs link block/dirty-bitmap: drop BdrvDirtyBitmap.mutex block/dirty-bitmap: refactor bdrv_dirty_bitmap_next block: switch reopen queue from QSIMPLEQ to QTAILQ block: reverse order for reopen commits iotests: add test-case to 165 to test reopening qcow2 bitmaps to RW block/qcow2-bitmap: get rid of bdrv_has_changed_persistent_bitmaps block/qcow2-bitmap: drop qcow2_reopen_bitmaps_rw_hint() block/qcow2-bitmap: do not remove bitmaps on reopen-ro iotests: add test 260 to check bitmap life after snapshot + commit block/qcow2-bitmap: fix and improve qcow2_reopen_bitmaps_rw qcow2-bitmap: move bitmap reopen-rw code to qcow2_reopen_commit qemu-deprecated.texi | 20 ++- qapi/block-core.json | 6 +- block/qcow2.h | 19 +-- include/block/block.h | 2 +- include/block/block_int.h | 20 +-- include/block/dirty-bitmap.h | 34 ++-- include/qemu/hbitmap.h | 5 + block.c | 79 +++------ block/backup.c | 8 +- block/block-copy.c | 2 +- block/dirty-bitmap.c | 290 +++++++++++++++++++-------------- block/mirror.c | 4 +- block/qcow2-bitmap.c | 212 +++++++++++++++--------- block/qcow2.c | 22 ++- blockdev.c | 40 ++--- migration/block-dirty-bitmap.c | 11 +- migration/block.c | 4 +- tests/test-hbitmap.c | 2 +- util/hbitmap.c | 4 + MAINTAINERS | 3 +- tests/qemu-iotests/165 | 57 ++++++- tests/qemu-iotests/165.out | 4 +- tests/qemu-iotests/260 | 89 ++++++++++ tests/qemu-iotests/260.out | 52 ++++++ tests/qemu-iotests/group | 1 + 25 files changed, 623 insertions(+), 367 deletions(-) create mode 100755 tests/qemu-iotests/260 create mode 100644 tests/qemu-iotests/260.out -- 2.21.0

2 21

[libvirt] [PATCH] qemu: caps: Use unique key for domCaps caching
by Cole Robinson 17 Oct '19

17 Oct '19

When searching qemuCaps->domCapsCache for existing domCaps data, we check for a matching pair of arch+virttype+machine+emulator. However for the hash table key we only use the machine string. So if the cache already contains: x86_64 + kvm + pc + /usr/bin/qemu-kvm But a new VM is defined with x86_64 + qemu + pc + /usr/bin/qemu-kvm We correctly fail to find matching cached domCaps, but then attempt to use a colliding key with virHashAddEntry Fix this by building a hash key from the 4 values, not just machine Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- qemu_domain.c validation should be affected, but it is covered up by another bug, fixed here: https://www.redhat.com/archives/libvir-list/2019-October/msg00708.html src/qemu/qemu_conf.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 08cd784054..64ac8cbdd3 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1396,6 +1396,8 @@ virQEMUDriverGetDomainCapabilities(virQEMUDriverPtr driver, domCaps = virHashSearch(domCapsCache, virQEMUDriverSearchDomcaps, &data, NULL); if (!domCaps) { + VIR_AUTOFREE(char *) key = NULL; + /* hash miss, build new domcaps */ if (!(domCaps = virDomainCapsNew(data.path, data.machine, data.arch, data.virttype))) @@ -1406,7 +1408,14 @@ virQEMUDriverGetDomainCapabilities(virQEMUDriverPtr driver, cfg->firmwares, cfg->nfirmwares) < 0) return NULL; - if (virHashAddEntry(domCapsCache, machine, domCaps) < 0) + if (virAsprintf(&key, "%d:%d:%s:%s", + data.arch, + data.virttype, + NULLSTR(data.machine), + NULLSTR(data.path)) < 0) + return NULL; + + if (virHashAddEntry(domCapsCache, key, domCaps) < 0) return NULL; } -- 2.23.0

3 3

[libvirt] [Call for Presentations] FOSDEM 2020 Virtualization & IaaS Devroom
by Kashyap Chamarthy 17 Oct '19

17 Oct '19

The FOSDEM open source developer conference is taking place in Brussels, Belgium on February 1st & 2nd, 2020. The call for virtualization presentations has been posted[1]. Reposting the text here (formatted for readability): ----------------------------------------------------------------------- We are excited to announce that the call for proposals is now open for the Virtualization & IaaS devroom at the upcoming FOSDEM 2020, to be hosted on February 1st 2020. The year 2020 will mark FOSDEM’s 20th anniversary as one of the longest-running free and open source software developer events, attracting thousands of developers and users from all over the world. FOSDEM will be held once again in Brussels, Belgium, on February 1st & 2nd, 2020. This devroom is a collaborative effort, and is organized by dedicated folks from projects such as OpenStack, Xen Project, oVirt, QEMU, KVM, libvirt, Foreman, and virtualization-related projects. We would like to invite all those who are involved in these fields to submit your proposals by December 1st, 2019. Important Dates --------------- - Submission deadline: 1 December 2019 - Acceptance notifications: 10 December 2019 - Final schedule announcement: 15th December 2019 - Devroom is only on one day: 1st February 2020 About the Devroom ----------------- The Virtualization & IaaS devroom will feature session topics such as open source hypervisors and virtual machine managers such as Xen Project, KVM, QEMU, bhyve, and VirtualBox, and Infrastructure-as-a-Service projects such as KubeVirt, Apache CloudStack, OpenStack, oVirt, QEMU and OpenNebula. This devroom will host presentations that focus on topics of shared interest, such as KVM; QEMU; libvirt; shared storage; virtualized networking; cloud security; clustering and high availability; interfacing with multiple hypervisors; hyperconverged deployments; and scaling across hundreds or thousands of servers. Presentations in this devroom will be aimed at developers working on these platforms who are looking to collaborate and improve shared infrastructure or solve common problems. We seek topics that encourage dialog between projects and continued work post-FOSDEM. Submit Your Proposal -------------------- All submissions must be made via the Pentabarf event planning site[1]. If you have not used Pentabarf before, you will need to create an account. If you submitted proposals for FOSDEM in previous years, you can use your existing account. After creating the account, select Create Event to start the submission process. Make sure to select Virtualization and IaaS devroom from the Track list. Please fill out all the required fields, and provide a meaningful abstract and description of your proposed session. Submission Guidelines --------------------- We expect more proposals than we can possibly accept, so it is vitally important that you submit your proposal on or before the deadline. Late submissions are unlikely to be considered. All presentation slots are 30 minutes, with 20 minutes planned for presentations, and 10 minutes for Q&A. All presentations will be recorded and made available under Creative Commons licenses. In the Submission notes field, please indicate that you agree that your presentation will be licensed under the CC-By-SA-4.0 or CC-By-4.0 license and that you agree to have your presentation recorded. For example: "If my presentation is accepted for FOSDEM, I hereby agree to license all recordings, slides, and other associated materials under the Creative Commons Attribution Share-Alike 4.0 International License. Sincerely, <NAME>." In the Submission notes field, please also confirm that if your talk is accepted, you will be able to attend FOSDEM and deliver your presentation. We will not consider proposals from prospective speakers who are unsure whether they will be able to secure funds for travel and lodging to attend FOSDEM. (Sadly, we are not able to offer travel funding for prospective speakers.) Speaker Mentoring Program ------------------------- As a part of the rising efforts to grow our communities and encourage a diverse and inclusive conference ecosystem, we're happy to announce that we'll be offering mentoring for new speakers. Our mentors can help you with tasks such as reviewing your abstract, reviewing your presentation outline or slides, or practicing your talk with you. You may apply to the mentoring program as a newcomer speaker if you: Never presented before or Presented only lightning talks or Presented full-length talks at small meetups (<50 ppl) Mentored presentations will have 25-minute slots, where 20 minutes will include the presentation and 5 minutes will be reserved for questions. The number of newcomer session slots is limited, so we will probably not be able to accept all applications. You must submit your talk and abstract to apply for the mentoring program, our mentors are volunteering their time and will happily provide feedback but won't write your presentation for you! If you are experiencing problems with Pentabarf, the proposal submission interface, or have other questions, you can email our devroom mailing list[2] and we will try to help you. How to Apply ------------ In addition to agreeing to video recording and confirming that you can attend FOSDEM in case your session is accepted, please write "speaker mentoring program application" in the "Submission notes" field, and list any prior speaking experience or other relevant information for your application. Code of Conduct --------------- Following the release of the updated code of conduct for FOSDEM, we'd like to remind all speakers and attendees that all of the presentations and discussions in our devroom are held under the guidelines set in the CoC and we expect attendees, speakers, and volunteers to follow the CoC at all times. If you submit a proposal and it is accepted, you will be required to confirm that you accept the FOSDEM CoC. If you have any questions about the CoC or wish to have one of the devroom organizers review your presentation slides or any other content for CoC compliance, please email us and we will do our best to assist you. Call for Volunteers ------------------- We are also looking for volunteers to help run the devroom. We need assistance watching time for the speakers, and helping with video for the devroom. Please contact devroom mailing list [2] for more information. Questions? ---------- If you have any questions about this devroom, please send your questions to our devroom mailing list. You can also subscribe to the list to receive updates about important dates, session announcements, and to connect with other attendees. See you all at FOSDEM! ----------------------------------------------------------------------- [1] https://lists.fosdem.org/pipermail/fosdem/2019q4/002889.html -- /kashyap

1 0

[libvirt] [RFC] Accepting PRs/MRs for libvirt on GitHub/GitLab
by Andrea Bolognani 17 Oct '19

17 Oct '19

As we look to make the libvirt project easier to contribute to, one fact that certainly comes to mind is that we only accept patches via the mailing list. While the core developers are comfortable with the email-based workflow and swear by it, many perspective contributors are used to the PR/MR workflow common to many Open Source projects these days, and similarly swear by it. If we look at the PRs submitted on GitHub against the libvirt mirror repository[1], there's just three of them per year on average, which is arguably not a lot; however, it should be noted that each repository also carries a fairly loud "PULL REQUESTS ARE IGNORED" message right at the top, and it's not unlikely that a number of perspective contributors simply lost interest after seeing it. As a way to make contributions easier without forcing core developers to give up their current workflow or making the project dependent on a third-party provider, I suggest we adopt a hybrid approach. First of all, we'd remove the ominous message from GitHub mirror repositories (interestingly, the same is not present on GitLab). Then, we'd starting accepting PRs/MRs. The way we'd handle them is that, when one comes in, one among the handful of core developers who volunteered to do so would review the patches on the respective platform, working with the submitter to get it into shape just like they would do on the mailing list; once the series is finally ready to be merged, the core developer would update the PR/MR as necessary, for example picking up R-bs or fixing the kind of trivial issues that usually don't warrant a repost, and then push to master as usual. More in detail: GitHub and GitLab have a feature that allows project members to update PRs/MRs: basically the way it works is that, if the PR/MR was created by the user 'foo' from their branch 'bar', the libvirt developer is allowed to (force-)push to the foo/libvirt/bar branch, and doing so updates the corresponding PR/MR; after that, if the updated branch is locally merged into master and master is pushed to the libvirt.org repo, once it gets mirrored GitHub/GitLab will recognize that the commit IDs match and automatically mark the PR/MR as merged. I have tested this behavior on both platforms (minus the mirroring part) with Martin's help. One last important bit. In the spirit of not requiring core developers to alter their workflow, the developer who reviewed the patches on GitHub/GitLab will also be responsible to format them to the mailing list after merging them: this way, even those who don't have a GitHub/GitLab account will get a chance to take notice of the code changes and weigh in. Unlike what we're used to, this feedback will come after the fact, but assuming that issues are spotted only at that point we can either push the relevant fixes as follow-up commits or even revert the series outright, so I don't feel like it would be a massive problem overall. Thoughts? [1] https://github.com/libvirt/libvirt/pulls?q=is:pr+is:closed -- Andrea Bolognani / Red Hat / Virtualization

8 14

[libvirt] [PATCH 0/2] gitdm: Update configuration
by Andrea Bolognani 17 Oct '19

17 Oct '19

Andrea Bolognani (2): gitdm: Fix sorting gitdm: Add missing entries docs/gitdm/companies/others | 4 +++- docs/gitdm/groups/unaffiliated | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) -- 2.21.0

1 2

[libvirt] [PATCH v1] qemu_driver: improve comparison/baseline error reporting
by Collin Walling 17 Oct '19

17 Oct '19

Providing an erroneous CPU definition in the XML file provided to the hypervisor-cpu-compare/baseline command will result in a verbose internal error. Let's add some sanity checking before executing the QMP commands to provide a cleaner message if something is wrong with the CPU model or features. An internal error will still appear for other messages originating from QEMU e.g. if a newer feature is not available for an older CPU model. Signed-off-by: Collin Walling <walling(a)linux.ibm.com> --- src/qemu/qemu_driver.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2e422b5..a4f916b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -13645,6 +13645,52 @@ qemuConnectCompareCPU(virConnectPtr conn, } +static int +qemuConnectCheckCPUModel(qemuMonitorPtr mon, + virCPUDefPtr cpu) +{ + qemuMonitorCPUModelInfoPtr modelInfo = NULL; + qemuMonitorCPUModelExpansionType type; + size_t i, j; + int ret = -1; + + /* Collect CPU model name and features known by QEMU */ + type = QEMU_MONITOR_CPU_MODEL_EXPANSION_FULL; + if (qemuMonitorGetCPUModelExpansion(mon, type, cpu, true, + false, &modelInfo) < 0) + goto cleanup; + + /* Sanity check CPU model */ + if (!modelInfo) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Unknown CPU model: %s"), cpu->model); + goto cleanup; + } + + /* Sanity check CPU features */ + for (i = 0; i < cpu->nfeatures; i++) { + const char *feat = cpu->features[i].name; + + for (j = 0; j < modelInfo->nprops; j++) { + const char *prop = modelInfo->props[j].name; + if (STREQ(feat, prop)) + break; + } + + if (j == modelInfo->nprops) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Unknown CPU feature: %s"), feat); + goto cleanup; + } + } + ret = 0; + + cleanup: + qemuMonitorCPUModelInfoFree(modelInfo); + return ret; +} + + static virCPUCompareResult qemuConnectCPUModelComparison(virQEMUCapsPtr qemuCaps, const char *libDir, @@ -13665,6 +13711,11 @@ qemuConnectCPUModelComparison(virQEMUCapsPtr qemuCaps, if (qemuProcessQMPStart(proc) < 0) goto cleanup; + if (qemuConnectCheckCPUModel(proc->mon, cpu_a) < 0 || + qemuConnectCheckCPUModel(proc->mon, cpu_b) < 0) { + goto cleanup; + } + if (qemuMonitorGetCPUModelComparison(proc->mon, cpu_a, cpu_b, &result) < 0) goto cleanup; @@ -13863,6 +13914,9 @@ qemuConnectCPUModelBaseline(virQEMUCapsPtr qemuCaps, if (qemuProcessQMPStart(proc) < 0) goto cleanup; + if (qemuConnectCheckCPUModel(proc->mon, cpus[0]) < 0) + goto cleanup; + if (VIR_ALLOC(baseline) < 0) goto cleanup; @@ -13870,6 +13924,9 @@ qemuConnectCPUModelBaseline(virQEMUCapsPtr qemuCaps, goto cleanup; for (i = 1; i < ncpus; i++) { + if (qemuConnectCheckCPUModel(proc->mon, cpus[i]) < 0) + goto cleanup; + if (qemuMonitorGetCPUModelBaseline(proc->mon, baseline, cpus[i], &result) < 0) goto cleanup; -- 2.7.4

2 1

[libvirt] [PATCH v4 0/5] qemu_driver: GLib powered cleanup
by Daniel Henrique Barboza 17 Oct '19

17 Oct '19

changes from v3: - only use the new Glib macros in all patches - different patch split, as suggested by Jano in v3 review - patch 5 (new): g_strdup_printf conversion changes from v2: - rebased with newer master (67e72053c1) - added an extra patch to convert the existing VIR_AUTO* macros to g_auto* ones, all at once, to avoid the case where a method will have both VIR_AUTO* and g_auto* macros at the same time. changes from v1: - addressed review concerns made by Erik - added more cleanups, as suggested by Erik v3: https://www.redhat.com/archives/libvir-list/2019-October/msg00918.html v2: https://www.redhat.com/archives/libvir-list/2019-September/msg01452.html v1: https://www.redhat.com/archives/libvir-list/2019-September/msg00719.html Daniel Henrique Barboza (5): qemu_driver: use g_auto* in some functions qemu_driver: use g_autoptr() when possible qemu_driver: use g_autofree when possible qemu_driver: remove unused 'cleanup' labels after g_auto*() changes qemu_driver: use g_strdup_printf src/qemu/qemu_driver.c | 721 ++++++++++++++--------------------------- 1 file changed, 242 insertions(+), 479 deletions(-) -- 2.21.0

5 13

[libvirt] [PATCH 1/1] qemu_hotplug: use VIR_AUTOUNREF() with virConnectPtr
by Daniel Henrique Barboza 17 Oct '19

17 Oct '19

Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com> --- Checked other pointer types that can be autounref as well, just found these instances. src/qemu/qemu_hotplug.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index e9285f0964..4cab132901 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1154,7 +1154,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, bool charDevPlugged = false; bool netdevPlugged = false; VIR_AUTOFREE(char *) netdev_name = NULL; - virConnectPtr conn = NULL; + VIR_AUTOUNREF(virConnectPtr) conn = NULL; virErrorPtr save_err = NULL; /* preallocate new slot for device */ @@ -1497,7 +1497,6 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, } VIR_FREE(vhostfd); VIR_FREE(vhostfdName); - virObjectUnref(conn); virDomainCCWAddressSetFree(ccwaddrs); VIR_FORCE_CLOSE(slirpfd); @@ -3475,7 +3474,7 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, bool needVlanUpdate = false; int ret = -1; int changeidx = -1; - virConnectPtr conn = NULL; + VIR_AUTOUNREF(virConnectPtr) conn = NULL; virErrorPtr save_err = NULL; if ((changeidx = virDomainNetFindIdx(vm->def, newdev)) < 0) @@ -3919,7 +3918,6 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, */ if (newdev && newdev->type == VIR_DOMAIN_NET_TYPE_NETWORK && conn) virDomainNetReleaseActualDevice(conn, vm->def, newdev); - virObjectUnref(conn); virErrorRestore(&save_err); return ret; @@ -4535,13 +4533,11 @@ qemuDomainRemoveHostDevice(virQEMUDriverPtr driver, if (net) { if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK) { - virConnectPtr conn = virGetConnectNetwork(); - if (conn) { + VIR_AUTOUNREF(virConnectPtr) conn = virGetConnectNetwork(); + if (conn) virDomainNetReleaseActualDevice(conn, vm->def, net); - virObjectUnref(conn); - } else { + else VIR_WARN("Unable to release network device '%s'", NULLSTR(net->ifname)); - } } virDomainNetDefFree(net); } @@ -4641,13 +4637,11 @@ qemuDomainRemoveNetDevice(virQEMUDriverPtr driver, qemuDomainNetDeviceVportRemove(net); if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK) { - virConnectPtr conn = virGetConnectNetwork(); - if (conn) { + VIR_AUTOUNREF(virConnectPtr) conn = virGetConnectNetwork(); + if (conn) virDomainNetReleaseActualDevice(conn, vm->def, net); - virObjectUnref(conn); - } else { + else VIR_WARN("Unable to release network device '%s'", NULLSTR(net->ifname)); - } } virDomainNetDefFree(net); return 0; -- 2.21.0

1 1

[libvirt] [PATCH 00/30] storagefile, security: qcow2 data_file support
by Cole Robinson 17 Oct '19

17 Oct '19

This series is the first steps to teaching libvirt about qcow2 data_file support, aka external data files or qcow2 external metadata. A bit about the feature: it was added in qemu 4.0. It essentially creates a two part image file: a qcow2 layer that just tracks the image metadata, and a separate data file which is stores the VM disk contents. AFAICT the driving use case is to keep a fully coherent raw disk image on disk, and only use qcow2 as an intermediate metadata layer when necessary, for things like incremental backup support. The original qemu patch posting is here: https://lists.gnu.org/archive/html/qemu-devel/2019-02/msg07496.html For testing, you can create a new qcow2+raw data_file image from an existing image, like: qemu-img convert -O qcow2 \ -o data_file=NEW.raw,data_file_raw=yes EXISTING.raw NEW.qcow2 The goal of this series is to teach libvirt enough about this case so that we can correctly relabel the data_file on VM startup/shutdown. The main functional changes are * Teach storagefile how to parse out data_file from the qcow2 header * Store the raw string as virStorageSource->externalDataStoreRaw * Track that as its out virStorageSource in externalDataStore * dac/selinux relabel externalDataStore as needed >From libvirt's perspective, externalDataStore is conceptually pretty close to a backingStore, but the main difference is its read/write permissions should match its parent image, rather than being readonly like backingStore. This series has only been tested on top of the -blockdev enablement series, but I don't think it actually interacts with that work at the moment. Future work: * Exposing this in the runtime XML. We need to figure out an XML schema. It will reuse virStorageSource obviously, but the main thing to figure out is probably 1) what the top element name should be ('dataFile' maybe?), 2) where it sits in the XML hierarchy (under <disk> or under <source> I guess) * Exposing this on the qemu -blockdev command line. Similar to how in the blockdev world we are explicitly putting the disk backing chain on the command line, we can do that for data_file too. Then like persistent <backingStore> XML the user will have the power to overwrite the data_file location for an individual VM run. * Figure out how we expect ovirt/rhev to be using this at runtime. Possibly taking a running VM using a raw image, doing blockdev-* magic to pivot it to qcow2+raw data_file, so it can initiate incremental backup on top of a previously raw only VM? Known issues: * In the qemu driver, the qcow2 image metadata is only parsed in -blockdev world if no <backingStore> is specified in the persistent XML. So basically if there's a <backingStore> listed, we never parse the qcow2 header and detect the presence of data_file. Fixable I'm sure but I didn't look into it much yet. Most of this is cleanups and refactorings to simplify the actual functional changes. Cole Robinson (30): storagefile: Make GetMetadataInternal static storagefile: qcow1: Check for BACKING_STORE_OK storagefile: qcow1: Fix check for empty backing file storagefile: qcow1: Let qcowXGetBackingStore fill in format storagefile: Check version to determine if qcow2 or not storagefile: Drop now unused isQCow2 argument storagefile: Use qcowXGetBackingStore directly storagefile: Push 'start' into qcow2GetBackingStoreFormat storagefile: Push extension_end calc to qcow2GetBackingStoreFormat storagefile: Rename qcow2GetBackingStoreFormat storagefile: Rename qcow2GetExtensions 'format' argument storagefile: Fix backing format \0 check storagefile: Add externalDataStoreRaw member storagefile: Parse qcow2 external data file storagefile: Fill in meta->externalDataStoreRaw storagefile: Don't access backingStoreRaw directly in FromBackingRelative storagefile: Split out virStorageSourceNewFromChild storagefile: Add externalDataStore member storagefile: Fill in meta->externalDataStore security: dac: Drop !parent handling in SetImageLabelInternal security: dac: Add is_toplevel to SetImageLabelInternal security: dac: Restore image label for externalDataStore security: dac: break out SetImageLabelRelative security: dac: Label externalDataStore security: selinux: Simplify SetImageLabelInternal security: selinux: Drop !parent handling in SetImageLabelInternal security: selinux: Add is_toplevel to SetImageLabelInternal security: selinux: Restore image label for externalDataStore security: selinux: break out SetImageLabelRelative security: selinux: Label externalDataStore src/libvirt_private.syms | 1 - src/security/security_dac.c | 63 +++++-- src/security/security_selinux.c | 97 +++++++---- src/util/virstoragefile.c | 281 ++++++++++++++++++++------------ src/util/virstoragefile.h | 11 +- 5 files changed, 290 insertions(+), 163 deletions(-) -- 2.23.0

7 89

[libvirt] [PATCH 0/2] Fix build with musl libc
by casantos＠redhat.com 17 Oct '19

17 Oct '19

From: Carlos Santos <casantos(a)redhat.com> - Do not use 'stderr' as a field name, since it's a preprocessor macro in stdio.h. - Include paths.h for _PATH_MOUNTED, if it's not defined in mntent.h. Found while porting libvirt to Buildroot (https://buildroot.org/) Carlos Santos (2): qemu: fix build with musl libc storage: fix build with musl libc src/qemu/qemu_process.c | 8 ++++---- src/qemu/qemu_process.h | 2 +- src/storage/storage_backend_fs.c | 3 +++ src/storage/storage_backend_vstorage.c | 3 +++ 4 files changed, 11 insertions(+), 5 deletions(-) -- 2.18.1

4 8

[libvirt] [PATCH 0/3] docs: hacking: document removed macro replacements (glib chronicles)
by Ján Tomko 17 Oct '19

17 Oct '19

Make the GLib section more readable. Ján Tomko (3): docs: hacking: separate section about already deleted macros docs: hacking: use <code> for functions/names docs: hacking: add a conversion table for removed libvirt macros docs/hacking.html.in | 71 +++++++++++++++++++++++++++++--------------- 1 file changed, 47 insertions(+), 24 deletions(-) -- 2.21.0

2 4

[libvirt] [PATCH] Drop needless @ret variable
by Michal Privoznik 17 Oct '19

17 Oct '19

In few places we have the following code pattern: int ret; ... /* @ret is not accessed here */ ret = f(...); return ret; This pattern can be written less verbose: ... return f(...); This patch was generated with following coccinelle spatch: @@ type T; constant C; expression f; identifier ret; @@ -T ret = C; ... when != ret -ret = f; -return ret; +return f; Afterwards I needed to fix a few places, e.g. comment in virDomainNetIPParseXML() was removed too because coccinelle thinks it refers to @ret while in fact it doesn't. Also in few places it replaced @ret declaration with a few spaces instead of removing the line. But nothing terribly wrong. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/bhyve/bhyve_driver.c | 38 +++++++++--------------- src/conf/checkpoint_conf.c | 5 +--- src/conf/domain_conf.c | 4 +-- src/conf/snapshot_conf.c | 5 +--- src/conf/storage_conf.c | 9 ++---- src/conf/virnwfilterbindingobj.c | 5 +--- src/libvirt-stream.c | 7 ++--- src/libxl/libxl_driver.c | 36 ++++++++--------------- src/lxc/lxc_driver.c | 36 ++++++++--------------- src/lxc/lxc_native.c | 5 +--- src/network/bridge_driver.c | 38 +++++++----------------- src/nwfilter/nwfilter_driver.c | 10 ++----- src/phyp/phyp_driver.c | 5 +--- src/qemu/qemu_command.c | 14 ++++----- src/qemu/qemu_driver.c | 14 +++------ src/qemu/qemu_process.c | 16 ++++------ src/remote/remote_daemon_dispatch.c | 5 +--- src/storage/storage_backend_iscsi.c | 5 +--- src/test/test_driver.c | 28 +++++------------- src/util/vircgroupv1.c | 6 +--- src/util/vircgroupv2.c | 6 +--- src/util/virdbus.c | 5 +--- src/vbox/vbox_storage.c | 18 ++++-------- src/vz/vz_driver.c | 45 ++++++++++------------------- tools/virsh-completer-domain.c | 4 +-- tools/virsh-completer-nodedev.c | 4 +-- tools/virsh-completer-pool.c | 4 +-- tools/virsh-completer-secret.c | 4 +-- tools/virsh-network.c | 5 +--- tools/vsh.c | 5 +--- 30 files changed, 115 insertions(+), 276 deletions(-) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 52e1895052..2e4f03d841 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -630,30 +630,24 @@ static int bhyveConnectListDomains(virConnectPtr conn, int *ids, int maxids) { bhyveConnPtr privconn = conn->privateData; - int n; if (virConnectListDomainsEnsureACL(conn) < 0) return -1; - n = virDomainObjListGetActiveIDs(privconn->domains, ids, maxids, - virConnectListDomainsCheckACL, conn); - - return n; + return virDomainObjListGetActiveIDs(privconn->domains, ids, maxids, + virConnectListDomainsCheckACL, conn); } static int bhyveConnectNumOfDomains(virConnectPtr conn) { bhyveConnPtr privconn = conn->privateData; - int count; if (virConnectNumOfDomainsEnsureACL(conn) < 0) return -1; - count = virDomainObjListNumOfDomains(privconn->domains, true, - virConnectNumOfDomainsCheckACL, conn); - - return count; + return virDomainObjListNumOfDomains(privconn->domains, true, + virConnectNumOfDomainsCheckACL, conn); } static int @@ -661,31 +655,28 @@ bhyveConnectListDefinedDomains(virConnectPtr conn, char **const names, int maxnames) { bhyveConnPtr privconn = conn->privateData; - int n; if (virConnectListDefinedDomainsEnsureACL(conn) < 0) return -1; memset(names, 0, sizeof(*names) * maxnames); - n = virDomainObjListGetInactiveNames(privconn->domains, names, - maxnames, virConnectListDefinedDomainsCheckACL, conn); - - return n; + return virDomainObjListGetInactiveNames(privconn->domains, names, + maxnames, + virConnectListDefinedDomainsCheckACL, + conn); } static int bhyveConnectNumOfDefinedDomains(virConnectPtr conn) { bhyveConnPtr privconn = conn->privateData; - int count; if (virConnectNumOfDefinedDomainsEnsureACL(conn) < 0) return -1; - count = virDomainObjListNumOfDomains(privconn->domains, false, - virConnectNumOfDefinedDomainsCheckACL, conn); - - return count; + return virDomainObjListNumOfDomains(privconn->domains, false, + virConnectNumOfDefinedDomainsCheckACL, + conn); } static char * @@ -771,17 +762,14 @@ bhyveConnectListAllDomains(virConnectPtr conn, unsigned int flags) { bhyveConnPtr privconn = conn->privateData; - int ret = -1; virCheckFlags(VIR_CONNECT_LIST_DOMAINS_FILTERS_ALL, -1); if (virConnectListAllDomainsEnsureACL(conn) < 0) return -1; - ret = virDomainObjListExport(privconn->domains, conn, domains, - virConnectListAllDomainsCheckACL, flags); - - return ret; + return virDomainObjListExport(privconn->domains, conn, domains, + virConnectListAllDomainsCheckACL, flags); } static virDomainPtr diff --git a/src/conf/checkpoint_conf.c b/src/conf/checkpoint_conf.c index b254dce7fd..586528a974 100644 --- a/src/conf/checkpoint_conf.c +++ b/src/conf/checkpoint_conf.c @@ -73,13 +73,10 @@ virDomainCheckpointDiskDefClear(virDomainCheckpointDiskDefPtr disk) virDomainCheckpointDefPtr virDomainCheckpointDefNew(void) { - virDomainCheckpointDefPtr def; - if (virDomainCheckpointInitialize() < 0) return NULL; - def = virObjectNew(virDomainCheckpointDefClass); - return def; + return virObjectNew(virDomainCheckpointDefClass); } static void diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 2e6a113de3..d1c2ad5484 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8306,7 +8306,6 @@ static virNetDevIPAddrPtr virDomainNetIPParseXML(xmlNodePtr node) { /* Parse the prefix in every case */ - virNetDevIPAddrPtr ret = NULL; unsigned int prefixValue = 0; int family = AF_UNSPEC; g_autofree virNetDevIPAddrPtr ip = NULL; @@ -8358,8 +8357,7 @@ virDomainNetIPParseXML(xmlNodePtr node) return NULL; } - ret = g_steal_pointer(&ip); - return ret; + return g_steal_pointer(&ip); } diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index 0e9d307321..1992cc1b08 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -113,13 +113,10 @@ virDomainSnapshotDiskDefFree(virDomainSnapshotDiskDefPtr disk) virDomainSnapshotDefPtr virDomainSnapshotDefNew(void) { - virDomainSnapshotDefPtr def; - if (virDomainSnapshotInitialize() < 0) return NULL; - def = virObjectNew(virDomainSnapshotDefClass); - return def; + return virObjectNew(virDomainSnapshotDefClass); } static void diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 9e4978b560..c115729ec7 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1692,14 +1692,11 @@ virStoragePoolSaveXML(const char *path, const char *xml) { char uuidstr[VIR_UUID_STRING_BUFLEN]; - int ret = -1; virUUIDFormat(def->uuid, uuidstr); - ret = virXMLSaveFile(path, - virXMLPickShellSafeComment(def->name, uuidstr), - "pool-edit", xml); - - return ret; + return virXMLSaveFile(path, + virXMLPickShellSafeComment(def->name, uuidstr), + "pool-edit", xml); } diff --git a/src/conf/virnwfilterbindingobj.c b/src/conf/virnwfilterbindingobj.c index 48d53fafb1..24aafa99c3 100644 --- a/src/conf/virnwfilterbindingobj.c +++ b/src/conf/virnwfilterbindingobj.c @@ -91,10 +91,7 @@ virNWFilterBindingObjSetDef(virNWFilterBindingObjPtr obj, virNWFilterBindingDefPtr virNWFilterBindingObjStealDef(virNWFilterBindingObjPtr obj) { - virNWFilterBindingDefPtr def; - - def = g_steal_pointer(&obj->def); - return def; + return g_steal_pointer(&obj->def); } diff --git a/src/libvirt-stream.c b/src/libvirt-stream.c index fb646d0aef..6f6bb5df0b 100644 --- a/src/libvirt-stream.c +++ b/src/libvirt-stream.c @@ -520,11 +520,8 @@ virStreamInData(virStreamPtr stream, virCheckNonNullArgReturn(data, -1); virCheckNonNullArgReturn(length, -1); - if (stream->driver->streamInData) { - int ret; - ret = (stream->driver->streamInData)(stream, data, length); - return ret; - } + if (stream->driver->streamInData) + return (stream->driver->streamInData)(stream, data, length); virReportUnsupportedError(); return -1; diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 64b21f2073..a1c752c25b 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -1009,30 +1009,24 @@ static int libxlConnectListDomains(virConnectPtr conn, int *ids, int nids) { libxlDriverPrivatePtr driver = conn->privateData; - int n; if (virConnectListDomainsEnsureACL(conn) < 0) return -1; - n = virDomainObjListGetActiveIDs(driver->domains, ids, nids, - virConnectListDomainsCheckACL, conn); - - return n; + return virDomainObjListGetActiveIDs(driver->domains, ids, nids, + virConnectListDomainsCheckACL, conn); } static int libxlConnectNumOfDomains(virConnectPtr conn) { libxlDriverPrivatePtr driver = conn->privateData; - int n; if (virConnectNumOfDomainsEnsureACL(conn) < 0) return -1; - n = virDomainObjListNumOfDomains(driver->domains, true, - virConnectNumOfDomainsCheckACL, conn); - - return n; + return virDomainObjListNumOfDomains(driver->domains, true, + virConnectNumOfDomainsCheckACL, conn); } static virDomainPtr @@ -2777,29 +2771,26 @@ libxlConnectListDefinedDomains(virConnectPtr conn, char **const names, int nnames) { libxlDriverPrivatePtr driver = conn->privateData; - int n; if (virConnectListDefinedDomainsEnsureACL(conn) < 0) return -1; - n = virDomainObjListGetInactiveNames(driver->domains, names, nnames, - virConnectListDefinedDomainsCheckACL, conn); - return n; + return virDomainObjListGetInactiveNames(driver->domains, names, nnames, + virConnectListDefinedDomainsCheckACL, + conn); } static int libxlConnectNumOfDefinedDomains(virConnectPtr conn) { libxlDriverPrivatePtr driver = conn->privateData; - int n; if (virConnectNumOfDefinedDomainsEnsureACL(conn) < 0) return -1; - n = virDomainObjListNumOfDomains(driver->domains, false, - virConnectNumOfDefinedDomainsCheckACL, - conn); - return n; + return virDomainObjListNumOfDomains(driver->domains, false, + virConnectNumOfDefinedDomainsCheckACL, + conn); } static int @@ -5717,17 +5708,14 @@ libxlConnectListAllDomains(virConnectPtr conn, unsigned int flags) { libxlDriverPrivatePtr driver = conn->privateData; - int ret = -1; virCheckFlags(VIR_CONNECT_LIST_DOMAINS_FILTERS_ALL, -1); if (virConnectListAllDomainsEnsureACL(conn) < 0) return -1; - ret = virDomainObjListExport(driver->domains, conn, domains, - virConnectListAllDomainsCheckACL, flags); - - return ret; + return virDomainObjListExport(driver->domains, conn, domains, + virConnectListAllDomainsCheckACL, flags); } /* Which features are supported by this driver? */ diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 204a3ed522..4edbe6e299 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -347,59 +347,49 @@ static int lxcDomainIsUpdated(virDomainPtr dom) static int lxcConnectListDomains(virConnectPtr conn, int *ids, int nids) { virLXCDriverPtr driver = conn->privateData; - int n; if (virConnectListDomainsEnsureACL(conn) < 0) return -1; - n = virDomainObjListGetActiveIDs(driver->domains, ids, nids, - virConnectListDomainsCheckACL, conn); - - return n; + return virDomainObjListGetActiveIDs(driver->domains, ids, nids, + virConnectListDomainsCheckACL, conn); } static int lxcConnectNumOfDomains(virConnectPtr conn) { virLXCDriverPtr driver = conn->privateData; - int n; if (virConnectNumOfDomainsEnsureACL(conn) < 0) return -1; - n = virDomainObjListNumOfDomains(driver->domains, true, - virConnectNumOfDomainsCheckACL, conn); - - return n; + return virDomainObjListNumOfDomains(driver->domains, true, + virConnectNumOfDomainsCheckACL, conn); } static int lxcConnectListDefinedDomains(virConnectPtr conn, char **const names, int nnames) { virLXCDriverPtr driver = conn->privateData; - int n; if (virConnectListDefinedDomainsEnsureACL(conn) < 0) return -1; - n = virDomainObjListGetInactiveNames(driver->domains, names, nnames, - virConnectListDefinedDomainsCheckACL, conn); - - return n; + return virDomainObjListGetInactiveNames(driver->domains, names, nnames, + virConnectListDefinedDomainsCheckACL, + conn); } static int lxcConnectNumOfDefinedDomains(virConnectPtr conn) { virLXCDriverPtr driver = conn->privateData; - int n; if (virConnectNumOfDefinedDomainsEnsureACL(conn) < 0) return -1; - n = virDomainObjListNumOfDomains(driver->domains, false, - virConnectNumOfDefinedDomainsCheckACL, conn); - - return n; + return virDomainObjListNumOfDomains(driver->domains, false, + virConnectNumOfDefinedDomainsCheckACL, + conn); } @@ -3254,16 +3244,14 @@ lxcConnectListAllDomains(virConnectPtr conn, unsigned int flags) { virLXCDriverPtr driver = conn->privateData; - int ret = -1; virCheckFlags(VIR_CONNECT_LIST_DOMAINS_FILTERS_ALL, -1); if (virConnectListAllDomainsEnsureACL(conn) < 0) return -1; - ret = virDomainObjListExport(driver->domains, conn, domains, - virConnectListAllDomainsCheckACL, flags); - return ret; + return virDomainObjListExport(driver->domains, conn, domains, + virConnectListAllDomainsCheckACL, flags); } diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index 8ae3c7b006..3ac5e34ee1 100644 --- a/src/lxc/lxc_native.c +++ b/src/lxc/lxc_native.c @@ -718,7 +718,6 @@ static int lxcConvertNetworkSettings(virDomainDefPtr def, virConfPtr properties) { int status; - int result = -1; size_t i; lxcNetworkParseData data = {def, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, @@ -742,9 +741,7 @@ lxcConvertNetworkSettings(virDomainDefPtr def, virConfPtr properties) /* When no network type is provided LXC only adds loopback */ def->features[VIR_DOMAIN_FEATURE_PRIVNET] = VIR_TRISTATE_SWITCH_ON; } - result = 0; - - return result; + return 0; error: for (i = 0; i < data.nips; i++) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 6862818698..e6881965c1 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -3136,17 +3136,13 @@ static int networkConnectNumOfNetworks(virConnectPtr conn) { virNetworkDriverStatePtr driver = networkGetDriver(); - int nactive; if (virConnectNumOfNetworksEnsureACL(conn) < 0) return -1; - nactive = virNetworkObjListNumOfNetworks(driver->networks, - true, - virConnectNumOfNetworksCheckACL, - conn); - - return nactive; + return virNetworkObjListNumOfNetworks(driver->networks, true, + virConnectNumOfNetworksCheckACL, + conn); } @@ -3156,17 +3152,12 @@ networkConnectListNetworks(virConnectPtr conn, int maxnames) { virNetworkDriverStatePtr driver = networkGetDriver(); - int got = 0; if (virConnectListNetworksEnsureACL(conn) < 0) return -1; - got = virNetworkObjListGetNames(driver->networks, - true, names, maxnames, - virConnectListNetworksCheckACL, - conn); - - return got; + return virNetworkObjListGetNames(driver->networks, true, names, maxnames, + virConnectListNetworksCheckACL, conn); } @@ -3174,17 +3165,13 @@ static int networkConnectNumOfDefinedNetworks(virConnectPtr conn) { virNetworkDriverStatePtr driver = networkGetDriver(); - int ninactive = 0; if (virConnectNumOfDefinedNetworksEnsureACL(conn) < 0) return -1; - ninactive = virNetworkObjListNumOfNetworks(driver->networks, - false, - virConnectNumOfDefinedNetworksCheckACL, - conn); - - return ninactive; + return virNetworkObjListNumOfNetworks(driver->networks, false, + virConnectNumOfDefinedNetworksCheckACL, + conn); } @@ -3194,16 +3181,13 @@ networkConnectListDefinedNetworks(virConnectPtr conn, int maxnames) { virNetworkDriverStatePtr driver = networkGetDriver(); - int got = 0; if (virConnectListDefinedNetworksEnsureACL(conn) < 0) return -1; - got = virNetworkObjListGetNames(driver->networks, - false, names, maxnames, - virConnectListDefinedNetworksCheckACL, - conn); - return got; + return virNetworkObjListGetNames(driver->networks, false, names, maxnames, + virConnectListDefinedNetworksCheckACL, + conn); } diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index fbdf250934..2e906555b9 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -707,19 +707,13 @@ nwfilterConnectListAllNWFilterBindings(virConnectPtr conn, virNWFilterBindingPtr **bindings, unsigned int flags) { - int ret; - virCheckFlags(0, -1); if (virConnectListAllNWFilterBindingsEnsureACL(conn) < 0) return -1; - ret = virNWFilterBindingObjListExport(driver->bindings, - conn, - bindings, - virConnectListAllNWFilterBindingsCheckACL); - - return ret; + return virNWFilterBindingObjListExport(driver->bindings, conn, bindings, + virConnectListAllNWFilterBindingsCheckACL); } diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index 4527adc670..67193d6359 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -3174,7 +3174,6 @@ phypDomainLookupByName(virConnectPtr conn, const char *lpar_name) { phyp_driverPtr phyp_driver = conn->privateData; LIBSSH2_SESSION *session = phyp_driver->session; - virDomainPtr dom = NULL; int lpar_id = 0; char *managed_system = phyp_driver->managed_system; unsigned char lpar_uuid[VIR_UUID_BUFLEN]; @@ -3186,9 +3185,7 @@ phypDomainLookupByName(virConnectPtr conn, const char *lpar_name) if (phypGetLparUUID(lpar_uuid, lpar_id, conn) == -1) return NULL; - dom = virGetDomain(conn, lpar_name, lpar_uuid, lpar_id); - - return dom; + return virGetDomain(conn, lpar_name, lpar_uuid, lpar_id); } static virDomainPtr diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index e98195b1d7..6886a07154 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -697,20 +697,16 @@ int qemuBuildSecretInfoProps(qemuDomainSecretInfoPtr secinfo, virJSONValuePtr *propsret) { - int ret = -1; g_autofree char *keyid = NULL; if (!(keyid = qemuDomainGetMasterKeyAlias())) return -1; - ret = qemuMonitorCreateObjectProps(propsret, - "secret", secinfo->s.aes.alias, - "s:data", secinfo->s.aes.ciphertext, - "s:keyid", keyid, - "s:iv", secinfo->s.aes.iv, - "s:format", "base64", NULL); - - return ret; + return qemuMonitorCreateObjectProps(propsret, "secret", + secinfo->s.aes.alias, "s:data", + secinfo->s.aes.ciphertext, "s:keyid", + keyid, "s:iv", secinfo->s.aes.iv, + "s:format", "base64", NULL); } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index cafd5c0fc7..f93f987833 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1761,29 +1761,23 @@ static char *qemuConnectGetHostname(virConnectPtr conn) static int qemuConnectListDomains(virConnectPtr conn, int *ids, int nids) { virQEMUDriverPtr driver = conn->privateData; - int n; if (virConnectListDomainsEnsureACL(conn) < 0) return -1; - n = virDomainObjListGetActiveIDs(driver->domains, ids, nids, - virConnectListDomainsCheckACL, conn); - - return n; + return virDomainObjListGetActiveIDs(driver->domains, ids, nids, + virConnectListDomainsCheckACL, conn); } static int qemuConnectNumOfDomains(virConnectPtr conn) { virQEMUDriverPtr driver = conn->privateData; - int n; if (virConnectNumOfDomainsEnsureACL(conn) < 0) return -1; - n = virDomainObjListNumOfDomains(driver->domains, true, - virConnectNumOfDomainsCheckACL, conn); - - return n; + return virDomainObjListNumOfDomains(driver->domains, true, + virConnectNumOfDomainsCheckACL, conn); } diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index aaca2fc7d6..b10fdc0379 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7316,8 +7316,6 @@ qemuProcessCreatePretendCmd(virQEMUDriverPtr driver, int qemuProcessKill(virDomainObjPtr vm, unsigned int flags) { - int ret; - VIR_DEBUG("vm=%p name=%s pid=%lld flags=0x%x", vm, vm->def->name, (long long)vm->pid, flags); @@ -7338,11 +7336,9 @@ qemuProcessKill(virDomainObjPtr vm, unsigned int flags) /* Request an extra delay of two seconds per current nhostdevs * to be safe against stalls by the kernel freeing up the resources */ - ret = virProcessKillPainfullyDelay(vm->pid, - !!(flags & VIR_QEMU_PROCESS_KILL_FORCE), - vm->def->nhostdevs * 2); - - return ret; + return virProcessKillPainfullyDelay(vm->pid, + !!(flags & VIR_QEMU_PROCESS_KILL_FORCE), + vm->def->nhostdevs * 2); } @@ -7764,11 +7760,9 @@ int qemuProcessAutoDestroyAdd(virQEMUDriverPtr driver, int qemuProcessAutoDestroyRemove(virQEMUDriverPtr driver, virDomainObjPtr vm) { - int ret; VIR_DEBUG("vm=%s", vm->def->name); - ret = virCloseCallbacksUnset(driver->closeCallbacks, vm, - qemuProcessAutoDestroy); - return ret; + return virCloseCallbacksUnset(driver->closeCallbacks, vm, + qemuProcessAutoDestroy); } bool qemuProcessAutoDestroyActive(virQEMUDriverPtr driver, diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon_dispatch.c index 56a46a13be..18b2e16a8f 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -7512,10 +7512,7 @@ get_nonnull_storage_pool(virConnectPtr conn, remote_nonnull_storage_pool pool) static virStorageVolPtr get_nonnull_storage_vol(virConnectPtr conn, remote_nonnull_storage_vol vol) { - virStorageVolPtr ret; - ret = virGetStorageVol(conn, vol.pool, vol.name, vol.key, - NULL, NULL); - return ret; + return virGetStorageVol(conn, vol.pool, vol.name, vol.key, NULL, NULL); } static virSecretPtr diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c index b11d1d6622..c754b5958c 100644 --- a/src/storage/storage_backend_iscsi.c +++ b/src/storage/storage_backend_iscsi.c @@ -227,7 +227,6 @@ virStorageBackendISCSICheckPool(virStoragePoolObjPtr pool, bool *isActive) { virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); - int ret = -1; g_autofree char *session = NULL; *isActive = false; @@ -253,9 +252,7 @@ virStorageBackendISCSICheckPool(virStoragePoolObjPtr pool, if ((session = virStorageBackendISCSISession(pool, true))) *isActive = true; - ret = 0; - - return ret; + return 0; } diff --git a/src/test/test_driver.c b/src/test/test_driver.c index ab7e5fc02a..f81af5d629 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -5270,11 +5270,8 @@ static int testConnectNumOfNetworks(virConnectPtr conn) { testDriverPtr privconn = conn->privateData; - int numActive; - - numActive = virNetworkObjListNumOfNetworks(privconn->networks, - true, NULL, conn); - return numActive; + return virNetworkObjListNumOfNetworks(privconn->networks, true, NULL, + conn); } @@ -5284,11 +5281,8 @@ testConnectListNetworks(virConnectPtr conn, int maxnames) { testDriverPtr privconn = conn->privateData; - int n; - - n = virNetworkObjListGetNames(privconn->networks, - true, names, maxnames, NULL, conn); - return n; + return virNetworkObjListGetNames(privconn->networks, true, names, + maxnames, NULL, conn); } @@ -5296,11 +5290,8 @@ static int testConnectNumOfDefinedNetworks(virConnectPtr conn) { testDriverPtr privconn = conn->privateData; - int numInactive; - - numInactive = virNetworkObjListNumOfNetworks(privconn->networks, - false, NULL, conn); - return numInactive; + return virNetworkObjListNumOfNetworks(privconn->networks, false, NULL, + conn); } @@ -5310,11 +5301,8 @@ testConnectListDefinedNetworks(virConnectPtr conn, int maxnames) { testDriverPtr privconn = conn->privateData; - int n; - - n = virNetworkObjListGetNames(privconn->networks, - false, names, maxnames, NULL, conn); - return n; + return virNetworkObjListGetNames(privconn->networks, false, names, + maxnames, NULL, conn); } diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c index 6ab79a1897..4d09d84274 100644 --- a/src/util/vircgroupv1.c +++ b/src/util/vircgroupv1.c @@ -410,11 +410,7 @@ virCgroupV1ValidatePlacement(virCgroupPtr group, static char * virCgroupV1StealPlacement(virCgroupPtr group) { - char *ret = NULL; - - ret = g_steal_pointer(&group->legacy[VIR_CGROUP_CONTROLLER_SYSTEMD].placement); - - return ret; + return g_steal_pointer(&group->legacy[VIR_CGROUP_CONTROLLER_SYSTEMD].placement); } diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c index 621ab71eb5..c89158d5d5 100644 --- a/src/util/vircgroupv2.c +++ b/src/util/vircgroupv2.c @@ -242,11 +242,7 @@ virCgroupV2ValidatePlacement(virCgroupPtr group, static char * virCgroupV2StealPlacement(virCgroupPtr group) { - char *ret; - - ret = g_steal_pointer(&group->unified.placement); - - return ret; + return g_steal_pointer(&group->unified.placement); } diff --git a/src/util/virdbus.c b/src/util/virdbus.c index f54c917c03..50a6bea05e 100644 --- a/src/util/virdbus.c +++ b/src/util/virdbus.c @@ -1178,15 +1178,12 @@ virDBusMessageEncodeArgs(DBusMessage* msg, va_list args) { DBusMessageIter iter; - int ret = -1; memset(&iter, 0, sizeof(iter)); dbus_message_iter_init_append(msg, &iter); - ret = virDBusMessageIterEncode(&iter, types, args); - - return ret; + return virDBusMessageIterEncode(&iter, types, args); } diff --git a/src/vbox/vbox_storage.c b/src/vbox/vbox_storage.c index ba5b876ffb..3d221fa8d9 100644 --- a/src/vbox/vbox_storage.c +++ b/src/vbox/vbox_storage.c @@ -90,10 +90,9 @@ static int vboxStoragePoolNumOfVolumes(virStoragePoolPtr pool) PRUint32 hardDiskAccessible = 0; nsresult rc; size_t i; - int ret = -1; if (!data->vboxObj) - return ret; + return -1; rc = gVBoxAPI.UArray.vboxArrayGet(&hardDisks, data->vboxObj, gVBoxAPI.UArray.handleGetHardDisks(data->vboxObj)); @@ -101,7 +100,7 @@ static int vboxStoragePoolNumOfVolumes(virStoragePoolPtr pool) virReportError(VIR_ERR_INTERNAL_ERROR, _("could not get number of volumes in the pool: %s, rc=%08x"), pool->name, (unsigned)rc); - return ret; + return -1; } for (i = 0; i < hardDisks.count; ++i) { @@ -118,9 +117,7 @@ static int vboxStoragePoolNumOfVolumes(virStoragePoolPtr pool) gVBoxAPI.UArray.vboxArrayRelease(&hardDisks); - ret = hardDiskAccessible; - - return ret; + return hardDiskAccessible; } static int @@ -131,10 +128,9 @@ vboxStoragePoolListVolumes(virStoragePoolPtr pool, char **const names, int nname PRUint32 numActive = 0; nsresult rc; size_t i; - int ret = -1; if (!data->vboxObj) - return ret; + return -1; rc = gVBoxAPI.UArray.vboxArrayGet(&hardDisks, data->vboxObj, gVBoxAPI.UArray.handleGetHardDisks(data->vboxObj)); @@ -142,7 +138,7 @@ vboxStoragePoolListVolumes(virStoragePoolPtr pool, char **const names, int nname virReportError(VIR_ERR_INTERNAL_ERROR, _("could not get the volume list in the pool: %s, rc=%08x"), pool->name, (unsigned)rc); - return ret; + return -1; } for (i = 0; i < hardDisks.count && numActive < nnames; ++i) { @@ -174,9 +170,7 @@ vboxStoragePoolListVolumes(virStoragePoolPtr pool, char **const names, int nname } gVBoxAPI.UArray.vboxArrayRelease(&hardDisks); - ret = numActive; - - return ret; + return numActive; } static virStorageVolPtr diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 21425346ac..69ec1a5377 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -210,13 +210,11 @@ static char * vzConnectGetCapabilities(virConnectPtr conn) { vzConnPtr privconn = conn->privateData; - char *xml; if (virConnectGetCapabilitiesEnsureACL(conn) < 0) return NULL; - xml = virCapabilitiesFormatXML(privconn->driver->caps); - return xml; + return virCapabilitiesFormatXML(privconn->driver->caps); } static int @@ -470,63 +468,53 @@ static int vzConnectListDomains(virConnectPtr conn, int *ids, int maxids) { vzConnPtr privconn = conn->privateData; - int n; if (virConnectListDomainsEnsureACL(conn) < 0) return -1; - n = virDomainObjListGetActiveIDs(privconn->driver->domains, ids, maxids, - virConnectListDomainsCheckACL, conn); - - return n; + return virDomainObjListGetActiveIDs(privconn->driver->domains, ids, + maxids, virConnectListDomainsCheckACL, + conn); } static int vzConnectNumOfDomains(virConnectPtr conn) { vzConnPtr privconn = conn->privateData; - int count; if (virConnectNumOfDomainsEnsureACL(conn) < 0) return -1; - count = virDomainObjListNumOfDomains(privconn->driver->domains, true, - virConnectNumOfDomainsCheckACL, conn); - - return count; + return virDomainObjListNumOfDomains(privconn->driver->domains, true, + virConnectNumOfDomainsCheckACL, conn); } static int vzConnectListDefinedDomains(virConnectPtr conn, char **const names, int maxnames) { vzConnPtr privconn = conn->privateData; - int n; if (virConnectListDefinedDomainsEnsureACL(conn) < 0) return -1; memset(names, 0, sizeof(*names) * maxnames); - n = virDomainObjListGetInactiveNames(privconn->driver->domains, names, - maxnames, - virConnectListDefinedDomainsCheckACL, - conn); - - return n; + return virDomainObjListGetInactiveNames(privconn->driver->domains, names, + maxnames, + virConnectListDefinedDomainsCheckACL, + conn); } static int vzConnectNumOfDefinedDomains(virConnectPtr conn) { vzConnPtr privconn = conn->privateData; - int count; if (virConnectNumOfDefinedDomainsEnsureACL(conn) < 0) return -1; - count = virDomainObjListNumOfDomains(privconn->driver->domains, false, - virConnectNumOfDefinedDomainsCheckACL, - conn); - return count; + return virDomainObjListNumOfDomains(privconn->driver->domains, false, + virConnectNumOfDefinedDomainsCheckACL, + conn); } static int @@ -535,17 +523,14 @@ vzConnectListAllDomains(virConnectPtr conn, unsigned int flags) { vzConnPtr privconn = conn->privateData; - int ret = -1; virCheckFlags(VIR_CONNECT_LIST_DOMAINS_FILTERS_ALL, -1); if (virConnectListAllDomainsEnsureACL(conn) < 0) return -1; - ret = virDomainObjListExport(privconn->driver->domains, conn, domains, - virConnectListAllDomainsCheckACL, flags); - - return ret; + return virDomainObjListExport(privconn->driver->domains, conn, domains, + virConnectListAllDomainsCheckACL, flags); } static virDomainPtr diff --git a/tools/virsh-completer-domain.c b/tools/virsh-completer-domain.c index bb06f468d7..641b26d2c5 100644 --- a/tools/virsh-completer-domain.c +++ b/tools/virsh-completer-domain.c @@ -173,7 +173,6 @@ virshDomainEventNameCompleter(vshControl *ctl G_GNUC_UNUSED, unsigned int flags) { size_t i = 0; - char **ret = NULL; VIR_AUTOSTRINGLIST tmp = NULL; virCheckFlags(0, NULL); @@ -186,8 +185,7 @@ virshDomainEventNameCompleter(vshControl *ctl G_GNUC_UNUSED, return NULL; } - ret = g_steal_pointer(&tmp); - return ret; + return g_steal_pointer(&tmp); } diff --git a/tools/virsh-completer-nodedev.c b/tools/virsh-completer-nodedev.c index 899c199902..83f6d415a7 100644 --- a/tools/virsh-completer-nodedev.c +++ b/tools/virsh-completer-nodedev.c @@ -73,7 +73,6 @@ virshNodeDeviceEventNameCompleter(vshControl *ctl G_GNUC_UNUSED, unsigned int flags) { size_t i = 0; - char **ret = NULL; VIR_AUTOSTRINGLIST tmp = NULL; virCheckFlags(0, NULL); @@ -86,8 +85,7 @@ virshNodeDeviceEventNameCompleter(vshControl *ctl G_GNUC_UNUSED, return NULL; } - ret = g_steal_pointer(&tmp); - return ret; + return g_steal_pointer(&tmp); } diff --git a/tools/virsh-completer-pool.c b/tools/virsh-completer-pool.c index ceb73eed06..def2b95b6d 100644 --- a/tools/virsh-completer-pool.c +++ b/tools/virsh-completer-pool.c @@ -76,7 +76,6 @@ virshPoolEventNameCompleter(vshControl *ctl G_GNUC_UNUSED, unsigned int flags) { size_t i = 0; - char **ret = NULL; VIR_AUTOSTRINGLIST tmp = NULL; virCheckFlags(0, NULL); @@ -89,8 +88,7 @@ virshPoolEventNameCompleter(vshControl *ctl G_GNUC_UNUSED, return NULL; } - ret = g_steal_pointer(&tmp); - return ret; + return g_steal_pointer(&tmp); } diff --git a/tools/virsh-completer-secret.c b/tools/virsh-completer-secret.c index a533ac178f..4ebeaeeb65 100644 --- a/tools/virsh-completer-secret.c +++ b/tools/virsh-completer-secret.c @@ -73,7 +73,6 @@ virshSecretEventNameCompleter(vshControl *ctl G_GNUC_UNUSED, unsigned int flags) { size_t i; - char **ret = NULL; VIR_AUTOSTRINGLIST tmp = NULL; virCheckFlags(0, NULL); @@ -86,6 +85,5 @@ virshSecretEventNameCompleter(vshControl *ctl G_GNUC_UNUSED, return NULL; } - ret = g_steal_pointer(&tmp); - return ret; + return g_steal_pointer(&tmp); } diff --git a/tools/virsh-network.c b/tools/virsh-network.c index 64b733adcc..edd61f3217 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -1384,8 +1384,6 @@ static const vshCmdOptDef opts_network_dhcp_leases[] = { static int virshNetworkDHCPLeaseSorter(const void *a, const void *b) { - int rv = -1; - virNetworkDHCPLeasePtr *lease1 = (virNetworkDHCPLeasePtr *) a; virNetworkDHCPLeasePtr *lease2 = (virNetworkDHCPLeasePtr *) b; @@ -1395,8 +1393,7 @@ virshNetworkDHCPLeaseSorter(const void *a, const void *b) if (!*lease1) return *lease2 != NULL; - rv = vshStrcasecmp((*lease1)->mac, (*lease2)->mac); - return rv; + return vshStrcasecmp((*lease1)->mac, (*lease2)->mac); } static bool diff --git a/tools/vsh.c b/tools/vsh.c index ee675a63cc..ae94a724df 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -2910,10 +2910,7 @@ vshReadlineCompletion(const char *text, int start G_GNUC_UNUSED, int end G_GNUC_UNUSED) { - char **matches = (char **) NULL; - - matches = rl_completion_matches(text, vshReadlineParse); - return matches; + return rl_completion_matches(text, vshReadlineParse); } -- 2.21.0

1 0

[libvirt] [PATCH] qemu: remove unused cfg variables
by Ján Tomko 17 Oct '19

17 Oct '19

These functions got a reference to the driver config without actually using it: processNicRxFilterChangedEvent qemuConnectDomainXMLToNative Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- Pushed as trivial. src/qemu/qemu_driver.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index cee3257a8a..cafd5c0fc7 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4607,7 +4607,6 @@ processNicRxFilterChangedEvent(virQEMUDriverPtr driver, virDomainObjPtr vm, const char *devAlias) { - virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); qemuDomainObjPrivatePtr priv = vm->privateData; virDomainDeviceDef dev; virDomainNetDefPtr def; @@ -4706,7 +4705,6 @@ processNicRxFilterChangedEvent(virQEMUDriverPtr driver, cleanup: virNetDevRxFilterFree(hostFilter); virNetDevRxFilterFree(guestFilter); - virObjectUnref(cfg); } @@ -7483,13 +7481,10 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn, virCommandPtr cmd = NULL; char *ret = NULL; size_t i; - virQEMUDriverConfigPtr cfg; virCapsPtr caps = NULL; virCheckFlags(0, NULL); - cfg = virQEMUDriverGetConfig(driver); - if (virConnectDomainXMLToNativeEnsureACL(conn) < 0) goto cleanup; @@ -7549,7 +7544,6 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn, virCommandFree(cmd); virObjectUnref(vm); virObjectUnref(caps); - virObjectUnref(cfg); return ret; } -- 2.19.2

1 0

[libvirt] [PATCH v4 00/26] scripts: convert most perl scripts to python
by Daniel P. Berrangé 17 Oct '19

17 Oct '19

This series is an effort to reduce the number of different languages we use by eliminating most use of perl in favour of python. This aligns with fact that the likely future build system we'll use (meson) is written in python, and that python is much more commonly used/understood by developers these days than perl. With this applied we use perl in a handful of places only: - src/rpc/gendispatch.pl - this is a horrendously large script and very hard to understand/follow. A straight syntax conversion to Python would still leave a hgue and hard to understand/follow script. It really needs a clean room rewrite from scratch, with better structure. - src/rpc/genprotocol.pl - fairly easy to convert, but might be obsolete depending on approach for rewriting gendispatch.pl, so ignored for now - tests/oomtrace.pl - will be purge by the patches that drop OOM handling anyway - tools/wireshark/util/genxdrstub.pl - a very large script, which I haven't got the courage to tackle yet. - cfg.mk/maint.mk - many syntax rules involve regexes which are fed to perl. Decision on what to do with syntax-check rules punted to another time. - build-aux/gitlog-to-changelog - build-aux/useless-if-before-free - Both pulled in from gnulib. Could be rewritten quite easily if desired, but given that we aren't maintainers of them right now, they're ignored as they don't really impact our developers. Note that the check-spacing.py script is significantly slower in Python than in Perl. After researching this it appears there is nothing that can be done. The Perl regex engine is simply much better optimized than the Python one. As previously discussed we need to loook at uncrustify or clang-format or some other tool to validate whitespace formatting. This is ongoing. We can either accept the slow down in the short term or keep the Perl version in the short term. In v4: - Moved all scripts into the scripts/ directory instead of having them scattered around source tree - Use re.search instead of re.match - Don't bother re-compiling regexes In v3: - All scripts comply with all flake8 style rules with exception of E129 visually indented line with same indent as next logical line In v2: - Pulled in patch to hacking file - Converted many more scripts - Forced UTF-8 character set to avoid ascii codec on py3 < 3.7 Daniel P. Berrangé (26): build: fix use of $(AUG_GENTEST) as a dependency build-aux: rewrite augeas test generator in Python build-aux: rewrite po file minimizer in Python build-aux: rewrite duplicate header checker in Python build-aux: rewrite whitespace checker in Python build-aux: rewrite mock inline checker in Python build-aux: rewrite header ifdef checker in Python src: rewrite ACL permissions checker in Python src: rewrite symfile sorting checker in Python src: rewrite symfile library checker in Python src: rewrite systemtap probe generator in Python src: rewrite systemtap function generator in Python src: rewrite driver name checker in Python src: rewrite driver impl checker in Python src: rewrite ACL rule checker in Python src: rewrite polkit ACL generator in Python src: rewrite remote protocol checker in Python tests: rewrite test argv line wrapper in Python tests: rewrite qemu capability grouper in Python tests: rewrite file access checker in Python docs: rewrite hvsupport.html page generator in python docs: rewrite polkit docs generator in Python docs: move apibuild.py to the scripts/ directory docs: move reformat-news.py to the scripts/ directory docs: move esx_vi_generator.py to the scripts/ directory docs: move hyperv_wmi_generator.py to the scripts/ directory .gitignore | 3 +- Makefile.am | 37 +- build-aux/augeas-gentest.pl | 60 --- build-aux/check-spacing.pl | 198 ------- build-aux/header-ifdef.pl | 182 ------- build-aux/minimize-po.pl | 37 -- build-aux/mock-noinline.pl | 75 --- build-aux/prohibit-duplicate-header.pl | 26 - cfg.mk | 32 +- docs/Makefile.am | 16 +- docs/genaclperms.pl | 125 ----- docs/hvsupport.pl | 458 ---------------- po/Makefile.am | 2 +- {docs => scripts}/apibuild.py | 0 scripts/augeas-gentest.py | 67 +++ scripts/check-aclperms.py | 75 +++ scripts/check-aclrules.py | 263 +++++++++ scripts/check-driverimpls.py | 102 ++++ scripts/check-drivername.py | 114 ++++ scripts/check-file-access.py | 123 +++++ scripts/check-remote-protocol.py | 136 +++++ scripts/check-spacing.py | 229 ++++++++ scripts/check-symfile.py | 80 +++ scripts/check-symsorting.py | 117 ++++ scripts/dtrace2systemtap.py | 143 +++++ {src/esx => scripts}/esx_vi_generator.py | 0 scripts/genaclperms.py | 123 +++++ scripts/genpolkit.py | 122 +++++ scripts/gensystemtap.py | 184 +++++++ scripts/group-qemu-caps.py | 123 +++++ scripts/header-ifdef.py | 231 ++++++++ scripts/hvsupport.py | 503 ++++++++++++++++++ .../hyperv_wmi_generator.py | 0 scripts/minimize-po.py | 58 ++ scripts/mock-noinline.py | 85 +++ scripts/prohibit-duplicate-header.py | 56 ++ {docs => scripts}/reformat-news.py | 0 scripts/test-wrap-argv.py | 170 ++++++ src/Makefile.am | 155 ++---- src/access/Makefile.inc.am | 6 +- src/access/genpolkit.pl | 119 ----- src/bhyve/Makefile.inc.am | 4 +- src/check-aclperms.pl | 73 --- src/check-aclrules.pl | 252 --------- src/check-driverimpls.pl | 80 --- src/check-drivername.pl | 83 --- src/check-symfile.pl | 70 --- src/check-symsorting.pl | 106 ---- src/dtrace2systemtap.pl | 130 ----- src/esx/Makefile.inc.am | 5 +- src/hyperv/Makefile.inc.am | 5 +- src/interface/Makefile.inc.am | 2 +- src/libxl/Makefile.inc.am | 4 +- src/locking/Makefile.inc.am | 6 +- src/logging/Makefile.inc.am | 2 +- src/lxc/Makefile.inc.am | 4 +- src/network/Makefile.inc.am | 2 +- src/node_device/Makefile.inc.am | 2 +- src/nwfilter/Makefile.inc.am | 2 +- src/qemu/Makefile.inc.am | 4 +- src/remote/Makefile.inc.am | 4 +- src/rpc/Makefile.inc.am | 1 - src/rpc/gensystemtap.pl | 193 ------- src/secret/Makefile.inc.am | 2 +- src/storage/Makefile.inc.am | 2 +- src/vbox/Makefile.inc.am | 2 +- src/vz/Makefile.inc.am | 2 +- tests/Makefile.am | 3 +- tests/check-file-access.pl | 126 ----- tests/file_access_whitelist.txt | 2 +- tests/group-qemu-caps.pl | 124 ----- tests/test-wrap-argv.pl | 174 ------ tests/testutils.c | 16 +- 73 files changed, 3243 insertions(+), 2879 deletions(-) delete mode 100755 build-aux/augeas-gentest.pl delete mode 100755 build-aux/check-spacing.pl delete mode 100644 build-aux/header-ifdef.pl delete mode 100755 build-aux/minimize-po.pl delete mode 100644 build-aux/mock-noinline.pl delete mode 100644 build-aux/prohibit-duplicate-header.pl delete mode 100755 docs/genaclperms.pl delete mode 100755 docs/hvsupport.pl rename {docs => scripts}/apibuild.py (100%) create mode 100755 scripts/augeas-gentest.py create mode 100755 scripts/check-aclperms.py create mode 100755 scripts/check-aclrules.py create mode 100755 scripts/check-driverimpls.py create mode 100644 scripts/check-drivername.py create mode 100755 scripts/check-file-access.py create mode 100644 scripts/check-remote-protocol.py create mode 100755 scripts/check-spacing.py create mode 100755 scripts/check-symfile.py create mode 100755 scripts/check-symsorting.py create mode 100755 scripts/dtrace2systemtap.py rename {src/esx => scripts}/esx_vi_generator.py (100%) create mode 100755 scripts/genaclperms.py create mode 100755 scripts/genpolkit.py create mode 100755 scripts/gensystemtap.py create mode 100755 scripts/group-qemu-caps.py create mode 100644 scripts/header-ifdef.py create mode 100755 scripts/hvsupport.py rename {src/hyperv => scripts}/hyperv_wmi_generator.py (100%) create mode 100755 scripts/minimize-po.py create mode 100644 scripts/mock-noinline.py create mode 100644 scripts/prohibit-duplicate-header.py rename {docs => scripts}/reformat-news.py (100%) create mode 100755 scripts/test-wrap-argv.py delete mode 100755 src/access/genpolkit.pl delete mode 100755 src/check-aclperms.pl delete mode 100755 src/check-aclrules.pl delete mode 100755 src/check-driverimpls.pl delete mode 100755 src/check-drivername.pl delete mode 100755 src/check-symfile.pl delete mode 100755 src/check-symsorting.pl delete mode 100755 src/dtrace2systemtap.pl delete mode 100755 src/rpc/gensystemtap.pl delete mode 100755 tests/check-file-access.pl delete mode 100755 tests/group-qemu-caps.pl delete mode 100755 tests/test-wrap-argv.pl -- 2.21.0

5 35

[libvirt] [PATCH 0/3] use virStringParseYesNo helper
by Mao Zhongyi 17 Oct '19

17 Oct '19

A function virStringParseYesNo was added to convert string 'yes' to true and 'no' to false, so use this helper to replace 'STREQ(.*, \"yes\")' and 'STREQ(.*, \"no\")' as it allows us to drop several repetitive if-then-else string->bool conversion blocks. Cc: abologna(a)redhat.com Cc: berrange(a)redhat.com Cc: crobinso(a)redhat.com Cc: gene(a)czarc.net Cc: g.sho1500(a)gmail.com Cc: jdenemar(a)redhat.com Cc: laine(a)laine.org Cc: mkletzan(a)redhat.com Cc: phrdina(a)redhat.com Mao Zhongyi (3): conf/domain_conf: use virStringParseYesNo helper conf/network_conf: use virStringParseYesNo helper qemu/qemu_migration_params: use virStringParseYesNo helper src/conf/domain_conf.c | 30 ++++++++++++++---------------- src/conf/network_conf.c | 4 +--- src/qemu/qemu_migration_params.c | 6 +----- 3 files changed, 16 insertions(+), 24 deletions(-) -- 2.17.1

4 11

[libvirt] [PATCH v2 0/3] qemu_process: use VIR_AUTO*/g_auto* all around
by Daniel Henrique Barboza 16 Oct '19

16 Oct '19

The usual AUTOFREE() and AUTOUNREF() changes that allows for a bit of cleanup. A new patch was added to convert most of the VIR_AUTO* macros to GLib g_auto* ones. v1: https://www.redhat.com/archives/libvir-list/2019-September/msg01465.html Daniel Henrique Barboza (3): qemu_process: use VIR_AUTOFREE() qemu_process: use VIR_AUTOUNREF() qemu_process.c: use GLib macros src/qemu/qemu_process.c | 444 +++++++++++++++------------------------- 1 file changed, 161 insertions(+), 283 deletions(-) -- 2.21.0

1 4

[libvirt] [PATCH v2 00/31] qemu: Store default CPU in domain XML
by Jiri Denemark 16 Oct '19

16 Oct '19

When starting a domain without a CPU model specified in the domain XML, QEMU will choose a default one. Which is fine unless the domain gets migrated to another host because libvirt doesn't perform any CPU ABI checks and the virtual CPU provided by QEMU on the destination host can differ from the one on the source host. With QEMU 4.2.0 we can probe for the default CPU model used by QEMU for a particular machine type and store it in the domain XML. This way the chosen CPU model is more visible to users and libvirt will make sure the guest will see the exact same CPU after migration. https://bugzilla.redhat.com/show_bug.cgi?id=1598151 https://bugzilla.redhat.com/show_bug.cgi?id=1598162 --- Some patches were too large so I decided to shorten them before sending to the list. You can check the full version of this series with git fetch https://gitlab.com/jirkade/libvirt cpu-default-type Jiri Denemark (31): tests: Add capabilities for QEMU 4.2.0 on s390x domcapstest: Add test case for QEMU 4.2.0 on s390x conf: Use VIR_AUTO* in virDomainCapsCPUModelsAdd conf: Drop nameLen parameter from virDomainCapsCPUModelsAdd qemu: Copy CPU models in virQEMUCapsGetCPUDefinitions qemu: Filter models in virQEMUCapsGetCPUDefinitions qemu: Use virQEMUCapsGetCPUDefinitions more qemu: Use VIR_AUTOPTR in qemuMonitorJSONGetCPUDefinitions qemu: Change return type of virQEMUCapsFetchCPUDefinitions qemu: Introduce qemuMonitorCPUDefs struct qemu: Flatten qemuMonitorCPUDefs.cpus build: Export virStringListCopy internal API qemu: Add qemuMonitorCPUDefsCopy qemu: Use VIR_AUTOFREE in virQEMUCapsLoadCPUModels qemu: Introduce virQEMUCapsCPUDefsToModels qemu: Rename virQEMUCaps{Get,Fetch}CPUDefinitions qemu: Split virQEMUCapsFetchCPUModels qemu: Switch qemuCaps to use qemuMonitorCPUDefs conf: Drop unused virDomainCapsCPUModelsFilter conf: Drop virDomainCapsCPUModelsAddSteal qemu: Store typename from query-cpu-definitions in qemuCaps qemu: Probe for default CPU types qemu: Introduce virQEMUCapsGetMachineDefaultCPU qemu: Drop unused virQEMUCapsGetDefaultMachine qemu: Use VIR_AUTOUNREF in qemuDomainDefPostParse conf: Define VIR_AUTOPTR for virCPUDef qemuxml2*test: Add test cases for default CPU models on aarch64 qemuxml2*test: Add test cases for default CPU models on ppc64 qemuxml2*test: Add test cases for default CPU models on s390x qemuxml2*test: Add test cases for default CPU models on x86_64 qemu: Store default CPU in domain XML src/conf/cpu_conf.h | 1 + src/conf/domain_capabilities.c | 86 +- src/conf/domain_capabilities.h | 8 - src/libvirt_private.syms | 3 +- src/qemu/qemu_capabilities.c | 358 +- src/qemu/qemu_capabilities.h | 15 +- src/qemu/qemu_domain.c | 84 +- src/qemu/qemu_driver.c | 4 +- src/qemu/qemu_monitor.c | 74 +- src/qemu/qemu_monitor.h | 18 +- src/qemu/qemu_monitor_json.c | 82 +- src/qemu/qemu_monitor_json.h | 2 +- src/qemu/qemu_process.c | 24 +- tests/cputest.c | 7 +- .../domaincapsschemadata/qemu_4.2.0.s390x.xml | 202 + tests/domaincapstest.c | 4 + .../caps_2.10.0.aarch64.xml | 126 +- .../caps_2.10.0.ppc64.xml | 512 +- .../caps_2.10.0.s390x.xml | 264 +- .../caps_2.10.0.x86_64.xml | 132 +- .../caps_2.11.0.s390x.xml | 264 +- .../caps_2.11.0.x86_64.xml | 136 +- .../caps_2.12.0.aarch64.xml | 136 +- .../caps_2.12.0.ppc64.xml | 516 +- .../caps_2.12.0.s390x.xml | 264 +- .../caps_2.12.0.x86_64.xml | 180 +- .../qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 512 +- .../qemucapabilitiesdata/caps_2.9.0.s390x.xml | 256 +- .../caps_2.9.0.x86_64.xml | 128 +- .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 516 +- .../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 272 +- .../caps_3.0.0.x86_64.xml | 184 +- .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 516 +- .../caps_3.1.0.x86_64.xml | 196 +- .../caps_4.0.0.aarch64.xml | 148 +- .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 516 +- .../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 284 +- .../caps_4.0.0.x86_64.xml | 196 +- .../caps_4.1.0.x86_64.xml | 400 +- .../caps_4.2.0.aarch64.xml | 242 +- .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 574 +- .../caps_4.2.0.s390x.replies | 22414 ++++++++++++++++ .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 3345 +++ .../caps_4.2.0.x86_64.xml | 492 +- tests/qemumonitorjsontest.c | 38 +- ...fault-cpu-kvm-virt-4.2.aarch64-latest.args | 38 + .../aarch64-default-cpu-kvm-virt-4.2.xml | 20 + ...fault-cpu-tcg-virt-4.2.aarch64-latest.args | 39 + .../aarch64-default-cpu-tcg-virt-4.2.xml | 20 + .../disk-cache.x86_64-latest.args | 1 + .../disk-cdrom-network.x86_64-latest.args | 1 + .../disk-cdrom-tray.x86_64-latest.args | 1 + .../disk-copy_on_read.x86_64-latest.args | 1 + .../disk-detect-zeroes.x86_64-latest.args | 1 + .../disk-floppy-q35-2_11.x86_64-latest.args | 1 + .../disk-floppy-q35-2_9.x86_64-latest.args | 1 + .../os-firmware-bios.x86_64-latest.args | 1 + ...os-firmware-efi-secboot.x86_64-latest.args | 1 + .../os-firmware-efi.x86_64-latest.args | 1 + ...ault-cpu-kvm-pseries-2.7.ppc64-latest.args | 38 + .../ppc64-default-cpu-kvm-pseries-2.7.xml | 22 + ...ault-cpu-kvm-pseries-3.1.ppc64-latest.args | 38 + .../ppc64-default-cpu-kvm-pseries-3.1.xml | 22 + ...ault-cpu-kvm-pseries-4.2.ppc64-latest.args | 38 + .../ppc64-default-cpu-kvm-pseries-4.2.xml | 22 + ...ault-cpu-tcg-pseries-2.7.ppc64-latest.args | 39 + .../ppc64-default-cpu-tcg-pseries-2.7.xml | 22 + ...ault-cpu-tcg-pseries-3.1.ppc64-latest.args | 39 + .../ppc64-default-cpu-tcg-pseries-3.1.xml | 22 + ...ault-cpu-tcg-pseries-4.2.ppc64-latest.args | 39 + .../ppc64-default-cpu-tcg-pseries-4.2.xml | 22 + ...t-cpu-kvm-ccw-virtio-4.2.s390x-latest.args | 31 + .../s390-default-cpu-kvm-ccw-virtio-4.2.xml | 16 + ...t-cpu-tcg-ccw-virtio-4.2.s390x-latest.args | 32 + .../s390-default-cpu-tcg-ccw-virtio-4.2.xml | 16 + .../tpm-emulator-tpm2-enc.x86_64-latest.args | 1 + .../tpm-emulator-tpm2.x86_64-latest.args | 1 + .../tpm-emulator.x86_64-latest.args | 1 + .../tseg-explicit-size.x86_64-latest.args | 1 + .../vhost-vsock-auto.x86_64-latest.args | 1 + .../vhost-vsock.x86_64-latest.args | 1 + ...-default-cpu-kvm-pc-4.2.x86_64-latest.args | 37 + .../x86_64-default-cpu-kvm-pc-4.2.xml | 24 + ...default-cpu-kvm-q35-4.2.x86_64-latest.args | 42 + .../x86_64-default-cpu-kvm-q35-4.2.xml | 24 + ...-default-cpu-tcg-pc-4.2.x86_64-latest.args | 37 + .../x86_64-default-cpu-tcg-pc-4.2.xml | 24 + ...default-cpu-tcg-q35-4.2.x86_64-latest.args | 42 + .../x86_64-default-cpu-tcg-q35-4.2.xml | 24 + tests/qemuxml2argvtest.c | 15 + ...efault-cpu-kvm-virt-4.2.aarch64-latest.xml | 38 + ...efault-cpu-tcg-virt-4.2.aarch64-latest.xml | 41 + .../os-firmware-bios.x86_64-latest.xml | 3 + .../os-firmware-efi-secboot.x86_64-latest.xml | 3 + .../os-firmware-efi.x86_64-latest.xml | 3 + ...fault-cpu-kvm-pseries-2.7.ppc64-latest.xml | 45 + ...fault-cpu-kvm-pseries-3.1.ppc64-latest.xml | 45 + ...fault-cpu-kvm-pseries-4.2.ppc64-latest.xml | 45 + ...fault-cpu-tcg-pseries-2.7.ppc64-latest.xml | 48 + ...fault-cpu-tcg-pseries-3.1.ppc64-latest.xml | 48 + ...fault-cpu-tcg-pseries-4.2.ppc64-latest.xml | 48 + ...lt-cpu-kvm-ccw-virtio-4.2.s390x-latest.xml | 23 + ...lt-cpu-tcg-ccw-virtio-4.2.s390x-latest.xml | 26 + .../tpm-emulator-tpm2-enc.x86_64-latest.xml | 3 + .../tpm-emulator-tpm2.x86_64-latest.xml | 3 + .../tpm-emulator.x86_64-latest.xml | 3 + .../tpm-passthrough-crb.x86_64-latest.xml | 3 + .../tpm-passthrough.x86_64-latest.xml | 3 + ...4-default-cpu-kvm-pc-4.2.x86_64-latest.xml | 40 + ...-default-cpu-kvm-q35-4.2.x86_64-latest.xml | 63 + ...4-default-cpu-tcg-pc-4.2.x86_64-latest.xml | 40 + ...-default-cpu-tcg-q35-4.2.x86_64-latest.xml | 63 + tests/qemuxml2xmltest.c | 15 + 113 files changed, 31926 insertions(+), 4317 deletions(-) create mode 100644 tests/domaincapsschemadata/qemu_4.2.0.s390x.xml create mode 100644 tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies create mode 100644 tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml create mode 100644 tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-latest.args create mode 100644 tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.xml create mode 100644 tests/qemuxml2argvdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.args create mode 100644 tests/qemuxml2argvdata/aarch64-default-cpu-tcg-virt-4.2.xml create mode 100644 tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest.args create mode 100644 tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.xml create mode 100644 tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.args create mode 100644 tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.xml create mode 100644 tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.args create mode 100644 tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.xml create mode 100644 tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest.args create mode 100644 tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.xml create mode 100644 tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest.args create mode 100644 tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.xml create mode 100644 tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest.args create mode 100644 tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.xml create mode 100644 tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args create mode 100644 tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.xml create mode 100644 tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-latest.args create mode 100644 tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-4.2.xml create mode 100644 tests/qemuxml2argvdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/x86_64-default-cpu-kvm-pc-4.2.xml create mode 100644 tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.xml create mode 100644 tests/qemuxml2argvdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/x86_64-default-cpu-tcg-pc-4.2.xml create mode 100644 tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.xml create mode 100644 tests/qemuxml2xmloutdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.xml create mode 100644 tests/qemuxml2xmloutdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-latest.xml create mode 100644 tests/qemuxml2xmloutdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.xml -- 2.23.0

2 60

[libvirt] [PATCH] build: Update .gitignore for build-aux files
by John Ferlan 16 Oct '19

16 Oct '19

Recent changes moved some files to build-aux and created at least one more. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- .gitignore | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 85ead5c907..30610a37c9 100644 --- a/.gitignore +++ b/.gitignore @@ -43,20 +43,22 @@ /autom4te.cache /build-aux/.gitignore /build-aux/compile +/build-aux/config.guess +/build-aux/config.sub /build-aux/depcomp +/build-aux/install-sh +/build-aux/ltmain.sh /build-aux/missing /build-aux/test-driver /build/ /ci/scratch/ /confdefs.h /config.cache -/config.guess /config.h /config.h.in /config.log /config.rpath /config.status -/config.sub /configure /configure.lineno /conftest.* @@ -96,7 +98,6 @@ /libvirt*.pc /libvirt.spec /ltconfig -/ltmain.sh /m4/* /mingw-libvirt.spec /mkinstalldirs -- 2.20.1

4 7

[libvirt] [PATCH v3 00/10] use VIR_AUTO*/g_auto* all around qemu_driver.c
by Daniel Henrique Barboza 16 Oct '19

16 Oct '19

changes from v2: - rebased with newer master (67e72053c1) - added an extra patch to convert the existing VIR_AUTO* macros to g_auto* ones, all at once, to avoid the case where a method will have both VIR_AUTO* and g_auto* macros at the same time. Note: the conversion in patch 10 wasn't 100% due to a handful of methods that I was unable to use g_autoptr. Take for example the method qemuDomainSaveInternal: -- qemuDomainObjPrivatePtr priv = vm->privateData; VIR_AUTOUNREF(virCapsPtr) caps = NULL; virQEMUSaveDataPtr data = NULL; VIR_AUTOUNREF(qemuDomainSaveCookiePtr) cookie = NULL; -- Changing the 'cookie' variable to use g_autoptr() causes an error: make[3]: Entering directory '/home/danielhb/kvm-project/libvirt/src' CC qemu/libvirt_driver_qemu_impl_la-qemu_driver.lo In file included from /usr/lib64/glib-2.0/include/glibconfig.h:9, from /usr/include/glib-2.0/glib/gtypes.h:32, from /usr/include/glib-2.0/glib/galloca.h:32, from /usr/include/glib-2.0/glib.h:30, from ./internal.h:31, from qemu/qemu_agent.h:24, from qemu/qemu_driver.c:40: qemu/qemu_driver.c: In function 'qemuDomainSaveInternal': qemu/qemu_driver.c:3282:15: error: unknown type name 'qemuDomainSaveCookie_autoptr' 3282 | g_autoptr(qemuDomainSaveCookie) cookie = NULL; I tried doing it with the 'Ptr' in the name, same error: CC qemu/libvirt_driver_qemu_impl_la-qemu_driver.lo In file included from /usr/lib64/glib-2.0/include/glibconfig.h:9, from /usr/include/glib-2.0/glib/gtypes.h:32, from /usr/include/glib-2.0/glib/galloca.h:32, from /usr/include/glib-2.0/glib.h:30, from ./internal.h:31, from qemu/qemu_agent.h:24, from qemu/qemu_driver.c:40: qemu/qemu_driver.c: In function 'qemuDomainSaveInternal': qemu/qemu_driver.c:3282:15: error: unknown type name 'qemuDomainSaveCookiePtr_autoptr' 3282 | g_autoptr(qemuDomainSaveCookiePtr) cookie = NULL; Similar situation happens with qemuDomainSaveImageStartVM and with qemuSecurityInit methods. They are mentioned in the commit message of patch 10 for reference. These methods are still using VIR_AUTO* macros. changes from v1: - addressed review concerns made by Erik - added more cleanups, as suggested by Erik v2: https://www.redhat.com/archives/libvir-list/2019-September/msg01452.html v1: https://www.redhat.com/archives/libvir-list/2019-September/msg00719.html Daniel Henrique Barboza (10): qemu_driver: use VIR_AUTOUNREF() with virQEMUDriverConfigPtr 1/3 qemu_driver: use VIR_AUTOUNREF() with virQEMUDriverConfigPtr 2/3 qemu_driver: use VIR_AUTOUNREF() with virQEMUDriverConfigPtr 3/3 qemu_driver: use VIR_AUTOUNREF() with virCapsPtr qemu_driver: use VIR_AUTOUNREF() with more pointer types qemu_driver: use VIR_AUTOFREE() with strings 1/3 qemu_driver: use VIR_AUTOFREE() with strings 2/3 qemu_driver: use VIR_AUTOFREE() with strings 3/3 qemu_driver: VIR_AUTOFREE on other scalar pointers qemu_driver.c: use GLib macros src/qemu/qemu_driver.c | 755 ++++++++++++++--------------------------- 1 file changed, 259 insertions(+), 496 deletions(-) -- 2.21.0

2 16

[libvirt] [PATCH 0/9] GLib macros and where to find them (glib chronicles)
by Ján Tomko 16 Oct '19

16 Oct '19

2 11

[libvirt] [PATCH 00/10] Clean up error preservation/restoration
by John Ferlan 16 Oct '19

16 Oct '19

I was going through some old git trees and found this one started before I 'altered' my Red Hat career path. Seeing as no one has picked it up from https://wiki.libvirt.org/page/BiteSizedTasks - figured I may as well post it rather than throw it away ;-) The change essentially alters virSaveLastError ... virSetError and virFreeError paths to use virErrorPreserveLast & virErrorRestore. John Ferlan (10): conf: Use consistent error preservation and restoration calls src: Use consistent error preservation and restoration calls libxl: Use consistent error preservation and restoration calls lxc: Use consistent error preservation and restoration calls qemu: Use consistent error preservation and restoration calls remote: Use consistent error preservation and restoration calls storage: Use consistent error preservation and restoration calls util: Use consistent error preservation and restoration calls vz: Use consistent error preservation and restoration calls tools: Use consistent error preservation and restoration calls src/conf/domain_conf.c | 7 +-- src/libvirt-stream.c | 36 +++++------- src/libxl/libxl_migration.c | 18 ++---- src/lxc/lxc_driver.c | 9 ++- src/lxc/lxc_process.c | 7 +-- src/qemu/qemu_cgroup.c | 14 ++--- src/qemu/qemu_command.c | 12 ++-- src/qemu/qemu_domain.c | 7 +-- src/qemu/qemu_driver.c | 36 +++++------- src/qemu/qemu_migration.c | 85 +++++++++------------------ src/qemu/qemu_migration_params.c | 9 ++- src/qemu/qemu_monitor.c | 19 +++--- src/qemu/qemu_process.c | 7 +-- src/remote/remote_daemon_stream.c | 17 +++--- src/storage/storage_backend_disk.c | 5 +- src/storage/storage_backend_logical.c | 5 +- src/storage/storage_driver.c | 8 +-- src/util/vircgroup.c | 18 +++--- src/util/virfirewall.c | 6 +- src/vz/vz_driver.c | 9 +-- tools/virsh.c | 7 +-- tools/virt-admin.c | 7 +-- 22 files changed, 137 insertions(+), 211 deletions(-) -- 2.20.1

2 11

[libvirt] [libvirt-rust PATCH 1/1] Make creating safe wrapper from raw pointer unsafe
by Linus Färnstrand 16 Oct '19

16 Oct '19

Giving an invalid pointer to the safe wrapper types causes undefined behavior when methods are later called on said wrapper Properly document safety contract of using unsafe constructor --- src/connect.rs | 10 ++++++++-- src/domain.rs | 10 ++++++++-- src/domain_snapshot.rs | 10 ++++++++-- src/interface.rs | 10 ++++++++-- src/network.rs | 10 ++++++++-- src/nodedev.rs | 10 ++++++++-- src/nwfilter.rs | 10 ++++++++-- src/secret.rs | 10 ++++++++-- src/storage_pool.rs | 10 ++++++++-- src/storage_vol.rs | 10 ++++++++-- src/stream.rs | 8 +++++++- 11 files changed, 87 insertions(+), 21 deletions(-) diff --git a/src/connect.rs b/src/connect.rs index 108224d..7f02619 100644 --- a/src/connect.rs +++ b/src/connect.rs @@ -462,8 +462,14 @@ impl Connect { self.ptr.unwrap() } - pub fn new(ptr: sys::virConnectPtr) -> Connect { - return Connect { ptr: Some(ptr) }; + /// Creates a new [Connect] from the given raw pointer. + /// + /// # Safety + /// + /// The pointer must point to a valid libvirt connection object. + /// The underlying object must be valid for the entire lifetime of the returned instance. + pub unsafe fn from_ptr(ptr: sys::virConnectPtr) -> Connect { + Connect { ptr: Some(ptr) } } pub fn get_version() -> Result<u32, Error> { diff --git a/src/domain.rs b/src/domain.rs index acb9e6e..0df95ee 100644 --- a/src/domain.rs +++ b/src/domain.rs @@ -628,8 +628,14 @@ impl Drop for Domain { } impl Domain { - pub fn new(ptr: sys::virDomainPtr) -> Domain { - return Domain { ptr: Some(ptr) }; + /// Creates a new [Domain] from the given raw pointer. + /// + /// # Safety + /// + /// The pointer must point to a valid libvirt domain object. + /// The underlying object must be valid for the entire lifetime of the returned instance. + pub unsafe fn from_ptr(ptr: sys::virDomainPtr) -> Domain { + Domain { ptr: Some(ptr) } } pub fn as_ptr(&self) -> sys::virDomainPtr { diff --git a/src/domain_snapshot.rs b/src/domain_snapshot.rs index 86599ef..8b6c873 100644 --- a/src/domain_snapshot.rs +++ b/src/domain_snapshot.rs @@ -94,8 +94,14 @@ impl Drop for DomainSnapshot { } impl DomainSnapshot { - pub fn new(ptr: sys::virDomainSnapshotPtr) -> DomainSnapshot { - return DomainSnapshot { ptr: Some(ptr) }; + /// Creates a new [DomainSnapshot] from the given raw pointer. + /// + /// # Safety + /// + /// The pointer must point to a valid libvirt domain snapshot object. + /// The underlying object must be valid for the entire lifetime of the returned instance. + pub unsafe fn from_ptr(ptr: sys::virDomainSnapshotPtr) -> DomainSnapshot { + DomainSnapshot { ptr: Some(ptr) } } pub fn as_ptr(&self) -> sys::virDomainSnapshotPtr { diff --git a/src/interface.rs b/src/interface.rs index 6fe8742..b06b641 100644 --- a/src/interface.rs +++ b/src/interface.rs @@ -81,8 +81,14 @@ impl Drop for Interface { } impl Interface { - pub fn new(ptr: sys::virInterfacePtr) -> Interface { - return Interface { ptr: Some(ptr) }; + /// Creates a new [Interface] from the given raw pointer. + /// + /// # Safety + /// + /// The pointer must point to a valid libvirt interface object. + /// The underlying object must be valid for the entire lifetime of the returned instance. + pub unsafe fn from_ptr(ptr: sys::virInterfacePtr) -> Interface { + Interface { ptr: Some(ptr) } } pub fn as_ptr(&self) -> sys::virInterfacePtr { diff --git a/src/network.rs b/src/network.rs index ac8c042..bbe5539 100644 --- a/src/network.rs +++ b/src/network.rs @@ -117,8 +117,14 @@ impl Drop for Network { } impl Network { - pub fn new(ptr: sys::virNetworkPtr) -> Network { - return Network { ptr: Some(ptr) }; + /// Creates a new [Network] from the given raw pointer. + /// + /// # Safety + /// + /// The pointer must point to a valid libvirt network object. + /// The underlying object must be valid for the entire lifetime of the returned instance. + pub unsafe fn from_ptr(ptr: sys::virNetworkPtr) -> Network { + Network { ptr: Some(ptr) } } pub fn as_ptr(&self) -> sys::virNetworkPtr { diff --git a/src/nodedev.rs b/src/nodedev.rs index c38c49e..2f36ea6 100644 --- a/src/nodedev.rs +++ b/src/nodedev.rs @@ -99,8 +99,14 @@ impl Drop for NodeDevice { } impl NodeDevice { - pub fn new(ptr: sys::virNodeDevicePtr) -> NodeDevice { - return NodeDevice { ptr: Some(ptr) }; + /// Creates a new [NodeDevice] from the given raw pointer. + /// + /// # Safety + /// + /// The pointer must point to a valid libvirt node device object. + /// The underlying object must be valid for the entire lifetime of the returned instance. + pub unsafe fn from_ptr(ptr: sys::virNodeDevicePtr) -> NodeDevice { + NodeDevice { ptr: Some(ptr) } } pub fn as_ptr(&self) -> sys::virNodeDevicePtr { diff --git a/src/nwfilter.rs b/src/nwfilter.rs index bd9455d..84f440e 100644 --- a/src/nwfilter.rs +++ b/src/nwfilter.rs @@ -68,8 +68,14 @@ impl Drop for NWFilter { } impl NWFilter { - pub fn new(ptr: sys::virNWFilterPtr) -> NWFilter { - return NWFilter { ptr: Some(ptr) }; + /// Creates a new [NWFilter] from the given raw pointer. + /// + /// # Safety + /// + /// The pointer must point to a valid libvirt NWFilter object. + /// The underlying object must be valid for the entire lifetime of the returned instance. + pub unsafe fn from_ptr(ptr: sys::virNWFilterPtr) -> NWFilter { + NWFilter { ptr: Some(ptr) } } pub fn as_ptr(&self) -> sys::virNWFilterPtr { diff --git a/src/secret.rs b/src/secret.rs index ba96b02..59a3f19 100644 --- a/src/secret.rs +++ b/src/secret.rs @@ -100,8 +100,14 @@ impl Drop for Secret { } impl Secret { - pub fn new(ptr: sys::virSecretPtr) -> Secret { - return Secret { ptr: Some(ptr) }; + /// Creates a new [Secret] from the given raw pointer. + /// + /// # Safety + /// + /// The pointer must point to a valid libvirt secret object. + /// The underlying object must be valid for the entire lifetime of the returned instance. + pub unsafe fn from_ptr(ptr: sys::virSecretPtr) -> Secret { + Secret { ptr: Some(ptr) } } pub fn as_ptr(&self) -> sys::virSecretPtr { diff --git a/src/storage_pool.rs b/src/storage_pool.rs index 38676c2..b8d9feb 100644 --- a/src/storage_pool.rs +++ b/src/storage_pool.rs @@ -156,8 +156,14 @@ impl Drop for StoragePool { } impl StoragePool { - pub fn new(ptr: sys::virStoragePoolPtr) -> StoragePool { - return StoragePool { ptr: Some(ptr) }; + /// Creates a new [StoragePool] from the given raw pointer. + /// + /// # Safety + /// + /// The pointer must point to a valid libvirt storage pool object. + /// The underlying object must be valid for the entire lifetime of the returned instance. + pub unsafe fn from_ptr(ptr: sys::virStoragePoolPtr) -> StoragePool { + StoragePool { ptr: Some(ptr) } } pub fn as_ptr(&self) -> sys::virStoragePoolPtr { diff --git a/src/storage_vol.rs b/src/storage_vol.rs index afc9b17..762c615 100644 --- a/src/storage_vol.rs +++ b/src/storage_vol.rs @@ -181,8 +181,14 @@ impl Drop for StorageVol { } impl StorageVol { - pub fn new(ptr: sys::virStorageVolPtr) -> StorageVol { - return StorageVol { ptr: Some(ptr) }; + /// Creates a new [StorageVol] from the given raw pointer. + /// + /// # Safety + /// + /// The pointer must point to a valid libvirt storage volume object. + /// The underlying object must be valid for the entire lifetime of the returned instance. + pub unsafe fn from_ptr(ptr: sys::virStorageVolPtr) -> StorageVol { + StorageVol { ptr: Some(ptr) } } pub fn as_ptr(&self) -> sys::virStorageVolPtr { diff --git a/src/stream.rs b/src/stream.rs index 8333ee5..ff85bea 100644 --- a/src/stream.rs +++ b/src/stream.rs @@ -68,7 +68,13 @@ impl Drop for Stream { } impl Stream { - pub fn new(ptr: sys::virStreamPtr) -> Stream { + /// Creates a new [Stream] from the given raw pointer. + /// + /// # Safety + /// + /// The pointer must point to a valid libvirt stream object. + /// The underlying object must be valid for the entire lifetime of the returned instance. + pub unsafe fn from_ptr(ptr: sys::virStreamPtr) -> Stream { Stream { ptr: Some(ptr) } } -- 2.21.0

3 2

[libvirt] [PATCH 0/9] More GLib macro usage (glib chronicles)
by Ján Tomko 16 Oct '19

16 Oct '19

2 10

[libvirt] [PATCH 0/8] Use even morer of GLib's macros (glib chronicles)
by Ján Tomko 16 Oct '19

16 Oct '19

4 13

[libvirt] [PATCH v4] util: Ignore SIGPIPE before write logs to stderr in child process
by Wang Yechao 16 Oct '19

16 Oct '19

Libvirtd has set SIGPIPE to ignored, and virFork resets all signal handlers to the defaults. But child process may write logs to stderr/stdout, that may generate SIGPIPE if journald has stopped. So in virExec(), set SIGPIPE to ignored before invoke virCommandMassClose, and revert it back to SIG_DFL after that. In virProcessRunInFork(), just set SIGPIPE to ignored. Signed-off-by: Wang Yechao <wang.yechao255(a)zte.com.cn> --- v1 patch: https://www.redhat.com/archives/libvir-list/2019-October/msg00720.html Changes in v2: - use pthread_sigmask to block SIGPIPE Changes in v3: - pass SIG_UNBLOCK(not SIG_SETMASK) to pthread_sigmask when unlock SIGPIPE Changes in v4: - don't block SIGPIPE, ignore it when invoke VIR_FORCE_CLOSE and virCommandMassClose --- src/util/vircommand.c | 16 ++++++++++++++++ src/util/virprocess.c | 10 ++++++++++ 2 files changed, 26 insertions(+) diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 763bcb6..bb6e73b 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -653,9 +653,25 @@ virExec(virCommandPtr cmd) umask(cmd->mask); ret = EXIT_CANCELED; + memset(&waxoff, 0, sizeof(waxoff)); + waxoff.sa_handler = SIG_IGN; + sigemptyset(&waxoff.sa_mask); + memset(&waxon, 0, sizeof(waxon)); + if (sigaction(SIGPIPE, &waxoff, &waxon) < 0) { + virReportSystemError(errno, "%s", + _("Could not disable SIGPIPE")); + goto fork_error; + } + if (virCommandMassClose(cmd, childin, childout, childerr) < 0) goto fork_error; + if (sigaction(SIGPIPE, &waxon, NULL) < 0) { + virReportSystemError(errno, "%s", + _("Could not re-enable SIGPIPE")); + goto fork_error; + } + if (prepareStdFd(childin, STDIN_FILENO) < 0) { virReportSystemError(errno, "%s", _("failed to setup stdin file handle")); diff --git a/src/util/virprocess.c b/src/util/virprocess.c index e8d4ba0..da66dcf 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -1151,6 +1151,16 @@ virProcessRunInFork(virProcessForkCallback cb, goto cleanup; if (child == 0) { + struct sigaction waxoff; + + memset(&waxoff, 0, sizeof(waxoff)); + waxoff.sa_handler = SIG_IGN; + sigemptyset(&waxoff.sa_mask); + if (sigaction(SIGPIPE, &waxoff, NULL) < 0) { + virReportSystemError(errno, "%s", + _("Could not disable SIGPIPE")); + } + VIR_FORCE_CLOSE(errfd[0]); ret = virProcessRunInForkHelper(errfd[1], parent, cb, opaque); VIR_FORCE_CLOSE(errfd[1]); -- 1.8.3.1

1 0

[libvirt] [PATCH 0/1] Add shrink flag to blockresize command
by martinsson.patrik＠gmail.com 16 Oct '19

16 Oct '19

From: patchon <martinsson.patrik(a)gmail.com> This changes the behaviour when shrinking a block device. This should be a fairly uncommon thing to do (I think), so I don't think one have to worry about breaking anything when introducing the new flag (--shrink). This also mimics the existing behaviour of the vol-resize command, which I personally think makes sense. Unfortunately this check was not present when I, one late Friday afternoon, was asked to extend a production-mysql-slave-device. This made me accidentally shrink a 2.5TB device with about 150GB. Needless to say - that Friday afternoon did not end with the obligatory weekend-beer-celebration. Non the less, I think this makes sense from an end user perspective. Also, there is actually one mention of this on behaviour already at https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=902171 patchon (1): Add shrink flag to blockresize command src/qemu/qemu_driver.c | 15 ++++++++++++++- tools/virsh-domain.c | 7 +++++++ tools/virsh.pod | 9 ++++++++- 3 files changed, 29 insertions(+), 2 deletions(-) -- 2.23.0

3 3

[libvirt] [PATCH 0/2] Fix build with musl libc
by casantos＠redhat.com 16 Oct '19

16 Oct '19

From: Carlos Santos <casantos(a)redhat.com> - Do not use 'stderr' as a field name, since it's a preprocessor macro in stdio.h. - Include paths.h for _PATH_MOUNTED, if it's not defined in mntent.h. Found while porting libvirt to Buildroot (https://buildroot.org/) Carlos Santos (2): qemu: fix build with musl libc storage: fix build with musl libc src/qemu/qemu_process.c | 8 ++++---- src/qemu/qemu_process.h | 2 +- src/storage/storage_backend_fs.c | 3 +++ src/storage/storage_backend_vstorage.c | 3 +++ 4 files changed, 11 insertions(+), 5 deletions(-) -- 2.18.1

1 2

[libvirt] [RFC 0/1] convert virStorageSource to GObject
by Daniel Henrique Barboza 15 Oct '19

15 Oct '19

I was hoping to quickly re-send the qemu_driver cleanups I've sent some time ago, now using Glib. I started by attempting to change the first VIR_AUTOUNREF() call in qemu_driver.c to g_autoptr(), which happens to be a virStorageSourcePtr type, then I realized that it wasn't that simple. Following up the instructions found on commit 16121a88a7, I started the conversion. Then 'make check' started to fail because some calls to virObjectRef/virObjectUnref were still remaining in the code, messing up stuff related with mirrorChain in qemu_blockjob.c. Turns out it was easier to burn through all the instances and change them to use GLib. This is being sent as RFC because x-I am aware that docs/hacking.html mentions that we shouldn't mix up certain GLib macros with Libvirt ones, thus I am uncertain of whether I have messed up or not. 'make check' works, did a few sanity checks with libvirtd as well. Hopefully this is somewhere near the mark. I intend to do such convertions from time to time, based on the cleanups I wanted to make in the qemu_driver file prior to the GLib introduction. Daniel Henrique Barboza (1): util: convert virStorageSource class to use GObject src/conf/domain_conf.c | 13 ++--- src/conf/snapshot_conf.c | 3 +- src/qemu/qemu_blockjob.c | 43 ++++++-------- src/qemu/qemu_domain.c | 6 +- src/qemu/qemu_driver.c | 14 ++--- src/qemu/qemu_hotplug.c | 3 +- src/qemu/qemu_migration.c | 2 +- src/storage/storage_backend_gluster.c | 2 +- src/storage/storage_util.c | 4 +- src/util/virstoragefile.c | 84 +++++++++++++-------------- src/util/virstoragefile.h | 9 ++- tests/qemublocktest.c | 6 +- tests/virstoragetest.c | 12 ++-- 13 files changed, 98 insertions(+), 103 deletions(-) -- 2.21.0

3 6

[libvirt] [PATCH v2 0/6] Enable ramfb parameter for mediated devices
by Jonathon Jongsma 15 Oct '19

15 Oct '19

This patch series is a continuation of a previous series that was already mostly merged. The one unmerged patch from the previous series is patch 6 in this series and has been rebased to git master. The other 5 patches are an attempt to address some things that Cole suggested in the previous review. I'm not sure whether I split the patches up too finely or not, but I'm happy to combine a couple of these patches if requested. Jonathon Jongsma (6): qemu: set domain capabilities for ramfb device qemu: use VIR_AUTOUNREF in qemuDomainDeviceDefValidate() qemu: fix domain device validation qemu: consolidate video validation qemu: unify domain caps validation for video devices qemu: add 'ramfb' attribute for mediated devices docs/formatdomain.html.in | 8 + docs/schemas/domaincommon.rng | 5 + src/conf/domain_capabilities.c | 17 ++- src/conf/domain_conf.c | 11 ++ src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_command.c | 17 ++- src/qemu/qemu_domain.c | 142 +++++++++--------- src/qemu/qemu_process.c | 62 -------- .../domaincapsschemadata/qemu_3.0.0.s390x.xml | 1 + .../qemu_3.1.0.x86_64.xml | 1 + .../qemu_4.0.0.x86_64.xml | 1 + .../qemu_4.1.0.x86_64.xml | 1 + .../qemu_4.2.0.x86_64.xml | 1 + ...tdev-mdev-display-ramfb.x86_64-latest.args | 37 +++++ .../hostdev-mdev-display-ramfb.xml | 33 ++++ tests/qemuxml2argvtest.c | 1 + 17 files changed, 203 insertions(+), 138 deletions(-) create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.xml -- 2.21.0

2 8

[libvirt] Fwd: libvirtd failing on MacOS in setgroups
by Marcus Furlong 15 Oct '19

15 Oct '19

Resend to libvir-list in case that is more appropriate: Hi, I get the following error when running libvirtd on MacOS as root: 2019-07-11 00:12:33.673+0000: 123145573953536: error : qemuProcessQMPLaunch:8501 : internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-x86_64 for probing: libvirt: error : cannot set supplemental groups: Invalid argument As a result `virsh capabilities` as root returns nothing: $ sudo virsh capabilities | grep qemu <baselabel type='qemu'>+0:+0</baselabel> whereas running as a regular user works fine: $ virsh capabilites | grep qemu <domain type='qemu'/> <domain type='qemu'/> <domain type='qemu'/> <domain type='qemu'/> <domain type='qemu'/> <domain type='qemu'/> <domain type='qemu'/> <domain type='qemu'/> <domain type='qemu'/> <domain type='qemu'/> <domain type='qemu'/> <domain type='qemu'/> <domain type='qemu'/> <domain type='qemu'/> <domain type='qemu'/> <domain type='qemu'/> <domain type='qemu'/> <domain type='qemu'/> <domain type='qemu'/> <domain type='qemu'/> <domain type='qemu'/> <domain type='qemu'/> <domain type='qemu'/> <domain type='qemu'/> <domain type='qemu'/> <domain type='qemu'/> <domain type='qemu'/> <domain type='qemu'/> and by extension, running VMs as regular user works fine via qemu:///session , but qemu:///system does not work. It seems like setgroups is failing: https://github.com/libvirt/libvirt/blob/v5.5.0/src/util/virutil.c#L1045-L10… Is this the expected behaviour? Full output below: $ sudo libvirtd 2019-07-11 00:12:33.379+0000: 123145573953536: info : libvirt version: 5.5.0 2019-07-11 00:12:33.379+0000: 123145573953536: warning : virProcessGetStartTime:1070 : Process start time of pid 49746 not available on this platform 2019-07-11 00:12:33.379+0000: 123145573953536: error : virSysinfoReadDMI:1172 : internal error: Failed to find path for dmidecode binary 2019-07-11 00:12:33.380+0000: 123145573953536: error : virFileFindHugeTLBFS:3734 : this function is not supported by the connection driver: virFileFindHugeTLBFS 2019-07-11 00:12:33.382+0000: 123145573953536: warning : virQEMUCapsInit:919 : Failed to get host CPU cache info 2019-07-11 00:12:33.401+0000: 123145573953536: error : virHostCPUGetTscInfo:1405 : Probing TSC is not supported on this platform: Function not implemented 2019-07-11 00:12:33.401+0000: 123145573953536: error : virExec:521 : Cannot find 'pm-is-supported' in path: No such file or directory 2019-07-11 00:12:33.401+0000: 123145573953536: warning : virQEMUCapsInit:926 : Failed to get host power management capabilities 2019-07-11 00:12:33.401+0000: 123145573953536: error : virNumaGetPages:988 : Operation not supported: page info is not supported on this platform 2019-07-11 00:12:33.401+0000: 123145573953536: warning : virQEMUCapsInit:933 : Failed to get pages info 2019-07-11 00:12:33.407+0000: 123145573953536: error : qemuProcessQMPLaunch:8501 : internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-alpha for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.407+0000: 123145573953536: warning : virQEMUCapsLogProbeFailure:4578 : Failed to probe capabilities for /usr/local/bin/qemu-system-alpha: internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-alpha for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.413+0000: 123145573953536: error : qemuProcessQMPLaunch:8501 : internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-arm for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.413+0000: 123145573953536: warning : virQEMUCapsLogProbeFailure:4578 : Failed to probe capabilities for /usr/local/bin/qemu-system-arm: internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-arm for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.419+0000: 123145573953536: error : qemuProcessQMPLaunch:8501 : internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-arm for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.419+0000: 123145573953536: warning : virQEMUCapsLogProbeFailure:4578 : Failed to probe capabilities for /usr/local/bin/qemu-system-arm: internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-arm for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.424+0000: 123145573953536: error : qemuProcessQMPLaunch:8501 : internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-aarch64 for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.424+0000: 123145573953536: warning : virQEMUCapsLogProbeFailure:4578 : Failed to probe capabilities for /usr/local/bin/qemu-system-aarch64: internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-aarch64 for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.431+0000: 123145573953536: error : qemuProcessQMPLaunch:8501 : internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-cris for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.431+0000: 123145573953536: warning : virQEMUCapsLogProbeFailure:4578 : Failed to probe capabilities for /usr/local/bin/qemu-system-cris: internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-cris for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.437+0000: 123145573953536: error : qemuProcessQMPLaunch:8501 : internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-i386 for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.437+0000: 123145573953536: warning : virQEMUCapsLogProbeFailure:4578 : Failed to probe capabilities for /usr/local/bin/qemu-system-i386: internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-i386 for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.443+0000: 123145573953536: error : qemuProcessQMPLaunch:8501 : internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-lm32 for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.443+0000: 123145573953536: warning : virQEMUCapsLogProbeFailure:4578 : Failed to probe capabilities for /usr/local/bin/qemu-system-lm32: internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-lm32 for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.449+0000: 123145573953536: error : qemuProcessQMPLaunch:8501 : internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-m68k for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.449+0000: 123145573953536: warning : virQEMUCapsLogProbeFailure:4578 : Failed to probe capabilities for /usr/local/bin/qemu-system-m68k: internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-m68k for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.497+0000: 123145573953536: error : qemuProcessQMPLaunch:8501 : internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-microblaze for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.497+0000: 123145573953536: warning : virQEMUCapsLogProbeFailure:4578 : Failed to probe capabilities for /usr/local/bin/qemu-system-microblaze: internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-microblaze for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.503+0000: 123145573953536: error : qemuProcessQMPLaunch:8501 : internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-microblazeel for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.503+0000: 123145573953536: warning : virQEMUCapsLogProbeFailure:4578 : Failed to probe capabilities for /usr/local/bin/qemu-system-microblazeel: internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-microblazeel for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.509+0000: 123145573953536: error : qemuProcessQMPLaunch:8501 : internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-mips for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.509+0000: 123145573953536: warning : virQEMUCapsLogProbeFailure:4578 : Failed to probe capabilities for /usr/local/bin/qemu-system-mips: internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-mips for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.515+0000: 123145573953536: error : qemuProcessQMPLaunch:8501 : internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-mipsel for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.515+0000: 123145573953536: warning : virQEMUCapsLogProbeFailure:4578 : Failed to probe capabilities for /usr/local/bin/qemu-system-mipsel: internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-mipsel for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.521+0000: 123145573953536: error : qemuProcessQMPLaunch:8501 : internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-mips64 for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.521+0000: 123145573953536: warning : virQEMUCapsLogProbeFailure:4578 : Failed to probe capabilities for /usr/local/bin/qemu-system-mips64: internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-mips64 for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.527+0000: 123145573953536: error : qemuProcessQMPLaunch:8501 : internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-mips64el for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.527+0000: 123145573953536: warning : virQEMUCapsLogProbeFailure:4578 : Failed to probe capabilities for /usr/local/bin/qemu-system-mips64el: internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-mips64el for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.533+0000: 123145573953536: error : qemuProcessQMPLaunch:8501 : internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-ppc for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.533+0000: 123145573953536: warning : virQEMUCapsLogProbeFailure:4578 : Failed to probe capabilities for /usr/local/bin/qemu-system-ppc: internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-ppc for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.571+0000: 123145573953536: error : qemuProcessQMPLaunch:8501 : internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-ppc64 for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.571+0000: 123145573953536: warning : virQEMUCapsLogProbeFailure:4578 : Failed to probe capabilities for /usr/local/bin/qemu-system-ppc64: internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-ppc64 for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.576+0000: 123145573953536: error : qemuProcessQMPLaunch:8501 : internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-ppc64 for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.576+0000: 123145573953536: warning : virQEMUCapsLogProbeFailure:4578 : Failed to probe capabilities for /usr/local/bin/qemu-system-ppc64: internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-ppc64 for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.582+0000: 123145573953536: error : qemuProcessQMPLaunch:8501 : internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-riscv32 for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.582+0000: 123145573953536: warning : virQEMUCapsLogProbeFailure:4578 : Failed to probe capabilities for /usr/local/bin/qemu-system-riscv32: internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-riscv32 for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.588+0000: 123145573953536: error : qemuProcessQMPLaunch:8501 : internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-riscv64 for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.588+0000: 123145573953536: warning : virQEMUCapsLogProbeFailure:4578 : Failed to probe capabilities for /usr/local/bin/qemu-system-riscv64: internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-riscv64 for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.594+0000: 123145573953536: error : qemuProcessQMPLaunch:8501 : internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-s390x for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.594+0000: 123145573953536: warning : virQEMUCapsLogProbeFailure:4578 : Failed to probe capabilities for /usr/local/bin/qemu-system-s390x: internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-s390x for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.600+0000: 123145573953536: error : qemuProcessQMPLaunch:8501 : internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-sh4 for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.600+0000: 123145573953536: warning : virQEMUCapsLogProbeFailure:4578 : Failed to probe capabilities for /usr/local/bin/qemu-system-sh4: internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-sh4 for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.605+0000: 123145573953536: error : qemuProcessQMPLaunch:8501 : internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-sh4eb for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.605+0000: 123145573953536: warning : virQEMUCapsLogProbeFailure:4578 : Failed to probe capabilities for /usr/local/bin/qemu-system-sh4eb: internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-sh4eb for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.612+0000: 123145573953536: error : qemuProcessQMPLaunch:8501 : internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-sparc for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.612+0000: 123145573953536: warning : virQEMUCapsLogProbeFailure:4578 : Failed to probe capabilities for /usr/local/bin/qemu-system-sparc: internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-sparc for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.619+0000: 123145573953536: error : qemuProcessQMPLaunch:8501 : internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-sparc64 for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.619+0000: 123145573953536: warning : virQEMUCapsLogProbeFailure:4578 : Failed to probe capabilities for /usr/local/bin/qemu-system-sparc64: internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-sparc64 for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.667+0000: 123145573953536: error : qemuProcessQMPLaunch:8501 : internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-unicore32 for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.667+0000: 123145573953536: warning : virQEMUCapsLogProbeFailure:4578 : Failed to probe capabilities for /usr/local/bin/qemu-system-unicore32: internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-unicore32 for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.673+0000: 123145573953536: error : qemuProcessQMPLaunch:8501 : internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-x86_64 for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.673+0000: 123145573953536: warning : virQEMUCapsLogProbeFailure:4578 : Failed to probe capabilities for /usr/local/bin/qemu-system-x86_64: internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-x86_64 for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.679+0000: 123145573953536: error : qemuProcessQMPLaunch:8501 : internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-xtensa for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.679+0000: 123145573953536: warning : virQEMUCapsLogProbeFailure:4578 : Failed to probe capabilities for /usr/local/bin/qemu-system-xtensa: internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-xtensa for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.685+0000: 123145573953536: error : qemuProcessQMPLaunch:8501 : internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-xtensaeb for probing: libvirt: error : cannot set supplemental groups: Invalid argument 2019-07-11 00:12:33.685+0000: 123145573953536: warning : virQEMUCapsLogProbeFailure:4578 : Failed to probe capabilities for /usr/local/bin/qemu-system-xtensaeb: internal error: Failed to start QEMU binary /usr/local/bin/qemu-system-xtensaeb for probing: libvirt: error : cannot set supplemental groups: Invalid argument -- Marcus Furlong

5 16

[libvirt] [PATCH] qemu: fix EFI nvram removal on domain undefine
by Pavel Mores 15 Oct '19

15 Oct '19

When undefining a UEFI domain its nvram file has to be properly handled as well. It's mandatory to use one of --nvram and --keep-nvram options when 'virsh undefine <domain>' is issued for a UEFI domain. To fix the bug as reported, virsh should return an error message if neither option is used and the nvram file should be removed when --nvram is given. The cause of the problem is that when qemuDomainUndefineFlags() is invoked on an inactive domain the path to its nvram file is empty. This commit aims to fix this by formatting and filling in the path in time for the nvram removal code to run properly. https://bugzilla.redhat.com/show_bug.cgi?id=1751596 Signed-off-by: Pavel Mores <pmores(a)redhat.com> --- src/qemu/qemu_domain.c | 12 +++++++++--- src/qemu/qemu_domain.h | 4 ++++ src/qemu/qemu_driver.c | 20 +++++++++++++++----- 3 files changed, 28 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 35067c851f..1a0367cc27 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -15441,16 +15441,22 @@ qemuDomainDiskIsMissingLocalOptional(virDomainDiskDefPtr disk) } +int +qemuDomainNVRAMPathFormat(virQEMUDriverConfigPtr cfg, + virDomainDefPtr def, char **path) +{ + return virAsprintf(path, "%s/%s_VARS.fd", cfg->nvramDir, def->name); +} + int qemuDomainNVRAMPathGenerate(virQEMUDriverConfigPtr cfg, virDomainDefPtr def) { if (def->os.loader && def->os.loader->type == VIR_DOMAIN_LOADER_TYPE_PFLASH && - def->os.loader->readonly == VIR_TRISTATE_SWITCH_ON && + def->os.loader->readonly == VIR_TRISTATE_BOOL_YES && !def->os.loader->nvram) { - return virAsprintf(&def->os.loader->nvram, "%s/%s_VARS.fd", - cfg->nvramDir, def->name); + return qemuDomainNVRAMPathFormat(cfg, def, &def->os.loader->nvram); } return 0; diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 01a54d4265..07725c7cc4 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -1207,6 +1207,10 @@ qemuDomainIsUsingNoShutdown(qemuDomainObjPrivatePtr priv); bool qemuDomainDiskIsMissingLocalOptional(virDomainDiskDefPtr disk); +int +qemuDomainNVRAMPathFormat(virQEMUDriverConfigPtr cfg, + virDomainDefPtr def, char **path); + int qemuDomainNVRAMPathGenerate(virQEMUDriverConfigPtr cfg, virDomainDefPtr def); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index bc0ede2fb0..dcaadbdb52 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7828,6 +7828,8 @@ qemuDomainUndefineFlags(virDomainPtr dom, int nsnapshots; int ncheckpoints; virQEMUDriverConfigPtr cfg = NULL; + char *nvram_path = NULL; + bool need_deallocate_nvram_path = false; virCheckFlags(VIR_DOMAIN_UNDEFINE_MANAGED_SAVE | VIR_DOMAIN_UNDEFINE_SNAPSHOTS_METADATA | @@ -7905,14 +7907,20 @@ qemuDomainUndefineFlags(virDomainPtr dom, } } - if (vm->def->os.loader && - vm->def->os.loader->nvram && - virFileExists(vm->def->os.loader->nvram)) { + if (vm->def->os.firmware == VIR_DOMAIN_OS_DEF_FIRMWARE_EFI) { + qemuDomainNVRAMPathFormat(cfg, vm->def, &nvram_path); + need_deallocate_nvram_path = true; + } else { + if (vm->def->os.loader) + nvram_path = vm->def->os.loader->nvram; + } + + if (nvram_path && virFileExists(nvram_path)) { if ((flags & VIR_DOMAIN_UNDEFINE_NVRAM)) { - if (unlink(vm->def->os.loader->nvram) < 0) { + if (unlink(nvram_path) < 0) { virReportSystemError(errno, _("failed to remove nvram: %s"), - vm->def->os.loader->nvram); + nvram_path); goto endjob; } } else if (!(flags & VIR_DOMAIN_UNDEFINE_KEEP_NVRAM)) { @@ -7948,6 +7956,8 @@ qemuDomainUndefineFlags(virDomainPtr dom, virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, event); virObjectUnref(cfg); + if (need_deallocate_nvram_path) + VIR_FREE(nvram_path); return ret; } -- 2.21.0

2 4

[libvirt] [PATCH 0/2] conf: Fix up empty 'network' cdroms
by Peter Krempa 15 Oct '19

15 Oct '19

Peter Krempa (2): conf: Reset disk type if <source> element is completely missing tests: Add test case for empty 'network' cdrom src/conf/domain_conf.c | 4 +++ ...m-empty-network-invalid.x86_64-latest.args | 34 +++++++++++++++++++ .../disk-cdrom-empty-network-invalid.xml | 30 ++++++++++++++++ tests/qemuxml2argvtest.c | 1 + ...om-empty-network-invalid.x86_64-latest.xml | 34 +++++++++++++++++++ tests/qemuxml2xmloutdata/disk-source-pool.xml | 2 +- tests/qemuxml2xmltest.c | 1 + 7 files changed, 105 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.xml create mode 100644 tests/qemuxml2xmloutdata/disk-cdrom-empty-network-invalid.x86_64-latest.xml -- 2.21.0

2 3

[libvirt] [PULL 00/19] Bitmaps patches
by John Snow 15 Oct '19

15 Oct '19

The following changes since commit 98b2e3c9ab3abfe476a2b02f8f51813edb90e72d: Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2019-10-08 16:08:35 +0100) are available in the Git repository at: https://github.com/jnsnow/qemu.git tags/bitmaps-pull-request for you to fetch changes up to b97d9a1014b61dd0980e7f4a0c9ca1e3b0aaa761: dirty-bitmaps: remove deprecated autoload parameter (2019-10-09 17:02:45 -0400) ---------------------------------------------------------------- Pull request ---------------------------------------------------------------- John Snow (2): MAINTAINERS: Add Vladimir as a reviewer for bitmaps dirty-bitmaps: remove deprecated autoload parameter Vladimir Sementsov-Ogievskiy (17): util/hbitmap: strict hbitmap_reset block: move bdrv_can_store_new_dirty_bitmap to block/dirty-bitmap.c block/dirty-bitmap: return int from bdrv_remove_persistent_dirty_bitmap block/qcow2: proper locking on bitmap add/remove paths block/dirty-bitmap: drop meta block/dirty-bitmap: add bs link block/dirty-bitmap: drop BdrvDirtyBitmap.mutex block/dirty-bitmap: refactor bdrv_dirty_bitmap_next block: switch reopen queue from QSIMPLEQ to QTAILQ block: reverse order for reopen commits iotests: add test-case to 165 to test reopening qcow2 bitmaps to RW block/qcow2-bitmap: get rid of bdrv_has_changed_persistent_bitmaps block/qcow2-bitmap: drop qcow2_reopen_bitmaps_rw_hint() block/qcow2-bitmap: do not remove bitmaps on reopen-ro iotests: add test 260 to check bitmap life after snapshot + commit block/qcow2-bitmap: fix and improve qcow2_reopen_bitmaps_rw qcow2-bitmap: move bitmap reopen-rw code to qcow2_reopen_commit qemu-deprecated.texi | 20 ++- qapi/block-core.json | 6 +- block/qcow2.h | 19 +-- include/block/block.h | 2 +- include/block/block_int.h | 20 +-- include/block/dirty-bitmap.h | 34 ++-- include/qemu/hbitmap.h | 5 + block.c | 79 +++------ block/backup.c | 14 +- block/dirty-bitmap.c | 290 +++++++++++++++++++-------------- block/mirror.c | 4 +- block/qcow2-bitmap.c | 212 +++++++++++++++--------- block/qcow2.c | 22 ++- blockdev.c | 40 ++--- migration/block-dirty-bitmap.c | 11 +- migration/block.c | 4 +- tests/test-hbitmap.c | 2 +- util/hbitmap.c | 4 + MAINTAINERS | 3 +- tests/qemu-iotests/165 | 57 ++++++- tests/qemu-iotests/165.out | 4 +- tests/qemu-iotests/260 | 89 ++++++++++ tests/qemu-iotests/260.out | 52 ++++++ tests/qemu-iotests/group | 1 + 24 files changed, 624 insertions(+), 370 deletions(-) create mode 100755 tests/qemu-iotests/260 create mode 100644 tests/qemu-iotests/260.out -- 2.21.0

4 25

[libvirt] [virttools-planet PATCH] Add Fabiano Fidencio to Planet Virt-Tools
by Fabiano Fidêncio 15 Oct '19

15 Oct '19

Signed-off-by: Fabiano Fidêncio <fidencio(a)redhat.com> --- updater/virt-tools/config.ini | 3 +++ 1 file changed, 3 insertions(+) diff --git a/updater/virt-tools/config.ini b/updater/virt-tools/config.ini index 6b4b5ec..9375c82 100644 --- a/updater/virt-tools/config.ini +++ b/updater/virt-tools/config.ini @@ -194,3 +194,6 @@ name = Stefano Garzarella face = sgarzare.png facewidth = 89 faceheight = 96 + +[https://fidencio.org/tags/virt/index.xml] +name = Fabiano Fidêncio -- 2.23.0

4 4

[libvirt] [PATCH 00/35] Use more of GLib's macros
by Ján Tomko 15 Oct '19

15 Oct '19

3 42

[libvirt] [PATCH v3 00/19] Integrate usage of glib into libvirt
by Daniel P. Berrangé 15 Oct '19

15 Oct '19

This is a followup to a previous patch series: v0: https://www.redhat.com/archives/libvir-list/2019-August/msg01374.html v1: https://www.redhat.com/archives/libvir-list/2019-September/msg01331.html v2: https://www.redhat.com/archives/libvir-list/2019-October/msg00271.html The focus in this glib series is - Wire up pieces to facilitate interoperability around memory allocation/cleanup. - Deprecate & document existing libvirt APIs that are targetted for removal/conversion. - Illustrate some conversions and/or usage of new APIs. - Convert code that allows us to eliminate more gnulib modules There's obviously alot of conversion work that could be done, especially around memory allocation, auto cleanup and virObject stuff. I'm not intending to do that myself in the short term, as my immediate focus is on eliminating gnulib modules. Once this series is merged though, anyone is able to take on conversion jobs, so this allows the work to be spread out across the contributors. changed in v2: - First patch gets an addition to .travis.yml to add glib2 on macOS - First patch blacklists -Wbad-function-cast warning flag - Second patch updates many makefiles to refer to $(GLIB_LIBS) to fix build on platforms with stricter linkers (Ubuntu) - virIdentity conversion uses _ consistently in methods - GOptionContext conversions are dropped Daniel P. Berrangé (19): build: probe for glib-2 library in configure build: link to glib library util: use glib memory allocation functions util: use glib string allocation/formatting functions util: convert virSystemdActivation to use VIR_DEFINE_AUTOPTR_FUNC util: rewrite auto cleanup macros to use glib's equivalent src: add support for g_autoptr with virObject instances conf: convert virSecretObj APIs to use autofree util: use glib base64 encoding/decoding APIs util: convert virIdentity implementation and test suite to g_autoptr access: convert polkit driver to auto free memory admin: convert admin server code to use auto free macros rpc: convert methods using virIdentityPtr to auto free macros remote: convert methods using virIdentityPtr to auto free macros util: convert virIdentity class to use GObject libxl: convert over to use GRegex for regular expressions conf: convert over to use GRegex for regular expressions util: replace strerror/strerror_r with g_strerror build: remove use of usleep gnulib module in favour of g_usleep .travis.yml | 1 + bootstrap.conf | 8 -- build-aux/syntax-check.mk | 2 +- configure.ac | 7 +- docs/hacking.html.in | 144 ++++++++------------ libvirt.spec.in | 1 + m4/virt-compile-warnings.m4 | 23 ++++ m4/virt-glib.m4 | 36 +++++ mingw-libvirt.spec.in | 2 + src/Makefile.am | 3 + src/access/Makefile.inc.am | 4 +- src/access/viraccessdriverpolkit.c | 38 ++---- src/admin/admin_server.c | 204 ++++++++++++---------------- src/bhyve/Makefile.inc.am | 1 + src/conf/capabilities.h | 3 + src/conf/domain_capabilities.h | 3 + src/conf/domain_conf.h | 3 + src/conf/domain_event.c | 25 ++-- src/conf/snapshot_conf.h | 3 + src/conf/storage_capabilities.h | 3 + src/conf/virsecretobj.c | 68 +++------- src/datatypes.h | 15 ++ src/hyperv/hyperv_driver.c | 2 +- src/hyperv/hyperv_wmi.c | 4 +- src/interface/Makefile.inc.am | 1 + src/internal.h | 1 + src/libvirt_private.syms | 1 - src/libxl/Makefile.inc.am | 1 + src/libxl/libxl_capabilities.c | 42 +++--- src/libxl/libxl_conf.c | 3 +- src/libxl/libxl_conf.h | 2 + src/locking/Makefile.inc.am | 9 +- src/locking/lock_daemon.c | 2 +- src/locking/lock_driver_sanlock.c | 2 +- src/logging/Makefile.inc.am | 1 + src/lxc/Makefile.inc.am | 4 + src/lxc/lxc_controller.c | 2 +- src/lxc/lxc_driver.c | 2 +- src/lxc/lxc_process.c | 2 +- src/network/Makefile.inc.am | 2 + src/network/bridge_driver.c | 2 +- src/node_device/Makefile.inc.am | 5 +- src/nwfilter/Makefile.inc.am | 1 + src/nwfilter/nwfilter_dhcpsnoop.c | 4 +- src/nwfilter/nwfilter_learnipaddr.c | 2 +- src/qemu/Makefile.inc.am | 1 + src/qemu/qemu_agent.c | 6 +- src/qemu/qemu_blockjob.h | 1 + src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 5 +- src/qemu/qemu_conf.h | 3 + src/qemu/qemu_domain.c | 8 +- src/qemu/qemu_monitor_json.c | 2 +- src/qemu/qemu_process.c | 6 +- src/qemu/qemu_tpm.c | 2 +- src/remote/Makefile.inc.am | 2 + src/remote/remote_daemon.c | 3 +- src/remote/remote_daemon_dispatch.c | 35 ++--- src/rpc/virnetserverclient.c | 57 ++++---- src/rpc/virnetserverprogram.c | 13 +- src/rpc/virnetsocket.c | 2 +- src/secret/Makefile.inc.am | 1 + src/secret/secret_driver.c | 1 - src/security/Makefile.inc.am | 1 + src/security/security_manager.c | 2 +- src/storage/Makefile.inc.am | 16 +++ src/storage/storage_backend_rbd.c | 4 +- src/storage/storage_util.c | 4 +- src/util/viralloc.c | 29 +--- src/util/viralloc.h | 14 +- src/util/virautoclean.h | 38 +++--- src/util/vircgroup.c | 2 +- src/util/virerror.c | 9 +- src/util/virerror.h | 1 + src/util/virfile.c | 2 +- src/util/virhostdev.h | 3 + src/util/viridentity.c | 92 +++++++------ src/util/viridentity.h | 7 +- src/util/virmdev.h | 3 + src/util/virnetdev.c | 2 +- src/util/virnetdevip.c | 2 +- src/util/virnetdevmacvlan.c | 2 +- src/util/virnetdevvportprofile.c | 2 +- src/util/virobject.h | 4 + src/util/virpci.c | 8 +- src/util/virpci.h | 3 + src/util/virprocess.c | 4 +- src/util/virresctrl.h | 4 + src/util/virscsi.h | 3 + src/util/virscsivhost.h | 3 + src/util/virstoragefile.h | 2 + src/util/virstring.c | 49 +++---- src/util/virstring.h | 10 +- src/util/virsystemd.c | 10 +- src/util/virsystemd.h | 5 +- src/util/virtime.c | 2 +- src/util/virusb.h | 3 + src/vbox/Makefile.inc.am | 1 + src/vbox/vbox_common.c | 2 +- src/vz/Makefile.inc.am | 1 + tests/Makefile.am | 7 +- tests/commandtest.c | 16 +-- tests/eventtest.c | 4 +- tests/fdstreamtest.c | 4 +- tests/qemumonitortestutils.c | 2 +- tests/seclabeltest.c | 4 +- tests/testutils.c | 6 +- tests/virhostcputest.c | 4 +- tests/viridentitytest.c | 45 +++--- tests/virnetserverclienttest.c | 3 +- tests/virsystemdtest.c | 2 +- tests/virtestmock.c | 4 +- tools/Makefile.am | 4 + tools/virsh-domain.c | 2 +- tools/virsh-secret.c | 17 +-- 115 files changed, 667 insertions(+), 650 deletions(-) create mode 100644 m4/virt-glib.m4 -- 2.21.0

4 26

[libvirt] [PATCH v2] util: Block SIGPIPE until execve in child process
by Wang Yechao 15 Oct '19

15 Oct '19

Libvirtd has set SIGPIPE to ignored, and virFork resets all signal handlers to the defaults. But child process may write logs to stderr/stdout, that may generate SIGPIPE if journald has stopped. So block SIGPIPE in virFork, and unblock it before execve. Signed-off-by: Wang Yechao <wang.yechao255(a)zte.com.cn> --- v1 patch: https://www.redhat.com/archives/libvir-list/2019-October/msg00720.html Changes in v2: - use pthread_sigmask to block SIGPIPE --- src/util/vircommand.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 79e1e87..bd3a582 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -321,6 +321,15 @@ virFork(void) virDispatchError(NULL); _exit(EXIT_CANCELED); } + + sigemptyset(&newmask); + sigaddset(&newmask, SIGPIPE); + if (pthread_sigmask(SIG_BLOCK, &newmask, NULL) != 0) { + virReportSystemError(errno, "%s", _("cannot block SIGPIPE")); + virDispatchError(NULL); + _exit(EXIT_CANCELED); + } + } return pid; } @@ -553,6 +562,7 @@ virExec(virCommandPtr cmd) struct sigaction waxon, waxoff; VIR_AUTOFREE(gid_t *) groups = NULL; int ngroups; + sigset_t set; if (cmd->args[0][0] != '/') { if (!(binary = binarystr = virFindFileInPath(cmd->args[0]))) { @@ -792,6 +802,13 @@ virExec(virCommandPtr cmd) /* Close logging again to ensure no FDs leak to child */ virLogReset(); + sigemptyset(&set); + sigaddset(&set, SIGPIPE); + if (pthread_sigmask(SIG_SETMASK, &set, NULL) != 0) { + virReportSystemError(errno, "%s", _("cannot unblock SIGPIPE")); + goto fork_error; + } + if (cmd->env) execve(binary, cmd->args, cmd->env); else -- 1.8.3.1

1 0

[libvirt] [PATCH] util: ignore SIGPIPE when writing to stderr/stdout
by Wang Yechao 15 Oct '19

15 Oct '19

libvirtd's stderr/stdout redirected to journald by default, so if the journald has stopped, libvirtd and libvirtd's child process will receive SIGPIPE signal when writing logs to stderr/stdout. journald stopped reasons: 1. manual command "systemctl stop systemd-journald.service" 2. oom killer kill it. ... Signed-off-by: Wang Yechao <wang.yechao255(a)zte.com.cn> --- src/util/virlog.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/util/virlog.c b/src/util/virlog.c index 4c76fbc..127e121 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -39,6 +39,7 @@ # include <sys/un.h> #endif #include <fnmatch.h> +#include <signal.h> #include "virerror.h" #include "virlog.h" @@ -732,6 +733,9 @@ virLogOutputToFd(virLogSourcePtr source ATTRIBUTE_UNUSED, if (fd < 0) return; + if (fd == STDERR_FILENO || fd == STDOUT_FILENO) + signal(SIGPIPE, SIG_IGN); + if (virAsprintfQuiet(&msg, "%s: %s", timestamp, str) < 0) return; @@ -740,6 +744,10 @@ virLogOutputToFd(virLogSourcePtr source ATTRIBUTE_UNUSED, if (flags & VIR_LOG_STACK_TRACE) virLogStackTraceToFd(fd); + + if (fd == STDERR_FILENO || fd == STDOUT_FILENO) + signal(SIGPIPE, SIG_DFL); + } -- 1.8.3.1

4 6

[libvirt] Question about migration confirm phase
by Jim Fehlig 14 Oct '19

14 Oct '19

I've been investigating a lockd lock ordering bug in a migration error handling path in the libxl driver. In the perform phase, the src calls virDomainLockProcessPause to release the lock before sending the VM to dst. In this case the send fails for other reasons and an attempt is made to reacquire the lock with virDomainLockProcessResume. But that fails since the dst has not finished cleaning up the failed VM and releasing the lock it acquired when starting to receive the VM. My immediate reaction was "why not reacquire the lock in the confirm phase", but then I saw my older comment a few lines later in the perform phase code /* * Confirm phase will not be executed if perform fails. End the * job started in begin phase. */ Is that just a bug in the implementation, or is it intended to skip the confirm phase if perform fails? Regards, Jim

2 2

Re: [libvirt] Add support for vhost-user-scsi-pci/vhost-user-blk-pci
by Cole Robinson 14 Oct '19

14 Oct '19

On 10/14/19 3:12 AM, Li Feng wrote: > Hi Cole & Michal, > > I'm sorry for my late response, I just end my journey today. > Thank your response, your suggestion is very helpful to me. > > I have added Michal in this mail, Michal helps me review my initial patchset. > (https://www.spinics.net/linux/fedora/libvir/msg191339.html) > Whoops I missed that posting, I didn't realize you had sent patches! > All concern about this feature is the XML design. > My original XML design exposes more details of Qemu. > > <vhost-user-blk-pci type='unix'> > <source type='bind' path='/tmp/vhost-blk.sock'> > <reconnect enabled='yes' timeout='5' /> > </source> > <queue num='4'/> > </vhost-user-blk-pci> > > As Cole's suggestion, the better design with all vhost-user-scsi/blk > features would like this: > > vhost-user-blk: > > <disk type='vhostuser' device='disk'> > <source type='unix' path='/path/to/vhost-user-blk.sock' mode='client'> > <reconnect enabled='yes' timeout='5' /> > </source> > <target dev='vda' bus='virtio'/> > <queue num='4'/> > <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> > </disk> > > vhost-user-scsi: > > <disk type='vhostuser' device='disk'> > <source type='unix' path='/path/to/vhost-user-scsi.sock' mode='client'> > <reconnect enabled='yes' timeout='5' /> > </source> > <target dev='sda' bus='scsi'/> > <queue num='4'/> > </disk> > I think my SCSI idea is wrong, sorry. vhost-user-scsi is for passing a scsi host adapter to the VM, correct? If so, then it's not really a <disk>, and so using the existing vhost-scsi support in <hostdev> is probably better. <hostdev> could possible be used for vhost-user-blk as well Can you provide some examples of full qemu command lines using vhost-user-blk and vhost-user-scsi? Just linking to examples else where is fine, but I'm wondering if there's more context Internally we already have an abstraction for vhost-scsi: <hostdev mode='subsystem' type='scsi_host'> <source protocol='vhost' wwpn='XXX'/> </hostdev> The obvious extension would be <hostdev mode='subsystem' type='scsi_host'> <source protocol='vhostuser' type='unix' path='/path/to/vhost-user-scsi.sock' mode='client'/> </hostdev> Internally implementing this will be weird. The <source> parameters are only dictated by the hostdev type= field, but in this case they would be dictated by the <source protocol=> field, and we would want to reuse the internal chardev abstraction. vhost-user-blk could be implemented similarly, but with type='storage' which is the way we pass through block devices to LXC guests, but it isn't currently supported in the qemu driver. I dunno. Maybe Michal or danpb can provide guidance > Conclusion: > 1. Add new type(vhostuser) for disk label; > 2. Add queue sub-label for disk to support multiqueue(<queue > num='4'/>) or reusing the driver label > (<driver name='vhostuser' queues='4'), which one is better? > Qemu support multiqueue like this: > -device vhost-user-scsi-pci,id=scsi0,chardev=spdk_vhost_scsi0,num_queues=4 > -device vhost-user-blk-pci,chardev=spdk_vhost_blk0,num-queues=4 > num-queues is already supported by libvirt for both <disk> and <hostdev> with <driver queues=X/>, so whether we use <disk> or <hostdev> you won't need to add any new XML here. > Another question: > When qemu is connecting to a vhost-user-scsi controller[1], there may > exist multiple LUNs under one target, > then one disklabel(<disk/>) will represent multiple SCSI LUNs, > the 'dev' property(<target dev='sda' bus='scsi'/>) will be ignored, right? > In other words, for vhost-user-scsi disk, it more likes a controller, > maybe the controller label is suitable. > Yes you are right, and this was my understanding. But then its not really a <controller> in libvirt's sense because we can't attach emulated devices to it, so it's more a fit for the existing <hostdev> vhost-user support. Unfortunately it's not really a clean fit anywhere, there will have to be some kind of compromise. And I'm not sure if <disk> or <hostdev> is right for vhost-user-blk, but hopefully others have more clear opinions. Thanks, Cole > I look forward to hearing from you as soon as possible. > > [1]: https://spdk.io/doc/vhost.html > > Feng Li > > Cole Robinson <crobinso(a)redhat.com> 于2019年10月10日周四上午6:48写道： >> >> Sorry for the late reply, and thanks Jano for pointing out elsewhere >> that this didn't receive a response. >> >> On 8/12/19 5:56 AM, Li Feng wrote: >>> Hi Guys, >>> >>> And I want to add the vhost-user-scsi-pci/vhost-user-blk-pci support >>> for libvirt. >>> >>> The usage in qemu like this: >>> >>> Vhost-SCSI >>> -chardev socket,id=char0,path=/var/tmp/vhost.0 >>> -device vhost-user-scsi-pci,id=scsi0,chardev=char0 >>> Vhost-BLK >>> -chardev socket,id=char1,path=/var/tmp/vhost.1 >>> -device vhost-user-blk-pci,id=blk0,chardev=char1 >>> >> >> Indeed that matches what I see for the qemu commits too: >> >> https://git.qemu.org/?p=qemu.git;a=commit;h=00343e4b54b >> https://git.qemu.org/?p=qemu.git;a=commit;h=f12c1ebddf7 >> >>> What type should I add for libvirt. >>> Type1: >>> <hostdev mode='subsystem' type='vhost-user'> >>> <source protocol='vhost-user-scsi' path='/tmp/vhost-scsi.sock'></source> >>> <alias name="vhost-user-scsi-disk1"/> >>> </hostdev> >>> >>> >>> Type2: >>> >>> <disk type='network' device='disk'> >>> <driver name='qemu' type='raw' cache='none' io='native'/> >>> <source protocol='vhost-user' path='/tmp/vhost-scsi.sock'> >>> </source> >>> <target dev='sdb' bus='vhost-user-scsi'/> >>> <boot order='3'/> >>> <alias name='scsi0-0-0-1'/> >>> <address type='drive' controller='0' bus='0' target='0' unit='1'/> >>> </disk> >>> >>> >>> <disk type='network' device='disk'> >>> <driver name='qemu' type='raw' cache='none' io='native'/> >>> <source protocol='vhost-user' path='/tmp/vhost-blk.sock'> >>> </source> >>> <target dev='vda' bus='vhost-user-blk'/> >>> <boot order='1'/> >>> <alias name='virtio-disk0'/> >>> <address type='pci' domain='0x0000' bus='0x00' slot='0x07' >>> function='0x0'/> >>> </disk> >>> >> >> I think wiring this into <disk> makes more sense. <hostdev> is really an >> abstraction for assigning a (typically) physical host device to the VM, >> so it handles things like hiding a PCI device from the host, and passing >> that exact device to the VM. >> >> In the vhost-user-scsi/blk case, the host device is just a special >> process running on the other side of a socket, and the device >> represented to the guest is a typical virtio device. So to me it makes >> more sense as a <disk> with a <source> that points at that socket. >> >> target bus=virtio vs bus=scsi is already used to distinguish between >> virtio-blk and virtio-scsi, so I think we can keep that bit as is, with >> the <address type=drive|pci> to match. We just need to differentiate >> between plain virtio and vhost-user >> >> network devices already have vhostuser support: >> >> <interface type='vhostuser'> >> <source type='unix' path='/tmp/vhost1.sock' mode='server|client'/> >> <model type='virtio'/> >> </interface> >> >> Internally that <source> is a virDomainChrSourceDefPtr which is our >> internal representation of a chardev. So I think something akin to this >> is the way to go. It will likely require updating a LOT of places in the >> code that check disk type= field, probably most places that care about >> whether type=NETWORK or type=!NETWORK will need to be mirrored for the >> new type. >> >> <disk type='vhostuser' device='disk'> >> <source type='unix' path='/path/to/vhost-user-blk.sock' mode='client'/> >> <target dev='vda' bus='virtio'/> >> </disk> >> >> <disk type='vhostuser' device='disk'> >> <source type='unix' path='/path/to/vhost-user-scsi.sock' mode='client'/> >> <target dev='sda' bus='scsi'/> >> </disk> >> >> - Cole > - Cole

1 0

[libvirt] [PATCH v2 0/3] unplug timeout changes for PPC64
by Daniel Henrique Barboza 14 Oct '19

14 Oct '19

This is a redesign of the previous patch series [1]. After the reviews of the first version, I ended up discarding the idea of a qemu user configuration for the unplug timeout value. Instead, this patch series now handles the problematic case of PPC64 guests with an exclusive PPC64 only timeout value of 10 seconds. Patch 3 now changes how the 'unplug timeout' message is reported, using VIR_ERR_OPERATION_TIMEOUT instead of VIR_ERR_OPERATION_FAILED and making it clearer that the timeout does not equal to unplug failed. [1] https://www.redhat.com/archives/libvir-list/2019-August/msg00698.html Daniel Henrique Barboza (3): qemu: use a bigger unplug timeout for PPC64 guests qemu: Remove qemu_hotplugpriv.h and qemuDomainRemoveDeviceWaitTime qemu_hotplug: make setvcpus timeout error message user-friendlier src/qemu/Makefile.inc.am | 1 - src/qemu/qemu_conf.h | 3 +++ src/qemu/qemu_driver.c | 11 +++++++++++ src/qemu/qemu_hotplug.c | 21 +++++++++------------ src/qemu/qemu_hotplugpriv.h | 32 -------------------------------- tests/qemuhotplugtest.c | 3 +-- 6 files changed, 24 insertions(+), 47 deletions(-) delete mode 100644 src/qemu/qemu_hotplugpriv.h -- 2.21.0

2 7

[libvirt] libvirt doc - missing entry in input devices section
by Ruth Netser 13 Oct '19

13 Oct '19

The option <input type='tablet' bus='usb'/> is missing from code box under https://libvirt.org/formatdomain.html#elementsInput section. (Exists for the other devices). -- Ruty Netser

2 2

Re: [libvirt] [PATCH v2 1/1] IDE: deprecate ide-drive
by Peter Krempa 11 Oct '19

11 Oct '19

On Thu, Oct 10, 2019 at 13:22:37 +0200, Philippe Mathieu-Daudé wrote: > On 10/10/19 12:43 AM, John Snow wrote: > > It's an old compatibility shim that just delegates to ide-cd or ide-hd. > > I'd like to refactor these some day, and getting rid of the super-object > > will make that easier. > > > > Either way, we don't need this. > > > > Libvirt-checked-by: Peter Krempa <pkrempa(a)redhat.com> > > Peter made a comment regarding Laszlo's Regression-tested-by tag: > > [...] nobody else is using > this convention (there are exactly 0 instances of > "Regression-tested-by" in the project git log as far as > I can see), and so in practice people reading the commits > won't really know what you meant by it. Everybody else > on the project uses "Tested-by" to mean either of the > two cases you describe above, without distinction... > > It probably applies to 'Libvirt-checked-by' too. I certainly didn't test it. So feel free to drop that line altogether.

3 5

Re: [libvirt] [PATCH 0/4] PCI multifunction partial assignment support
by Abdulla Bubshait 11 Oct '19

11 Oct '19

On Mon, 7 Oct 2019 18:11:32 -0300 Daniel Henrique Barboza <danielhb413 gmail com> wrote: > These series tries to solve the partial assignment of multifunction > hostdev PCI devices by introducing a new hostdev attribute called > 'assigned'. This is how it works: > > - it is a boolean value that will be efffective just for > multifunction hostdev PCI devices, since there's no other > occurrence for this kind of use in Libvirt. Trying to > declare assign='yes|no' in any other PCI hostdev device > will cause parse errors; I think this functionality should be available to all hostdev PCI devices and not just multifunction ones. You might have several devices that are part of the same IOMMU group that you don't mind giving up from the host, but don't want to supply all of them to the guest. This would be an alternative to using ACS patch in these situations. One example is having two nvme drives in a single IOMMU group, you will be able to pass a single one to the guest rather than being forced to pass both.

2 1

[libvirt] [PATCH v5 0/1] add test for driver.c:virConnectValidateURIPath()
by Daniel Henrique Barboza 11 Oct '19

11 Oct '19

changes from v4: - other patches got merged, this is the last survivor - enhanced the code by attending to all suggestions from Cole Robinson v4: https://www.redhat.com/archives/libvir-list/2019-September/msg01164.html Daniel Henrique Barboza (1): tests: add a test for driver.c:virConnectValidateURIPath() tests/Makefile.am | 7 ++- tests/virdriverconnvalidatetest.c | 90 +++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+), 1 deletion(-) create mode 100644 tests/virdriverconnvalidatetest.c -- 2.21.0

2 2

[libvirt] [PATCH 0/3] security: Don't remember labels for TPM
by Michal Privoznik 11 Oct '19

11 Oct '19

As it turns out, /dev/tpm0 can't be opened more than once. This doesn't fit into our seclabel remembering approach and thus disable it for TPM devices. There's also another type of files which can't be opened more than once - /dev/vfio/N. Usually, this won't be a problem unless users try to attach/detach some devices from the same IOMMU group. This will require more treatment though because it's broken on more levels. 1) we remove /dev/vfio/N in private devtmpfs on device detach, even though there is another device still attached to domain from the same IOMMU group, 2) we remove the IOMMU group from CGroups, i.e. we effectively deny access to qemu 3) we restore seclabels (regardless of seclabel remembering) Therefore, I'm only addressing TPM issue here and will continue work on hostdevs. Michal Prívozník (3): security: Try to lock only paths with remember == true security_dac: Allow selective remember/recall for chardevs security: Don't remember labels for TPM src/security/security_dac.c | 91 ++++++++++++++++++++++----------- src/security/security_selinux.c | 16 +++--- 2 files changed, 71 insertions(+), 36 deletions(-) -- 2.21.0

2 7

[libvirt] [PATCH] security: apparmor: Allow RO /usr/share/edk2/
by Cole Robinson 11 Oct '19

11 Oct '19

On Fedora, already whitelisted paths to AAVMF and OVMF binaries are symlinks to binaries under /usr/share/edk2/. Add that directory to the RO whitelist so virt-aa-helper-test passes Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- I don't know if anyone is actually using apparmor on Fedora, but I have the libs installed now for testing. I think the better thing to do would be to adjust virt-aa-helper-test to not touch host state src/security/virt-aa-helper.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index d9f6b5638b..509187ac36 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -505,6 +505,7 @@ valid_path(const char *path, const bool readonly) "/vmlinuz", "/initrd", "/initrd.img", + "/usr/share/edk2/", "/usr/share/OVMF/", /* for OVMF images */ "/usr/share/ovmf/", /* for OVMF images */ "/usr/share/AAVMF/", /* for AAVMF images */ -- 2.23.0

2 1

[libvirt] [PATCH 0/2] tests: Add capabilities for QEMU 4.2.0 on ppc64 and aarch64
by Andrea Bolognani 11 Oct '19

11 Oct '19

This will be useful to test Jirka's changes to how we handle default CPU models on more architectures. The version posted to the list is heavily snipped, but you can grab the full one with $ git fetch https://gitlab.com/abologna/libvirt caps-4.2.0 Andrea Bolognani (2): tests: Add capabilitie for QEMU 4.2.0 on ppc64 tests: Add capabilitie for QEMU 4.2.0 on aarch64 .../caps_4.2.0.aarch64.replies | 20684 +++++++++++++ .../caps_4.2.0.aarch64.xml | 321 + .../caps_4.2.0.ppc64.replies | 24406 ++++++++++++++++ .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1087 + 4 files changed, 46498 insertions(+) create mode 100644 tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies create mode 100644 tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml create mode 100644 tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies create mode 100644 tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml -- 2.21.0

3 6

[libvirt] [jenkins-ci PATCH] lcitool: Force LANG=en_US.UTF-8 for the containers
by Fabiano Fidêncio 11 Oct '19

11 Oct '19

As we cannot and should not rely on how the containers were generated, let's force the container LANG to be en_US.UTF-8 otherwise some containers (Debian 9, Ubuntu 16, and Ubuntu 18) would simply bail when dealing with environment variables inherited from Gitlab CI which contains non-POSIX characteres, such as "Fidêncio". Unfortunately, there's no standard way to do this accross different distros, leaving us with this "happy little accident" of setting up LANG in the way it's done right now. Signed-off-by: Fabiano Fidêncio <fidencio(a)redhat.com> --- guests/lcitool | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/guests/lcitool b/guests/lcitool index 49bb50b..a630971 100755 --- a/guests/lcitool +++ b/guests/lcitool @@ -735,6 +735,10 @@ class Application: RUN pip3 install {pip_pkgs} """).format(**varmap)) + sys.stdout.write(textwrap.dedent(""" + ENV LANG "en_US.UTF-8" + """).format(**varmap)) + if args.cross_arch: sys.stdout.write(textwrap.dedent(""" ENV ABI "{cross_abi}" -- 2.23.0

3 3