- Devel - libvirt List Archives

[libvirt] [PATCH] vircgroupv1: add ifdef around cgroup code
by Pavel Hrdina 25 Sep '18

25 Sep '18

Cgroups are supported only on linux. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/util/vircgroupv1.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c index 62a6e5c448..3d05fbd745 100644 --- a/src/util/vircgroupv1.c +++ b/src/util/vircgroupv1.c @@ -55,6 +55,8 @@ VIR_ENUM_IMPL(virCgroupV1Controller, VIR_CGROUP_CONTROLLER_LAST, "name=systemd"); +#ifdef VIR_CGROUP_SUPPORTED + /* We're looking for at least one 'cgroup' fs mount, * which is *not* a named mount. */ static bool @@ -2099,3 +2101,15 @@ virCgroupV1Register(void) { virCgroupBackendRegister(&virCgroupV1Backend); } + +#else /* !VIR_CGROUP_SUPPORTED */ + +void +virCgroupV1Register(void) +{ + virReportSystemError(ENOSYS, "%s", + _("Control groups not supported on this platform")); + return -1; +} + +#endif /* !VIR_CGROUP_SUPPORTED */ -- 2.17.1

3 2

[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

[libvirt] [PATCHv3 0/4] Introduce x86 RDT (CMT&MBM) host capability
by Wang Huaqiang 20 Sep '18

20 Sep '18

This series of patches introduced the x86 Cache Monitoring Technology (CMT) to libvirt by interacting with kernel resource control (resctrl) interface. CMT is one of the Intel(R) x86 CPU feature which belongs to the Resource Director Technology (RDT). CMT reports the occupancy of the last level cache, which is shared by all CPU cores. In v1 series, we are introducing CMT for libvirt, including reporting host capability and creating CMT groups. Introducing host capability is pretty much a well self-contained step, we only cover this step in this series. As an extension of v1, MBM capability is also introduced. These patches will not cover the part of creating CMT groups, which will be subsequent patches. We have serval discussion about the enabling of CMT, please refer to following links for the RFCs. RFCv3 https://www.redhat.com/archives/libvir-list/2018-August/msg01213.html RFCv2 https://www.redhat.com/archives/libvir-list/2018-July/msg00409.html https://www.redhat.com/archives/libvir-list/2018-July/msg01241.html RFCv1 https://www.redhat.com/archives/libvir-list/2018-June/msg00674.html 1. About reason why CMT is necessary for libvirt? The perf events of 'CMT, MBML, MBMT' have been phased out since Linux kernel commit c39a0e2c8850f08249383f2425dbd8dbe4baad69, in libvirt the perf based cmt,mbm will not work with the latest linux kernel. These patches add CMT feature to libvirt through kernel resctrlfs interface. 2. Interfaces for CMT from the high level. CMT, CAT, MBM and MBA are orthogonal features, each could works independently. If 'CMT' is enabled in host, then a 'cache monitor' is introduced for cache, which is role is monitoring the last level cache utilization of target system process. Cache monitor capabilities is shown under element <cache>. 'MBM', a monitor named memory bandwidth monitor is introduced, for role of monitoring memory bandwidth utilization. The capability information block is located under <memory bandwidth> element. 2.1 Query the host capability of CMT. The element 'monitor' represents the host capabilities of CMT. The explanations of involved attributes: - 'maxMonitors': denotes the maximum monitoring groups could be created, which is limited by the number of hardware 'RMID'. - 'reuseThreshold': an adjustable value affects the final reuse of resources used by monitor. After the action of removing a monitor, the kernel may not release all hardware resources that monitor used immediately if the cache occupancy value associated with 'removed' monitor is above this threshold. Once the cache occupancy is below this threshold, the underlying hardware resource will be reclaimed and be put into the resource pool for next reusing. - 'llc_occupancy': a feature of CMT, reporting the last level cache occupancy information. - 'mbm_total_bytes': a feature of MBM, reporting total memory bandwidth utilization, in bytes, including local memory and remote memory for multi-node system. - 'mbm_local_bytes': a feature of MBM, reporting only local memory bandwidth utilization. # virsh capabilities ... <cache> <bank id='0' level='3' type='both' size='15' unit='MiB' cpus='0-5'> <control granularity='768' min='1536' unit='KiB' type='both' maxAllocs='4'/> </bank> <bank id='1' level='3' type='both' size='15' unit='MiB' cpus='6-11'> <control granularity='768' min='1536' unit='KiB' type='both' maxAllocs='4'/> </bank> + <monitor level='3' reuseThreshold='270336' maxMonitors='176'> + <feature name='llc_occupancy'/> + </monitor> </cache> <memory_bandwidth> <node id='0' cpus='0-5'> <control granularity='10' min ='10' maxAllocs='4'/> </node> <node id='1' cpus='6-11'> <control granularity='10' min ='10' maxAllocs='4'/> </node> + <monitor maxMonitors='176'> + <feature name='mbm_total_bytes'/> + <feature name='mbm_local_bytes'/> + </monitor> </memory_bandwidth> ... </host> Changes since v2: - Addressed John Ferlan's review. - Typo fixed. - Removed VIR_ENUM_DECL(virMonitor); Changes since v1: - Introduced MBM capability. - Capability layout changed * Moved <monitor> from cahe <bank> to <cache> * Renamed <Threshold> to <reuseThreshold> - Document for 'reuseThreshold' changed. - Introduced API virResctrlInfoGetMonitorPrefix - Added more tests, covering standalone CMT, fake new feature. - Creating CMT resource control group will be subsequent job. Wang Huaqiang (4): util: Introduce monitor capability interface conf: Refactor cache bank capability structure conf: Refactor memory bandwidth capability structure conf: Introduce RDT monitor host capability docs/schemas/capability.rng | 37 +++- src/conf/capabilities.c | 122 ++++++++--- src/conf/capabilities.h | 24 ++- src/libvirt_private.syms | 2 + src/util/virresctrl.c | 236 +++++++++++++++++++++ src/util/virresctrl.h | 40 ++++ .../resctrl/info/L3_MON/max_threshold_occupancy | 1 + .../resctrl/info/L3_MON/mon_features | 1 + .../resctrl/info/L3_MON/num_rmids | 1 + .../linux-resctrl-cmt/resctrl/manualres/cpus | 1 + .../linux-resctrl-cmt/resctrl/manualres/schemata | 1 + .../linux-resctrl-cmt/resctrl/manualres/tasks | 0 .../linux-resctrl-cmt/resctrl/schemata | 1 + tests/vircaps2xmldata/linux-resctrl-cmt/system | 1 + .../resctrl/info/L3/cbm_mask | 1 + .../resctrl/info/L3/min_cbm_bits | 1 + .../resctrl/info/L3/num_closids | 1 + .../resctrl/info/L3_MON/max_threshold_occupancy | 1 + .../resctrl/info/L3_MON/mon_features | 10 + .../resctrl/info/L3_MON/num_rmids | 1 + .../resctrl/info/MB/bandwidth_gran | 1 + .../resctrl/info/MB/min_bandwidth | 1 + .../resctrl/info/MB/num_closids | 1 + .../resctrl/manualres/cpus | 1 + .../resctrl/manualres/schemata | 1 + .../resctrl/manualres/tasks | 0 .../linux-resctrl-fake-feature/resctrl/schemata | 1 + .../linux-resctrl-fake-feature/system | 1 + .../resctrl/info/L3_MON/max_threshold_occupancy | 1 + .../linux-resctrl/resctrl/info/L3_MON/mon_features | 3 + .../linux-resctrl/resctrl/info/L3_MON/num_rmids | 1 + .../vircaps2xmldata/vircaps-x86_64-resctrl-cmt.xml | 53 +++++ .../vircaps-x86_64-resctrl-fake-feature.xml | 73 +++++++ tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml | 7 + tests/vircaps2xmltest.c | 2 + 35 files changed, 594 insertions(+), 36 deletions(-) create mode 100644 tests/vircaps2xmldata/linux-resctrl-cmt/resctrl/info/L3_MON/max_threshold_occupancy create mode 100644 tests/vircaps2xmldata/linux-resctrl-cmt/resctrl/info/L3_MON/mon_features create mode 100644 tests/vircaps2xmldata/linux-resctrl-cmt/resctrl/info/L3_MON/num_rmids create mode 100644 tests/vircaps2xmldata/linux-resctrl-cmt/resctrl/manualres/cpus create mode 100644 tests/vircaps2xmldata/linux-resctrl-cmt/resctrl/manualres/schemata create mode 100644 tests/vircaps2xmldata/linux-resctrl-cmt/resctrl/manualres/tasks create mode 100644 tests/vircaps2xmldata/linux-resctrl-cmt/resctrl/schemata create mode 120000 tests/vircaps2xmldata/linux-resctrl-cmt/system create mode 100644 tests/vircaps2xmldata/linux-resctrl-fake-feature/resctrl/info/L3/cbm_mask create mode 100644 tests/vircaps2xmldata/linux-resctrl-fake-feature/resctrl/info/L3/min_cbm_bits create mode 100644 tests/vircaps2xmldata/linux-resctrl-fake-feature/resctrl/info/L3/num_closids create mode 100644 tests/vircaps2xmldata/linux-resctrl-fake-feature/resctrl/info/L3_MON/max_threshold_occupancy create mode 100644 tests/vircaps2xmldata/linux-resctrl-fake-feature/resctrl/info/L3_MON/mon_features create mode 100644 tests/vircaps2xmldata/linux-resctrl-fake-feature/resctrl/info/L3_MON/num_rmids create mode 100644 tests/vircaps2xmldata/linux-resctrl-fake-feature/resctrl/info/MB/bandwidth_gran create mode 100644 tests/vircaps2xmldata/linux-resctrl-fake-feature/resctrl/info/MB/min_bandwidth create mode 100644 tests/vircaps2xmldata/linux-resctrl-fake-feature/resctrl/info/MB/num_closids create mode 100644 tests/vircaps2xmldata/linux-resctrl-fake-feature/resctrl/manualres/cpus create mode 100644 tests/vircaps2xmldata/linux-resctrl-fake-feature/resctrl/manualres/schemata create mode 100644 tests/vircaps2xmldata/linux-resctrl-fake-feature/resctrl/manualres/tasks create mode 100644 tests/vircaps2xmldata/linux-resctrl-fake-feature/resctrl/schemata create mode 120000 tests/vircaps2xmldata/linux-resctrl-fake-feature/system create mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3_MON/max_threshold_occupancy create mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3_MON/mon_features create mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3_MON/num_rmids create mode 100644 tests/vircaps2xmldata/vircaps-x86_64-resctrl-cmt.xml create mode 100644 tests/vircaps2xmldata/vircaps-x86_64-resctrl-fake-feature.xml -- 2.7.4

3 7

[libvirt] [PATCH 0/2] build: fix CI builds
by Jim Fehlig 20 Sep '18

20 Sep '18

Fix CI builds broken by commit 5bdcef13. While doing so I noticed more unused variables, which are removed by patch1. Jim Fehlig (2): build: remove unused variables from virt-driver-libxl.m4 libxl: fallback to lib probe if pkgconfig file not found m4/virt-driver-libxl.m4 | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) -- 2.18.0

4 8

[libvirt] what determines the type of virtual NIC in libvirt (veth or tap)?
by Frank Wang 20 Sep '18

20 Sep '18

Hi All, I'd like to know what determines the type of virtual NIC in libvirt ? There was a problem I encountered, the vm can't get the mirror traffic while the virtual port in openvswitch is veth, If the virtual port is tun, the everything is fine. [root@allinone-247 ~]# ethtool -i vn62f717800 driver: veth version: 1.0 firmware-version: expansion-rom-version: bus-info: supports-statistics: yes supports-test: no supports-eeprom-access: no supports-register-dump: no supports-priv-flags: no I uninstall the veth kernel module, then restart vm, then the vm can receive the mirror traffic [root@allinone-247 ~]# ethtool -i vn62f717800 driver: tun version: 1.6 firmware-version: expansion-rom-version: bus-info: tap supports-statistics: no supports-test: no supports-eeprom-access: no supports-register-dump: no supports-priv-flags: no so, I'm wondering if there are configuration options which can be configured to use which type of virtual NIC(tap or veth). Any comments would be appreciate.

2 1

[libvirt] [PATCH] virhostdev: Fix PCI devices are still attatched to stub driver bug
by Wu Zongyong 20 Sep '18

20 Sep '18

Currently, PCI devices will not be rebound to host drivers but attached to the stub driver when: 1) use libvirt to start a virtual machine with PCI devices assigned, then stop libvirtd process and shutdown the virtual machine. Finally, PCI devices are still bound to the stub driver instead of host drivers after libvirt start again. 2) use libvirt to shutdown a virtual machine wtih PCI devices assigned, then stop libvirtd process before libvirt try to rebind PCI devices to host drivers. Finally, PCI devices are still bound to the stub driver after libvirt start again. Notice that the comment on the top of virPCIDeviceDetach as follows: activeDevs should be a list of all PCI devices currently in use by a domain.inactiveDevs is a list of all PCI devices that libvirt has detached from the host driver + attached to the stub driver, but hasn't yet assigned to a domain. It's not reasonable that libvirt filter out devices that are either not active or not used by the current domain and driver. For devices belong to domains that has been shutdown before libvirt start, we should put them into inactiveDevs if then meet the condition that PCI devices have been detached from the host driver + attached to the stub driver. Moreover, we set orignal states of PCI devices when build PCI devices list in virHostdevGetPCIHostDeviceList if states has been set in struct virDomainHostdevDefPtr. Signed-off-by: Wu Zongyong <cordius.wu(a)huawei.com> --- src/util/virhostdev.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c index ca79c37..ecf95e3 100644 --- a/src/util/virhostdev.c +++ b/src/util/virhostdev.c @@ -235,6 +235,7 @@ virHostdevGetPCIHostDeviceList(virDomainHostdevDefPtr *hostdevs, int nhostdevs) for (i = 0; i < nhostdevs; i++) { virDomainHostdevDefPtr hostdev = hostdevs[i]; virDomainHostdevSubsysPCIPtr pcisrc = &hostdev->source.subsys.u.pci; + virDomainHostdevOrigStatesPtr origstates = &hostdev->origstates; virPCIDevicePtr pci; if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) @@ -262,6 +263,10 @@ virHostdevGetPCIHostDeviceList(virDomainHostdevDefPtr *hostdevs, int nhostdevs) virPCIDeviceSetStubDriver(pci, VIR_PCI_STUB_DRIVER_XEN); else virPCIDeviceSetStubDriver(pci, VIR_PCI_STUB_DRIVER_KVM); + + virPCIDeviceSetUnbindFromStub(pci, origstates->states.pci.unbind_from_stub); + virPCIDeviceSetRemoveSlot(pci, origstates->states.pci.remove_slot); + virPCIDeviceSetReprobe(pci, origstates->states.pci.reprobe); } return pcidevs; @@ -1008,8 +1013,19 @@ virHostdevReAttachPCIDevices(virHostdevManagerPtr mgr, continue; } } else { - virPCIDeviceListDel(pcidevs, pci); - continue; + int stub = virPCIDeviceGetStubDriver(pci); + if (stub > VIR_PCI_STUB_DRIVER_NONE && + stub < VIR_PCI_STUB_DRIVER_LAST) { + /* The device is bound to a known stub driver: add a copy + * to the inactive list */ + VIR_DEBUG("Adding PCI device %s to inactive list", + virPCIDeviceGetName(pci)); + if (virPCIDeviceListAddCopy(mgr->inactivePCIHostdevs, pci) < 0) { + VIR_ERROR(_("Failed to add PCI device %s to the inactive list"), + virGetLastErrorMessage()); + virResetLastError(); + } + } } i++; -- 1.9.1

3 3

[libvirt] [jenkins-ci PATCH] Forcefully remove build/ directory for autotools builds
by Andrea Bolognani 20 Sep '18

20 Sep '18

Normally this shouldn't be needed, because 'git clean -xdf' is executed after updating the git repository and before starting the build; however, some RPM builds (notably libvirt's) internally use git to apply patches, and if one of those fails it will leave a git repository inside of build/ behind, which 'git clean' dutifully refuses to remove and whose presence will in turn cause 'mkdir build', and thus the entire build, to fail. Solve the issue by forcefully removing build/ ourselves before starting an autotools build. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- guests/playbooks/build/jobs/autotools-build-job.yml | 1 + jobs/autotools.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/guests/playbooks/build/jobs/autotools-build-job.yml b/guests/playbooks/build/jobs/autotools-build-job.yml index bf7a616..01b6ff5 100644 --- a/guests/playbooks/build/jobs/autotools-build-job.yml +++ b/guests/playbooks/build/jobs/autotools-build-job.yml @@ -6,6 +6,7 @@ {{ global_env }} {{ local_env }} + rm -rf build mkdir build cd build ../autogen.sh --prefix=$VIRT_PREFIX {{ autogen_args }} diff --git a/jobs/autotools.yaml b/jobs/autotools.yaml index 8956855..9349b8c 100644 --- a/jobs/autotools.yaml +++ b/jobs/autotools.yaml @@ -41,6 +41,7 @@ - shell: | {global_env} {local_env} + rm -rf build mkdir build cd build ../autogen.sh --prefix=$VIRT_PREFIX {autogen_args} -- 2.17.1

2 1

[libvirt] [PATCH] Remove ignore_value or void from unlink calls
by John Ferlan 20 Sep '18

20 Sep '18

There seems to be no need to add the ignore_value wrapper or caste with (void) to the unlink() calls, so let's just remove them. I assume at one point in time Coverity complained. So, let's just be consistent - those that care to check the return status can and those that don't can just have the naked unlink. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- As a result of Michal's review comment on my recent storage driver error path series... src/conf/virsecretobj.c | 2 +- src/nwfilter/nwfilter_dhcpsnoop.c | 2 +- src/qemu/qemu_capabilities.c | 2 +- src/storage/storage_driver.c | 4 ++-- src/util/virfilecache.c | 2 +- src/util/virnetdev.c | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/conf/virsecretobj.c b/src/conf/virsecretobj.c index 2ff2998c15..78911c0908 100644 --- a/src/conf/virsecretobj.c +++ b/src/conf/virsecretobj.c @@ -666,7 +666,7 @@ virSecretObjDeleteData(virSecretObjPtr obj) { /* The configFile will already be removed, so secret won't be * loaded again if this fails */ - (void)unlink(obj->base64File); + unlink(obj->base64File); } diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c index 2330ba0479..6d114557c7 100644 --- a/src/nwfilter/nwfilter_dhcpsnoop.c +++ b/src/nwfilter/nwfilter_dhcpsnoop.c @@ -1923,7 +1923,7 @@ virNWFilterSnoopLeaseFileRefresh(void) if (rename(TMPLEASEFILE, LEASEFILE) < 0) { virReportSystemError(errno, _("rename(\"%s\", \"%s\")"), TMPLEASEFILE, LEASEFILE); - ignore_value(unlink(TMPLEASEFILE)); + unlink(TMPLEASEFILE); } virAtomicIntSet(&virNWFilterSnoopState.wLeases, 0); diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 04c2adcfb5..394202942f 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -4304,7 +4304,7 @@ virQEMUCapsInitQMPCommandAbort(virQEMUCapsInitQMPCommandPtr cmd) cmd->cmd = NULL; if (cmd->monpath) - ignore_value(unlink(cmd->monpath)); + unlink(cmd->monpath); virDomainObjEndAPI(&cmd->vm); diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index bf43d77c8b..7c22c43584 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -84,7 +84,7 @@ storagePoolRefreshFailCleanup(virStorageBackendPtr backend, virErrorPtr orig_err = virSaveLastError(); if (stateFile) - ignore_value(unlink(stateFile)); + unlink(stateFile); if (backend->stopPool) backend->stopPool(obj); if (orig_err) { @@ -142,7 +142,7 @@ storagePoolUpdateStateCallback(virStoragePoolObjPtr obj, virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to initialize storage pool '%s': %s"), def->name, virGetLastErrorMessage()); - ignore_value(unlink(stateFile)); + unlink(stateFile); active = false; } diff --git a/src/util/virfilecache.c b/src/util/virfilecache.c index 2927c68358..15c0d99fd9 100644 --- a/src/util/virfilecache.c +++ b/src/util/virfilecache.c @@ -161,7 +161,7 @@ virFileCacheLoad(virFileCachePtr cache, if (!cache->handlers.isValid(loadData, cache->priv)) { VIR_DEBUG("Outdated cached capabilities '%s' for '%s'", file, name); - ignore_value(unlink(file)); + unlink(file); ret = 0; goto cleanup; } diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 39c91313de..e94960c9da 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -2161,7 +2161,7 @@ virNetDevReadNetConfig(const char *linkdev, int vf, } /* we won't need the file again */ - ignore_value(unlink(filePath)); + unlink(filePath); ret = 0; cleanup: -- 2.17.1

2 1

[libvirt] [PATCH 0/5] Cleanup some storage driver paths
by John Ferlan 20 Sep '18

20 Sep '18

See the patches for details - everything leads to the last one. John Ferlan (5): storage: Clean up stateFile if refreshPool fails storage: Clean up storagePoolUpdateStateCallback processing storage: Create error label path for storagePoolCreateXML storage: Introduce storagePoolRefreshFailCleanup storage: Save error during refresh failure processing src/storage/storage_driver.c | 73 ++++++++++++++++++++---------------- 1 file changed, 40 insertions(+), 33 deletions(-) -- 2.17.1

2 9

[libvirt] [libvirt PATCH v6 00/15] Finish the conversion to virConfGetValue* functions libvirt
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. Fabiano Fidêncio (15): xen_common: Change xenConfigCopyStringInternal to using virConfGetValueString xen_common: Change xenConfigGetUUID to using virConfGetValueString xen_common: Change xenConfigGetString to using virConfGetValueString xen_xl: Adapt xenParseCmdline due to changes in xenConfigGetString xen_xl: Adapt xenParseXLOS due to changes in xenConfigGetString xen_xl: adapt xenParseXLCPUID due to changes in xenConfigGetString xen_common: Adapt xenParseEventsActions due to changes in xenConfigGetString xen_common: Adapt xenParseCPUFeatures due to changes in xenConfigGetString xen_common: Adapt xenParseEmulatedDevices due to changes in xenConfigGetString xen_common: Adapt xenParseGeneralMeta due to changes in xenConfigGetString xen_xm: Adapt xenParseXMOS due to changes in xenConfigGetString xen_xm: Adapt xenParseXMInputDevs due to changes in xenConfigGetString 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 | 223 +++++++++++++++++++------------------ src/xenconfig/xen_xl.c | 71 +++++++----- src/xenconfig/xen_xm.c | 48 ++++---- 3 files changed, 186 insertions(+), 156 deletions(-) -- 2.17.1

2 22

[libvirt] [PATCH 0/2] Tiny system header cleanup
by Erik Skultety 20 Sep '18

20 Sep '18

2 6

[libvirt] [PATCH v3] qemu: Ignore nwfilter binding instantiation issues during reconnect
by John Ferlan 20 Sep '18

20 Sep '18

https://bugzilla.redhat.com/show_bug.cgi?id=1607202 It's essentially stated in the nwfilterBindingDelete that we will allow the admin to shoot themselves in the foot by deleting the nwfilter binding which then allows them to undefine the nwfilter that is in use for the running guest... However, by allowing this we cause a problem for libvirtd restart reconnect processing which would then try to recreate the missing binding attempting to use the deleted filter resulting in an error and thus shutting the guest down. So rather than keep adding virDomainConfNWFilterInstantiate flags to "ignore" specific error conditions, modify the logic to ignore, but VIR_WARN errors other than ignoreExists. This will at least allow the guest to not shutdown for only nwfilter binding errors that we can now perhaps recover from since we have the binding create/delete capability. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- v2: https://www.redhat.com/archives/libvir-list/2018-August/msg01567.html Differences to v2. Leave the ignoreExists bool, but just allow and VIR_WARN other errors from virDomainConfNWFilterInstantiate. Continue processing all filters from error point too. src/qemu/qemu_process.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index ab749389ee..61a277f468 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3160,20 +3160,29 @@ qemuProcessNotifyNets(virDomainDefPtr def) } } -static int -qemuProcessFiltersInstantiate(virDomainDefPtr def, bool ignoreExists) +/* Attempt to instantiate the filters. Ignore failures because it's + * possible that someone deleted a filter binding and the associated + * filter while the guest was running and we don't want that action + * to cause failure to keep the guest running during the reconnection + * processing. Nor do we necessarily want other failures to do the + * same. We'll just log the error conditions other than of course + * ignoreExists possibility (e.g. the true flag) */ +static void +qemuProcessFiltersInstantiate(virDomainDefPtr def) { size_t i; for (i = 0; i < def->nnets; i++) { virDomainNetDefPtr net = def->nets[i]; if ((net->filter) && (net->ifname)) { - if (virDomainConfNWFilterInstantiate(def->name, def->uuid, net, ignoreExists) < 0) - return 1; + if (virDomainConfNWFilterInstantiate(def->name, def->uuid, net, + true) < 0) { + VIR_WARN("filter '%s' instantiation for '%s' failed '%s'", + net->filter, net->ifname, virGetLastErrorMessage()); + virResetLastError(); + } } } - - return 0; } static int @@ -7892,8 +7901,7 @@ qemuProcessReconnect(void *opaque) qemuProcessNotifyNets(obj->def); - if (qemuProcessFiltersInstantiate(obj->def, true)) - goto error; + qemuProcessFiltersInstantiate(obj->def); if (qemuProcessRefreshDisks(driver, obj, QEMU_ASYNC_JOB_NONE) < 0) goto error; -- 2.17.1

2 4

[libvirt] [PATCH V3 0/2] libxl: drop support for Xen 4.4 and 4.5
by Jim Fehlig 19 Sep '18

19 Sep '18

V2: https://www.redhat.com/archives/libvir-list/2018-September/msg00383.html New in V3: - Change definition of LIBXL_API_VERSION to 0x040500, the API version set when Xen 4.6 was released - Drop the 'true' parameter to LIBVIRT_CHECK_PKG macro so configure fails if libxl is requested but the devel packages are not installed - Remove a now unused variable and a redundant 'if test with_libxl' check - Moved the news file addition to 'Removed features' section Jim Fehlig (2): libxl: drop support for Xen < 4.6 news: Announce dropping support for Xen 4.4 and 4.5 docs/drvxen.html.in | 2 +- docs/news.xml | 11 +++++++++++ m4/virt-driver-libxl.m4 | 27 ++------------------------- src/libxl/libxl_domain.c | 2 +- src/libxl/libxl_driver.c | 2 +- 5 files changed, 16 insertions(+), 28 deletions(-) -- 2.18.0

3 10

[libvirt] [PATCH] secret: Makefile: Fix an EXTRA_DIST typo
by Erik Skultety 19 Sep '18

19 Sep '18

So, when trying to add some secret util sources, we referenced them with a non-existent symbol. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- src/secret/Makefile.inc.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/secret/Makefile.inc.am b/src/secret/Makefile.inc.am index 305c4a1ead..79c2b2d74a 100644 --- a/src/secret/Makefile.inc.am +++ b/src/secret/Makefile.inc.am @@ -13,7 +13,7 @@ DRIVER_SOURCE_FILES += $(SECRET_DRIVER_SOURCES) STATEFUL_DRIVER_SOURCE_FILES += $(SECRET_DRIVER_SOURCES) EXTRA_DIST += \ $(SECRET_DRIVER_SOURCES) \ - $(SECRET_UTIL_SOURCESQ) \ + $(SECRET_UTIL_SOURCES) \ $(NULL) noinst_LTLIBRARIES += libvirt_secret.la -- 2.17.1

1 1

[libvirt] [PATCH 0/9] cgroup cleanups and preparation for v2
by Pavel Hrdina 19 Sep '18

19 Sep '18

Pavel Hrdina (9): vircgroup: cleanup controllers not managed by systemd on error vircgroup: fix bug in virCgroupEnableMissingControllers vircgroup: rename virCgroupAdd.*Task to virCgroupAdd.*Process vircgroup: introduce virCgroupTaskFlags vircgroup: introduce virCgroupAddThread vircgroupmock: cleanup unused cgroup files vircgroupmock: rewrite cgroup fopen mocking vircgrouptest: call virCgroupDetectMounts directly vircgrouptest: call virCgroupNewSelf instead virCgroupDetectMounts src/libvirt-lxc.c | 2 +- src/libvirt_private.syms | 6 +- src/lxc/lxc_controller.c | 4 +- src/qemu/qemu_process.c | 4 +- src/qemu/qemu_tpm.c | 2 +- src/util/vircgroup.c | 135 +++++++----- src/util/vircgroup.h | 5 +- src/util/vircgrouppriv.h | 4 - tests/vircgroupdata/all-in-one.cgroups | 7 + tests/vircgroupdata/all-in-one.mounts | 2 +- tests/vircgroupdata/all-in-one.parsed | 12 +- tests/vircgroupdata/all-in-one.self.cgroup | 1 + tests/vircgroupdata/cgroups1.cgroups | 11 + tests/vircgroupdata/cgroups1.self.cgroup | 11 + tests/vircgroupdata/cgroups2.cgroups | 10 + tests/vircgroupdata/cgroups2.self.cgroup | 10 + tests/vircgroupdata/cgroups3.cgroups | 12 + tests/vircgroupdata/cgroups3.self.cgroup | 12 + tests/vircgroupdata/fedora-18.cgroups | 10 + tests/vircgroupdata/fedora-18.self.cgroup | 9 + tests/vircgroupdata/fedora-21.cgroups | 12 + tests/vircgroupdata/fedora-21.self.cgroup | 10 + tests/vircgroupdata/kubevirt.cgroups | 10 + tests/vircgroupdata/kubevirt.self.cgroup | 10 + tests/vircgroupdata/logind.cgroups | 10 + tests/vircgroupdata/logind.mounts | 2 + tests/vircgroupdata/logind.self.cgroup | 1 + tests/vircgroupdata/ovirt-node-6.6.cgroups | 9 + .../vircgroupdata/ovirt-node-6.6.self.cgroup | 8 + tests/vircgroupdata/ovirt-node-7.1.cgroups | 11 + .../vircgroupdata/ovirt-node-7.1.self.cgroup | 10 + tests/vircgroupdata/rhel-7.1.cgroups | 11 + tests/vircgroupdata/rhel-7.1.self.cgroup | 10 + tests/vircgroupdata/systemd.cgroups | 8 + tests/vircgroupdata/systemd.mounts | 11 + tests/vircgroupdata/systemd.self.cgroup | 6 + tests/vircgroupmock.c | 206 ++---------------- tests/vircgrouptest.c | 24 +- 38 files changed, 362 insertions(+), 276 deletions(-) create mode 100644 tests/vircgroupdata/all-in-one.cgroups create mode 100644 tests/vircgroupdata/all-in-one.self.cgroup create mode 100644 tests/vircgroupdata/cgroups1.cgroups create mode 100644 tests/vircgroupdata/cgroups1.self.cgroup create mode 100644 tests/vircgroupdata/cgroups2.cgroups create mode 100644 tests/vircgroupdata/cgroups2.self.cgroup create mode 100644 tests/vircgroupdata/cgroups3.cgroups create mode 100644 tests/vircgroupdata/cgroups3.self.cgroup create mode 100644 tests/vircgroupdata/fedora-18.cgroups create mode 100644 tests/vircgroupdata/fedora-18.self.cgroup create mode 100644 tests/vircgroupdata/fedora-21.cgroups create mode 100644 tests/vircgroupdata/fedora-21.self.cgroup create mode 100644 tests/vircgroupdata/kubevirt.cgroups create mode 100644 tests/vircgroupdata/kubevirt.self.cgroup create mode 100644 tests/vircgroupdata/logind.cgroups create mode 100644 tests/vircgroupdata/logind.mounts create mode 100644 tests/vircgroupdata/logind.self.cgroup create mode 100644 tests/vircgroupdata/ovirt-node-6.6.cgroups create mode 100644 tests/vircgroupdata/ovirt-node-6.6.self.cgroup create mode 100644 tests/vircgroupdata/ovirt-node-7.1.cgroups create mode 100644 tests/vircgroupdata/ovirt-node-7.1.self.cgroup create mode 100644 tests/vircgroupdata/rhel-7.1.cgroups create mode 100644 tests/vircgroupdata/rhel-7.1.self.cgroup create mode 100644 tests/vircgroupdata/systemd.cgroups create mode 100644 tests/vircgroupdata/systemd.mounts create mode 100644 tests/vircgroupdata/systemd.self.cgroup -- 2.17.1

2 19

[libvirt] [PATCH] virsh: Honour user locale in cmdList
by Michal Privoznik 19 Sep '18

19 Sep '18

In 2e97450425e we've mistakenly removed gettext macro for translating static strings. This results in table header being printed in English regardless of user locale. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tools/virsh-domain-monitor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index adc5bb1a7a..8962586d76 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -1942,9 +1942,9 @@ cmdList(vshControl *ctl, const vshCmd *cmd) /* print table header in legacy mode */ if (optTable) { if (optTitle) - table = vshTableNew("Id", "Name", "State", "Title", NULL); + table = vshTableNew(_("Id"), _("Name"), _("State"), _("Title"), NULL); else - table = vshTableNew("Id", "Name", "State", NULL); + table = vshTableNew(_("Id"), _("Name"), _("State"), NULL); if (!table) goto cleanup; -- 2.16.4

2 1

[libvirt] [PATCH] conf: fix starting a domain with cpuset=""
by Yi Wang 19 Sep '18

19 Sep '18

Domain fails to start when its config xml including: <vcpu cpuset="" current="8">64</vcpu> # virsh create vm.xml error: Failed to create domain from vm.xml error: invalid argument: Failed to parse bitmap '' This patch fixes this. Signed-off-by: Yi Wang <wang.yi59(a)zte.com.cn> Reviewed-by: Xi Xu <xu.xi8(a)zte.com.cn> --- src/conf/domain_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 8619962..bacafb2 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -18553,7 +18553,7 @@ virDomainVcpuParse(virDomainDefPtr def, if (def->placement_mode != VIR_DOMAIN_CPU_PLACEMENT_MODE_AUTO) { tmp = virXMLPropString(vcpuNode, "cpuset"); - if (tmp) { + if (tmp && strlen(tmp) != 0) { if (virBitmapParse(tmp, &def->cpumask, VIR_DOMAIN_CPUMASK_LEN) < 0) goto cleanup; -- 1.8.3.1

3 7

[libvirt] [PATCH] qemu: Fix error reporting in qemuDomainSaveImageStartVM
by Jiri Denemark 18 Sep '18

18 Sep '18

When restoring a domain from a compressed image, we launch an intermediate process for decompressing the saved data. If QEMU fails to load the data for some reason, we force close the stdin/stdout file descriptors of the intermediate process and wait for it to die. However, virCommandWait can report various errors which would overwrite the real error from QEMU. Thus instead of getting something useful: internal error: process exited while connecting to monitor: 2018-09-17T15:17:29.998910Z qemu-system-x86_64: can't apply global Skylake-Client-x86_64-cpu.osxsave=off: Property '.osxsave' not found we could get an irrelevant error message: internal error: Child process (lzop -dc --ignore-warn) unexpected fatal signal 13 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_driver.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 9424994aa1..25cbccc5e6 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6590,11 +6590,15 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, restored = true; if (intermediatefd != -1) { + virErrorPtr orig_err = NULL; + if (!restored) { /* if there was an error setting up qemu, the intermediate * process will wait forever to write to stdout, so we - * must manually kill it. + * must manually kill it and ignore any error related to + * the process */ + orig_err = virSaveLastError(); VIR_FORCE_CLOSE(intermediatefd); VIR_FORCE_CLOSE(*fd); } @@ -6604,6 +6608,11 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, restored = false; } VIR_DEBUG("Decompression binary stderr: %s", NULLSTR(errbuf)); + + if (orig_err) { + virSetError(orig_err); + virFreeError(orig_err); + } } VIR_FORCE_CLOSE(intermediatefd); -- 2.19.0

2 1

[libvirt] [PATCH] ctags: Generate tags for headers, i.e. function prototypes
by Erik Skultety 18 Sep '18

18 Sep '18

>From time to time it's handy to jump directly to a function prototype in a header. However, generating tags for headers is disabled by default in ctags, let's enable it by using --c-kinds=+p. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- .ctags | 1 + 1 file changed, 1 insertion(+) diff --git a/.ctags b/.ctags index 75e9753182..a4f17b589d 100644 --- a/.ctags +++ b/.ctags @@ -3,3 +3,4 @@ --exclude=*.html --exclude=*.html.in --langmap=c:+.h.in +--c-kinds=+p -- 2.17.1

2 2

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

18 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; - Chages since v4: All comments from Ján Tomko have been addressed (hopefully, they actually were this time :-)); Fabiano Fidêncio (1): xen_common: Convert to typesafe virConf acessors src/xenconfig/xen_common.c | 163 +++++++++++++++++-------------------- 1 file changed, 75 insertions(+), 88 deletions(-) -- 2.17.1

2 4

[libvirt] Subject: [PATCH] libvirt-domain.c:virDomainMigrateCheckNotLocal function
by xiajidong＠cmss.chinamobile.com 18 Sep '18

18 Sep '18

>From c013b053d7514ee66b841bc99900b06d1e9d4dfd Mon Sep 17 00:00:00 2001 From: xiajidong <xiajidong(a)cmss.chinamobile.com> Date: Tue, 18 Sep 2018 08:04:20 -0400 Subject: [PATCH] libvirt-domain.c:virDomainMigrateCheckNotLocal function return bool instead of int type the function of virDomainMigrateCheckNotLocal return bool should be more in line with specification, and use return is better than goto. Signed-off-by: xiajidong <xiajidong(a)cmss.chinamobile.com> --- src/libvirt-domain.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 7690339..d741261 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -3290,25 +3290,25 @@ virDomainMigrateVersion3Params(virDomainPtr domain, } -static int +static bool virDomainMigrateCheckNotLocal(const char *dconnuri) { virURIPtr tempuri = NULL; - int ret = -1; - if (!(tempuri = virURIParse(dconnuri))) - goto cleanup; + if (!(tempuri = virURIParse(dconnuri))) { + virURIFree(tempuri); + return false; + } if (!tempuri->server || STRPREFIX(tempuri->server, "localhost")) { virReportInvalidArg(dconnuri, "%s", _("Attempt to migrate guest to the same host")); - goto cleanup; + virURIFree(tempuri); + return false; } - ret = 0; - cleanup: virURIFree(tempuri); - return ret; + return ture; } @@ -3428,7 +3428,7 @@ virDomainMigrateUnmanagedParams(virDomainPtr domain, VIR_TYPED_PARAMS_DEBUG(params, nparams); if ((flags & VIR_MIGRATE_PEER2PEER) && - virDomainMigrateCheckNotLocal(dconnuri) < 0) + !virDomainMigrateCheckNotLocal(dconnuri)) return -1; if ((flags & VIR_MIGRATE_PEER2PEER) && -- 1.8.3.1

2 1

Re: [libvirt] [PATCH 2/2] hw/vfio/display: add ramfb support
by Alex Williamson 18 Sep '18

18 Sep '18

On Mon, 10 Sep 2018 08:43:40 +0200 Gerd Hoffmann <kraxel(a)redhat.com> wrote: > So we have a boot display when using a vgpu as primary display. > > Use vfio-pci-ramfb instead of vfio-pci to enable it. > > Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com> > --- > include/hw/vfio/vfio-common.h | 2 ++ > hw/vfio/display.c | 12 ++++++++++++ > hw/vfio/pci.c | 15 +++++++++++++++ > 3 files changed, 29 insertions(+) > > diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h > index 821def0565..0d85a0a6f8 100644 > --- a/include/hw/vfio/vfio-common.h > +++ b/include/hw/vfio/vfio-common.h > @@ -26,6 +26,7 @@ > #include "qemu/queue.h" > #include "qemu/notify.h" > #include "ui/console.h" > +#include "hw/display/ramfb.h" > #ifdef CONFIG_LINUX > #include <linux/vfio.h> > #endif > @@ -146,6 +147,7 @@ typedef struct VFIODMABuf { > > typedef struct VFIODisplay { > QemuConsole *con; > + RAMFBState *ramfb; > struct { > VFIORegion buffer; > DisplaySurface *surface; > diff --git a/hw/vfio/display.c b/hw/vfio/display.c > index 59c0e5d1d7..3901f580c6 100644 > --- a/hw/vfio/display.c > +++ b/hw/vfio/display.c > @@ -124,6 +124,9 @@ static void vfio_display_dmabuf_update(void *opaque) > > primary = vfio_display_get_dmabuf(vdev, DRM_PLANE_TYPE_PRIMARY); > if (primary == NULL) { > + if (dpy->ramfb) { > + ramfb_display_update(dpy->con, dpy->ramfb); > + } > return; > } > > @@ -181,6 +184,9 @@ static int vfio_display_dmabuf_init(VFIOPCIDevice *vdev, Error **errp) > vdev->dpy->con = graphic_console_init(DEVICE(vdev), 0, > &vfio_display_dmabuf_ops, > vdev); > + if (strcmp(object_get_typename(OBJECT(vdev)), "vfio-pci-ramfb") == 0) { > + vdev->dpy->ramfb = ramfb_setup(errp); > + } > return 0; > } > > @@ -228,6 +234,9 @@ static void vfio_display_region_update(void *opaque) > return; > } > if (!plane.drm_format || !plane.size) { > + if (dpy->ramfb) { > + ramfb_display_update(dpy->con, dpy->ramfb); > + } > return; > } > format = qemu_drm_format_to_pixman(plane.drm_format); > @@ -300,6 +309,9 @@ static int vfio_display_region_init(VFIOPCIDevice *vdev, Error **errp) > vdev->dpy->con = graphic_console_init(DEVICE(vdev), 0, > &vfio_display_region_ops, > vdev); > + if (strcmp(object_get_typename(OBJECT(vdev)), "vfio-pci-ramfb") == 0) { > + vdev->dpy->ramfb = ramfb_setup(errp); > + } > return 0; > } > > diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c > index 866f0deeb7..7c0628756e 100644 > --- a/hw/vfio/pci.c > +++ b/hw/vfio/pci.c > @@ -3258,9 +3258,24 @@ static const TypeInfo vfio_pci_dev_info = { > }, > }; > > +static void vfio_pci_ramfb_dev_class_init(ObjectClass *klass, void *data) > +{ > + DeviceClass *dc = DEVICE_CLASS(klass); > + > + dc->hotpluggable = false; > +} > + > +static const TypeInfo vfio_pci_ramfb_dev_info = { > + .name = "vfio-pci-ramfb", > + .parent = "vfio-pci", > + .instance_size = sizeof(VFIOPCIDevice), > + .class_init = vfio_pci_ramfb_dev_class_init, > +}; > + > static void register_vfio_pci_dev_type(void) > { > type_register_static(&vfio_pci_dev_info); > + type_register_static(&vfio_pci_ramfb_dev_info); > } > > type_init(register_vfio_pci_dev_type) My concern here is still all of the extra tooling that needs to be added to management layers above QEMU for this device that exists only because we can't hotplug the primary display in QEMU. What happens when we can hotplug the primary display? Aren't disabling hotplug of a vfio-pci device and supporting ramfb two separate things? I think we're leaking current implementation issues out to the device options when really we'd rather have a "ramfb" (or perhaps "console") option on the vfio-pci device and the hotplug capability determined automatically and available through introspection of the device. Thanks, Alex

3 6

[libvirt] [PATCH] Drop \n at the end of VIR_DEBUG messages
by Jiri Denemark 18 Sep '18

18 Sep '18

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/conf/capabilities.c | 2 +- src/util/virrotatingfile.c | 4 ++-- tests/virnetsockettest.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 326bd15cee..85f538e8c4 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -691,7 +691,7 @@ virCapabilitiesDomainDataLookupInternal(virCapsPtr caps, machinetype, machine->name, NULLSTR(machine->canonical)); continue; } - VIR_DEBUG("Match machine type machine %s\n", NULLSTR(machinetype)); + VIR_DEBUG("Match machine type machine %s", NULLSTR(machinetype)); foundmachine = machine; break; diff --git a/src/util/virrotatingfile.c b/src/util/virrotatingfile.c index ca62a8e026..d7dc3bd1ce 100644 --- a/src/util/virrotatingfile.c +++ b/src/util/virrotatingfile.c @@ -484,7 +484,7 @@ virRotatingFileWriterAppend(virRotatingFileWriterPtr file, if ((file->entry->pos == file->maxlen && len) || forceRollover) { virRotatingFileWriterEntryPtr tmp; - VIR_DEBUG("Hit max size %zu on %s (force=%d)\n", + VIR_DEBUG("Hit max size %zu on %s (force=%d)", file->maxlen, file->basepath, forceRollover); if (virRotatingFileWriterRollover(file) < 0) @@ -571,7 +571,7 @@ virRotatingFileReaderConsume(virRotatingFileReaderPtr file, { ssize_t ret = 0; - VIR_DEBUG("Consume %p %zu\n", buf, len); + VIR_DEBUG("Consume %p %zu", buf, len); while (len) { virRotatingFileReaderEntryPtr entry; ssize_t got; diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c index 5927be1f80..7f52bf5c61 100644 --- a/tests/virnetsockettest.c +++ b/tests/virnetsockettest.c @@ -161,7 +161,7 @@ testSocketIncoming(virNetSocketPtr sock, void *opaque) { virNetSocketPtr *retsock = opaque; - VIR_DEBUG("Incoming sock=%p events=%d\n", sock, events); + VIR_DEBUG("Incoming sock=%p events=%d", sock, events); *retsock = sock; } -- 2.19.0

2 1

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

18 Sep '18

qemuProcessReconnectHelper has hold the doms lock, if create qemuProcessReconnect thread failed, it will get the doms lock again to remove the dom from doms list. add obj->inReconnetCtx flag to avoid deadlock. Signed-off-by: Wang Yechao <wang.yechao255(a)zte.com.cn> --- src/conf/domain_conf.h | 1 + src/conf/virdomainobjlist.c | 6 ++++-- src/qemu/qemu_process.c | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index e30a4b2..5bc5771 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2608,6 +2608,7 @@ struct _virDomainObj { virDomainSnapshotObjPtr current_snapshot; bool hasManagedSave; + bool inReconnectCtx; void *privateData; void (*privateDataFreeFunc)(void *); diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c index 805fe94..30300b4 100644 --- a/src/conf/virdomainobjlist.c +++ b/src/conf/virdomainobjlist.c @@ -397,11 +397,13 @@ virDomainObjListRemove(virDomainObjListPtr doms, dom->removing = true; virObjectRef(dom); virObjectUnlock(dom); - virObjectRWLockWrite(doms); + if (!dom->inReconnectCtx) + virObjectRWLockWrite(doms); virObjectLock(dom); virDomainObjListRemoveLocked(doms, dom); virObjectUnref(dom); - virObjectRWUnlock(doms); + if (!dom->inReconnectCtx) + virObjectRWUnlock(doms); } diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index eb9904b..8c30850 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -8029,6 +8029,7 @@ qemuProcessReconnectHelper(virDomainObjPtr obj, */ qemuProcessStop(src->driver, obj, VIR_DOMAIN_SHUTOFF_FAILED, QEMU_ASYNC_JOB_NONE, 0); + obj->inReconnectCtx = true; qemuDomainRemoveInactiveJob(src->driver, obj); virDomainObjEndAPI(&obj); -- 1.8.3.1

4 4

[libvirt] [PATCH v2] nwfilter: fix deadlock when nwfilter reload
by Wang Yechao 17 Sep '18

17 Sep '18

user run "firewalld-cmd --reload" nwfilterStateReload called in main thread step 1. virRWLockWrite(&updateLock) step 2. virNWFilterLoadAllConfigs step 3. virRWLockUnlock(&updateLock); lauch a vm: qemuDomainCreateXML runs in other thread step 1. virRWLockRead(&updateLock); step 2. qemuProcessStart step 3. qemuProcessWaitForMonitor step 4. ... step 5 virRWLockUnlock(&updateLock); if nwfilterStateReload called in the middle of step 1 and step 5 of qemuDomainCreateXML, it can't get the updateLock and then block the event_loop, so event_loop can't handle the qemu-monitor messages, cause deadlock move nwfilterStateReload into thread to fix this problem. Signed-off-by: Wang Yechao <wang.yechao255(a)zte.com.cn> Reviewed-by: Wang Yi <wang.yi59(a)zte.com.cn> --- src/nwfilter/nwfilter_driver.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 1ee5162..ab85072 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -80,18 +80,26 @@ static void nwfilterDriverUnlock(void) } #if HAVE_FIREWALLD +static void nwfilterReloadThread(void *opaque ATTRIBUTE_UNUSED) +{ + nwfilterStateReload(); +} static DBusHandlerResult nwfilterFirewalldDBusFilter(DBusConnection *connection ATTRIBUTE_UNUSED, DBusMessage *message, void *user_data ATTRIBUTE_UNUSED) { + virThread thread; + if (dbus_message_is_signal(message, DBUS_INTERFACE_DBUS, "NameOwnerChanged") || dbus_message_is_signal(message, "org.fedoraproject.FirewallD1", "Reloaded")) { VIR_DEBUG("Reload in nwfilter_driver because of firewalld."); - nwfilterStateReload(); + + if (virThreadCreate(&thread, false, nwfilterReloadThread, NULL) < 0) + VIR_WARN("create nwfilterReloadThread failed."); } return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; -- 1.8.3.1

3 2

[libvirt] [tck PATCH] eliminate use of deprecated brctl in network tests
by Laine Stump 17 Sep '18

17 Sep '18

brctl is part of the bridge-utils package, which has been deprecated / replaced by the "ip" and "bridge" commands in the iproute package in all modern distros. This patch removes the few usages of brctl in libvirt-tck's network tests, replacing it with a functional equivalent that uses "ip link show type bridge" instead. Signed-off-by: Laine Stump <laine(a)laine.org> --- scripts/networks/networkxml2hostout/tck-testnet-1.dat | 4 ++-- scripts/networks/networkxml2hostout/tck-testnet-1.post.dat | 2 +- scripts/networks/networkxml2hostout/tck-testnet-2.dat | 4 ++-- scripts/networks/networkxml2hostout/tck-testnet-2.post.dat | 2 +- scripts/networks/networkxml2hostout/tck-testnet-3.dat | 4 ++-- scripts/networks/networkxml2hostout/tck-testnet-3.post.dat | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/networks/networkxml2hostout/tck-testnet-1.dat b/scripts/networks/networkxml2hostout/tck-testnet-1.dat index 59cda2f..3e2ce12 100644 --- a/scripts/networks/networkxml2hostout/tck-testnet-1.dat +++ b/scripts/networks/networkxml2hostout/tck-testnet-1.dat @@ -15,8 +15,8 @@ ACCEPT all -- 10.1.2.0/24 0.0.0.0/0 bind-dynamic #grep dhcp-range `ps aux | sed -n '0,/dnsmasq .*tck-testnet/ s|.*--conf-file=$.*tck-testnet.conf$.*|\1|p'` dhcp-range=10.1.2.2,10.1.2.254 -#brctl show | grep tck-testbr | gawk '{print $1" "$3}' -tck-testbr yes +#ip link show type bridge | grep tck-testbr | gawk '{print $2}' +tck-testbr: #ip -o addr show dev tck-testbr | gawk '{print $4" "$6}' 10.1.2.1/24 10.1.2.255 #virsh net-list | grep tck-testnet diff --git a/scripts/networks/networkxml2hostout/tck-testnet-1.post.dat b/scripts/networks/networkxml2hostout/tck-testnet-1.post.dat index 48e1d5a..30f981a 100644 --- a/scripts/networks/networkxml2hostout/tck-testnet-1.post.dat +++ b/scripts/networks/networkxml2hostout/tck-testnet-1.post.dat @@ -4,6 +4,6 @@ #ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*$dhcp-range 10\.1\.2\.2\,10\.1\.2\.254*$.*|\1|p' #route -n | grep '10\.1\.2\.' #route -n | grep '10\.1\.2\.' -#brctl show | grep tck-testbr | gawk '{print $1" "$3}' +#ip link show type bridge | grep tck-testbr | gawk '{print $2}' #ifconfig tck-testbr 2>/dev/null| grep ':10\.1\.2\.' #virsh net-list | grep tck-testnet diff --git a/scripts/networks/networkxml2hostout/tck-testnet-2.dat b/scripts/networks/networkxml2hostout/tck-testnet-2.dat index 4f3d135..48b4b28 100644 --- a/scripts/networks/networkxml2hostout/tck-testnet-2.dat +++ b/scripts/networks/networkxml2hostout/tck-testnet-2.dat @@ -10,8 +10,8 @@ ACCEPT all -- 10.1.2.0/24 0.0.0.0/0 bind-dynamic #grep dhcp-range `ps aux | sed -n '0,/dnsmasq .*tck-testnet/ s|.*--conf-file=$.*tck-testnet.conf$.*|\1|p'` dhcp-range=10.1.2.2,10.1.2.254 -#brctl show | grep tck-testbr | gawk '{print $1" "$3}' -tck-testbr yes +#ip link show type bridge | grep tck-testbr | gawk '{print $2}' +tck-testbr: #ip -o addr show dev tck-testbr | gawk '{print $4" "$6}' 10.1.2.1/24 10.1.2.255 #virsh net-list | grep tck-testnet diff --git a/scripts/networks/networkxml2hostout/tck-testnet-2.post.dat b/scripts/networks/networkxml2hostout/tck-testnet-2.post.dat index a8e0f60..a80f663 100644 --- a/scripts/networks/networkxml2hostout/tck-testnet-2.post.dat +++ b/scripts/networks/networkxml2hostout/tck-testnet-2.post.dat @@ -3,6 +3,6 @@ #ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*$listen-address 10\.1\.2\.1$.*|\1|p' #ps aux | sed -n '/dnsmasq .*tck-testnet/ s|.*$dhcp-range 10\.1\.2\.2,10\.1\.2\.254$.*|\1|p' #route -n | grep '10\.1\.2\.' -#brctl show | grep tck-testbr | gawk '{print $1" "$3}' +#ip link show type bridge | grep tck-testbr | gawk '{print $2}' #ifconfig tck-testbr 2>/dev/null | grep ':10\.1\.2\.' #virsh net-list | grep tck-testnet diff --git a/scripts/networks/networkxml2hostout/tck-testnet-3.dat b/scripts/networks/networkxml2hostout/tck-testnet-3.dat index 5c61690..fca4f81 100644 --- a/scripts/networks/networkxml2hostout/tck-testnet-3.dat +++ b/scripts/networks/networkxml2hostout/tck-testnet-3.dat @@ -20,8 +20,8 @@ bind-dynamic dhcp-range=10.1.2.2,10.1.2.254 dhcp-range=2001:db8:ac10:fe01::1,ra-only dhcp-range=2001:db8:ac10:fd01::1,ra-only -#brctl show | grep tck-testbr | gawk '{print $1" "$3}' -tck-testbr yes +#ip link show type bridge | grep tck-testbr | gawk '{print $2}' +tck-testbr: #ip -o addr show dev tck-testbr | gawk '{print $4" "$6}' | grep -v link 10.1.2.1/24 10.1.2.255 192.168.97.1/24 192.168.97.255 diff --git a/scripts/networks/networkxml2hostout/tck-testnet-3.post.dat b/scripts/networks/networkxml2hostout/tck-testnet-3.post.dat index e525e72..2bebd61 100644 --- a/scripts/networks/networkxml2hostout/tck-testnet-3.post.dat +++ b/scripts/networks/networkxml2hostout/tck-testnet-3.post.dat @@ -11,7 +11,7 @@ #route -n | grep '10\.1\.2\.' #route -n | grep '192\.168\.97\.' #route -n | grep '172\.28\.255\.240' -#brctl show | grep tck-testbr +#ip link show type bridge | grep tck-testbr | gawk '{print $2}' #ifconfig tck-testbr 2>/dev/null | grep ':10\.1\.2\.' #ifconfig tck-testbr 2>/dev/null | grep 'inet6 addr: 2001' #ip addr show tck-testbr 2>/dev/null | grep "inet " -- 2.18.0

2 1

[libvirt] [PATCH] api,qemu: add block latency histogram
by Nikolay Shirokovskiy 17 Sep '18

17 Sep '18

This patch adds option to configure/read latency histogram of block device IO operations. The corresponding functionality in qemu still has x- prefix AFAIK. So this patch should help qemu functionality to become non experimental. In short histogram is configured thru new API virDomainSetBlockLatencyHistogram and histogram itself is available as new fields of virConnectGetAllDomainStats output. --- include/libvirt/libvirt-domain.h | 27 ++++++ src/access/viraccessperm.c | 3 +- src/access/viraccessperm.h | 6 ++ src/conf/domain_conf.c | 6 ++ src/conf/domain_conf.h | 1 + src/driver-hypervisor.h | 9 ++ src/libvirt-domain.c | 58 +++++++++++++ src/libvirt_private.syms | 2 + src/libvirt_public.syms | 5 ++ src/qemu/qemu_driver.c | 136 ++++++++++++++++++++++++++++++ src/qemu/qemu_monitor.c | 37 +++++++- src/qemu/qemu_monitor.h | 19 +++++ src/qemu/qemu_monitor_json.c | 163 ++++++++++++++++++++++++++++++++---- src/qemu/qemu_monitor_json.h | 8 ++ src/remote/remote_daemon_dispatch.c | 39 +++++++++ src/remote/remote_driver.c | 49 ++++++++++- src/remote/remote_protocol.x | 23 ++++- src/remote_protocol-structs | 11 +++ tools/virsh-domain.c | 118 ++++++++++++++++++++++++++ tools/virsh.pod | 18 ++++ 20 files changed, 716 insertions(+), 22 deletions(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index fdd2d6b..4fafa3d 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -4793,4 +4793,31 @@ int virDomainGetLaunchSecurityInfo(virDomainPtr domain, int *nparams, unsigned int flags); +/* + * virDomainBlockLatencyHistogram: + * + * Selects a IO operation for which latency histogram is to be configured + */ +typedef enum { + VIR_DOMAIN_BLOCK_LATENCY_ALL = 0, + VIR_DOMAIN_BLOCK_LATENCY_READ = 1, + VIR_DOMAIN_BLOCK_LATENCY_WRITE = 2, + VIR_DOMAIN_BLOCK_LATENCY_FLUSH = 3, + +# ifdef VIR_ENUM_SENTINELS + VIR_DOMAIN_BLOCK_LATENCY_LAST + /* + * NB: this enum value will increase over time. It reflects the last state + * supported by this version of the libvirt API. + */ +# endif +} virDomainBlockLatencyHistogram; + +int virDomainSetBlockLatencyHistogram(virDomainPtr dom, + const char *dev, + unsigned int op, + unsigned long long *boundaries, + int nboundaries, + unsigned int flags); + #endif /* __VIR_LIBVIRT_DOMAIN_H__ */ diff --git a/src/access/viraccessperm.c b/src/access/viraccessperm.c index d7cbb70..e08853a 100644 --- a/src/access/viraccessperm.c +++ b/src/access/viraccessperm.c @@ -43,7 +43,8 @@ VIR_ENUM_IMPL(virAccessPermDomain, "fs_trim", "fs_freeze", "block_read", "block_write", "mem_read", "open_graphics", "open_device", "screenshot", - "open_namespace", "set_time", "set_password"); + "open_namespace", "set_time", "set_password", + "block_stats_conf"); VIR_ENUM_IMPL(virAccessPermInterface, VIR_ACCESS_PERM_INTERFACE_LAST, diff --git a/src/access/viraccessperm.h b/src/access/viraccessperm.h index 5ac5ff3..a3097c5 100644 --- a/src/access/viraccessperm.h +++ b/src/access/viraccessperm.h @@ -312,6 +312,12 @@ typedef enum { */ VIR_ACCESS_PERM_DOMAIN_SET_PASSWORD, + /** + * @desc: Configure block stats gathering + * @message: Configuring block stats gathering requires authorization + */ + VIR_ACCESS_PERM_DOMAIN_BLOCK_STATS_CONF, + VIR_ACCESS_PERM_DOMAIN_LAST, } virAccessPermDomain; diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 38cac07..6095636 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -802,6 +802,12 @@ VIR_ENUM_IMPL(virDomainCrashedReason, VIR_DOMAIN_CRASHED_LAST, VIR_ENUM_IMPL(virDomainPMSuspendedReason, VIR_DOMAIN_PMSUSPENDED_LAST, "unknown") +VIR_ENUM_IMPL(virDomainBlockLatencyHistogram, VIR_DOMAIN_BLOCK_LATENCY_LAST, + "all", + "read", + "write", + "flush") + VIR_ENUM_IMPL(virDomainSeclabel, VIR_DOMAIN_SECLABEL_LAST, "default", "none", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 8a36733..e2674c8 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3466,6 +3466,7 @@ VIR_ENUM_DECL(virDomainShutdownReason) VIR_ENUM_DECL(virDomainShutoffReason) VIR_ENUM_DECL(virDomainCrashedReason) VIR_ENUM_DECL(virDomainPMSuspendedReason) +VIR_ENUM_DECL(virDomainBlockLatencyHistogram) const char *virDomainStateReasonToString(virDomainState state, int reason); int virDomainStateReasonFromString(virDomainState state, const char *reason); diff --git a/src/driver-hypervisor.h b/src/driver-hypervisor.h index eef31eb..968334f 100644 --- a/src/driver-hypervisor.h +++ b/src/driver-hypervisor.h @@ -1322,6 +1322,14 @@ typedef int unsigned int flags); +typedef int +(*virDrvDomainSetBlockLatencyHistogram)(virDomainPtr dom, + const char *dev, + unsigned int op, + unsigned long long *boundaries, + int nboundaries, + unsigned int flags); + typedef struct _virHypervisorDriver virHypervisorDriver; typedef virHypervisorDriver *virHypervisorDriverPtr; @@ -1572,6 +1580,7 @@ struct _virHypervisorDriver { virDrvConnectBaselineHypervisorCPU connectBaselineHypervisorCPU; virDrvNodeGetSEVInfo nodeGetSEVInfo; virDrvDomainGetLaunchSecurityInfo domainGetLaunchSecurityInfo; + virDrvDomainSetBlockLatencyHistogram domainSetBlockLatencyHistogram; }; diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index ef46027..bfc1947 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -12223,3 +12223,61 @@ int virDomainGetLaunchSecurityInfo(virDomainPtr domain, virDispatchError(domain->conn); return -1; } + + +/* + * virDomainSetBlockLatencyHistogram: + * @domain: pointer to domain object + * @dev: string specifying the block device + * @op: selects io operation to set histogram for + * @boundaries: borders of histogram bins in nanoseconds, 0 ns and +inf ns + * borders are implicit and should not be specified + * @nboundaries: number of boundaries + * @flags: currently unused, callers should pass 0 + * + * Configures latency histogram parameters for IO operation @op for disk @dev + * of the @domain. If @op is VIR_DOMAIN_BLOCK_LATENCY_ALL then histograms + * for all IO operations will be configured. + * + * @boundaries is list of histogram iterval boundaries in nanoseconds in acsending + * order. Boundaries 0 and +inf are implicit and should not be specified. + * For example 10, 50, 100 will configure histogram with intervals + * [0, 10), [10, 50), [50, 100) and [100, +inf). If @boundaries is NULL + * and @op is VIR_DOMAIN_BLOCK_LATENCY_ALL then all the histograms will be removed + * that is they will not be collected and will not be in the domain stats output. + * + * Returns 0 on success, -1 on failure. + */ +int virDomainSetBlockLatencyHistogram(virDomainPtr domain, + const char *dev, + unsigned int op, + unsigned long long *boundaries, + int nboundaries, + unsigned int flags) +{ + VIR_DOMAIN_DEBUG(domain, "dev='%s' op=%d boundaries=%p " + "nboundaries=%d flags=0x%x", + NULLSTR(dev), op, boundaries, nboundaries, flags); + + virResetLastError(); + + virCheckDomainReturn(domain, -1); + virCheckReadOnlyGoto(domain->conn->flags, error); + + virCheckNonNullArgGoto(dev, error); + + if (domain->conn->driver->domainSetBlockLatencyHistogram) { + int ret; + ret = domain->conn->driver->domainSetBlockLatencyHistogram( + domain, dev, op, boundaries, nboundaries, flags); + if (ret < 0) + goto error; + return ret; + } + + virReportUnsupportedError(); + + error: + virDispatchError(domain->conn); + return -1; +} diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 954ab4b..3eb36f1 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -189,6 +189,8 @@ virDiskNameToIndex; virDomainActualNetDefFree; virDomainBlockedReasonTypeFromString; virDomainBlockedReasonTypeToString; +virDomainBlockLatencyHistogramTypeFromString; +virDomainBlockLatencyHistogramTypeToString; virDomainBootTypeFromString; virDomainBootTypeToString; virDomainCapabilitiesPolicyTypeToString; diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms index d4cdbd8..4f20993 100644 --- a/src/libvirt_public.syms +++ b/src/libvirt_public.syms @@ -809,4 +809,9 @@ LIBVIRT_4.5.0 { virNWFilterBindingGetFilterName; } LIBVIRT_4.4.0; +LIBVIRT_4.8.0 { + global: + virDomainSetBlockLatencyHistogram; +} LIBVIRT_4.5.0; + # .... define new API here using predicted next version number .... diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a0f7c71..d473ddc 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -20099,6 +20099,48 @@ qemuDomainGetStatsOneBlockRefreshNamed(virStorageSourcePtr src, static int +qemuDomainGetBlockLatency(virDomainStatsRecordPtr record, + int *maxparams, + size_t block_idx, + const char *op, + qemuBlockLatencyStatsPtr latency) +{ + char param_name[VIR_TYPED_PARAM_FIELD_LENGTH]; + size_t i; + int ret = -1; + + if (!latency->nbins) + return 0; + + snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, + "block.%zu.latency.%s.bincount", block_idx, op); + if (virTypedParamsAddUInt(&record->params, &record->nparams, maxparams, + param_name, latency->nbins) < 0) + goto cleanup; + + for (i = 0; i < latency->nbins; i++) { + snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, + "block.%zu.latency.%s.bin.%zu", block_idx, op, i); + if (virTypedParamsAddULLong(&record->params, &record->nparams, maxparams, + param_name, latency->bins[i]) < 0) + goto cleanup; + } + + for (i = 0; i < latency->nbins - 1; i++) { + snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, + "block.%zu.latency.%s.boundary.%zu", block_idx, op, i); + if (virTypedParamsAddULLong(&record->params, &record->nparams, maxparams, + param_name, latency->boundaries[i]) < 0) + goto cleanup; + } + + ret = 0; + cleanup: + return ret; +} + + +static int qemuDomainGetStatsOneBlock(virQEMUDriverPtr driver, virQEMUDriverConfigPtr cfg, virDomainObjPtr dom, @@ -20128,6 +20170,14 @@ qemuDomainGetStatsOneBlock(virQEMUDriverPtr driver, goto cleanup; } + if (qemuDomainGetBlockLatency(record, maxparams, block_idx, "rd", + &entry->rd_latency) < 0 || + qemuDomainGetBlockLatency(record, maxparams, block_idx, "wr", + &entry->wr_latency) < 0 || + qemuDomainGetBlockLatency(record, maxparams, block_idx, "fl", + &entry->flush_latency) < 0) + goto cleanup; + QEMU_ADD_BLOCK_PARAM_ULL(record, maxparams, block_idx, "allocation", entry->wr_highest_offset); @@ -21752,6 +21802,91 @@ qemuDomainGetLaunchSecurityInfo(virDomainPtr domain, return ret; } + +static +int qemuDomainSetBlockLatencyHistogram(virDomainPtr dom, + const char *dev, + unsigned int op, + unsigned long long *boundaries, + int nboundaries, + unsigned int flags) +{ + virQEMUDriverPtr driver = dom->conn->privateData; + qemuDomainObjPrivatePtr priv; + virDomainObjPtr vm; + virDomainDiskDefPtr disk; + char *device = NULL; + bool job = false; + int ret = -1; + int rc; + + virCheckFlags(0, -1); + + if (op >= VIR_DOMAIN_BLOCK_LATENCY_LAST) { + virReportError(VIR_ERR_INVALID_ARG, + _("unknown latency histogram: %d"), op); + return -1; + } + + if (!boundaries && op) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("per operation histogram deletion is not supported")); + return -1; + } + + if (boundaries && nboundaries > 1) { + size_t i; + + for (i = 0; i < nboundaries - 1; i++) { + if (boundaries[i] > boundaries[i + 1]) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("boundaries should be in ascending order")); + return -1; + } + } + } + + if (!(vm = qemuDomObjFromDomain(dom))) + return -1; + + if (virDomainSetBlockLatencyHistogramEnsureACL(dom->conn, vm->def) < 0) + goto cleanup; + + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) + goto cleanup; + job = true; + + if (!virDomainObjIsActive(vm)) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain is not running")); + goto cleanup; + } + + priv = vm->privateData; + + if (!(disk = qemuDomainDiskByName(vm->def, dev))) + goto cleanup; + + if (!(device = qemuAliasDiskDriveFromDisk(disk))) + goto cleanup; + + qemuDomainObjEnterMonitor(driver, vm); + rc = qemuMonitorBlockLatencyHistogramSet(priv->mon, device, op, + boundaries, nboundaries); + if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0) + goto cleanup; + + ret = 0; + cleanup: + if (job) + qemuDomainObjEndJob(driver, vm); + virDomainObjEndAPI(&vm); + VIR_FREE(device); + + return ret; +} + + static virHypervisorDriver qemuHypervisorDriver = { .name = QEMU_DRIVER_NAME, .connectURIProbe = qemuConnectURIProbe, @@ -21977,6 +22112,7 @@ static virHypervisorDriver qemuHypervisorDriver = { .connectBaselineHypervisorCPU = qemuConnectBaselineHypervisorCPU, /* 4.4.0 */ .nodeGetSEVInfo = qemuNodeGetSEVInfo, /* 4.5.0 */ .domainGetLaunchSecurityInfo = qemuDomainGetLaunchSecurityInfo, /* 4.5.0 */ + .domainSetBlockLatencyHistogram = qemuDomainSetBlockLatencyHistogram, /* 4.8.0 */ }; diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 4c0002d..064da62 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -2257,6 +2257,25 @@ qemuMonitorQueryBlockstats(qemuMonitorPtr mon) } +void +qemuBlockStatsFree(void *value, const void *name ATTRIBUTE_UNUSED) +{ + qemuBlockStatsPtr stats = value; + + if (!stats) + return; + + VIR_FREE(stats->rd_latency.bins); + VIR_FREE(stats->rd_latency.boundaries); + VIR_FREE(stats->wr_latency.bins); + VIR_FREE(stats->wr_latency.boundaries); + VIR_FREE(stats->flush_latency.bins); + VIR_FREE(stats->flush_latency.boundaries); + + VIR_FREE(stats); +} + + /** * qemuMonitorGetAllBlockStatsInfo: * @mon: monitor object @@ -2279,7 +2298,7 @@ qemuMonitorGetAllBlockStatsInfo(qemuMonitorPtr mon, QEMU_CHECK_MONITOR(mon); - if (!(*ret_stats = virHashCreate(10, virHashValueFree))) + if (!(*ret_stats = virHashCreate(10, qemuBlockStatsFree))) goto error; ret = qemuMonitorJSONGetAllBlockStatsInfo(mon, *ret_stats, @@ -4429,3 +4448,19 @@ qemuMonitorGetPRManagerInfo(qemuMonitorPtr mon, virHashFree(info); return ret; } + +int +qemuMonitorBlockLatencyHistogramSet(qemuMonitorPtr mon, + const char *device, + unsigned int op, + unsigned long long *boundaries, + int nboundaries) +{ + VIR_DEBUG("mon=%p, device=%s op=%d boundaries=%p nboundaries=%d", + mon, device, op, boundaries, nboundaries); + + QEMU_CHECK_MONITOR(mon); + + return qemuMonitorJSONBlockLatencyHistogramSet(mon, device, op, + boundaries, nboundaries); +} diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 48b142a..9295ecb 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -569,6 +569,14 @@ virHashTablePtr qemuMonitorGetBlockInfo(qemuMonitorPtr mon); virJSONValuePtr qemuMonitorQueryBlockstats(qemuMonitorPtr mon); +typedef struct _qemuBlockLatencyStats qemuBlockLatencyStats; +typedef qemuBlockLatencyStats *qemuBlockLatencyStatsPtr; +struct _qemuBlockLatencyStats { + unsigned long long *boundaries; + unsigned long long *bins; + unsigned int nbins; +}; + typedef struct _qemuBlockStats qemuBlockStats; typedef qemuBlockStats *qemuBlockStatsPtr; struct _qemuBlockStats { @@ -580,6 +588,9 @@ struct _qemuBlockStats { long long wr_total_times; long long flush_req; long long flush_total_times; + qemuBlockLatencyStats rd_latency; + qemuBlockLatencyStats wr_latency; + qemuBlockLatencyStats flush_latency; unsigned long long capacity; unsigned long long physical; @@ -592,6 +603,8 @@ struct _qemuBlockStats { unsigned long long write_threshold; }; +void qemuBlockStatsFree(void *value, const void *name); + int qemuMonitorGetAllBlockStatsInfo(qemuMonitorPtr mon, virHashTablePtr *ret_stats, bool backingChain) @@ -1188,4 +1201,10 @@ struct _qemuMonitorPRManagerInfo { int qemuMonitorGetPRManagerInfo(qemuMonitorPtr mon, virHashTablePtr *retinfo); +int qemuMonitorBlockLatencyHistogramSet(qemuMonitorPtr mon, + const char *device, + unsigned int op, + unsigned long long *boundaries, + int nboundaries); + #endif /* QEMU_MONITOR_H */ diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 3181805..7622626 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2319,6 +2319,64 @@ int qemuMonitorJSONGetBlockInfo(qemuMonitorPtr mon, } +static int +qemuMonitorJSONGetBlockLatencyStats(virJSONValuePtr stats, + const char *name, + qemuBlockLatencyStatsPtr latency) +{ + virJSONValuePtr latencyJSON; + virJSONValuePtr bins; + virJSONValuePtr boundaries; + size_t i; + + if (!(latencyJSON = virJSONValueObjectGetObject(stats, name))) + return 0; + + if (!(bins = virJSONValueObjectGetArray(latencyJSON, "bins"))) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot read bins in latency %s"), name); + return -1; + } + + if (!(boundaries = virJSONValueObjectGetArray(latencyJSON, "boundaries"))) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot read boundaries in latency %s"), name); + return -1; + } + + if (virJSONValueArraySize(bins) != virJSONValueArraySize(boundaries) + 1) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("bins and boundaries size mismatch in latency %s"), name); + return -1; + } + latency->nbins = virJSONValueArraySize(bins); + + if (VIR_ALLOC_N(latency->boundaries, latency->nbins - 1) < 0 || + VIR_ALLOC_N(latency->bins, latency->nbins) < 0) + return -1; + + for (i = 0; i < latency->nbins; i++) { + if (virJSONValueGetNumberUlong(virJSONValueArrayGet(bins, i), + &latency->bins[i]) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("invalid bins in latency %s"), name); + return -1; + } + } + + for (i = 0; i < latency->nbins - 1; i++) { + if (virJSONValueGetNumberUlong(virJSONValueArrayGet(boundaries, i), + &latency->boundaries[i]) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("invalid boundaries in latency %s"), name); + return -1; + } + } + + return 0; +} + + static qemuBlockStatsPtr qemuMonitorJSONBlockStatsCollectData(virJSONValuePtr dev, int *nstats) @@ -2358,6 +2416,17 @@ qemuMonitorJSONBlockStatsCollectData(virJSONValuePtr dev, QEMU_MONITOR_BLOCK_STAT_GET("flush_total_time_ns", bstats->flush_total_times, false); #undef QEMU_MONITOR_BLOCK_STAT_GET +#define QEMU_MONITOR_BLOCK_LATENCY_GET(NAME) \ + if (qemuMonitorJSONGetBlockLatencyStats(stats, \ + #NAME "_latency_histogram", \ + &bstats->NAME ## _latency) < 0) \ + goto cleanup; + + QEMU_MONITOR_BLOCK_LATENCY_GET(rd); + QEMU_MONITOR_BLOCK_LATENCY_GET(wr); + QEMU_MONITOR_BLOCK_LATENCY_GET(flush); +#undef QEMU_MONITOR_BLOCK_LATENCY_GET + if ((parent = virJSONValueObjectGetObject(dev, "parent")) && (parentstats = virJSONValueObjectGetObject(parent, "stats"))) { if (virJSONValueObjectGetNumberUlong(parentstats, "wr_highest_offset", @@ -2368,30 +2437,28 @@ qemuMonitorJSONBlockStatsCollectData(virJSONValuePtr dev, VIR_STEAL_PTR(ret, bstats); cleanup: - VIR_FREE(bstats); + qemuBlockStatsFree(bstats, NULL); return ret; } static int -qemuMonitorJSONAddOneBlockStatsInfo(qemuBlockStatsPtr bstats, +qemuMonitorJSONAddOneBlockStatsInfo(virJSONValuePtr dev, const char *name, virHashTablePtr stats) { - qemuBlockStatsPtr copy = NULL; + qemuBlockStatsPtr bstats; + int nstats; - if (VIR_ALLOC(copy) < 0) + if (!(bstats = qemuMonitorJSONBlockStatsCollectData(dev, &nstats))) return -1; - if (bstats) - *copy = *bstats; - - if (virHashAddEntry(stats, name, copy) < 0) { - VIR_FREE(copy); + if (virHashAddEntry(stats, name, bstats) < 0) { + qemuBlockStatsFree(bstats, NULL); return -1; } - return 0; + return nstats; } @@ -2402,7 +2469,6 @@ qemuMonitorJSONGetOneBlockStatsInfo(virJSONValuePtr dev, virHashTablePtr hash, bool backingChain) { - qemuBlockStatsPtr bstats = NULL; int ret = -1; int nstats = 0; const char *qdevname = NULL; @@ -2423,19 +2489,16 @@ qemuMonitorJSONGetOneBlockStatsInfo(virJSONValuePtr dev, goto cleanup; } - if (!(bstats = qemuMonitorJSONBlockStatsCollectData(dev, &nstats))) - goto cleanup; - if (devicename && - qemuMonitorJSONAddOneBlockStatsInfo(bstats, devicename, hash) < 0) + (nstats = qemuMonitorJSONAddOneBlockStatsInfo(dev, devicename, hash)) < 0) goto cleanup; if (qdevname && STRNEQ_NULLABLE(qdevname, devicename) && - qemuMonitorJSONAddOneBlockStatsInfo(bstats, qdevname, hash) < 0) + qemuMonitorJSONAddOneBlockStatsInfo(dev, qdevname, hash) < 0) goto cleanup; if (nodename && - qemuMonitorJSONAddOneBlockStatsInfo(bstats, nodename, hash) < 0) + qemuMonitorJSONAddOneBlockStatsInfo(dev, nodename, hash) < 0) goto cleanup; if (backingChain && @@ -2446,7 +2509,6 @@ qemuMonitorJSONGetOneBlockStatsInfo(virJSONValuePtr dev, ret = nstats; cleanup: - VIR_FREE(bstats); VIR_FREE(devicename); return ret; } @@ -8396,3 +8458,68 @@ qemuMonitorJSONGetPRManagerInfo(qemuMonitorPtr mon, return ret; } + + +int +qemuMonitorJSONBlockLatencyHistogramSet(qemuMonitorPtr mon, + const char *device, + unsigned int op, + unsigned long long *boundaries, + int nboundaries) +{ + int ret = -1; + char *specOp = NULL; + virJSONValuePtr cmd = NULL; + virJSONValuePtr reply = NULL; + const char *specAll = "A:boundaries"; + const char *spec; + virJSONValuePtr boundariesJSON = NULL; + + if (op != VIR_DOMAIN_BLOCK_LATENCY_ALL) { + if (virAsprintf(&specOp, "A:boundaries-%s", + virDomainBlockLatencyHistogramTypeToString(op)) < 0) + return -1; + spec = specOp; + } else { + spec = specAll; + } + + if (boundaries) { + size_t i; + + if (!(boundariesJSON = virJSONValueNewArray())) + goto cleanup; + + for (i = 0; i < nboundaries; i++) { + virJSONValuePtr val; + + if (!(val = virJSONValueNewNumberUlong(boundaries[i])) || + virJSONValueArrayAppend(boundariesJSON, val) < 0) { + virJSONValueFree(val); + goto cleanup; + } + } + } + + if (!(cmd = qemuMonitorJSONMakeCommand("block-latency-histogram-set", + "s:device", device, + spec, &boundariesJSON, + NULL))) + return -1; + + if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) + goto cleanup; + + if (qemuMonitorJSONCheckError(cmd, reply) < 0) + goto cleanup; + + ret = 0; + + cleanup: + virJSONValueFree(cmd); + virJSONValueFree(reply); + virJSONValueFree(boundariesJSON); + VIR_FREE(specOp); + + return ret; +} diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index da267b1..f1636a4 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -577,4 +577,12 @@ int qemuMonitorJSONGetPRManagerInfo(qemuMonitorPtr mon, virHashTablePtr info) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); +int +qemuMonitorJSONBlockLatencyHistogramSet(qemuMonitorPtr mon, + const char *device, + unsigned int op, + unsigned long long *boundaries, + int nboundaries) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); + #endif /* QEMU_MONITOR_JSON_H */ diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon_dispatch.c index e62ebfb..50d2dc4 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -7030,6 +7030,45 @@ remoteDispatchStorageVolGetInfoFlags(virNetServerPtr server ATTRIBUTE_UNUSED, } +static int +remoteDispatchDomainSetBlockLatencyHistogram(virNetServerPtr server ATTRIBUTE_UNUSED, + virNetServerClientPtr client, + virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessageErrorPtr rerr, + remote_domain_set_block_latency_histogram_args *args, + remote_domain_set_block_latency_histogram_ret *ret) +{ + int rv = -1; + virDomainPtr dom = NULL; + int result; + struct daemonClientPrivate *priv = virNetServerClientGetPrivateData(client); + + if (!priv->conn) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not open")); + goto cleanup; + } + + if (!(dom = get_nonnull_domain(priv->conn, args->dom))) + goto cleanup; + + if ((result = virDomainSetBlockLatencyHistogram(dom, args->dev, + args->op, + (unsigned long long *)args->boundaries.boundaries_val, + args->boundaries.boundaries_len, + args->flags)) < 0) + goto cleanup; + + ret->result = result; + rv = 0; + + cleanup: + if (rv < 0) + virNetMessageSaveError(rerr); + virObjectUnref(dom); + return rv; +} + + /*----- Helpers. -----*/ /* get_nonnull_domain and get_nonnull_network turn an on-wire diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 3b43e21..c5f9295 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -8153,6 +8153,52 @@ remoteStorageVolGetInfoFlags(virStorageVolPtr vol, } +static int +remoteDomainSetBlockLatencyHistogram(virDomainPtr dom, + const char *dev, + unsigned int op, + unsigned long long *boundaries, + int nboundaries, + unsigned int flags) +{ + int rv = -1; + struct private_data *priv = dom->conn->privateData; + remote_domain_set_block_latency_histogram_args args; + remote_domain_set_block_latency_histogram_ret ret; + + remoteDriverLock(priv); + + if (nboundaries > REMOTE_DOMAIN_SET_BLOCK_LATENCY_HISTOGRAM_BOUNDARIES_MAX) { + virReportError(VIR_ERR_RPC, + _("boundaries length greater than maximum: %d > %d"), + nboundaries, + REMOTE_DOMAIN_SET_BLOCK_LATENCY_HISTOGRAM_BOUNDARIES_MAX); + goto done; + } + + make_nonnull_domain(&args.dom, dom); + args.dev = (char *)dev; + args.op = op; + args.boundaries.boundaries_val = (uint64_t *) boundaries; + args.boundaries.boundaries_len = nboundaries; + args.flags = flags; + + memset(&ret, 0, sizeof(ret)); + + if (call(dom->conn, priv, 0, REMOTE_PROC_DOMAIN_SET_BLOCK_LATENCY_HISTOGRAM, + (xdrproc_t)xdr_remote_domain_set_block_latency_histogram_args, (char *)&args, + (xdrproc_t)xdr_remote_domain_set_block_latency_histogram_ret, (char *)&ret) == -1) { + goto done; + } + + rv = ret.result; + + done: + remoteDriverUnlock(priv); + return rv; +} + + /* get_nonnull_domain and get_nonnull_network turn an on-wire * (name, uuid) pair into virDomainPtr or virNetworkPtr object. * These can return NULL if underlying memory allocations fail, @@ -8536,7 +8582,8 @@ static virHypervisorDriver hypervisor_driver = { .connectCompareHypervisorCPU = remoteConnectCompareHypervisorCPU, /* 4.4.0 */ .connectBaselineHypervisorCPU = remoteConnectBaselineHypervisorCPU, /* 4.4.0 */ .nodeGetSEVInfo = remoteNodeGetSEVInfo, /* 4.5.0 */ - .domainGetLaunchSecurityInfo = remoteDomainGetLaunchSecurityInfo /* 4.5.0 */ + .domainGetLaunchSecurityInfo = remoteDomainGetLaunchSecurityInfo, /* 4.5.0 */ + .domainSetBlockLatencyHistogram = remoteDomainSetBlockLatencyHistogram, /* 4.8.0 */ }; static virNetworkDriver network_driver = { diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index 28c8feb..c4ede63 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -262,6 +262,9 @@ const REMOTE_NODE_SEV_INFO_MAX = 64; /* Upper limit on number of launch security information entries */ const REMOTE_DOMAIN_LAUNCH_SECURITY_INFO_PARAMS_MAX = 64; +/* Upper limit on block latency histogram boundaries. */ +const REMOTE_DOMAIN_SET_BLOCK_LATENCY_HISTOGRAM_BOUNDARIES_MAX = 1024; + /* UUID. VIR_UUID_BUFLEN definition comes from libvirt.h */ typedef opaque remote_uuid[VIR_UUID_BUFLEN]; @@ -3557,6 +3560,18 @@ struct remote_connect_list_all_nwfilter_bindings_ret { /* insert@1 */ unsigned int ret; }; +struct remote_domain_set_block_latency_histogram_args { + remote_nonnull_domain dom; + remote_nonnull_string dev; + unsigned int op; + unsigned hyper boundaries<REMOTE_DOMAIN_SET_BLOCK_LATENCY_HISTOGRAM_BOUNDARIES_MAX>; + unsigned int flags; +}; + +struct remote_domain_set_block_latency_histogram_ret { + int result; +}; + /*----- Protocol. -----*/ /* Define the program number, protocol version and procedure numbers here. */ @@ -6312,5 +6327,11 @@ enum remote_procedure { * @acl: connect:search_nwfilter_bindings * @aclfilter: nwfilter_binding:getattr */ - REMOTE_PROC_CONNECT_LIST_ALL_NWFILTER_BINDINGS = 401 + REMOTE_PROC_CONNECT_LIST_ALL_NWFILTER_BINDINGS = 401, + + /** + * @generate: none + * @acl: domain:block_stats_conf + */ + REMOTE_PROC_DOMAIN_SET_BLOCK_LATENCY_HISTOGRAM = 402 }; diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index 6343e14..aa85253 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -2966,6 +2966,16 @@ struct remote_connect_list_all_nwfilter_bindings_ret { } bindings; u_int ret; }; +struct remote_domain_set_block_latency_histogram_args { + remote_nonnull_domain dom; + remote_nonnull_string dev; + u_int op; + struct { + u_int boundaries_len; + uint64_t boundaries_val; + } boundaries; + u_int flags; +}; enum remote_procedure { REMOTE_PROC_CONNECT_OPEN = 1, REMOTE_PROC_CONNECT_CLOSE = 2, @@ -3368,4 +3378,5 @@ enum remote_procedure { REMOTE_PROC_NWFILTER_BINDING_CREATE_XML = 399, REMOTE_PROC_NWFILTER_BINDING_DELETE = 400, REMOTE_PROC_CONNECT_LIST_ALL_NWFILTER_BINDINGS = 401, + REMOTE_PROC_DOMAIN_SET_BLOCK_LATENCY_HISTOGRAM = 402, }; diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index c1cff9f..e4cf49b 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -13816,6 +13816,118 @@ cmdDomFSInfo(vshControl *ctl, const vshCmd *cmd) return ret >= 0; } +/* + * "block-set-latency-histogram" command + */ +static const vshCmdInfo info_block_set_latency_histogram[] = { + {.name = "help", + .data = N_("configures latency histogram for given device for given operation") + }, + {.name = "desc", + .data = N_("configures latency histogram for given device for given operation") + }, + {.name = NULL} +}; + +static const vshCmdOptDef opts_block_set_latency_histogram[] = { + VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_ACTIVE), + {.name = "dev", + .type = VSH_OT_DATA, + .flags = VSH_OFLAG_REQ, + .help = N_("device to set latency histogram for") + }, + {.name = "boundaries", + .type = VSH_OT_STRING, + .help = N_("comma separated histogram boundaries in nanoseconds") + }, + {.name = "op", + .type = VSH_OT_STRING, + .help = N_("operation to set latency histogram for, all if omitted") + }, + {.name = NULL} +}; + +static bool +cmdBlockSetLatencyHistogram(vshControl *ctl, const vshCmd *cmd) +{ + const char *dev = NULL; + const char *opstr = NULL; + const char *boundariesstr = NULL; + char **boundarieslist = NULL; + char **tmp = NULL; + unsigned long long *boundaries = NULL; + size_t nboundaries = 0; + unsigned char op; + virDomainPtr dom; + bool ret = false; + + if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) + return false; + + if (vshCommandOptStringReq(ctl, cmd, "dev", &dev) < 0) + goto cleanup; + + if (vshCommandOptStringReq(ctl, cmd, "op", &opstr) < 0) + goto cleanup; + + if (opstr) { + if (STREQ(opstr, "read")) { + op = VIR_DOMAIN_BLOCK_LATENCY_READ; + } else if (STREQ(opstr, "write")) { + op = VIR_DOMAIN_BLOCK_LATENCY_WRITE; + } else if (STREQ(opstr, "flush")) { + op = VIR_DOMAIN_BLOCK_LATENCY_FLUSH; + } else { + vshError(ctl, _("Unknown operation %s value, expecting " + "'read', 'write', 'flush'."), opstr); + goto cleanup; + } + } else { + op = VIR_DOMAIN_BLOCK_LATENCY_ALL; + } + + if (vshCommandOptStringReq(ctl, cmd, "boundaries", &boundariesstr) < 0) + goto cleanup; + + if (!boundariesstr && op) { + vshError(ctl, _("per operation histogram deletion is not supported")); + goto cleanup; + } + + if (boundariesstr && + !(boundarieslist = virStringSplit(boundariesstr, ",", 0))) { + vshError(ctl, "%s", _("Cannot parse boundaries string")); + goto cleanup; + } + + tmp = boundarieslist; + while (boundarieslist && *tmp) { + unsigned long long val; + + if (virStrToLong_ull(*tmp, NULL, 10, &val) < 0) { + vshError(ctl, _("Cannot parse boundaries value: %s"), *tmp); + goto cleanup; + } + + if (VIR_APPEND_ELEMENT(boundaries, nboundaries, val) < 0) + goto cleanup; + + tmp++; + } + + if (virDomainSetBlockLatencyHistogram(dom, dev, op, + boundaries, nboundaries, 0) < 0) + goto cleanup; + + ret = true; + + cleanup: + virshDomainFree(dom); + virStringListFree(boundarieslist); + VIR_FREE(boundaries); + return ret; +} + const vshCmdDef domManagementCmds[] = { {.name = "attach-device", .handler = cmdAttachDevice, @@ -14425,5 +14537,11 @@ const vshCmdDef domManagementCmds[] = { .info = info_domblkthreshold, .flags = 0 }, + {.name = "block-set-latency-histogram", + .handler = cmdBlockSetLatencyHistogram, + .opts = opts_block_set_latency_histogram, + .info = info_block_set_latency_histogram, + .flags = 0 + }, {.name = NULL} }; diff --git a/tools/virsh.pod b/tools/virsh.pod index 86c041d..faed047 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2988,6 +2988,24 @@ See B<vcpupin> for information on I<cpulist>. Output the IP address and port number for the VNC display. If the information is not available the processes will provide an exit code of 1. +=item B<block-set-latency-histogram> I<domain> I<disk> [I<boundaries>] +[I<--op> I<operation>] + +Configures latency histogram parameters for IO operation I<operation> for disk +I<disk> and resets all histogram's bins to zero. I<operation> is one of +C<read>, C<write> or C<flush>. If I<operation> is omitted then histograms for +all operations will be configured. Histogram itself is available via +B<domstats>. + +I<boundaries> is a comma separated list of histogram iterval boundaries in +nanoseconds in acsending order. Boundaries 0 and +inf are implicit and should +not be specified. For example "10, 50, 100" will configure histogram with +intervals [0, 10), [10, 50), [50, 100) and [100, +inf). + +If both I<boundaries> and I<operation> are omitted then the histograms for all +operations will be removed that is they will not be collected and will not be +in the B<domstats> output. + =back =head1 DEVICE COMMANDS -- 1.8.3.1

3 4

[libvirt] [PATCH v7] qemu: Introduce state_lock_timeout to qemu.conf
by Yi Wang 17 Sep '18

17 Sep '18

When doing some job holding state lock for a long time, we may come across error: "Timed out during operation: cannot acquire state change lock" Well, sometimes it's not a problem and users want to continue to wait, and this patch allow users decide how long time they can wait the state lock. Signed-off-by: Yi Wang <wang.yi59(a)zte.com.cn> Reviewed-by: Xi Xu <xu.xi8(a)zte.com.cn> --- changes in v7: - fix multiplication issue in BeginJobInternal changes in v6: - modify the description in qemu.conf - move the multiplication to BeginJobInternal changes in v5: - adjust position of state lock in aug file - fix state lock time got from conf file from milliseconds to seconds changes in v4: - fix syntax-check error changes in v3: - add user-friendly description and nb of state lock - check validity of stateLockTimeout changes in v2: - change default value to 30 in qemu.conf - set the default value in virQEMUDriverConfigNew() --- src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 7 +++++++ src/qemu/qemu_conf.c | 14 ++++++++++++++ src/qemu/qemu_conf.h | 2 ++ src/qemu/qemu_domain.c | 5 +---- src/qemu/test_libvirtd_qemu.aug.in | 1 + 6 files changed, 26 insertions(+), 4 deletions(-) diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug index ddc4bbf..a5601e1 100644 --- a/src/qemu/libvirtd_qemu.aug +++ b/src/qemu/libvirtd_qemu.aug @@ -100,6 +100,7 @@ module Libvirtd_qemu = | str_entry "lock_manager" let rpc_entry = int_entry "max_queued" + | int_entry "state_lock_timeout" | int_entry "keepalive_interval" | int_entry "keepalive_count" diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index cd57b3c..f5e34f1 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -667,6 +667,13 @@ # #max_queued = 0 + +# It is strongly recommended to not touch this setting +# +# Default is 30 +# +#state_lock_timeout = 60 + ################################################################### # Keepalive protocol: # This allows qemu driver to detect broken connections to remote diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index a4f545e..5be37dc 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -129,6 +129,9 @@ void qemuDomainCmdlineDefFree(qemuDomainCmdlineDefPtr def) #endif +/* Give up waiting for mutex after 30 seconds */ +#define QEMU_JOB_WAIT_TIME (30) + virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) { virQEMUDriverConfigPtr cfg; @@ -346,6 +349,8 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) cfg->glusterDebugLevel = 4; cfg->stdioLogD = true; + cfg->stateLockTimeout = QEMU_JOB_WAIT_TIME; + if (!(cfg->namespaces = virBitmapNew(QEMU_DOMAIN_NS_LAST))) goto error; @@ -863,6 +868,9 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, if (virConfGetValueUInt(conf, "keepalive_count", &cfg->keepAliveCount) < 0) goto cleanup; + if (virConfGetValueInt(conf, "state_lock_timeout", &cfg->stateLockTimeout) < 0) + goto cleanup; + if (virConfGetValueInt(conf, "seccomp_sandbox", &cfg->seccompSandbox) < 0) goto cleanup; @@ -1055,6 +1063,12 @@ virQEMUDriverConfigValidate(virQEMUDriverConfigPtr cfg) return -1; } + if (cfg->stateLockTimeout <= 0) { + virReportError(VIR_ERR_CONF_SYNTAX, "%s", + _("state_lock_timeout must be larger than zero")); + return -1; + } + return 0; } diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index a8d84ef..97cf2e1 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -190,6 +190,8 @@ struct _virQEMUDriverConfig { int keepAliveInterval; unsigned int keepAliveCount; + int stateLockTimeout; + int seccompSandbox; char *migrateHost; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 886e3fb..4dea85f 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6652,9 +6652,6 @@ qemuDomainObjCanSetJob(qemuDomainObjPrivatePtr priv, priv->job.agentActive == QEMU_AGENT_JOB_NONE)); } -/* Give up waiting for mutex after 30 seconds */ -#define QEMU_JOB_WAIT_TIME (1000ull * 30) - /** * qemuDomainObjBeginJobInternal: * @driver: qemu driver @@ -6714,7 +6711,7 @@ qemuDomainObjBeginJobInternal(virQEMUDriverPtr driver, } priv->jobs_queued++; - then = now + QEMU_JOB_WAIT_TIME; + then = now + cfg->stateLockTimeout * 1000; retry: if ((!async && job != QEMU_JOB_DESTROY) && diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index f1e8806..8e072d0 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -82,6 +82,7 @@ module Test_libvirtd_qemu = { "relaxed_acs_check" = "1" } { "lock_manager" = "lockd" } { "max_queued" = "0" } +{ "state_lock_timeout" = "60" } { "keepalive_interval" = "5" } { "keepalive_count" = "5" } { "seccomp_sandbox" = "1" } -- 1.8.3.1

4 3

[libvirt] [PATCH] tests: Follow up on qemucaps2xmldata rename
by Andrea Bolognani 17 Sep '18

17 Sep '18

The directory has been renamed in 562990849a9d, but a reference to it was not updated at the same time, causing 'make dist' to fail ever since. Fix it. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed under the Pink Bunny Ears of Shame™ rule. tests/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 136fe16f71..51be1509e1 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -122,7 +122,7 @@ EXTRA_DIST = \ qemuargv2xmldata \ qemublocktestdata \ qemucapabilitiesdata \ - qemucaps2xmldata \ + qemucaps2xmloutdata \ qemuhotplugtestcpus \ qemuhotplugtestdevices \ qemuhotplugtestdomains \ -- 2.17.1

1 0

[libvirt] [PATCH 0/5] qemu: Detect KVM usability correctly
by Andrea Bolognani 17 Sep '18

17 Sep '18

There are a few cases in which we're not reporting the correct information through 'virsh capabilities', leading to applications such as libguestfs attempting to launch KVM guests on a host that doesn't actually support them. Our code is also more complicated than it needs to be due to backwards compatibilty reasons that we no longer care about these days, so we can perform some cleanup there; there are further cleanup opportunities in the same area, but some of them are a bit tricky so I'll leave them for a follow-up series. We also get some extra test coverage pretty much for free. Yay! Andrea Bolognani (5): tests: Reuse qemucapabilities data for qemucaps2xml tests: Add more tests to qemucaps2xml qemu: Drop QEMU_CAPS_ENABLE_KVM qemu: Clarify QEMU_CAPS_KVM qemu: Don't check for /dev/kvm presence src/qemu/qemu_capabilities.c | 27 +--- src/qemu/qemu_capabilities.h | 4 +- tests/qemucapabilitiestest.c | 1 + tests/qemucaps2xmldata/all_1.6.0-1.caps | 129 ------------------ .../nodisksnapshot_1.6.0-1.caps | 128 ----------------- .../caps_1.5.3.x86_64.xml} | 12 +- .../caps_1.6.0.x86_64.xml} | 14 +- .../caps_1.7.0.x86_64.xml} | 12 +- .../caps_2.1.1.x86_64.xml} | 12 +- .../caps_2.10.0.aarch64.xml} | 13 +- .../caps_2.10.0.ppc64.xml} | 14 +- .../caps_2.10.0.s390x.xml} | 14 +- .../caps_2.10.0.x86_64.xml} | 12 +- .../caps_2.11.0.s390x.xml} | 14 +- .../caps_2.11.0.x86_64.xml} | 12 +- .../caps_2.12.0.aarch64.xml} | 13 +- .../caps_2.12.0.ppc64.xml} | 14 +- .../caps_2.12.0.s390x.xml} | 14 +- .../caps_2.12.0.x86_64.xml} | 12 +- .../caps_2.4.0.x86_64.xml} | 12 +- .../caps_2.5.0.x86_64.xml} | 12 +- .../caps_2.6.0.aarch64.xml} | 13 +- .../caps_2.6.0.ppc64.xml} | 14 +- .../caps_2.6.0.x86_64.xml} | 12 +- .../caps_2.7.0.s390x.xml} | 14 +- .../caps_2.7.0.x86_64.xml} | 12 +- .../caps_2.8.0.s390x.xml} | 14 +- .../caps_2.8.0.x86_64.xml} | 12 +- .../caps_2.9.0.ppc64.xml} | 14 +- .../caps_2.9.0.s390x.xml} | 14 +- .../caps_2.9.0.x86_64.xml} | 12 +- .../caps_3.0.0.ppc64.xml} | 14 +- .../caps_3.0.0.riscv32.xml} | 13 +- .../caps_3.0.0.riscv64.xml | 25 ++++ .../caps_3.0.0.x86_64.xml} | 12 +- tests/qemucaps2xmltest.c | 63 +++++++-- tests/qemuxml2argvtest.c | 11 +- 37 files changed, 229 insertions(+), 535 deletions(-) delete mode 100644 tests/qemucaps2xmldata/all_1.6.0-1.caps delete mode 100644 tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_1.5.3.x86_64.xml} (67%) rename tests/{qemucaps2xmldata/nodisksnapshot_1.6.0-1.xml => qemucaps2xmloutdata/caps_1.6.0.x86_64.xml} (60%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_1.7.0.x86_64.xml} (67%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_2.1.1.x86_64.xml} (67%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_2.10.0.aarch64.xml} (62%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_2.10.0.ppc64.xml} (56%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_2.10.0.s390x.xml} (56%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_2.10.0.x86_64.xml} (67%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_2.11.0.s390x.xml} (56%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_2.11.0.x86_64.xml} (67%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_2.12.0.aarch64.xml} (62%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_2.12.0.ppc64.xml} (56%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_2.12.0.s390x.xml} (56%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_2.12.0.x86_64.xml} (67%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_2.4.0.x86_64.xml} (67%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_2.5.0.x86_64.xml} (67%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_2.6.0.aarch64.xml} (62%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_2.6.0.ppc64.xml} (56%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_2.6.0.x86_64.xml} (67%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_2.7.0.s390x.xml} (56%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_2.7.0.x86_64.xml} (67%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_2.8.0.s390x.xml} (56%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_2.8.0.x86_64.xml} (67%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_2.9.0.ppc64.xml} (56%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_2.9.0.s390x.xml} (56%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_2.9.0.x86_64.xml} (67%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_3.0.0.ppc64.xml} (56%) copy tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_3.0.0.riscv32.xml} (54%) create mode 100644 tests/qemucaps2xmloutdata/caps_3.0.0.riscv64.xml rename tests/{qemucaps2xmldata/all_1.6.0-1.xml => qemucaps2xmloutdata/caps_3.0.0.x86_64.xml} (67%) -- 2.17.1

2 11

[libvirt] [PATCHv2 0/6] Introduce syntax-check rule for incorrect indentation and blank first line in function body
by Shi Lei 17 Sep '18

17 Sep '18

v1 here: https://www.redhat.com/archives/libvir-list/2018-September/msg00497.html Diff from v1: (according to the comments from Jano) - Change build-aux/check-spacing.pl rather than cfg.mk - Don't exempt '/' (which matches comments in function) in the rule - Split these two type of error messages and only output the relevant one - Patch 2/4 of v1 divide into two patches by the type of error messages Shi Lei (6): build-aux:check-spacing.pl: Introduce syntax-check rule for incorrect indentation and blank first line in function body src: fix incorrect indentation in function body by checking first line tests: fix incorrect indentation in function body by checking first line src: remove blank first line in function body tests: remove blank first line in function body tools: remove blank first line in function body build-aux/check-spacing.pl | 22 +++++ src/bhyve/bhyve_command.c | 3 - src/bhyve/bhyve_conf.c | 6 +- src/bhyve/bhyve_driver.c | 33 ++++--- src/bhyve/bhyve_monitor.c | 1 - src/bhyve/bhyve_process.c | 1 - src/conf/cpu_conf.c | 1 - src/conf/domain_capabilities.c | 1 - src/conf/domain_conf.c | 12 +-- src/conf/network_conf.c | 2 - src/cpu/cpu_s390.c | 84 ++++++++-------- src/cpu/cpu_x86.c | 1 - src/esx/esx_vi_types.c | 2 +- src/locking/lock_driver_nop.c | 1 - src/network/bridge_driver.c | 1 - src/network/bridge_driver_linux.c | 1 - src/nwfilter/nwfilter_learnipaddr.c | 1 - src/phyp/phyp_driver.c | 1 - src/qemu/qemu_alias.c | 1 - src/qemu/qemu_domain_address.c | 86 ++++++++--------- src/qemu/qemu_driver.c | 1 - src/qemu/qemu_monitor.c | 1 - src/qemu/qemu_monitor_json.c | 1 - src/qemu/qemu_process.c | 1 - src/storage/storage_backend_sheepdog.c | 3 - src/storage/storage_driver.c | 1 - src/storage/storage_util.c | 1 - src/test/test_driver.c | 2 - src/util/vircommand.c | 6 +- src/util/virdnsmasq.c | 1 - src/util/virfile.c | 1 - src/util/virnetdev.c | 49 +++++----- src/util/virnetdevmacvlan.c | 11 +-- src/util/virnetdevvportprofile.c | 2 +- src/util/virstoragefile.c | 1 - src/util/virutil.c | 3 +- src/vbox/vbox_storage.c | 1 - src/vbox/vbox_tmpl.c | 8 +- src/vz/vz_driver.c | 1 - src/vz/vz_sdk.c | 1 - src/xenapi/xenapi_driver.c | 2 - src/xenconfig/xen_common.c | 11 +-- tests/qemuxml2argvmock.c | 2 +- tests/sexpr2xmltest.c | 44 ++++----- tests/virnetdevmock.c | 1 - tests/virnettlshelpers.c | 18 ++-- tests/virshtest.c | 128 ++++++++++++------------- tests/vshtabletest.c | 3 - tests/xml2sexprtest.c | 36 +++---- tools/virsh-volume.c | 1 - tools/virt-admin.c | 1 - 51 files changed, 284 insertions(+), 320 deletions(-) -- 2.17.1

2 8

[libvirt] [PATCH 0/5] Use memfd if possible
by marcandre.lureau＠redhat.com 17 Sep '18

17 Sep '18

From: Marc-André Lureau <marcandre.lureau(a)redhat.com> Hi, This is an alternative to "[RFC v2 02/16] qemu: add memfd memory backing", which added a new source type. Instead, Daniel suggested to automatically use memfd for anonymous memory when available. Marc-André Lureau (5): qemu: add memory-backend-memfd capability check qemu: check memory-backend-memfd.hugetlb capability qemu: prefer memfd for anonymous memory conf: drop hugepage non-anoymous memory requirement tests: add qemuxml2argv memfd-memory-numa test src/conf/domain_conf.c | 7 -- src/qemu/qemu_capabilities.c | 10 ++ src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 61 +++++++--- .../caps_2.12.0.aarch64.replies | 94 ++++++++++++--- .../caps_2.12.0.aarch64.xml | 4 +- .../caps_2.12.0.ppc64.replies | 90 +++++++++++--- .../caps_2.12.0.ppc64.xml | 4 +- .../caps_2.12.0.s390x.replies | 98 ++++++++++++---- .../caps_2.12.0.s390x.xml | 4 +- .../caps_2.12.0.x86_64.replies | 110 +++++++++++++----- .../caps_2.12.0.x86_64.xml | 4 +- .../caps_3.0.0.ppc64.replies | 90 +++++++++++--- .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 4 +- .../caps_3.0.0.riscv32.replies | 86 +++++++++++--- .../caps_3.0.0.riscv32.xml | 2 + .../caps_3.0.0.riscv64.replies | 86 +++++++++++--- .../caps_3.0.0.riscv64.xml | 2 + .../caps_3.0.0.x86_64.replies | 110 +++++++++++++----- .../caps_3.0.0.x86_64.xml | 4 +- tests/qemuxml2argvdata/memfd-memory-numa.args | 28 +++++ tests/qemuxml2argvdata/memfd-memory-numa.xml | 36 ++++++ tests/qemuxml2argvtest.c | 5 + 23 files changed, 760 insertions(+), 181 deletions(-) create mode 100644 tests/qemuxml2argvdata/memfd-memory-numa.args create mode 100644 tests/qemuxml2argvdata/memfd-memory-numa.xml -- 2.19.0.rc1

7 42

[libvirt] [PATCH v2 0/2] Fix issues in qemuARPGetInterfaces and virArpTableGet
by Lin Ma 17 Sep '18

17 Sep '18

v1 -> v2: * Follow Chen Hanxiao's suggestion, Ignore 3 types of virtual interface backends * Adjusted the commit messages of patch 1/2 to reflect the code changes. Lin Ma (2): qemu: Remove network type limitation for qemuARPGetInterfaces virarptable: Return a virArpTablePtr when the nlmsghdr for loop is over src/qemu/qemu_driver.c | 4 +++- src/util/virarptable.c | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) -- 2.15.1

3 7

[libvirt] [PATCH] conf: Move more PCI functions out of device_conf
by Andrea Bolognani 15 Sep '18

15 Sep '18

Functions that deal with virPCIDeviceAddress exclusively belong to util/virpci. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/conf/device_conf.c | 66 ---------------------------------------- src/conf/device_conf.h | 7 ----- src/libvirt_private.syms | 6 ++-- src/util/virpci.c | 65 +++++++++++++++++++++++++++++++++++++++ src/util/virpci.h | 7 +++++ 5 files changed, 75 insertions(+), 76 deletions(-) diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c index cbdfbf6ef4..98a419f40f 100644 --- a/src/conf/device_conf.c +++ b/src/conf/device_conf.c @@ -160,59 +160,6 @@ virDomainDeviceInfoAddressIsEqual(const virDomainDeviceInfo *a, return true; } -bool -virPCIDeviceAddressIsValid(virPCIDeviceAddressPtr addr, - bool report) -{ - if (addr->domain > 0xFFFF) { - if (report) - virReportError(VIR_ERR_XML_ERROR, - _("Invalid PCI address domain='0x%x', " - "must be <= 0xFFFF"), - addr->domain); - return false; - } - if (addr->bus > 0xFF) { - if (report) - virReportError(VIR_ERR_XML_ERROR, - _("Invalid PCI address bus='0x%x', " - "must be <= 0xFF"), - addr->bus); - return false; - } - if (addr->slot > 0x1F) { - if (report) - virReportError(VIR_ERR_XML_ERROR, - _("Invalid PCI address slot='0x%x', " - "must be <= 0x1F"), - addr->slot); - return false; - } - if (addr->function > 7) { - if (report) - virReportError(VIR_ERR_XML_ERROR, - _("Invalid PCI address function=0x%x, " - "must be <= 7"), - addr->function); - return false; - } - if (virPCIDeviceAddressIsEmpty(addr)) { - if (report) - virReportError(VIR_ERR_XML_ERROR, "%s", - _("Invalid PCI address 0000:00:00, at least " - "one of domain, bus, or slot must be > 0")); - return false; - } - return true; -} - - -bool -virPCIDeviceAddressIsEmpty(const virPCIDeviceAddress *addr) -{ - return !(addr->domain || addr->bus || addr->slot); -} - bool virDeviceInfoPCIAddressIsWanted(const virDomainDeviceInfo *info) { @@ -309,19 +256,6 @@ virPCIDeviceAddressFormat(virBufferPtr buf, return 0; } -bool -virPCIDeviceAddressEqual(virPCIDeviceAddress *addr1, - virPCIDeviceAddress *addr2) -{ - if (addr1->domain == addr2->domain && - addr1->bus == addr2->bus && - addr1->slot == addr2->slot && - addr1->function == addr2->function) { - return true; - } - return false; -} - bool virDomainDeviceCCWAddressIsValid(virDomainDeviceCCWAddressPtr addr) { diff --git a/src/conf/device_conf.h b/src/conf/device_conf.h index 9f51118e29..407956bd02 100644 --- a/src/conf/device_conf.h +++ b/src/conf/device_conf.h @@ -191,10 +191,6 @@ bool virDomainDeviceInfoAddressIsEqual(const virDomainDeviceInfo *a, bool virDomainDeviceAddressIsValid(virDomainDeviceInfoPtr info, int type); -bool virPCIDeviceAddressIsValid(virPCIDeviceAddressPtr addr, - bool report); -bool virPCIDeviceAddressIsEmpty(const virPCIDeviceAddress *addr); - bool virDeviceInfoPCIAddressIsWanted(const virDomainDeviceInfo *info); bool virDeviceInfoPCIAddressIsPresent(const virDomainDeviceInfo *info); @@ -205,9 +201,6 @@ int virPCIDeviceAddressFormat(virBufferPtr buf, virPCIDeviceAddress addr, bool includeTypeInAddr); -bool virPCIDeviceAddressEqual(virPCIDeviceAddress *addr1, - virPCIDeviceAddress *addr2); - bool virDomainDeviceCCWAddressIsValid(virDomainDeviceCCWAddressPtr addr); int virDomainDeviceCCWAddressParseXML(xmlNodePtr node, virDomainDeviceCCWAddressPtr addr); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index a0d229a79f..d6662d691d 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -108,10 +108,7 @@ virDomainDeviceUSBAddressParseXML; virDomainDeviceVirtioSerialAddressParseXML; virInterfaceLinkFormat; virInterfaceLinkParseXML; -virPCIDeviceAddressEqual; virPCIDeviceAddressFormat; -virPCIDeviceAddressIsEmpty; -virPCIDeviceAddressIsValid; virPCIDeviceAddressParseXML; @@ -2498,10 +2495,13 @@ virObjectUnref; # util/virpci.h virPCIDeviceAddressAsString; +virPCIDeviceAddressEqual; virPCIDeviceAddressGetIOMMUGroupAddresses; virPCIDeviceAddressGetIOMMUGroupNum; virPCIDeviceAddressGetSysfsFile; virPCIDeviceAddressIOMMUGroupIterate; +virPCIDeviceAddressIsEmpty; +virPCIDeviceAddressIsValid; virPCIDeviceAddressParse; virPCIDeviceCopy; virPCIDeviceDetach; diff --git a/src/util/virpci.c b/src/util/virpci.c index 1730d888f7..fb3f04fac3 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -1668,6 +1668,71 @@ virPCIDeviceReadID(virPCIDevicePtr dev, const char *id_name) return id_str; } +bool +virPCIDeviceAddressIsValid(virPCIDeviceAddressPtr addr, + bool report) +{ + if (addr->domain > 0xFFFF) { + if (report) + virReportError(VIR_ERR_XML_ERROR, + _("Invalid PCI address domain='0x%x', " + "must be <= 0xFFFF"), + addr->domain); + return false; + } + if (addr->bus > 0xFF) { + if (report) + virReportError(VIR_ERR_XML_ERROR, + _("Invalid PCI address bus='0x%x', " + "must be <= 0xFF"), + addr->bus); + return false; + } + if (addr->slot > 0x1F) { + if (report) + virReportError(VIR_ERR_XML_ERROR, + _("Invalid PCI address slot='0x%x', " + "must be <= 0x1F"), + addr->slot); + return false; + } + if (addr->function > 7) { + if (report) + virReportError(VIR_ERR_XML_ERROR, + _("Invalid PCI address function=0x%x, " + "must be <= 7"), + addr->function); + return false; + } + if (virPCIDeviceAddressIsEmpty(addr)) { + if (report) + virReportError(VIR_ERR_XML_ERROR, "%s", + _("Invalid PCI address 0000:00:00, at least " + "one of domain, bus, or slot must be > 0")); + return false; + } + return true; +} + +bool +virPCIDeviceAddressIsEmpty(const virPCIDeviceAddress *addr) +{ + return !(addr->domain || addr->bus || addr->slot); +} + +bool +virPCIDeviceAddressEqual(virPCIDeviceAddress *addr1, + virPCIDeviceAddress *addr2) +{ + if (addr1->domain == addr2->domain && + addr1->bus == addr2->bus && + addr1->slot == addr2->slot && + addr1->function == addr2->function) { + return true; + } + return false; +} + char * virPCIDeviceAddressAsString(virPCIDeviceAddressPtr addr) { diff --git a/src/util/virpci.h b/src/util/virpci.h index b4f72f8f06..16c2eded5e 100644 --- a/src/util/virpci.h +++ b/src/util/virpci.h @@ -218,6 +218,13 @@ int virPCIGetSysfsFile(char *virPCIDeviceName, char **pci_sysfs_device_link) ATTRIBUTE_RETURN_CHECK; +bool virPCIDeviceAddressIsValid(virPCIDeviceAddressPtr addr, + bool report); +bool virPCIDeviceAddressIsEmpty(const virPCIDeviceAddress *addr); + +bool virPCIDeviceAddressEqual(virPCIDeviceAddress *addr1, + virPCIDeviceAddress *addr2); + char *virPCIDeviceAddressAsString(virPCIDeviceAddressPtr addr) ATTRIBUTE_NONNULL(1); -- 2.17.1

3 2

[libvirt] [PATCH] libxl: remove configure check for libxl_domain_config_from_json
by Jim Fehlig 15 Sep '18

15 Sep '18

The libxl_domain_config_from_json API appeared in Xen 4.5, hence there is no need to check for its existence after changing the minimum supported Xen version to 4.6. Remove the check and its use in the tests. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- m4/virt-driver-libxl.m4 | 7 ------- tests/libxlxml2domconfigtest.c | 4 ++-- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/m4/virt-driver-libxl.m4 b/m4/virt-driver-libxl.m4 index 902da11472..70c5c59e6a 100644 --- a/m4/virt-driver-libxl.m4 +++ b/m4/virt-driver-libxl.m4 @@ -56,13 +56,6 @@ AC_DEFUN([LIBVIRT_DRIVER_CHECK_LIBXL], [ ],[ LIBXL_LIBS="$LIBXL_LIBS -lxenstore -lxenctrl" ]) - - dnl Check if libxl_domain_config_from_json is available for domXML to - dnl libxl_domain_config tests - LIBS="$LIBS -lxenlight -lxenctrl" - AC_CHECK_FUNCS([libxl_domain_config_from_json]) - CFLAGS="$old_CFLAGS" - LIBS="$old_LIBS" fi AC_SUBST([LIBXL_CFLAGS]) diff --git a/tests/libxlxml2domconfigtest.c b/tests/libxlxml2domconfigtest.c index b814461acc..eacf8f5615 100644 --- a/tests/libxlxml2domconfigtest.c +++ b/tests/libxlxml2domconfigtest.c @@ -33,7 +33,7 @@ #include "testutils.h" -#if defined(WITH_LIBXL) && defined(WITH_YAJL) && defined(HAVE_LIBXL_DOMAIN_CONFIG_FROM_JSON) +#if defined(WITH_LIBXL) && defined(WITH_YAJL) # include "internal.h" # include "viralloc.h" @@ -228,4 +228,4 @@ int main(void) return EXIT_AM_SKIP; } -#endif /* WITH_LIBXL && WITH_YAJL && HAVE_LIBXL_DOMAIN_CONFIG_FROM_JSON */ +#endif /* WITH_LIBXL && WITH_YAJL */ -- 2.18.0

2 1

[libvirt] [PATCH 00/10] Introduce x86 Cache Monitoring Technology (CMT)
by Wang Huaqiang 15 Sep '18

15 Sep '18

This series of patches introduced the x86 Cache Monitoring Technology (CMT) to libvirt by interacting with kernel resource control (resctrl) interface. CMT is one of the Intel(R) x86 CPU feature which belongs to the Resource Director Technology (RDT). CMT reports the occupancy of the last level cache, which is shared by all CPU cores. We have serval discussion about the enabling of CMT, please refer to following links for the RFCs. RFCv3 https://www.redhat.com/archives/libvir-list/2018-August/msg01213.html RFCv2 https://www.redhat.com/archives/libvir-list/2018-July/msg00409.html https://www.redhat.com/archives/libvir-list/2018-July/msg01241.html RFCv1 https://www.redhat.com/archives/libvir-list/2018-June/msg00674.html 1. About reason why CMT is necessary in libvirt? The perf events of 'CMT, MBML, MBMT' have been phased out since Linux kernel commit c39a0e2c8850f08249383f2425dbd8dbe4baad69, in libvirt the perf based cmt,mbm will not work with the latest linux kernel. These patches add CMT feature to libvirt through kernel resctrlfs interface. 2. Interfaces for CMT from the high level. 2.1 Query the host capability of CMT. The element 'monitor' represents the host capabilities of CMT. The explanations of involved CMT attributes: - 'maxAllocs' denotes the maximum monitoring groups could be created, which is limited by the number of hardware 'RMID'. - 'threshold' denotes the upper bound of cache occupancy for current group, in bytes, to determine if an RMID can be reused. - element 'feature' denotes the monitoring feature supported. - 'llc_occupancy' is the feature for reporting the last level cache occupancy information. # virsh capabilities ... <cache> <bank id='0' level='3' type='both' size='15' unit='MiB' cpus='0-5'> <control granularity='768' unit='KiB' type='code' maxAllocs='8'/> <control granularity='768' unit='KiB' type='data' maxAllocs='8'/> + <monitor threshold='540672' unit='B' maxAllocs='176'/> + <feature name=llc_occupancy/> + </monitor> </bank> <bank id='1' level='3' type='both' size='15' unit='MiB' cpus='6-11'> <control granularity='768' unit='KiB' type='code' maxAllocs='8'/> <control granularity='768' unit='KiB' type='data' maxAllocs='8'/> + <monitor threshold='540672' unit='B' maxAllocs='176'/> + <feature name=llc_occupancy/> + </monitor> </bank> </cache> ... 2.2 Create cache monitoring group (cache monitor). The main interface for creating monitoring group is through XML file. The proposed configuration is like: <cputune> <cachetune vcpus='1'> <cache id='0' level='3' type='code' size='7680' unit='KiB'/> <cache id='1' level='3' type='data' size='3840' unit='KiB'/> + <monitor vcpus='1'/> </cachetune> <cachetune vcpus='4-7'> + <monitor vcpus='4-6'/> </cachetune> </cputune> In above XML, created 2 cache resctrl allocation groups and 2 resctrl monitoring groups. The changes of cache monitor will be effective in next booting of VM. 2.3 Show CMT result through command 'domstats' Adding the interface in qemu to report this information for resource monitor group through command 'virsh domstats --cpu-total'. Below is a typical output: # virsh domstats 1 --cpu-total Domain: 'ubuntu16.04-base' ... cpu.cache.monitor.count=2 cpu.cache.0.name=vcpus_1 cpu.cache.0.vcpus=1 cpu.cache.0.bank.count=2 cpu.cache.0.bank.0.id=0 cpu.cache.0.bank.0.bytes=4505600 cpu.cache.0.bank.1.id=1 cpu.cache.0.bank.1.bytes=5586944 cpu.cache.1.name=vcpus_4-6 cpu.cache.1.vcpus=4,5,6 cpu.cache.1.bank.count=2 cpu.cache.1.bank.0.id=0 cpu.cache.1.bank.0.bytes=17571840 cpu.cache.1.bank.1.id=1 cpu.cache.1.bank.1.bytes=29106176 **Changes Since RFCv3** In the output of 'domstats', added 'cpu.cache.<cmt_group_index>.bank.<bank_index>.id' to tell the OS assigned cache bank id of current cache. Changes is prefixed with a '+': # virsh domstats 1 --cpu-total Domain: 'ubuntu16.04-base' ... cpu.cache.monitor.count=2 cpu.cache.0.name=vcpus_1 cpu.cache.0.vcpus=1 cpu.cache.0.bank.count=2 + cpu.cache.0.bank.0.id=0 cpu.cache.0.bank.0.bytes=4505600 + cpu.cache.0.bank.1.id=1 cpu.cache.0.bank.1.bytes=5586944 cpu.cache.1.name=vcpus_4-6 cpu.cache.1.vcpus=4,5,6 cpu.cache.1.bank.count=2 + cpu.cache.1.bank.0.id=0 cpu.cache.1.bank.0.bytes=17571840 + cpu.cache.1.bank.1.id=1 cpu.cache.1.bank.1.bytes=29106176 Wang Huaqiang (10): conf: Renamed 'controlBuf' to 'childrenBuf' util: add interface retrieving CMT capability conf: Add CMT capability to host test: add test case for resctrl monitor util: resctrl: refactoring some functions util: Introduce resctrl monitor for CMT conf: refactor virDomainResctrlAppend conf: introduce resctrl monitor group in domain qemu: Introduce resctrl monitoring group qemu: Report cache occupancy (CMT) with domstats .gnulib | 1 - docs/formatdomain.html.in | 14 +- docs/schemas/capability.rng | 28 + docs/schemas/domaincommon.rng | 11 +- src/conf/capabilities.c | 51 +- src/conf/capabilities.h | 1 + src/conf/domain_conf.c | 159 +++++- src/conf/domain_conf.h | 20 + src/libvirt-domain.c | 9 + src/libvirt_private.syms | 6 + src/qemu/qemu_driver.c | 265 ++++++++- src/qemu/qemu_process.c | 40 +- src/util/virresctrl.c | 597 +++++++++++++++++++-- src/util/virresctrl.h | 48 +- tests/genericxml2xmlindata/cachetune-cdp.xml | 2 + .../cachetune-colliding-monitors.xml | 36 ++ tests/genericxml2xmlindata/cachetune-small.xml | 1 + tests/genericxml2xmlindata/cachetune.xml | 3 + tests/genericxml2xmltest.c | 4 + .../resctrl/info/L3_MON/max_threshold_occupancy | 1 + .../linux-resctrl/resctrl/info/L3_MON/mon_features | 3 + .../linux-resctrl/resctrl/info/L3_MON/num_rmids | 1 + tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml | 6 + 23 files changed, 1208 insertions(+), 99 deletions(-) delete mode 160000 .gnulib create mode 100644 tests/genericxml2xmlindata/cachetune-colliding-monitors.xml create mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3_MON/max_threshold_occupancy create mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3_MON/mon_features create mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3_MON/num_rmids -- 2.7.4

5 41

[libvirt] [PATCH v2] numa: fix unsafe access to numa_nodes_ptr
by Wang Yechao 14 Sep '18

14 Sep '18

numa_nodes_ptr is a global variable in libnuma.so. It is been freed after main thread exits. If we have many running vms, restart the libvirtd service continuously at intervals of a few seconds, the main thread may exit before qemuProcessReconnect thread, and a segfault error occurs. Backstrace as follows: 0 0x00007f40e3d2dd72 in numa_bitmask_isbitset () from /lib64/libnuma.so.1 1 0x00007f40e4d14c55 in virNumaNodeIsAvailable (node=node@entry=0) at util/virnuma.c:396 2 0x00007f40e4d16010 in virNumaGetHostMemoryNodeset () at util/virnuma.c:1011 3 0x00007f40b94ced90 in qemuRestoreCgroupState (vm=0x7f407c39df00, vm=0x7f407c39df00) at qemu/qemu_cgroup.c:877 4 qemuConnectCgroup (driver=driver@entry=0x7f407c21fe80, vm=0x7f407c39df00) at qemu/qemu_cgroup.c:969 5 0x00007f40b94eef93 in qemuProcessReconnect (opaque=<optimized out>) at qemu/qemu_process.c:3531 6 0x00007f40e4d34bd2 in virThreadHelper (data=<optimized out>) at util/virthread.c:206 7 0x00007f40e214ee25 in start_thread () from /lib64/libpthread.so.0 8 0x00007f40e1e7c36d in clone () from /lib64/libc.so.6 Signed-off-by: Wang Yechao <wang.yechao255(a)zte.com.cn> --- src/util/virnuma.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/util/virnuma.c b/src/util/virnuma.c index 67e6c86..f06f6b3 100644 --- a/src/util/virnuma.c +++ b/src/util/virnuma.c @@ -381,7 +381,10 @@ virNumaGetMaxCPUs(void) bool virNumaNodeIsAvailable(int node) { - return numa_bitmask_isbitset(numa_nodes_ptr, node); + if (numa_nodes_ptr) + return numa_bitmask_isbitset(numa_nodes_ptr, node); + else + return false; } -- 1.8.3.1

2 1

[libvirt] [PATCH v2] qemu: check for vhostusers bandwidth
by Roland Schulz 14 Sep '18

14 Sep '18

Vhostuser doesn't support bandwidth and due to backwards compatibility it was decided to just warn users instead of erroring out https://bugzilla.redhat.com/show_bug.cgi?id=1524230 Signed-off-by: Roland Schulz <schullzroll(a)gmail.com> --- src/qemu/qemu_command.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ff9589f593..011e2b45af 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8244,6 +8244,8 @@ qemuBuildVhostuserCommandLine(virQEMUDriverPtr driver, virQEMUCapsPtr qemuCaps, unsigned int bootindex) { + virNetDevBandwidthPtr actualBandwidth = virDomainNetGetActualBandwidth(net); + virDomainNetType actualType = virDomainNetGetActualType(net); virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); char *chardev = NULL; char *netdev = NULL; @@ -8257,6 +8259,13 @@ qemuBuildVhostuserCommandLine(virQEMUDriverPtr driver, goto cleanup; } + /* Warn if unsupported bandwidth requested */ + if (actualBandwidth && !virNetDevSupportBandwidth(actualType)) { + VIR_WARN(_("setting bandwidth on interfaces of " + "type '%s' is not implemented yet"), + virDomainNetTypeToString(actualType)); + } + switch ((virDomainChrType)net->data.vhostuser->type) { case VIR_DOMAIN_CHR_TYPE_UNIX: if (!(chardev = qemuBuildChrChardevStr(logManager, secManager, -- 2.17.1

2 1

[libvirt] [PATCH] vhost-user: define conventions for vhost-user backends
by Marc-André Lureau 14 Sep '18

14 Sep '18

As discussed during "[PATCH v4 00/29] vhost-user for input & GPU" review, let's define a common set of backend conventions to help with management layer implementation, and interoperability. Cc: libvir-list(a)redhat.com Cc: Gerd Hoffmann <kraxel(a)redhat.com> Cc: Daniel P. Berrangé <berrange(a)redhat.com> Cc: Changpeng Liu <changpeng.liu(a)intel.com> Cc: Dr. David Alan Gilbert <dgilbert(a)redhat.com> Cc: Felipe Franciosi <felipe(a)nutanix.com> Cc: Gonglei <arei.gonglei(a)huawei.com> Cc: Maxime Coquelin <maxime.coquelin(a)redhat.com> Cc: Michael S. Tsirkin <mst(a)redhat.com> Cc: Victor Kaplansky <victork(a)redhat.com> Signed-off-by: Marc-André Lureau <marcandre.lureau(a)redhat.com> --- docs/interop/vhost-user.txt | 106 +++++++++++++++++++++++++++++++++++- 1 file changed, 104 insertions(+), 2 deletions(-) diff --git a/docs/interop/vhost-user.txt b/docs/interop/vhost-user.txt index ba5e37d714..691ce173ed 100644 --- a/docs/interop/vhost-user.txt +++ b/docs/interop/vhost-user.txt @@ -17,8 +17,13 @@ The protocol defines 2 sides of the communication, master and slave. Master is the application that shares its virtqueues, in our case QEMU. Slave is the consumer of the virtqueues. -In the current implementation QEMU is the Master, and the Slave is intended to -be a software Ethernet switch running in user space, such as Snabbswitch. +In the current implementation QEMU is the Master, and the Slave is the +external process consuming the virtio queues, for example a software +Ethernet switch running in user space, such as Snabbswitch, or a block +device backend processing read & write to a virtual disk. In order to +facilitate interoperability between various backend implementations, +it is recommended to follow the "Backend program conventions" +described in this document. Master and slave can be either a client (i.e. connecting) or server (listening) in the socket communication. @@ -859,3 +864,100 @@ resilient for selective requests. For the message types that already solicit a reply from the client, the presence of VHOST_USER_PROTOCOL_F_REPLY_ACK or need_reply bit being set brings no behavioural change. (See the 'Communication' section for details.) + +Backend program conventions +--------------------------- + +vhost-user backends provide various services and they may need to be +configured manually depending on the use case. However, it is a good +idea to follow the conventions listed here when possible. Users, QEMU +or libvirt, can then rely on some common behaviour to avoid +heterogenous configuration and management of the backend program and +facilitate interoperability. + +In order to be discoverable, default vhost-user backends should be +located under "/usr/libexec", and be named "vhost-user-$device" where +"$device" is the device name in lower-case following the name listed +in the Linux virtio_ids.h header (ex: the VIRTIO_ID_RPROC_SERIAL +backend would be named "vhost-user-rproc-serial"). + +Mechanisms to list, and to select among alternatives implementations +or modify the default backend are not described at this point (a +distribution may use update-alternatives, for example, to list and to +pick a different default backend). + +The backend program must end (as quickly and cleanly as possible) when +the SIGTERM signal is received. Eventually, it may be SIGKILL by the +management layer after a few seconds. + +The following command line options have an expected behaviour. They +are mandatory, unless explicitly said differently: + +* --socket-path=PATH + +This option specify the location of the vhost-user Unix domain socket. +It is incompatible with --fd. + +* --fd=FDNUM + +When this argument is given, the backend program is started with the +vhost-user socket as file descriptor FDNUM. It is incompatible with +--socket-path. + +* --print-capabilities + +Output to stdout a line-seperated list of backend capabilities, and +then exit successfully. Other options and arguments should be ignored, +and the backend program should not perform its normal function. + +At the time of writing, there are no common capabilities. Some +device-specific capabilities are listed in the respective sections. By +convention, device-specific capabilities are prefixed by their device +name. + +* --pidfile=PATH + +Write the process id (PID) to the given file PATH. This is mostly +useful if the backend daemonize/fork itself. + +vhost-user-input program conventions +------------------------------------ + +Capabilities: + +input-evdev-path + + The --evdev-path command line option is supported. + +input-no-grab + + The --no-grab command line option is supported. + +* --evdev-path=PATH (optional) + +Specify the linux input device. + +* --no-grab (optional) + +Do no request exclusive access to the input device. + +vhost-user-gpu program conventions +---------------------------------- + +Capabilities: + +gpu-render-node + + The --render-node command line option is supported. + +gpu-virgl + + The --virgl command line option is supported. + +* --render-node=PATH (optional) + +Specify the GPU DRM render node. + +* --virgl (optional) + +Enable virgl rendering support. -- 2.19.0.rc1

2 2

[libvirt] [PATCH] util: Add stubs for virDoes{User, Group}Exist() without getpwuid_r
by Martin Kletzander 14 Sep '18

14 Sep '18

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed under the build-breaker rule. src/util/virutil.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/util/virutil.c b/src/util/virutil.c index 3d1b02eceb31..b0334edb36a0 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -1248,6 +1248,18 @@ virGetGroupList(uid_t uid ATTRIBUTE_UNUSED, gid_t gid ATTRIBUTE_UNUSED, return 0; } +int +virDoesUserExist(const char *name ATTRIBUTE_UNUSED) +{ + return 0; +} + +int +virDoesGroupExist(const char *name ATTRIBUTE_UNUSED) +{ + return 0; +} + # ifdef WIN32 /* These methods are adapted from GLib2 under terms of LGPLv2+ */ static int -- 2.18.0

1 0

[libvirt] [PATCH] qemu: Introduce state_lock_timeout to qemu.conf
by Yi Wang 13 Sep '18

13 Sep '18

When doing some job holding state lock for a long time, we may come across error: "Timed out during operation: cannot acquire state change lock" Well, sometimes it's not a problem and users want to continue to wait, and this patch allow users decide how long time they can wait the state lock. Signed-off-by: Yi Wang <wang.yi59(a)zte.com.cn> Reviewed-by: Xi Xu <xu.xi8(a)zte.com.cn> --- changes in v6: - modify the description in qemu.conf - move the multiplication to BeginJobInternal changes in v5: - adjust position of state lock in aug file - fix state lock time got from conf file from milliseconds to seconds changes in v4: - fix syntax-check error changes in v3: - add user-friendly description and nb of state lock - check validity of stateLockTimeout changes in v2: - change default value to 30 in qemu.conf - set the default value in virQEMUDriverConfigNew() --- src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 7 +++++++ src/qemu/qemu_conf.c | 14 ++++++++++++++ src/qemu/qemu_conf.h | 2 ++ src/qemu/qemu_domain.c | 7 +++---- src/qemu/test_libvirtd_qemu.aug.in | 1 + 6 files changed, 28 insertions(+), 4 deletions(-) diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug index ddc4bbf..a5601e1 100644 --- a/src/qemu/libvirtd_qemu.aug +++ b/src/qemu/libvirtd_qemu.aug @@ -100,6 +100,7 @@ module Libvirtd_qemu = | str_entry "lock_manager" let rpc_entry = int_entry "max_queued" + | int_entry "state_lock_timeout" | int_entry "keepalive_interval" | int_entry "keepalive_count" diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index cd57b3c..f5e34f1 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -667,6 +667,13 @@ # #max_queued = 0 + +# It is strongly recommended to not touch this setting +# +# Default is 30 +# +#state_lock_timeout = 60 + ################################################################### # Keepalive protocol: # This allows qemu driver to detect broken connections to remote diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index a4f545e..5be37dc 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -129,6 +129,9 @@ void qemuDomainCmdlineDefFree(qemuDomainCmdlineDefPtr def) #endif +/* Give up waiting for mutex after 30 seconds */ +#define QEMU_JOB_WAIT_TIME (30) + virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) { virQEMUDriverConfigPtr cfg; @@ -346,6 +349,8 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) cfg->glusterDebugLevel = 4; cfg->stdioLogD = true; + cfg->stateLockTimeout = QEMU_JOB_WAIT_TIME; + if (!(cfg->namespaces = virBitmapNew(QEMU_DOMAIN_NS_LAST))) goto error; @@ -863,6 +868,9 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, if (virConfGetValueUInt(conf, "keepalive_count", &cfg->keepAliveCount) < 0) goto cleanup; + if (virConfGetValueInt(conf, "state_lock_timeout", &cfg->stateLockTimeout) < 0) + goto cleanup; + if (virConfGetValueInt(conf, "seccomp_sandbox", &cfg->seccompSandbox) < 0) goto cleanup; @@ -1055,6 +1063,12 @@ virQEMUDriverConfigValidate(virQEMUDriverConfigPtr cfg) return -1; } + if (cfg->stateLockTimeout <= 0) { + virReportError(VIR_ERR_CONF_SYNTAX, "%s", + _("state_lock_timeout must be larger than zero")); + return -1; + } + return 0; } diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index a8d84ef..97cf2e1 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -190,6 +190,8 @@ struct _virQEMUDriverConfig { int keepAliveInterval; unsigned int keepAliveCount; + int stateLockTimeout; + int seccompSandbox; char *migrateHost; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 886e3fb..306772a 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6652,9 +6652,6 @@ qemuDomainObjCanSetJob(qemuDomainObjPrivatePtr priv, priv->job.agentActive == QEMU_AGENT_JOB_NONE)); } -/* Give up waiting for mutex after 30 seconds */ -#define QEMU_JOB_WAIT_TIME (1000ull * 30) - /** * qemuDomainObjBeginJobInternal: * @driver: qemu driver @@ -6714,7 +6711,9 @@ qemuDomainObjBeginJobInternal(virQEMUDriverPtr driver, } priv->jobs_queued++; - then = now + QEMU_JOB_WAIT_TIME; + + cfg->stateLockTimeout *= 1000; + then = now + cfg->stateLockTimeout; retry: if ((!async && job != QEMU_JOB_DESTROY) && diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index f1e8806..8e072d0 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -82,6 +82,7 @@ module Test_libvirtd_qemu = { "relaxed_acs_check" = "1" } { "lock_manager" = "lockd" } { "max_queued" = "0" } +{ "state_lock_timeout" = "60" } { "keepalive_interval" = "5" } { "keepalive_count" = "5" } { "seccomp_sandbox" = "1" } -- 1.8.3.1

3 2

[libvirt] [PATCH v5] qemu: Introduce state_lock_timeout to qemu.conf
by Yi Wang 13 Sep '18

13 Sep '18

When doing some job holding state lock for a long time, we may come across error: "Timed out during operation: cannot acquire state change lock" Well, sometimes it's not a problem and users want to continue to wait, and this patch allow users decide how long time they can wait the state lock. Signed-off-by: Yi Wang <wang.yi59(a)zte.com.cn> Reviewed-by: Xi Xu <xu.xi8(a)zte.com.cn> --- changes in v5: - adjust position of state lock in aug file - fix state lock time got from conf file from milliseconds to seconds changes in v4: - fix syntax-check error changes in v3: - add user-friendly description and nb of state lock - check validity of stateLockTimeout changes in v2: - change default value to 30 in qemu.conf - set the default value in virQEMUDriverConfigNew() --- src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 10 ++++++++++ src/qemu/qemu_conf.c | 15 +++++++++++++++ src/qemu/qemu_conf.h | 2 ++ src/qemu/qemu_domain.c | 5 +---- src/qemu/test_libvirtd_qemu.aug.in | 1 + 6 files changed, 30 insertions(+), 4 deletions(-) diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug index ddc4bbf..a5601e1 100644 --- a/src/qemu/libvirtd_qemu.aug +++ b/src/qemu/libvirtd_qemu.aug @@ -100,6 +100,7 @@ module Libvirtd_qemu = | str_entry "lock_manager" let rpc_entry = int_entry "max_queued" + | int_entry "state_lock_timeout" | int_entry "keepalive_interval" | int_entry "keepalive_count" diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index cd57b3c..8920a1a 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -667,6 +667,16 @@ # #max_queued = 0 + +# When two or more threads want to work with the same domain they use a +# job lock to mutually exclude each other. However, waiting for the lock +# is limited up to state_lock_timeout seconds. +# NB, strong recommendation to set the timeout longer than 30 seconds. +# +# Default is 30 +# +#state_lock_timeout = 60 + ################################################################### # Keepalive protocol: # This allows qemu driver to detect broken connections to remote diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index a4f545e..012f4d1 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -129,6 +129,9 @@ void qemuDomainCmdlineDefFree(qemuDomainCmdlineDefPtr def) #endif +/* Give up waiting for mutex after 30 seconds */ +#define QEMU_JOB_WAIT_TIME (1000ull * 30) + virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) { virQEMUDriverConfigPtr cfg; @@ -346,6 +349,8 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) cfg->glusterDebugLevel = 4; cfg->stdioLogD = true; + cfg->stateLockTimeout = QEMU_JOB_WAIT_TIME; + if (!(cfg->namespaces = virBitmapNew(QEMU_DOMAIN_NS_LAST))) goto error; @@ -863,6 +868,10 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, if (virConfGetValueUInt(conf, "keepalive_count", &cfg->keepAliveCount) < 0) goto cleanup; + if (virConfGetValueInt(conf, "state_lock_timeout", &cfg->stateLockTimeout) < 0) + goto cleanup; + cfg->stateLockTimeout *= 1000; + if (virConfGetValueInt(conf, "seccomp_sandbox", &cfg->seccompSandbox) < 0) goto cleanup; @@ -1055,6 +1064,12 @@ virQEMUDriverConfigValidate(virQEMUDriverConfigPtr cfg) return -1; } + if (cfg->stateLockTimeout <= 0) { + virReportError(VIR_ERR_CONF_SYNTAX, "%s", + _("state_lock_timeout should larger than zero")); + return -1; + } + return 0; } diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index a8d84ef..97cf2e1 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -190,6 +190,8 @@ struct _virQEMUDriverConfig { int keepAliveInterval; unsigned int keepAliveCount; + int stateLockTimeout; + int seccompSandbox; char *migrateHost; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 886e3fb..5a2ca52 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6652,9 +6652,6 @@ qemuDomainObjCanSetJob(qemuDomainObjPrivatePtr priv, priv->job.agentActive == QEMU_AGENT_JOB_NONE)); } -/* Give up waiting for mutex after 30 seconds */ -#define QEMU_JOB_WAIT_TIME (1000ull * 30) - /** * qemuDomainObjBeginJobInternal: * @driver: qemu driver @@ -6714,7 +6711,7 @@ qemuDomainObjBeginJobInternal(virQEMUDriverPtr driver, } priv->jobs_queued++; - then = now + QEMU_JOB_WAIT_TIME; + then = now + cfg->stateLockTimeout; retry: if ((!async && job != QEMU_JOB_DESTROY) && diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index f1e8806..8e072d0 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -82,6 +82,7 @@ module Test_libvirtd_qemu = { "relaxed_acs_check" = "1" } { "lock_manager" = "lockd" } { "max_queued" = "0" } +{ "state_lock_timeout" = "60" } { "keepalive_interval" = "5" } { "keepalive_count" = "5" } { "seccomp_sandbox" = "1" } -- 1.8.3.1

4 3

[libvirt] Re：Re: [PATCH] add nodeset='all' and default for interleavemode
by peng.hao2＠zte.com.cn 13 Sep '18

13 Sep '18

>On 09/11/2018 04:28 PM, Peng Hao wrote: >> For interleave mode,sometimes we want to allocate mmeory regularly >> in all nodes on the host. But different hosts has different node number. >> So we add nodeset='all' for interleave mode and if nodeset=NULL default >> nodeset is 'all' for interleave mode. >> >> Signed-off-by: Peng Hao <peng.hao2(a)zte.com.cn> >> --- >> src/conf/numa_conf.c | 73 ++++++++++++++++++++++++++++++++++++++++------------ >> 1 file changed, 57 insertions(+), 16 deletions(-) > >Firstly, this patch does not pass 'syntax-check'. Secondly, it breaks >qemuxml2argvtest. > I will pay attention to this. >> + numa->memory.allnode = true; >> + } else { >Any patch that changes accepted XML needs to go hand in hand with >documentation and RNG update and a test case. I will add next. >> + if (placement == VIR_DOMAIN_NUMATUNE_PLACEMENT_STATIC && >> + mode == VIR_DOMAIN_NUMATUNE_MEM_INTERLEAVE && >> + numa->memory.allnode) { >> + if ((bitmap = virBitmapNew(VIR_DOMAIN_CPUMASK_LEN)) == NULL) >> + goto cleanup; >> + virBitmapClearAll(bitmap); >> + maxnode = numa_max_node(); >So, you're including numa.h to get this function. What if: >a) numa.h is not available? >b) what is wrong with virNumaGetMaxNode()? >> + for (i = 0; i <= maxnode; i++) { >> + if (virBitmapSetBit(bitmap, i) < 0) { >> + virBitmapFree(bitmap); >> + goto cleanup; >> + } >> + } >> + if (numa->memory.nodeset) >> + virBitmapFree(numa->memory.nodeset); >> + numa->memory.nodeset = bitmap; >> } >> >> /* setting nodeset when placement auto is invalid */ >> >But more importantly, why is this patch needed? I might be missing >something, but: >a) you can just not pin the memory to avoid mismatch of NUMA nodes on >migration, >b) supply new domain XML on migration where NUMA nodes match the destination >Isn't pinning memory to all NUMA nodes equivalent to no pinning at all? I would use 'interlaeve' to let virtual machine's memory distribute evenly in all nodes. And 'interleave' setting ask for providing 'nodeset'. I think it is not so convenient. >Michal

1 0

[libvirt] [PATCH 0/5] qemu: misc graphics fixes
by Nikolay Shirokovskiy 13 Sep '18

13 Sep '18

Nikolay Shirokovskiy (5): qemu: fix typo in vnc port releasing qemu: simplify graphics port releasing qemu: vnc: mark websocket as used on reconnect qemu: mark graphics ports as used on migration qemu: keep websocketGenerated on libvirtd restarts src/conf/domain_conf.c | 9 +++++++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_migration.c | 6 ++++++ src/qemu/qemu_process.c | 51 ++++++++++++++++++++++------------------------- src/qemu/qemu_process.h | 3 +++ 5 files changed, 43 insertions(+), 27 deletions(-) -- 1.8.3.1

2 13

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

13 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. 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. 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/Makefile.am | 1 + src/conf/domain_conf.c | 22 ++++-------- src/conf/domain_conf.h | 70 +++---------------------------------- src/libvirt_private.syms | 2 ++ src/lxc/lxc_cgroup.c | 69 ++----------------------------------- src/qemu/qemu_cgroup.c | 61 ++------------------------------- src/qemu/qemu_command.c | 4 +-- 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 | 7 ++++ src/util/virmem.h | 66 +++++++++++++++++++++++++++++++++++ 13 files changed, 259 insertions(+), 208 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

4 9

[libvirt] [PATCH 0/4] cfg.mk: Introduce syntax-check rule for incorrect indentation or empty line in function body
by Shi Lei 13 Sep '18

13 Sep '18

This series introduce syntax-check rule for below: 1. For incorrect indentation of the first line in function body int foo(int a0, ...) { [NOT 4 spaces]int first-line; ... ... } 2. For empty first line of function body int foo(int a0, ...) { [empty line] int second-line; ... ... } And it *ignores* the conditions as below: 1. For macros just as #if/#ifdef int foo(int a0, ...) { #if ANYTHING int second-line; ... ... } 2. For comments int foo(int a0, ...) { /* comments */ int second-line; ... ... } 3. For empty function body int foo(void) { } ^ This function has NO content 4. For labels { readmore: int second-line; ... ... goto readmore; ... ... } Shi Lei (4): cfg.mk: Introduce syntax-check rule for incorrect indentation or empty line in function body src: fix incorrect indentation or empty first line in function body tests: fix incorrect indentation or empty first line in function body tools: fix incorrect indentation or empty first line in function body cfg.mk | 11 +++ src/bhyve/bhyve_command.c | 3 - src/bhyve/bhyve_conf.c | 6 +- src/bhyve/bhyve_driver.c | 33 ++++--- src/bhyve/bhyve_monitor.c | 1 - src/bhyve/bhyve_process.c | 1 - src/conf/cpu_conf.c | 1 - src/conf/domain_capabilities.c | 1 - src/conf/domain_conf.c | 12 +-- src/conf/network_conf.c | 2 - src/cpu/cpu_s390.c | 82 ++++++++--------- src/cpu/cpu_x86.c | 1 - src/esx/esx_vi_types.c | 2 +- src/locking/lock_driver_nop.c | 1 - src/network/bridge_driver.c | 1 - src/network/bridge_driver_linux.c | 1 - src/nwfilter/nwfilter_learnipaddr.c | 1 - src/phyp/phyp_driver.c | 1 - src/qemu/qemu_alias.c | 1 - src/qemu/qemu_domain_address.c | 1 - src/qemu/qemu_driver.c | 1 - src/qemu/qemu_monitor.c | 1 - src/qemu/qemu_monitor_json.c | 1 - src/qemu/qemu_process.c | 1 - src/storage/storage_backend_sheepdog.c | 3 - src/storage/storage_driver.c | 1 - src/storage/storage_util.c | 1 - src/test/test_driver.c | 2 - src/util/vircommand.c | 6 +- src/util/virdbuspriv.h | 18 ++-- src/util/virdnsmasq.c | 1 - src/util/virfile.c | 1 - src/util/virnetdev.c | 55 ++++++------ src/util/virnetdevmacvlan.c | 11 ++- src/util/virnetdevvportprofile.c | 2 +- src/util/virstoragefile.c | 1 - src/util/virutil.c | 3 +- src/vbox/vbox_storage.c | 1 - src/vz/vz_driver.c | 1 - src/vz/vz_sdk.c | 1 - src/xenapi/xenapi_driver.c | 2 - src/xenconfig/xen_common.c | 9 +- tests/qemuxml2argvmock.c | 2 +- tests/sexpr2xmltest.c | 30 +++---- tests/virnetdevmock.c | 1 - tests/virnettlshelpers.c | 18 ++-- tests/virshtest.c | 118 ++++++++++++------------- tests/vshtabletest.c | 3 - tests/xml2sexprtest.c | 24 ++--- tools/virsh-volume.c | 1 - tools/virt-admin.c | 1 - 51 files changed, 218 insertions(+), 266 deletions(-) -- 2.17.1

2 10

[libvirt] [PATCHv2 0/5] Introduce VIR_AUTOCLOSE macro for closing fd automatically
by Shi Lei 13 Sep '18

13 Sep '18

v1 here: https://www.redhat.com/archives/libvir-list/2018-September/msg00319.html Diff from v1: - Change VIR_AUTOCLOSE macro (comments from Michal) - Remove others except for patches in util (comments from Erik) - Change sc_require_attribute_cleanup_initialization for this macro Shi Lei (5): util: file: introduce VIR_AUTOCLOSE macro to close fd of the file automatically cfg.mk: Change syntax-check rule for VIR_AUTOCLOSE variable initialization util: file: use VIR_AUTOCLOSE instead of VIR_FORCE_CLOSE util: netdevbridge: use VIR_AUTOCLOSE instead of VIR_FORCE_CLOSE util: netdev: use VIR_AUTOCLOSE instead of VIR_FORCE_CLOSE cfg.mk | 2 +- src/util/virfile.c | 21 ++-- src/util/virfile.h | 18 ++- src/util/virnetdev.c | 251 +++++++++++++------------------------ src/util/virnetdevbridge.c | 120 ++++++------------ 5 files changed, 146 insertions(+), 266 deletions(-) -- 2.17.1

2 9

[libvirt] [PATCH 0/3] qemu: Drop some cruft
by Andrea Bolognani 13 Sep '18

13 Sep '18

No longer needed since we bumped our minimum QEMU version to 1.5.0. Andrea Bolognani (3): qemu: Drop QEMU_CAPS_VNC_WEBSOCKET qemu: Drop QEMU_CAPS_CHARDEV_SPICEPORT qemu: Drop redundant version checks src/qemu/qemu_capabilities.c | 27 +++++-------------- src/qemu/qemu_capabilities.h | 4 +-- src/qemu/qemu_command.c | 14 +--------- .../caps_1.5.3.x86_64.xml | 2 -- .../caps_1.6.0.x86_64.xml | 2 -- .../caps_1.7.0.x86_64.xml | 2 -- .../caps_2.1.1.x86_64.xml | 2 -- .../caps_2.10.0.aarch64.xml | 2 -- .../caps_2.10.0.ppc64.xml | 2 -- .../caps_2.10.0.s390x.xml | 2 -- .../caps_2.10.0.x86_64.xml | 2 -- .../caps_2.11.0.s390x.xml | 2 -- .../caps_2.11.0.x86_64.xml | 2 -- .../caps_2.12.0.aarch64.xml | 2 -- .../caps_2.12.0.ppc64.xml | 2 -- .../caps_2.12.0.s390x.xml | 2 -- .../caps_2.12.0.x86_64.xml | 2 -- .../caps_2.4.0.x86_64.xml | 2 -- .../caps_2.5.0.x86_64.xml | 2 -- .../caps_2.6.0.aarch64.xml | 2 -- .../qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 2 -- .../caps_2.6.0.x86_64.xml | 2 -- .../qemucapabilitiesdata/caps_2.7.0.s390x.xml | 2 -- .../caps_2.7.0.x86_64.xml | 2 -- .../qemucapabilitiesdata/caps_2.8.0.s390x.xml | 2 -- .../caps_2.8.0.x86_64.xml | 2 -- .../qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 2 -- .../qemucapabilitiesdata/caps_2.9.0.s390x.xml | 2 -- .../caps_2.9.0.x86_64.xml | 2 -- .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 2 -- .../caps_3.0.0.riscv32.xml | 2 -- .../caps_3.0.0.riscv64.xml | 2 -- .../caps_3.0.0.x86_64.xml | 2 -- tests/qemuxml2argvtest.c | 6 ++--- 34 files changed, 12 insertions(+), 99 deletions(-) -- 2.17.1

3 11

[libvirt] [PATCH 0/2] Remove some unnecessary warnings
by Martin Kletzander 12 Sep '18

12 Sep '18

cd . ./blurb Martin Kletzander (2): Add functions for checking if user or group exists qemu: Report less errors on driver startup src/libvirt_private.syms | 2 ++ src/qemu/qemu_conf.c | 6 ++++-- src/util/virutil.c | 40 ++++++++++++++++++++++++++++++++-------- src/util/virutil.h | 4 ++++ 4 files changed, 42 insertions(+), 10 deletions(-) -- 2.18.0

3 5

[libvirt] [PATCH v7 0/2] deprecate incorrect CPUs topolog
by Igor Mammedov 12 Sep '18

12 Sep '18

Changelog since v5: * add(v6) and then remove(v7) Notes section to/from deprication doc (Eduardo Habkost <ehabkost(a)redhat.com>) * fix up wording and math formating in deprication doc (Eduardo Habkost <ehabkost(a)redhat.com>) * drop !socket check as it always evaluates to true at that point (Eduardo Habkost <ehabkost(a)redhat.com>) Changelog since v4: * extend deprication doc, adding that maxcpus should be multiple of present on CLI [sockets/cores/threads] options (Eduardo Habkost <ehabkost(a)redhat.com>) series bundles together 2 related patches posted separately earlier: vl.c deprecate incorrect CPUs topology vl:c: make sure that sockets are calculated correctly in '-smp X' case Goal is to depricate invalid topologies so we could make sure that topology configuration is correct by forbidding invalid input once deprecation period ends. --- CC: libvir-list(a)redhat.com CC: ehabkost(a)redhat.com Igor Mammedov (2): vl.c deprecate incorrect CPUs topology vl:c: make sure that sockets are calculated correctly in '-smp X' case qemu-deprecated.texi | 13 +++++++++++++ vl.c | 12 +++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) -- 2.7.4

2 4

[libvirt] [PATCH v5 0/2] deprecate incorrect CPUs topology
by Igor Mammedov 12 Sep '18

12 Sep '18

Changelog since v4: * extend deprication doc, adding that maxcpus should be multiple of present on CLI [sockets/cores/threads] options (Eduardo Habkost <ehabkost(a)redhat.com>) series bundles together 2 related patches posted separately earlier: vl.c deprecate incorrect CPUs topology vl:c: make sure that sockets are calculated correctly in '-smp X' case Goal is to depricate invalid topologies so we could make sure that topology configuration is correct by forbidding invalid input once deprecation period ends. --- CC: libvir-list(a)redhat.com CC: drjones(a)redhat.com CC: ehabkost(a)redhat.com Igor Mammedov (2): vl.c deprecate incorrect CPUs topology vl:c: make sure that sockets are calculated correctly in '-smp X' case qemu-deprecated.texi | 19 +++++++++++++++++++ vl.c | 12 +++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) -- 2.7.4

4 15

[libvirt] [PATCHv2 0/7] qemuxml2argvtest cleanups
by Ján Tomko 12 Sep '18

12 Sep '18

Patch 1 and patch 3 were not acked in v1. The changes to the ACKed ones are minimal. Complete diff to v2: diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 867e0d569f..0e43320b96 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -460,20 +460,20 @@ testCompareXMLToStartupXML(const void *data) } -# define TEST_EXCLUSIVE_FLAGS(FLAG1, FLAG2) \ - if ((testFlags & FLAG1) && (testFlags & FLAG2)) { \ - VIR_TEST_DEBUG("Flags %s and %s are mutually exclusive\n", \ - #FLAG1, #FLAG2); \ - return -1; \ - } - - static int -testCheckExclusiveFlags(int testFlags ATTRIBUTE_UNUSED) +testCheckExclusiveFlags(int flags) { - TEST_EXCLUSIVE_FLAGS(FLAG_STEAL_VM, FLAG_EXPECT_FAILURE); - TEST_EXCLUSIVE_FLAGS(FLAG_STEAL_VM, FLAG_EXPECT_PARSE_ERROR); - TEST_EXCLUSIVE_FLAGS(FLAG_REAL_CAPS, FLAG_SKIP_LEGACY_CPUS); + virCheckFlags(FLAG_EXPECT_FAILURE | + FLAG_EXPECT_PARSE_ERROR | + FLAG_FIPS | + FLAG_STEAL_VM | + FLAG_REAL_CAPS | + FLAG_SKIP_LEGACY_CPUS | + 0, -1); + + VIR_EXCLUSIVE_FLAGS_RET(FLAG_STEAL_VM, FLAG_EXPECT_FAILURE, -1); + VIR_EXCLUSIVE_FLAGS_RET(FLAG_STEAL_VM, FLAG_EXPECT_PARSE_ERROR, -1); + VIR_EXCLUSIVE_FLAGS_RET(FLAG_REAL_CAPS, FLAG_SKIP_LEGACY_CPUS, -1); return 0; } Ján Tomko (7): tests: add a function for checking exclusive flags tests: introduce macro for qemu XML->startup XML tests: only run startup XML tests if requested tests: report errors in QEMU XML->startup XML tests tests: do not mangle real qemu caps in xml2argvtest tests: turn skipLegacyCPUs into a flag qemu: remove unnecessary virQEMUCapsFreeHostCPUModel src/qemu/qemu_capabilities.c | 25 ++------------- src/qemu/qemu_capspriv.h | 5 --- tests/qemuxml2argvtest.c | 74 ++++++++++++++++++++++++++++---------------- 3 files changed, 49 insertions(+), 55 deletions(-) -- 2.16.4

2 8

[libvirt] [PATCH 0/2] Cleanup memoryBacking docs and move some hugepages checks
by John Ferlan 12 Sep '18

12 Sep '18

While reviewing the -memfd series: https://www.redhat.com/archives/libvir-list/2018-September/msg00381.html I noted that a couple of checks seemed out of place in the the domain_conf processing. They seem more "in place" in the hypvervisor processing. And while doing this I also noted the documentation is clearly not up to snuff, so I modified that too. That's a followup to another recent review comment: https://www.redhat.com/archives/libvir-list/2018-September/msg00176.html although I didn't delve into much detail, just the basics of what the attributes are and the acceptible values. John Ferlan (2): doc: Update the wording around the backingStore conf: Move hypervisor specific nhugepage checks docs/formatdomain.html.in | 13 ++++++++----- src/conf/domain_conf.c | 14 -------------- src/qemu/qemu_domain.c | 27 ++++++++++++++++++++++----- 3 files changed, 30 insertions(+), 24 deletions(-) -- 2.17.1

2 4

[libvirt] [jenkins-ci PATCH v2 0/2] Enable libosinfo tests that require network connectivity
by Fabiano Fidêncio 12 Sep '18

12 Sep '18

Let's enable both media and tree uris tests in order to early catch URL changes that need to be fixed in osinfo-db. Fabiano Fidêncio (2): guests: Enable {media,tree}uris tests for libosinfo projects: Enable {media,tree}uri tests for libosinfo guests/playbooks/build/projects/libosinfo.yml | 4 ++++ projects/libosinfo.yaml | 3 +++ 2 files changed, 7 insertions(+) -- 2.17.1

2 5

[libvirt] [PATCH 0/6] Introduce VIR_AUTOCLOSE macro for closing fd automatically
by Shi Lei 12 Sep '18

12 Sep '18

This series introduce VIR_AUTOCLOSE macro which can force close fd of the file automatically when the fd goes out of scope. It's used to eliminate VIR_FORCE_CLOSE in cleanup sections. The new macro consults VIR_AUTOFREE and VIR_AUTOPTR. Shi Lei (6): util: file: introduce VIR_AUTOCLOSE macro to close fd of the file automatically util: file: use VIR_AUTOCLOSE instead of VIR_FORCE_CLOSE in cleanup sections util: netdevbridge: use VIR_AUTOCLOSE instead of VIR_FORCE_CLOSE in cleanup sections util: netdev: use VIR_AUTOCLOSE instead of VIR_FORCE_CLOSE in cleanup sections phyp: driver: use VIR_AUTOCLOSE instead of VIR_FORCE_CLOSE in cleanup sections uml: conf: use VIR_AUTOCLOSE instead of VIR_FORCE_CLOSE in cleanup sections src/phyp/phyp_driver.c | 29 ++--- src/uml/uml_conf.c | 13 +- src/util/virfile.c | 21 +-- src/util/virfile.h | 20 ++- src/util/virnetdev.c | 253 +++++++++++++------------------------ src/util/virnetdevbridge.c | 120 ++++++------------ 6 files changed, 163 insertions(+), 293 deletions(-) -- 2.17.1

3 21

[libvirt] [PATCH 0/3] Allow inputvol when creating vol from inputvol to be encrypted
by John Ferlan 12 Sep '18

12 Sep '18

https://bugzilla.redhat.com/show_bug.cgi?id=1613737 Details in the patches (and even more in the bz). John Ferlan (3): storage: Remove secretPath from _virStorageBackendQemuImgInfo storage: Allow for inputvol to have any format for encryption storage: Allow inputvol to be encrypted src/storage/storage_util.c | 79 ++++++++++++++++--- src/storage/storage_util.h | 1 + .../luks-convert-encrypt.argv | 11 +++ .../luks-convert-encrypt2fileqcow2.argv | 7 ++ .../luks-convert-encrypt2fileraw.argv | 7 ++ .../luks-convert-qcow2.argv | 9 +++ tests/storagevolxml2argvtest.c | 19 ++++- tests/storagevolxml2xmlin/vol-encrypt1.xml | 21 +++++ tests/storagevolxml2xmlin/vol-encrypt2.xml | 21 +++++ tests/storagevolxml2xmlin/vol-file-qcow2.xml | 21 +++++ 10 files changed, 184 insertions(+), 12 deletions(-) create mode 100644 tests/storagevolxml2argvdata/luks-convert-encrypt.argv create mode 100644 tests/storagevolxml2argvdata/luks-convert-encrypt2fileqcow2.argv create mode 100644 tests/storagevolxml2argvdata/luks-convert-encrypt2fileraw.argv create mode 100644 tests/storagevolxml2argvdata/luks-convert-qcow2.argv create mode 100644 tests/storagevolxml2xmlin/vol-encrypt1.xml create mode 100644 tests/storagevolxml2xmlin/vol-encrypt2.xml create mode 100644 tests/storagevolxml2xmlin/vol-file-qcow2.xml -- 2.17.1

2 10

[libvirt] Fw: Re: [PATCH 4/6] util: netdev: use VIR_AUTOCLOSE instead of VIR_FORCE_CLOSE
by Shi Lei 12 Sep '18

12 Sep '18

On 2018-09-12 at 16:25, Shi Lei wrote: On 2018-09-12 at 15:21, Erik Skultety wrote: >On Tue, Sep 11, 2018 at 11:37:45PM +0800, Shi Lei wrote: >> On 2018-09-11 at 20:44, Erik Skultety wrote: >> >On Mon, Sep 10, 2018 at 11:47:53AM +0800, Shi Lei wrote: >> >> By making use of GNU C's cleanup attribute handled by the VIR_AUTOCLOSE macro, >> >> many of the VIR_FORCE_CLOSE calls can be dropped, which in turn leads to >> >> getting rid of many of our cleanup sections. >> >> >> >> Signed-off-by: Shi Lei <shi_lei(a)massclouds.com> >> >> --- >> >> static int >> >> @@ -909,9 +867,9 @@ char *virNetDevGetName(int ifindex) >> >> #if defined(SIOCGIFINDEX) && defined(HAVE_STRUCT_IFREQ) >> >> int virNetDevGetIndex(const char *ifname, int *ifindex) >> >> { >> >> - int ret = -1; >> >> struct ifreq ifreq; >> >> - int fd = socket(VIR_NETDEV_FAMILY, SOCK_DGRAM, 0); >> >> + VIR_AUTOCLOSE(fd); >> >> + socket(VIR_NETDEV_FAMILY, SOCK_DGRAM, 0); >> > >> >^this could not potentially work... >> > >> >Erik >> >> Sorry! I'm too careless. >> >> I think that a new syntax-check rule might make sense. >> This rule checks below: >> >> type foo(a0, a1 ...); >> >> [type] var = foo(a0, a1, ...); /* It's OK */ >> ignore_value(foo(a0, a1, ...)); /* It's OK */ >> >> foo(a0, a1, ...); /* Report this usage */ > >but this would go away with the syntax-check rule you proposed in you response >to the first patch? If not, then would you be more specific to help me >understand the problem more? > >Thanks, >Erik Sorry! I was muddle-headed last night. It is not the syntax-check rule in my response to the first patch. This is another rule and I wanted to introduce it to avoid some faults then. Today I find that it is not easy as I thought. Please ignore it ... :-) Shi Lei > >> >> And it takes effect before compilation and even it's in the inactive >> side of the #if-#else conditons. >> >> It would not check macros since their name are upper case and >> we don't care for the function as condition in if-else statement. >> >> How about it? >> And I can try it if it's a bit helpful ... >> >> Shi Lei >> >> >> >> -- >> libvir-list mailing list >> libvir-list(a)redhat.com >> https://www.redhat.com/mailman/listinfo/libvir-list

1 0

[libvirt] [PATCHv3 0/3] Add virNetlinkNewLink helper for simplifying virNetDev*Create
by Shi Lei 12 Sep '18

12 Sep '18

v2 here: https://www.redhat.com/archives/libvir-list/2018-September/msg00131.html Diff from V2: This series remove all unrelated changes. Those changes would be standalone patches. Shi Lei (3): util: netlink: Introduce virNetlinkNewLink helper util: netlink: Add wrapper macros to make virNetlinkNewLink more readable util: netlink: Using virNetlinkNewLink to simplify virNetDev*Create src/libvirt_private.syms | 1 + src/util/virnetdevbridge.c | 73 +++--------------------- src/util/virnetdevmacvlan.c | 110 +++++------------------------------- src/util/virnetlink.c | 104 ++++++++++++++++++++++++++++++++++ src/util/virnetlink.h | 43 ++++++++++++++ 5 files changed, 172 insertions(+), 159 deletions(-) -- 2.17.1

3 17

[libvirt] [PATCH] numa: fix unsafe access to numa_nodes_ptr
by Wang Yechao 12 Sep '18

12 Sep '18

numa_nodes_ptr is a global variable in libnuma.so. It is been freed after main thread exits. If we have many running vms, restart the libvirtd service continuously at intervals of a few seconds, the main thread may exit before qemuProcessReconnect thread, and a segfault error occurs. Backstrace as follows: 0 0x00007f40e3d2dd72 in numa_bitmask_isbitset () from /lib64/libnuma.so.1 1 0x00007f40e4d14c55 in virNumaNodeIsAvailable (node=node@entry=0) at util/virnuma.c:396 2 0x00007f40e4d16010 in virNumaGetHostMemoryNodeset () at util/virnuma.c:1011 3 0x00007f40b94ced90 in qemuRestoreCgroupState (vm=0x7f407c39df00, vm=0x7f407c39df00) at qemu/qemu_cgroup.c:877 4 qemuConnectCgroup (driver=driver@entry=0x7f407c21fe80, vm=0x7f407c39df00) at qemu/qemu_cgroup.c:969 5 0x00007f40b94eef93 in qemuProcessReconnect (opaque=<optimized out>) at qemu/qemu_process.c:3531 6 0x00007f40e4d34bd2 in virThreadHelper (data=<optimized out>) at util/virthread.c:206 7 0x00007f40e214ee25 in start_thread () from /lib64/libpthread.so.0 8 0x00007f40e1e7c36d in clone () from /lib64/libc.so.6 Signed-off-by: Wang Yechao <wang.yechao255(a)zte.com.cn> --- src/util/virnuma.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/util/virnuma.c b/src/util/virnuma.c index 67e6c86..502b1d5 100644 --- a/src/util/virnuma.c +++ b/src/util/virnuma.c @@ -381,7 +381,10 @@ virNumaGetMaxCPUs(void) bool virNumaNodeIsAvailable(int node) { - return numa_bitmask_isbitset(numa_nodes_ptr, node); + if (numa_nodes_ptr) + return numa_bitmask_isbitset(numa_nodes_ptr, node); + else + return false; } -- 1.8.3.1

1 0

[libvirt] [PATCH 0/2] Fix issues in qemuARPGetInterfaces and virArpTableGet
by Lin Ma 12 Sep '18

12 Sep '18

Lin Ma (2): qemu: Remove network type limitation for qemuARPGetInterfaces virarptable: Return a virArpTablePtr when the nlmsghdr for loop is over src/qemu/qemu_driver.c | 3 --- src/util/virarptable.c | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) -- 2.16.2

2 6

Re: [libvirt] [PATCH v3 4/4] block/rbd: add deprecation documenation for filename keyvalue pairs
by Eric Blake 11 Sep '18

11 Sep '18

[MAINTAINERS says libvir-list should have been cc'd; not sure why that didn't happen] On 9/11/18 4:34 PM, Jeff Cody wrote: > Signed-off-by: Jeff Cody <jcody(a)redhat.com> In the subject: s/documenation/documentation/ > --- > qemu-deprecated.texi | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi > index 1b9c007f12..4df8ac442d 100644 > --- a/qemu-deprecated.texi > +++ b/qemu-deprecated.texi > @@ -190,6 +190,13 @@ used instead. > In order to prevent QEMU from automatically opening an image's backing > chain, use ``"backing": null'' instead. > > +@subsubsection "rbd keyvalue pair encoded filenames": "" (since 3.1.0) > + > +Options for ``rbd'' should be specified according to its runtime options, > +like other block drivers. Legacy parsing of keyvalue pair encoded > +filenames is useful to open images with the old format for backing files; > +These image files should be updated to use the current format. Can we give an example? Cribbing from patch 3, an example might look like changing: json:{"file.driver":"rbd", "file.filename":"rbd:rbd/name"} into: json:{"file.driver":"rbd", "file.pool":"rbd", "file.image":"name"} I'll let Peter or John comment on whether libvirt's RBD pool handler is impacted by this deprecation, but it seems reasonable to me. -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org

2 1

[libvirt] [PATCH] qemu_domain: Drop namespace check from top level functions
by Michal Privoznik 11 Sep '18

11 Sep '18

In some cases we are checking if the mount namespace is enabled at two places: one is at the beginning of exported function (e.g. qemuDomainNamespaceSetupDisk()) and the other is at the beginning of qemuDomainNamespaceMknodPaths() which is called from the former function anyway. Then we have some other functions which rely on the later check solely. In order to compensate for possibly needles function call, qemuDomainNamespaceMknodPaths() returns early if @npaths is zero. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_domain.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 5329899b13..15325aa4c1 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -12428,7 +12428,8 @@ qemuDomainNamespaceMknodPaths(virDomainObjPtr vm, int ret = -1; size_t i; - if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT)) + if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT) || + !npaths) return 0; cfg = virQEMUDriverGetConfig(driver); @@ -12521,9 +12522,6 @@ qemuDomainNamespaceSetupDisk(virDomainObjPtr vm, char *dmPath = NULL; int ret = -1; - if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT)) - return 0; - for (next = src; virStorageSourceIsBacking(next); next = next->backingStore) { if (virStorageSourceIsEmpty(next) || !virStorageSourceIsLocalStorage(next)) { @@ -12574,9 +12572,6 @@ qemuDomainNamespaceSetupHostdev(virDomainObjPtr vm, char **paths = NULL; size_t i, npaths = 0; - if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT)) - return 0; - if (qemuDomainGetHostdevPath(NULL, hostdev, false, &npaths, &paths, NULL) < 0) goto cleanup; @@ -12600,9 +12595,6 @@ qemuDomainNamespaceTeardownHostdev(virDomainObjPtr vm, char **paths = NULL; size_t i, npaths = 0; - if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT)) - return 0; - if (qemuDomainGetHostdevPath(vm->def, hostdev, true, &npaths, &paths, NULL) < 0) goto cleanup; -- 2.16.4

2 1

[libvirt] Terminal input “udevadm trigger” command,then produce “nl_recv returned with error:No buffer space available”
by xiajidong＠cmss.chinamobile.com 11 Sep '18

11 Sep '18

Dear libvirt experts， I have add some patch as follow.this two patch add buffer size to avoid to produce “nl_recv returned with error:No buffer space available” 1. libvirt-nodedev-Increase-the-netlink-socket-buffer-size-to-t.patch 2. libvirt-util-increase-libnl-buffer-size.patch but as I set some configuration in /etc/libvirt/libvitd.conf as follows # Logging level: 4 errors, 3 warnings, 2 information, 1 debug log_level =2 # Multiple outputs can be defined, they just need to be separated by spaces. # e.g. to log all warnings and errors to syslog under the libvirtd ident: log_outputs="2:syslog:libvirtd" when I input “udevadm trigger” command [root@localhost ~]# vi /etc/libvirt/libvirtd.conf [root@localhost ~]# systemctl restart libvirtd [root@localhost ~]# udevadm trigger [root@localhost ~]# udevadm trigger [root@localhost ~]# udevadm trigger [root@localhost ~]# then will produce “nl_recv returned with error:No buffer space available” [root@localhost ~]# tail -f /var/log/messages | grep buffer Sep 2 22:44:00 localhost libvirtd: 4004: error : virNetlinkEventCallback:699 : nl_recv returned with error: No buffer space available Sep 2 23:11:33 localhost libvirtd: 4004: error : virNetlinkEventCallback:699 : nl_recv returned with error: No buffer space available Sep 2 23:11:45 localhost libvirtd: 4004: error : virNetlinkEventCallback:699 : nl_recv returned with error: No buffer space available So my question is: When input “udevadm trigger” in terminal, if setting log_level and log_outputs="2:syslog:libvirtd",how to avoid to produce “error virNetlinkEventCallback:699 : nl_recv returned with error: No buffer space available” log information? I am looking forward to your reply. _____ Best Regards, Jidong Xia China Mobile (Suzhou) Software Technology Company.cloud computing product department Tel: (+86) 18896726087 E-Mail：xiajidong(a)cmss.chinamobile.com <mailto:xiajidong@cmss.chinamobile.com>

2 1

[libvirt] [PATCH] test: Remove possible infinite loop in virnetsockettest
by John Ferlan 11 Sep '18

11 Sep '18

Commit 39015a6f3 modified the test to be more reliable/realistic, but without checking the return status of virEventRunDefaultImpl it's possible that the test could run infinitely. Found by Coverity Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- tests/virnetsockettest.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c index cccb90d0be..490f720fd0 100644 --- a/tests/virnetsockettest.c +++ b/tests/virnetsockettest.c @@ -243,8 +243,13 @@ testSocketAccept(const void *opaque) &cdata) < 0) goto cleanup; - while (rsock == NULL) - virEventRunDefaultImpl(); + while (rsock == NULL) { + if (virEventRunDefaultImpl() < 0) { + VIR_WARN("Failed to run event loop: %s\n", + virGetLastErrorMessage()); + break; + } + } for (i = 0; i < nlsock; i++) { if (lsock[i] == rsock) { -- 2.17.1

2 2

[libvirt] [PATCH] news: Mention Xen support for PM suspend and wakeup
by Jim Fehlig 11 Sep '18

11 Sep '18

Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- docs/news.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index b8bee35df0..9d16b2930b 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -35,6 +35,15 @@ <libvirt> <release version="v4.8.0" date="unreleased"> <section title="New features"> + <change> + <summary> + Xen: Support PM Suspend and Wakeup + </summary> + <description> + The libxl driver now supports the virDomainPMSuspendForDuration + and virDomainPMWakeup APIs. + </description> + </change> </section> <section title="Improvements"> <change> -- 2.18.0

2 1

[libvirt] [PATCH 0/9] qemuxml2argvtest cleanups
by Ján Tomko 11 Sep '18

11 Sep '18

While looking at how slow this test has gotten, I found a lost test case, some redundancies. Thankfully, not running the HostModel functions twice helped, but there is still room for improvement: we spend a lot of time in the CPU driver comparing the same strings over and over again and with over 300 entries in virQEMUCaps enum, we can reduce some of these string comparisons in the future to cope with more and more QEMU versions being tested. Ján Tomko (9): tests: drop 'drive' from qemuxml2startup tests tests: add macro for dealing with exclusive flags tests: introduce macro for qemu XML->startup XML tests: only run startup XML tests if requested tests: report errors in QEMU XML->startup XML tests tests: drop redundant virQEMUCapsFilterByMachineType tests: do not mangle real qemu caps in xml2argvtest tests: turn skipLegacyCPUs into a flag qemu: remove unnecessary virQEMUCapsFreeHostCPUModel src/qemu/qemu_capabilities.c | 25 +------ src/qemu/qemu_capspriv.h | 5 -- tests/qemuxml2argvtest.c | 76 +++++++++++++--------- .../{disk-drive-shared.xml => disk-shared.xml} | 0 4 files changed, 49 insertions(+), 57 deletions(-) rename tests/qemuxml2startupxmloutdata/{disk-drive-shared.xml => disk-shared.xml} (100%) -- 2.16.4

2 18

[libvirt] [PATCH] qemu: free SEV caps in virQEMUCapsDispose
by Ján Tomko 11 Sep '18

11 Sep '18

Commit 77f51ab5 started parsing an copying the SEV capabilities, but omitted the free call. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/qemu/qemu_capabilities.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 08cf822b88..308f5602ca 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1662,6 +1662,8 @@ void virQEMUCapsDispose(void *obj) VIR_FREE(qemuCaps->gicCapabilities); + virSEVCapabilitiesFree(qemuCaps->sevCapabilities); + virQEMUCapsHostCPUDataClear(&qemuCaps->kvmCPU); virQEMUCapsHostCPUDataClear(&qemuCaps->tcgCPU); } -- 2.16.4

2 1

[libvirt] [PATCH 0/2] Remove unnecessary/duplicated qemuAgentCheckError calls
by John Ferlan 11 Sep '18

11 Sep '18

Followup to review comments I made for recent agent series. John Ferlan (2): qemu: Remove duplicated qemuAgentCheckError qemu: Remove duplicated qemuAgentCheckError src/qemu/qemu_agent.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) -- 2.17.1

2 3

[libvirt] [PATCHv4 0/2] Add virNetlinkNewLink helper for simplifying virNetDev*Create
by Shi Lei 11 Sep '18

11 Sep '18

v3 here: https://www.redhat.com/archives/libvir-list/2018-September/msg00233.html Diff from v3: This series make changes according to the comments from Erik and John. Shi Lei (2): util: netlink: Introduce virNetlinkNewLink helper to simplify virNetDev*Create util: netlink: Add wrapper macros to make virNetlinkNewLink more readable src/libvirt_private.syms | 1 + src/util/virnetdevbridge.c | 73 +++--------------------- src/util/virnetdevmacvlan.c | 110 +++++------------------------------ src/util/virnetlink.c | 111 ++++++++++++++++++++++++++++++++++++ src/util/virnetlink.h | 36 ++++++++++++ 5 files changed, 172 insertions(+), 159 deletions(-) -- 2.17.1

2 4

[libvirt] [PATCH] add nodeset='all' and default for interleave mode
by Peng Hao 11 Sep '18

11 Sep '18

For interleave mode,sometimes we want to allocate mmeory regularly in all nodes on the host. But different hosts has different node number. So we add nodeset='all' for interleave mode and if nodeset=NULL default nodeset is 'all' for interleave mode. Signed-off-by: Peng Hao <peng.hao2(a)zte.com.cn> --- src/conf/numa_conf.c | 73 ++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 57 insertions(+), 16 deletions(-) diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c index 97a3ca4..de5fb9c 100644 --- a/src/conf/numa_conf.c +++ b/src/conf/numa_conf.c @@ -29,6 +29,10 @@ #include "virnuma.h" #include "virstring.h" +#if WITH_NUMACTL +#include <numa.h> +#endif + /* * Distance definitions defined Conform ACPI 2.0 SLIT. * See include/linux/topology.h @@ -66,6 +70,7 @@ typedef virDomainNumaNode *virDomainNumaNodePtr; struct _virDomainNuma { struct { bool specified; + bool allnode; virBitmapPtr nodeset; virDomainNumatuneMemMode mode; virDomainNumatunePlacement placement; @@ -259,13 +264,17 @@ virDomainNumatuneParseXML(virDomainNumaPtr numa, tmp = virXMLPropString(node, "nodeset"); if (tmp) { - if (virBitmapParse(tmp, &nodeset, VIR_DOMAIN_CPUMASK_LEN) < 0) - goto cleanup; - - if (virBitmapIsAllClear(nodeset)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Invalid value of 'nodeset': %s"), tmp); - goto cleanup; + if (strcmp(tmp, "all") == 0) { + numa->memory.allnode = true; + } else { + if (virBitmapParse(tmp, &nodeset, VIR_DOMAIN_CPUMASK_LEN) < 0) + goto cleanup; + + if (virBitmapIsAllClear(nodeset)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Invalid value of 'nodeset': %s"), tmp); + goto cleanup; + } } VIR_FREE(tmp); @@ -319,10 +328,14 @@ virDomainNumatuneFormatXML(virBufferPtr buf, virBufferAsprintf(buf, "<memory mode='%s' ", tmp); if (numatune->memory.placement == VIR_DOMAIN_NUMATUNE_PLACEMENT_STATIC) { - if (!(nodeset = virBitmapFormat(numatune->memory.nodeset))) - return -1; - virBufferAsprintf(buf, "nodeset='%s'/>\n", nodeset); - VIR_FREE(nodeset); + if (numatune->memory.allnode == true) { + virBufferAsprintf(buf, "nodeset='all'/>\n"); + } else { + if (!(nodeset = virBitmapFormat(numatune->memory.nodeset))) + return -1; + virBufferAsprintf(buf, "nodeset='%s'/>\n", nodeset); + VIR_FREE(nodeset); + } } else if (numatune->memory.placement) { tmp = virDomainNumatunePlacementTypeToString(numatune->memory.placement); virBufferAsprintf(buf, "placement='%s'/>\n", tmp); @@ -497,6 +510,9 @@ virDomainNumatuneSet(virDomainNumaPtr numa, virBitmapPtr nodeset) { int ret = -1; + int i = 0, maxnode = 0; + virBitmapPtr bitmap = NULL; + /* No need to do anything in this case */ if (mode == -1 && placement == -1 && !nodeset) @@ -538,7 +554,7 @@ virDomainNumatuneSet(virDomainNumaPtr numa, } if (placement == VIR_DOMAIN_NUMATUNE_PLACEMENT_DEFAULT) { - if (numa->memory.nodeset || placement_static) + if (numa->memory.nodeset || placement_static || numa->memory.allnode) placement = VIR_DOMAIN_NUMATUNE_PLACEMENT_STATIC; else placement = VIR_DOMAIN_NUMATUNE_PLACEMENT_AUTO; @@ -546,10 +562,35 @@ virDomainNumatuneSet(virDomainNumaPtr numa, if (placement == VIR_DOMAIN_NUMATUNE_PLACEMENT_STATIC && !numa->memory.nodeset) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("nodeset for NUMA memory tuning must be set " - "if 'placement' is 'static'")); - goto cleanup; + if (mode != VIR_DOMAIN_NUMATUNE_MEM_INTERLEAVE) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("nodeset for NUMA memory tuning must be set " + "if 'placement' is 'static'")); + goto cleanup; + } else { + /* default set all node if nodeset is NULL, when placement + * is static and mode is interleave. + */ + numa->memory.allnode = true; + } + } + + if (placement == VIR_DOMAIN_NUMATUNE_PLACEMENT_STATIC && + mode == VIR_DOMAIN_NUMATUNE_MEM_INTERLEAVE && + numa->memory.allnode) { + if ((bitmap = virBitmapNew(VIR_DOMAIN_CPUMASK_LEN)) == NULL) + goto cleanup; + virBitmapClearAll(bitmap); + maxnode = numa_max_node(); + for (i = 0; i <= maxnode; i++) { + if (virBitmapSetBit(bitmap, i) < 0) { + virBitmapFree(bitmap); + goto cleanup; + } + } + if (numa->memory.nodeset) + virBitmapFree(numa->memory.nodeset); + numa->memory.nodeset = bitmap; } /* setting nodeset when placement auto is invalid */ -- 1.8.3.1

2 1

[libvirt] [PATCH] docs: Fix missing timestamp inside backingStore.
by Julio Faracco 11 Sep '18

11 Sep '18

All backingStore XML definitions have a XML tag with the timestamp. This timestamp is not defined insinde RNG volume storage schema and it is causing some problems to validate and check volume XMLs. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1594266 Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- docs/schemas/storagevol.rng | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/schemas/storagevol.rng b/docs/schemas/storagevol.rng index 96d6b3e6d0..32aaa2784d 100644 --- a/docs/schemas/storagevol.rng +++ b/docs/schemas/storagevol.rng @@ -139,6 +139,7 @@ </element> <ref name='format'/> <ref name='permissions'/> + <ref name='timestamps'/> </interleave> </element> </define> -- 2.17.1

2 1

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

11 Sep '18

qemuProcessReconnectHelper has hold the doms lock, if create qemuProcessReconnect thread failed, it will get the doms lock again to remove the dom from doms list. add obj->inReconnetCtx flag to avoid deadlock. Signed-off-by: Wang Yechao <wang.yechao255(a)zte.com.cn> --- src/conf/domain_conf.h | 1 + src/conf/virdomainobjlist.c | 6 ++++-- src/qemu/qemu_process.c | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index e30a4b2..5bc5771 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2608,6 +2608,7 @@ struct _virDomainObj { virDomainSnapshotObjPtr current_snapshot; bool hasManagedSave; + bool inReconnectCtx; void *privateData; void (*privateDataFreeFunc)(void *); diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c index 805fe94..30300b4 100644 --- a/src/conf/virdomainobjlist.c +++ b/src/conf/virdomainobjlist.c @@ -397,11 +397,13 @@ virDomainObjListRemove(virDomainObjListPtr doms, dom->removing = true; virObjectRef(dom); virObjectUnlock(dom); - virObjectRWLockWrite(doms); + if (!dom->inReconnectCtx) + virObjectRWLockWrite(doms); virObjectLock(dom); virDomainObjListRemoveLocked(doms, dom); virObjectUnref(dom); - virObjectRWUnlock(doms); + if (!dom->inReconnectCtx) + virObjectRWUnlock(doms); } diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index eb9904b..8c30850 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -8029,6 +8029,7 @@ qemuProcessReconnectHelper(virDomainObjPtr obj, */ qemuProcessStop(src->driver, obj, VIR_DOMAIN_SHUTOFF_FAILED, QEMU_ASYNC_JOB_NONE, 0); + obj->inReconnectCtx = true; qemuDomainRemoveInactiveJob(src->driver, obj); virDomainObjEndAPI(&obj); -- 1.8.3.1

1 0

[libvirt] [PATCH V2 0/2] libxl: drop support for Xen 4.4 and 4.5
by Jim Fehlig 11 Sep '18

11 Sep '18

V1: https://www.redhat.com/archives/libvir-list/2018-March/msg01704.html Jim Fehlig (2): libxl: drop support for Xen < 4.6 news: Announce dropping support for Xen 4.4 and 4.5 docs/drvxen.html.in | 2 +- docs/news.xml | 9 +++++++++ m4/virt-driver-libxl.m4 | 22 +--------------------- 3 files changed, 11 insertions(+), 22 deletions(-) -- 2.18.0

4 6

[libvirt] [PATCH] qemu: check for vhostusers bandwidth
by Roland Schulz 11 Sep '18

11 Sep '18

https://bugzilla.redhat.com/show_bug.cgi?id=1524230 Signed-off-by: Roland Schulz <schullzroll(a)gmail.com> --- src/qemu/qemu_command.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ff9589f593..284c2709fc 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8244,6 +8244,8 @@ qemuBuildVhostuserCommandLine(virQEMUDriverPtr driver, virQEMUCapsPtr qemuCaps, unsigned int bootindex) { + virNetDevBandwidthPtr actualBandwidth = virDomainNetGetActualBandwidth(net); + virDomainNetType actualType = virDomainNetGetActualType(net); virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); char *chardev = NULL; char *netdev = NULL; @@ -8257,6 +8259,19 @@ qemuBuildVhostuserCommandLine(virQEMUDriverPtr driver, goto cleanup; } + /* Set bandwidth or warn if requested and not supported. */ + if (actualBandwidth) { + if (virNetDevSupportBandwidth(actualType)) { + if (virNetDevBandwidthSet(net->ifname, actualBandwidth, false, + !virDomainNetTypeSharesHostView(net)) < 0) + goto cleanup; + } else { + VIR_WARN("setting bandwidth on interfaces of " + "type '%s' is not implemented yet", + virDomainNetTypeToString(actualType)); + } + } + switch ((virDomainChrType)net->data.vhostuser->type) { case VIR_DOMAIN_CHR_TYPE_UNIX: if (!(chardev = qemuBuildChrChardevStr(logManager, secManager, -- 2.17.1

3 3

[libvirt] [PATCH 0/5] libxl: various migration V3 improvements
by Jim Fehlig 11 Sep '18

11 Sep '18

Patch 5 fixes a long standing problem found by some very slow hosts in xen's osstest https://lists.xenproject.org/archives/html/xen-devel/2018-08/msg01945.html While working on the fix, I discovered other problems in libxl's V3 migration protocol. E.g. a modify job on the migrating VM was not handled properly across the phases on either src or dst host. Patches 1-4 fix this and other problems found along the way. Jim Fehlig (5): libxl: migration: defer removing VM until finish phase libxl: fix logic in P2P migration libxl: fix job handling across migration phases on src libxl: fix job handling across migration phases on dst libxl: join with thread receiving migration data src/libxl/libxl_domain.h | 1 + src/libxl/libxl_driver.c | 7 -- src/libxl/libxl_migration.c | 168 ++++++++++++++++++++++++------------ 3 files changed, 114 insertions(+), 62 deletions(-) -- 2.18.0

2 6

[libvirt] [PATCH] nwfilter: fix deadlock when nwfilter reload
by Wang Yechao 11 Sep '18

11 Sep '18

user run "firewalld-cmd --reload" nwfilterStateReload called in main thread step 1. virRWLockWrite(&updateLock) step 2. virNWFilterLoadAllConfigs step 3. virRWLockUnlock(&updateLock); lauch a vm: qemuDomainCreateXML runs in other thread step 1. virRWLockRead(&updateLock); step 2. qemuProcessStart step 3. qemuProcessWaitForMonitor step 4. ... step 5 virRWLockUnlock(&updateLock); if nwfilterStateReload called in the middle of step 1 and step 5 of qemuDomainCreateXML, it can't get the updateLock and then block the event_loop, so event_loop can't handle the qemu-monitor messages, cause deadlock move nwfilterStateReload into thread to fix this problem. Signed-off-by: Wang Yechao <wang.yechao255(a)zte.com.cn> Reviewed-by: Wang Yi <wang.yi59(a)zte.com.cn> --- src/nwfilter/nwfilter_driver.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 1ee5162..8dcc40b 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -80,18 +80,27 @@ static void nwfilterDriverUnlock(void) } #if HAVE_FIREWALLD +static void nwfilterReloadThread(void *opaque ATTRIBUTE_UNUSED) +{ + nwfilterStateReload(); +} static DBusHandlerResult nwfilterFirewalldDBusFilter(DBusConnection *connection ATTRIBUTE_UNUSED, DBusMessage *message, void *user_data ATTRIBUTE_UNUSED) { + virThread thread; + if (dbus_message_is_signal(message, DBUS_INTERFACE_DBUS, "NameOwnerChanged") || dbus_message_is_signal(message, "org.fedoraproject.FirewallD1", "Reloaded")) { VIR_DEBUG("Reload in nwfilter_driver because of firewalld."); - nwfilterStateReload(); + + if (virThreadCreate(&thread, false, nwfilterReloadThread, NULL) < 0) { + VIR_ERROR("create nwfilterThread failed."); + } } return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; -- 1.8.3.1

1 0