- Devel - libvirt List Archives

[PATCH v2 0/7] more Hyper-V APIs
by Matt Coleman 19 Oct '20

19 Oct '20

This set of patches adds several new APIs and fixes several others. Changes since v1: * 'enabledValue' and 'disabledValue' are now static strings in hypervDomainSetAutostart() * a long virReportError() call has been split into two lines Matt Coleman (7): hyperv: implement domainSetAutostart hyperv: implement nodeGetFreeMemory hyperv: implement domainReboot and domainReset hyperv: implement domainShutdown and domainShutdownFlags hyperv: fix domainSuspend and domainResume on Hyper-V V2 hyperv: fix domainManagedSave on Hyper-V V2 news: more Hyper-V APIs NEWS.rst | 7 +- src/hyperv/hyperv_driver.c | 267 +++++++++++++++++++++++++- src/hyperv/hyperv_wmi_classes.h | 3 + src/hyperv/hyperv_wmi_generator.input | 78 ++++++++ 4 files changed, 347 insertions(+), 8 deletions(-) -- 2.27.0

4 24

[PATCH 0/5] hyperv: Make ownershipt transfer obvious
by Michal Privoznik 19 Oct '20

19 Oct '20

*** BLURB HERE *** Michal Prívozník (5): hyperv: Make it obvious that hypervInvokeMethod() consumes an argument hyperv: Reindent hypervInvokeMethod() body hyperv: Drop needless label in hypervDomainSetMemoryFlags() hyperv: Make it obvious that hypervAddEmbeddedParam() consumes an argument hyperv: Simplify @memResource freeing in hypervDomainSetMemoryFlags() src/hyperv/hyperv_driver.c | 34 ++++------ src/hyperv/hyperv_wmi.c | 129 +++++++++++++++++++++---------------- src/hyperv/hyperv_wmi.h | 12 ++-- 3 files changed, 94 insertions(+), 81 deletions(-) -- 2.26.2

3 7

Re: [PATCH 0/6] qemu: Fix cdrom as SCSI hostdev via -blockdev
by daggs 19 Oct '20

19 Oct '20

Greetings All, > Sent: Thursday, October 15, 2020 at 6:25 PM > From: "Peter Krempa" <pkrempa(a)redhat.com> > To: libvir-list(a)redhat.com > Cc: "daggs" <daggs(a)gmx.com> > Subject: [PATCH 0/6] qemu: Fix cdrom as SCSI hostdev via -blockdev > > -drive detects whether a device is a cdrom automatically but we need to > use 'host_cdrom' when using blockdev explicitly. Fix the hostdev code > which was recently converted to -blockdev. > > Warning: > > I _don't_ have a box with a CDROM handy so this code is not tested in action! > > Peter Krempa (6): > qemuProcessCreatePretendCmd: Split up preparation and command building > qemu: hostdev: Prepare definition bits in qemuDomainPrepareHostdev > qemu: Prepare hostdev data which depends on the host state separately > qemuxml2argvmock: Remove mocking of 'virSCSIDeviceGetSgName' > qemu: Detect whether a SCSI hostdev is a cdrom > qemu: Add test cases for 'host_cdrom' blockdev backend via <disk> I've tested the bellow on libvirt 6.8.0, I wasn't able to get it to work, with the same entry as the example, e.g.: <hostdev mode='subsystem' type='scsi' managed='yes'> <source> <adapter name='cdrom'/> <address bus='0' target='0' unit='0'/> </source> <readonly/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </hostdev> I get this error: error: XML error: SCSI host device doesn't support managed mode. if I mark the managed as no (like other pci pass-through devices I have in the vm), I get this error: error: internal error: Cannot parse adapter 'cdrom' looks like the commit is missing the cdrom validation at https://gitlab.com/libvirt/libvirt/-/blob/master/src/util/virscsi.c#L90 full machine xml can be found at https://dpaste.com/G32WWAJA2 Dagg.

1 0

[libvirt PATCH v2 0/4] Make SEV 'cbitpos' and 'reducedPhysBits' attributes optional
by Erik Skultety 16 Oct '20

16 Oct '20

We designed them as mandatory, but these are platform dependent and can be filled from QEMU capabilities. Resolves: https://gitlab.com/libvirt/libvirt/-/issues/57 Since v1: - moved the capability check from qemuProcessPrepareSEVGuestInput to qemuValidateDomainDef as requested Erik Skultety (4): qemu_process: sev: Drop an unused variable qemu: process: Move SEV capability check to qemuValidateDomainDef qemu: process: sev: Fill missing 'cbitpos' & 'reducedPhysBits' from caps conf: domain: sev: Make 'cbitpos' & 'reducedPhysBits' attrs optional docs/schemas/domaincommon.rng | 16 ++++--- src/conf/domain_conf.c | 46 ++++++++++++------- src/conf/domain_conf.h | 2 + src/qemu/qemu_process.c | 45 +++++++++++++----- src/qemu/qemu_validate.c | 8 ++++ ...v-missing-platform-info.x86_64-2.12.0.args | 37 +++++++++++++++ ...nch-security-sev-missing-platform-info.xml | 35 ++++++++++++++ tests/qemuxml2argvtest.c | 1 + 8 files changed, 157 insertions(+), 33 deletions(-) create mode 100644 tests/qemuxml2argvdata/launch-security-sev-missing-platfo= rm-info.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/launch-security-sev-missing-platfo= rm-info.xml --=20 2.26.2

2 6

[RFC PATCH v2] fix error message in virMigrate3 if connection is broken
by Nikolay Shirokovskiy 15 Oct '20

15 Oct '20

Changes from v1 [1]: - return error value from VIR_DRV_SUPPORTS_FEATURE instead of setting error to out argument (decrease over enginering level on patch generator in other words :) Currently virDomainMigrate3 reports "this function is not supported by the connection driver: virDomainMigrate3" if connection to destination for example is broken. This is a bit misleading. This is a result of we treat errors as unsupported feature in VIR_DRV_SUPPORTS_FEATURE macro. Let's return error from macro as is. I guess all the other occurences of VIR_DRV_SUPPORTS_FEATURE need to be updated as well so that we detect errors early and not have issues similar to virDomainMigrate3. I'm going to fix the other places if this RFC is approved. [1] https://www.redhat.com/archives/libvir-list/2020-September/msg01056.html --- src/driver.h | 14 ++++++++ src/libvirt-domain.c | 91 +++++++++++++++++++++++++++++++++++++--------------- 2 files changed, 79 insertions(+), 26 deletions(-) diff --git a/src/driver.h b/src/driver.h index 6278aa0..c29b2fa 100644 --- a/src/driver.h +++ b/src/driver.h @@ -60,6 +60,20 @@ typedef enum { (drv)->connectSupportsFeature((conn), (feature)) > 0 : 0) +/* + * A little wrapper for connectSupportsFeature API to test that the API + * itself is available first. Return values are same as for API. + * + * Returns: + * -1 on error + * 0 feature is not supported + * 1 feature is supported + */ +#define VIR_DRV_SUPPORTS_FEATURE2(drv, conn, feature) \ + ((drv)->connectSupportsFeature ? \ + (drv)->connectSupportsFeature((conn), (feature)) : 0) + + #define __VIR_DRIVER_H_INCLUDES___ #include "driver-hypervisor.h" diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index cde86c7..03c357f 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -3846,6 +3846,9 @@ virDomainMigrate3(virDomainPtr domain, const char *dname = NULL; const char *dxml = NULL; unsigned long long bandwidth = 0; + int rc_src; + int rc_dst; + int rc; VIR_DOMAIN_DEBUG(domain, "dconn=%p, params=%p, nparms=%u flags=0x%x", dconn, params, nparams, flags); @@ -3878,15 +3881,21 @@ virDomainMigrate3(virDomainPtr domain, } if (flags & VIR_MIGRATE_OFFLINE) { - if (!VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn, - VIR_DRV_FEATURE_MIGRATION_OFFLINE)) { + rc = VIR_DRV_SUPPORTS_FEATURE2(domain->conn->driver, domain->conn, + VIR_DRV_FEATURE_MIGRATION_OFFLINE); + if (rc < 0) { + goto error; + } else if (rc == 0) { virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", _("offline migration is not supported by " "the source host")); goto error; } - if (!VIR_DRV_SUPPORTS_FEATURE(dconn->driver, dconn, - VIR_DRV_FEATURE_MIGRATION_OFFLINE)) { + rc = VIR_DRV_SUPPORTS_FEATURE2(dconn->driver, dconn, + VIR_DRV_FEATURE_MIGRATION_OFFLINE); + if (rc < 0) { + goto error; + } else if (rc == 0) { virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", _("offline migration is not supported by " "the destination host")); @@ -3899,21 +3908,30 @@ virDomainMigrate3(virDomainPtr domain, * the flag for just the source side. We mask it out to allow * migration from newer source to an older destination that * rejects the flag. */ - if (flags & VIR_MIGRATE_CHANGE_PROTECTION && - !VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn, - VIR_DRV_FEATURE_MIGRATE_CHANGE_PROTECTION)) { - virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", - _("cannot enforce change protection")); - goto error; + if (flags & VIR_MIGRATE_CHANGE_PROTECTION) { + rc = VIR_DRV_SUPPORTS_FEATURE2(domain->conn->driver, domain->conn, + VIR_DRV_FEATURE_MIGRATE_CHANGE_PROTECTION); + if (rc < 0) { + goto error; + } else if (rc == 0) { + virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", + _("cannot enforce change protection")); + goto error; + } } flags &= ~VIR_MIGRATE_CHANGE_PROTECTION; /* Prefer extensible API but fall back to older migration APIs if params * only contains parameters which were supported by the older API. */ - if (VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn, - VIR_DRV_FEATURE_MIGRATION_PARAMS) && - VIR_DRV_SUPPORTS_FEATURE(dconn->driver, dconn, - VIR_DRV_FEATURE_MIGRATION_PARAMS)) { + rc_src = VIR_DRV_SUPPORTS_FEATURE2(domain->conn->driver, domain->conn, + VIR_DRV_FEATURE_MIGRATION_PARAMS); + if (rc_src < 0) + goto error; + rc_dst = VIR_DRV_SUPPORTS_FEATURE2(dconn->driver, dconn, + VIR_DRV_FEATURE_MIGRATION_PARAMS); + if (rc_dst < 0) + goto error; + if (rc_src && rc_dst) { VIR_DEBUG("Using migration protocol 3 with extensible parameters"); ddomain = virDomainMigrateVersion3Params(domain, dconn, params, nparams, flags); @@ -3939,17 +3957,30 @@ virDomainMigrate3(virDomainPtr domain, goto error; } - if (VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn, - VIR_DRV_FEATURE_MIGRATION_V3) && - VIR_DRV_SUPPORTS_FEATURE(dconn->driver, dconn, - VIR_DRV_FEATURE_MIGRATION_V3)) { + rc_src = VIR_DRV_SUPPORTS_FEATURE2(domain->conn->driver, domain->conn, + VIR_DRV_FEATURE_MIGRATION_V3); + if (rc_src < 0) + goto error; + rc_dst = VIR_DRV_SUPPORTS_FEATURE2(dconn->driver, dconn, + VIR_DRV_FEATURE_MIGRATION_V3); + if (rc_dst < 0) + goto error; + if (rc_src && rc_dst) { VIR_DEBUG("Using migration protocol 3"); ddomain = virDomainMigrateVersion3(domain, dconn, dxml, flags, dname, uri, bandwidth); - } else if (VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn, - VIR_DRV_FEATURE_MIGRATION_V2) && - VIR_DRV_SUPPORTS_FEATURE(dconn->driver, dconn, - VIR_DRV_FEATURE_MIGRATION_V2)) { + goto done; + } + + rc_src = VIR_DRV_SUPPORTS_FEATURE2(domain->conn->driver, domain->conn, + VIR_DRV_FEATURE_MIGRATION_V2); + if (rc_src < 0) + goto error; + rc_dst = VIR_DRV_SUPPORTS_FEATURE2(dconn->driver, dconn, + VIR_DRV_FEATURE_MIGRATION_V2); + if (rc_dst < 0) + goto error; + if (rc_src && rc_dst) { VIR_DEBUG("Using migration protocol 2"); if (dxml) { virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", @@ -3959,10 +3990,18 @@ virDomainMigrate3(virDomainPtr domain, } ddomain = virDomainMigrateVersion2(domain, dconn, flags, dname, uri, bandwidth); - } else if (VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn, - VIR_DRV_FEATURE_MIGRATION_V1) && - VIR_DRV_SUPPORTS_FEATURE(dconn->driver, dconn, - VIR_DRV_FEATURE_MIGRATION_V1)) { + goto done; + } + + rc_src = VIR_DRV_SUPPORTS_FEATURE2(domain->conn->driver, domain->conn, + VIR_DRV_FEATURE_MIGRATION_V1); + if (rc_src < 0) + goto error; + rc_dst = VIR_DRV_SUPPORTS_FEATURE2(dconn->driver, dconn, + VIR_DRV_FEATURE_MIGRATION_V1); + if (rc_dst < 0) + goto error; + if (rc_src && rc_dst) { VIR_DEBUG("Using migration protocol 1"); if (dxml) { virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", -- 1.8.3.1

1 1

[libvirt PATCH 0/3] Add script to sync from QEMU i386 cpu models
by Tim Wiederhake 15 Oct '20

15 Oct '20

This hopefully makes synchronization with QEMU faster and less error prone. Patch #3 showcases the changes to the cpu models the script suggests for qemu 8d90bfc5c31ad60f6049dd39be636b06bc00b652. Tim Wiederhake (3): cpu_map: Unify apostrophe and quotation mark usage cpu_map: Add script to sync from QEMU i386 cpu models [DONTMERGE] Sample output of new sync script src/cpu_map/arm_Falkor.xml | 6 +- src/cpu_map/arm_Kunpeng-920.xml | 6 +- src/cpu_map/arm_ThunderX299xx.xml | 6 +- src/cpu_map/arm_cortex-a53.xml | 6 +- src/cpu_map/arm_cortex-a57.xml | 6 +- src/cpu_map/arm_cortex-a72.xml | 6 +- src/cpu_map/arm_features.xml | 34 +- src/cpu_map/index.xml | 12 +- src/cpu_map/ppc64_POWER6.xml | 6 +- src/cpu_map/ppc64_POWER7.xml | 8 +- src/cpu_map/ppc64_POWER8.xml | 10 +- src/cpu_map/ppc64_POWER9.xml | 6 +- src/cpu_map/ppc64_POWERPC_e5500.xml | 6 +- src/cpu_map/ppc64_POWERPC_e6500.xml | 6 +- src/cpu_map/ppc64_vendors.xml | 4 +- src/cpu_map/sync_qemu_i386.py | 361 +++++++++ src/cpu_map/x86_486.xml | 18 +- src/cpu_map/x86_Broadwell-IBRS.xml | 135 ++-- src/cpu_map/x86_Broadwell-noTSX-IBRS.xml | 131 ++-- src/cpu_map/x86_Broadwell-noTSX.xml | 129 ++-- src/cpu_map/x86_Broadwell.xml | 132 ++-- src/cpu_map/x86_Cascadelake-Server-noTSX.xml | 166 ++-- src/cpu_map/x86_Cascadelake-Server.xml | 169 ++-- src/cpu_map/x86_Conroe.xml | 70 +- src/cpu_map/x86_Cooperlake.xml | 14 +- src/cpu_map/x86_Denverton.xml | 74 ++ src/cpu_map/x86_Dhyana.xml | 144 ++-- src/cpu_map/x86_EPYC-IBPB.xml | 157 ++-- src/cpu_map/x86_EPYC-Rome.xml | 169 ++-- src/cpu_map/x86_EPYC.xml | 150 ++-- src/cpu_map/x86_Haswell-IBRS.xml | 128 ++-- src/cpu_map/x86_Haswell-noTSX-IBRS.xml | 124 +-- src/cpu_map/x86_Haswell-noTSX.xml | 122 +-- src/cpu_map/x86_Haswell.xml | 124 +-- src/cpu_map/x86_Icelake-Client-noTSX.xml | 164 ++-- src/cpu_map/x86_Icelake-Client.xml | 167 ++-- src/cpu_map/x86_Icelake-Server-noTSX.xml | 197 ++--- src/cpu_map/x86_Icelake-Server.xml | 185 ++--- src/cpu_map/x86_IvyBridge-IBRS.xml | 109 +-- src/cpu_map/x86_IvyBridge.xml | 106 +-- src/cpu_map/x86_KnightsMill.xml | 77 ++ src/cpu_map/x86_Nehalem-IBRS.xml | 84 +- src/cpu_map/x86_Nehalem.xml | 81 +- src/cpu_map/x86_Opteron_G1.xml | 65 +- src/cpu_map/x86_Opteron_G2.xml | 72 +- src/cpu_map/x86_Opteron_G3.xml | 82 +- src/cpu_map/x86_Opteron_G4.xml | 105 +-- src/cpu_map/x86_Opteron_G5.xml | 111 +-- src/cpu_map/x86_Penryn.xml | 74 +- src/cpu_map/x86_SandyBridge-IBRS.xml | 98 +-- src/cpu_map/x86_SandyBridge.xml | 95 +-- src/cpu_map/x86_Skylake-Client-IBRS.xml | 148 ++-- src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml | 144 ++-- src/cpu_map/x86_Skylake-Client.xml | 145 ++-- src/cpu_map/x86_Skylake-Server-IBRS.xml | 158 ++-- src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml | 155 ++-- src/cpu_map/x86_Skylake-Server.xml | 156 ++-- src/cpu_map/x86_Snowridge.xml | 79 ++ src/cpu_map/x86_Westmere-IBRS.xml | 85 +- src/cpu_map/x86_Westmere.xml | 84 +- src/cpu_map/x86_athlon.xml | 60 +- src/cpu_map/x86_core2duo.xml | 72 +- src/cpu_map/x86_coreduo.xml | 62 +- src/cpu_map/x86_cpu64-rhel5.xml | 54 +- src/cpu_map/x86_cpu64-rhel6.xml | 58 +- src/cpu_map/x86_features.xml | 724 +++++++++--------- src/cpu_map/x86_kvm32.xml | 57 +- src/cpu_map/x86_kvm64.xml | 65 +- src/cpu_map/x86_n270.xml | 66 +- src/cpu_map/x86_pentium.xml | 31 +- src/cpu_map/x86_pentium2.xml | 49 +- src/cpu_map/x86_pentium3.xml | 51 +- src/cpu_map/x86_pentiumpro.xml | 38 +- src/cpu_map/x86_phenom.xml | 83 +- src/cpu_map/x86_qemu32.xml | 48 +- src/cpu_map/x86_qemu64.xml | 75 +- src/cpu_map/x86_vendors.xml | 6 +- 77 files changed, 4160 insertions(+), 3110 deletions(-) create mode 100755 src/cpu_map/sync_qemu_i386.py create mode 100644 src/cpu_map/x86_Denverton.xml create mode 100644 src/cpu_map/x86_KnightsMill.xml create mode 100644 src/cpu_map/x86_Snowridge.xml -- 2.26.2

2 4

[PATCH v2] docs: Document camelCase preference for XML elements and attributes
by Michal Privoznik 15 Oct '20

15 Oct '20

Recently I've merged a patch that used hyphens in an attribute name. I fixed it later, but turned out we don't document our preference which is camelCase. Suggested-by: Erik Skultety <eskultet(a)redhat.com> Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- diff to v1: - Extended coding style too. docs/api_extension.html.in | 6 ++++++ docs/coding-style.rst | 15 +++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/docs/api_extension.html.in b/docs/api_extension.html.in index 6c64e83314..d7696056ac 100644 --- a/docs/api_extension.html.in +++ b/docs/api_extension.html.in @@ -110,6 +110,12 @@ src/libvirt_public.syms </code> + + Please note that single word names for attributes and elements is + preferred. But if you have to use two ore more words please join them in + camelCase style. + + This task is in many ways the most important to get right, since once the API has been committed to the repository, it's libvirt's policy diff --git a/docs/coding-style.rst b/docs/coding-style.rst index 44e5265a60..cfd7b16638 100644 --- a/docs/coding-style.rst +++ b/docs/coding-style.rst @@ -960,3 +960,18 @@ git): cleanup: /* ... do other stuff ... */ } + + +XML element and attribute naming +-------------------------------- + +New elements and/or attributes should be short and descriptive. +In general, they should reflect what the feature does instead of +how exactly it is named in given hypervisor because this creates +an abstraction that other drivers can benefit from (for instance +if the same feature is named differently in two hypervisors). +That is not to say an element or attribute can't have the same +name as in a hypervisor, but proceed with caution. + +Single worded names are preferred, but if more words must be +used then they shall be joined in camelCase style. -- 2.26.2

2 1

[PATCH v1 00/24] move more validations to qemu_validate.c
by Daniel Henrique Barboza 15 Oct '20

15 Oct '20

Hi, This is another step following up the work done in [1]. Recapping, the idea is to move any validation that can be done in parse/define time to qemu_validate.c instead of let it sit inside a command line build function in qemu_command.c. I'll again copy/paste the reasoning Cole Robinson gave for this work back then (see [2] for more info): ------- The benefits of moving to validate time is that XML is rejected by 'virsh define' rather than at 'virsh start' time. It also makes it easier to follow the cli building code, and makes it easier to verify qemu_command.c test suite code coverage for the important stuff like covering every CLI option. It's also a good intermediate step for sharing validation with domain capabilities building, like is done presently for rng models. ------- Not all validations were moved with these series, but I covered most of them. One thing worth noticing is the existence of 'post start' validations, most of them related to PCI addressing, and other notable cases such as NUMA nodes and CPU models, that can't be moved to parse time. The reason is that the QEMU driver will change them during start time. I contemplated move them to the existing qemuBuildCommandLineValidate(), but that would remove them from the hotplug path that uses the qemuBuild*DevStr() functions. I don't have an easy answer on how to handle these 'post start' validations ATM, so for now they remain in qemu_command.c. [1] https://www.redhat.com/archives/libvir-list/2019-December/msg00570.html [2] https://www.redhat.com/archives/libvir-list/2019-October/msg00568.html src/qemu/qemu_command.c | 379 +-------- src/qemu/qemu_command.h | 4 +- src/qemu/qemu_hotplug.c | 4 +- src/qemu/qemu_validate.c | 740 ++++++++++++++---- tests/qemuhotplugtest.c | 1 + .../disk-sata-incompatible-address.err | 2 +- .../net-virtio-rxqueuesize-invalid-size.err | 2 +- .../pseries-panic-address.err | 2 +- tests/qemuxml2argvtest.c | 28 +- tests/qemuxml2xmltest.c | 62 +- 10 files changed, 706 insertions(+), 518 deletions(-) -- 2.26.2

2 31

[libvirt PATCH] qemu: agent: fix array access
by Ján Tomko 15 Oct '20

15 Oct '20

My code movement changed the type of ifaces_ret from virDomainInterfacePtr * to virDomainInterfacePtr **, but failed to adjust the condition or dereference the array correctly. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> Fixes: 6ddb1f803ea38d8d709b984fa9539e34318a9dc0 --- src/qemu/qemu_agent.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index c9c4b034d3..4c61c5cdc6 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -2209,6 +2209,7 @@ qemuAgentGetAllInterfaceAddresses(virDomainInterfacePtr **ifaces_ret, size_t ifaces_count = 0; size_t i; + *ifaces_ret = NULL; /* Hash table to handle the interface alias */ ifaces_store = virHashNew(NULL); @@ -2223,9 +2224,9 @@ qemuAgentGetAllInterfaceAddresses(virDomainInterfacePtr **ifaces_ret, return ifaces_count; error: - if (ifaces_ret) { + if (*ifaces_ret) { for (i = 0; i < ifaces_count; i++) - virDomainInterfaceFree(*ifaces_ret[i]); + virDomainInterfaceFree((*ifaces_ret)[i]); } VIR_FREE(*ifaces_ret); return -1; -- 2.26.2

2 1

[PATCH v1 1/8] migration/dirtyrate: Introduce virDomainDirtyRateInfo structure
by Hao Wang 15 Oct '20

15 Oct '20

Introduce virDomainDirtyRateInfo structure used for domain's memory dirty rate query. Signed-off-by: Hao Wang <wanghao232(a)huawei.com> Reviewed-by: Chuan Zheng <zhengchuan(a)huawei.com> --- include/libvirt/libvirt-domain.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 8b9d9c1..2d3847b 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -4999,4 +4999,28 @@ int virDomainBackupBegin(virDomainPtr domain, char *virDomainBackupGetXMLDesc(virDomainPtr domain, unsigned int flags); +/** + * virDomainDirtyRateInfo: + * + * a virDomainDirtyRateInfo is a structure filled by virDomainGetDirtyRate() and + * extracting dirty rate infomation for a given active Domain. + */ + +typedef struct _virDomainDirtyRateInfo virDomainDirtyRateInfo; + +struct _virDomainDirtyRateInfo { + int status; /* the status of dirtyrate calculation */ + long long dirtyRate; /* the dirtyrate in MB/s */ + long long startTime; /* the start time of dirtyrate calculation */ + long long calcTime; /* the period of dirtyrate calculation */ +}; + +/** + * virDomainDirtyRateInfoPtr: + * + * a virDomainDirtyRateInfoPtr is a pointer to a virDomainDirtyRateInfo structure. + */ + +typedef virDomainDirtyRateInfo *virDomainDirtyRateInfoPtr; + #endif /* LIBVIRT_DOMAIN_H */ -- 2.23.0

3 9

[PATCH v3 0/2] block: deprecate the sheepdog driver
by Daniel P. Berrangé 15 Oct '20

15 Oct '20

2 years back I proposed dropping the sheepdog mailing list from the MAINTAINERS file, but somehow the patch never got picked up: https://lists.gnu.org/archive/html/qemu-block/2018-03/msg01048.html So here I am with the same patch again. This time I go further and deprecate the sheepdog driver entirely. See the rationale in the second patch commit message. Changes in v3: - A few minor text changes - Don't initialize static variable to false Daniel P. Berrangé (2): block: drop moderated sheepdog mailing list from MAINTAINERS file block: deprecate the sheepdog block driver MAINTAINERS | 1 - block/sheepdog.c | 14 ++++++++++++++ configure | 5 +++-- docs/system/deprecated.rst | 9 +++++++++ 4 files changed, 26 insertions(+), 3 deletions(-) -- 2.26.2

3 4

[PATCH] docs: Document camelCase preference for XML elements and attributes
by Michal Privoznik 15 Oct '20

15 Oct '20

Recently I've merged a patch that used hyphens in an attribute name. I fixed it later, but turned out we don't document our preference which is camelCase. Suggested-by: Erik Skultety <eskultet(a)redhat.com> Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- I'm not sure this is the correct place to put this, suggestions welcome. docs/api_extension.html.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/api_extension.html.in b/docs/api_extension.html.in index 6c64e83314..d7696056ac 100644 --- a/docs/api_extension.html.in +++ b/docs/api_extension.html.in @@ -110,6 +110,12 @@ src/libvirt_public.syms </code> + + Please note that single word names for attributes and elements is + preferred. But if you have to use two ore more words please join them in + camelCase style. + + This task is in many ways the most important to get right, since once the API has been committed to the repository, it's libvirt's policy -- 2.26.2

2 1

[libvirt PATCH] docs: Expand on recommendation in hypervisor-cpu-baseline description
by Tim Wiederhake 15 Oct '20

15 Oct '20

On some architectures, e.g. aarch64 and s390x, the output of `virsh capabilities` is not suitable for use in `virsh hypervisor-cpu-baseline`. Expand the description of the man page to make this explicit. https://bugzilla.redhat.com/show_bug.cgi?id=1850654 Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com> --- docs/manpages/virsh.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst index 8fee4c7afe..d34a1c8684 100644 --- a/docs/manpages/virsh.rst +++ b/docs/manpages/virsh.rst @@ -976,8 +976,9 @@ as printed by ``capabilities`` command. The guest CPU definition may be created from the host CPU model found in domain capabilities XML (printed by ``domcapabilities`` command). In addition to the <cpu> elements, this command accepts full capabilities XMLs, or domain capabilities XMLs containing the CPU -definitions. For best results, use only the CPU definitions from domain -capabilities. +definitions. It is recommended to use only the CPU definitions from domain +capabilities, as on some architectures using the host CPU definition may either +fail or provide unexpected results. When *FILE* contains only a single CPU definition, the command will print the same CPU with restrictions imposed by the capabilities of the hypervisor. -- 2.26.2

3 2

[PATCH 0/3] free-page-reporting cleanups
by Michal Privoznik 15 Oct '20

15 Oct '20

In the end, I decided to not change the attribute name to avoid confusion (QEMU uses the name for the feature), but if you want me to we still can do it. Michal Prívozník (3): tests: Turn virtio-options-memballoon-freepage-reporting.xml into a symlink lib: s/free-page-reporting/free_page_reporting/ docs: Clarify free_page_reporting attribute docs/formatdomain.rst | 8 ++++--- docs/schemas/domaincommon.rng | 2 +- src/conf/domain_conf.c | 8 +++---- src/qemu/qemu_validate.c | 2 +- ...-options-memballoon-freepage-reporting.err | 2 +- ...-options-memballoon-freepage-reporting.xml | 2 +- ...-options-memballoon-freepage-reporting.xml | 23 +------------------ 7 files changed, 14 insertions(+), 33 deletions(-) mode change 100644 => 120000 tests/qemuxml2xmloutdata/virtio-options-memballoon-freepage-reporting.xml -- 2.26.2

3 7

[[RESEND] 0/8] migration/dirtyrate: Introduce APIs for getting domain memory dirty rate
by Hao Wang 15 Oct '20

15 Oct '20

Sometimes domain's memory dirty rate is expected by user in order to decide whether it's proper to be migrated out or not. We have already completed the QEMU part of the capability: https://patchew.org/QEMU/1600237327-33618-1-git-send-email-zhengchuan@huawe… And this serial of patches introduce the corresponding LIBVIRT part -- DomainGetDirtyRateInfo API and corresponding virsh api -- "getdirtyrate". instructions: bash# virsh getdirtyrate --help NAME getdirtyrate - Get a vm's memory dirty rate SYNOPSIS getdirtyrate <domain> [--seconds <number>] [--calculate] [--query] DESCRIPTION Get memory dirty rate of a domain in order to decide whether it's proper to be migrated out or not. OPTIONS [--domain] <string> domain name, id or uuid --seconds <number> calculate memory dirty rate within specified seconds, a valid range of values is [1, 60], and would default to 1s. --calculate calculate dirty rate only, can be used together with --query, either or both is expected, otherwise would default to both. --query query dirty rate only, can be used together with --calculate, either or both is expected, otherwise would default to both. example: bash# virsh getdirtyrate --calculate --query --domain vm0 --seconds 1 status: measured startTime: 820148 calcTime: 1 s dirtyRate: 6 MB/s Hao Wang (8): migration/dirtyrate: Introduce virDomainDirtyRateInfo structure migration/dirtyrate: Implement qemuMonitorJSONExtractDirtyRateInfo migration/dirtyrate: Introduce dirty_rate async job migration/dirtyrate: Implement qemuDomainQueryDirtyRate migration/dirtyrate: Implement qemuDomainCalculateDirtyRate migration/dirtyrate: Introduce virDomainDirtyRateFlags migration/dirtyrate: Introduce DomainGetDirtyRateInfo API migration/dirtyrate: Introduce getdirtyrate virsh api include/libvirt/libvirt-domain.h | 65 ++++++++++++++++++ src/driver-hypervisor.h | 7 ++ src/libvirt-domain.c | 46 +++++++++++++ src/libvirt_public.syms | 5 ++ src/qemu/qemu_domainjob.c | 3 + src/qemu/qemu_domainjob.h | 1 + src/qemu/qemu_driver.c | 76 +++++++++++++++++++++ src/qemu/qemu_migration.c | 63 +++++++++++++++++ src/qemu/qemu_migration.h | 10 +++ src/qemu/qemu_monitor.c | 24 +++++++ src/qemu/qemu_monitor.h | 8 +++ src/qemu/qemu_monitor_json.c | 97 ++++++++++++++++++++++++++ src/qemu/qemu_monitor_json.h | 8 +++ src/qemu/qemu_process.c | 3 + src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 21 +++++- tools/virsh-domain.c | 113 +++++++++++++++++++++++++++++++ 17 files changed, 550 insertions(+), 1 deletion(-) -- 2.23.0

1 8

Why guest physical addresses are not the same as the corresponding host virtual addresses in QEMU/KVM? Thanks!
by harry harry 15 Oct '20

15 Oct '20

Hi QEMU/KVM developers, I am sorry if my email disturbs you. I did an experiment and found the guest physical addresses (GPAs) are not the same as the corresponding host virtual addresses (HVAs). I am curious about why; I think they should be the same. I am very appreciated if you can give some comments and suggestions about 1) why GPAs and HVAs are not the same in the following experiment; 2) are there any better experiments to look into the reasons? Any other comments/suggestions are also very welcome. Thanks! The experiment is like this: in a single vCPU VM, I ran a program allocating and referencing lots of pages (e.g., 100*1024) and didn't let the program terminate. Then, I checked the program's guest virtual addresses (GVAs) and GPAs through parsing its pagemap and maps files located at /proc/pid/pagemap and /proc/pid/maps, respectively. At last, in the host OS, I checked the vCPU's pagemap and maps files to find the program's HVAs and host physical addresses (HPAs); I actually checked the new allocated physical pages in the host OS after the program was executed in the guest OS. With the above experiment, I found GPAs of the program are different from its corresponding HVAs. BTW, Intel EPT and other related Intel virtualization techniques were enabled. Thanks, Harry

4 17

[PATCH 0/2] hyperv: bump minimum openwsman version to 2.6.3
by Matt Coleman 15 Oct '20

15 Oct '20

As Daniel mentioned in the thread for my commit "hyperv: make Msvm_ComputerSystem WQL queries locale agnostic", we can increase the minimum openwsman version since all the supported distributions have at least version 2.6.3. Comments about older versions have been removed throughout the codebase. Also, openwsman.h has been removed entirely, since its original purpose was to work around bugs in earlier (now unsupported) openwsman versions. Matt Coleman (2): hyperv: bump minimum openwsman version to 2.6.3 hyperv: remove openwsman.h libvirt.spec.in | 2 +- meson.build | 2 +- src/hyperv/hyperv_driver.c | 5 +--- src/hyperv/hyperv_private.h | 3 ++- src/hyperv/hyperv_wmi.c | 12 +++------ src/hyperv/hyperv_wmi.h | 1 - src/hyperv/hyperv_wmi_classes.h | 3 ++- src/hyperv/openwsman.h | 47 --------------------------------- 8 files changed, 10 insertions(+), 65 deletions(-) delete mode 100644 src/hyperv/openwsman.h -- 2.27.0

3 5

[libvirt PATCH 0/3] Make SEV 'cbitpos' and 'reducedPhysBits' attributes optional
by Erik Skultety 14 Oct '20

14 Oct '20

We designed them as mandatory, but these are platform dependent and can be filled from QEMU capabilities. Resolves: https://gitlab.com/libvirt/libvirt/-/issues/57 Erik Skultety (3): qemu_process: sev: Drop an unused variable qemu: process: sev: Fill missing 'cbitpos' & 'reducedPhysBits' from caps conf: domain: sev: Make 'cbitpos' & 'reducedPhysBits' attrs optional docs/schemas/domaincommon.rng | 16 ++++--- src/conf/domain_conf.c | 46 ++++++++++++------- src/conf/domain_conf.h | 2 + src/qemu/qemu_process.c | 43 ++++++++++++++++- ...v-missing-platform-info.x86_64-2.12.0.args | 37 +++++++++++++++ ...nch-security-sev-missing-platform-info.xml | 35 ++++++++++++++ tests/qemuxml2argvtest.c | 1 + 7 files changed, 156 insertions(+), 24 deletions(-) create mode 100644 tests/qemuxml2argvdata/launch-security-sev-missing-platfo= rm-info.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/launch-security-sev-missing-platfo= rm-info.xml --=20 2.26.2

2 7

[PATCH v2 0/4] qemu: Add support for free-page-reporting
by Nico Pache 14 Oct '20

14 Oct '20

gitlab issue: https://gitlab.com/libvirt/libvirt/-/issues/79 The virtio-balloon device now has the ability to report free pages back to the hypervisor for reuse by other programs. This kernel feature allows for more stable and resource friendly systems. This feature is available in QEMU and is enabled with free-page-reporting=on default virt setting should be off but the user should be able to enable it. Nico Pache (4): Document and parser support for the Virtio free page reporting feature. QEMU: declare qemu capabilities for the Virtio Free page reporting feature QEMU: introduce Virtio free page reporting feature provide testing for free-page-reporting feature in QEMU docs/formatdomain.rst | 6 ++++ docs/schemas/domaincommon.rng | 5 +++ src/conf/domain_conf.c | 21 +++++++++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 5 +++ src/qemu/qemu_validate.c | 7 ++++ .../caps_5.1.0.x86_64.xml | 1 + .../caps_5.2.0.x86_64.xml | 1 + ...-options-memballoon-freepage-reporting.err | 1 + ...loon-freepage-reporting.x86_64-latest.args | 36 +++++++++++++++++++ ...-options-memballoon-freepage-reporting.xml | 22 ++++++++++++ tests/qemuxml2argvtest.c | 2 ++ ...-options-memballoon-freepage-reporting.xml | 22 ++++++++++++ 15 files changed, 133 insertions(+) create mode 100644 tests/qemuxml2argvdata/virtio-options-memballoon-freepage-reporting.err create mode 100644 tests/qemuxml2argvdata/virtio-options-memballoon-freepage-reporting.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/virtio-options-memballoon-freepage-reporting.xml create mode 100644 tests/qemuxml2xmloutdata/virtio-options-memballoon-freepage-reporting.xml -- 2.18.4

7 23

[PATCH] bhyve: implement virtio-9p support
by Roman Bogorodskiy 14 Oct '20

14 Oct '20

Recently virtio-9p support was added to bhyve. On the host side it looks this way: bhyve .... -s 25:0,virtio-9p,sharename=/path/to/shared/dir It could also have ",ro" suffix to make share read-only. In the Linux guest, this share is mounted with: mount -t 9p sharename /mnt/sharename In the guest user will see the same permissions and ownership information for this directory as on the host. No uid/gid remapping is supported, so those could resolve to wrong user or group names. The same applies to the other side: chowning/chmodding in the guest will set specified ownership and permissions on the host. In libvirt domain XML it's modeled using the 'filesystem' element: <filesystem type='mount'> <source dir='/path/to/shared/dir'/> <target dir='sharename'/> </filesystem> Optional 'readonly' sub-element enables read-only mode. Signed-off-by: Roman Bogorodskiy <bogorodskiy(a)gmail.com> --- src/bhyve/bhyve_capabilities.c | 14 ++++ src/bhyve/bhyve_capabilities.h | 1 + src/bhyve/bhyve_command.c | 72 +++++++++++++++++++ src/bhyve/bhyve_device.c | 10 +++ src/libvirt_private.syms | 1 + .../bhyvexml2argv-fs-9p-readonly.args | 10 +++ .../bhyvexml2argv-fs-9p-readonly.ldargs | 3 + .../bhyvexml2argv-fs-9p-readonly.xml | 28 ++++++++ ...exml2argv-fs-9p-unsupported-accessmode.xml | 27 +++++++ ...bhyvexml2argv-fs-9p-unsupported-driver.xml | 28 ++++++++ .../bhyvexml2argv-fs-9p.args | 10 +++ .../bhyvexml2argv-fs-9p.ldargs | 3 + .../bhyvexml2argvdata/bhyvexml2argv-fs-9p.xml | 27 +++++++ tests/bhyvexml2argvtest.c | 9 ++- .../bhyvexml2xmlout-fs-9p.xml | 38 ++++++++++ tests/bhyvexml2xmltest.c | 1 + 16 files changed, 281 insertions(+), 1 deletion(-) create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-unsupported-accessmode.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-unsupported-driver.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-fs-9p.xml diff --git a/src/bhyve/bhyve_capabilities.c b/src/bhyve/bhyve_capabilities.c index 96cfe8357a..8a9acf52b0 100644 --- a/src/bhyve/bhyve_capabilities.c +++ b/src/bhyve/bhyve_capabilities.c @@ -344,6 +344,17 @@ bhyveProbeCapsVNCPassword(unsigned int *caps, char *binary) } +static int +bhyveProbeCapsVirtio9p(unsigned int *caps, char *binary) +{ + return bhyveProbeCapsDeviceHelper(caps, binary, + "-s", + "0,virtio-9p", + "pci slot 0:0: unknown device \"hda\"", + BHYVE_CAP_VIRTIO_9P); +} + + int virBhyveProbeCaps(unsigned int *caps) { @@ -378,6 +389,9 @@ virBhyveProbeCaps(unsigned int *caps) if ((ret = bhyveProbeCapsVNCPassword(caps, binary))) goto out; + if ((ret = bhyveProbeCapsVirtio9p(caps, binary))) + goto out; + out: VIR_FREE(binary); return ret; diff --git a/src/bhyve/bhyve_capabilities.h b/src/bhyve/bhyve_capabilities.h index b2a16b0189..1b25c000b5 100644 --- a/src/bhyve/bhyve_capabilities.h +++ b/src/bhyve/bhyve_capabilities.h @@ -51,6 +51,7 @@ typedef enum { BHYVE_CAP_CPUTOPOLOGY = 1 << 6, BHYVE_CAP_SOUND_HDA = 1 << 7, BHYVE_CAP_VNC_PASSWORD = 1 << 8, + BHYVE_CAP_VIRTIO_9P = 1 << 9, } virBhyveCapsFlags; int virBhyveProbeGrubCaps(virBhyveGrubCapsFlags *caps); diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index 7526f10fb1..7606840f45 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -547,6 +547,73 @@ bhyveBuildSoundArgStr(const virDomainDef *def G_GNUC_UNUSED, return 0; } +static int +bhyveBuildFSArgStr(const virDomainDef *def G_GNUC_UNUSED, + virDomainFSDefPtr fs, + virCommandPtr cmd) +{ + g_auto(virBuffer) params = VIR_BUFFER_INITIALIZER; + + switch ((virDomainFSType) fs->type) { + case VIR_DOMAIN_FS_TYPE_MOUNT: + break; + case VIR_DOMAIN_FS_TYPE_BLOCK: + case VIR_DOMAIN_FS_TYPE_FILE: + case VIR_DOMAIN_FS_TYPE_TEMPLATE: + case VIR_DOMAIN_FS_TYPE_RAM: + case VIR_DOMAIN_FS_TYPE_BIND: + case VIR_DOMAIN_FS_TYPE_VOLUME: + case VIR_DOMAIN_FS_TYPE_LAST: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unsupported filesystem type '%s'"), + virDomainFSTypeToString(fs->type)); + return -1; + } + + switch (fs->fsdriver) { + case VIR_DOMAIN_FS_DRIVER_TYPE_DEFAULT: + /* The only supported driver by bhyve currently */ + break; + case VIR_DOMAIN_FS_DRIVER_TYPE_VIRTIOFS: + case VIR_DOMAIN_FS_DRIVER_TYPE_PATH: + case VIR_DOMAIN_FS_DRIVER_TYPE_HANDLE: + case VIR_DOMAIN_FS_DRIVER_TYPE_LOOP: + case VIR_DOMAIN_FS_DRIVER_TYPE_NBD: + case VIR_DOMAIN_FS_DRIVER_TYPE_PLOOP: + case VIR_DOMAIN_FS_DRIVER_TYPE_LAST: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unsupported filesystem driver '%s'"), + virDomainFSDriverTypeToString(fs->fsdriver)); + return -1; + } + + switch (fs->accessmode) { + case VIR_DOMAIN_FS_ACCESSMODE_PASSTHROUGH: + /* This is the only supported mode for now, does not need specific configuration */ + break; + case VIR_DOMAIN_FS_ACCESSMODE_MAPPED: + case VIR_DOMAIN_FS_ACCESSMODE_SQUASH: + case VIR_DOMAIN_FS_ACCESSMODE_LAST: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unsupported filesystem accessmode '%s'"), + virDomainFSAccessModeTypeToString(fs->accessmode)); + return -1; + } + + if (fs->readonly) + virBufferAddLit(&params, ",ro"); + + virCommandAddArg(cmd, "-s"); + virCommandAddArgFormat(cmd, "%d:%d,virtio-9p,%s=%s%s", + fs->info.addr.pci.slot, + fs->info.addr.pci.function, + fs->src->path, + fs->dst, + virBufferCurrentContent(&params)); + + return 0; +} + virCommandPtr virBhyveProcessBuildBhyveCmd(bhyveConnPtr driver, virDomainDefPtr def, bool dryRun) @@ -699,6 +766,11 @@ virBhyveProcessBuildBhyveCmd(bhyveConnPtr driver, virDomainDefPtr def, goto error; } + for (i = 0; i < def->nfss; i++) { + if (bhyveBuildFSArgStr(def, def->fss[i], cmd) < 0) + goto error; + } + if (bhyveBuildConsoleArgStr(def, cmd) < 0) goto error; diff --git a/src/bhyve/bhyve_device.c b/src/bhyve/bhyve_device.c index e2e1efd97e..f8c7522d26 100644 --- a/src/bhyve/bhyve_device.c +++ b/src/bhyve/bhyve_device.c @@ -175,6 +175,16 @@ bhyveAssignDevicePCISlots(virDomainDefPtr def, return -1; } + for (i = 0; i < def->nfss; i++) { + if (!virDeviceInfoPCIAddressIsWanted(&def->fss[i]->info)) + continue; + if (virDomainPCIAddressReserveNextAddr(addrs, + &def->fss[i]->info, + VIR_PCI_CONNECT_TYPE_PCI_DEVICE, + -1) < 0) + return -1; + } + return 0; } diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 7cf8bea962..ae82172b90 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -402,6 +402,7 @@ virDomainDiskSourceFormat; virDomainDiskTranslateSourcePool; virDomainFeatureTypeFromString; virDomainFeatureTypeToString; +virDomainFSAccessModeTypeToString; virDomainFSCacheModeTypeToString; virDomainFSDefFree; virDomainFSDefNew; diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.args b/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.args new file mode 100644 index 0000000000..193895574d --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.args @@ -0,0 +1,10 @@ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ +-s 2:0,ahci,hd:/tmp/freebsd.img \ +-s 3:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 \ +-s 4:0,virtio-9p,/shared/dir=shared_dir,ro bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.ldargs new file mode 100644 index 0000000000..32538b558e --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.ldargs @@ -0,0 +1,3 @@ +/usr/sbin/bhyveload \ +-m 214 \ +-d /tmp/freebsd.img bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.xml new file mode 100644 index 0000000000..6341236654 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.xml @@ -0,0 +1,28 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory>219136</memory> + <vcpu>1</vcpu> + <os> + <type>hvm</type> + </os> + <devices> + <disk type='file'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <address type='drive' controller='0' bus='0' target='2' unit='0'/> + </disk> + <interface type='bridge'> + <mac address='52:54:00:b9:94:02'/> + <model type='virtio'/> + <source bridge="virbr0"/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + <filesystem> + <source dir='/shared/dir'/> + <target dir='shared_dir'/> + <readonly/> + </filesystem> + </devices> +</domain> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-unsupported-accessmode.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-unsupported-accessmode.xml new file mode 100644 index 0000000000..f7d8ce5712 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-unsupported-accessmode.xml @@ -0,0 +1,27 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory>219136</memory> + <vcpu>1</vcpu> + <os> + <type>hvm</type> + </os> + <devices> + <disk type='file'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <address type='drive' controller='0' bus='0' target='2' unit='0'/> + </disk> + <interface type='bridge'> + <mac address='52:54:00:b9:94:02'/> + <model type='virtio'/> + <source bridge="virbr0"/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + <filesystem accessmode='mapped'> + <source dir='/shared/dir'/> + <target dir='shared_dir'/> + </filesystem> + </devices> +</domain> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-unsupported-driver.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-unsupported-driver.xml new file mode 100644 index 0000000000..3072e6a687 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-unsupported-driver.xml @@ -0,0 +1,28 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory>219136</memory> + <vcpu>1</vcpu> + <os> + <type>hvm</type> + </os> + <devices> + <disk type='file'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <address type='drive' controller='0' bus='0' target='2' unit='0'/> + </disk> + <interface type='bridge'> + <mac address='52:54:00:b9:94:02'/> + <model type='virtio'/> + <source bridge="virbr0"/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + <filesystem> + <driver type='loop'/> + <source dir='/shared/dir'/> + <target dir='shared_dir'/> + </filesystem> + </devices> +</domain> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.args b/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.args new file mode 100644 index 0000000000..0d27954432 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.args @@ -0,0 +1,10 @@ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ +-s 2:0,ahci,hd:/tmp/freebsd.img \ +-s 3:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 \ +-s 4:0,virtio-9p,/shared/dir=shared_dir bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.ldargs new file mode 100644 index 0000000000..32538b558e --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.ldargs @@ -0,0 +1,3 @@ +/usr/sbin/bhyveload \ +-m 214 \ +-d /tmp/freebsd.img bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.xml new file mode 100644 index 0000000000..22b8edc69f --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.xml @@ -0,0 +1,27 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory>219136</memory> + <vcpu>1</vcpu> + <os> + <type>hvm</type> + </os> + <devices> + <disk type='file'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <address type='drive' controller='0' bus='0' target='2' unit='0'/> + </disk> + <interface type='bridge'> + <mac address='52:54:00:b9:94:02'/> + <model type='virtio'/> + <source bridge="virbr0"/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + <filesystem> + <source dir='/shared/dir'/> + <target dir='shared_dir'/> + </filesystem> + </devices> +</domain> diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index def2acc15c..be816e554f 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -167,7 +167,7 @@ mymain(void) BHYVE_CAP_NET_E1000 | BHYVE_CAP_LPC_BOOTROM | \ BHYVE_CAP_FBUF | BHYVE_CAP_XHCI | \ BHYVE_CAP_CPUTOPOLOGY | BHYVE_CAP_SOUND_HDA | \ - BHYVE_CAP_VNC_PASSWORD; + BHYVE_CAP_VNC_PASSWORD | BHYVE_CAP_VIRTIO_9P; DO_TEST("base"); DO_TEST("wired"); @@ -208,6 +208,13 @@ mymain(void) DO_TEST("sound"); DO_TEST("isa-controller"); DO_TEST_FAILURE("isa-multiple-controllers"); + DO_TEST("fs-9p"); + DO_TEST("fs-9p-readonly"); + DO_TEST_FAILURE("fs-9p-unsupported-type"); + DO_TEST_FAILURE("fs-9p-unsupported-driver"); + DO_TEST_FAILURE("fs-9p-unsupported-accessmode"); + driver.bhyvecaps &= ~BHYVE_CAP_VIRTIO_9P; + DO_TEST_FAILURE("fs-9p"); /* Address allocation tests */ DO_TEST("addr-single-sata-disk"); diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-fs-9p.xml b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-fs-9p.xml new file mode 100644 index 0000000000..db3faf29ef --- /dev/null +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-fs-9p.xml @@ -0,0 +1,38 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <disk type='file' device='disk'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <address type='drive' controller='0' bus='0' target='2' unit='0'/> + </disk> + <controller type='pci' index='0' model='pci-root'/> + <controller type='sata' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </controller> + <filesystem type='mount' accessmode='passthrough'> + <source dir='/shared/dir'/> + <target dir='shared_dir'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </filesystem> + <interface type='bridge'> + <mac address='52:54:00:b9:94:02'/> + <source bridge='virbr0'/> + <model type='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + </devices> +</domain> diff --git a/tests/bhyvexml2xmltest.c b/tests/bhyvexml2xmltest.c index 8808d5a8fa..eb9b108704 100644 --- a/tests/bhyvexml2xmltest.c +++ b/tests/bhyvexml2xmltest.c @@ -112,6 +112,7 @@ mymain(void) DO_TEST_DIFFERENT("msrs"); DO_TEST_DIFFERENT("sound"); DO_TEST_DIFFERENT("isa-controller"); + DO_TEST_DIFFERENT("fs-9p"); /* Address allocation tests */ DO_TEST_DIFFERENT("addr-single-sata-disk"); -- 2.28.0

3 5

[PATCH v2 0/9] docs: Fix migration.html generation and report such errors next time
by Peter Krempa 14 Oct '20

14 Oct '20

This version refactors the XSLT transformation command a bit more carefully and thoroughly. A semantic difference in v2 is that the output HTMLs are no longer reformatted. Don't apply/revert first patch to see the build failure: [59/144] Generating migration.html with a meson_exe.py custom command FAILED: docs/migration.html /usr/bin/meson --internal exe --capture docs/migration.html -- /bin/xsltproc --stringparam pagesrc docs/migration.html.in --stringparam builddir /home/pipo/build/libvirt/gcc --stringparam timestamp 'Tue Oct 13 16:16:15 2020 UTC' --nonet ../../../libvirt/docs/site.xsl ../../../libvirt/docs/migration.html.in ../../../libvirt/docs/migration.html.in:664: parser error : Opening and ending tag mismatch: p line 649 and body </body> ^ ../../../libvirt/docs/migration.html.in:665: parser error : Opening and ending tag mismatch: body line 649 and html </html> ^ ../../../libvirt/docs/migration.html.in:666: parser error : EndTag: '</' not found ^ unable to parse ../../../libvirt/docs/migration.html.in [84/144] Generating hacking.html with a meson_exe.py custom command ninja: build stopped: subcommand failed. Peter Krempa (9): docs: migration: Fix syntax scripts/meson-html-gen.py: Don't rereformat output files docs: meson.build: Limit html files depending on 'aclperms.htmlinc' docs: meson.build: Generate HTML files directly by meson docs: meson.build: Prepare for use of identical code for XSLT processing of htmls docs/internals/meson.build: Use template code for XSLT processing docs/kbase/meson.build: Use template code for XSLT processing docs/manpages/meson.build: Use template code for XSLT processing scripts: meson-html-gen: Remove docs/internals/meson.build | 55 ++++++++++++++++---------- docs/kbase/meson.build | 56 ++++++++++++++++---------- docs/manpages/meson.build | 55 +++++++++++++++++--------- docs/meson.build | 80 +++++++++++++++++++++++--------------- docs/migration.html.in | 1 + scripts/meson-html-gen.py | 37 ------------------ scripts/meson.build | 1 - 7 files changed, 157 insertions(+), 128 deletions(-) delete mode 100755 scripts/meson-html-gen.py -- 2.26.2

2 11

[PATCH v2 0/4] support memory failure
by zhenwei pi 14 Oct '20

14 Oct '20

v1->v2: Seperate a 'all in one' patch into 4 patches. Use a 'flags' with bit definition instead of 'action_required' & 'recursive' for extention. Queue event directly without internal job. Add full test method in commit. v1: Since QEMU 5.2 (commit-77b285f7f6), QEMU supports 'memory failure' event, posts event to monitor if hitting a hardware memory error. zhenwei pi (4): API: introduce memory failure qemu: process: implement domainMemoryFailure qemu: monitor: handle memory failure event virsh: implement memory failure event examples/c/misc/event-test.c | 16 ++++++++ include/libvirt/libvirt-domain.h | 82 +++++++++++++++++++++++++++++++++++++ src/conf/domain_event.c | 80 ++++++++++++++++++++++++++++++++++++ src/conf/domain_event.h | 12 ++++++ src/libvirt_private.syms | 2 + src/qemu/qemu_monitor.c | 21 +++++++++- src/qemu/qemu_monitor.h | 39 ++++++++++++++++++ src/qemu/qemu_monitor_json.c | 49 ++++++++++++++++++++++ src/qemu/qemu_process.c | 59 ++++++++++++++++++++++++++ src/remote/remote_daemon_dispatch.c | 32 +++++++++++++++ src/remote/remote_driver.c | 32 +++++++++++++++ src/remote/remote_protocol.x | 16 +++++++- src/remote_protocol-structs | 8 ++++ tools/virsh-domain.c | 40 ++++++++++++++++++ 14 files changed, 486 insertions(+), 2 deletions(-) -- 2.11.0

4 8

[libvirt][PATCH v1 0/1] introduce an attribute "migratable" to numatune memory element
by Luyao Zhong 14 Oct '20

14 Oct '20

RFC discussion record link: https://www.redhat.com/archives/libvir-list/2020-August/msg00960.html Luyao Zhong (1): introduce an attribute "migratable" to numatune memory element docs/formatdomain.rst | 8 +++- docs/schemas/domaincommon.rng | 5 +++ src/conf/numa_conf.c | 45 +++++++++++++++++++ src/conf/numa_conf.h | 3 ++ src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 6 ++- src/qemu/qemu_process.c | 21 +++++++++ .../numatune-memory-migratable.args | 34 ++++++++++++++ .../numatune-memory-migratable.err | 1 + .../numatune-memory-migratable.xml | 33 ++++++++++++++ tests/qemuxml2argvtest.c | 5 +++ 11 files changed, 160 insertions(+), 2 deletions(-) create mode 100644 tests/qemuxml2argvdata/numatune-memory-migratable.args create mode 100644 tests/qemuxml2argvdata/numatune-memory-migratable.err create mode 100644 tests/qemuxml2argvdata/numatune-memory-migratable.xml -- 2.25.4

3 3

[libvirt PATCH] qemu: remove some unnecessary local variables
by Jonathon Jongsma 14 Oct '20

14 Oct '20

These variables seem to be left over from a previous refactoring and they don't add anything to the code. Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- src/qemu/qemu_hotplug.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 2c184b9ba0..79fc8baa5c 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -5502,7 +5502,6 @@ qemuDomainDetachPrepRedirdev(virDomainObjPtr vm, virDomainRedirdevDefPtr match, virDomainRedirdevDefPtr *detach) { - virDomainRedirdevDefPtr redirdev; ssize_t idx; if ((idx = virDomainRedirdevDefFind(vm->def, match)) < 0) { @@ -5511,7 +5510,7 @@ qemuDomainDetachPrepRedirdev(virDomainObjPtr vm, return -1; } - *detach = redirdev = vm->def->redirdevs[idx]; + *detach = vm->def->redirdevs[idx]; return 0; } @@ -5523,12 +5522,11 @@ qemuDomainDetachPrepNet(virDomainObjPtr vm, virDomainNetDefPtr *detach) { int detachidx; - virDomainNetDefPtr net = NULL; if ((detachidx = virDomainNetFindIdx(vm->def, match)) < 0) return -1; - *detach = net = vm->def->nets[detachidx]; + *detach = vm->def->nets[detachidx]; return 0; } @@ -5598,7 +5596,6 @@ qemuDomainDetachPrepRNG(virDomainObjPtr vm, virDomainRNGDefPtr *detach) { ssize_t idx; - virDomainRNGDefPtr rng; if ((idx = virDomainRNGFind(vm->def, match)) < 0) { virReportError(VIR_ERR_DEVICE_MISSING, @@ -5608,7 +5605,7 @@ qemuDomainDetachPrepRNG(virDomainObjPtr vm, return -1; } - *detach = rng = vm->def->rngs[idx]; + *detach = vm->def->rngs[idx]; return 0; } @@ -5619,7 +5616,6 @@ qemuDomainDetachPrepMemory(virDomainObjPtr vm, virDomainMemoryDefPtr match, virDomainMemoryDefPtr *detach) { - virDomainMemoryDefPtr mem; int idx; if (qemuDomainMemoryDeviceAlignSize(vm->def, match) < 0) @@ -5633,7 +5629,7 @@ qemuDomainDetachPrepMemory(virDomainObjPtr vm, return -1; } - *detach = mem = vm->def->mems[idx]; + *detach = vm->def->mems[idx]; return 0; } -- 2.26.2

2 1

[PATCH 0/2] virtiofs can be used without NUMA
by Marc Hartmayer 13 Oct '20

13 Oct '20

Halil Pasic (1): Reflect in virtiofs.rst that virtiofs can be used without NUMA Marc Hartmayer (1): qemu: virtiofs can be used without NUMA nodes docs/kbase/virtiofs.rst | 17 ++++++++++++----- src/qemu/qemu_validate.c | 13 +++++++++---- 2 files changed, 21 insertions(+), 9 deletions(-) -- 2.25.4

2 4

[PATCH 0/2] qemu: Set noqueue qdisc for TAP devices
by Michal Privoznik 13 Oct '20

13 Oct '20

See 2/2 for detailed explanation. Long story short - we can squeeze more bandwidth from TAP devices we create for domains. Michal Prívozník (2): virnetdev: Introduce virNetDevSetRootQDisc() qemu: Set noqueue qdisc for TAP devices src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 2 ++ src/qemu/qemu_domain.c | 36 +++++++++++++++++++++++++++++++ src/qemu/qemu_domain.h | 4 ++++ src/qemu/qemu_hotplug.c | 2 ++ src/util/virnetdev.c | 46 ++++++++++++++++++++++++++++++++++++++++ src/util/virnetdev.h | 3 +++ 7 files changed, 94 insertions(+) -- 2.26.2

2 5

[PATCH] qemu_slirp: Check if helper exists before fetching its capabilities
by Michal Privoznik 13 Oct '20

13 Oct '20

I've noticed when running libvirtd in the session mode that whenever I start a virtual machine the following error is printed into logs: error : cannot execute binary /usr/bin/slirp-helper: No such file or directory The error message is produced in qemuSlirpNewForHelper() which does attempt to be a NO-OP if the helper doesn't exist by checking if its path is NULL, but that's not usually the case because in the default config (in virQEMUDriverConfigNew()) its path is initialized to QEMU_SLIRP_HELPER. And while it is true that during configure we try to get the actual path of the helper we fallback to the path above if not found. Fix the check so that the function checks whether the helper exists and is executable. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_slirp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_slirp.c b/src/qemu/qemu_slirp.c index d2e4ed79be..4e5ab12727 100644 --- a/src/qemu/qemu_slirp.c +++ b/src/qemu/qemu_slirp.c @@ -101,7 +101,8 @@ qemuSlirpNewForHelper(const char *helper) virJSONValuePtr featuresJSON; size_t i, nfeatures; - if (!helper) + if (!helper || + !virFileIsExecutable(helper)) return NULL; slirp = qemuSlirpNew(); -- 2.26.2

3 2

[libvirt PATCH 0/4] vmx: start parsing SATA disks
by Pino Toscano 13 Oct '20

13 Oct '20

Try to parse SATA disks in VMware guests from their configs in VMX files. There are a couple of helper/cleanup commits to ease a bit the actual patches. Pino Toscano (4): vmx: hide private helpers vmx: shortcut 'cdrom-image' as CD-ROM earlier vmx: expand the disk array vmx: start parsing SATA disks src/libvirt_vmx.syms | 12 - src/vmx/vmx.c | 212 ++++++++++++++++-- src/vmx/vmx.h | 44 ---- .../vmx2xml-esx-in-the-wild-10.vmx | 101 +++++++++ .../vmx2xml-esx-in-the-wild-10.xml | 36 +++ .../vmx2xmldata/vmx2xml-esx-in-the-wild-8.xml | 6 + tests/vmx2xmltest.c | 1 + 7 files changed, 335 insertions(+), 77 deletions(-) create mode 100644 tests/vmx2xmldata/vmx2xml-esx-in-the-wild-10.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-esx-in-the-wild-10.xml -- 2.26.2

2 5

[RFC] qemu: virtiofs can be used without NUMA nodes
by Marc Hartmayer 13 Oct '20

13 Oct '20

...if a machine memory-backend using shared memory is configured for the guest. This is especially important for QEMU machine types that don't have NUMA but virtiofs support. An example snippet: <domain type='kvm'> <name>test</name> <memory unit='KiB'>2097152</memory> <memoryBacking> <access mode='shared'/> </memoryBacking> <devices> <filesystem type='mount' accessmode='passthrough'> <driver type='virtiofs'/> <source dir='/tmp/test'/> <target dir='coffee'/> </filesystem> ... </devices> ... </domain> and the corresponding QEMU command line: /usr/bin/qemu-system-s390x \ -machine s390-ccw-virtio-5.2,memory-backend=s390.ram \ -m 2048 \ -object memory-backend-file,id=s390.ram,mem-path=/var/lib/libvirt/qemu/ram/46-test/s390.ram,share=yes,size=2147483648 \ ... Signed-off-by: Marc Hartmayer <mhartmay(a)linux.ibm.com> --- Note: There are still some TODOs left... e.g. adapt the virtiofs documentation of libvirt. --- src/qemu/qemu_validate.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index a212605579d2..077a85b30802 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -3470,14 +3470,21 @@ qemuValidateDomainDeviceDefGraphics(const virDomainGraphicsDef *graphics, static int -qemuValidateDomainDefVirtioFSSharedMemory(const virDomainDef *def) +qemuValidateDomainDefVirtioFSSharedMemory(const virDomainDef *def, + virQEMUCapsPtr qemuCaps) { + const char *defaultRAMId = virQEMUCapsGetMachineDefaultRAMid(qemuCaps, + def->virtType, + def->os.machine); size_t numa_nodes = virDomainNumaGetNodeCount(def->numa); size_t i; - if (numa_nodes == 0) { + if (numa_nodes == 0 && + !(defaultRAMId && def->mem.access == VIR_DOMAIN_MEMORY_ACCESS_SHARED)) { + /* TODO do we need further checks here (e.g. check whether + * memory backend is supported by the QEMU binary)? */ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("virtiofs requires one or more NUMA nodes")); + _("virtiofs requires shared memory")); return -1; } @@ -3591,7 +3598,7 @@ qemuValidateDomainDeviceDefFS(virDomainFSDefPtr fs, _("virtiofs does not support multidevs")); return -1; } - if (qemuValidateDomainDefVirtioFSSharedMemory(def) < 0) + if (qemuValidateDomainDefVirtioFSSharedMemory(def, qemuCaps) < 0) return -1; break; -- 2.25.4

2 2

Remove rpath from RPMs
by Daniel Letai 13 Oct '20

13 Oct '20

2 3

[libvirt PATCH] logging: allow max_len=0 to disable log rollover
by Daniel P. Berrangé 13 Oct '20

13 Oct '20

Currently setting max_len=0 causes virtlogd to spin in a busy loop. It is natural to allow this to disable log rollover which can be useful for developers debugging things. Note disabling rollover exposes the host to denial of service from a malicious guest, so must be used with care. Closes https://gitlab.com/libvirt/libvirt/-/issues/85 Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/logging/virtlogd.conf | 4 ++++ src/util/virrotatingfile.c | 48 +++++++++++++++++++++----------------- 2 files changed, 30 insertions(+), 22 deletions(-) diff --git a/src/logging/virtlogd.conf b/src/logging/virtlogd.conf index 8b1ff0156f..c53a1112bd 100644 --- a/src/logging/virtlogd.conf +++ b/src/logging/virtlogd.conf @@ -87,6 +87,10 @@ # Maximum file size before rolling over. Defaults to 2 MB # +# Setting max_size to zero will disable rollover entirely. +# NOTE: disabling rollover exposes the host filesystem to +# denial of service from a malicious guest. +# # Beware that a logrotate config file might be installed too, # to handle cases where virtlogd is disabled. To ensure that # the logrotate config is a no-op when virtlogd is running, diff --git a/src/util/virrotatingfile.c b/src/util/virrotatingfile.c index a88c332cf4..9f1ef17c3e 100644 --- a/src/util/virrotatingfile.c +++ b/src/util/virrotatingfile.c @@ -225,7 +225,8 @@ virRotatingFileWriterDelete(virRotatingFileWriterPtr file) * * The files will never exceed @maxlen bytes in size, * but may be rolled over before they reach this size - * in order to avoid splitting lines + * in order to avoid splitting lines. If @maxlen is + * zero then no rollover will be performed. */ virRotatingFileWriterPtr virRotatingFileWriterNew(const char *path, @@ -430,25 +431,27 @@ virRotatingFileWriterAppend(virRotatingFileWriterPtr file, size_t towrite = len; bool forceRollover = false; - if (file->entry->pos > file->maxlen) { - /* If existing file is for some reason larger then max length we - * won't write to this file anymore, but we rollover this file.*/ - forceRollover = true; - towrite = 0; - } else if ((file->entry->pos + towrite) > file->maxlen) { - towrite = file->maxlen - file->entry->pos; - - /* - * If there's a newline in the last 80 chars - * we're about to write, then break at that - * point to avoid splitting lines across - * separate files - */ - for (i = 0; i < towrite && i < 80; i++) { - if (buf[towrite - i - 1] == '\n') { - towrite -= i; - forceRollover = true; - break; + if (file->maxlen != 0) { + if (file->entry->pos > file->maxlen) { + /* If existing file is for some reason larger then max length we + * won't write to this file anymore, but we rollover this file.*/ + forceRollover = true; + towrite = 0; + } else if ((file->entry->pos + towrite) > file->maxlen) { + towrite = file->maxlen - file->entry->pos; + + /* + * If there's a newline in the last 80 chars + * we're about to write, then break at that + * point to avoid splitting lines across + * separate files + */ + for (i = 0; i < towrite && i < 80; i++) { + if (buf[towrite - i - 1] == '\n') { + towrite -= i; + forceRollover = true; + break; + } } } } @@ -468,8 +471,9 @@ virRotatingFileWriterAppend(virRotatingFileWriterPtr file, file->entry->len += towrite; } - if ((file->entry->pos == file->maxlen && len) || - forceRollover) { + if (file->maxlen != 0 && + ((file->entry->pos == file->maxlen && len) || + forceRollover)) { virRotatingFileWriterEntryPtr tmp; VIR_DEBUG("Hit max size %zu on %s (force=%d)", file->maxlen, file->basepath, forceRollover); -- 2.26.2

2 1

[libvirt PATCH 0/2] fixes allocation issues leading to crashes
by Pavel Hrdina 13 Oct '20

13 Oct '20

Our libvirt-dbus tests discovered allocation issues introduced by recent rewrite to use g_new0 instead of VIR_ALLOC_N by allocating array one element shorter in some places which can lead to crashes of client applications counting on a fact that the returned arrays are NULL terminated. Pavel Hrdina (2): conf: fix g_new0 allocation conf: virsecretobj: fix g_new0 allocation src/conf/virinterfaceobj.c | 2 +- src/conf/virnetworkobj.c | 4 ++-- src/conf/virnodedeviceobj.c | 2 +- src/conf/virsecretobj.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) -- 2.26.2

4 5

Re: Overlay limit bug
by Peter Krempa 13 Oct '20

13 Oct '20

Adding libvir-list to cc. If you come across stuff that involves both libvirt and qemu it's best to crosspost it to libvir-list too as I've noticed this only accidentally. On Mon, Oct 12, 2020 at 15:03:10 -0400, Yoonho Park wrote: > I stumbled on a bug in qemu 4.2.0 (virsh 6.0.0) with a large number of > overlays. I am using "qemu-img create" and "virsh snapshot-create-as" to > create each overlay. When I run "virsh snapshot-create-as" for the 42nd > overlay, I get "error: No complete monitor response found in 10485760 This error comes from libvirt's DoS protection. The response from qemu is too large. This happens when 'query-named-block-nodes' is called on too-deep backing chains as the reply contains both nested and linear entries. Thus for a N deep backing chain, you get N + N-1 + N-2 ... entries in the returned data. Libvirt stops reading after 1MiB of json to prevent buffer overflows from a rogue qemu. > bytes: Numerical result out of range". However, I pulled down qemu 5.1.50 > (still using virsh 6.0.0), and it looks like the problem has disappeared > which is great. Does anyone know the patch set that addressed this bug? qemu patch: commit facda5443f5a8676fb635b82ac1046ac6b6a67ce Author: Peter Krempa <pkrempa(a)redhat.com> Date: Mon Jan 20 09:50:49 2020 +0100 qapi: Allow getting flat output from 'query-named-block-nodes' When a management application manages node names there's no reason to recurse into backing images in the output of query-named-block-nodes. Add a parameter to the command which will return just the top level structs. v4.2.0-1584-gfacda5443f libvirt patches: commit 95080cc8b470c977d53043d4eff3e30781f472eb Author: Peter Krempa <pkrempa(a)redhat.com> Date: Tue Jan 21 16:51:40 2020 +0100 qemu: Don't request nested entries in qemuBlockGetNamedNodeData Use the 'flat' flag for 'query-named-block-nodes' if qemu supports QEMU_CAPS_QMP_QUERY_NAMED_BLOCK_NODES_FLAT in qemuBlockGetNamedNodeData. We don't need the data so plumb in whether qemu supports the 'flat' output. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> Reviewed-by: Ján Tomko <jtomko(a)redhat.com> commit 855211bbf3ed45a73159f45eba1b15f05d771b76 Author: Peter Krempa <pkrempa(a)redhat.com> Date: Tue Jan 21 16:42:49 2020 +0100 qemu: monitor: Add 'flat' parameter for qemuMonitorJSONQueryNamedBlockNodes Modern qemu allows to skip the nested redundant data in the output of query-named-block-nodes. Plumb in the support for the argument that enables it. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> Reviewed-by: Ján Tomko <jtomko(a)redhat.com> commit 63610bd5fbe67ba9eb4f22f67c4bdab6eda8c041 Author: Peter Krempa <pkrempa(a)redhat.com> Date: Wed Feb 26 12:50:53 2020 +0100 qemuCheckpointDiscardBitmaps: Use qemuBlockGetNamedNodeData Replace qemuMonitorBlockGetNamedNodeData by qemuBlockGetNamedNodeData. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> Reviewed-by: Ján Tomko <jtomko(a)redhat.com> commit f886c9f33051fc03dd6c78134c92d31e7caf0c81 Author: Peter Krempa <pkrempa(a)redhat.com> Date: Tue Jan 21 16:33:12 2020 +0100 qemu: monitor: Refactor variable cleanup in qemuMonitorJSONQueryNamedBlockNodes Use g_autoptr to get rid of the cleanup section. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> Reviewed-by: Ján Tomko <jtomko(a)redhat.com> commit b7991c903cdd5b3c8b79a206584a4db81a6d4eaa Author: Peter Krempa <pkrempa(a)redhat.com> Date: Tue Jan 21 15:13:47 2020 +0100 qemu: capabilities: Add capability for the 'flat' argument of 'query-named-block-nodes' Detect the presence of the flag and make it available internally as QEMU_CAPS_QMP_QUERY_NAMED_BLOCK_NODES_FLAT. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> Reviewed-by: Ján Tomko <jtomko(a)redhat.com> v6.1.0-29-g95080cc8b4 > Also, does anyone know the "official" limit on the number of overlays that > can be created and is there a qemu test that exercises this? I could not Libvirt's official limit is 200 layers. This is the documentation for the validation function explaining the rationale: /** * qemuDomainStorageSourceValidateDepth: * @src: storage source chain to validate * @add: offsets the calculated number of images * @diskdst: optional disk target to use in error message * * The XML parser limits the maximum element nesting to 256 layers. As libvirt * reports the chain into the status and in some cases the config XML we must * validate that any user-provided chains will not exceed the XML nesting limit * when formatted to the XML. * * This function validates that the storage source chain starting @src is at * most 200 layers deep. @add modifies the calculated value to offset the number * to allow checking cases when new layers are going to be added to the chain. * * Returns 0 on success and -1 if the chain is too deep. Error is reported. */ int qemuDomainStorageSourceValidateDepth(virStorageSourcePtr src, int add, const char *diskdst) > find an overlay limit test in tests/qemu-iotests. I'd guess qemu doesn't really limit that, but at some point you'll get too much of a performance penalty form traversing all the structs.

1 0

[PATCH v3] util: support PCI passthrough net device stats collection
by zhenwei pi 12 Oct '20

12 Oct '20

Collect PCI passthrough net device stats from kernel by netlink API. Currently, libvirt can not get PCI passthrough net device stats, run command: #virsh domifstat instance --interface=52:54:00:2d:b2:35 error: Failed to get interface stats instance 52:54:00:2d:b2:35 error: internal error: Interface name not provided The PCI device(usually SR-IOV virtual function device) is detached while it's used in PCI passthrough mode. And we can not parse this device from /proc/net/dev any more. In this patch, libvirt check net device is VF of not firstly, then query virNetDevVFInterfaceStats(new API). virNetDevVFInterfaceStats parses VFs info of all PFs, compares MAC address until the two MAC addresses match. '#ip -s link show' can get the same result. Instead of parsing the output result, implement this feature by libnl API. Notice that this feature deponds on driver of PF. Test on Mellanox ConnectX-4 Lx, it works well. Also test on Intel Corporation 82599ES, it works, but only get 0. (ip-link command get the same result). IFLA_VF_STATS is supported since Linux-4.2, suggested by Laine, just using defined(__linux__) && WITH_LIBNL is enough. Signed-off-by: zhenwei pi <pizhenwei(a)bytedance.com> --- src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 3 ++ src/util/virnetdev.c | 121 +++++++++++++++++++++++++++++++++++++++++++++++ src/util/virnetdev.h | 5 ++ 4 files changed, 130 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index bdbe3431b8..bcc40b8d69 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2585,6 +2585,7 @@ virNetDevSetRcvMulti; virNetDevSetupControl; virNetDevSysfsFile; virNetDevValidateConfig; +virNetDevVFInterfaceStats; # util/virnetdevbandwidth.h diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ae715c01d7..f554010c40 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10196,6 +10196,9 @@ qemuDomainInterfaceStats(virDomainPtr dom, if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_VHOSTUSER) { if (virNetDevOpenvswitchInterfaceStats(net->ifname, stats) < 0) goto cleanup; + } else if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_HOSTDEV) { + if (virNetDevVFInterfaceStats(&net->mac, stats) < 0) + goto cleanup; } else { if (virNetDevTapInterfaceStats(net->ifname, stats, !virDomainNetTypeSharesHostView(net)) < 0) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index e1a4cc2bef..3d54d07606 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -1489,6 +1489,7 @@ static struct nla_policy ifla_vf_policy[IFLA_VF_MAX+1] = { .maxlen = sizeof(struct ifla_vf_mac) }, [IFLA_VF_VLAN] = { .type = NLA_UNSPEC, .maxlen = sizeof(struct ifla_vf_vlan) }, + [IFLA_VF_STATS] = { .type = NLA_NESTED }, }; @@ -2265,6 +2266,116 @@ virNetDevSetNetConfig(const char *linkdev, int vf, return 0; } +static struct nla_policy ifla_vfstats_policy[IFLA_VF_STATS_MAX+1] = { + [IFLA_VF_STATS_RX_PACKETS] = { .type = NLA_U64 }, + [IFLA_VF_STATS_TX_PACKETS] = { .type = NLA_U64 }, + [IFLA_VF_STATS_RX_BYTES] = { .type = NLA_U64 }, + [IFLA_VF_STATS_TX_BYTES] = { .type = NLA_U64 }, + [IFLA_VF_STATS_BROADCAST] = { .type = NLA_U64 }, + [IFLA_VF_STATS_MULTICAST] = { .type = NLA_U64 }, +}; + +static int +virNetDevParseVfStats(struct nlattr **tb, virMacAddrPtr mac, + virDomainInterfaceStatsPtr stats) +{ + int ret = -1, len; + struct ifla_vf_mac *vf_lladdr; + struct nlattr *nla, *t[IFLA_VF_MAX+1]; + struct nlattr *stb[IFLA_VF_STATS_MAX+1]; + + if (tb == NULL || mac == NULL || stats == NULL) { + return -1; + } + + if (!tb[IFLA_VFINFO_LIST]) + return -1; + + len = nla_len(tb[IFLA_VFINFO_LIST]); + + for (nla = nla_data(tb[IFLA_VFINFO_LIST]); nla_ok(nla, len); + nla = nla_next(nla, &len)) { + ret = nla_parse(t, IFLA_VF_MAX, nla_data(nla), nla_len(nla), + ifla_vf_policy); + if (ret < 0) + return -1; + + if (t[IFLA_VF_MAC] == NULL) { + continue; + } + + vf_lladdr = nla_data(t[IFLA_VF_MAC]); + if (virMacAddrCmpRaw(mac, vf_lladdr->mac)) { + continue; + } + + if (t[IFLA_VF_STATS]) { + ret = nla_parse_nested(stb, IFLA_VF_STATS_MAX, + t[IFLA_VF_STATS], + ifla_vfstats_policy); + if (ret < 0) + return -1; + + stats->rx_bytes = nla_get_u64(stb[IFLA_VF_STATS_RX_BYTES]); + stats->tx_bytes = nla_get_u64(stb[IFLA_VF_STATS_TX_BYTES]); + stats->rx_packets = nla_get_u64(stb[IFLA_VF_STATS_RX_PACKETS]); + stats->tx_packets = nla_get_u64(stb[IFLA_VF_STATS_TX_PACKETS]); + } + return 0; + } + + return ret; +} + +/** + * virNetDevVFInterfaceStats: + * @mac: MAC address of the VF interface + * @stats: returns stats of the VF interface + * + * Get the VF interface from kernel by netlink. + * Returns 0 on success, -1 on failure. + */ +int +virNetDevVFInterfaceStats(virMacAddrPtr mac, + virDomainInterfaceStatsPtr stats) +{ + int rc = -1; + void *nlData = NULL; + struct nlattr *tb[IFLA_MAX + 1] = {NULL, }; + char *sysfsDevicePath = NULL; + DIR *dirp = NULL; + struct dirent *dp; + + if (virDirOpen(&dirp, SYSFS_NET_DIR) < 0) + return -1; + + /* get all PCI net devices, and parse VFs list from netlink API. + * compare MAC address, collect device stats if matching. + */ + while (virDirRead(dirp, &dp, SYSFS_NET_DIR) > 0) { + if (virNetDevSysfsFile(&sysfsDevicePath, dp->d_name, "device") < 0) + break; + + if (virNetDevIsPCIDevice(sysfsDevicePath)) { + rc = virNetlinkDumpLink(dp->d_name, -1, &nlData, tb, 0, 0); + if (rc < 0) { + rc = -1; + goto cleanup; + } + + rc = virNetDevParseVfStats(tb, mac, stats); + VIR_FREE(nlData); + if (rc == 0) + goto cleanup; + } + VIR_FREE(sysfsDevicePath); + } + + cleanup: + VIR_FREE(sysfsDevicePath); + VIR_DIR_CLOSE(dirp); + return rc; +} #else /* defined(__linux__) && defined(WITH_LIBNL) && defined(IFLA_VF_MAX) */ @@ -2309,6 +2420,16 @@ virNetDevSetNetConfig(const char *linkdev G_GNUC_UNUSED, } +int +virNetDevVFInterfaceStats(virMacAddrPtr mac G_GNUC_UNUSED, + virDomainInterfaceStatsPtr stats G_GNUC_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", + _("Unable to get VF net device stats on this platform")); + return -1; +} + + #endif /* defined(__linux__) && defined(WITH_LIBNL) && defined(IFLA_VF_MAX) */ VIR_ENUM_IMPL(virNetDevIfState, diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h index 5f581323ed..ff59d9d341 100644 --- a/src/util/virnetdev.h +++ b/src/util/virnetdev.h @@ -312,4 +312,9 @@ int virNetDevSysfsFile(char **pf_sysfs_device_link, int virNetDevRunEthernetScript(const char *ifname, const char *script) G_GNUC_NO_INLINE; +int virNetDevVFInterfaceStats(virMacAddrPtr mac, + virDomainInterfaceStatsPtr stats) +ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); + + G_DEFINE_AUTOPTR_CLEANUP_FUNC(virNetDevRxFilter, virNetDevRxFilterFree); -- 2.11.0

3 3

[PATCH v2] qemu: migration: don't open storage driver too early
by Cole Robinson 12 Oct '20

12 Oct '20

If storage migration is requested, and the destination storage does not exist on the remote host, qemu's migration support will call into the libvirt storage driver to precreate the destination storage. The storage driver virConnectPtr is opened too early though, adding an unnecessary dependency on the storage driver for several cases that don't require it. This currently requires kubevirt to install the storage driver even though they aren't actually using it. Push the virGetConnectStorage calls to right before the cases they are actually needed. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- v2: Only open the connection once per VM via qemuMigrationDstPrecreateStorage src/qemu/qemu_migration.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 2000c86640..4e959abebf 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -169,7 +169,7 @@ qemuMigrationSrcRestoreDomainState(virQEMUDriverPtr driver, virDomainObjPtr vm) static int -qemuMigrationDstPrecreateDisk(virConnectPtr conn, +qemuMigrationDstPrecreateDisk(virConnectPtr *conn, virDomainDiskDefPtr disk, unsigned long long capacity) { @@ -204,7 +204,12 @@ qemuMigrationDstPrecreateDisk(virConnectPtr conn, *volName = '\0'; volName++; - if (!(pool = virStoragePoolLookupByTargetPath(conn, basePath))) + if (!*conn) { + if (!(*conn = virGetConnectStorage())) + goto cleanup; + } + + if (!(pool = virStoragePoolLookupByTargetPath(*conn, basePath))) goto cleanup; format = virStorageFileFormatTypeToString(disk->src->format); if (disk->src->format == VIR_STORAGE_FILE_QCOW2) @@ -212,7 +217,12 @@ qemuMigrationDstPrecreateDisk(virConnectPtr conn, break; case VIR_STORAGE_TYPE_VOLUME: - if (!(pool = virStoragePoolLookupByName(conn, disk->src->srcpool->pool))) + if (!*conn) { + if (!(*conn = virGetConnectStorage())) + goto cleanup; + } + + if (!(pool = virStoragePoolLookupByName(*conn, disk->src->srcpool->pool))) goto cleanup; format = virStorageFileFormatTypeToString(disk->src->format); volName = disk->src->srcpool->volume; @@ -304,14 +314,11 @@ qemuMigrationDstPrecreateStorage(virDomainObjPtr vm, { int ret = -1; size_t i = 0; - virConnectPtr conn; + virConnectPtr conn = NULL; if (!nbd || !nbd->ndisks) return 0; - if (!(conn = virGetConnectStorage())) - return -1; - for (i = 0; i < nbd->ndisks; i++) { virDomainDiskDefPtr disk; const char *diskSrcPath; @@ -349,7 +356,8 @@ qemuMigrationDstPrecreateStorage(virDomainObjPtr vm, VIR_DEBUG("Proceeding with disk source %s", NULLSTR(diskSrcPath)); - if (qemuMigrationDstPrecreateDisk(conn, disk, nbd->disks[i].capacity) < 0) + if (qemuMigrationDstPrecreateDisk(&conn, + disk, nbd->disks[i].capacity) < 0) goto cleanup; } -- 2.28.0

2 1

[PATCH 0/2] docs: Fix migration.html generation and report such errors next time
by Peter Krempa 12 Oct '20

12 Oct '20

Invert the order of the patches to see the error: FAILED: docs/migration.xslout.html /usr/bin/meson --internal exe --capture docs/migration.xslout.html -- /bin/xsltproc --stringparam pagesrc docs/migration.html.in --stringparam builddir /home/pipo/build/libvirt/gcc --stringparam timestamp 'Mon Oct 12 14:03:50 2020 UTC' --nonet ../../../libvirt/docs/site.xsl ../../../libvirt/docs/migration.html.in ../../../libvirt/docs/migration.html.in:664: parser error : Opening and ending tag mismatch: p line 649 and body </body> ^ ../../../libvirt/docs/migration.html.in:665: parser error : Opening and ending tag mismatch: body line 649 and html </html> ^ ../../../libvirt/docs/migration.html.in:666: parser error : EndTag: '</' not found ^ unable to parse ../../../libvirt/docs/migration.html.in [132/262] Generating 'docs/ci.xslout.html.p/ci.html.in'. ninja: build stopped: subcommand failed. Peter Krempa (2): docs: migration: Fix syntax docs: meson.build: Generate HTML files directly by meson docs/meson.build | 39 +++++++++++++++++++++++++-------------- docs/migration.html.in | 1 + scripts/meson-html-gen.py | 37 ------------------------------------- 3 files changed, 26 insertions(+), 51 deletions(-) delete mode 100755 scripts/meson-html-gen.py -- 2.26.2

1 3

[PATCH] qemu: migration: don't open storage driver too early
by Cole Robinson 12 Oct '20

12 Oct '20

If storage migration is requested, and the destination storage does not exist on the remote host, qemu's migration support will call into the libvirt storage driver to precreate the destination storage. The storage driver virConnectPtr is opened too early though, adding an unnecessary dependency on the storage driver for several cases that don't require it. This currently requires kubevirt to install the storage driver even though they aren't actually using it. Push the virGetConnectStorage calls to right before the cases they are actually needed. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/qemu/qemu_migration.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 2000c86640..99a6b41483 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -169,8 +169,7 @@ qemuMigrationSrcRestoreDomainState(virQEMUDriverPtr driver, virDomainObjPtr vm) static int -qemuMigrationDstPrecreateDisk(virConnectPtr conn, - virDomainDiskDefPtr disk, +qemuMigrationDstPrecreateDisk(virDomainDiskDefPtr disk, unsigned long long capacity) { int ret = -1; @@ -181,6 +180,7 @@ qemuMigrationDstPrecreateDisk(virConnectPtr conn, g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; const char *format = NULL; unsigned int flags = 0; + virConnectPtr conn = NULL; VIR_DEBUG("Precreate disk type=%s", virStorageTypeToString(disk->src->type)); @@ -204,6 +204,9 @@ qemuMigrationDstPrecreateDisk(virConnectPtr conn, *volName = '\0'; volName++; + if (!(conn = virGetConnectStorage())) + goto cleanup; + if (!(pool = virStoragePoolLookupByTargetPath(conn, basePath))) goto cleanup; format = virStorageFileFormatTypeToString(disk->src->format); @@ -212,6 +215,9 @@ qemuMigrationDstPrecreateDisk(virConnectPtr conn, break; case VIR_STORAGE_TYPE_VOLUME: + if (!(conn = virGetConnectStorage())) + goto cleanup; + if (!(pool = virStoragePoolLookupByName(conn, disk->src->srcpool->pool))) goto cleanup; format = virStorageFileFormatTypeToString(disk->src->format); @@ -270,6 +276,7 @@ qemuMigrationDstPrecreateDisk(virConnectPtr conn, VIR_FREE(volStr); virObjectUnref(vol); virObjectUnref(pool); + virObjectUnref(conn); return ret; } @@ -304,13 +311,10 @@ qemuMigrationDstPrecreateStorage(virDomainObjPtr vm, { int ret = -1; size_t i = 0; - virConnectPtr conn; if (!nbd || !nbd->ndisks) return 0; - if (!(conn = virGetConnectStorage())) - return -1; for (i = 0; i < nbd->ndisks; i++) { virDomainDiskDefPtr disk; @@ -349,13 +353,12 @@ qemuMigrationDstPrecreateStorage(virDomainObjPtr vm, VIR_DEBUG("Proceeding with disk source %s", NULLSTR(diskSrcPath)); - if (qemuMigrationDstPrecreateDisk(conn, disk, nbd->disks[i].capacity) < 0) + if (qemuMigrationDstPrecreateDisk(disk, nbd->disks[i].capacity) < 0) goto cleanup; } ret = 0; cleanup: - virObjectUnref(conn); return ret; } -- 2.28.0

4 9

[PATCH 1/3] bhyve: fix virtio-9p src/dst order
by Roman Bogorodskiy 12 Oct '20

12 Oct '20

For the virtio-9p bhyve command line argument, the proper order is mount_tag=/path/to/host/dir, not the opposite. Signed-off-by: Roman Bogorodskiy <bogorodskiy(a)gmail.com> --- src/bhyve/bhyve_command.c | 2 +- tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.args | 2 +- tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.args | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index 7606840f45..acf3a5a433 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -607,8 +607,8 @@ bhyveBuildFSArgStr(const virDomainDef *def G_GNUC_UNUSED, virCommandAddArgFormat(cmd, "%d:%d,virtio-9p,%s=%s%s", fs->info.addr.pci.slot, fs->info.addr.pci.function, - fs->src->path, fs->dst, + fs->src->path, virBufferCurrentContent(&params)); return 0; diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.args b/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.args index 193895574d..bfcd88e366 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.args @@ -7,4 +7,4 @@ -s 0:0,hostbridge \ -s 2:0,ahci,hd:/tmp/freebsd.img \ -s 3:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 \ --s 4:0,virtio-9p,/shared/dir=shared_dir,ro bhyve +-s 4:0,virtio-9p,shared_dir=/shared/dir,ro bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.args b/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.args index 0d27954432..e890f7400b 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.args @@ -7,4 +7,4 @@ -s 0:0,hostbridge \ -s 2:0,ahci,hd:/tmp/freebsd.img \ -s 3:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 \ --s 4:0,virtio-9p,/shared/dir=shared_dir bhyve +-s 4:0,virtio-9p,shared_dir=/shared/dir bhyve -- 2.28.0

2 6

[PATCH] libvirt: add memory failure event
by zhenwei pi 12 Oct '20

12 Oct '20

Since QEMU 5.2 (commit-77b285f7f6), QEMU supports 'memory failure' event, posts event to monitor if hitting a hardware memory error. Several changes in this patch: Add a new event 'memory failure' for libvirt domain. Implement memory failure event handling for QEMU from QMP. Also implement virsh command callback functions. Test case: ~# virsh event stretch --event memory-failure event 'memory-failure' for domain stretch: recipient: guest action: inject flags: action required: 0 recursive: 0 events received: 1 Signed-off-by: zhenwei pi <pizhenwei(a)bytedance.com> --- examples/c/misc/event-test.c | 17 ++++++++ include/libvirt/libvirt-domain.h | 84 +++++++++++++++++++++++++++++++++++++ src/conf/domain_event.c | 82 ++++++++++++++++++++++++++++++++++++ src/conf/domain_event.h | 12 ++++++ src/libvirt_private.syms | 2 + src/qemu/qemu_domain.c | 1 + src/qemu/qemu_domain.h | 1 + src/qemu/qemu_driver.c | 57 +++++++++++++++++++++++++ src/qemu/qemu_monitor.c | 21 +++++++++- src/qemu/qemu_monitor.h | 39 +++++++++++++++++ src/qemu/qemu_monitor_json.c | 50 ++++++++++++++++++++++ src/qemu/qemu_process.c | 28 +++++++++++++ src/remote/remote_daemon_dispatch.c | 33 +++++++++++++++ src/remote/remote_driver.c | 35 ++++++++++++++++ src/remote/remote_protocol.x | 21 +++++++++- src/remote_protocol-structs | 12 ++++++ tools/virsh-domain.c | 37 ++++++++++++++++ 17 files changed, 530 insertions(+), 2 deletions(-) diff --git a/examples/c/misc/event-test.c b/examples/c/misc/event-test.c index 52caa8ffa8..b10946d569 100644 --- a/examples/c/misc/event-test.c +++ b/examples/c/misc/event-test.c @@ -964,6 +964,22 @@ myDomainEventBlockThresholdCallback(virConnectPtr conn G_GNUC_UNUSED, static int +myDomainEventMemoryFailureCallback(virConnectPtr conn G_GNUC_UNUSED, + virDomainPtr dom, + virDomainMemoryFailureRecipientType recipient, + virDomainMemoryFailureActionType action, + virDomainMemoryFailureFlagsPtr flags, + void *opaque G_GNUC_UNUSED) +{ + printf("%s EVENT: Domain %s(%d) memory failure: recipient '%d', " + "aciont '%d', action_required '%d', recursive '%d'", + __func__, virDomainGetName(dom), virDomainGetID(dom), recipient, + action, flags->action_required, flags->recursive); + return 0; +} + + +static int myDomainEventMigrationIterationCallback(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, int iteration, @@ -1093,6 +1109,7 @@ struct domainEventData domainEvents[] = { DOMAIN_EVENT(VIR_DOMAIN_EVENT_ID_DEVICE_REMOVAL_FAILED, myDomainEventDeviceRemovalFailedCallback), DOMAIN_EVENT(VIR_DOMAIN_EVENT_ID_METADATA_CHANGE, myDomainEventMetadataChangeCallback), DOMAIN_EVENT(VIR_DOMAIN_EVENT_ID_BLOCK_THRESHOLD, myDomainEventBlockThresholdCallback), + DOMAIN_EVENT(VIR_DOMAIN_EVENT_ID_MEMORY_FAILURE, myDomainEventMemoryFailureCallback), }; struct storagePoolEventData { diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 77f9116675..a9170d9a7e 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -3196,6 +3196,66 @@ typedef enum { } virDomainEventCrashedDetailType; /** + * virDomainMemoryFailureRecipientType: + * + * Recipient of a memory failure event. + */ +typedef enum { + /* memory failure at hypersivor memory address space */ + VIR_DOMAIN_EVENT_MEMORY_FAILURE_RECIPIENT_HYPERVISOR = 0, + + /* memory failure at guest memory address space */ + VIR_DOMAIN_EVENT_MEMORY_FAILURE_RECIPIENT_GUEST = 1, + +# ifdef VIR_ENUM_SENTINELS + VIR_DOMAIN_EVENT_MEMORY_FAILURE_RECIPIENT_LAST +# endif +} virDomainMemoryFailureRecipientType; + + +/** + * virDomainMemoryFailureActionType: + * + * Action of a memory failure event. + */ +typedef enum { + /* the memory failure could be ignored. This will only be the case for + * action-optional failures. */ + VIR_DOMAIN_EVENT_MEMORY_FAILURE_ACTION_IGNORE = 0, + + /* memory failure occurred in guest memory, the guest enabled MCE handling + * mechanism, and hypervisor could inject the MCE into the guest + * successfully. */ + VIR_DOMAIN_EVENT_MEMORY_FAILURE_ACTION_INJECT = 1, + + /* the failure is unrecoverable. This occurs for action-required failures + * if the recipient is the hypervisor; hypervisor will exit. */ + VIR_DOMAIN_EVENT_MEMORY_FAILURE_ACTION_FATAL = 2, + + /* the failure is unrecoverable but confined to the guest. This occurs if + * the recipient is a guest which is not ready to handle memory failures. */ + VIR_DOMAIN_EVENT_MEMORY_FAILURE_ACTION_RESET = 3, + +# ifdef VIR_ENUM_SENTINELS + VIR_DOMAIN_EVENT_MEMORY_FAILURE_ACTION_LAST +# endif +} virDomainMemoryFailureActionType; + + +typedef struct _virDomainMemoryFailureFlags virDomainMemoryFailureFlags; +typedef virDomainMemoryFailureFlags *virDomainMemoryFailureFlagsPtr; +struct _virDomainMemoryFailureFlags { + /* whether a memory failure event is action-required or action-optional + * (e.g. a failure during memory scrub). */ + int action_required; + + /* whether the failure occurred while the previous failure was still in + * progress. */ + int recursive; +}; + + +/** * virConnectDomainEventCallback: * @conn: virConnect connection * @dom: The domain on which the event occurred @@ -4565,6 +4625,29 @@ typedef void (*virConnectDomainEventBlockThresholdCallback)(virConnectPtr conn, void *opaque); /** + * virConnectDomainEventMemoryFailureCallback: + * @conn: connection object + * @dom: domain on which the event occurred + * @recipient: the recipient of hardware memory failure + * @action: the action of hardware memory failure + * @flags: the flags of hardware memory failure + * @opaque: application specified data + * + * The callback occurs when the hypervisor handles the hardware memory + * corrupted event. + * + * The callback signature to use when registering for an event of type + * VIR_DOMAIN_EVENT_ID_MEMORY_FAILURE with virConnectDomainEventRegisterAny() + */ +typedef void (*virConnectDomainEventMemoryFailureCallback)(virConnectPtr conn, + virDomainPtr dom, + virDomainMemoryFailureRecipientType recipient, + virDomainMemoryFailureActionType action, + virDomainMemoryFailureFlagsPtr flags, + void *opaque); + + +/** * VIR_DOMAIN_EVENT_CALLBACK: * * Used to cast the event specific callback into the generic one @@ -4606,6 +4689,7 @@ typedef enum { VIR_DOMAIN_EVENT_ID_DEVICE_REMOVAL_FAILED = 22, /* virConnectDomainEventDeviceRemovalFailedCallback */ VIR_DOMAIN_EVENT_ID_METADATA_CHANGE = 23, /* virConnectDomainEventMetadataChangeCallback */ VIR_DOMAIN_EVENT_ID_BLOCK_THRESHOLD = 24, /* virConnectDomainEventBlockThresholdCallback */ + VIR_DOMAIN_EVENT_ID_MEMORY_FAILURE = 25, /* virConnectDomainEventMemoryFailureCallback */ # ifdef VIR_ENUM_SENTINELS VIR_DOMAIN_EVENT_ID_LAST diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index a8bd9f1595..20c5590835 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -57,6 +57,7 @@ static virClassPtr virDomainEventJobCompletedClass; static virClassPtr virDomainEventDeviceRemovalFailedClass; static virClassPtr virDomainEventMetadataChangeClass; static virClassPtr virDomainEventBlockThresholdClass; +static virClassPtr virDomainEventMemoryFailureClass; static void virDomainEventDispose(void *obj); static void virDomainEventLifecycleDispose(void *obj); @@ -79,6 +80,7 @@ static void virDomainEventJobCompletedDispose(void *obj); static void virDomainEventDeviceRemovalFailedDispose(void *obj); static void virDomainEventMetadataChangeDispose(void *obj); static void virDomainEventBlockThresholdDispose(void *obj); +static void virDomainEventMemoryFailureDispose(void *obj); static void virDomainEventDispatchDefaultFunc(virConnectPtr conn, @@ -287,6 +289,16 @@ struct _virDomainEventBlockThreshold { typedef struct _virDomainEventBlockThreshold virDomainEventBlockThreshold; typedef virDomainEventBlockThreshold *virDomainEventBlockThresholdPtr; +struct _virDomainEventMemoryFailure { + virDomainEvent parent; + + virDomainMemoryFailureRecipientType recipient; + virDomainMemoryFailureActionType action; + virDomainMemoryFailureFlags flags; +}; +typedef struct _virDomainEventMemoryFailure virDomainEventMemoryFailure; +typedef virDomainEventMemoryFailure *virDomainEventMemoryFailurePtr; + static int virDomainEventsOnceInit(void) @@ -333,6 +345,8 @@ virDomainEventsOnceInit(void) return -1; if (!VIR_CLASS_NEW(virDomainEventBlockThreshold, virDomainEventClass)) return -1; + if (!VIR_CLASS_NEW(virDomainEventMemoryFailure, virDomainEventClass)) + return -1; return 0; } @@ -542,6 +556,14 @@ virDomainEventBlockThresholdDispose(void *obj) } +static void +virDomainEventMemoryFailureDispose(void *obj) +{ + virDomainEventMemoryFailurePtr event = obj; + VIR_DEBUG("obj=%p", event); +} + + static void * virDomainEventNew(virClassPtr klass, int eventID, @@ -1619,6 +1641,53 @@ virDomainEventBlockThresholdNewFromDom(virDomainPtr dom, } +static virObjectEventPtr +virDomainEventMemoryFailureNew(int id, + const char *name, + unsigned char *uuid, + virDomainMemoryFailureRecipientType recipient, + virDomainMemoryFailureActionType action, + virDomainMemoryFailureFlagsPtr flags) +{ + virDomainEventMemoryFailurePtr ev; + + if (virDomainEventsInitialize() < 0) + return NULL; + + if (!(ev = virDomainEventNew(virDomainEventMemoryFailureClass, + VIR_DOMAIN_EVENT_ID_MEMORY_FAILURE, + id, name, uuid))) + return NULL; + + ev->recipient = recipient; + ev->action = action; + ev->flags.action_required = flags->action_required; + ev->flags.recursive = flags->recursive; + + return (virObjectEventPtr)ev; +} + +virObjectEventPtr +virDomainEventMemoryFailureNewFromObj(virDomainObjPtr obj, + virDomainMemoryFailureRecipientType recipient, + virDomainMemoryFailureActionType action, + virDomainMemoryFailureFlagsPtr flags) +{ + return virDomainEventMemoryFailureNew(obj->def->id, obj->def->name, + obj->def->uuid, recipient, action, + flags); +} + +virObjectEventPtr +virDomainEventMemoryFailureNewFromDom(virDomainPtr dom, + virDomainMemoryFailureRecipientType recipient, + virDomainMemoryFailureActionType action, + virDomainMemoryFailureFlagsPtr flags) +{ + return virDomainEventMemoryFailureNew(dom->id, dom->name, dom->uuid, + recipient, action, flags); +} + static void virDomainEventDispatchDefaultFunc(virConnectPtr conn, virObjectEventPtr event, @@ -1902,6 +1971,19 @@ virDomainEventDispatchDefaultFunc(virConnectPtr conn, cbopaque); goto cleanup; } + case VIR_DOMAIN_EVENT_ID_MEMORY_FAILURE: + { + virDomainEventMemoryFailurePtr memoryFailureEvent; + + memoryFailureEvent = (virDomainEventMemoryFailurePtr)event; + ((virConnectDomainEventMemoryFailureCallback)cb)(conn, dom, + memoryFailureEvent->recipient, + memoryFailureEvent->action, + &memoryFailureEvent->flags, + cbopaque); + goto cleanup; + } + case VIR_DOMAIN_EVENT_ID_LAST: break; } diff --git a/src/conf/domain_event.h b/src/conf/domain_event.h index d1cfb81d62..5b317e8d30 100644 --- a/src/conf/domain_event.h +++ b/src/conf/domain_event.h @@ -255,6 +255,18 @@ virDomainEventBlockThresholdNewFromDom(virDomainPtr dom, unsigned long long threshold, unsigned long long excess); +virObjectEventPtr +virDomainEventMemoryFailureNewFromObj(virDomainObjPtr obj, + virDomainMemoryFailureRecipientType recipient, + virDomainMemoryFailureActionType action, + virDomainMemoryFailureFlagsPtr flags); + +virObjectEventPtr +virDomainEventMemoryFailureNewFromDom(virDomainPtr dom, + virDomainMemoryFailureRecipientType recipient, + virDomainMemoryFailureActionType action, + virDomainMemoryFailureFlagsPtr flags); + int virDomainEventStateRegister(virConnectPtr conn, virObjectEventStatePtr state, diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 152083d220..927de5001a 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -704,6 +704,8 @@ virDomainEventLifecycleNew; virDomainEventLifecycleNewFromDef; virDomainEventLifecycleNewFromDom; virDomainEventLifecycleNewFromObj; +virDomainEventMemoryFailureNewFromDom; +virDomainEventMemoryFailureNewFromObj; virDomainEventMetadataChangeNewFromDom; virDomainEventMetadataChangeNewFromObj; virDomainEventMigrationIterationNewFromDom; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 9623123d3c..5b5316fadd 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -10551,6 +10551,7 @@ qemuProcessEventFree(struct qemuProcessEvent *event) case QEMU_PROCESS_EVENT_BLOCK_JOB: case QEMU_PROCESS_EVENT_MONITOR_EOF: case QEMU_PROCESS_EVENT_GUEST_CRASHLOADED: + case QEMU_PROCESS_EVENT_MEMORY_FAILURE: VIR_FREE(event->data); break; case QEMU_PROCESS_EVENT_JOB_STATUS_CHANGE: diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 9bf32e16c9..51d5963f25 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -441,6 +441,7 @@ typedef enum { QEMU_PROCESS_EVENT_PR_DISCONNECT, QEMU_PROCESS_EVENT_RDMA_GID_STATUS_CHANGED, QEMU_PROCESS_EVENT_GUEST_CRASHLOADED, + QEMU_PROCESS_EVENT_MEMORY_FAILURE, QEMU_PROCESS_EVENT_LAST } qemuProcessEventType; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 8ef812cd94..aecd947836 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4292,6 +4292,59 @@ processGuestCrashloadedEvent(virQEMUDriverPtr driver, } +static void +processMemoryFailureEvent(virQEMUDriverPtr driver, + virDomainObjPtr vm, + qemuMonitorEventMemoryFailurePtr mfp) +{ + virObjectEventPtr event = NULL; + virDomainMemoryFailureRecipientType recipient; + virDomainMemoryFailureActionType action; + virDomainMemoryFailureFlags flags; + + switch (mfp->recipient) { + case QEMU_MONITOR_MEMORY_FAILURE_RECIPIENT_HYPERVISOR: + recipient = VIR_DOMAIN_EVENT_MEMORY_FAILURE_RECIPIENT_HYPERVISOR; + break; + case QEMU_MONITOR_MEMORY_FAILURE_RECIPIENT_GUEST: + recipient = VIR_DOMAIN_EVENT_MEMORY_FAILURE_RECIPIENT_GUEST; + break; + case QEMU_MONITOR_MEMORY_FAILURE_RECIPIENT_LAST: + default: + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("requested unknown memory failure recipient")); + return; + } + + switch (mfp->action) { + case QEMU_MONITOR_MEMORY_FAILURE_ACTION_IGNORE: + action = VIR_DOMAIN_EVENT_MEMORY_FAILURE_ACTION_IGNORE; + break; + case QEMU_MONITOR_MEMORY_FAILURE_ACTION_INJECT: + action = VIR_DOMAIN_EVENT_MEMORY_FAILURE_ACTION_INJECT; + break; + case QEMU_MONITOR_MEMORY_FAILURE_ACTION_FATAL: + action = VIR_DOMAIN_EVENT_MEMORY_FAILURE_ACTION_FATAL; + break; + case QEMU_MONITOR_MEMORY_FAILURE_ACTION_RESET: + action = VIR_DOMAIN_EVENT_MEMORY_FAILURE_ACTION_RESET; + break; + case QEMU_MONITOR_MEMORY_FAILURE_ACTION_LAST: + default: + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("requested unknown memory failure action")); + return; + } + + flags.action_required = mfp->action_required; + flags.recursive = mfp->recursive; + event = virDomainEventMemoryFailureNewFromObj(vm, recipient, action, + &flags); + + virObjectEventStateQueue(driver->domainEventState, event); +} + + static void qemuProcessEventHandler(void *data, void *opaque) { struct qemuProcessEvent *processEvent = data; @@ -4341,6 +4394,10 @@ static void qemuProcessEventHandler(void *data, void *opaque) case QEMU_PROCESS_EVENT_GUEST_CRASHLOADED: processGuestCrashloadedEvent(driver, vm); break; + case QEMU_PROCESS_EVENT_MEMORY_FAILURE: + processMemoryFailureEvent(driver, vm, processEvent->data); + break; + case QEMU_PROCESS_EVENT_LAST: break; } diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 8c991fefbb..189b789bb8 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -159,7 +159,6 @@ static int qemuMonitorOnceInit(void) VIR_ONCE_GLOBAL_INIT(qemuMonitor); - VIR_ENUM_IMPL(qemuMonitorMigrationStatus, QEMU_MONITOR_MIGRATION_STATUS_LAST, "inactive", "setup", @@ -197,6 +196,14 @@ VIR_ENUM_IMPL(qemuMonitorDumpStatus, "none", "active", "completed", "failed", ); +VIR_ENUM_IMPL(qemuMonitorMemoryFailureRecipient, + QEMU_MONITOR_MEMORY_FAILURE_RECIPIENT_LAST, + "hypervisor", "guest"); + +VIR_ENUM_IMPL(qemuMonitorMemoryFailureAction, + QEMU_MONITOR_MEMORY_FAILURE_ACTION_LAST, + "ignore", "inject", + "fatal", "reset"); #if DEBUG_RAW_IO static char * @@ -1428,6 +1435,18 @@ qemuMonitorEmitSpiceMigrated(qemuMonitorPtr mon) int +qemuMonitorEmitMemoryFailure(qemuMonitorPtr mon, + qemuMonitorEventMemoryFailurePtr mfp) +{ + int ret = -1; + + QEMU_MONITOR_CALLBACK(mon, ret, domainMemoryFailure, mon->vm, mfp); + + return ret; +} + + +int qemuMonitorEmitMigrationStatus(qemuMonitorPtr mon, int status) { diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index a744c8975b..17ba006a2f 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -340,6 +340,40 @@ typedef int (*qemuMonitorDomainGuestCrashloadedCallback)(qemuMonitorPtr mon, virDomainObjPtr vm, void *opaque); +typedef enum { + QEMU_MONITOR_MEMORY_FAILURE_RECIPIENT_HYPERVISOR, + QEMU_MONITOR_MEMORY_FAILURE_RECIPIENT_GUEST, + + QEMU_MONITOR_MEMORY_FAILURE_RECIPIENT_LAST +} qemuMonitorMemoryFailureRecipient; + +VIR_ENUM_DECL(qemuMonitorMemoryFailureRecipient); + +typedef enum { + QEMU_MONITOR_MEMORY_FAILURE_ACTION_IGNORE, + QEMU_MONITOR_MEMORY_FAILURE_ACTION_INJECT, + QEMU_MONITOR_MEMORY_FAILURE_ACTION_FATAL, + QEMU_MONITOR_MEMORY_FAILURE_ACTION_RESET, + + QEMU_MONITOR_MEMORY_FAILURE_ACTION_LAST +} qemuMonitorMemoryFailureAction; + +VIR_ENUM_DECL(qemuMonitorMemoryFailureAction); + +typedef struct _qemuMonitorEventMemoryFailure qemuMonitorEventMemoryFailure; +typedef qemuMonitorEventMemoryFailure *qemuMonitorEventMemoryFailurePtr; +struct _qemuMonitorEventMemoryFailure { + qemuMonitorMemoryFailureRecipient recipient; + qemuMonitorMemoryFailureAction action; + bool action_required; + bool recursive; +}; + +typedef int (*qemuMonitorDomainMemoryFailureCallback)(qemuMonitorPtr mon, + virDomainObjPtr vm, + qemuMonitorEventMemoryFailurePtr mfp, + void *opaque); + typedef struct _qemuMonitorCallbacks qemuMonitorCallbacks; typedef qemuMonitorCallbacks *qemuMonitorCallbacksPtr; struct _qemuMonitorCallbacks { @@ -376,6 +410,7 @@ struct _qemuMonitorCallbacks { qemuMonitorDomainPRManagerStatusChangedCallback domainPRManagerStatusChanged; qemuMonitorDomainRdmaGidStatusChangedCallback domainRdmaGidStatusChanged; qemuMonitorDomainGuestCrashloadedCallback domainGuestCrashloaded; + qemuMonitorDomainMemoryFailureCallback domainMemoryFailure; }; qemuMonitorPtr qemuMonitorOpen(virDomainObjPtr vm, @@ -475,6 +510,10 @@ int qemuMonitorEmitSerialChange(qemuMonitorPtr mon, const char *devAlias, bool connected); int qemuMonitorEmitSpiceMigrated(qemuMonitorPtr mon); + +int qemuMonitorEmitMemoryFailure(qemuMonitorPtr mon, + qemuMonitorEventMemoryFailurePtr mfp); + int qemuMonitorEmitMigrationStatus(qemuMonitorPtr mon, int status); int qemuMonitorEmitMigrationPass(qemuMonitorPtr mon, diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 26ac499fc5..8e2659dc21 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -112,6 +112,7 @@ static void qemuMonitorJSONHandleBlockThreshold(qemuMonitorPtr mon, virJSONValue static void qemuMonitorJSONHandleDumpCompleted(qemuMonitorPtr mon, virJSONValuePtr data); static void qemuMonitorJSONHandlePRManagerStatusChanged(qemuMonitorPtr mon, virJSONValuePtr data); static void qemuMonitorJSONHandleRdmaGidStatusChanged(qemuMonitorPtr mon, virJSONValuePtr data); +static void qemuMonitorJSONHandleMemoryFailure(qemuMonitorPtr mon, virJSONValuePtr data); typedef struct { const char *type; @@ -132,6 +133,7 @@ static qemuEventHandler eventHandlers[] = { { "GUEST_CRASHLOADED", qemuMonitorJSONHandleGuestCrashloaded, }, { "GUEST_PANICKED", qemuMonitorJSONHandleGuestPanic, }, { "JOB_STATUS_CHANGE", qemuMonitorJSONHandleJobStatusChange, }, + { "MEMORY_FAILURE", qemuMonitorJSONHandleMemoryFailure, }, { "MIGRATION", qemuMonitorJSONHandleMigrationStatus, }, { "MIGRATION_PASS", qemuMonitorJSONHandleMigrationPass, }, { "NIC_RX_FILTER_CHANGED", qemuMonitorJSONHandleNicRxFilterChanged, }, @@ -1336,6 +1338,54 @@ qemuMonitorJSONHandleSpiceMigrated(qemuMonitorPtr mon, static void +qemuMonitorJSONHandleMemoryFailure(qemuMonitorPtr mon, + virJSONValuePtr data) +{ + virJSONValuePtr flagsjson = virJSONValueObjectGetObject(data, "flags"); + const char *str; + int recipient; + int action; + bool ar = false; + bool recursive = false; + qemuMonitorEventMemoryFailurePtr mfp; + + if (!(str = virJSONValueObjectGetString(data, "recipient"))) { + VIR_WARN("missing recipient in memory failure event"); + return; + } + + recipient = qemuMonitorMemoryFailureRecipientTypeFromString(str); + if (recipient == -1) { + VIR_WARN("unknown recipient '%s' in memory_failure event", str); + return; + } + + if (!(str = virJSONValueObjectGetString(data, "action"))) { + VIR_WARN("missing action in memory failure event"); + return; + } + + action = qemuMonitorMemoryFailureActionTypeFromString(str); + if (action == -1) { + VIR_WARN("unknown action '%s' in memory_failure event", str); + return; + } + + if (flagsjson) { + virJSONValueObjectGetBoolean(flagsjson, "action-required", &ar); + virJSONValueObjectGetBoolean(flagsjson, "recursive", &recursive); + } + + mfp = g_new0(qemuMonitorEventMemoryFailure, 1); + mfp->recipient = recipient; + mfp->action = action; + mfp->action_required = ar; + mfp->recursive = recursive; + qemuMonitorEmitMemoryFailure(mon, mfp); +} + + +static void qemuMonitorJSONHandleMigrationStatus(qemuMonitorPtr mon, virJSONValuePtr data) { diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 6b5de29fdb..abcbab0f06 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1878,6 +1878,33 @@ qemuProcessHandleGuestCrashloaded(qemuMonitorPtr mon G_GNUC_UNUSED, } +static int +qemuProcessHandleMemoryFailure(qemuMonitorPtr mon G_GNUC_UNUSED, + virDomainObjPtr vm, + qemuMonitorEventMemoryFailurePtr mfp, + void *opaque) +{ + virQEMUDriverPtr driver = opaque; + struct qemuProcessEvent *processEvent; + + virObjectLock(vm); + processEvent = g_new0(struct qemuProcessEvent, 1); + + processEvent->eventType = QEMU_PROCESS_EVENT_MEMORY_FAILURE; + processEvent->data = mfp; + processEvent->vm = virObjectRef(vm); + + if (virThreadPoolSendJob(driver->workerPool, 0, processEvent) < 0) { + virObjectUnref(vm); + qemuProcessEventFree(processEvent); + } + + virObjectUnlock(vm); + + return 0; +} + + static qemuMonitorCallbacks monitorCallbacks = { .eofNotify = qemuProcessHandleMonitorEOF, .errorNotify = qemuProcessHandleMonitorError, @@ -1910,6 +1937,7 @@ static qemuMonitorCallbacks monitorCallbacks = { .domainPRManagerStatusChanged = qemuProcessHandlePRManagerStatusChanged, .domainRdmaGidStatusChanged = qemuProcessHandleRdmaGidStatusChanged, .domainGuestCrashloaded = qemuProcessHandleGuestCrashloaded, + .domainMemoryFailure = qemuProcessHandleMemoryFailure, }; static void diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon_dispatch.c index 32ebcd8f36..45a8ab3c05 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -1302,6 +1302,38 @@ remoteRelayDomainEventBlockThreshold(virConnectPtr conn, } +static int +remoteRelayDomainEventMemoryFailure(virConnectPtr conn, + virDomainPtr dom, + virDomainMemoryFailureRecipientType recipient, + virDomainMemoryFailureActionType action, + virDomainMemoryFailureFlagsPtr flags, + void *opaque) +{ + daemonClientEventCallbackPtr callback = opaque; + remote_domain_event_memory_failure_msg data; + + if (callback->callbackID < 0 || + !remoteRelayDomainEventCheckACL(callback->client, conn, dom)) + return -1; + + /* build return data */ + memset(&data, 0, sizeof(data)); + data.callbackID = callback->callbackID; + data.recipient = recipient; + data.action = action; + data.flags.action_required = flags->action_required; + data.flags.recursive = flags->recursive; + make_nonnull_domain(&data.dom, dom); + + remoteDispatchObjectEventSend(callback->client, remoteProgram, + REMOTE_PROC_DOMAIN_EVENT_MEMORY_FAILURE, + (xdrproc_t)xdr_remote_domain_event_memory_failure_msg, &data); + + return 0; +} + + static virConnectDomainEventGenericCallback domainEventCallbacks[] = { VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventLifecycle), VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventReboot), @@ -1328,6 +1360,7 @@ static virConnectDomainEventGenericCallback domainEventCallbacks[] = { VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventDeviceRemovalFailed), VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventMetadataChange), VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventBlockThreshold), + VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventMemoryFailure), }; G_STATIC_ASSERT(G_N_ELEMENTS(domainEventCallbacks) == VIR_DOMAIN_EVENT_ID_LAST); diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index d318224605..5b29161a22 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -405,6 +405,11 @@ remoteDomainBuildEventBlockThreshold(virNetClientProgramPtr prog, void *evdata, void *opaque); static void +remoteDomainBuildEventMemoryFailure(virNetClientProgramPtr prog, + virNetClientPtr client, + void *evdata, void *opaque); + +static void remoteConnectNotifyEventConnectionClosed(virNetClientProgramPtr prog G_GNUC_UNUSED, virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque); @@ -615,6 +620,10 @@ static virNetClientProgramEvent remoteEvents[] = { remoteDomainBuildEventBlockThreshold, sizeof(remote_domain_event_block_threshold_msg), (xdrproc_t)xdr_remote_domain_event_block_threshold_msg }, + { REMOTE_PROC_DOMAIN_EVENT_MEMORY_FAILURE, + remoteDomainBuildEventMemoryFailure, + sizeof(remote_domain_event_memory_failure_msg), + (xdrproc_t)xdr_remote_domain_event_memory_failure_msg }, }; static void @@ -5440,6 +5449,32 @@ remoteDomainBuildEventBlockThreshold(virNetClientProgramPtr prog G_GNUC_UNUSED, } +static void +remoteDomainBuildEventMemoryFailure(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, + void *evdata, void *opaque) +{ + virConnectPtr conn = opaque; + remote_domain_event_memory_failure_msg *msg = evdata; + struct private_data *priv = conn->privateData; + virDomainPtr dom; + virDomainMemoryFailureFlags flags; + virObjectEventPtr event = NULL; + + if (!(dom = get_nonnull_domain(conn, msg->dom))) + return; + + flags.action_required = msg->flags.action_required; + flags.recursive = msg->flags.recursive; + event = virDomainEventMemoryFailureNewFromDom(dom, msg->recipient, + msg->action, &flags); + + virObjectUnref(dom); + + virObjectEventStateQueueRemote(priv->eventState, event, msg->callbackID); +} + + static int remoteStreamSend(virStreamPtr st, const char *data, diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index f4d6147676..a3fda24807 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -3469,6 +3469,19 @@ struct remote_domain_event_callback_metadata_change_msg { remote_string nsuri; }; +struct remote_domain_event_memory_failure_flags { + int action_required; + int recursive; +}; + +struct remote_domain_event_memory_failure_msg { + int callbackID; + remote_nonnull_domain dom; + int recipient; + int action; + remote_domain_event_memory_failure_flags flags; +}; + struct remote_connect_secret_event_register_any_args { int eventID; remote_secret secret; @@ -6668,5 +6681,11 @@ enum remote_procedure { * @priority: high * @acl: domain:read */ - REMOTE_PROC_DOMAIN_BACKUP_GET_XML_DESC = 422 + REMOTE_PROC_DOMAIN_BACKUP_GET_XML_DESC = 422, + + /** + * @generate: both + * @acl: none + */ + REMOTE_PROC_DOMAIN_EVENT_MEMORY_FAILURE = 423 }; diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index bae0f0b545..1b74fb330d 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -2862,6 +2862,17 @@ struct remote_domain_event_callback_metadata_change_msg { int type; remote_string nsuri; }; +struct remote_domain_event_memory_failure_flags { + int action_required; + int recursive; +}; +struct remote_domain_event_memory_failure_msg { + int callbackID; + remote_nonnull_domain dom; + int recipient; + int action; + remote_domain_event_memory_failure_flags flags; +}; struct remote_connect_secret_event_register_any_args { int eventID; remote_secret secret; @@ -3558,4 +3569,5 @@ enum remote_procedure { REMOTE_PROC_DOMAIN_AGENT_SET_RESPONSE_TIMEOUT = 420, REMOTE_PROC_DOMAIN_BACKUP_BEGIN = 421, REMOTE_PROC_DOMAIN_BACKUP_GET_XML_DESC = 422, + REMOTE_PROC_DOMAIN_EVENT_MEMORY_FAILURE = 423, }; diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 8f11393197..7c6b19a54b 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -13590,6 +13590,41 @@ virshEventBlockThresholdPrint(virConnectPtr conn G_GNUC_UNUSED, } +VIR_ENUM_DECL(virshEventMemoryFailureRecipientType); +VIR_ENUM_IMPL(virshEventMemoryFailureRecipientType, + VIR_DOMAIN_EVENT_MEMORY_FAILURE_RECIPIENT_LAST, + N_("hypervisor"), + N_("guest")); + +VIR_ENUM_DECL(virshEventMemoryFailureActionType); +VIR_ENUM_IMPL(virshEventMemoryFailureActionType, + VIR_DOMAIN_EVENT_MEMORY_FAILURE_ACTION_LAST, + N_("ignore"), + N_("inject"), + N_("fatal"), + N_("reset")); + +static void +virshEventMemoryFailurePrint(virConnectPtr conn G_GNUC_UNUSED, + virDomainPtr dom, + virDomainMemoryFailureRecipientType recipient, + virDomainMemoryFailureActionType action, + virDomainMemoryFailureFlagsPtr flags, + void *opaque) +{ + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; + + virBufferAsprintf(&buf, _("event 'memory-failure' for domain %s:\n" + "recipient: %s\naction: %s\nflags:\n" + "\taction required: %d\n\trecursive: %d\n"), + virDomainGetName(dom), + UNKNOWNSTR(virshEventMemoryFailureRecipientTypeTypeToString(recipient)), + UNKNOWNSTR(virshEventMemoryFailureActionTypeTypeToString(action)), + !!(flags->action_required), !!(flags->recursive)); + virshEventPrint(opaque, &buf); +} + + virshDomainEventCallback virshDomainEventCallbacks[] = { { "lifecycle", VIR_DOMAIN_EVENT_CALLBACK(virshEventLifecyclePrint), }, @@ -13639,6 +13674,8 @@ virshDomainEventCallback virshDomainEventCallbacks[] = { VIR_DOMAIN_EVENT_CALLBACK(virshEventMetadataChangePrint), }, { "block-threshold", VIR_DOMAIN_EVENT_CALLBACK(virshEventBlockThresholdPrint), }, + { "memory-failure", + VIR_DOMAIN_EVENT_CALLBACK(virshEventMemoryFailurePrint), }, }; G_STATIC_ASSERT(VIR_DOMAIN_EVENT_ID_LAST == G_N_ELEMENTS(virshDomainEventCallbacks)); -- 2.11.0

2 1

[PATCH] virsocketaddr: Zero @netmask in virSocketAddrPrefixToNetmask()
by Michal Privoznik 12 Oct '20

12 Oct '20

The aim of virSocketAddrPrefixToNetmask() is to initialize passed virSocketAddr structure based on prefix length and family. However, it doesn't set all members in the struct which may lead to reads of uninitialized values: ==15421== Use of uninitialised value of size 8 ==15421== at 0x50F297A: _itoa_word (in /lib64/libc-2.31.so) ==15421== by 0x510C8FE: __vfprintf_internal (in /lib64/libc-2.31.so) ==15421== by 0x5120295: __vsnprintf_internal (in /lib64/libc-2.31.so) ==15421== by 0x50F8969: snprintf (in /lib64/libc-2.31.so) ==15421== by 0x51BB602: getnameinfo (in /lib64/libc-2.31.so) ==15421== by 0x496DEE0: virSocketAddrFormatFull (virsocketaddr.c:486) ==15421== by 0x496DD9F: virSocketAddrFormat (virsocketaddr.c:444) ==15421== by 0x11871F: networkDnsmasqConfContents (bridge_driver.c:1404) ==15421== by 0x1118F5: testCompareXMLToConfFiles (networkxml2conftest.c:48) ==15421== by 0x111BAF: testCompareXMLToConfHelper (networkxml2conftest.c:112) ==15421== by 0x112679: virTestRun (testutils.c:142) ==15421== by 0x111D09: mymain (networkxml2conftest.c:144) ==15421== Uninitialised value was created by a stack allocation ==15421== at 0x1175D2: networkDnsmasqConfContents (bridge_driver.c:1056) All callers expect the function to initialize the structure fully. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virsocketaddr.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c index e0eb76ded3..65aaa632c7 100644 --- a/src/util/virsocketaddr.c +++ b/src/util/virsocketaddr.c @@ -1097,6 +1097,8 @@ virSocketAddrPrefixToNetmask(unsigned int prefix, virSocketAddrPtr netmask, int family) { + memset(netmask, 0, sizeof(*netmask)); + netmask->data.stor.ss_family = AF_UNSPEC; /* assume failure */ if (family == AF_INET) { @@ -1135,7 +1137,7 @@ virSocketAddrPrefixToNetmask(unsigned int prefix, } return 0; - } +} /** * virSocketAddrGetIPPrefix: -- 2.26.2

2 2

[libvirt PATCH 0/4] Some documentation fixes
by Tim Wiederhake 09 Oct '20

09 Oct '20

I encountered some references to a cpu_map.xml file which was moved to a subdirectory in commit 3ecbac95cd and split up in to different files in 2c127947ae and e6d7be38b9. This series removes all remaining references to this file and fixes an unrelated minor issue in the description of the "feature" element in the section about "cpu". Tim Wiederhake (4): tests: Remove references to "cpu_map.xml" in the code qemu: Remove references to "cpu_map.xml" in the code docs: Remove references to "cpu_map.xml" in the documentation doc: Fix element name in description of "feature" docs/formatdomain.rst | 14 +++++++------- src/qemu/qemu_capabilities.c | 2 +- tests/cputest.c | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) -- 2.26.2

2 5

[libvirt PATCH 0/3] ci: Start building RPMs
by Andrea Bolognani 09 Oct '20

09 Oct '20

See it in action: https://gitlab.com/abologna/libvirt/-/pipelines/199936179 Andrea Bolognani (3): ci: Refresh Dockerfiles ci: Allow skipping dist ci: Start building RPMs .gitlab-ci.yml | 41 ++++++++++--------- ci/containers/libvirt-centos-7.Dockerfile | 1 + ci/containers/libvirt-centos-8.Dockerfile | 1 + .../libvirt-centos-stream.Dockerfile | 1 + ci/containers/libvirt-fedora-31.Dockerfile | 1 + ci/containers/libvirt-fedora-32.Dockerfile | 1 + ...rt-fedora-rawhide-cross-mingw32.Dockerfile | 1 + ...rt-fedora-rawhide-cross-mingw64.Dockerfile | 1 + .../libvirt-fedora-rawhide.Dockerfile | 1 + 9 files changed, 30 insertions(+), 19 deletions(-) -- 2.26.2

3 8

[libvirt PATCH 00/10] use g_autoptr with cgroups (glib chronicles)
by Pavel Hrdina 09 Oct '20

09 Oct '20

Pavel Hrdina (10): qemu_cgroup: introduce qemuRestoreCgroupThread helper util: vircgroup: use GLib alloc functions util: vircgroup: change virCgroupFree to take only virCgroupPtr util: vircgroup: introduce g_autoptr() for virCgroup libvirt-lxc: use g_autoptr for virCgroup lxc: use g_autoptr for virCgroup qemu: use g_autoptr for virCgroup util: use g_autoptr for virCgroup tests: use g_autoptr for virCgroup tools: use g_autoptr for virCgroup src/libvirt-lxc.c | 5 +- src/lxc/lxc_cgroup.c | 20 +-- src/lxc/lxc_container.c | 37 ++--- src/lxc/lxc_controller.c | 2 +- src/lxc/lxc_domain.c | 2 +- src/lxc/lxc_process.c | 9 +- src/qemu/qemu_cgroup.c | 87 ++++++----- src/qemu/qemu_domain.c | 3 +- src/qemu/qemu_driver.c | 139 ++++++------------ src/qemu/qemu_process.c | 2 +- src/util/vircgroup.c | 198 +++++++++++-------------- src/util/vircgroup.h | 4 +- src/util/vircgroupv1.c | 9 +- tests/vircgrouptest.c | 236 +++++++++++------------------- tools/virt-host-validate-common.c | 4 +- 15 files changed, 305 insertions(+), 452 deletions(-) -- 2.26.2

2 13

[libvirt PATCH] remote: remove leftover goto
by Ján Tomko 09 Oct '20

09 Oct '20

Signed-off-by: Ján Tomko <jtomko(a)redhat.com> Reported-by: John Ferlan <jferlan(a)redhat.com> Fixes: 8487595bee0c04e56b0d8e866c5c71318faf1689 Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- /me gets the paper bag src/remote/remote_driver.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 49769ac04d..d318224605 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -7636,7 +7636,6 @@ remoteDomainGetFSInfo(virDomainPtr dom, } info_ret = g_new0(virDomainFSInfoPtr, ret.info.info_len); - goto cleanup; for (i = 0; i < ret.info.info_len; i++) { src = &ret.info.info_val[i]; -- 2.26.2

2 1

[libvirt PATCH v2 0/9] spec: Improve feature and architecture handling
by Andrea Bolognani 09 Oct '20

09 Oct '20

Changes from [v1]: * address review feedback. [v1] https://www.redhat.com/archives/libvir-list/2020-October/msg00336.html Andrea Bolognani (9): spec: Simplify setting features off by default spec: firewalld is always enabled spec: bash completion actually defaults to on spec: Move with_numactl definition spec: Introduce with_dmidecode spec: Move _vpath_builddir definition spec: Drop s390 architecture from conditionals spec: Refactor qemu_kvm_arches definition spec: Introduce arches_* libvirt.spec.in | 116 ++++++++++++++++++++++++------------------------ 1 file changed, 57 insertions(+), 59 deletions(-) -- 2.26.2

2 10

[libvirt PATCH 00/15] various meson fixes and improvements
by Pavel Hrdina 09 Oct '20

09 Oct '20

Pavel Hrdina (15): meson_options: change VMware default from enabled to auto meson_options: change VirtualBox default from enabled to auto meson_options: move firewalld options to build feature options meson: no need to call meson.get_compiler() again meson: properly handle libpcap if it's explicitly disabled meson: properly handle readline if it's explicitly disabled meson: build nodedev driver only if libvirtd is compiled meson: add libnl build option meson: add rbd build option meson: prefix kvm_dep, m_dep and util_dep with lib meson: add missing libraries to summary meson: remove required libraries from summary meson: move build feature options to miscellaneous summary meson: add docs option to enable/disable generating documentation meson: add tests build option to enable/disable unit tests libvirt.spec.in | 2 + meson.build | 135 +++++++++++++++++++++++++----------------- meson_options.txt | 12 ++-- src/bhyve/meson.build | 4 +- src/util/meson.build | 4 +- 5 files changed, 96 insertions(+), 61 deletions(-) -- 2.26.2

2 23

[libvirt PATCH 0/8] delete VIR_ALLOC and VIR_ALLOC_N (glib chronicles)
by Ján Tomko 09 Oct '20

09 Oct '20

Ján Tomko (8): remote: refactor remoteSerializeDHCPLease libxl: xenParseXMOS: separate VIR_ALLOC call remote: use g_new0 instead of VIR_ALLOC remote: remoteDispatchAuthList: remove useless 'rv' src: use g_new0 instead of VIR_ALLOC tests: use g_new0 instead of VIR_ALLOC tests: delete VIR_ALLOC tests cases util: delete VIR_ALLOC and VIR_ALLOC_N src/access/viraccessmanager.c | 3 +- src/admin/admin_server_dispatch.c | 6 +- src/hypervisor/domain_driver.c | 3 +- src/hypervisor/virclosecallbacks.c | 7 +- src/libvirt_private.syms | 2 - src/libxl/xen_xm.c | 9 +- src/remote/remote_daemon_config.c | 3 +- src/remote/remote_daemon_dispatch.c | 279 +++++++++------------------- src/remote/remote_daemon_stream.c | 6 +- src/remote/remote_driver.c | 102 +++------- src/test/test_driver.c | 66 +++---- src/util/viralloc.c | 39 ---- src/util/viralloc.h | 33 ---- tests/viralloctest.c | 89 +-------- 14 files changed, 157 insertions(+), 490 deletions(-) -- 2.26.2

3 13

[PATCH 0/7] more Hyper-V APIs
by Matt Coleman 09 Oct '20

09 Oct '20

This set of patches adds several new APIs and fixes several others. Matt Coleman (7): hyperv: implement domainSetAutostart hyperv: implement nodeGetFreeMemory hyperv: implement domainReboot and domainReset hyperv: implement domainShutdown and domainShutdownFlags hyperv: fix domainSuspend and domainResume on Hyper-V V2 hyperv: fix domainManagedSave on Hyper-V V2 news: more Hyper-V APIs NEWS.rst | 7 +- src/hyperv/hyperv_driver.c | 268 +++++++++++++++++++++++++- src/hyperv/hyperv_wmi_classes.h | 3 + src/hyperv/hyperv_wmi_generator.input | 78 ++++++++ 4 files changed, 348 insertions(+), 8 deletions(-) -- 2.27.0

3 12

[libvirt PATCH 0/9] spec: Improve feature and architecture handling
by Andrea Bolognani 09 Oct '20

09 Oct '20

Make things more maintainable. Andrea Bolognani (9): spec: Simplify setting features off by default spec: firewalld is always enabled spec: bash completion actually defaults to on spec: Move with_numactl definition spec: Introduce with_dmidecode spec: Move _vpath_builddir definition spec: Drop s390 architecture from conditionals spec: Refactor qemu_kvm_arches definition spec: Introduce arches_* libvirt.spec.in | 117 ++++++++++++++++++++++++------------------------ 1 file changed, 58 insertions(+), 59 deletions(-) -- 2.26.2

3 30

[PATCH] qemu.conf: Re-word the description for *_tls_x509_verify
by Fangge Jin 09 Oct '20

09 Oct '20

The original descirption for *_tls_x509_verify is a little misleading by saying that "Enabling this option will reject any client who does not have a ca-cert.pem certificate". Signed-off-by: Fangge Jin <fjin(a)redhat.com> --- src/qemu/qemu.conf | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index a96bedb114..b1bd3cecbd 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -109,9 +109,8 @@ # issuing an x509 certificate to every client who needs to connect. # # Enabling this option will reject any client that does not have a -# ca-cert.pem certificate signed by the CA in the vnc_tls_x509_cert_dir -# (or default_tls_x509_cert_dir) as well as the corresponding client-*.pem -# files described in default_tls_x509_cert_dir. +# certificate(as described in default_tls_x509_verify) signed by the +# CA in the vnc_tls_x509_cert_dir (or default_tls_x509_cert_dir). # # If this option is not supplied, it will be set to the value of # "default_tls_x509_verify". @@ -248,9 +247,8 @@ # issuing an x509 certificate to every client who needs to connect. # # Enabling this option will reject any client that does not have a -# ca-cert.pem certificate signed by the CA in the chardev_tls_x509_cert_dir -# (or default_tls_x509_cert_dir) as well as the corresponding client-*.pem -# files described in default_tls_x509_cert_dir. +# certificate(as described in default_tls_x509_verify) signed by the +# CA in the chardev_tls_x509_cert_dir (or default_tls_x509_cert_dir). # # If this option is not supplied, it will be set to the value of # "default_tls_x509_verify". @@ -375,9 +373,8 @@ # issuing an x509 certificate to every client who needs to connect. # # Enabling this option will reject any client that does not have a -# ca-cert.pem certificate signed by the CA in the migrate_tls_x509_cert_dir -# (or default_tls_x509_cert_dir) as well as the corresponding client-*.pem -# files described in default_tls_x509_cert_dir. +# certificate(as described in default_tls_x509_verify) signed by the +# CA in the migrate_tls_x509_cert_dir (or default_tls_x509_cert_dir). # # If this option is not supplied, it will be set to the value of # "default_tls_x509_verify". @@ -412,9 +409,8 @@ # issuing an x509 certificate to every client who needs to connect. # # Enabling this option will reject any client that does not have a -# ca-cert.pem certificate signed by the CA in the backup_tls_x509_cert_dir -# (or default_tls_x509_cert_dir) as well as the corresponding client-*.pem -# files described in default_tls_x509_cert_dir. +# certificate(as described in default_tls_x509_verify) signed by the +# CA in the backup_tls_x509_cert_dir (or default_tls_x509_cert_dir). # # If this option is not supplied, it will be set to the value of # "default_tls_x509_verify". -- 2.20.1

2 1