- Devel - libvirt List Archives

[PATCH V2 0/3] Xen: Add support for qemu commandline passthrough
by Jim Fehlig 25 Aug '20

25 Aug '20

V2 of https://www.redhat.com/archives/libvir-list/2020-July/msg02043.html Changes in V2: - Drop use of virStringListCopy, and hence patch 1/4 - Switch to using 'xen' namespace and schema extenstion instead of qemu - Use more glib functions Jim Fehlig (3): Xen: Add support for qemu command-line passthrough Xen: Add support for qemu commandline passthrough to config converter news: Mention support for device model commandline passthrough in Xen NEWS.rst | 8 ++ docs/drvxen.html.in | 29 +++++++ docs/schemas/domaincommon.rng | 17 ++++ src/libxl/libxl_conf.c | 10 ++- src/libxl/libxl_conf.h | 8 ++ src/libxl/libxl_domain.c | 84 ++++++++++++++++++ src/libxl/libxl_domain.h | 1 + src/libxl/xen_xl.c | 91 ++++++++++++++++++++ tests/xlconfigdata/test-qemu-passthrough.cfg | 26 ++++++ tests/xlconfigdata/test-qemu-passthrough.xml | 53 ++++++++++++ tests/xlconfigtest.c | 1 + 11 files changed, 327 insertions(+), 1 deletion(-) create mode 100644 tests/xlconfigdata/test-qemu-passthrough.cfg create mode 100644 tests/xlconfigdata/test-qemu-passthrough.xml -- 2.26.2

2 7

XDR related breakage in libvirt v6.6.0 when using libvirt-lxc
by Christian Ehrhardt 25 Aug '20

25 Aug '20

Hi, I expect that this falls under the "with meson now everything is different anyway" umbrella but wanted to let you know about this as it affects v6.6 in at least Ubuntu/Debian. The following recent patch has broken libvirt-lxc for us: commit d7147b3797380de2d159ce6324536f3e1f2d97e3 Author: Pavel Hrdina <phrdina(a)redhat.com> Date: Fri Jun 19 00:44:07 2020 +0200 m4: virt-xdr: rewrite XDR check I was tracking that down for [1] since the tests [4] failed on me. [2] holds the backtrace. In Debian the tests are skipped which explains why they were not seen there: smoke-lxc SKIP Test requires machine-level isolation but testbed does not provide that What happens is that the libvirt_lxc segfaults when using XDR functions. dmesg shows: [582093.524644] libvirt_lxc[261446]: segfault at 0 ip 0000000000000000 sp 00007ffdd2345598 error 14 in libvirt_lxc[5587e42aa000+8000] [582093.524650] Code: Bad RIP value. There are quite some uncertainties left, but on the surface it seems that it links with libtirpc but then instead of calling libtirpc: src/xdr.c:929:xdr_uint64_t(xdrs, ullp) it ends (gdb tells us in [2]) in glibc glibc: sunrpc/xdr_intXX_t.c:62:xdr_uint64_t (XDR *xdrs, uint64_t *uip) And the return from that function breaks it badly (instruction pointer at 0x0 -> segfault) Bisecting pointed to the referred commit which brings libtirpc into the mix. The former builds had xdr detected, but not with libtirpc. configure: xdr: yes (CFLAGS='' LIBS='') The new config now does configure: xdr: yes (CFLAGS='-I/usr/include/tirpc' LIBS='-ltirpc') And the resulting libvirt_lxc reflects that v6.0.0 $ lddtree /usr/lib/libvirt/libvirt_lxc | grep tirpc v6.6.0 $ lddtree /usr/lib/libvirt/libvirt_lxc | grep tirpc libtirpc.so.3 => /lib/x86_64-linux-gnu/libtirpc.so.3 This seems to lead to the bad jump and the crash eventually. Meanwhile reverting d7147b37 "m4: virt-xdr: rewrite XDR check" on top of v6.6.0 resolves the issue back to the former state. For anyone that wants to recreate this, I also attached a bisect script [3] which includes the test case you'd need. [1]: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1892826 [2]: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1892826/comments/4 [3]: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1892826/+attachment/… [4]: https://objectstorage.prodstack4-5.canonical.com/v1/AUTH_77e2ada1e7a84929a7… -- Christian Ehrhardt Staff Engineer, Ubuntu Server Canonical Ltd

2 3

[libvirt PATCH] storage_util: fix qemu-img sparse allocation
by Pavel Hrdina 25 Aug '20

25 Aug '20

Commit <c9ec7088c7a3f4cd26bb471f1f243931fff6f4f9> introduced a support to fully allocate qcow2 images when <allocation> matches <capacity> but it doesn't work as expected. The issue is that info.size_arg is in KB but the info.allocation introduced by the mentioned commit is in B. This results in using "preallocation=falloc," in cases where "preallocation=metadata," should be used. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/storage/storage_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index f7c09e3375..fcecedbc3a 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -1044,7 +1044,7 @@ virStorageBackendCreateQemuImgCmdFromVol(virStoragePoolObjPtr pool, .type = NULL, .inputType = NULL, .path = vol->target.path, - .allocation = vol->target.allocation, + .allocation = VIR_DIV_UP(vol->target.allocation, 1024), .encryption = !!vol->target.encryption, .preallocate = !!(flags & VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA), .compat = vol->target.compat, -- 2.26.2

2 1

[libvirt PATCH] rpm: always disable ceph on 32-bit
by Daniel P. Berrangé 25 Aug '20

25 Aug '20

The logic to disable Ceph on 32-bit was protected by a Fedora conditional. This is redundant as RHEL doesn't build on 32-bit platforms for years. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- libvirt.spec.in | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index e64cfdb561..5193a7cf89 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -117,11 +117,9 @@ %define with_storage_zfs 0 %endif -# Ceph dropping support for 32-bit hosts -%if 0%{?fedora} >= 30 - %ifarch %{arm} %{ix86} - %define with_storage_rbd 0 - %endif +# Ceph dropped support for 32-bit hosts +%ifarch %{arm} %{ix86} + %define with_storage_rbd 0 %endif # RHEL doesn't ship OpenVZ, VBox, PowerHypervisor, -- 2.26.2

2 3

[PATCH v2] virnetserver: fix some memory leaks in virNetTLSContextReloadForServer
by Jin Yan 25 Aug '20

25 Aug '20

These leaks were introduced in commit 15d280fa97b0, use g_autofree for all cert_path pointers. Signed-off-by: Jin Yan <jinyan12(a)huawei.com> --- src/rpc/virnettlscontext.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c index 168f3010ae..37564db14e 100644 --- a/src/rpc/virnettlscontext.c +++ b/src/rpc/virnettlscontext.c @@ -921,10 +921,10 @@ int virNetTLSContextReloadForServer(virNetTLSContextPtr ctxt, { gnutls_certificate_credentials_t x509credBak; int err; - char *cacert = NULL; - char *cacrl = NULL; - char *cert = NULL; - char *key = NULL; + g_autofree char *cacert = NULL; + g_autofree char *cacrl = NULL; + g_autofree char *cert = NULL; + g_autofree char *key = NULL; x509credBak = ctxt->x509cred; ctxt->x509cred = NULL; -- 2.23.0

4 3

[PATCH] NEWS: Mention IQN setting for iSCSI hostdevs
by Peter Krempa 25 Aug '20

25 Aug '20

Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- NEWS.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index d92714c29b..70c6684761 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -13,6 +13,12 @@ v6.7.0 (unreleased) * **New features** + * qemu: Add support for initiator IQN configuration for iSCSI hostdevs + + Similarly to iSCSI ``<disk>`` users can use an ``<initiator>`` element + inside ``<hostdev>`` with the same format to configure the ``IQN`` value + used by the qemu initiator when connecting to an iSCSI target. + * **Improvements** * Allow sparse streams for block devices -- 2.26.2

3 2

[PATCH 0/5] qemu: split off snapshot code for cleanup and reuse
by Peter Krempa 25 Aug '20

25 Aug '20

Peter Krempa (5): qemuOpenFileAs: Move into util/virqemu.c qemuOpenFile: Move to qemu_domain.c qemuFileWrapperFDClose: move to qemu_domain.c qemu: Split of code related to handling of the save image file qemu: Extract snapshot related code to a separate file po/POTFILES.in | 2 + src/libvirt_private.syms | 1 + src/qemu/meson.build | 2 + src/qemu/qemu_domain.c | 70 + src/qemu/qemu_domain.h | 11 + src/qemu/qemu_driver.c | 3320 ++----------------------------------- src/qemu/qemu_saveimage.c | 764 +++++++++ src/qemu/qemu_saveimage.h | 116 ++ src/qemu/qemu_snapshot.c | 2266 +++++++++++++++++++++++++ src/qemu/qemu_snapshot.h | 55 + src/util/virqemu.c | 130 ++ src/util/virqemu.h | 7 + 12 files changed, 3520 insertions(+), 3224 deletions(-) create mode 100644 src/qemu/qemu_saveimage.c create mode 100644 src/qemu/qemu_saveimage.h create mode 100644 src/qemu/qemu_snapshot.c create mode 100644 src/qemu/qemu_snapshot.h -- 2.26.2

4 13

[PATCH 1/1] NEWS.rst: update with NVDIMM auto-alignment removal for pSeries
by Daniel Henrique Barboza 25 Aug '20

25 Aug '20

Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com> --- NEWS.rst | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index d92714c29b..7ae4aa9340 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -20,6 +20,17 @@ v6.7.0 (unreleased) Sparse streams (e.g. ``virsh vol-download --sparse`` or ``virsh vol-upload --sparse``) now handle if one of the stream ends is a block device. + * Remove NVDIMM auto-alignment for pSeries Guests + + This feature was introduced in libvirt v6.2.0 as part of the overall + NVDIMM support for pSeries guests. The idea was to relieve the user + from knowing ppc64 alignment details, but the end result is that we + ended up with inconsistencies between domain XML and actual NVDIMM + size the guest is using. To promote consistency between domain XML + and the guest, unaligned NVDIMM sizes for pSeries guests will now be + forbid and no size auto-alignment will be made. Instead, libvirt will + suggest an aligned round up size for the user. + * **Bug fixes** * virdevmapper: Deal with kernels without DM support -- 2.26.2

2 1

[libvirt PATCH v2] manpages/virsh: A couple of small clarifications
by Kashyap Chamarthy 25 Aug '20

25 Aug '20

Changes: - Update the descriptions of --current & --config flags. For --config, the reason to rephrase "next boot" to "next start" is: "Next boot may still imply somebody selecting "reboot" in the guest OS and fully expecting the changes to be applied." (per Peter Krempa) For --current, existing documentation says: "If *--current* is specified, affect the current guest state." It's not entirely clear what states can "current" mean or imply. So rephrase it in context of the other two related flags --live and --config. - While at it, I also took the liberty to replace the few occurrences of "peristent domain[s]" with "persistent guest[s]" Fix all occurrences (i.e. as many as I could spot) of this. (Thanks: Dan Berrangé on IRC.) Signed-off-by: Kashyap Chamarthy <kchamart(a)redhat.com> --- - v2: Address Peter Krempa's feedback (https://www.redhat.com/archives/libvir-list/2020-July/msg01274.html) --- docs/manpages/virsh.rst | 163 +++++++++++++++++++++++----------------- 1 file changed, 95 insertions(+), 68 deletions(-) diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst index 1a2cf09fb7..561b1f038e 100644 --- a/docs/manpages/virsh.rst +++ b/docs/manpages/virsh.rst @@ -710,7 +710,7 @@ groups: Persistence ........... -Flag *--persistent* is used to include persistent domains in the returned +Flag *--persistent* is used to include persistent guests in the returned list. To include transient domains specify *--transient*. Existence of managed save image @@ -1089,8 +1089,9 @@ then the default value of 1 second will be displayed. Supplying a 0 will reset the value back to the default. If *--live* is specified, affect a running guest. -If *--config* is specified, affect the next boot of a persistent guest. -If *--current* is specified, affect the current guest state. +If *--config* is specified, affect the next start of a persistent guest. +If *--current* is specified, it is equivalent to either *--live* or +*--config*, depending on the current state of the guest. When setting the disk io parameters both *--live* and *--config* flags may be given, but *--current* is exclusive. For querying only one of *--live*, *--config* or *--current* can be specified. If no flag is specified, behavior @@ -1151,8 +1152,9 @@ Only the devices listed in the string are modified; any existing per-device write_bytes_sec for other devices remain unchanged. If *--live* is specified, affect a running guest. -If *--config* is specified, affect the next boot of a persistent guest. -If *--current* is specified, affect the current guest state. +If *--config* is specified, affect the next start of a persistent guest. +If *--current* is specified, it is equivalent to either *--live* or +*--config*, depending on the current state of the guest. Both *--live* and *--config* flags may be given, but *--current* is exclusive. If no flag is specified, behavior is different depending on hypervisor. @@ -1451,7 +1453,7 @@ Create a domain from an XML <file>. Optionally, *--validate* option can be passed to validate the format of the input XML file against an internal RNG schema (identical to using virt-xml-validate(1) tool). Domains created using this command are going to be either transient (temporary ones that will vanish -once destroyed) or existing persistent domains that will run with one-time use +once destroyed) or existing persistent guests that will run with one-time use configuration, leaving the persistent XML untouched (this can come handy during an automated testing of various configurations all based on the original XML). See the example below for usage demonstration. @@ -1490,7 +1492,7 @@ is only supported with container based virtualization. respectively: a. the domain is going to be transient - b. an existing persistent domain will run with a modified one-time + b. an existing persistent guest will run with a modified one-time configuration .. code-block:: @@ -1985,8 +1987,9 @@ To clear inbound or outbound settings, use *--inbound* or *--outbound* respectfully with average value of zero. If *--live* is specified, affect a running guest. -If *--config* is specified, affect the next boot of a persistent guest. -If *--current* is specified, affect the current guest state. +If *--config* is specified, affect the next start of a persistent guest. +If *--current* is specified, it is equivalent to either *--live* or +*--config*, depending on the current state of the guest. Both *--live* and *--config* flags may be given, but *--current* is exclusive. If no flag is specified, behavior is different depending on hypervisor. @@ -2088,8 +2091,10 @@ QEMU/KVM 1.5 to be running on the host. The *--live*, *--config*, and *--current* flags are only valid when using the *--period* option in order to set the collection period for the balloon driver. If *--live* is specified, only the running guest collection period -is affected. If *--config* is specified, affect the next boot of a persistent -guest. If *--current* is specified, affect the current guest state. +is affected. If *--config* is specified, affect the next start of a persistent +guest. If *--current* is specified, it is equivalent to either *--live* +or *--config*, depending on the current state of the guest. + Both *--live* and *--config* flags may be given, but *--current* is exclusive. If no flag is specified, behavior is different depending @@ -2581,8 +2586,9 @@ CPUs. See ``vcpupin`` for *cpulist*. If *--live* is specified, affect a running guest. -If *--config* is specified, affect the next boot of a persistent guest. -If *--current* is specified, affect the current guest state. +If *--config* is specified, affect the next start of a persistent guest. +If *--current* is specified, it is equivalent to either *--live* or +*--config*, depending on the current state of the guest. Both *--live* and *--config* flags may be given if *cpulist* is present, but *--current* is exclusive. If no flag is specified, behavior is different depending on hypervisor. @@ -2744,9 +2750,9 @@ If the *iothread_id* already exists, the command will fail. The If *--live* is specified, affect a running guest. If the guest is not running an error is returned. -If *--config* is specified, affect the next boot of a persistent guest. -If *--current* is specified or *--live* and *--config* are not specified, -affect the current guest state. +If *--config* is specified, affect the next start of a persistent guest. +If *--current* is specified, it is equivalent to either *--live* or +*--config*, depending on the current state of the guest. iothreaddel @@ -2765,9 +2771,10 @@ If the *iothread_id* does not exist an error will occur. If *--live* is specified, affect a running guest. If the guest is not running an error is returned. -If *--config* is specified, affect the next boot of a persistent guest. -If *--current* is specified or *--live* and *--config* are not specified, -affect the current guest state. +If *--config* is specified, affect the next start of a persistent guest. +If *--current* is specified, it is equivalent to either *--live* or +*--config*, depending on the current state of the guest. + iothreadinfo @@ -2784,10 +2791,11 @@ the CPU Affinity for each IOThread. If *--live* is specified, get the IOThreads data from the running guest. If the guest is not running, an error is returned. -If *--config* is specified, get the IOThreads data from the next boot of +If *--config* is specified, get the IOThreads data from the next start of a persistent guest. If *--current* is specified or *--live* and *--config* are not specified, -then get the IOThread data based on the current guest state. +then get the IOThread data based on the current guest state, which can +either be live or offline. iothreadpin @@ -2812,9 +2820,9 @@ to all physical cpus, simply specify 'r' as a *cpulist*. If *--live* is specified, affect a running guest. If the guest is not running, an error is returned. -If *--config* is specified, affect the next boot of a persistent guest. -If *--current* is specified or *--live* and *--config* are not specified, -affect the current guest state. +If *--config* is specified, affect the next start of a persistent guest. +If *--current* is specified, it is equivalent to either *--live* or +*--config*, depending on the current state of the guest. Both *--live* and *--config* flags may be given if *cpulist* is present, but *--current* is exclusive. If no flag is specified, behavior is different depending on hypervisor. @@ -2851,7 +2859,8 @@ next start, restore, etc. If *--live* is specified, affect a running guest. If the guest is not running an error is returned. If *--current* is specified or *--live* is not specified, then handle -as if *--live* was specified. +as if *--live* was specified. (Where "current" here means whatever the +present guest state is: live or offline.) managedsave @@ -2997,8 +3006,9 @@ than KiB, and requests that are not an even multiple will be rounded up. For example, vSphere/ESX rounds the parameter up to mebibytes (1024 kibibytes). If *--live* is specified, affect a running guest. -If *--config* is specified, affect the next boot of a persistent guest. -If *--current* is specified, affect the current guest state. +If *--config* is specified, affect the next start of a persistent guest. +If *--current* is specified, it is equivalent to either *--live* or +*--config*, depending on the current state of the guest. Both *--live* and *--config* flags may be given, but *--current* is exclusive. If no flag is specified, behavior is different depending on hypervisor. @@ -3160,7 +3170,7 @@ the destination to supply a larger set of changes to any host-specific portions of the domain XML, such as accounting for naming differences between source and destination in accessing underlying storage. If *--persistent* is enabled, *--persistent-xml* ``file`` can be used to -supply an alternative XML file which will be used as the persistent domain +supply an alternative XML file which will be used as the persistent guest definition on the destination host. *--timeout* ``seconds`` tells virsh to run a specified action when live @@ -3392,8 +3402,9 @@ Its syntax is a comma separated list, with '-' for ranges and '^' for excluding a node. If *--live* is specified, set scheduler information of a running guest. -If *--config* is specified, affect the next boot of a persistent guest. -If *--current* is specified, affect the current guest state. +If *--config* is specified, affect the next start of a persistent guest. +If *--current* is specified, it is equivalent to either *--live* or +*--config*, depending on the current state of the guest. For running guests in Linux hosts, the changes made in the domain's numa parameters does not imply that the guest memory will be moved to a @@ -3485,8 +3496,9 @@ separated by commas. Valid event names are as follows: the *--perf* flag. If *--live* is specified, affect a running guest. -If *--config* is specified, affect the next boot of a persistent guest. -If *--current* is specified, affect the current guest state. +If *--config* is specified, affect the next start of a persistent guest. +If *--current* is specified, it is equivalent to either *--live* or +*--config*, depending on the current state of the guest. Both *--live* and *--config* flags may be given, but *--current* is exclusive. If no flag is specified, behavior is different depending on hypervisor. @@ -3714,8 +3726,9 @@ Xen (credit scheduler): weight, cap ESX (allocation scheduler): reservation, limit, shares If *--live* is specified, set scheduler information of a running guest. -If *--config* is specified, affect the next boot of a persistent guest. -If *--current* is specified, affect the current guest state. +If *--config* is specified, affect the next start of a persistent guest. +If *--current* is specified, it is equivalent to either *--live* or +*--config*, depending on the current state of the guest. ``Note``: The cpu_shares parameter has a valid value range of 0-262144; Negative values are wrapped to positive, and larger values are capped at the maximum. @@ -3956,8 +3969,9 @@ setmaxmem Change the maximum memory allocation limit for a guest domain. If *--live* is specified, affect a running guest. -If *--config* is specified, affect the next boot of a persistent guest. -If *--current* is specified, affect the current guest state. +If *--config* is specified, affect the next start of a persistent guest. +If *--current* is specified, it is equivalent to either *--live* or +*--config*, depending on the current state of the guest. Both *--live* and *--config* flags may be given, but *--current* is exclusive. If no flag is specified, behavior is different depending on hypervisor. @@ -3987,8 +4001,9 @@ setmem Change the memory allocation for a guest domain. If *--live* is specified, perform a memory balloon of a running guest. -If *--config* is specified, affect the next boot of a persistent guest. -If *--current* is specified, affect the current guest state. +If *--config* is specified, affect the next start of a persistent guest. +If *--current* is specified, it is equivalent to either *--live* or +*--config*, depending on the current state of the guest. Both *--live* and *--config* flags may be given, but *--current* is exclusive. If no flag is specified, behavior is different depending on hypervisor. @@ -4038,7 +4053,8 @@ specified together if supported by the hypervisor. If this command is run before the guest has finished booting, the guest may fail to process the change. -If *--current* is specified, affect the current guest state. +If *--current* is specified, it is equivalent to either *--live* or +*--config*, depending on the current state of the guest. When no flags are given, the *--live* flag is assumed and the guest domain must be active. In this situation it @@ -4083,10 +4099,11 @@ Note that hypervisors may refuse to disable certain vcpus such as vcpu 0 or others. If *--live* is specified, affect a running domain. -If *--config* is specified, affect the next startup of a persistent domain. -If *--current* is specified, affect the current domain state. This is the -default. Both *--live* and *--config* flags may be given, but *--current* is -exclusive. +If *--config* is specified, affect the next startup of a persistent guest. +If *--current* is specified, it is equivalent to either *--live* or +*--config*, depending on the current state of the guest. This is the +default. Both *--live* and *--config* flags may be given, but +*--current* is exclusive. shutdown @@ -4262,7 +4279,7 @@ via the *--active* flag, rather than relating to the *--current* flag. *--maximum* requests information on the maximum cap of vcpus that a domain can add via ``setvcpus``, while *--active* shows the current usage; these two flags cannot both be specified. *--config* -requires a persistent domain and requests information regarding the next +requires a persistent guest and requests information regarding the next time the domain will be booted, *--live* requires a running domain and lists current values, and *--current* queries according to the current state of the domain (corresponding to *--live* if running, or @@ -4355,8 +4372,9 @@ separated list and a special markup using '-' and '^' (ex. '0-4', '0-3,^2') can also be allowed. The '-' denotes the range and the '^' denotes exclusive. For pinning the *vcpu* to all physical cpus specify 'r' as a *cpulist*. If *--live* is specified, affect a running guest. -If *--config* is specified, affect the next boot of a persistent guest. -If *--current* is specified, affect the current guest state. +If *--config* is specified, affect the next start of a persistent guest. +If *--current* is specified, it is equivalent to either *--live* or +*--config*, depending on the current state of the guest. Both *--live* and *--config* flags may be given if *cpulist* is present, but *--current* is exclusive. If no flag is specified, behavior is different depending on hypervisor. @@ -4402,7 +4420,7 @@ file using a device definition element such as <disk> or <interface> as the top-level element. See the documentation at `https://libvirt.org/formatdomain.html#elementsDevices <https://libvirt.org/formatdomain.html#elementsDevices>`__ to learn about libvirt XML format for a device. If *--config* is specified the -command alters the persistent domain configuration with the device +command alters the persistent guest configuration with the device attach taking effect the next time libvirt starts the domain. For cdrom and floppy devices, this command only replaces the media within an existing device; consider using ``update-device`` for this @@ -4410,8 +4428,9 @@ usage. For passthrough host devices, see also ``nodedev-detach``, needed if the PCI device does not use managed mode. If *--live* is specified, affect a running domain. -If *--config* is specified, affect the next startup of a persistent domain. -If *--current* is specified, affect the current domain state. +If *--config* is specified, affect the next startup of a persistent guest. +If *--current* is specified, it is equivalent to either *--live* or +*--config*, depending on the current state of the guest. Both *--live* and *--config* flags may be given, but *--current* is exclusive. When no flag is specified legacy API is used whose behavior depends on the hypervisor driver. @@ -4479,8 +4498,9 @@ If *--print-xml* is specified, then the XML of the disk that would be attached is printed instead. If *--live* is specified, affect a running domain. -If *--config* is specified, affect the next startup of a persistent domain. -If *--current* is specified, affect the current domain state. +If *--config* is specified, affect the next startup of a persistent guest. +If *--current* is specified, it is equivalent to either *--live* or +*--config*, depending on the current state of the guest. Both *--live* and *--config* flags may be given, but *--current* is exclusive. When no flag is specified legacy API is used whose behavior depends on the hypervisor driver. @@ -4567,8 +4587,9 @@ If ``--print-xml`` is specified, then the XML of the interface that would be attached is printed instead. If ``--live`` is specified, affect a running domain. -If ``--config`` is specified, affect the next startup of a persistent domain. -If ``--current`` is specified, affect the current domain state. +If ``--config`` is specified, affect the next startup of a persistent guest. +If ``--current`` is specified, affect the current domain state, which +can either be live or offline. Both ``--live`` and ``--config`` flags may be given, but ``--current`` is exclusive. When no flag is specified legacy API is used whose behavior depends on the hypervisor driver. @@ -4614,8 +4635,9 @@ when the device is removed. Note that the event may arrive before the command returns. If *--live* is specified, affect a running domain. -If *--config* is specified, affect the next startup of a persistent domain. -If *--current* is specified, affect the current domain state. +If *--config* is specified, affect the next startup of a persistent guest. +If *--current* is specified, it is equivalent to either *--live* or +*--config*, depending on the current state of the guest. Both *--live* and *--config* flags may be given, but *--current* is exclusive. When no flag is specified legacy API is used whose behavior depends on the hypervisor driver. @@ -4642,8 +4664,9 @@ removal of the device is notified asynchronously via libvirt events (see virsh event). If *--live* is specified, affect a running domain. -If *--config* is specified, affect the next startup of a persistent domain. -If *--current* is specified, affect the current domain state. +If *--config* is specified, affect the next startup of a persistent guest. +If *--current* is specified, it is equivalent to either *--live* or +*--config*, depending on the current state of the guest. Both *--live* and *--config* flags may be given, but *--current* is exclusive. @@ -4662,8 +4685,9 @@ Detach a disk device from a domain. The *target* is the device as seen from the domain. If *--live* is specified, affect a running domain. -If *--config* is specified, affect the next startup of a persistent domain. -If *--current* is specified, affect the current domain state. +If *--config* is specified, affect the next startup of a persistent guest. +If *--current* is specified, it is equivalent to either *--live* or +*--config*, depending on the current state of the guest. Both *--live* and *--config* flags may be given, but *--current* is exclusive. When no flag is specified legacy API is used whose behavior depends on the hypervisor driver. @@ -4698,8 +4722,9 @@ Detach a network interface from a domain. present on the domain. If *--live* is specified, affect a running domain. -If *--config* is specified, affect the next startup of a persistent domain. -If *--current* is specified, affect the current domain state. +If *--config* is specified, affect the next startup of a persistent guest. +If *--current* is specified, it is equivalent to either *--live* or +*--config*, depending on the current state of the guest. Both *--live* and *--config* flags may be given, but *--current* is exclusive. When no flag is specified legacy API is used whose behavior depends on the hypervisor driver. @@ -4731,8 +4756,9 @@ locked/mounted in the domain. See the documentation at libvirt XML format for a device. If *--live* is specified, affect a running domain. -If *--config* is specified, affect the next startup of a persistent domain. -If *--current* is specified, affect the current domain state. +If *--config* is specified, affect the next startup of a persistent guest. +If *--current* is specified, it is equivalent to either *--live* or +*--config*, depending on the current state of the guest. Both *--live* and *--config* flags may be given, but *--current* is exclusive. Not specifying any flag is the same as specifying *--current*. @@ -4776,7 +4802,7 @@ is used by default. The *--force* option can be used to force media changing. If *--live* is specified, alter live configuration of running guest. If *--config* is specified, alter persistent configuration, effect observed -on next boot. +on next startup of the guest. *--current* can be either or both of *live* and *config*, depends on the hypervisor's implementation. Both *--live* and *--config* flags may be given, but *--current* is @@ -5223,7 +5249,8 @@ instance of <ip> will get the modification. If *--live* is specified, affect a running network. If *--config* is specified, affect the next startup of a persistent network. -If *--current* is specified, affect the current network state. +If *--current* is specified, it is equivalent to either *--live* or +*--config*, depending on the current state of the guest. Both *--live* and *--config* flags may be given, but *--current* is exclusive. Not specifying any flag is the same as specifying *--current*. @@ -6717,7 +6744,7 @@ taken. This increases the size of the memory image of the external snapshot. This is currently supported only for full system external snapshots. Existence of snapshot metadata will prevent attempts to ``undefine`` -a persistent domain. However, for transient domains, snapshot +a persistent guest. However, for transient domains, snapshot metadata is silently lost when the domain quits running (whether by command such as ``destroy`` or by internal guest action). @@ -6926,7 +6953,7 @@ Filtering options are not compatible with *--tree*. If *--metadata* is specified, the list will be filtered to just snapshots that involve libvirt metadata, and thus would prevent -``undefine`` of a persistent domain, or be lost on ``destroy`` of +``undefine`` of a persistent guest, or be lost on ``destroy`` of a transient domain. Likewise, if *--no-metadata* is specified, the list will be filtered to just snapshots that exist without the need for libvirt metadata. @@ -7087,7 +7114,7 @@ to freeze and unfreeze domain's mounted file systems. However, if domain has no guest agent, checkpoint creation will fail. Existence of checkpoint metadata will prevent attempts to ``undefine`` -a persistent domain. However, for transient domains, checkpoint +a persistent guest. However, for transient domains, checkpoint metadata is silently lost when the domain quits running (whether by command such as ``destroy`` or by internal guest action). -- 2.26.2

4 6

[PATCH] virsh: Add source-initiator opt to build the initiator of pool XML
by Han Han 25 Aug '20

25 Aug '20

For iscsi-direct pool, the initiator is necessary for pool defining: <pool type="iscsi-direct"> ... <initiator> <iqn name="iqn.2013-06.com.example:iscsi-initiator"/> </initiator> ... </pool> Add --source-initiator to fill the initiator iqn for pool-create-as/pool-define-as subcommands. https://bugzilla.redhat.com/show_bug.cgi?id=1658082 Signed-off-by: Han Han <hhan(a)redhat.com> --- docs/manpages/virsh.rst | 5 +++++ tools/virsh-pool.c | 17 +++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst index 9187037a56..0482fe8b26 100644 --- a/docs/manpages/virsh.rst +++ b/docs/manpages/virsh.rst @@ -5732,6 +5732,7 @@ pool-create-as pool-create-as name type [--source-host hostname] [--source-path path] [--source-dev path] [--source-name name] [--target path] [--source-format format] + [--source-initiator initiator-iqn] [--auth-type authtype --auth-username username [--secret-usage usage | --secret-uuid uuid]] [--source-protocol-ver ver] @@ -5769,6 +5770,9 @@ the host file system. [*--source-format format*] provides information about the format of the pool (pool types fs, netfs, disk, logical). +[*--source-initiator initiator-iqn*] provides the initiator iqn for iscsi +connection of the pool (pool type iscsi-direct). + [*--auth-type authtype* *--auth-username username* [*--secret-usage usage* | *--secret-uuid uuid*]] provides the elements required to generate authentication credentials for @@ -5831,6 +5835,7 @@ pool-define-as pool-define-as name type [--source-host hostname] [--source-path path] [--source-dev path] [*--source-name name*] [*--target path*] [*--source-format format*] + [--source-initiator initiator-iqn] [*--auth-type authtype* *--auth-username username* [*--secret-usage usage* | *--secret-uuid uuid*]] [*--source-protocol-ver ver*] diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c index fd43d3bb62..a7e0aa3010 100644 --- a/tools/virsh-pool.c +++ b/tools/virsh-pool.c @@ -141,6 +141,10 @@ {.name = "source-protocol-ver", \ .type = VSH_OT_STRING, \ .help = N_("nfsvers value for NFS pool mount option") \ + }, \ + {.name = "source-initiator", \ + .type = VSH_OT_STRING, \ + .help = N_("initiator iqn for underlying storage") \ } virStoragePoolPtr @@ -324,7 +328,8 @@ virshBuildPoolXML(vshControl *ctl, *secretUsage = NULL, *adapterName = NULL, *adapterParent = NULL, *adapterWwnn = NULL, *adapterWwpn = NULL, *secretUUID = NULL, *adapterParentWwnn = NULL, *adapterParentWwpn = NULL, - *adapterParentFabricWwn = NULL, *protoVer = NULL; + *adapterParentFabricWwn = NULL, *protoVer = NULL, + *srcInitiator = NULL; g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; VSH_EXCLUSIVE_OPTIONS("secret-usage", "secret-uuid"); @@ -352,7 +357,8 @@ virshBuildPoolXML(vshControl *ctl, vshCommandOptStringReq(ctl, cmd, "adapter-parent-wwnn", &adapterParentWwnn) < 0 || vshCommandOptStringReq(ctl, cmd, "adapter-parent-wwpn", &adapterParentWwpn) < 0 || vshCommandOptStringReq(ctl, cmd, "adapter-parent-fabric-wwn", &adapterParentFabricWwn) < 0 || - vshCommandOptStringReq(ctl, cmd, "source-protocol-ver", &protoVer) < 0) { + vshCommandOptStringReq(ctl, cmd, "source-protocol-ver", &protoVer) < 0 || + vshCommandOptStringReq(ctl, cmd, "source-initiator", &srcInitiator) < 0) { return false; } @@ -370,6 +376,13 @@ virshBuildPoolXML(vshControl *ctl, virBufferAsprintf(&buf, "<dir path='%s'/>\n", srcPath); if (srcDev) virBufferAsprintf(&buf, "<device path='%s'/>\n", srcDev); + if (srcInitiator) { + virBufferAddLit(&buf, "<initiator>\n"); + virBufferAdjustIndent(&buf, 2); + virBufferAsprintf(&buf, "<iqn name='%s'/>\n", srcInitiator); + virBufferAdjustIndent(&buf, -2); + virBufferAddLit(&buf, "</initiator>\n"); + } if (adapterWwnn && adapterWwpn) { virBufferAddLit(&buf, "<adapter type='fc_host'"); if (adapterParent) -- 2.28.0

2 1