- Devel - libvirt List Archives

[libvirt PATCH] qemu: Fix affinity typo
by Ján Tomko 22 Jul '20

22 Jul '20

Fixes: 4c0398b5284d14c55eca51095673b6fadbbd85fb Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- Pushed as trivial. src/qemu/qemu_process.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 1006f41614..ec6ca14bbd 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2653,7 +2653,7 @@ qemuProcessSetupPid(virDomainObjPtr vm, virDomainNumatuneMemMode mem_mode; virCgroupPtr cgroup = NULL; virBitmapPtr use_cpumask = NULL; - virBitmapPtr afinity_cpumask = NULL; + virBitmapPtr affinity_cpumask = NULL; g_autoptr(virBitmap) hostcpumap = NULL; g_autofree char *mem_mask = NULL; int ret = -1; @@ -2679,7 +2679,7 @@ qemuProcessSetupPid(virDomainObjPtr vm, * its config file */ if (qemuProcessGetAllCpuAffinity(&hostcpumap) < 0) goto cleanup; - afinity_cpumask = hostcpumap; + affinity_cpumask = hostcpumap; } /* @@ -2720,11 +2720,11 @@ qemuProcessSetupPid(virDomainObjPtr vm, } - if (!afinity_cpumask) - afinity_cpumask = use_cpumask; + if (!affinity_cpumask) + affinity_cpumask = use_cpumask; /* Setup legacy affinity. */ - if (afinity_cpumask && virProcessSetAffinity(pid, afinity_cpumask) < 0) + if (affinity_cpumask && virProcessSetAffinity(pid, affinity_cpumask) < 0) goto cleanup; /* Set scheduler type and priority, but not for the main thread. */ -- 2.26.2

1 0

Format/style of UI message
by Pino Toscano 22 Jul '20

22 Jul '20

Hi, I recently took a look at the UI/user visible messages from libvirt, which are translated using gettext. They are extracted in a single libvirt.pot catalog, which includes messages from libvirt.so itself (mostly, if not all, errors), the separate daemons, the helper tools, and from virsh. I noticed there is plently of room for improvements: what strikes is the lack of consistency among the messages. Let me state first: I understand that not all the people are native English speakers (I am not), so I'm not picking against anyone. Some examples: a) different capitalization: - "cannot open %s" - "Cannot open %s" b) different quoting for files/identifiers/etc: - "Cannot open %s" - "Cannot open '%s'" c) different verbs for failed actions: - "Cannot frobnicate ..." - "Could not frobnicate ..." - "Did not frobnicate ..." - "Failed to frobnicate ..." - "Unable to frobnicate ..." depending on the message, also "frobbing failed" d) sometimes contractions ("couldn't", "don't", etc), sometimes not ("could not", "do not", etc) e) what QEMU/etc supports: - "... by this QEMU binary" - "... for this QEMU binary" - "... in this QEMU binary" - "... with this QEMU binary" - "... by this QEMU" - "... for this QEMU" - "... with this QEMU" - "... with this binary" [in a QEMU file] - "... [supported] by qemu" there is also "qemu does not support ...", which I think it can stay for now; also both "available [by/for/etc]" and "supported [by/for/etc]" are used I can give it a try in fixing the messages to be more consistent all around; before I start the mass editing, I need to know which style to follow: a) it seems like the virError fields @message, @str1, @str2 and @str3 are joined together in reporting/log strings like "error: <text>"; hence, should they be not capitalized? It may look OK in English, but less nice and hard to fix in translations. Obviously, sentences as shown in tools (e.g. virsh) definitely need to be properly capitalized. b) should identifiers such as filenames, paths, XML tags, JSON fields, etc be always quoted? c) which verb to use when something failed? "could not" is a subjective thing, not a past action; "failed" seems to imply that something was attempted; "did not" seems to imply that it was not done, but nothing whether it was attempted; the rest sort of indicate the ability to do something. d) allow contractions or not? They are generally used in spoken/informal language, and while libvirt is not that formal it should not be that colloquial either IMHO; also, they make the text slightly harder to understand by non-native speakers, and they are lost when translating. A POV on the matter is: https://www.businesswritingblog.com/business_writing/2006/04/dont_use_contr… e) which message to use to indicate that QEMU does not support something? Thanks, -- Pino Toscano

4 3

The issue about adding multipath device's targets into qemu-pr-helper's namespace
by Lin Ma 22 Jul '20

22 Jul '20

Hi all, I have a namespace question about passthrough disk(multipath device). In case of enabling namespace and cgroups in qemu.conf, The target(s) of the multipath device won't be added into qemu-pr-helper's namespace under certain situation, It causes the PERSISTENT RESERVE command failure in guest. While user starts a vm, To build namespace, The qemuDomainSetupDisk() will be invoked via threadA(this thread id will be the qemu's pid), To build cgroup, The qemuSetupImagePathCgroup() will be invoked via threadB. Both of the functions invoke the virDevMapperGetTargets() trying to parse a multipath device to target paths string, Then fill the targetPaths[]. The issue I experienced is: After libvirtd started, Everything works well for the first booted vm which has the passthrough multipath device. But If I shut it down & start it again, OR keep it running & start another vm which has other passthrough multipath device, Then the target(s) of the fresh started vm won't be added into the related qemu-pr-helper's namespace and it causes PERSISTENT RESERVE command failure in the corresponding guest. I digged into code, In this situation, The targetPaths[] in qemuDomainSetupDisk() won't be filled, it keeps NULL after virDevMapperGetTargets() returns. The virDevMapperGetTargets doesn't fill targetPaths[] because the dm_task_run() of libdevmapper returns 0 with errno 9(Bad file descriptor). So far, I don't understand why the dm_task_run() return 0 in this situation. BTW, The virDevMapperGetTargets() can always successfully fill the targetPaths[] in qemuSetupImagePathCgroup(). Please refer to the following 2 tests: The multipath configuration on host: host:~ # multipath -l vm1-data (3600140582d9024bc13f4b8db5ff12de0) dm-11 FreeNAS,lv68 size=6.0G features='0' hwhandler='1 alua' wp=rw `-+- policy='service-time 0' prio=0 status=active `- 2:0:0:2 sdd 8:48 active undef running vm2-data (36001405fc5f29ace3ec4fb8acd32aae5) dm-8 FreeNAS,lv46 size=4.0G features='0' hwhandler='1 alua' wp=rw `-+- policy='service-time 0' prio=0 status=active `- 2:0:0:1 sde 8:64 active undef running =================================================================== Test A: host:~ # systemctl restart libvirtd host:~ # virsh list Id Name State -------------------- host:~ # host:~ # virsh domblklist vm1 Target Source ------------------------------------------ vda /opt/vms/vm1/disk0.qcow2 sda /dev/mapper/vm1-data host:~ # host:~ # virsh start vm1 Domain vm1 started host:~ # virsh list Id Name State --------------------------- 1 vm1 running host:~ # nsenter -t $(pidof qemu-pr-helper) -a bash host:~ # ls -l /dev/sd* brw-rw---- 1 root disk 8, 48 Jul 14 16:30 /dev/sdd host:~ # exit exit host:~ # vm1:~ # lsscsi [0:0:0:0] disk FreeNAS lv68 0123 /dev/sda vm1:~ # vm1:~ # sg_persist --in -k /dev/sda FreeNAS lv68 0123 Peripheral device type: disk PR generation=0x0, there are NO registered reservation keys vm1:~ # host:~ # virsh shutdown vm1 Domain vm1 is being shutdown host:~ # virsh list Id Name State -------------------- host:~ # host:~ # virsh start vm1 Domain vm1 started host:~ # virsh list Id Name State --------------------------- 2 vm1 running host:~ # nsenter -t $(pidof qemu-pr-helper) -a bash host:~ # ls -l /dev/sd* ls: cannot access '/dev/sd*': No such file or directory host:~ # exit exit host:~ # vm1:~ # sg_persist --in -k /dev/sda FreeNAS lv68 0123 Peripheral device type: disk PR in (Read keys): Aborted command Aborted command vm1:~ # =================================================================== Test B: host:~ # systemctl restart libvirtd host:~ # virsh list Id Name State -------------------- host:~ # host:~ # virsh domblklist vm1 Target Source ------------------------------------------ vda /opt/vms/vm1/disk0.qcow2 sda /dev/mapper/vm1-data host:~ # host:~ # virsh start vm1 Domain vm1 started host:~ # virsh list Id Name State --------------------------- 1 vm1 running host:~ # nsenter -t $(pidof qemu-pr-helper) -a bash host:~ # ls -l /dev/sd* brw-rw---- 1 root disk 8, 48 Jul 14 17:28 /dev/sdd host:~ # exit exit host:~ # vm1:~ # lsscsi [2:0:0:0] disk FreeNAS lv68 0123 /dev/sda vm1:~ # vm1:~ # sg_persist --in -k /dev/sda FreeNAS lv68 0123 Peripheral device type: disk PR generation=0x0, there are NO registered reservation keys vm1:~ # host:~ # virsh list Id Name State --------------------------- 1 vm1 running host:~ # host:~ # virsh domblklist vm2 Target Source ------------------------------------------ vda /opt/vms/vm2/disk0.qcow2 sda /dev/mapper/vm2-data host:~ # host:~ # virsh start vm2 Domain vm2 started host:~ # virsh list Id Name State --------------------------- 1 vm1 running 2 vm2 running host:~ # nsenter -t $(qemu-pr-helper pid of vm2) -a bash host:~ # ls -l /dev/sd* ls: cannot access '/dev/sd*': No such file or directory host:~ # exit exit host:~ # vm2:~ # lsscsi [0:0:0:0] disk FreeNAS lv46 0123 /dev/sda vm2:~ # vm2:~ # sg_persist --in -k /dev/sda FreeNAS lv46 0123 Peripheral device type: disk PR in (Read keys): Aborted command Aborted command vm2:~ # =================================================================== Any comments will be much appreciated. Thanks in advance, Lin

3 6

[PATCH] news: Remove one of last two instances of -drive if=none usage
by Jianan Gao 22 Jul '20

22 Jul '20

There is a series of patched for describing remove one of last two instances of -drive if=none usage to help QEMU in deprecation of -drive if=none without the need to refactor all old boards. Signed-off-by: Jianan Gao <jgao(a)redhat.com> --- NEWS.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index ff977968c7..b763e45e11 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -147,6 +147,11 @@ v6.4.0 (2020-06-02) already does in these cases. Users are encouraged to provide complete NUMA topologies to avoid unexpected changes in the domain XML. + * qemu: remove one of last two instances of -drive if=none usage + + �� Remove one of last two instances of -drive if=none usage to help QEMU in + deprecation of -drive if=none without the need to refactor all old boards. + * **Bug fixes** * qemu: fixed regression in network device hotplug with new qemu versions -- 2.21.3

3 4

[PATCH 00/10] resolve hangs/crashes on libvirtd shutdown
by Nikolay Shirokovskiy 22 Jul '20

22 Jul '20

This series follows [1] but address the issue slightly differently. Instead of polling for RPC thread pool termination it waits for thread pool drain in distinct thread and then signal the main loop to exit. The series introduces new driver's methods stateShutdown/stateShutdownWait to finish all driver's background threads. The methods however are only implemented for qemu driver and only partially. There are other drivers that have background threads and I don't check every one of them in terms of how they manage their background threads. For example node driver creates 2 threads. One of them is supposed to live a for a short amount of time and thus not tracked. This thread can cause issues on shutdown. The second thread is tracked and finished synchronously on driver cleanup. So this thread can not cause crashes but can cause hangs theoretically speaking so we may want to move the thread finishing to stateShutdownWait method so that possible hang will be handled by shutdown timeout. The qemu driver also has untracked threads and they can cause crashes on shutdown. For example reconnect threads or reboot thread. These need to be tracked. I'm going to address these issues in qemu and other drivers once the overall approach will be approved. I added 2 new driver's methods so that thread finishing will be done in parallel. If we have only one method then the shutdown is done one by one effectively. I've added clean shutdown timeout in event loop as suggested by Daniel in [2]. Now I think why we can't just go with systemd unit management? Systemd will eventually send SIGKILL and we can tune the timeout using TimeoutStopUSec parameter. This way we even don't need to introduce new driver's methods. Driver's background threads can be finished in stateCleanup method. AFAIU as drivers are cleaned up in reverse order it is safe in the sense that already cleaned up driver can not be used by background threads of not yet cleaned up driver. Of course this way the cleanup is not done in parallel. Well to turn it into parallel we can introduce just stateShutdown which we don't need to call in netdaemon code and thus don't introduce undesired dependency of netdaemon on drivers concept. [1] Resolve libvirtd hang on termination with connected long running client https://www.redhat.com/archives/libvir-list/2018-July/msg00382.html [2] Races / crashes in shutdown of libvirtd daemon https://www.redhat.com/archives/libvir-list/2020-April/msg01328.html Nikolay Shirokovskiy (10): libvirt: add stateShutdown/stateShutdownWait to drivers util: always initialize priority condition util: add stop/drain functions to thread pool rpc: don't unref service ref on socket behalf twice rpc: finish all threads before exiting main loop vireventthread: add virEventThreadClose qemu: exit thread synchronously in qemuDomainObjStopWorker qemu: implement driver's shutdown/shutdown wait methods rpc: cleanup virNetDaemonClose method util: remove unused virThreadPoolNew macro scripts/check-drivername.py | 2 + src/driver-state.h | 8 ++++ src/libvirt.c | 42 +++++++++++++++++++ src/libvirt_internal.h | 2 + src/libvirt_private.syms | 3 ++ src/libvirt_remote.syms | 1 - src/qemu/qemu_domain.c | 1 + src/qemu/qemu_driver.c | 32 +++++++++++++++ src/remote/remote_daemon.c | 3 -- src/rpc/virnetdaemon.c | 95 ++++++++++++++++++++++++++++++++++++------- src/rpc/virnetdaemon.h | 2 - src/rpc/virnetserver.c | 8 ++++ src/rpc/virnetserver.h | 1 + src/rpc/virnetserverservice.c | 1 - src/util/vireventthread.c | 9 ++++ src/util/vireventthread.h | 1 + src/util/virthreadpool.c | 65 ++++++++++++++++++++--------- src/util/virthreadpool.h | 6 +-- 18 files changed, 238 insertions(+), 44 deletions(-) -- 1.8.3.1

3 24

Re: [ovirt-devel] [ARM64] Possiblity to support oVirt on ARM64
by Nir Soffer 22 Jul '20

22 Jul '20

On Sun, Jul 19, 2020 at 5:04 PM Zhenyu Zheng <zhengzhenyulixi(a)gmail.com> wrote: > > Hi oVirt, > > We are currently trying to make oVirt work on ARM64 platform, since I'm quite new to oVirt community, I'm wondering what is the current status about ARM64 support in the oVirt upstream, as I saw the oVirt Wikipedia page mentioned there is an ongoing efforts to support ARM platform. We have a small team here and we are willing to also help to make this work. Hi Zhenyu, I think this is a great idea, both supporting more hardware, and enlarging the oVirt community. Regarding hardware support we depend mostly on libvirt and qemu, and I don't know that is the status. Adding relevant lists and people. I don't know about any effort on oVirt side, but last week I added arm builds for ovirt-imageio and it works: https://copr.fedorainfracloud.org/coprs/nsoffer/ovirt-imageio-preview/build… We have many dependendencies, but oVirt itself is mostly python and java, with tiny bits in C or using ctypes, so it should not be too hard. I think the first thing is getting some hardware for testing. Do you have such hardware, or have some contacts that can help to get hardware contribution for this? Nir

4 4

[PATCH 1/1] formatdomain.html.in: mention pSeries NVDIMM 'align down' mechanic
by Daniel Henrique Barboza 22 Jul '20

22 Jul '20

The reason why we align down the guest area (total-size - label-size) is explained in the body of qemuDomainNVDimmAlignSizePseries(). This behavior must also be documented in the user docs. Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com> --- docs/formatdomain.html.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index f5ee97de81..af6c809ddd 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -9412,8 +9412,10 @@ qemu-kvm -net nic,model=? /dev/null </p> <ol> <li>the minimum label size is 128KiB,</li> - <li>the remaining size (total-size - label-size) will be aligned - to 4KiB as default.</li> + <li>the remaining size (total-size - label-size), also called guest + area, will be aligned to 4KiB as default. For pSeries guests, the + guest area will be aligned down to 256MiB, and the minimum size + of the guest area must be at least 256MiB plus the label-size.</li> </ol> </dd> -- 2.26.2

2 2

[libvirt PATCH] docs: virConnectGetCapabilities do not provide pool types
by Pino Toscano 22 Jul '20

22 Jul '20

Remove the paragraph in the storage pool page that mentions virConnectGetCapabilities, as virConnectGetCapabilities does not return any information about pools. Signed-off-by: Pino Toscano <ptoscano(a)redhat.com> --- docs/formatstoragecaps.html.in | 6 ------ 1 file changed, 6 deletions(-) diff --git a/docs/formatstoragecaps.html.in b/docs/formatstoragecaps.html.in index ee3888f44d..d8a1cacd96 100644 --- a/docs/formatstoragecaps.html.in +++ b/docs/formatstoragecaps.html.in @@ -13,12 +13,6 @@ supported, and if relevant the source format types, the required source elements, and the target volume format types. </p> - <p>The Storage Pool Capabilities XML provides more information than the - <a href="/html/libvirt-libvirt-host.html#virConnectGetCapabilities"> - <code>virConnectGetCapabilities</code> - </a> - which only provides an enumerated list of supported pool types.</p> - <h2><a id="elements">Element and attribute overview</a></h2> <p>A query interface was added to the virConnect API's to retrieve the -- 2.26.2

3 5

[PATCH] qemu: pre-create the dbus directory in qemuStateInitialize
by Bihong Yu 22 Jul '20

22 Jul '20

>From 187323ce736dcd9b1a177d552630b0c6859a4798 Mon Sep 17 00:00:00 2001 From: Bihong Yu <yubihong(a)huawei.com> Date: Tue, 14 Jul 2020 15:44:05 +0800 Subject: [PATCH] qemu: pre-create the dbus directory in qemuStateInitialize There are races condiction to make '/run/libvirt/qemu/dbus' directory in virDirCreateNoFork() while concurrent start VMs, and get "failed to create directory '/run/libvirt/qemu/dbus': File exists" error message. pre-create the dbus directory in qemuStateInitialize. Signed-off-by:Bihong Yu <yubihong(a)huawei.com> --- src/qemu/qemu_dbus.c | 4 +--- src/qemu/qemu_dbus.h | 2 +- src/qemu/qemu_driver.c | 4 ++++ src/qemu/qemu_process.c | 3 --- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_dbus.c b/src/qemu/qemu_dbus.c index 51f6c94..0e0306a 100644 --- a/src/qemu/qemu_dbus.c +++ b/src/qemu/qemu_dbus.c @@ -34,10 +34,8 @@ VIR_LOG_INIT("qemu.dbus"); int -qemuDBusPrepareHost(virQEMUDriverPtr driver) +qemuDBusPreparePath(virQEMUDriverConfigPtr cfg) { - g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); - return virDirCreate(cfg->dbusStateDir, 0770, cfg->user, cfg->group, VIR_DIR_CREATE_ALLOW_EXIST); } diff --git a/src/qemu/qemu_dbus.h b/src/qemu/qemu_dbus.h index 474eb10..6ce9f7b 100644 --- a/src/qemu/qemu_dbus.h +++ b/src/qemu/qemu_dbus.h @@ -21,7 +21,7 @@ #include "qemu_conf.h" #include "qemu_domain.h" -int qemuDBusPrepareHost(virQEMUDriverPtr driver); +int qemuDBusPreparePath(virQEMUDriverConfigPtr cfg); char *qemuDBusGetAddress(virQEMUDriverPtr driver, virDomainObjPtr vm); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d185666..52b68c9 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -50,6 +50,7 @@ #include "qemu_security.h" #include "qemu_checkpoint.h" #include "qemu_backup.h" +#include "qemu_dbus.h" #include "virerror.h" #include "virlog.h" @@ -790,6 +791,9 @@ qemuStateInitialize(bool privileged, cfg->migrationPortMax)) == NULL) goto error; + if (qemuDBusPreparePath(cfg) < 0) + goto error; + if (qemuSecurityInit(qemu_driver) < 0) goto error; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index eba14ed..46620ca 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -6449,9 +6449,6 @@ qemuProcessPrepareHost(virQEMUDriverPtr driver, qemuDomainObjPrivatePtr priv = vm->privateData; g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); - if (qemuDBusPrepareHost(driver) < 0) - return -1; - if (qemuPrepareNVRAM(cfg, vm) < 0) return -1; -- 1.8.3.1

3 5

[libvirt PATCH v2 00/15] convert network and nwfilter directories to glib memory allocation.
by Laine Stump 21 Jul '20

21 Jul '20

V1 was here: https://www.redhat.com/archives/libvir-list/2020-June/msg01156.html Some patches were ACKed and pushed. I re-ordered/re-organized most of the rest, and removed some others to deal with separately (the xmlNodeContent stuff) What's left here is a few preliminary patches, then the standard set, once for network and again for nwfilter: 1) convert from VIR_(RE)ALLOC(_N) to g_new0()/g_renew() 2) use g_auto*() where appropriate, removing unneeded free's 3) get rid of now-extraneous labels 4) (controversial) replace any remaining VIR_FREE() with g_free() (and possibly g_clear_pointer() when needed NB: these patches require my virBuffer "convert to g_auto" series as a prerequisite: https://www.redhat.com/archives/libvir-list/2020-July/msg00185.html Changes from V1: * move conversion of virFirewall and virBuffer automatics to another series (see above) * re-order to replace VIR_ALLOC first (without adding any g_auto*) instead of doing it after g_auto conversion of automatics, then do all g_auto additions at o * separate label elimination into separate patches per jtomko's suggestion. Laine Stump (15): replace g_new() with g_new0() for consistency util: define g_autoptr cleanups for a couple dnsmasq objects define g_autoptr cleanup function for virNetworkDHCPLease network: replace VIR_ALLOC/REALLOC with g_new0/g_renew network: use g_auto wherever appropriate network: eliminate unnecessary labels network: use g_free() in place of remaining VIR_FREE() nwfilter: remove unnecessary code from ebtablesGetSubChainInsts() nwfilter: clear nrules when resetting virNWFilterInst nwfilter: define a typedef for struct ebtablesSubChainInst nwfilter: transform logic in virNWFilterRuleInstSort to eliminate label nwfilter: use standard label names when reasonable nwfilter: replace VIR_ALLOC with g_new0 nwfilter: convert local pointers to use g_auto* nwfilter: convert remaining VIR_FREE() to g_free() src/datatypes.h | 2 + src/network/bridge_driver.c | 536 ++++++++-------------- src/network/bridge_driver_linux.c | 22 +- src/network/leaseshelper.c | 16 +- src/nwfilter/nwfilter_dhcpsnoop.c | 150 +++--- src/nwfilter/nwfilter_driver.c | 13 +- src/nwfilter/nwfilter_ebiptables_driver.c | 119 ++--- src/nwfilter/nwfilter_gentech_driver.c | 57 ++- src/nwfilter/nwfilter_learnipaddr.c | 43 +- src/qemu/qemu_backup.c | 2 +- src/util/virdnsmasq.h | 4 + src/util/virutil.c | 2 +- tests/qemuhotplugmock.c | 2 +- 13 files changed, 379 insertions(+), 589 deletions(-) -- 2.25.4

3 38

[PATCH] NEWS: mention readonly attribute is not yet supported by virtiofsd
by Jianan Gao 21 Jul '20

21 Jul '20

There was a clear statement on not supported by virtiofsd with readonly attribute. Signed-off-by: Jianan Gao <jgao(a)redhat.com> --- NEWS.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 2c6c628c61..ff977968c7 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -170,6 +170,10 @@ v6.4.0 (2020-06-02) firewalld resets all iptables rules and chains on restart, and this includes deleting those created by libvirt. + * qemu: reject readonly attribute for virtiofs + + virtiofs does not yet support read-only shares. + v6.3.0 (2020-05-05) =================== -- 2.21.3

2 1

[libvirt PATCH] qemu: Drop ret variable from qemuConnectCPUModelComparison
by Jiri Denemark 21 Jul '20

21 Jul '20

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_driver.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b8ba2e3fb9..8e81c30a93 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -13150,7 +13150,6 @@ qemuConnectCPUModelComparison(virQEMUCapsPtr qemuCaps, { g_autoptr(qemuProcessQMP) proc = NULL; g_autofree char *result = NULL; - int ret = VIR_CPU_COMPARE_ERROR; if (!(proc = qemuProcessQMPNew(virQEMUCapsGetBinary(qemuCaps), libDir, runUid, runGid, false))) @@ -13163,15 +13162,17 @@ qemuConnectCPUModelComparison(virQEMUCapsPtr qemuCaps, return VIR_CPU_COMPARE_ERROR; if (STREQ(result, "identical")) - ret = VIR_CPU_COMPARE_IDENTICAL; - else if (STREQ(result, "superset")) - ret = VIR_CPU_COMPARE_SUPERSET; - else if (failIncompatible) + return VIR_CPU_COMPARE_IDENTICAL; + + if (STREQ(result, "superset")) + return VIR_CPU_COMPARE_SUPERSET; + + if (failIncompatible) { virReportError(VIR_ERR_CPU_INCOMPATIBLE, NULL); - else - ret = VIR_CPU_COMPARE_INCOMPATIBLE; + return VIR_CPU_COMPARE_ERROR; + } - return ret; + return VIR_CPU_COMPARE_INCOMPATIBLE; } -- 2.27.0

2 1

[PATCH] network: refactor networkSetIPv6Sysctls() for proper g_autofree usage
by Laine Stump 21 Jul '20

21 Jul '20

This function used the same char* three times for different purposes, freeing it after each use. Since we don't want to ever manually free an autofree'd pointer, modify it to use three separate char*, and make them all g_autofree. Signed-off-by: Laine Stump <laine(a)redhat.com> --- This was suggested by Jan in https://www.redhat.com/archives/libvir-list/2020-July/msg00805.html pushing this patch along with the patch 5 referenced there will permit pushing patch 06/15 of that series unmodified. src/network/bridge_driver.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index dd8f34e543..6d341dba7c 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -2248,7 +2248,9 @@ static int networkSetIPv6Sysctls(virNetworkObjPtr obj) { virNetworkDefPtr def = virNetworkObjGetDef(obj); - char *field = NULL; + g_autofree char *disable_ipv6 = NULL; + g_autofree char *accept_ra = NULL; + g_autofree char *autoconf = NULL; int ret = -1; bool enableIPv6 = !!virNetworkDefGetIPByIndex(def, AF_INET6, 0); @@ -2256,10 +2258,10 @@ networkSetIPv6Sysctls(virNetworkObjPtr obj) * network. But also unset it if there *are* ipv6 addresses, as we * can't be sure of its default value. */ - field = g_strdup_printf(SYSCTL_PATH "/net/ipv6/conf/%s/disable_ipv6", - def->bridge); + disable_ipv6 = g_strdup_printf(SYSCTL_PATH "/net/ipv6/conf/%s/disable_ipv6", + def->bridge); - if (access(field, W_OK) < 0 && errno == ENOENT) { + if (access(disable_ipv6, W_OK) < 0 && errno == ENOENT) { if (!enableIPv6) VIR_DEBUG("ipv6 appears to already be disabled on %s", def->bridge); @@ -2267,13 +2269,12 @@ networkSetIPv6Sysctls(virNetworkObjPtr obj) goto cleanup; } - if (virFileWriteStr(field, enableIPv6 ? "0" : "1", 0) < 0) { + if (virFileWriteStr(disable_ipv6, enableIPv6 ? "0" : "1", 0) < 0) { virReportSystemError(errno, _("cannot write to %s to enable/disable IPv6 " - "on bridge %s"), field, def->bridge); + "on bridge %s"), disable_ipv6, def->bridge); goto cleanup; } - VIR_FREE(field); /* The rest of the ipv6 sysctl tunables should always be set the * same, whether or not we're using ipv6 on this bridge. @@ -2282,30 +2283,29 @@ networkSetIPv6Sysctls(virNetworkObjPtr obj) /* Prevent guests from hijacking the host network by sending out * their own router advertisements. */ - field = g_strdup_printf(SYSCTL_PATH "/net/ipv6/conf/%s/accept_ra", - def->bridge); + accept_ra = g_strdup_printf(SYSCTL_PATH "/net/ipv6/conf/%s/accept_ra", + def->bridge); - if (virFileWriteStr(field, "0", 0) < 0) { + if (virFileWriteStr(accept_ra, "0", 0) < 0) { virReportSystemError(errno, - _("cannot disable %s"), field); + _("cannot disable %s"), accept_ra); goto cleanup; } - VIR_FREE(field); /* All interfaces used as a gateway (which is what this is, by * definition), must always have autoconf=0. */ - field = g_strdup_printf(SYSCTL_PATH "/net/ipv6/conf/%s/autoconf", def->bridge); + autoconf = g_strdup_printf(SYSCTL_PATH "/net/ipv6/conf/%s/autoconf", + def->bridge); - if (virFileWriteStr(field, "0", 0) < 0) { + if (virFileWriteStr(autoconf, "0", 0) < 0) { virReportSystemError(errno, - _("cannot disable %s"), field); + _("cannot disable %s"), autoconf); goto cleanup; } ret = 0; cleanup: - VIR_FREE(field); return ret; } -- 2.25.4

2 1

[PATCH] security: Remove the superfluous break
by Yi Wang 21 Jul '20

21 Jul '20

From: Liao Pingfang <liao.pingfang(a)zte.com.cn> Remove the superfuous break, as there is a 'return' before it. Signed-off-by: Liao Pingfang <liao.pingfang(a)zte.com.cn> Signed-off-by: Yi Wang <wang.yi59(a)zte.com.cn> --- src/security/security_apparmor.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c index 3f6a213..eea37dc 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -699,7 +699,6 @@ AppArmorSetMemoryLabel(virSecurityManagerPtr mgr, return -1; } return reload_profile(mgr, def, mem->nvdimmPath, true); - break; case VIR_DOMAIN_MEMORY_MODEL_NONE: case VIR_DOMAIN_MEMORY_MODEL_DIMM: case VIR_DOMAIN_MEMORY_MODEL_LAST: -- 2.9.5

3 2

[PATCH] qemu: Remove superfluous breaks
by Yi Wang 21 Jul '20

21 Jul '20

From: Liao Pingfang <liao.pingfang(a)zte.com.cn> Remove superfluous breaks, as there is a "return" before them. Signed-off-by: Liao Pingfang <liao.pingfang(a)zte.com.cn> Signed-off-by: Yi Wang <wang.yi59(a)zte.com.cn> --- src/qemu/qemu_firmware.c | 1 - src/qemu/qemu_hostdev.c | 1 - 2 files changed, 2 deletions(-) diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index bd251c0..2edc0ef 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -1111,7 +1111,6 @@ qemuFirmwareEnableFeatures(virQEMUDriverPtr driver, _("domain has SMM turned off " "but chosen firmware requires it")); return -1; - break; case VIR_TRISTATE_SWITCH_ABSENT: VIR_DEBUG("Enabling SMM feature"); def->features[VIR_DOMAIN_FEATURE_SMM] = VIR_TRISTATE_SWITCH_ON; diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c index fb63da2..d39f9d7 100644 --- a/src/qemu/qemu_hostdev.c +++ b/src/qemu/qemu_hostdev.c @@ -202,7 +202,6 @@ qemuHostdevPreparePCIDevicesCheckSupport(virDomainHostdevDefPtr *hostdevs, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("host doesn't support legacy PCI passthrough")); return false; - break; case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_XEN: case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_TYPE_LAST: -- 2.9.5

3 2

[PATCH] conf: Remove superfluous breaks
by Yi Wang 21 Jul '20

21 Jul '20

From: Liao Pingfang <liao.pingfang(a)zte.com.cn> Remove superfluous breaks, as there is a "return" before them. Signed-off-by: Liao Pingfang <liao.pingfang(a)zte.com.cn> Signed-off-by: Yi Wang <wang.yi59(a)zte.com.cn> --- src/conf/domain_conf.c | 6 ------ src/conf/network_conf.c | 12 ------------ src/conf/nwfilter_params.c | 4 ---- 3 files changed, 22 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index bcebfc6..355aa74 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1840,7 +1840,6 @@ const char *virDomainInputDefGetPath(virDomainInputDefPtr input) case VIR_DOMAIN_INPUT_TYPE_KBD: case VIR_DOMAIN_INPUT_TYPE_LAST: return NULL; - break; case VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH: return input->source.evdev; @@ -2728,7 +2727,6 @@ virDomainChrSourceDefIsEqual(const virDomainChrSourceDef *src, case VIR_DOMAIN_CHR_TYPE_DEV: case VIR_DOMAIN_CHR_TYPE_PIPE: return STREQ_NULLABLE(src->data.file.path, tgt->data.file.path); - break; case VIR_DOMAIN_CHR_TYPE_NMDM: return STREQ_NULLABLE(src->data.nmdm.master, tgt->data.nmdm.master) && STREQ_NULLABLE(src->data.nmdm.slave, tgt->data.nmdm.slave); @@ -8425,7 +8423,6 @@ virDomainHostdevSubsysSCSIVHostDefParseXML(xmlNodePtr sourcenode, _("Invalid hostdev protocol '%s'"), virDomainHostdevSubsysSCSIHostProtocolTypeToString(hostsrc->protocol)); return -1; - break; } return 0; @@ -18139,13 +18136,11 @@ virDomainChrEquals(virDomainChrDefPtr src, case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_XEN: case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO: return STREQ_NULLABLE(src->target.name, tgt->target.name); - break; case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_GUESTFWD: if (!src->target.addr || !tgt->target.addr) return src->target.addr == tgt->target.addr; return memcmp(src->target.addr, tgt->target.addr, sizeof(*src->target.addr)) == 0; - break; case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_NONE: case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_LAST: @@ -18163,7 +18158,6 @@ virDomainChrEquals(virDomainChrDefPtr src, case VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE: case VIR_DOMAIN_CHR_DEVICE_TYPE_PARALLEL: return src->target.port == tgt->target.port; - break; case VIR_DOMAIN_CHR_DEVICE_TYPE_LAST: /* shouldn't happen */ break; diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 0fd68a7..4221623 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -3682,48 +3682,36 @@ virNetworkDefUpdateSection(virNetworkDefPtr def, switch (section) { case VIR_NETWORK_SECTION_BRIDGE: return virNetworkDefUpdateBridge(def, command, parentIndex, ctxt, flags); - break; case VIR_NETWORK_SECTION_DOMAIN: return virNetworkDefUpdateDomain(def, command, parentIndex, ctxt, flags); - break; case VIR_NETWORK_SECTION_IP: return virNetworkDefUpdateIP(def, command, parentIndex, ctxt, flags); - break; case VIR_NETWORK_SECTION_IP_DHCP_HOST: return virNetworkDefUpdateIPDHCPHost(def, command, parentIndex, ctxt, flags); - break; case VIR_NETWORK_SECTION_IP_DHCP_RANGE: return virNetworkDefUpdateIPDHCPRange(def, command, parentIndex, ctxt, flags); - break; case VIR_NETWORK_SECTION_FORWARD: return virNetworkDefUpdateForward(def, command, parentIndex, ctxt, flags); - break; case VIR_NETWORK_SECTION_FORWARD_INTERFACE: return virNetworkDefUpdateForwardInterface(def, command, parentIndex, ctxt, flags); - break; case VIR_NETWORK_SECTION_FORWARD_PF: return virNetworkDefUpdateForwardPF(def, command, parentIndex, ctxt, flags); - break; case VIR_NETWORK_SECTION_PORTGROUP: return virNetworkDefUpdatePortGroup(def, command, parentIndex, ctxt, flags); - break; case VIR_NETWORK_SECTION_DNS_HOST: return virNetworkDefUpdateDNSHost(def, command, parentIndex, ctxt, flags); - break; case VIR_NETWORK_SECTION_DNS_TXT: return virNetworkDefUpdateDNSTxt(def, command, parentIndex, ctxt, flags); - break; case VIR_NETWORK_SECTION_DNS_SRV: return virNetworkDefUpdateDNSSrv(def, command, parentIndex, ctxt, flags); - break; default: virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("can't update unrecognized section of network")); diff --git a/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c index b0d60ab..f2ec080 100644 --- a/src/conf/nwfilter_params.c +++ b/src/conf/nwfilter_params.c @@ -169,10 +169,8 @@ virNWFilterVarValueGetCardinality(const virNWFilterVarValue *val) switch (val->valType) { case NWFILTER_VALUE_TYPE_SIMPLE: return 1; - break; case NWFILTER_VALUE_TYPE_ARRAY: return val->u.array.nValues; - break; case NWFILTER_VALUE_TYPE_LAST: return 0; } @@ -853,10 +851,8 @@ virNWFilterVarAccessEqual(const virNWFilterVarAccess *a, case VIR_NWFILTER_VAR_ACCESS_ELEMENT: return (a->u.index.idx == b->u.index.idx && a->u.index.intIterId == b->u.index.intIterId); - break; case VIR_NWFILTER_VAR_ACCESS_ITERATOR: return a->u.iterId == b->u.iterId; - break; case VIR_NWFILTER_VAR_ACCESS_LAST: break; } -- 2.9.5

3 2

[PATCH v2 1/2] qemu: add support for shmem-{plain, doorbell} role
by Wang Xin 21 Jul '20

21 Jul '20

Role(master or peer) controls how the domain behaves on migration. For more details about migration with ivshmem, see https://git.qemu.org/?p=qemu.git;a=blob_plain;f=docs/system/ivshmem.rst;hb=… It's a optional attribute in libvirt, and qemu will choose default role for ivshmem device if the user is not specified. With device property 'role', the value can be 'master' or 'peer'. - 'master' (means 'master=on' in qemu), the guest will copy the shared memory on migration to the destination host. - 'peer' (means 'master=off' in qemu), the migration is disabled. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> Signed-off-by: Yang Hang <yanghang44(a)huawei.com> Signed-off-by: Wang Xin <wangxinxin.wang(a)huawei.com> diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index f5ee97de81..d4d90ad44d 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -9141,7 +9141,7 @@ qemu-kvm -net nic,model=? /dev/null <pre> ... <devices> - <shmem name='my_shmem0'> + <shmem name='my_shmem0' role='peer'> <model type='ivshmem-plain'/> <size unit='M'>4</size> </shmem> @@ -9159,9 +9159,15 @@ qemu-kvm -net nic,model=? /dev/null <dt><code>shmem</code></dt> <dd> The <code>shmem</code> element has one mandatory attribute, - <code>name</code> to identify the shared memory. This attribute cannot - be directory specific to <code>.</code> or <code>..</code> as well as - it cannot involve path separator <code>/</code>. + <code>name</code> to identify the shared memory. Optional attribute + <code>role</code> can be set to values "master" or "peer". The former + will mean that upon migration, the data in the shared memory is migrated + with the domain. There should be only one "master" per shared memory object. + Migration with "peer" role is disabled. If migration of such domain is required, + the shmem device needs to be unplugged before migration and plugged in at the + destination upon successful migration. This attribute cannot be directory + specific to <code>.</code> or <code>..</code> as well as it cannot involve path + separator <code>/</code>. </dd> <dt><code>model</code></dt> <dd> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index a810f569c6..09d4ad3e96 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -4417,6 +4417,14 @@ <param name="pattern">[^/]*</param> </data> </attribute> + <optional> + <attribute name="role"> + <choice> + <value>master</value> + <value>peer</value> + </choice> + </attribute> + </optional> <interleave> <optional> <element name="model"> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 7ecd2818b9..6e67c7ebe0 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1325,6 +1325,13 @@ VIR_ENUM_IMPL(virDomainShmemModel, "ivshmem-doorbell", ); +VIR_ENUM_IMPL(virDomainShmemRole, + VIR_DOMAIN_SHMEM_ROLE_LAST, + "default", + "master", + "peer", +); + VIR_ENUM_IMPL(virDomainLaunchSecurity, VIR_DOMAIN_LAUNCH_SECURITY_LAST, "", @@ -15357,6 +15364,19 @@ virDomainShmemDefParseXML(virDomainXMLOptionPtr xmlopt, goto cleanup; } + if (def->model != VIR_DOMAIN_SHMEM_MODEL_IVSHMEM) { + tmp = virXMLPropString(node, "role"); + if (tmp) { + if ((def->role = virDomainShmemRoleTypeFromString(tmp)) <= 0) { + virReportError(VIR_ERR_XML_ERROR, + _("Unknown shmem role type '%s'"), tmp); + goto cleanup; + } + + VIR_FREE(tmp); + } + } + if (virParseScaledValue("./size[1]", NULL, ctxt, &def->size, 1, ULLONG_MAX, false) < 0) goto cleanup; @@ -18579,6 +18599,9 @@ virDomainShmemDefEquals(virDomainShmemDefPtr src, if (src->model != dst->model) return false; + if (src->role != dst->role) + return false; + if (src->server.enabled != dst->server.enabled) return false; @@ -23758,6 +23781,15 @@ virDomainShmemDefCheckABIStability(virDomainShmemDefPtr src, return false; } + if (src->role != dst->role) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target shared memory role '%s' does not match " + "source role '%s'"), + virDomainShmemRoleTypeToString(dst->role), + virDomainShmemRoleTypeToString(src->role)); + return false; + } + if (src->model != dst->model) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Target shared memory model '%s' does not match " @@ -27408,8 +27440,12 @@ virDomainShmemDefFormat(virBufferPtr buf, virDomainShmemDefPtr def, unsigned int flags) { - virBufferEscapeString(buf, "<shmem name='%s'>\n", def->name); + virBufferEscapeString(buf, "<shmem name='%s'", def->name); + if (def->role) + virBufferEscapeString(buf, " role='%s'", + virDomainShmemRoleTypeToString(def->role)); + virBufferAddLit(buf, ">\n"); virBufferAdjustIndent(buf, 2); virBufferAsprintf(buf, "<model type='%s'/>\n", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 241149af24..855c144ddb 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1771,10 +1771,19 @@ typedef enum { VIR_DOMAIN_SHMEM_MODEL_LAST } virDomainShmemModel; +typedef enum { + VIR_DOMAIN_SHMEM_ROLE_DEFAULT, + VIR_DOMAIN_SHMEM_ROLE_MASTER, + VIR_DOMAIN_SHMEM_ROLE_PEER, + + VIR_DOMAIN_SHMEM_ROLE_LAST +} virDomainShmemRole; + struct _virDomainShmemDef { char *name; unsigned long long size; int model; /* enum virDomainShmemModel */ + int role; /* enum virDomainShmemRole */ struct { bool enabled; virDomainChrSourceDef chr; @@ -3624,6 +3633,7 @@ VIR_ENUM_DECL(virDomainMemoryAllocation); VIR_ENUM_DECL(virDomainIOMMUModel); VIR_ENUM_DECL(virDomainVsockModel); VIR_ENUM_DECL(virDomainShmemModel); +VIR_ENUM_DECL(virDomainShmemRole); VIR_ENUM_DECL(virDomainLaunchSecurity); /* from libvirt.h */ VIR_ENUM_DECL(virDomainState); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 73b72c9e10..3f28943575 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -597,6 +597,8 @@ virDomainShmemDefInsert; virDomainShmemDefRemove; virDomainShmemModelTypeFromString; virDomainShmemModelTypeToString; +virDomainShmemRoleTypeFromString; +virDomainShmemRoleTypeToString; virDomainShutdownReasonTypeFromString; virDomainShutdownReasonTypeToString; virDomainShutoffReasonTypeFromString; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 839c93bfb4..0655d8359d 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8539,11 +8539,24 @@ qemuBuildShmemDevStr(virDomainDefPtr def, virBufferAdd(&buf, virDomainShmemModelTypeToString(shmem->model), -1); virBufferAsprintf(&buf, ",id=%s", shmem->info.alias); - if (shmem->server.enabled) + if (shmem->server.enabled) { virBufferAsprintf(&buf, ",chardev=char%s", shmem->info.alias); - else + } else { virBufferAsprintf(&buf, ",memdev=shmmem-%s", shmem->info.alias); + switch ((virDomainShmemRole) shmem->role) { + case VIR_DOMAIN_SHMEM_ROLE_MASTER: + virBufferAddLit(&buf, ",master=on"); + break; + case VIR_DOMAIN_SHMEM_ROLE_PEER: + virBufferAddLit(&buf, ",master=off"); + break; + case VIR_DOMAIN_SHMEM_ROLE_DEFAULT: + case VIR_DOMAIN_SHMEM_ROLE_LAST: + break; + } + } + if (shmem->msi.vectors) virBufferAsprintf(&buf, ",vectors=%u", shmem->msi.vectors); if (shmem->msi.ioeventfd) { diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 78e64344f6..5ae85c7ae7 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1261,10 +1261,22 @@ qemuMigrationSrcIsAllowed(virQEMUDriverPtr driver, } } - if (vm->def->nshmems) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("migration with shmem device is not supported")); - return false; + for (i = 0; i < vm->def->nshmems; i++) { + virDomainShmemDefPtr shmem = vm->def->shmems[i]; + + if (shmem->model == VIR_DOMAIN_SHMEM_MODEL_IVSHMEM) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("migration with legacy shmem device is not supported")); + return false; + } + if (shmem->role == VIR_DOMAIN_SHMEM_ROLE_PEER) { + virReportError(VIR_ERR_OPERATION_INVALID, + _("domain's shmem device '%s' has role='%s', " + "try unplugging it first"), + shmem->name, + virDomainShmemRoleTypeToString(shmem->role)); + return false; + } } for (i = 0; i < vm->def->nnets; i++) { diff --git a/tests/qemuhotplugtestdevices/qemuhotplug-ivshmem-plain-detach.xml b/tests/qemuhotplugtestdevices/qemuhotplug-ivshmem-plain-detach.xml index 68f592fb21..338017aa28 100644 --- a/tests/qemuhotplugtestdevices/qemuhotplug-ivshmem-plain-detach.xml +++ b/tests/qemuhotplugtestdevices/qemuhotplug-ivshmem-plain-detach.xml @@ -1,4 +1,4 @@ -<shmem name='shmem0'> +<shmem name='shmem0' role='peer'> <model type='ivshmem-plain'/> <size unit='M'>4</size> <alias name='shmem0'/> diff --git a/tests/qemuhotplugtestdevices/qemuhotplug-ivshmem-plain.xml b/tests/qemuhotplugtestdevices/qemuhotplug-ivshmem-plain.xml index 6bd96ff167..780e49de23 100644 --- a/tests/qemuhotplugtestdevices/qemuhotplug-ivshmem-plain.xml +++ b/tests/qemuhotplugtestdevices/qemuhotplug-ivshmem-plain.xml @@ -1,3 +1,3 @@ -<shmem name='shmem0'> +<shmem name='shmem0' role='peer'> <model type='ivshmem-plain'/> </shmem> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-doorbell.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-doorbell.xml index a6930bfa69..8013264989 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-doorbell.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-doorbell.xml @@ -45,7 +45,7 @@ <alias name='input1'/> </input> <memballoon model='none'/> - <shmem name='shmem0'> + <shmem name='shmem0' role='peer'> <model type='ivshmem-plain'/> <size unit='M'>4</size> <alias name='shmem0'/> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-plain.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-plain.xml index 757b6b0980..0490310760 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-plain.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-plain.xml @@ -45,7 +45,7 @@ <alias name='input1'/> </input> <memballoon model='none'/> - <shmem name='shmem0'> + <shmem name='shmem0' role='peer'> <model type='ivshmem-plain'/> <size unit='M'>4</size> <alias name='shmem0'/> diff --git a/tests/qemuxml2argvdata/shmem-plain-doorbell.args b/tests/qemuxml2argvdata/shmem-plain-doorbell.args index 6ed86b7448..aa41d5391a 100644 --- a/tests/qemuxml2argvdata/shmem-plain-doorbell.args +++ b/tests/qemuxml2argvdata/shmem-plain-doorbell.args @@ -30,10 +30,10 @@ size=4194304,share=yes \ -device ivshmem-plain,id=shmem0,memdev=shmmem-shmem0,bus=pci.0,addr=0x3 \ -object memory-backend-file,id=shmmem-shmem1,mem-path=/dev/shm/shmem1,\ size=134217728,share=yes \ --device ivshmem-plain,id=shmem1,memdev=shmmem-shmem1,bus=pci.0,addr=0x5 \ +-device ivshmem-plain,id=shmem1,memdev=shmmem-shmem1,master=off,bus=pci.0,addr=0x5 \ -object memory-backend-file,id=shmmem-shmem2,mem-path=/dev/shm/shmem2,\ size=268435456,share=yes \ --device ivshmem-plain,id=shmem2,memdev=shmmem-shmem2,bus=pci.0,addr=0x4 \ +-device ivshmem-plain,id=shmem2,memdev=shmmem-shmem2,master=on,bus=pci.0,addr=0x4 \ -device ivshmem-doorbell,id=shmem3,chardev=charshmem3,ioeventfd=on,bus=pci.0,\ addr=0x6 \ -chardev socket,id=charshmem3,path=/var/lib/libvirt/shmem-shmem3-sock \ diff --git a/tests/qemuxml2argvdata/shmem-plain-doorbell.xml b/tests/qemuxml2argvdata/shmem-plain-doorbell.xml index e248d637a5..7c76e0fbba 100644 --- a/tests/qemuxml2argvdata/shmem-plain-doorbell.xml +++ b/tests/qemuxml2argvdata/shmem-plain-doorbell.xml @@ -22,11 +22,11 @@ <shmem name='shmem0'> <model type='ivshmem-plain'/> </shmem> - <shmem name='shmem1'> + <shmem name='shmem1' role='peer'> <model type='ivshmem-plain'/> <size unit='M'>128</size> </shmem> - <shmem name='shmem2'> + <shmem name='shmem2' role='master'> <model type='ivshmem-plain'/> <size unit='M'>256</size> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> diff --git a/tests/qemuxml2xmloutdata/shmem-plain-doorbell.xml b/tests/qemuxml2xmloutdata/shmem-plain-doorbell.xml index c5dd0f4598..64c0a7d753 100644 --- a/tests/qemuxml2xmloutdata/shmem-plain-doorbell.xml +++ b/tests/qemuxml2xmloutdata/shmem-plain-doorbell.xml @@ -26,12 +26,12 @@ <size unit='M'>4</size> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </shmem> - <shmem name='shmem1'> + <shmem name='shmem1' role='peer'> <model type='ivshmem-plain'/> <size unit='M'>128</size> <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> </shmem> - <shmem name='shmem2'> + <shmem name='shmem2' role='master'> <model type='ivshmem-plain'/> <size unit='M'>256</size> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index c17e3303b0..6cb2718767 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1135,7 +1135,8 @@ mymain(void) DO_TEST("tap-vhost", NONE); DO_TEST("tap-vhost-incorrect", NONE); DO_TEST("shmem", NONE); - DO_TEST("shmem-plain-doorbell", NONE); + DO_TEST("shmem-plain-doorbell", + QEMU_CAPS_DEVICE_IVSHMEM_PLAIN, QEMU_CAPS_DEVICE_IVSHMEM_DOORBELL); DO_TEST("smbios", NONE); DO_TEST("smbios-multiple-type2", NONE); DO_TEST("smbios-type-fwcfg", NONE); -- 2.26.0.windows.1

3 5

[PATCH 0/5] trivial qemuProcessQMPPtr related cleanups
by Daniel Henrique Barboza 21 Jul '20

21 Jul '20

Hi, These are some simple cleanups related to the qemuProcessQMPPtr pointer I ended up making while trying to understand how and when qemuProcessQMPFree() is called. Daniel Henrique Barboza (5): qemu_process.h: register AUTOPTR_CLEANUP_FUNC for qemuProcessQMPPtr qemu_process.c: modernize qemuProcessQMPNew() qemu_driver.c: modernize qemuConnectCPUModelBaseline() qemu_driver.c: modernize qemuConnectCPUModelComparison() qemu_capabilities.c: use g_autoptr() in virQEMUCapsInitQMPSingle() src/qemu/qemu_capabilities.c | 3 +-- src/qemu/qemu_driver.c | 41 ++++++++++++++---------------------- src/qemu/qemu_process.c | 13 ++++-------- src/qemu/qemu_process.h | 1 + 4 files changed, 22 insertions(+), 36 deletions(-) -- 2.26.2

2 7

Plans for the next release
by Jiri Denemark 21 Jul '20

21 Jul '20

Hi all, We are getting close to the next release of libvirt. Because I am on vacation next week, I think we will have a little bit longer freeze period (although mainly extended by a weekend). So to aim for the release at the beginning of August I suggest entering the freeze just before the upcoming weekend starts, i.e., on Friday July 24 (in late evening) and I think we can skip RC2 this time and just push the release on August 1 or 2. Normal freeze period would start on Monday with RC2 on Thursday and a final release on August 1, which is pretty similar in terms of frozen work days. I hope this works for everyone. Jirka

1 0

[libvirt PATCH 0/9] remote: introduce a custom netcat impl for ssh tunnelling
by Daniel P. Berrangé 21 Jul '20

21 Jul '20

We have long had a problem with use of netcat for ssh tunnelling because there's no guarantee the UNIX socket path the client builds will match the UNIX socket path the remote host uses. We don't even allow session mode SSH tunnelling for this reason. We also can't easily auto-spawn libvirtd in session mode. With the introduction of modular daemons we also have potential for two completely different UNIX socket paths even for system mode, and the client can't know which to use. The solution to all these problems is to introduce a custom netcat impl. Instead passing the UNIX socket path, we pass the libvirt driver URI. The custom netcat then decides which socket path to use based on the remote build host environment. We still have to support netcat for interoperability with legacy libvirt versions, but we can default to the new virt-nc. Daniel P. Berrangé (9): rpc: merge logic for generating remote SSH shell script remote: split off enums into separate source file remote: split out function for parsing URI scheme remote: parse the remote transport string earlier remote: split out function for constructing socket path remote: extract logic for determining daemon to connect to remote: introduce virtd-nc helper binary rpc: switch order of args in virNetClientNewSSH rpc: use new virt-nc binary for remote tunnelling build-aux/syntax-check.mk | 2 +- docs/uri.html.in | 18 ++ po/POTFILES.in | 2 + src/libvirt_remote.syms | 1 + src/remote/Makefile.inc.am | 32 +++ src/remote/remote_driver.c | 323 +++++---------------------- src/remote/remote_nc.c | 424 ++++++++++++++++++++++++++++++++++++ src/remote/remote_sockets.c | 277 +++++++++++++++++++++++ src/remote/remote_sockets.h | 70 ++++++ src/rpc/virnetclient.c | 151 ++++++++----- src/rpc/virnetclient.h | 29 ++- src/rpc/virnetsocket.c | 37 +--- src/rpc/virnetsocket.h | 4 +- tests/virnetsockettest.c | 12 +- 14 files changed, 1018 insertions(+), 364 deletions(-) create mode 100644 src/remote/remote_nc.c create mode 100644 src/remote/remote_sockets.c create mode 100644 src/remote/remote_sockets.h -- 2.26.2

3 23

[PATCH 00/10] Fix device names reported by 'write_threshold' event and add support for monitoring 'mirror'
by Peter Krempa 21 Jul '20

21 Jul '20

Allow monitoring the 'mirror' image write threshold and also report correct aliases. Clean up some leftovers and improve docs while at it. Peter Krempa (10): virDomainSetBlockThreshold: Document values of '@dev' better qemuDomainDiskBackingStoreGetName: Remove unused argument qemuDomainDiskBackingStoreGetName: Eliminate temp variable qemuProcessHandleBlockThreshold: Report correct indexes virDomainSetBlockThreshold: Clarify values of @dev the event is fired for qemuDomainDiskLookupByNodename: Remove unused 'idx' virStorageSourceFindByNodeName: Remove unused 'idx' argument qemuDomainDiskLookupByNodename: Look also for 'mirror' node names qemuDomainGetStorageSourceByDevstr: Look also in 'mirror' chain virDomainSetBlockThreshold: Mention that the event can be registered for <mirror> src/libvirt-domain.c | 13 +++++++++++ src/qemu/qemu_domain.c | 49 +++++++++++++++++++-------------------- src/qemu/qemu_domain.h | 4 +--- src/qemu/qemu_process.c | 28 +++++++++++++++------- src/util/virstoragefile.c | 16 +++---------- src/util/virstoragefile.h | 3 +-- 6 files changed, 61 insertions(+), 52 deletions(-) -- 2.26.2

2 21

[PATCH 0/5] qemu: Fix handling of bitmaps for active layer block commit and block copy
by Peter Krempa 21 Jul '20

21 Jul '20

See patch 3 for explanation. Peter Krempa (5): qemu: blockjob: Don't base bitmap handling of active-layer block commit on QEMU_CAPS_BLOCKDEV_REOPEN qemu: blockjob: Actually delete temporary bitmap on failed active commit qemu: block: Remove 'active-write' bitmap even if there are no bitmaps to merge qemuDomainBlockPivot: Rename 'actions' to 'bitmapactions' qemuDomainBlockPivot: Ignore failures of creating active layer bitmap src/qemu/qemu_block.c | 3 ++- src/qemu/qemu_blockjob.c | 16 ++++++++++++--- src/qemu/qemu_driver.c | 20 ++++++++----------- .../qemublocktestdata/bitmapblockcommit/empty | 9 +++++++++ .../bitmapblockcopy/empty-deep-out.json | 9 +++++++++ .../bitmapblockcopy/empty-shallow-out.json | 9 +++++++++ 6 files changed, 50 insertions(+), 16 deletions(-) -- 2.26.2

2 10

Setting 'nodatacow' on VM image when on Btrfs
by Chris Murphy 21 Jul '20

21 Jul '20

It's generally recommended by upstream Btrfs development to set 'nodatacow' using 'chattr +C' on the containing directory for VM images. By setting it on the containing directory it means new VM images inherit the attribute, including images copied to this location. But 'nodatacow' also implies no compression and no data checksums. Could there be use cases in which it's preferred to do compression and checksumming on VM images? In that case the fragmentation problem can be mitigated by periodic defragmentation. Is this something libvirt can and should do? Possibly by default with a way for users to opt out? Another option is to have the installer set 'chattr +C' in the short term. But this doesn't help GNOME Boxes, since the user home isn't created at installation time. Three advantages of libvirt awareness of Btrfs: (a) GNOME Boxes Cockpit, and other users of libvirt can then use this same mechanism, and apply to their VM image locations. (b) Create the containing directory as a subvolume instead of a directory (1) btrfs snapshots are not recursive, therefore making this a subvolume would prevent it from being snapshot, and thus (temporarily) resuming datacow. (2) in heavy workloads there can be lock contention on file btrees; a subvolume is a dedicated file btree; so this would reduce tendency for lock contention in heavy workloads (this is not likely a desktop/laptop use case) (c) virtiofs might be able to take advantage of btrfs subvolumes. (This is a partial rewrite of https://bugzilla.redhat.com/show_bug.cgi?id=1855000) Thanks, -- Chris Murphy

2 8

[libvirt PATCH] network: split out networkSetIPv6Sysctl
by Ján Tomko 21 Jul '20

21 Jul '20

Refactor networkSetIPv6Sysctls to remove repetition and reuse of the 'field' variable. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/network/bridge_driver.c | 71 ++++++++++++++++++------------------- 1 file changed, 35 insertions(+), 36 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 713763130b..d817b5cbd6 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -2249,37 +2249,51 @@ networkEnableIPForwarding(bool enableIPv4, } +static int +networkSetIPv6Sysctl(const char *bridge, + const char *sysctl_field, + const char *sysctl_setting, + bool ignoreMissing) +{ + g_autofree char *field = g_strdup_printf(SYSCTL_PATH "/net/ipv6/conf/%s/%s", + bridge, sysctl_field); + + if (ignoreMissing && access(field, W_OK) < 0 && errno == ENOENT) + return -2; + + if (virFileWriteStr(field, sysctl_setting, 0) < 0) { + virReportSystemError(errno, + _("cannot write to '%s' on bridge '%s'"), + field, bridge); + return -1; + } + + return 0; +} + + static int networkSetIPv6Sysctls(virNetworkObjPtr obj) { virNetworkDefPtr def = virNetworkObjGetDef(obj); - char *field = NULL; - int ret = -1; bool enableIPv6 = !!virNetworkDefGetIPByIndex(def, AF_INET6, 0); + int rc; /* set disable_ipv6 if there are no ipv6 addresses defined for the * network. But also unset it if there *are* ipv6 addresses, as we * can't be sure of its default value. */ - field = g_strdup_printf(SYSCTL_PATH "/net/ipv6/conf/%s/disable_ipv6", - def->bridge); - - if (access(field, W_OK) < 0 && errno == ENOENT) { + rc = networkSetIPv6Sysctl(def->bridge, "disable_ipv6", + enableIPv6 ? "0" : "1", true); + if (rc == -2) { if (!enableIPv6) VIR_DEBUG("ipv6 appears to already be disabled on %s", def->bridge); - ret = 0; - goto cleanup; + return 0; + } else if (rc < 0) { + return -1; } - if (virFileWriteStr(field, enableIPv6 ? "0" : "1", 0) < 0) { - virReportSystemError(errno, - _("cannot write to %s to enable/disable IPv6 " - "on bridge %s"), field, def->bridge); - goto cleanup; - } - VIR_FREE(field); - /* The rest of the ipv6 sysctl tunables should always be set the * same, whether or not we're using ipv6 on this bridge. */ @@ -2287,31 +2301,16 @@ networkSetIPv6Sysctls(virNetworkObjPtr obj) /* Prevent guests from hijacking the host network by sending out * their own router advertisements. */ - field = g_strdup_printf(SYSCTL_PATH "/net/ipv6/conf/%s/accept_ra", - def->bridge); - - if (virFileWriteStr(field, "0", 0) < 0) { - virReportSystemError(errno, - _("cannot disable %s"), field); - goto cleanup; - } - VIR_FREE(field); + if (networkSetIPv6Sysctl(def->bridge, "accept_ra", "0", false) < 0) + return -1; /* All interfaces used as a gateway (which is what this is, by * definition), must always have autoconf=0. */ - field = g_strdup_printf(SYSCTL_PATH "/net/ipv6/conf/%s/autoconf", def->bridge); + if (networkSetIPv6Sysctl(def->bridge, "autoconf", "0", false) < 0) + return -1; - if (virFileWriteStr(field, "0", 0) < 0) { - virReportSystemError(errno, - _("cannot disable %s"), field); - goto cleanup; - } - - ret = 0; - cleanup: - VIR_FREE(field); - return ret; + return 0; } -- 2.25.4

2 1

[GSoC][PATCH v5] qemu_domainjob: introduce `privateData` for `qemuDomainJob`
by Prathamesh Chavan 20 Jul '20

20 Jul '20

To remove dependecy of `qemuDomainJob` on job specific paramters, a `privateData` pointer is introduced. To handle it, structure of callback functions is also introduced. Signed-off-by: Prathamesh Chavan <pc44800(a)gmail.com> --- Previous version of this patch can be found here[1]. This patch mainly improvises on the changes suggested in the review of the previous version by Martin and Michal. Currently, the structure `qemuDomainJobInfo` is kept untouched. src/qemu/qemu_domain.c | 70 ++++++++++++++++++++++++++++++- src/qemu/qemu_domain.h | 10 +++++ src/qemu/qemu_domainjob.c | 71 ++++++++++++++++++-------------- src/qemu/qemu_domainjob.h | 38 ++++++++++++----- src/qemu/qemu_driver.c | 3 +- src/qemu/qemu_migration.c | 28 +++++++++---- src/qemu/qemu_migration_params.c | 9 ++-- src/qemu/qemu_process.c | 15 +++++-- 8 files changed, 185 insertions(+), 59 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 10d2033db1..b0ed562d25 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -88,6 +88,74 @@ VIR_ENUM_IMPL(qemuDomainNamespace, "mount", ); + +static void * +qemuJobAllocPrivate(void) +{ + return g_new0(qemuDomainJobPrivate, 1); +} + + +static void +qemuJobFreePrivate(void *opaque) +{ + qemuDomainJobPrivatePtr priv = opaque; + + if (!priv) + return; + + qemuMigrationParamsFree(priv->migParams); + VIR_FREE(priv); +} + + +static void +qemuJobResetPrivate(void *opaque) +{ + qemuDomainJobPrivatePtr priv = opaque; + + priv->spiceMigration = false; + priv->spiceMigrated = false; + priv->dumpCompleted = false; + qemuMigrationParamsFree(priv->migParams); + priv->migParams = NULL; +} + + +static int +qemuDomainFormatJobPrivate(virBufferPtr buf, + qemuDomainJobObjPtr job) +{ + qemuDomainJobPrivatePtr priv = job->privateData; + + if (priv->migParams) + qemuMigrationParamsFormat(buf, priv->migParams); + + return 0; +} + + +static int +qemuDomainParseJobPrivate(xmlXPathContextPtr ctxt, + qemuDomainJobObjPtr job) +{ + qemuDomainJobPrivatePtr priv = job->privateData; + + if (qemuMigrationParamsParse(ctxt, &priv->migParams) < 0) + return -1; + + return 0; +} + + +static qemuDomainObjPrivateJobCallbacks qemuPrivateJobCallbacks = { + .allocJobPrivate = qemuJobAllocPrivate, + .freeJobPrivate = qemuJobFreePrivate, + .resetJobPrivate = qemuJobResetPrivate, + .formatJob = qemuDomainFormatJobPrivate, + .parseJob = qemuDomainParseJobPrivate, +}; + /** * qemuDomainObjFromDomain: * @domain: Domain pointer that has to be looked up @@ -1585,7 +1653,7 @@ qemuDomainObjPrivateAlloc(void *opaque) if (VIR_ALLOC(priv) < 0) return NULL; - if (qemuDomainObjInitJob(&priv->job) < 0) { + if (qemuDomainObjInitJob(&priv->job, &qemuPrivateJobCallbacks) < 0) { virReportSystemError(errno, "%s", _("Unable to init qemu driver mutexes")); goto error; diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index e524fd0002..bb9b414a46 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -492,6 +492,16 @@ struct _qemuDomainXmlNsDef { char **capsdel; }; +typedef struct _qemuDomainJobPrivate qemuDomainJobPrivate; +typedef qemuDomainJobPrivate *qemuDomainJobPrivatePtr; +struct _qemuDomainJobPrivate { + bool spiceMigration; /* we asked for spice migration and we + * should wait for it to finish */ + bool spiceMigrated; /* spice migration completed */ + bool dumpCompleted; /* dump completed */ + qemuMigrationParamsPtr migParams; +}; + int qemuDomainObjStartWorker(virDomainObjPtr dom); void qemuDomainObjStopWorker(virDomainObjPtr dom); diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c index d96d5334a3..7cbfe3801e 100644 --- a/src/qemu/qemu_domainjob.c +++ b/src/qemu/qemu_domainjob.c @@ -159,24 +159,6 @@ qemuDomainEventEmitJobCompleted(virQEMUDriverPtr driver, virObjectEventStateQueue(driver->domainEventState, event); } - -int -qemuDomainObjInitJob(qemuDomainJobObjPtr job) -{ - memset(job, 0, sizeof(*job)); - - if (virCondInit(&job->cond) < 0) - return -1; - - if (virCondInit(&job->asyncCond) < 0) { - virCondDestroy(&job->cond); - return -1; - } - - return 0; -} - - static void qemuDomainObjResetJob(qemuDomainJobObjPtr job) { @@ -207,17 +189,13 @@ qemuDomainObjResetAsyncJob(qemuDomainJobObjPtr job) job->phase = 0; job->mask = QEMU_JOB_DEFAULT_MASK; job->abortJob = false; - job->spiceMigration = false; - job->spiceMigrated = false; - job->dumpCompleted = false; VIR_FREE(job->error); g_clear_pointer(&job->current, qemuDomainJobInfoFree); - qemuMigrationParamsFree(job->migParams); - job->migParams = NULL; + job->cb->resetJobPrivate(job->privateData); job->apiFlags = 0; } -void +int qemuDomainObjRestoreJob(virDomainObjPtr obj, qemuDomainJobObjPtr job) { @@ -229,11 +207,16 @@ qemuDomainObjRestoreJob(virDomainObjPtr obj, job->asyncJob = priv->job.asyncJob; job->asyncOwner = priv->job.asyncOwner; job->phase = priv->job.phase; - job->migParams = g_steal_pointer(&priv->job.migParams); + job->privateData = g_steal_pointer(&priv->job.privateData); job->apiFlags = priv->job.apiFlags; + if (!(priv->job.privateData = priv->job.cb->allocJobPrivate())) + return -1; + job->cb = priv->job.cb; + qemuDomainObjResetJob(&priv->job); qemuDomainObjResetAsyncJob(&priv->job); + return 0; } void @@ -241,6 +224,7 @@ qemuDomainObjFreeJob(qemuDomainJobObjPtr job) { qemuDomainObjResetJob(job); qemuDomainObjResetAsyncJob(job); + job->cb->freeJobPrivate(job->privateData); g_clear_pointer(&job->current, qemuDomainJobInfoFree); g_clear_pointer(&job->completed, qemuDomainJobInfoFree); virCondDestroy(&job->cond); @@ -1239,14 +1223,14 @@ qemuDomainObjPrivateXMLFormatNBDMigration(virBufferPtr buf, return 0; } - int qemuDomainObjPrivateXMLFormatJob(virBufferPtr buf, virDomainObjPtr vm) { + qemuDomainObjPrivatePtr priv = vm->privateData; + qemuDomainJobObjPtr jobObj = &priv->job; g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) childBuf = VIR_BUFFER_INIT_CHILD(buf); - qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainJob job = priv->job.active; if (!qemuDomainTrackJob(job)) @@ -1273,8 +1257,8 @@ qemuDomainObjPrivateXMLFormatJob(virBufferPtr buf, qemuDomainObjPrivateXMLFormatNBDMigration(&childBuf, vm) < 0) return -1; - if (priv->job.migParams) - qemuMigrationParamsFormat(&childBuf, priv->job.migParams); + if (jobObj->cb->formatJob(&childBuf, jobObj) < 0) + return -1; virXMLFormatElement(buf, "job", &attrBuf, &childBuf); @@ -1366,12 +1350,12 @@ qemuDomainObjPrivateXMLParseJobNBD(virDomainObjPtr vm, return 0; } - int qemuDomainObjPrivateXMLParseJob(virDomainObjPtr vm, xmlXPathContextPtr ctxt) { qemuDomainObjPrivatePtr priv = vm->privateData; + qemuDomainJobObjPtr job = &priv->job; VIR_XPATH_NODE_AUTORESTORE(ctxt); g_autofree char *tmp = NULL; @@ -1420,8 +1404,33 @@ qemuDomainObjPrivateXMLParseJob(virDomainObjPtr vm, if (qemuDomainObjPrivateXMLParseJobNBD(vm, ctxt) < 0) return -1; - if (qemuMigrationParamsParse(ctxt, &priv->job.migParams) < 0) + if (job->cb->parseJob(ctxt, job) < 0) + return -1; + + return 0; +} + + +int +qemuDomainObjInitJob(qemuDomainJobObjPtr job, + qemuDomainObjPrivateJobCallbacksPtr cb) +{ + memset(job, 0, sizeof(*job)); + job->cb = cb; + + if (!(job->privateData = job->cb->allocJobPrivate())) + return -1; + + if (virCondInit(&job->cond) < 0) { + job->cb->freeJobPrivate(job->privateData); return -1; + } + + if (virCondInit(&job->asyncCond) < 0) { + job->cb->freeJobPrivate(job->privateData); + virCondDestroy(&job->cond); + return -1; + } return 0; } diff --git a/src/qemu/qemu_domainjob.h b/src/qemu/qemu_domainjob.h index 9d2ee14584..c83e055647 100644 --- a/src/qemu/qemu_domainjob.h +++ b/src/qemu/qemu_domainjob.h @@ -19,7 +19,7 @@ #pragma once #include <glib-object.h> -#include "qemu_migration_params.h" +#include "qemu_monitor.h" #define JOB_MASK(job) (job == 0 ? 0 : 1 << (job - 1)) #define QEMU_JOB_DEFAULT_MASK \ @@ -156,6 +156,25 @@ qemuDomainJobInfoCopy(qemuDomainJobInfoPtr info); typedef struct _qemuDomainJobObj qemuDomainJobObj; typedef qemuDomainJobObj *qemuDomainJobObjPtr; + +typedef void *(*qemuDomainObjPrivateJobAlloc)(void); +typedef void (*qemuDomainObjPrivateJobFree)(void *); +typedef void (*qemuDomainObjPrivateJobReset)(void *); +typedef int (*qemuDomainObjPrivateJobFormat)(virBufferPtr, + qemuDomainJobObjPtr); +typedef int (*qemuDomainObjPrivateJobParse)(xmlXPathContextPtr, + qemuDomainJobObjPtr); + +typedef struct _qemuDomainObjPrivateJobCallbacks qemuDomainObjPrivateJobCallbacks; +typedef qemuDomainObjPrivateJobCallbacks *qemuDomainObjPrivateJobCallbacksPtr; +struct _qemuDomainObjPrivateJobCallbacks { + qemuDomainObjPrivateJobAlloc allocJobPrivate; + qemuDomainObjPrivateJobFree freeJobPrivate; + qemuDomainObjPrivateJobReset resetJobPrivate; + qemuDomainObjPrivateJobFormat formatJob; + qemuDomainObjPrivateJobParse parseJob; +}; + struct _qemuDomainJobObj { virCond cond; /* Use to coordinate jobs */ @@ -182,14 +201,11 @@ struct _qemuDomainJobObj { qemuDomainJobInfoPtr current; /* async job progress data */ qemuDomainJobInfoPtr completed; /* statistics data of a recently completed job */ bool abortJob; /* abort of the job requested */ - bool spiceMigration; /* we asked for spice migration and we - * should wait for it to finish */ - bool spiceMigrated; /* spice migration completed */ char *error; /* job event completion error */ - bool dumpCompleted; /* dump completed */ - - qemuMigrationParamsPtr migParams; unsigned long apiFlags; /* flags passed to the API which started the async job */ + + void *privateData; /* job specific collection of data */ + qemuDomainObjPrivateJobCallbacksPtr cb; }; const char *qemuDomainAsyncJobPhaseToString(qemuDomainAsyncJob job, @@ -234,8 +250,8 @@ void qemuDomainObjSetJobPhase(virQEMUDriverPtr driver, int phase); void qemuDomainObjSetAsyncJobMask(virDomainObjPtr obj, unsigned long long allowedJobs); -void qemuDomainObjRestoreJob(virDomainObjPtr obj, - qemuDomainJobObjPtr job); +int qemuDomainObjRestoreJob(virDomainObjPtr obj, + qemuDomainJobObjPtr job); void qemuDomainObjDiscardAsyncJob(virQEMUDriverPtr driver, virDomainObjPtr obj); void qemuDomainObjReleaseAsyncJob(virDomainObjPtr obj); @@ -264,7 +280,9 @@ bool qemuDomainTrackJob(qemuDomainJob job); void qemuDomainObjFreeJob(qemuDomainJobObjPtr job); -int qemuDomainObjInitJob(qemuDomainJobObjPtr job); +int +qemuDomainObjInitJob(qemuDomainJobObjPtr job, + qemuDomainObjPrivateJobCallbacksPtr cb); bool qemuDomainJobAllowed(qemuDomainJobObjPtr jobs, qemuDomainJob newJob); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d185666ed8..d9c5f21f21 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3701,9 +3701,10 @@ static int qemuDumpWaitForCompletion(virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv = vm->privateData; + qemuDomainJobPrivatePtr jobPriv = priv->job.privateData; VIR_DEBUG("Waiting for dump completion"); - while (!priv->job.dumpCompleted && !priv->job.abortJob) { + while (!jobPriv->dumpCompleted && !priv->job.abortJob) { if (virDomainObjWait(vm) < 0) return -1; } diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 78e64344f6..2c7bf349c3 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1422,12 +1422,13 @@ static int qemuMigrationSrcWaitForSpice(virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv = vm->privateData; + qemuDomainJobPrivatePtr jobPriv = priv->job.privateData; - if (!priv->job.spiceMigration) + if (!jobPriv->spiceMigration) return 0; VIR_DEBUG("Waiting for SPICE to finish migration"); - while (!priv->job.spiceMigrated && !priv->job.abortJob) { + while (!jobPriv->spiceMigrated && !priv->job.abortJob) { if (virDomainObjWait(vm) < 0) return -1; } @@ -1856,9 +1857,11 @@ qemuMigrationSrcGraphicsRelocate(virQEMUDriverPtr driver, if (qemuDomainObjEnterMonitorAsync(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT) == 0) { + qemuDomainJobPrivatePtr jobPriv = priv->job.privateData; + ret = qemuMonitorGraphicsRelocate(priv->mon, type, listenAddress, port, tlsPort, tlsSubject); - priv->job.spiceMigration = !ret; + jobPriv->spiceMigration = !ret; if (qemuDomainObjExitMonitor(driver, vm) < 0) ret = -1; } @@ -1993,6 +1996,7 @@ qemuMigrationSrcCleanup(virDomainObjPtr vm, { virQEMUDriverPtr driver = opaque; qemuDomainObjPrivatePtr priv = vm->privateData; + qemuDomainJobPrivatePtr jobPriv = priv->job.privateData; VIR_DEBUG("vm=%s, conn=%p, asyncJob=%s, phase=%s", vm->def->name, conn, @@ -2018,7 +2022,7 @@ qemuMigrationSrcCleanup(virDomainObjPtr vm, " domain was successfully started on destination or not", vm->def->name); qemuMigrationParamsReset(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT, - priv->job.migParams, priv->job.apiFlags); + jobPriv->migParams, priv->job.apiFlags); /* clear the job and let higher levels decide what to do */ qemuDomainObjDiscardAsyncJob(driver, vm); break; @@ -2382,6 +2386,7 @@ qemuMigrationDstPrepareAny(virQEMUDriverPtr driver, int dataFD[2] = { -1, -1 }; qemuDomainObjPrivatePtr priv = NULL; qemuMigrationCookiePtr mig = NULL; + qemuDomainJobPrivatePtr jobPriv = NULL; bool tunnel = !!st; g_autofree char *xmlout = NULL; unsigned int cookieFlags; @@ -2505,6 +2510,7 @@ qemuMigrationDstPrepareAny(virQEMUDriverPtr driver, *def = NULL; priv = vm->privateData; + jobPriv = priv->job.privateData; priv->origname = g_strdup(origname); if (taint_hook) { @@ -2710,7 +2716,7 @@ qemuMigrationDstPrepareAny(virQEMUDriverPtr driver, stopjob: qemuMigrationParamsReset(driver, vm, QEMU_ASYNC_JOB_MIGRATION_IN, - priv->job.migParams, priv->job.apiFlags); + jobPriv->migParams, priv->job.apiFlags); if (stopProcess) { unsigned int stopFlags = VIR_QEMU_PROCESS_STOP_MIGRATED; @@ -2979,6 +2985,7 @@ qemuMigrationSrcConfirmPhase(virQEMUDriverPtr driver, virObjectEventPtr event; g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); qemuDomainObjPrivatePtr priv = vm->privateData; + qemuDomainJobPrivatePtr jobPriv = priv->job.privateData; qemuDomainJobInfoPtr jobInfo = NULL; VIR_DEBUG("driver=%p, vm=%p, cookiein=%s, cookieinlen=%d, " @@ -3064,7 +3071,7 @@ qemuMigrationSrcConfirmPhase(virQEMUDriverPtr driver, qemuMigrationSrcRestoreDomainState(driver, vm); qemuMigrationParamsReset(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT, - priv->job.migParams, priv->job.apiFlags); + jobPriv->migParams, priv->job.apiFlags); if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) VIR_WARN("Failed to save status on vm %s", vm->def->name); @@ -4642,6 +4649,7 @@ qemuMigrationSrcPerformJob(virQEMUDriverPtr driver, virErrorPtr orig_err = NULL; g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); qemuDomainObjPrivatePtr priv = vm->privateData; + qemuDomainJobPrivatePtr jobPriv = priv->job.privateData; if (qemuMigrationJobStart(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT, flags) < 0) @@ -4699,7 +4707,7 @@ qemuMigrationSrcPerformJob(virQEMUDriverPtr driver, */ if (!v3proto && ret < 0) qemuMigrationParamsReset(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT, - priv->job.migParams, priv->job.apiFlags); + jobPriv->migParams, priv->job.apiFlags); qemuMigrationSrcRestoreDomainState(driver, vm); @@ -4740,6 +4748,7 @@ qemuMigrationSrcPerformPhase(virQEMUDriverPtr driver, unsigned long resource) { qemuDomainObjPrivatePtr priv = vm->privateData; + qemuDomainJobPrivatePtr jobPriv = priv->job.privateData; int ret = -1; /* If we didn't start the job in the begin phase, start it now. */ @@ -4774,7 +4783,7 @@ qemuMigrationSrcPerformPhase(virQEMUDriverPtr driver, endjob: if (ret < 0) { qemuMigrationParamsReset(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT, - priv->job.migParams, priv->job.apiFlags); + jobPriv->migParams, priv->job.apiFlags); qemuMigrationJobFinish(driver, vm); } else { qemuMigrationJobContinue(vm); @@ -4973,6 +4982,7 @@ qemuMigrationDstFinish(virQEMUDriverPtr driver, virErrorPtr orig_err = NULL; int cookie_flags = 0; qemuDomainObjPrivatePtr priv = vm->privateData; + qemuDomainJobPrivatePtr jobPriv = priv->job.privateData; g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); unsigned short port; unsigned long long timeReceived = 0; @@ -5226,7 +5236,7 @@ qemuMigrationDstFinish(virQEMUDriverPtr driver, } qemuMigrationParamsReset(driver, vm, QEMU_ASYNC_JOB_MIGRATION_IN, - priv->job.migParams, priv->job.apiFlags); + jobPriv->migParams, priv->job.apiFlags); qemuMigrationJobFinish(driver, vm); if (!virDomainObjIsActive(vm)) diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c index aea17b1ac8..fc282960da 100644 --- a/src/qemu/qemu_migration_params.c +++ b/src/qemu/qemu_migration_params.c @@ -950,6 +950,7 @@ qemuMigrationParamsEnableTLS(virQEMUDriverPtr driver, qemuMigrationParamsPtr migParams) { qemuDomainObjPrivatePtr priv = vm->privateData; + qemuDomainJobPrivatePtr jobPriv = priv->job.privateData; g_autoptr(virJSONValue) tlsProps = NULL; g_autoptr(virJSONValue) secProps = NULL; g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); @@ -961,7 +962,7 @@ qemuMigrationParamsEnableTLS(virQEMUDriverPtr driver, return -1; } - if (!priv->job.migParams->params[QEMU_MIGRATION_PARAM_TLS_CREDS].set) { + if (!jobPriv->migParams->params[QEMU_MIGRATION_PARAM_TLS_CREDS].set) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("TLS migration is not supported with this " "QEMU binary")); @@ -1025,8 +1026,9 @@ qemuMigrationParamsDisableTLS(virDomainObjPtr vm, qemuMigrationParamsPtr migParams) { qemuDomainObjPrivatePtr priv = vm->privateData; + qemuDomainJobPrivatePtr jobPriv = priv->job.privateData; - if (!priv->job.migParams->params[QEMU_MIGRATION_PARAM_TLS_CREDS].set) + if (!jobPriv->migParams->params[QEMU_MIGRATION_PARAM_TLS_CREDS].set) return 0; if (qemuMigrationParamsSetString(migParams, @@ -1150,6 +1152,7 @@ qemuMigrationParamsCheck(virQEMUDriverPtr driver, virBitmapPtr remoteCaps) { qemuDomainObjPrivatePtr priv = vm->privateData; + qemuDomainJobPrivatePtr jobPriv = priv->job.privateData; qemuMigrationCapability cap; qemuMigrationParty party; size_t i; @@ -1203,7 +1206,7 @@ qemuMigrationParamsCheck(virQEMUDriverPtr driver, * to ask QEMU for their current settings. */ - return qemuMigrationParamsFetch(driver, vm, asyncJob, &priv->job.migParams); + return qemuMigrationParamsFetch(driver, vm, asyncJob, &jobPriv->migParams); } diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 70fc24b993..af060b3180 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1608,6 +1608,7 @@ qemuProcessHandleSpiceMigrated(qemuMonitorPtr mon G_GNUC_UNUSED, void *opaque G_GNUC_UNUSED) { qemuDomainObjPrivatePtr priv; + qemuDomainJobPrivatePtr jobPriv; virObjectLock(vm); @@ -1615,12 +1616,13 @@ qemuProcessHandleSpiceMigrated(qemuMonitorPtr mon G_GNUC_UNUSED, vm, vm->def->name); priv = vm->privateData; + jobPriv = priv->job.privateData; if (priv->job.asyncJob != QEMU_ASYNC_JOB_MIGRATION_OUT) { VIR_DEBUG("got SPICE_MIGRATE_COMPLETED event without a migration job"); goto cleanup; } - priv->job.spiceMigrated = true; + jobPriv->spiceMigrated = true; virDomainObjBroadcast(vm); cleanup: @@ -1720,6 +1722,7 @@ qemuProcessHandleDumpCompleted(qemuMonitorPtr mon G_GNUC_UNUSED, void *opaque G_GNUC_UNUSED) { qemuDomainObjPrivatePtr priv; + qemuDomainJobPrivatePtr jobPriv; virObjectLock(vm); @@ -1727,11 +1730,12 @@ qemuProcessHandleDumpCompleted(qemuMonitorPtr mon G_GNUC_UNUSED, vm, vm->def->name, stats, NULLSTR(error)); priv = vm->privateData; + jobPriv = priv->job.privateData; if (priv->job.asyncJob == QEMU_ASYNC_JOB_NONE) { VIR_DEBUG("got DUMP_COMPLETED event without a dump_completed job"); goto cleanup; } - priv->job.dumpCompleted = true; + jobPriv->dumpCompleted = true; priv->job.current->stats.dump = *stats; priv->job.error = g_strdup(error); @@ -3411,6 +3415,8 @@ qemuProcessRecoverMigrationIn(virQEMUDriverPtr driver, virDomainState state, int reason) { + + qemuDomainJobPrivatePtr jobPriv = job->privateData; bool postcopy = (state == VIR_DOMAIN_PAUSED && reason == VIR_DOMAIN_PAUSED_POSTCOPY_FAILED) || (state == VIR_DOMAIN_RUNNING && @@ -3459,7 +3465,7 @@ qemuProcessRecoverMigrationIn(virQEMUDriverPtr driver, } qemuMigrationParamsReset(driver, vm, QEMU_ASYNC_JOB_NONE, - job->migParams, job->apiFlags); + jobPriv->migParams, job->apiFlags); return 0; } @@ -3471,6 +3477,7 @@ qemuProcessRecoverMigrationOut(virQEMUDriverPtr driver, int reason, unsigned int *stopFlags) { + qemuDomainJobPrivatePtr jobPriv = job->privateData; bool postcopy = state == VIR_DOMAIN_PAUSED && (reason == VIR_DOMAIN_PAUSED_POSTCOPY || reason == VIR_DOMAIN_PAUSED_POSTCOPY_FAILED); @@ -3554,7 +3561,7 @@ qemuProcessRecoverMigrationOut(virQEMUDriverPtr driver, } qemuMigrationParamsReset(driver, vm, QEMU_ASYNC_JOB_NONE, - job->migParams, job->apiFlags); + jobPriv->migParams, job->apiFlags); return 0; } -- 2.25.1

2 1