- Devel - libvirt List Archives

[libvirt] [PATCH 00/47] extract cgroup v1 code to separate backend
by Pavel Hrdina 25 Sep '18

25 Sep '18

We will need to introduce cgroup v2 support which needs to co-exit with the current cgroup v1 implementation. In order to do that this patch series introduces virCgroupBackend structure and moves all cgroup v1 related code to separate file. There is no functional change. This series depends on [1] and you can pull it from [2]. [1] <https://www.redhat.com/archives/libvir-list/2018-September/msg00760.html> [2] <https://github.com/Antique/libvirt/tree/cgroupv1> Pavel Hrdina (47): util: introduce vircgroupbackend files vircgroup: introduce cgroup v1 backend files vircgroup: extract virCgroupV1Available vircgroup: detect available backend for cgroup vircgroup: extract virCgroupV1ValidateMachineGroup vircgroup: extract virCgroupV1CopyMounts vircgroup: extract v1 detect functions vircgroup: extract virCgroupV1CopyPlacement vircgroup: extract virCgroupV1ValidatePlacement vircgroup: extract virCgroupV1GetPlacement vircgroup: extract virCgroupV1DetectControllers vircgroup: extract virCgroupV1HasController vircgroup: extract virCgroupV1GetAnyController vircgroup: extract virCgroupV1PathOfController vircgroup: extract virCgroupV1MakeGroup vircgroup: extract virCgroupV1Remove vircgroup: extract virCgroupV1AddTask vircgroup: extract virCgroupV1HasEmptyTasks vircgroup: extract virCgroupV1BindMount vircgroup: extract virCgroupV1SetOwner vircgroup: extract virCgroupV1(Set|Get)BlkioWeight vircgroup: extract virCgroupV1GetBlkioIoServiced vircgroup: extract virCgroupV1GetBlkioIoDeviceServiced vircgroup: extract virCgroupV1(Set|Get)BlkioDeviceWeight vircgroup: extract virCgroupV1(Set|Get)BlkioDeviceReadIops vircgroup: extract virCgroupV1(Set|Get)BlkioDeviceWriteIops vircgroup: extract virCgroupV1(Set|Get)BlkioDeviceReadBps vircgroup: extract virCgroupV1(Set|Get)BlkioDeviceWriteBps vircgroup: extract virCgroupV1SetMemory vircgroup: extract virCgroupV1GetMemoryStat vircgroup: extract virCgroupV1GetMemoryUsage vircgroup: extract virCgroupV1(Set|Get)Memory*Limit vircgroup: extract virCgroupV1GetMemSwapUsage vircgroup: extract virCgroupV1(Allow|Deny)Device vircgroup: extract virCgroupV1(Allow|Deny)AllDevices vircgroup: extract virCgroupV1(Set|Get)CpuShares vircgroup: extract virCgroupV1(Set|Get)CpuCfsPeriod vircgroup: extract virCgroupV1(Set|Get)CpuCfsQuota vircgroup: extract virCgroupV1SupportsCpuBW vircgroup: extract virCgroupV1GetCpuacct*Usage vircgroup: extract virCgroupV1GetCpuacctStat vircgroup: extract virCgroupV1(Set|Get)FreezerState vircgroup: extract virCgroupV1(Set|Get)CpusetMems vircgroup: extract virCgroupV1(Set|Get)CpusetMemoryMigrate vircgroup: extract virCgroupV1(Set|Get)CpusetCpus vircgroup: rename virCgroupController into virCgroupV1Controller vircgroup: rename controllers to legacy src/Makefile.am | 2 + src/libvirt_private.syms | 6 + src/util/Makefile.inc.am | 4 + src/util/vircgroup.c | 1692 +++------------------------- src/util/vircgroupbackend.c | 66 ++ src/util/vircgroupbackend.h | 437 ++++++++ src/util/vircgrouppriv.h | 59 +- src/util/vircgroupv1.c | 2096 +++++++++++++++++++++++++++++++++++ src/util/vircgroupv1.h | 27 + tests/vircgrouptest.c | 52 +- 10 files changed, 2840 insertions(+), 1601 deletions(-) create mode 100644 src/util/vircgroupbackend.c create mode 100644 src/util/vircgroupbackend.h create mode 100644 src/util/vircgroupv1.c create mode 100644 src/util/vircgroupv1.h -- 2.17.1

3 150

[libvirt] [PATCH 0/6] syntax-check: Introduce a new rule to check misaligned stuff and fix it (batch I)
by Shi Lei 25 Sep '18

25 Sep '18

This series check misaligned stuff in parenthesis: 1. For misaligned arguments of function 2. For misaligned conditions of [if|while|switch|...] It adds a temporary filter for this new rule since there're too much misalignment. Now it just fix misalignment in src/util and it's the batch I. Next step, we need modify this path filter to finish all changes. Also, it simplifies the check-spacing.pl by adding wrapper functions before introducing the new rule. Thanks, Shi Lei Shi Lei (6): util: Fix misaligned arguments and misaligned conditions for [if|while|...] build-aux:check-spacing: Add wrapper function of CheckFunctionBody build-aux:check-spacing: Add wrapper function of KillComments build-aux:check-spacing: Add wrapper function of CheckWhiteSpaces build-aux:check-spacing: Add wrapper function of CheckCurlyBrackets build-aux:check-spacing: Introduce a new rule to check misaligned stuff in parenthesises build-aux/check-spacing.pl | 476 ++++++++++++++++++++----------- src/util/vircgroup.c | 34 +-- src/util/virconf.c | 4 +- src/util/virdbus.c | 2 +- src/util/virdnsmasq.c | 5 +- src/util/virerror.c | 2 +- src/util/virevent.c | 14 +- src/util/vireventpoll.c | 8 +- src/util/virfile.c | 6 +- src/util/virgic.c | 2 +- src/util/virhook.c | 2 +- src/util/virhostdev.c | 23 +- src/util/viridentity.c | 18 +- src/util/viriscsi.c | 22 +- src/util/virjson.c | 2 +- src/util/virkeycode.c | 22 +- src/util/virkeyfile.c | 6 +- src/util/virlockspace.c | 2 +- src/util/virlog.c | 18 +- src/util/virnetdev.c | 4 +- src/util/virnetdevbridge.c | 2 +- src/util/virnetdevip.c | 11 +- src/util/virnetdevmacvlan.c | 30 +- src/util/virnetdevopenvswitch.c | 34 +-- src/util/virnetdevvportprofile.c | 24 +- src/util/virnetlink.c | 10 +- src/util/virobject.c | 2 +- src/util/virpci.c | 4 +- src/util/virperf.c | 4 +- src/util/virprocess.c | 2 +- src/util/virqemu.c | 4 +- src/util/virresctrl.c | 7 +- src/util/virsocketaddr.c | 2 +- src/util/virstorageencryption.c | 2 +- src/util/virstoragefile.c | 60 ++-- src/util/virsysinfo.c | 2 +- src/util/viruri.c | 2 +- src/util/virutil.c | 2 +- src/util/virxml.c | 2 +- 39 files changed, 512 insertions(+), 366 deletions(-) -- 2.17.1

3 11

[libvirt] [PATCH v5 00/13] PCI passthrough support on s390
by Yi Min Zhao 25 Sep '18

25 Sep '18

Abstract ======== The PCI representation in QEMU has recently been extended for S390 allowing configuration of zPCI attributes like uid (user-defined identifier) and fid (PCI function identifier). The details can be found here: https://lists.gnu.org/archive/html/qemu-devel/2016-06/msg07262.html To support the new zPCI feature of the S390 platform, two new XML attributes, @uid and @fid, are introduced for device addresses of type 'pci', i.e.: <hostdev mode='subsystem' type='pci'> <driver name='vfio'/> <source> <address domain='0x0001' bus='0x00' slot='0x00' function='0x0'/> </source> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0' uid='0x0003' fid='0x00000027'/> </hostdev> uid and fid are optional attributes. If they are defined by the user, unique values within the guest domain must be used. If they are not specified and the architecture requires them, they are automatically generated with non-conflicting values. Current implementation is the most seamless one for the user as it unites the address specific data of a PCI device on one XML element. It could accommodate both specifying our special parameters (uid and fid) and re-using standard statements (domain, bus, slot and function) for PCI devices. User can still specify bus/slot/function for the virtualized PCI devices in the XML. Thus uid/fid act as an extension to the PCI address and are stored in a new structure 'virZPCIDeviceAddress' which is a member of common PCI Address structure. Additionally, two hashtables are used for assignment and reservation of uid/fid. In support of extending the PCI address, a new PCI address extension flag is introduced. This extension flag allows is not only dedicated for the S390 platform but also other architectures needing certain extensions to PCI address space. Code Base ========= commit in master: 2f6ff0da5b qemu: Don't overwrite stats in qemuDomainBlocksStatsGather Change Log ========== v4->v5: 1. Update the version number. 2. Fixup code style error. 3. Separate qemu code into single patch. 4. Rebase the patches to the new code of master branch. v3->v4: 1. Update docs. 2. Format code style. 3. Optimize zPCI support check. 4. Move the check of zPCI defined in xml but unsupported by Qemu to qemuDomainDeviceDefValidate(). 5. Change zpci address member of PCI address struct from pointer to instance. 6. Modify zpci address definition principle. Currently the user must either define both of uid and fid or not. v2->v3: 1. Revise code style. 2. Update test cases. 3. Introduce qemuDomainCollectPCIAddressExtension() to collect PCI extension addresses. 4. Introduce virDeviceInfoPCIAddressExtensionPresent() to check if zPCI address exists. 5. Optimize zPCI address check logic. 6. Optimize passed parameters of zPCI addr alloc/release/reserve functions. 7. Report enum range error in qemuDomainDeviceSupportZPCI(). 8. Update commit messages. v1->v2: 1. Separate test commit and merge testcases into corresponding commits that introduce the functionalities firstly. 2. Spare some checks for zpci device. 3. Add vsock and controller support. 4. Add uin32 type schema. 5. Rename zpciuid and zpcifid to zpci_uid and zpci_fid. 6. Always return multibus support on S390. Yi Min Zhao (13): conf: Add definitions for 'uid' and 'fid' PCI address attributes qemu: Introduce zPCI capability conf: Introduce a new PCI address extension flag qemu: Enable PCI multi bus for S390 guests qemu: Auto add pci-root for s390/s390x guests conf: Introduce address caching for PCI extensions conf: Introduce parser, formatter for uid and fid qemu: Add zPCI address definition check conf: Allocate/release 'uid' and 'fid' in PCI address qemu: Generate and use zPCI device in QEMU command line qemu: Add hotpluging support for PCI devices on S390 guests docs: Add 'uid' and 'fid' information news: Update news for PCI address extension attributes cfg.mk | 1 + docs/formatdomain.html.in | 9 +- docs/news.xml | 10 + docs/schemas/basictypes.rng | 23 ++ docs/schemas/domaincommon.rng | 1 + src/conf/device_conf.c | 76 +++++ src/conf/device_conf.h | 4 + src/conf/domain_addr.c | 330 +++++++++++++++++++++ src/conf/domain_addr.h | 29 ++ src/conf/domain_conf.c | 6 + src/libvirt_private.syms | 6 + src/qemu/qemu_capabilities.c | 6 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 95 ++++++ src/qemu/qemu_command.h | 2 + src/qemu/qemu_domain.c | 27 ++ src/qemu/qemu_domain_address.c | 205 ++++++++++++- src/qemu/qemu_hotplug.c | 151 +++++++++- src/util/virpci.h | 11 + tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 + tests/qemuxml2argvdata/disk-virtio-s390-zpci.args | 26 ++ tests/qemuxml2argvdata/disk-virtio-s390-zpci.xml | 17 ++ .../hostdev-vfio-zpci-autogenerate.args | 25 ++ .../hostdev-vfio-zpci-autogenerate.xml | 18 ++ .../hostdev-vfio-zpci-boundaries.args | 29 ++ .../hostdev-vfio-zpci-boundaries.xml | 26 ++ .../hostdev-vfio-zpci-multidomain-many.args | 39 +++ .../hostdev-vfio-zpci-multidomain-many.xml | 67 +++++ tests/qemuxml2argvdata/hostdev-vfio-zpci.args | 25 ++ tests/qemuxml2argvdata/hostdev-vfio-zpci.xml | 19 ++ tests/qemuxml2argvtest.c | 20 ++ tests/qemuxml2xmloutdata/disk-virtio-s390-zpci.xml | 29 ++ .../hostdev-vfio-zpci-autogenerate.xml | 30 ++ .../hostdev-vfio-zpci-boundaries.xml | 42 +++ .../hostdev-vfio-zpci-multidomain-many.xml | 79 +++++ tests/qemuxml2xmloutdata/hostdev-vfio-zpci.xml | 30 ++ tests/qemuxml2xmltest.c | 17 ++ 42 files changed, 1523 insertions(+), 14 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-virtio-s390-zpci.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-s390-zpci.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci.args create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci.xml create mode 100644 tests/qemuxml2xmloutdata/disk-virtio-s390-zpci.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-vfio-zpci-boundaries.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-vfio-zpci-multidomain-many.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-vfio-zpci.xml -- Yi Min

2 53

[libvirt] [PATCH v4 0/4] block/rbd: enable filename parsing on open
by Jeff Cody 25 Sep '18

25 Sep '18

Changes from v3: ================ Patch 4: Typo fixed [Eric] Added examples [Eric] Changes from v2: ================= Patch 4: New, document deprecation. [Eric] Patch 3,2: Add r-b's Changes from v1: ================= Patch 1: Don't pass unused BlockDriverState to helper function Patch 2: Do not allow mixed usage; fail if keyvalue is present [Eric] Add deprecation warning [John] Pull legacy parsing code into function [John] Fixed filename leak Patch 3: New; iotest 231. [Eric] iotest failure on current master: QA output created by 231 -qemu-img: RBD options encoded in the filename as keyvalue pairs is deprecated. Future versions may cease to parse these options in the future. -unable to get monitor info from DNS SRV with service name: ceph-mon -no monitors specified to connect to. -qemu-img: Could not open 'json:{'file.driver':'rbd','file.filename':'rbd:rbd/bogus:conf=BOGUS_CONF'}': error connecting: No such file or directory +qemu-img: Could not open 'json:{'file.driver':'rbd','file.filename':'rbd:rbd/bogus:conf=BOGUS_CONF'}': Parameter 'pool' is missing unable to get monitor info from DNS SRV with service name: ceph-mon no monitors specified to connect to. qemu-img: Could not open 'json:{'file.driver':'rbd','file.pool':'rbd','file.image':'bogus','file.conf':'BOGUS_CONF'}': error connecting: No such file or directory Failures: 231 Failed 1 of 1 tests Jeff Cody (4): block/rbd: pull out qemu_rbd_convert_options block/rbd: Attempt to parse legacy filenames block/rbd: add iotest for rbd legacy keyvalue filename parsing block/rbd: add deprecation documentation for filename keyvalue pairs block/rbd.c | 89 ++++++++++++++++++++++++++++++++------ qemu-deprecated.texi | 15 +++++++ tests/qemu-iotests/231 | 62 ++++++++++++++++++++++++++ tests/qemu-iotests/231.out | 9 ++++ tests/qemu-iotests/group | 1 + 5 files changed, 162 insertions(+), 14 deletions(-) create mode 100755 tests/qemu-iotests/231 create mode 100644 tests/qemu-iotests/231.out -- 2.17.1

2 7

[libvirt] [PATCH 00/10] libxl: PVHv2 support
by Marek Marczykowski-Górecki 24 Sep '18

24 Sep '18

This is a respin of my old PVHv1 patch[1], converted to PVHv2. Should the code use "PVH" name (as libxl does internally), or "PVHv2" as in many places in Xen documentation? I've chosen the former, but want to confirm it. Also, not sure about VIR_DOMAIN_OSTYPE_XENPVH (as discussed on PVHv1 patch) - while it will be messy in many cases, there is libxl_domain_build_info.u.{hvm,pv,pvh} which would be good to not mess up. Also, PVHv2 needs different kernel features than PV (CONFIG_XEN_PVH vs CONFIG_XEN_PV), so keeping the same VIR_DOMAIN_OSTYPE_XEN could be confusing. On the other hand, libxl_domain_build_info.u.pv is used in very few places (one section of libxlMakeDomBuildInfo), so guarding u.hvm access with VIR_DOMAIN_OSTYPE_HVM may be enough. For now I've reused VIR_DOMAIN_OSTYPE_XEN - in the driver itself, most of the code is the same as for PV. Since PVHv2 relies on features in newer Xen versions, I needed to convert also some older code. For example b_info->u.hvm.nested_hvm was deprecated in favor of b_info->nested_hvm. While the code do handle both old and new versions (obviously refusing PVHv2 if Xen is too old), this isn't the case for tests. How it should be handled, if at all? First few preparatory patches can be applied independently. [1] https://www.redhat.com/archives/libvir-list/2016-August/msg00376.html Marek Marczykowski-Górecki (10): docs: don't refer to deprecated 'linux' ostype in example docs: add documentation of arch element of capabilities.xml docs: update domain schema for machine attribute libxl: set shadow memory for any guest type, not only HVM libxl: prefer new location of nested_hvm in libxl_domain_build_info libxl: reorder libxlMakeDomBuildInfo for upcoming PVH support libxl: add support for PVH tests: add basic Xen PVH test xenconfig: add support for parsing type= xl config entry xenconfig: add support for type="pvh" docs/formatcaps.html.in | 20 +++- docs/formatdomain.html.in | 12 +- docs/schemas/domaincommon.rng | 3 +- src/libxl/libxl_capabilities.c | 23 +++- src/libxl/libxl_conf.c | 90 ++++++++++++----- src/libxl/libxl_driver.c | 6 +- src/xenconfig/xen_common.c | 27 ++++- src/xenconfig/xen_xl.c | 5 +- tests/libxlxml2domconfigdata/basic-pv.json | 1 +- tests/libxlxml2domconfigdata/basic-pvh.json | 49 +++++++++- tests/libxlxml2domconfigdata/basic-pvh.xml | 28 +++++- tests/libxlxml2domconfigdata/fullvirt-cpuid.json | 2 +- tests/libxlxml2domconfigdata/multiple-ip.json | 1 +- tests/libxlxml2domconfigdata/vnuma-hvm.json | 2 +- tests/libxlxml2domconfigtest.c | 1 +- tests/testutilsxen.c | 3 +- tests/xlconfigdata/test-fullvirt-type.cfg | 21 ++++- tests/xlconfigdata/test-fullvirt-type.xml | 27 +++++- tests/xlconfigdata/test-paravirt-type.cfg | 13 ++- tests/xlconfigdata/test-paravirt-type.xml | 25 +++++- tests/xlconfigdata/test-pvh-type.cfg | 13 ++- tests/xlconfigdata/test-pvh-type.xml | 25 +++++- tests/xlconfigtest.c | 3 +- 23 files changed, 358 insertions(+), 42 deletions(-) create mode 100644 tests/libxlxml2domconfigdata/basic-pvh.json create mode 100644 tests/libxlxml2domconfigdata/basic-pvh.xml create mode 100644 tests/xlconfigdata/test-fullvirt-type.cfg create mode 100644 tests/xlconfigdata/test-fullvirt-type.xml create mode 100644 tests/xlconfigdata/test-paravirt-type.cfg create mode 100644 tests/xlconfigdata/test-paravirt-type.xml create mode 100644 tests/xlconfigdata/test-pvh-type.cfg create mode 100644 tests/xlconfigdata/test-pvh-type.xml base-commit: 49a5fcfac7d13ac8082a80aff7d7156968afee0f -- git-series 0.9.1

4 29

[libvirt] [PATCH v2 0/2] Fix some Coverity found issues.
by John Ferlan 24 Sep '18

24 Sep '18

v1: https://www.redhat.com/archives/libvir-list/2018-September/msg01115.html Already pushed patch 1 and 3 from v1, just reworked patch 2 (the lxc change) based on review and repost. John Ferlan (2): lxc: Remove unnecessary error label lxc: Resolve memory leak src/lxc/lxc_native.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) -- 2.17.1

2 3

[libvirt] [PATCH 0/3] Fix some Coverity found issues.
by John Ferlan 24 Sep '18

24 Sep '18

Updated to a more recent Coverity checker and it found some new issues. The last one perhaps could be a false positive, I don't really know for sure, but there's enough instances that I figured it was worth the patch. John Ferlan (3): conf: Alter when ctxt->node is set lxc: Resolve memory leak tests: Resolve possible overrun src/conf/domain_conf.c | 8 +-- src/lxc/lxc_native.c | 110 +++++++++++++++++++++++------------------ tests/vircgroupmock.c | 21 ++++---- 3 files changed, 79 insertions(+), 60 deletions(-) -- 2.17.1

2 9

[libvirt] [PATCH] tools: Fix printf format
by Michal Privoznik 24 Sep '18

24 Sep '18

We're passing size_t but using format for unsigned long. Introduced in latest vshTable rework patches. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under build breaker and trivial rules. tools/virsh-domain.c | 2 +- tools/virt-admin.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 2a416b919a..cfb0095333 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6949,7 +6949,7 @@ virshVcpuPinQuery(vshControl *ctl, if (!(pinInfo = virBitmapDataFormat(cpumap, cpumaplen))) goto cleanup; - if (virAsprintf(&vcpuStr, "%lu", i) < 0) + if (virAsprintf(&vcpuStr, "%zu", i) < 0) goto cleanup; if (vshTableRowAppend(table, vcpuStr, pinInfo, NULL) < 0) diff --git a/tools/virt-admin.c b/tools/virt-admin.c index ce74489edf..77928ddb80 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -398,7 +398,7 @@ cmdSrvList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) for (i = 0; i < nsrvs; i++) { VIR_AUTOFREE(char *) idStr = NULL; - if (virAsprintf(&idStr, "%lu", i) < 0) + if (virAsprintf(&idStr, "%zu", i) < 0) goto cleanup; if (vshTableRowAppend(table, -- 2.16.4

1 0

[libvirt] [libvirt PATCH v3 0/4] Share cgroup code that is duplicated between QEMU and LXC
by Fabiano Fidêncio 24 Sep '18

24 Sep '18

virLXCCgroupSetupBlkioTune() and qemuSetupBlkioCgroup() and virLXCCgroupSetupCpuTune() and qemuSetupCpuCgroup() are the most similar functions between QEMU and LXC code. Let's move their common code to virCgroup. Mind that the first two patches are basically preparing the ground for the changes introduced in the last two patches. I know that Pavel Hrdina suggested taking a different path[0] for this series but I do believe Michal's and Jano's points are valid, thus I've decided to just do the changes suggested by Michal (at least for now). [0]: https://www.redhat.com/archives/libvir-list/2018-September/msg00534.html changes since v1: - Michal Privoznik pointed out (as did the `make syntax-check` :-)) that we do want to keep src/util independently of the parsing code (thus, including "conf/domain_conf.h" in vircgroup.h is not the way to go). This has been solved now by partially following Michal's suggestion and splitting the structs and functions that would be use in the common code to new different files. changes since v2: - Fixed `make syntax-check` errors that I've missed before (didn't have cppi installed); - Created a new section in src/libvirt_private.syms to correctly export the virBlkioDeviceArrayClear symbol; - Removed a virlkio.c from libvirt_setuid_rpc_client_la__SOURCES (why did I add it there in the first place? ;-)) - Explicitly included virmem.h in qemu_{domain,command}.c. Although there's nothing enforcing it, I do believe it's a good practive that should be followed and I've checked with Andrea and Peter about doing that and both agreed with the approach. Fabiano Fidêncio (4): domain_conf: split out virBlkioDevice and virDomainBlkiotune definitions domain_conf: split out virDomainMemtune and virDomainHugePage definitions vircgroup: Add virCgroupSetupBlkioTune() vircgroup: Add virCgroupSetupMemTune() src/conf/domain_conf.c | 22 ++++-------- src/conf/domain_conf.h | 70 +++---------------------------------- src/libvirt_private.syms | 7 +++- src/lxc/lxc_cgroup.c | 69 ++----------------------------------- src/qemu/qemu_cgroup.c | 61 ++------------------------------- src/qemu/qemu_command.c | 5 +-- src/qemu/qemu_domain.c | 3 +- src/util/Makefile.inc.am | 2 ++ src/util/virblkio.c | 37 ++++++++++++++++++++ src/util/virblkio.h | 52 ++++++++++++++++++++++++++++ src/util/vircgroup.c | 74 ++++++++++++++++++++++++++++++++++++++++ src/util/vircgroup.h | 5 +++ src/util/virmem.h | 66 +++++++++++++++++++++++++++++++++++ 13 files changed, 263 insertions(+), 210 deletions(-) create mode 100644 src/util/virblkio.c create mode 100644 src/util/virblkio.h create mode 100644 src/util/virmem.h -- 2.17.1 Subject: [libvirt PATCH v2 0/4] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit

3 6

[libvirt] [PATCH libvirt-python 0/2] event-test.py fixes
by Philipp Hahn 24 Sep '18

24 Sep '18

Hello, event-test.py is bad at handling newer livecycle events. Attached are two patches to improve that. Philipp Hahn (2): event-test.py: Sync list of domain lifecycle events event-test.py: Future proof lifecycle event handling examples/event-test.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) -- 2.11.0

3 29

[libvirt] [PATCH v2 00/13] Implement vsh-table API to virsh and virt-admin
by Simon Kobyda 24 Sep '18

24 Sep '18

API is implemented in virsh and virt-admin. It fixes problems with table-alignment, makes tables more readable and deals with unicode. Table however could not be implemented in places, which do use simple lists, or table implementation would change content of output, which users might rely on. If you know about other place where it could be implemented, let me know. https://bugzilla.redhat.com/show_bug.cgi?id=1574624 https://bugzilla.redhat.com/show_bug.cgi?id=1584630 Changes in v2: - Implemented gettext function - Fixed few possible leaks caused by inserting "goto cleanup" statements - Implemented VIR_AUTOFREE where it's appropriate Simon Kobyda (13): virsh: Implement vsh-table to iface-list virsh: Implement vshTable API to net-list and net-dhcp-leases virsh: Implement vshTable API to secret-list virsh: Implement vshTable API to nwfilter-list and nwfilterbinding-list virsh: Implement vshTable API to snapshot-list. virsh: Set up cmdDomblkinfo() and cmdDomblkinfoPrint() for vshTable API implementation virsh: Implement vshTable API to domblkinfo virsh: Implement vshTable API to domblklist virsh: Implement vshTable API to domiflist virsh: Implement vshTable API to vcpupin, iothreadinfo, domfsinfo virsh: Implement vshTable API to pool-list virsh: Implement vshTable API to vol-list virt-admin: Implement vshTable API to server-list and client-list tools/virsh-domain-monitor.c | 147 ++++++++++++++++--------------- tools/virsh-domain.c | 98 +++++++++++++++------ tools/virsh-interface.c | 27 ++++-- tools/virsh-network.c | 59 ++++++++----- tools/virsh-nwfilter.c | 47 +++++++--- tools/virsh-pool.c | 162 +++++++---------------------------- tools/virsh-secret.c | 28 ++++-- tools/virsh-snapshot.c | 33 ++++--- tools/virsh-volume.c | 129 ++++++---------------------- tools/virt-admin.c | 47 +++++++--- 10 files changed, 371 insertions(+), 406 deletions(-) -- 2.17.1

2 14

[libvirt] [PATCH 0/5] qemu: Change the way we generate VIR_DOMAIN_EVENT_RESUMED
by Jiri Denemark 22 Sep '18

22 Sep '18

https://bugzilla.redhat.com/show_bug.cgi?id=1612943 Jiri Denemark (5): qemu: Properly report VIR_DOMAIN_EVENT_RESUMED_FROM_SNAPSHOT qemu: Report more appropriate running reasons qemu: Pass running reason to RESUME event handler qemu: Map running reason to resume event detail qemu: Avoid duplicate resume events and state changes src/qemu/qemu_domain.c | 29 ++++++++++++++++++++++++ src/qemu/qemu_domain.h | 7 ++++++ src/qemu/qemu_driver.c | 13 ----------- src/qemu/qemu_migration.c | 36 +++++------------------------- src/qemu/qemu_process.c | 46 ++++++++++++++++++++++++--------------- 5 files changed, 71 insertions(+), 60 deletions(-) -- 2.19.0

2 14

[libvirt] [PATCH] qemuProcess: update hostdevs before connectting qemu monitor
by Wu Zongyong 22 Sep '18

22 Sep '18

In a following case: virsh start $domain service libvirtd stop <shutdown> the guest from within the $domain service libvirtd start Notice that PCI devices which have been assigned to the $domain will still be bound to stub drivers instead rebound to host drivers. In that case the call stack is like below: libvirtd start qemuProcessReconnect qemuProcessStop qemuHostdevReAttachDomainDevices qemuHostdevReAttachPCIDevices virHostdevReAttachPCIDevices qemuHostdevUpdateActiveDomainDevices won't be called because the monitor channel is closed. So host devices in $domain will not be added to either activePCIHostdevs list or inactivePCIHostdev list. And therefore, virHostdevReAttachPCIDevices just neglects these host PCI devices which are bound to stub drivers and don't rebind them to host drivers. This patch fixs that by moving qemuHostdevUpdateActiveDomainDevices before qemuConnectMonitor. Signed-off-by: Wu Zongyong <cordius.wu(a)huawei.com> --- src/qemu/qemu_process.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index f9a01da..d187271 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7783,6 +7783,9 @@ qemuProcessReconnect(void *opaque) * allowReboot in status XML and we need to initialize it. */ qemuProcessPrepareAllowReboot(obj); + if (qemuHostdevUpdateActiveDomainDevices(driver, obj->def) < 0) + goto error; + if (priv->qemuCaps && virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_CHARDEV_FD_PASS)) retry = false; @@ -7794,9 +7797,6 @@ qemuProcessReconnect(void *opaque) if (qemuConnectMonitor(driver, obj, QEMU_ASYNC_JOB_NONE, retry, NULL) < 0) goto error; - if (qemuHostdevUpdateActiveDomainDevices(driver, obj->def) < 0) - goto error; - priv->machineName = qemuDomainGetMachineName(obj); if (!priv->machineName) goto error; -- 1.9.1

2 1

[libvirt] [PATCH v4 0/4] qemu: Fix deadlock if create qemuProcessReconnect thread failed
by Wang Yechao 22 Sep '18

22 Sep '18

v3 patch: https://www.redhat.com/archives/libvir-list/2018-September/msg00950.html --- Changes in v4: - Split up v3 into four parts Wang Yechao (4): qemu: Split up qemuDomainRemoveInactive qemu: Create a qemuDomainRemoveInactiveLocked qemu: Create a qemuDomainRemoveInactiveJobLocked qemu: Fix deadlock if create qemuProcessReconnect thread failed src/qemu/qemu_domain.c | 79 ++++++++++++++++++++++++++++++++++++++++--------- src/qemu/qemu_domain.h | 3 ++ src/qemu/qemu_process.c | 2 +- 3 files changed, 69 insertions(+), 15 deletions(-) -- 1.8.3.1

2 5

[libvirt] [PATCH 0/2] tests: Add QEMU 3.0.0 capability tests for s390x
by Boris Fiuczynski 21 Sep '18

21 Sep '18

Add capability and domcaps tests for QEMU 3.0.0 on s390x. Boris Fiuczynski (2): tests: Add capabilities data for QEMU 3.0.0 on s390x tests: domaincaps: Add QEMU 3.0 for s390x .../domaincapsschemadata/qemu_3.0.0.s390x.xml | 183 + tests/domaincapstest.c | 4 + .../caps_3.0.0.s390x.replies | 20530 ++++++++++++++++ .../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 2691 ++ tests/qemucapabilitiestest.c | 1 + 5 files changed, 23409 insertions(+) create mode 100644 tests/domaincapsschemadata/qemu_3.0.0.s390x.xml create mode 100644 tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies create mode 100644 tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml -- 2.17.0

3 9

[libvirt] [PATCH 00/13] Implement vsh-table API to virsh and virt-admin
by Simon Kobyda 21 Sep '18

21 Sep '18

API is implemented in virsh and virt-admin. It fixes problems with table-alignment, makes tables more readable and deals with unicode. Table however could not be implemented in places, which do use simple lists, or table implementation would change content of output, which users might rely on. If you know about other place where it could be implemented, let me know. https://bugzilla.redhat.com/show_bug.cgi?id=1574624 https://bugzilla.redhat.com/show_bug.cgi?id=1584630 Simon Kobyda (13): virsh: Implement vsh-table to iface-list virsh: Implement vshTable API to net-list and net-dhcp-leases virsh: Implement vshTable API to secret-list virsh: Implement vshTable API to nwfilter-list and nwfilterbinding-list virsh: Implement vshTable API to snapshot-list. virsh: Set up cmdDomblkinfo() and cmdDomblkinfoPrint() for vshTable API implementation virsh: Implement vshTable API to domblkinfo virsh: Implement vshTable API to domblklist virsh: Implement vshTable API to domiflist virsh: Implement vshTable API to vcpupin, iothreadinfo, domfsinfo virsh: Implement vshTable API to pool-list virsh: Implement vshTable API to vol-list virt-admin: Implement vshTable API to server-list and client-list tools/virsh-domain-monitor.c | 131 +++++++++++++++------------- tools/virsh-domain.c | 95 +++++++++++++++------ tools/virsh-interface.c | 27 ++++-- tools/virsh-network.c | 55 ++++++++---- tools/virsh-nwfilter.c | 47 +++++++--- tools/virsh-pool.c | 160 +++++++---------------------------- tools/virsh-secret.c | 30 +++++-- tools/virsh-snapshot.c | 33 +++++--- tools/virsh-volume.c | 127 ++++++--------------------- tools/virt-admin.c | 46 +++++++--- 10 files changed, 367 insertions(+), 384 deletions(-) -- 2.17.1

3 19

[libvirt] [PATCH 0/2] qemu: Drop QEMU_CAPS_DEVICE_SCSI_GENERIC
by Andrea Bolognani 21 Sep '18

21 Sep '18

2 3

[libvirt] [PATCH v2] virsh: Don't break loop of domblkinfo for disks
by Han Han 21 Sep '18

21 Sep '18

https://bugzilla.redhat.com/show_bug.cgi?id=1619625 --all option is added to cmdDomblkinfo since commit 62c39193 allowing to show all block devices info. Reset error when empty source in case error breaks the loop of domblkinfo for disks. Signed-off-by: Han Han <hhan(a)redhat.com> --- tools/virsh-domain-monitor.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index b9b4f9739b..576610f005 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -475,6 +475,7 @@ cmdDomblkinfo(vshControl *ctl, const vshCmd *cmd) int ndisks; size_t i; xmlNodePtr *disks = NULL; + char *source = NULL; char *target = NULL; char *protocol = NULL; @@ -505,16 +506,18 @@ cmdDomblkinfo(vshControl *ctl, const vshCmd *cmd) for (i = 0; i < ndisks; i++) { ctxt->node = disks[i]; + source = virXPathString("string(./source)", ctxt); protocol = virXPathString("string(./source/@protocol)", ctxt); target = virXPathString("string(./target/@dev)", ctxt); rc = virDomainGetBlockInfo(dom, target, &info, 0); if (rc < 0) { - /* If protocol is present that's an indication of a networked - * storage device which cannot provide statistics, so generate - * 0 based data and get the next disk. */ - if (protocol && !active && + /* For the case of empty cdrom, networked disk which cannot + * provide statistics, generate 0 based data and get the next + * disk. + */ + if (!source && protocol && !active && virGetLastErrorCode() == VIR_ERR_INTERNAL_ERROR && virGetLastErrorDomain() == VIR_FROM_STORAGE) { memset(&info, 0, sizeof(info)); @@ -526,6 +529,7 @@ cmdDomblkinfo(vshControl *ctl, const vshCmd *cmd) cmdDomblkinfoPrint(ctl, &info, target, human, false); + VIR_FREE(source); VIR_FREE(target); VIR_FREE(protocol); } @@ -540,6 +544,7 @@ cmdDomblkinfo(vshControl *ctl, const vshCmd *cmd) cleanup: virshDomainFree(dom); + VIR_FREE(source); VIR_FREE(target); VIR_FREE(protocol); VIR_FREE(disks); -- 2.18.0

3 2

[libvirt] [PATCH 0/2] Couple of vhostuser fixes
by Michal Privoznik 21 Sep '18

21 Sep '18

Almost trivial ones. Michal Prívozník (2): qemu_hotplug: Fetch vhostuser ifname on hotplug virsh: Display vhostuser socket path in domiflist src/qemu/qemu_hotplug.c | 5 +++++ tools/virsh-domain-monitor.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) -- 2.16.4

2 4

[libvirt] [QEMU PATCH v2 0/4] Deprecation patches net and enforce-config-section
by Thomas Huth 21 Sep '18

21 Sep '18

Deprecate the "name" parameter for -net, and "enforce-config-section" of -machine. v2: - Split the single net patch into multiple smaller patches - Add patch to deprecate enforce-config-section Thomas Huth (4): Makefile: Add missing dependency for qemu-deprecated.texi net: Deprecate the "name" parameter of -net net/slirp: Deprecate the [hub_id name] parameter tuple hw/core/machine: Officially deprecate the enforce-config-section parameter Makefile | 2 +- hw/core/machine.c | 3 +++ net/net.c | 4 ++++ net/slirp.c | 2 ++ qemu-deprecated.texi | 17 +++++++++++++++++ 5 files changed, 27 insertions(+), 1 deletion(-) -- 1.8.3.1

4 13

[libvirt] [QEMU PATCH] net: Deprecate the old way of using a legacy net via "name" instead of "id"
by Thomas Huth 21 Sep '18

21 Sep '18

In early times, network backends were specified by a "vlan" and "name" tuple. With the introduction of netdevs, the "name" was replaced by an "id" (which is supposed to be unique), but the "name" parameter stayed as an alias which could be used instead of "id". Unfortunately, we miss the duplication check for "name": $ qemu-system-x86_64 -net user,name=n1 -net user,name=n1 ... starts without an error, while "id" correctly complains: $ qemu-system-x86_64 -net user,id=n1 -net user,id=n1 qemu-system-x86_64: -net user,id=n1: Duplicate ID 'n1' for net Instead of trying to fix the code for the legacy "name" parameter, let's rather get rid of this old interface and deprecate the "name" parameter now - this will also be less confusing for the users in the long run. While we're at it, also deprecate the old syntax for the hostfwd_add and hostfwd_remove commands that still work with this legacy "hub" plus "name" tuple. It is enough to specify the netdev id there instead. Also add a missing dependency to the Makefile to make sure that the docs get correctly regenerated when qemu-deprecated.texi is changed. Signed-off-by: Thomas Huth <thuth(a)redhat.com> --- Makefile | 2 +- net/net.c | 4 ++++ net/slirp.c | 2 ++ qemu-deprecated.texi | 13 +++++++++++++ 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index fe623e4..f42e176 100644 --- a/Makefile +++ b/Makefile @@ -978,7 +978,7 @@ txt: qemu-doc.txt docs/interop/qemu-qmp-ref.txt docs/interop/qemu-ga-ref.txt qemu-doc.html qemu-doc.info qemu-doc.pdf qemu-doc.txt: \ qemu-img.texi qemu-nbd.texi qemu-options.texi qemu-option-trace.texi \ - qemu-monitor.texi qemu-img-cmds.texi qemu-ga.texi \ + qemu-deprecated.texi qemu-monitor.texi qemu-img-cmds.texi qemu-ga.texi \ qemu-monitor-info.texi docs/qemu-block-drivers.texi \ docs/qemu-cpu-models.texi diff --git a/net/net.c b/net/net.c index 2a31339..cdcd5cf 100644 --- a/net/net.c +++ b/net/net.c @@ -984,6 +984,10 @@ static int net_client_init1(const void *object, bool is_netdev, Error **errp) /* missing optional values have been initialized to "all bits zero" */ name = net->has_id ? net->id : net->name; + if (net->has_name) { + warn_report("The 'name' parameter is deprecated, use 'id' instead"); + } + /* Map the old options to the new flat type */ switch (opts->type) { case NET_LEGACY_OPTIONS_TYPE_NONE: diff --git a/net/slirp.c b/net/slirp.c index c18060f..073bc69 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -404,6 +404,8 @@ static SlirpState *slirp_lookup(Monitor *mon, const char *hub_id, monitor_printf(mon, "unrecognized (hub-id, stackname) pair\n"); return NULL; } + warn_report("Using 'hub-id' is deprecated. Specify the netdev id " + "directly instead"); } else { nc = qemu_find_netdev(name); if (!nc) { diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 8a2e399..eed7132 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -83,6 +83,11 @@ The 'file' driver for drives is no longer appropriate for character or host devices and will only accept regular files (S_IFREG). The correct driver for these file types is 'host_cdrom' or 'host_device' as appropriate. +@subsection -net ...,name=@var{name} (since 3.1) + +The @option{name} parameter of the @option{-net} option is an old synonym +for the @option{id} parameter which should now be used instead. + @section QEMU Machine Protocol (QMP) commands @subsection block-dirty-bitmap-add "autoload" parameter (since 2.12.0) @@ -99,6 +104,14 @@ The ``query-cpus'' command is replaced by the ``query-cpus-fast'' command. The ``arch'' output member of the ``query-cpus-fast'' command is replaced by the ``target'' output member. +@section System emulator human monitor commands + +@subsection The hub_id parameter of 'hostfwd_add' / 'hostfwd_remove' (since 3.1) + +The @option{hub_id} parameter of the 'hostfwd_add' and 'hostfwd_remove' HMP +commands is redundant. It is enough to specify the netdev ID of the backend +that should be changed. + @section System emulator devices @subsection ivshmem (since 2.6.0) -- 1.8.3.1

4 5

[libvirt] [libvirt PATCH v7 0/6] Finish the conversion to virConfGetValue* functions
by Fabiano Fidêncio 20 Sep '18

20 Sep '18

This patchset finishes the conversion to virConfGetValue* functions, started by Daniel Berrange a few months ago. Please, mind that although we could make virConfGetValue* functions more generic in order to support numbers and booleans as strings, that doesn't seem the safest path to take. The side-effect of this is that we will have to live with some specific code doing that as part of vmx and xen_common. Once this patchset gets merged, https://wiki.libvirt.org/page/BiteSizedTasks#Finish_conversion_to_virConfGe… can be removed. - Changes since v1: All the "values" from virConfGetValueString() are freed - Changes since v2: All comments from Ján Tomko have been addressed; A few leaks were (possibly) found and they're addressed in the last patch of the series; - Changes since v3: All comments from Ján Tomko have been addressed in order to lower the non-whitespace changes in the first patch; - Changes since v4: All comments from Ján Tomko have been addressed (hopefully, they actually were this time :-)); - Changes since v5: All comments from John Ferlan have been addressed, including splitting the patches per "function" touched. Some new patches were also needed due to a behaviour change introduced by the "xen_common: Change xenParsePCIList to using virConfGetValueStringList" patch. - Changes since v6: Actually properly building the code /o\ (John, --with-libxl is what you need!) Squashed all the patches fixing the leak with the patch that introduces the leak Followed John's suggestions and comments in order to try to keep the new checks as close as possible to the old ones. Fabiano Fidêncio (6): xen_common: Change xenConfigCopyStringInternal to using virConfGetValueString xen_common: Change xenConfigGetUUID to using virConfGetValueString xen_common: Change xenConfigGetString to using virConfGetValueString xen_common: Change xenParsePCIList to using virConfGetValueStringList xen_common: Change xenParseVfbs to using virConfGetValueStringList xen_common: Change xenParseCharDev to using virConfGetValueStringList src/xenconfig/xen_common.c | 202 ++++++++++++++++++++----------------- src/xenconfig/xen_common.h | 2 +- src/xenconfig/xen_xl.c | 10 +- src/xenconfig/xen_xm.c | 7 +- 4 files changed, 120 insertions(+), 101 deletions(-) -- 2.17.1

2 14

[libvirt] [jenkins-ci PATCH] guests: Hash test user password dynamically
by Andrea Bolognani 20 Sep '18

20 Sep '18

Current versions of Ansible support the password_hash() filter, so we can avoid hardcoding a pre-computed hash and make what's happening a bit clearer. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- guests/playbooks/update/tasks/users.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guests/playbooks/update/tasks/users.yml b/guests/playbooks/update/tasks/users.yml index 0a930d6..abaeaa4 100644 --- a/guests/playbooks/update/tasks/users.yml +++ b/guests/playbooks/update/tasks/users.yml @@ -28,7 +28,7 @@ - name: '{{ flavor }}: Set password' user: name: '{{ flavor }}' - password: '$6$xSlfvkcsDgPmRAMX$mFh9qRmFFW9cyW1n5/jeHvq4OmJA8WzSD70Mfis3VHc3Z5imZeiQAg9VNL4sFEtmDy/siU3nJL.QeAapCgfL20' + password: '{{ "test"|password_hash("sha512") }}' when: - flavor == 'test' -- 2.17.1

2 2

[libvirt] [PATCH] util: Fix travis build error
by John Ferlan 20 Sep '18

20 Sep '18

Commit 12093f1f used %ld instead of %zd for a size_t. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Sigh, always something simple. Pushed under the build breaker rule. src/util/virresctrl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c index eddcc41b67..1019bb52cc 100644 --- a/src/util/virresctrl.c +++ b/src/util/virresctrl.c @@ -676,7 +676,7 @@ virResctrlGetMonitorInfo(virResctrlInfoPtr resctrl) } features = virStringSplitCount(featurestr, "\n", 0, &nfeatures); - VIR_DEBUG("Resctrl supported %ld monitoring features", nfeatures); + VIR_DEBUG("Resctrl supported %zd monitoring features", nfeatures); info_monitor->nfeatures = nfeatures; VIR_STEAL_PTR(info_monitor->features, features); -- 2.17.1

1 0

[libvirt] [PATCH v3] qemu: fix deadlock if create qemuProcessReconnect thread failed
by Wang Yechao 20 Sep '18

20 Sep '18

qemuProcessReconnectHelper has hold lock on doms, if create qemuProcessReconnect thread failed, calls qemuDomainRemoveInactiveJob will lead to deadlock. Add a qemuDomainRemoveInactiveJobLocked, modify qemuProcessReconnectHelper to call it. Signed-off-by: Wang Yechao <wang.yechao255(a)zte.com.cn> --- v2 patch: https://www.redhat.com/archives/libvir-list/2018-September/msg00635.html Changes in v3: - drop v2 patch, cause it is not good. - split qemuDomainRemoveInactive into qemuDomainRemoveInactiveCommon and virDomainObjListRemove. - create a qemuDomainRemoveInactiveLocked, consists of qemuDomainRemoveInactiveCommon and virDomainObjListRemoveLocked. - create a qemuDomainRemoveInactiveJobLocked, which copies qemuDomainRemoveInactiveJob except calling qemuDomainRemoveInactiveLocked - Modify qemuProcessReconnectHelper to call qemuDomainRemoveInactiveJobLocked --- src/qemu/qemu_domain.c | 75 ++++++++++++++++++++++++++++++++++++++++--------- src/qemu/qemu_domain.h | 9 ++++++ src/qemu/qemu_process.c | 2 +- 3 files changed, 71 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 2fd8a2a..ef0d91d 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -8343,24 +8343,13 @@ qemuDomainSnapshotDiscardAllMetadata(virQEMUDriverPtr driver, return rem.err; } - -/** - * qemuDomainRemoveInactive: - * - * The caller must hold a lock to the vm. - */ void -qemuDomainRemoveInactive(virQEMUDriverPtr driver, - virDomainObjPtr vm) +qemuDomainRemoveInactiveCommon(virQEMUDriverPtr driver, + virDomainObjPtr vm) { char *snapDir; virQEMUDriverConfigPtr cfg; - if (vm->persistent) { - /* Short-circuit, we don't want to remove a persistent domain */ - return; - } - cfg = virQEMUDriverGetConfig(driver); /* Remove any snapshot metadata prior to removing the domain */ @@ -8379,9 +8368,47 @@ qemuDomainRemoveInactive(virQEMUDriverPtr driver, } qemuExtDevicesCleanupHost(driver, vm->def); + virObjectUnref(cfg); +} + +/** + * qemuDomainRemoveInactive: + * + * The caller must hold a lock to the vm. + */ +void +qemuDomainRemoveInactive(virQEMUDriverPtr driver, + virDomainObjPtr vm) +{ + if (vm->persistent) { + /* Short-circuit, we don't want to remove a persistent domain */ + return; + } + + qemuDomainRemoveInactiveCommon(driver, vm); virDomainObjListRemove(driver->domains, vm); - virObjectUnref(cfg); +} + +/** + * qemuDomainRemoveInactiveLocked: + * + * The caller must hold a lock to the vm , + * and hold a lock to the doms. + */ + +void +qemuDomainRemoveInactiveLocked(virQEMUDriverPtr driver, + virDomainObjPtr vm) +{ + if (vm->persistent) { + /* Short-circuit, we don't want to remove a persistent domain */ + return; + } + + qemuDomainRemoveInactiveCommon(driver, vm); + virDomainObjListRemoveLocked(driver->domains, vm); + } @@ -8407,6 +8434,26 @@ qemuDomainRemoveInactiveJob(virQEMUDriverPtr driver, qemuDomainObjEndJob(driver, vm); } +/** + * qemuDomainRemoveInactiveJobLocked: + * + * Just like qemuDomainRemoveInactiveJob but it hold lock + * on 'doms'. + */ + +void +qemuDomainRemoveInactiveJobLocked(virQEMUDriverPtr driver, + virDomainObjPtr vm) +{ + bool haveJob; + + haveJob = qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) >= 0; + + qemuDomainRemoveInactiveLocked(driver, vm); + + if (haveJob) + qemuDomainObjEndJob(driver, vm); +} void qemuDomainSetFakeReboot(virQEMUDriverPtr driver, diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 914c9a6..1d80621 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -698,12 +698,21 @@ int qemuDomainSnapshotDiscardAll(void *payload, int qemuDomainSnapshotDiscardAllMetadata(virQEMUDriverPtr driver, virDomainObjPtr vm); +void qemuDomainRemoveInactiveCommon(virQEMUDriverPtr driver, + virDomainObjPtr vm); + void qemuDomainRemoveInactive(virQEMUDriverPtr driver, virDomainObjPtr vm); +void qemuDomainRemoveInactiveLocked(virQEMUDriverPtr driver, + virDomainObjPtr vm); + void qemuDomainRemoveInactiveJob(virQEMUDriverPtr driver, virDomainObjPtr vm); +void qemuDomainRemoveInactiveJobLocked(virQEMUDriverPtr driver, + virDomainObjPtr vm); + void qemuDomainSetFakeReboot(virQEMUDriverPtr driver, virDomainObjPtr vm, bool value); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 72a59de..ed24447 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -8025,7 +8025,7 @@ qemuProcessReconnectHelper(virDomainObjPtr obj, */ qemuProcessStop(src->driver, obj, VIR_DOMAIN_SHUTOFF_FAILED, QEMU_ASYNC_JOB_NONE, 0); - qemuDomainRemoveInactiveJob(src->driver, obj); + qemuDomainRemoveInactiveJobLocked(src->driver, obj); virDomainObjEndAPI(&obj); virNWFilterUnlockFilterUpdates(); -- 1.8.3.1

2 1