- Devel - libvirt List Archives

[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 15 Oct '20

15 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 14 Oct '20

14 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