- Devel - libvirt List Archives

[libvirt PATCH 0/2] storage: fully support qcow2 with LUKS volumes
by Daniel P. Berrangé 17 Sep '20

17 Sep '20

We added support for LUKS with raw volumes, but never extended it to cover qcow2 volumes. Daniel P. Berrangé (2): util: detect LUKS encryption scheme in qcow2 files storage: add support for qcow2 LUKS encryption src/storage/storage_util.c | 70 +++++++++++++++++++++++++++++--------- src/util/virqemu.c | 23 +++++++++---- src/util/virqemu.h | 1 + src/util/virstoragefile.c | 16 +++++++++ 4 files changed, 88 insertions(+), 22 deletions(-) -- 2.26.2

2 3

[libvirt PATCH] remote: slightly improve debugging of socket selection
by Daniel P. Berrangé 17 Sep '20

17 Sep '20

The current debug message reports the "mode" after selection has completed, however, the "mode" value can be changed by the selection logic. It is thus beneficial to report most values upfront, and only report newly changed values at the end. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/remote/remote_sockets.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/remote/remote_sockets.c b/src/remote/remote_sockets.c index 7c69ed9e7f..478c78edc2 100644 --- a/src/remote/remote_sockets.c +++ b/src/remote/remote_sockets.c @@ -145,6 +145,11 @@ remoteGetUNIXSocket(remoteDriverTransport transport, g_autofree char *direct_sock_name = NULL; g_autofree char *legacy_sock_name = NULL; + VIR_DEBUG("Choosing remote socket for transport=%s mode=%s driver=%s ro=%d session=%d", + remoteDriverTransportTypeToString(transport), + remoteDriverModeTypeToString(mode), + driver, ro, session); + if (driver) direct_daemon = g_strdup_printf("virt%sd", driver); @@ -208,12 +213,9 @@ remoteGetUNIXSocket(remoteDriverTransport transport, return NULL; } - VIR_DEBUG("Chosen UNIX sockname=%s daemon=%s " - "for mode=%s transport=%s ro=%d session=%d", + VIR_DEBUG("Chosen UNIX sockname=%s daemon=%s with mode=%s", sock_name, NULLSTR(*daemon), - remoteDriverModeTypeToString(mode), - remoteDriverTransportTypeToString(transport), - ro, session); + remoteDriverModeTypeToString(mode)); return sock_name; } -- 2.26.2

2 1

[libvirt] [PATCH 00/12] qemu/virsh/docs: various minor fixes
by Lin Ma 16 Sep '20

16 Sep '20

Lin Ma (12): qemu: qemuDomainPMSuspendForDuration: Check availability of agent qemu: Return perf status that affect next boot for shutoff domains network: Check for active network during networkGetDHCPLeases virsh: domid: Error out if domain is not active virsh: net-port-create: log errors for non-existent xml file virsh: event: options --all and --event are mutually exclusive virsh: domblkinfo: options --all and --device are mutually exclusive virsh: domdisplay: options --all and --type are mutually exclusive virsh: iface-list: options --all and --inactive are mutually exclusive virsh: pool-list: options --all and --inactive are mutually exclusive docs: virsh: Document the IO mode 'io_uring' docs: virsh: Drop duplicate spelling for dompmwakeup docs/manpages/virsh.rst | 5 +++-- src/network/bridge_driver.c | 7 +++++++ src/qemu/qemu_driver.c | 8 ++++++-- tools/virsh-domain-monitor.c | 2 ++ tools/virsh-domain.c | 17 ++++++++++++----- tools/virsh-interface.c | 2 ++ tools/virsh-network.c | 1 + tools/virsh-pool.c | 2 ++ 8 files changed, 35 insertions(+), 9 deletions(-) -- 2.26.0

4 34

[PATCH] access: ensure ACL files are rebuilt when protocol changes
by Daniel P. Berrangé 16 Sep '20

16 Sep '20

Meson is not told that the .x protocol files are an input for the generator, so it doesn't know to setup a rebuild dependancy. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/access/meson.build | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/access/meson.build b/src/access/meson.build index b23838a776..ff088024f6 100644 --- a/src/access/meson.build +++ b/src/access/meson.build @@ -34,6 +34,7 @@ foreach name : [ 'remote', 'qemu', 'lxc' ] access_gen_headers += custom_target( header_file, + input: protocol_file, output: header_file, command: [ gendispatch_prog, '--mode=aclheader', name, name.to_upper(), protocol_file, @@ -43,6 +44,7 @@ foreach name : [ 'remote', 'qemu', 'lxc' ] access_gen_sources += custom_target( source_file, + input: protocol_file, output: source_file, command: [ gendispatch_prog, '--mode=aclbody', name, name.to_upper(), @@ -53,6 +55,7 @@ foreach name : [ 'remote', 'qemu', 'lxc' ] access_gen_sym += custom_target( syms_file, + input: protocol_file, output: syms_file, capture: true, command: [ @@ -62,6 +65,7 @@ foreach name : [ 'remote', 'qemu', 'lxc' ] access_gen_xml += custom_target( xml_file, + input: protocol_file, output: xml_file, capture: true, command: [ -- 2.26.2

3 2

[PATCH] hyperv: fix the number of threads per core
by Matt Coleman 16 Sep '20

16 Sep '20

The operands were reversed, producing an incorrect result. Co-authored-by: Sri Ramanujam <sramanujam(a)datto.com> Signed-off-by: Matt Coleman <matt(a)datto.com> --- src/hyperv/hyperv_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index 20d372b274..9b181ebfff 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -310,7 +310,7 @@ hypervNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info) } info->cores = processorList->data.common->NumberOfCores; - info->threads = info->cores / processorList->data.common->NumberOfLogicalProcessors; + info->threads = processorList->data.common->NumberOfLogicalProcessors / info->cores; info->cpus = info->sockets * info->cores; result = 0; -- 2.27.0

2 1

[PATCH] qemu: fix concurrency crash bug in force snapshot revert
by Nikolay Shirokovskiy 16 Sep '20

16 Sep '20

This patch is just revert of [1]. Actually we should NOT pass QEMU_ASYNC_JOB_NONE as that patch suggests while we are in async job in order to acquire nested jobs correctly. The patch tries to fix issues introduced by another patch [2] where jobs are mistakenly cleared out in qemuProcessStop. Later patch [3] fixed the issue introduced by patch [2]. Now we need to revert [1] as well as we now still have same concurrency crash issues as [3] described but for the force revert. [1] 0c4408c83: qemu: Don't use asyncJob after stop during snapshot revert [2] 888aa4b6b: qemuDomainObjPrivateDataClear: Don't leak @migParams [3] d75f865fb: qemu: fix concurrency crash bug in snapshot revert Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com> --- src/qemu/qemu_snapshot.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index 1e8ea80..5f49fd1 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -1719,7 +1719,6 @@ qemuSnapshotRevert(virDomainObjPtr vm, qemuDomainSaveCookiePtr cookie; virCPUDefPtr origCPU = NULL; unsigned int start_flags = VIR_QEMU_PROCESS_START_GEN_VMID; - qemuDomainAsyncJob jobType = QEMU_ASYNC_JOB_START; bool defined = false; virCheckFlags(VIR_DOMAIN_SNAPSHOT_REVERT_RUNNING | @@ -1899,9 +1898,6 @@ qemuSnapshotRevert(virDomainObjPtr vm, VIR_DOMAIN_EVENT_STOPPED, detail); virObjectEventStateQueue(driver->domainEventState, event); - /* Start after stop won't be an async start job, so - * reset to none */ - jobType = QEMU_ASYNC_JOB_NONE; goto load; } } @@ -1968,7 +1964,7 @@ qemuSnapshotRevert(virDomainObjPtr vm, rc = qemuProcessStart(snapshot->domain->conn, driver, vm, cookie ? cookie->cpu : NULL, - jobType, NULL, -1, NULL, snap, + QEMU_ASYNC_JOB_START, NULL, -1, NULL, snap, VIR_NETDEV_VPORT_PROFILE_OP_CREATE, start_flags); virDomainAuditStart(vm, "from-snapshot", rc >= 0); @@ -2003,7 +1999,7 @@ qemuSnapshotRevert(virDomainObjPtr vm, } rc = qemuProcessStartCPUs(driver, vm, VIR_DOMAIN_RUNNING_FROM_SNAPSHOT, - jobType); + QEMU_ASYNC_JOB_START); if (rc < 0) goto endjob; virObjectUnref(event); -- 1.8.3.1

2 1

[PATCH V2] Modify virCPUarmCompare to perform compare actions
by Zhenyu Zheng 16 Sep '20

16 Sep '20

Modify virCPUarmCompare in cpu_arm.c to perform compare action. This patch only adds host to host CPU compare, the rest cases remains the same. This is useful for source and destination host compare during migrations to avoid migration between different CPU models that have different CPU freatures. Signed-off-by: Zhenyu Zheng <zheng.zhenyu(a)outlook.com> --- src/cpu/cpu_arm.c | 51 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 47 insertions(+), 4 deletions(-) diff --git a/src/cpu/cpu_arm.c b/src/cpu/cpu_arm.c index 939a3b8390..e8581ec31f 100644 --- a/src/cpu/cpu_arm.c +++ b/src/cpu/cpu_arm.c @@ -463,11 +463,54 @@ virCPUarmBaseline(virCPUDefPtr *cpus, } static virCPUCompareResult -virCPUarmCompare(virCPUDefPtr host G_GNUC_UNUSED, - virCPUDefPtr cpu G_GNUC_UNUSED, - bool failMessages G_GNUC_UNUSED) +virCPUarmCompare(virCPUDefPtr host, + virCPUDefPtr cpu, + bool failIncompatible +) { - return VIR_CPU_COMPARE_IDENTICAL; + g_autofree char *message = NULL; + virCPUCompareResult ret = VIR_CPU_COMPARE_IDENTICAL; + + /* Only support host to host CPU compare for ARM*/ + if (cpu->type != VIR_CPU_TYPE_HOST) + return ret; + + if (!host || !host->model) { + if (failIncompatible) { + virReportError(VIR_ERR_CPU_INCOMPATIBLE, "%s", + _("unknown host CPU")); + ret = VIR_CPU_COMPARE_ERROR; + } else { + VIR_WARN("unknown host CPU"); + ret = VIR_CPU_COMPARE_INCOMPATIBLE; + } + return ret; + } + + /* Compare vendor and model to check if CPUs are identical */ + if (STRNEQ(host->vendor, cpu->vendor) || + STRNEQ(host->model, cpu->model)) { + VIR_DEBUG("host CPU model does not match required CPU model %s", + cpu->model); + if (message) { + message = g_strdup_printf(_("host CPU model does not match required " + "CPU model %s"), + cpu->model); + } + + ret = VIR_CPU_COMPARE_INCOMPATIBLE; + } + + if (failIncompatible && ret == VIR_CPU_COMPARE_INCOMPATIBLE) { + ret = VIR_CPU_COMPARE_ERROR; + if (message) { + virReportError(VIR_ERR_CPU_INCOMPATIBLE, "%s", message); + } else { + virReportError(VIR_ERR_CPU_INCOMPATIBLE, NULL); + } + } + + return ret; } static int -- 2.20.1

3 2

[PATCH] Add unit tests for timer validation
by Sebastian Mitterle 16 Sep '20

16 Sep '20

Add minimal coverage for non-x86_64 timer validation from commit 2f5d8ffebe5d3d00e16a051ed62ce8a703f18e7c Signed-off-by: Sebastian Mitterle <smitterl(a)redhat.com> --- tests/meson.build | 1 + tests/qemuvalidatetest.c | 107 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 108 insertions(+) create mode 100644 tests/qemuvalidatetest.c diff --git a/tests/meson.build b/tests/meson.build index 0a204c46e4..dfdc1e8b93 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -460,6 +460,7 @@ if conf.has('WITH_QEMU') { 'name': 'qemumigparamstest', 'link_with': [ test_qemu_driver_lib, test_utils_qemu_monitor_lib ], 'link_whole': [ test_utils_qemu_lib ] }, { 'name': 'qemumonitorjsontest', 'link_with': [ test_qemu_driver_lib, test_utils_qemu_monitor_lib ], 'link_whole': [ test_utils_qemu_lib ] }, { 'name': 'qemusecuritytest', 'sources': [ 'qemusecuritytest.c', 'qemusecuritymock.c' ], 'link_with': [ test_qemu_driver_lib ], 'link_whole': [ test_utils_qemu_lib ] }, + { 'name': 'qemuvalidatetest', 'link_with': [ test_qemu_driver_lib ], 'link_whole': [ test_file_wrapper_lib ] }, { 'name': 'qemuvhostusertest', 'link_with': [ test_qemu_driver_lib ], 'link_whole': [ test_file_wrapper_lib ] }, { 'name': 'qemuxml2argvtest', 'link_with': [ test_qemu_driver_lib, test_utils_qemu_monitor_lib ], 'link_whole': [ test_utils_qemu_lib, test_file_wrapper_lib ] }, { 'name': 'qemuxml2xmltest', 'link_with': [ test_qemu_driver_lib ], 'link_whole': [ test_utils_qemu_lib, test_file_wrapper_lib ] }, diff --git a/tests/qemuvalidatetest.c b/tests/qemuvalidatetest.c new file mode 100644 index 0000000000..617669dae0 --- /dev/null +++ b/tests/qemuvalidatetest.c @@ -0,0 +1,107 @@ +/* + * qemuvalidatetest.c: Test the qemu domain validation + * + * Copyright (C) 2010-2020 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ + +#include <config.h> + +#include "qemu/qemu_validate.c" +#include "testutils.h" +#include "internal.h" +#include "src/conf/virconftypes.h" +#include "src/conf/domain_conf.h" +#include "src/qemu/qemu_capabilities.h" +#include "src/util/virarch.h" + +static virDomainDefPtr +getDefWithUnsupportedTimerPresent(void) +{ + virDomainTimerDefPtr timer; + virDomainDefPtr def; + + if (VIR_ALLOC(timer) < 0) + return NULL; + + timer->present = 1; + timer->name = VIR_DOMAIN_TIMER_NAME_TSC; + + def = virDomainDefNew(); + def->virtType = VIR_DOMAIN_VIRT_QEMU; + def->os = (virDomainOSDef) { + .arch = VIR_ARCH_S390X, + .machine = (char *)"m" + }; + def->emulator = (char *)"e"; + def->clock = (virDomainClockDef) { + .ntimers = 1, + }; + if (VIR_ALLOC_N(def->clock.timers, 1) < 0) + return NULL; + def->clock.timers[0] = timer; + + return def; +} + +static int +errorTimersNotOnX86(const void *unused G_GNUC_UNUSED) +{ + int ret = 0; + char *log; + char expectedError[75] = "'tsc' timer is not supported for virtType=qemu arch=s390x machine=m guests"; + virDomainDefPtr def = getDefWithUnsupportedTimerPresent(); + if (qemuValidateDomainDefClockTimers(def, NULL) != -1) { + ret = -1; + } + log = virTestLogContentAndReset(); + if (!strstr(log, expectedError)) { + printf("expected : %s", expectedError); + printf("but got : %s", virTestLogContentAndReset()); + ret = -1; + } + return ret; +} + +static int +onlyErrorTimersNotOnX86IfPresent(const void *unused G_GNUC_UNUSED) +{ + int ret = 0; + virDomainDefPtr def = getDefWithUnsupportedTimerPresent(); + def->clock.timers[0]->present = 0; + if (qemuValidateDomainDefClockTimers(def, NULL) == -1) { + ret = -1; + } + return ret; +} + +static int +testsuite(void) +{ + int ret = 0; + +#define DO_TEST(NAME) \ + if (virTestRun("Command Exec " #NAME " test", \ + NAME, NULL) < 0) \ + ret = -1 + + DO_TEST(errorTimersNotOnX86); + DO_TEST(onlyErrorTimersNotOnX86IfPresent); + + return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; +} + +VIR_TEST_MAIN(testsuite); -- 2.26.2

2 2

[PATCH 0/2] qemu: Properly configure readonly iSCSI hostdevs
by Peter Krempa 16 Sep '20

16 Sep '20

See patch 2/2. Peter Krempa (2): qemuxml2argvtest: hostdev-scsi-virtio-scsi: Add <readonly/> to one of the iSCSI hostdevs qemuBuildHostdevSCSIAttachPrepare: Propagate 'readonly' flag also for iSCSI src/qemu/qemu_command.c | 2 +- .../qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.args | 2 +- .../qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args | 2 +- .../hostdev-scsi-virtio-scsi.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml | 1 + tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml | 1 + 6 files changed, 6 insertions(+), 4 deletions(-) -- 2.26.2

2 3

[PATCH] docs/system: clarify deprecation scheduled
by Stefan Hajnoczi 15 Sep '20

15 Sep '20

The sentence explaining the deprecation schedule is ambiguous. Make it clear that a feature deprecated in the Nth release is guaranteed to remain available in the N+1th release. Removal can occur in the N+2nd release or later. As an example of this in action, see commit 25956af3fe5dd0385ad8017bc768a6afe41e2a74 ("block: Finish deprecation of 'qemu-img convert -n -o'"). The feature was deprecated in QEMU 4.2.0. It was present in the 5.0.0 release and removed in the 5.1.0 release. Signed-off-by: Stefan Hajnoczi <stefanha(a)redhat.com> --- docs/system/deprecated.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index 851dbdeb8a..fecfb2f1c1 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -4,9 +4,9 @@ Deprecated features In general features are intended to be supported indefinitely once introduced into QEMU. In the event that a feature needs to be removed, it will be listed in this section. The feature will remain functional -for 2 releases prior to actual removal. Deprecated features may also -generate warnings on the console when QEMU starts up, or if activated -via a monitor command, however, this is not a mandatory requirement. +for 1 more release after deprecation. Deprecated features may also generate +warnings on the console when QEMU starts up, or if activated via a monitor +command, however, this is not a mandatory requirement. Prior to the 2.10.0 release there was no official policy on how long features would be deprecated prior to their removal, nor -- 2.26.2

4 5