- Devel - libvirt List Archives

[libvirt PATCH] Fix incorrect g_new0 conversions
by Ján Tomko 06 Oct '20

06 Oct '20

I left in a 'return' or 'goto cleanup' in a few places that where I did the conversion manually. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> Reported-by: John Ferlan <jferlan(a)redhat.com> --- src/esx/esx_storage_backend_vmfs.c | 1 - src/libxl/libxl_capabilities.c | 2 -- src/libxl/libxl_driver.c | 1 - src/qemu/qemu_hotplug.c | 1 - src/storage/storage_backend_iscsi_direct.c | 1 - tools/virt-login-shell-helper.c | 1 - 6 files changed, 7 deletions(-) diff --git a/src/esx/esx_storage_backend_vmfs.c b/src/esx/esx_storage_backend_vmfs.c index e397853bf7..c7a7863a61 100644 --- a/src/esx/esx_storage_backend_vmfs.c +++ b/src/esx/esx_storage_backend_vmfs.c @@ -1195,7 +1195,6 @@ esxStorageVolCreateXMLFrom(virStoragePoolPtr pool, if (priv->primary->hasQueryVirtualDiskUuid) { key = g_new0(char, VIR_UUID_STRING_BUFLEN); - goto cleanup; if (esxVI_QueryVirtualDiskUuid(priv->primary, datastorePath, priv->primary->datacenter->_reference, diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index 622cba1bfc..2f3ed5bc83 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -284,7 +284,6 @@ libxlCapsInitNuma(libxl_ctx *ctx, virCapsPtr caps) if (nr_cpus_node[node] == 1) { cpus[node] = g_new0(virCapsHostNUMACellCPU, 1); - goto cleanup; } else { if (VIR_REALLOC_N(cpus[node], nr_cpus_node[node]) < 0) goto cleanup; @@ -323,7 +322,6 @@ libxlCapsInitNuma(libxl_ctx *ctx, virCapsPtr caps) size_t j; siblings = g_new0(virCapsHostNUMACellSiblingInfo, nr_siblings); - goto cleanup; for (j = 0; j < nr_siblings; j++) { siblings[j].node = j; diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 446449fb33..e28c649688 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -2762,7 +2762,6 @@ libxlConnectDomainXMLToNative(virConnectPtr conn, const char * nativeFormat, } ret = g_new0(char, len); - goto cleanup; if (virConfWriteMem(ret, &len, conf) < 0) { VIR_FREE(ret); diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 1aa8b497dd..7a54fcb221 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1280,7 +1280,6 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, tapfd = g_new0(int, tapfdSize); memset(tapfd, -1, sizeof(*tapfd) * tapfdSize); vhostfd = g_new0(int, vhostfdSize); - goto cleanup; memset(vhostfd, -1, sizeof(*vhostfd) * vhostfdSize); if (qemuInterfaceEthernetConnect(vm->def, driver, net, tapfd, tapfdSize) < 0) diff --git a/src/storage/storage_backend_iscsi_direct.c b/src/storage/storage_backend_iscsi_direct.c index 66ceb48e6a..12b075db0b 100644 --- a/src/storage/storage_backend_iscsi_direct.c +++ b/src/storage/storage_backend_iscsi_direct.c @@ -626,7 +626,6 @@ virStorageBackendISCSIDirectVolWipeZero(virStorageVolDefPtr vol, if (virISCSIDirectGetVolumeCapacity(iscsi, lun, &block_size, &nb_block)) return ret; data = g_new0(unsigned char, block_size * BLOCK_PER_PACKET); - return ret; while (lba < nb_block) { const uint64_t to_write = MIN(nb_block - lba + 1, BLOCK_PER_PACKET); diff --git a/tools/virt-login-shell-helper.c b/tools/virt-login-shell-helper.c index 0e7987bf82..0522896eee 100644 --- a/tools/virt-login-shell-helper.c +++ b/tools/virt-login-shell-helper.c @@ -100,7 +100,6 @@ static int virLoginShellGetShellArgv(virConfPtr conf, if (rv == 0) { *shargv = g_new0(char *, 2); - return -1; (*shargv)[0] = g_strdup("/bin/sh"); *shargvlen = 1; } else { -- 2.26.2

3 4

[libvirt PATCH 0/9] qemu: use g_new0 (glib chronicles)
by Ján Tomko 06 Oct '20

06 Oct '20

With the exception of qemu_migrate_cookie and qemu_slirp which should be dealt with by Peter's series. Ján Tomko (9): qemu: separate out VIR_ALLOC calls qemu: capabilities: use g_new0 qemu: domain: use g_new0 qemu: driver: use g_new0 qemu: monitor: json: use g_new0 qemu: process: use g_new0 qemu: command: use g_new0 qemu: firmware: use g_new0 qemu: use g_new0 src/qemu/qemu_agent.c | 6 +- src/qemu/qemu_block.c | 15 ++--- src/qemu/qemu_capabilities.c | 48 +++++--------- src/qemu/qemu_cgroup.c | 6 +- src/qemu/qemu_command.c | 35 ++++------- src/qemu/qemu_conf.c | 20 +++--- src/qemu/qemu_domain.c | 55 ++++++---------- src/qemu/qemu_domain_address.c | 3 +- src/qemu/qemu_driver.c | 62 +++++++----------- src/qemu/qemu_firmware.c | 34 ++++------ src/qemu/qemu_hotplug.c | 29 ++++----- src/qemu/qemu_migration.c | 6 +- src/qemu/qemu_monitor.c | 13 +--- src/qemu/qemu_monitor_json.c | 112 +++++++++++---------------------- src/qemu/qemu_namespace.c | 3 +- src/qemu/qemu_process.c | 75 +++++++++------------- src/qemu/qemu_saveimage.c | 3 +- src/qemu/qemu_vhost_user.c | 17 +++-- 18 files changed, 190 insertions(+), 352 deletions(-) -- 2.26.2

3 15

[libvirt PATCH] examples: fix storage volume size schema
by Daniel P. Berrangé 06 Oct '20

06 Oct '20

There is no such <storage> element, <capacity> and <allocation> exist at the top level. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- examples/xml/storage/vol-cow.xml | 6 ++---- examples/xml/storage/vol-qcow.xml | 6 ++---- examples/xml/storage/vol-qcow2.xml | 6 ++---- examples/xml/storage/vol-raw.xml | 6 ++---- examples/xml/storage/vol-sparse.xml | 6 ++---- examples/xml/storage/vol-vmdk.xml | 6 ++---- 6 files changed, 12 insertions(+), 24 deletions(-) diff --git a/examples/xml/storage/vol-cow.xml b/examples/xml/storage/vol-cow.xml index 1d80a01f4b..f2bf1b4950 100644 --- a/examples/xml/storage/vol-cow.xml +++ b/examples/xml/storage/vol-cow.xml @@ -1,9 +1,7 @@ <volume type="file"> <name>cow.img</name> - <storage> - <allocation>0</allocation> - <capacity unit="T">1</capacity> - </storage> + <allocation>0</allocation> + <capacity unit="T">1</capacity> <target> <format type="cow"/> </target> diff --git a/examples/xml/storage/vol-qcow.xml b/examples/xml/storage/vol-qcow.xml index af2011d66a..6c30329f39 100644 --- a/examples/xml/storage/vol-qcow.xml +++ b/examples/xml/storage/vol-qcow.xml @@ -1,9 +1,7 @@ <volume type="file"> <name>qcow.img</name> - <storage> - <allocation>0</allocation> - <capacity unit="T">1</capacity> - </storage> + <allocation>0</allocation> + <capacity unit="T">1</capacity> <target> <format type="qcow"/> </target> diff --git a/examples/xml/storage/vol-qcow2.xml b/examples/xml/storage/vol-qcow2.xml index 9d944a78d7..14639da796 100644 --- a/examples/xml/storage/vol-qcow2.xml +++ b/examples/xml/storage/vol-qcow2.xml @@ -1,9 +1,7 @@ <volume type="file"> <name>qcow2.img</name> - <storage> - <allocation>0</allocation> - <capacity unit="T">1</capacity> - </storage> + <allocation>0</allocation> + <capacity unit="T">1</capacity> <target> <format type="qcow2"/> </target> diff --git a/examples/xml/storage/vol-raw.xml b/examples/xml/storage/vol-raw.xml index 59d4b457b1..bc4e049a35 100644 --- a/examples/xml/storage/vol-raw.xml +++ b/examples/xml/storage/vol-raw.xml @@ -1,7 +1,5 @@ <volume type="file"> <name>raw.img</name> - <storage> - <allocation unit="M">10</allocation> - <capacity unit="M">1000</capacity> - </storage> + <allocation unit="M">10</allocation> + <capacity unit="M">1000</capacity> </volume> diff --git a/examples/xml/storage/vol-sparse.xml b/examples/xml/storage/vol-sparse.xml index c529a490d9..2ec9f0b748 100644 --- a/examples/xml/storage/vol-sparse.xml +++ b/examples/xml/storage/vol-sparse.xml @@ -1,7 +1,5 @@ <volume type="file"> <name>sparse.img</name> - <storage> - <allocation>0</allocation> - <capacity unit="T">1</capacity> - </storage> + <allocation>0</allocation> + <capacity unit="T">1</capacity> </volume> diff --git a/examples/xml/storage/vol-vmdk.xml b/examples/xml/storage/vol-vmdk.xml index 5af0a8499f..05309a1438 100644 --- a/examples/xml/storage/vol-vmdk.xml +++ b/examples/xml/storage/vol-vmdk.xml @@ -1,9 +1,7 @@ <volume type="file"> <name>vmdk3.img</name> - <storage> - <allocation>0</allocation> - <capacity unit="T">1</capacity> - </storage> + <allocation>0</allocation> + <capacity unit="T">1</capacity> <target> <format type="vmdk"/> </target> -- 2.26.2

2 2

[PATCH] mailmap: consolidate my email addresses
by Matt Coleman 06 Oct '20

06 Oct '20

Signed-off-by: Matt Coleman <matt(a)datto.com> --- .mailmap | 1 + 1 file changed, 1 insertion(+) diff --git a/.mailmap b/.mailmap index 2b080568bc..9dfb7a832b 100644 --- a/.mailmap +++ b/.mailmap @@ -47,6 +47,7 @@ <fidencio(a)redhat.com> <fabiano(a)fidencio.org> <shi_lei(a)massclouds.com> <shilei.massclouds(a)gmx.com> <adrian.brzezinski(a)eo.pl> <redhat(a)adrb.pl> +<matt(a)datto.com> <mcoleman(a)datto.com> # Name consolidation: # Preferred author spelling <preferred email> -- 2.27.0

3 2

[libvirt PATCH 00/12] util: use g_new0 (glib chronicles)
by Ján Tomko 06 Oct '20

06 Oct '20

2 13

Re: [PATCH 1/1] Optional free-page-reporting can be enabled/disabled for memballon device of model 'virtio'.
by Peter Krempa 06 Oct '20

06 Oct '20

On Mon, Oct 05, 2020 at 17:40:48 -0400, Nico Pache wrote: > I'm not super familiar with the code base so followed the 2 > autodeflate commits as a guide. > > I had a few questions regarding your feedback. > > > > The patch is also missing test XML addition for the qemuxml2argvtest and > > qemuxml2xmltest. > > > can you please explain the qemuxml2xmltest files. I don't get what they do. qemuxml2argvtest takes the input file from qemuxml2argvdata/testname.xml which is a VM xml file and invokes internals which generate the command line which would be used to start qemu. This is then checked against qemuxml2argvdata/testname.args Similarly qemuxml2xmltest takes the same input file as the above test (literally the same, from the qemuxml2argv directory) and parses it and formats it back applying any internal validation and default filling. The output is compared against qemuxml2xmloutdata/testname.xml Note that you just have to provide the input file and invocation macro and you can then run the testsuite instructing it to generate the expected output files: VIR_TEST_REGENERATE_OUTPUT=1 tests/qemuxml2argvtest And commit the result after verifying that it has the new bits formatted. (Yes the testsuite will fail on the first round.) You can either provide your own input file, but it needs have certain settings (such as path to emulator) right to work with the tests so it's usually simpler to just copy and modify an appropriate existing test input file. The added bonus of the above is that those files are also automatically checked for conformance with the XML schema. Please note that any new tests added to the qemuxml2* test suite should use the DO_TEST_CAPS_* (such as DO_TEST_CAPS_LATEST, which invokes the test with capabilities of the latest version of x86_64 qemu) macros to invoke it rather than the now obsolete DO_TEST (without CAPS) where you are enumerating the qemu capability flags manually. > Also do I commit the additional testing files with the src/qemu changes or > in a separate commit? Either of them is fine. They just must apply, compile and pass the tests after every commit. > Will changing *virtio-balloon-pci.free-page-reporting* to > *virtio-balloon.free-page-reporting* encompass all the possible > virtio-balloon options? yup, that sounds reasonable > > Thanks in advance! > --Nico

1 0

[libvirt PATCH 0/4] virsh: use g_new0 (glib chronicles)
by Ján Tomko 06 Oct '20

06 Oct '20

Ján Tomko (4): virsh: do not add bools into size calculations virsh: use g_new0 instead of vsh[CM]alloc virsh: delete vsh[CM]alloc virsh: network-port: remove pointless comment tools/virsh-checkpoint.c | 11 +++++++---- tools/virsh-domain-monitor.c | 11 +++++------ tools/virsh-domain.c | 24 ++++++++++++------------ tools/virsh-host.c | 22 +++++++++++----------- tools/virsh-interface.c | 8 ++++---- tools/virsh-network.c | 9 ++++----- tools/virsh-nodedev.c | 12 ++++++------ tools/virsh-nwfilter.c | 8 ++++---- tools/virsh-pool.c | 8 ++++---- tools/virsh-secret.c | 6 +++--- tools/virsh-snapshot.c | 14 ++++++++------ tools/virsh-volume.c | 8 ++++---- tools/vsh.c | 30 ++++++------------------------ tools/vsh.h | 6 ------ 14 files changed, 78 insertions(+), 99 deletions(-) -- 2.26.2

2 5

[PATCH] rpm: Enable Xen support on AArch64
by Neal Gompa 06 Oct '20

06 Oct '20

Starting with Linux 5.9, Xen Dom0 works on commonly available AArch64 devices, such as the Raspberry Pi 4. Reference: https://xenproject.org/2020/09/29/xen-on-raspberry-pi-4-adventures/ Signed-off-by: Neal Gompa <ngompa13(a)gmail.com> --- libvirt.spec.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index aa2bc84be9..470782b23e 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -97,8 +97,8 @@ # Finally set the OS / architecture specific special cases -# Xen is available only on i386 x86_64 ia64 -%ifnarch %{ix86} x86_64 ia64 +# Xen is available only on i386 x86_64 ia64 aarch64 +%ifnarch %{ix86} x86_64 ia64 aarch64 %define with_libxl 0 %endif -- 2.26.2

4 5

restrictions for virtiofs (related to commit: 88957116c9 for libvirt 6.9.0)
by Masayoshi Mizuma 06 Oct '20

06 Oct '20

Hello Jan, and Michal, commit: 88957116c9 ("qemu: Use memory-backend-* for regular guest memory") gets the system memory sharable without numa config. The qemu options with the patch will be like as: -machine pc-q35-5.2,accel=kvm,usb=off,vmport=off,smm=on,dump-guest-core=off,memory-backend=pc.ram \ -object memory-backend-file,id=pc.ram,mem-path=/var/lib/libvirt/qemu/ram/2-Test/pc.ram,share=yes,size=17179869184 \ So, we can remove the numa restriction of virtiofs, right? The patch to remove that is the bottom of this email. And, 88957116c9 seems to introduce another restriction which we cannot create numa nodes on the machine. I got the following message when I set the numa config and started the VM: 2020-10-02T00:31:46.780374Z qemu-system-x86_64: '-machine memory-backend' and '-numa memdev' properties are mutually exclusive qemu rejects the -machine memory-backend' and '-numa memdev' because it may cause crash. commit: ea81f98bce ("numa: prevent usage of -M memory-backend and -numa memdev at the same time") introduced the check. Do you have any ideas to solve above? =================================================================== From: Masayoshi Mizuma <m.mizuma(a)jp.fujitsu.com> Date: Fri, 2 Oct 2020 10:50:06 -0400 Subject: [PATCH] qemu: Remove the number of numa restriction for virtiofs virtiofs requires at least one numa node to access the system memory as shared memory. 88957116c9 ("qemu: Use memory-backend-* for regular guest memory") gets the system memory sharable without the numa config. Let's remove the number of numa restriction for virtiofs. Signed-off-by: Masayoshi Mizuma <m.mizuma(a)jp.fujitsu.com> --- src/qemu/qemu_validate.c | 44 ++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index a212605579..b5372e7499 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -3475,36 +3475,36 @@ qemuValidateDomainDefVirtioFSSharedMemory(const virDomainDef *def) size_t numa_nodes = virDomainNumaGetNodeCount(def->numa); size_t i; - if (numa_nodes == 0) { + if ((!numa_nodes) && (def->mem.access != VIR_DOMAIN_MEMORY_ACCESS_SHARED)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("virtiofs requires one or more NUMA nodes")); + _("virtiofs requires shared memory")); return -1; - } - - for (i = 0; i < numa_nodes; i++) { - virDomainMemoryAccess node_access = - virDomainNumaGetNodeMemoryAccessMode(def->numa, i); + } else { + for (i = 0; i < numa_nodes; i++) { + virDomainMemoryAccess node_access = + virDomainNumaGetNodeMemoryAccessMode(def->numa, i); - switch (node_access) { - case VIR_DOMAIN_MEMORY_ACCESS_DEFAULT: - if (def->mem.access != VIR_DOMAIN_MEMORY_ACCESS_SHARED) { + switch (node_access) { + case VIR_DOMAIN_MEMORY_ACCESS_DEFAULT: + if (def->mem.access != VIR_DOMAIN_MEMORY_ACCESS_SHARED) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("virtiofs requires shared memory")); + return -1; + } + break; + case VIR_DOMAIN_MEMORY_ACCESS_SHARED: + break; + case VIR_DOMAIN_MEMORY_ACCESS_PRIVATE: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("virtiofs requires shared memory")); return -1; - } - break; - case VIR_DOMAIN_MEMORY_ACCESS_SHARED: - break; - case VIR_DOMAIN_MEMORY_ACCESS_PRIVATE: - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("virtiofs requires shared memory")); - return -1; - case VIR_DOMAIN_MEMORY_ACCESS_LAST: - default: - virReportEnumRangeError(virDomainMemoryAccess, node_access); - return -1; + case VIR_DOMAIN_MEMORY_ACCESS_LAST: + default: + virReportEnumRangeError(virDomainMemoryAccess, node_access); + return -1; + } } } return 0; -- 2.27.0 Thanks, Masa

2 3

[PATCHv3 4/5] qemu: add docs for 'fmode' and 'dmode' options
by Brian Turek 06 Oct '20

06 Oct '20

Adds documentation for QEMU 9pfs 'fmode' and 'dmode' options. Signed-off-by: Brian Turek <brian.turek(a)gmail.com> --- docs/formatdomain.rst | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index cc4f91d4ea..085f29ef8f 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -3062,6 +3062,12 @@ A directory on the host that can be accessed directly from the guest. <target dir='/import/from/host'/> <readonly/> </filesystem> + <filesystem type='mount' accessmode='mapped' fmode='644' dmode='755'> + <driver type='path'/> + <source dir='/export/to/guest'/> + <target dir='/import/from/host'/> + <readonly/> + </filesystem> <filesystem type='file' accessmode='passthrough'> <driver type='loop' format='raw'/> <source file='/export/to/guest.img'/> @@ -3140,6 +3146,12 @@ A directory on the host that can be accessed directly from the guest. "virtio-non-transitional", or "virtio". See `Virtio transitional devices <#elementsVirtioTransitional>`__ for more details. + The filesystem element has optional attributes ``fmode`` and ``dmode``. + These two attributes control the creation mode for files and directories + when used with the ``mapped`` value for ``accessmode`` (:since:`since 6.9.0, + requires QEMU 2.10` ). If not specified, QEMU creates files with mode + ``600`` and directories with mode ``700``. + The filesystem element has an optional attribute ``multidevs`` which specifies how to deal with a filesystem export containing more than one device, in order to avoid file ID collisions on guest when using 9pfs ( -- 2.25.1

1 0

[PATCHv3 3/5] qemu: add schema 'fmode' and 'dmode' options
by Brian Turek 06 Oct '20

06 Oct '20

Adds schema to validate the 'fmode' and 'dmode' attributes on a 'fileystem' node. Checks to ensure that the values are 1-4 octal digits long. Signed-off-by: Brian Turek <brian.turek(a)gmail.com> --- docs/schemas/domaincommon.rng | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 316d93fb69..6c814d600a 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -26,6 +26,12 @@ </element> </define> + <define name='createMode'> + <data type="unsignedInt"> + <param name='pattern'>[0-7]{1,4}</param> + </data> + </define> +  @@ -2736,6 +2742,16 @@ </choice> </attribute> </optional> + <optional> + <attribute name="fmode"> + <ref name='createMode'/> + </attribute> + </optional> + <optional> + <attribute name="dmode"> + <ref name='createMode'/> + </attribute> + </optional> <optional> <element name='readonly'> <empty/> -- 2.25.1

1 0

[PATCHv3 2/5] qemu: add support for 'fmode' and 'dmode' options
by Brian Turek 06 Oct '20

06 Oct '20

Expose QEMU's 9pfs 'fmode' and 'dmode' options via attributes on the 'filesystem' node in the domain XML. These options control the creation mode of files and directories, respectively, when using accessmode=mapped. QEMU defaults to creating files with mode 0600 and directories with mode 0700. Signed-off-by: Brian Turek <brian.turek(a)gmail.com> --- src/conf/domain_conf.c | 27 ++++++++ src/conf/domain_conf.h | 2 + src/qemu/qemu_command.c | 6 ++ src/qemu/qemu_validate.c | 18 ++++++ .../virtio-9p-createmode.x86_64-latest.args | 45 ++++++++++++++ .../qemuxml2argvdata/virtio-9p-createmode.xml | 58 ++++++++++++++++++ .../virtio-9p-createmode.x86_64-latest.xml | 61 +++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 8 files changed, 218 insertions(+) create mode 100644 tests/qemuxml2argvdata/virtio-9p-createmode.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/virtio-9p-createmode.xml create mode 100644 tests/qemuxml2xmloutdata/virtio-9p-createmode.x86_64-latest.xml diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 175b632a38..e80b3b7ef6 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11496,6 +11496,8 @@ virDomainFSDefParseXML(virDomainXMLOptionPtr xmlopt, g_autofree char *units = NULL; g_autofree char *model = NULL; g_autofree char *multidevs = NULL; + g_autofree char *fmode = NULL; + g_autofree char *dmode = NULL; ctxt->node = node; @@ -11524,6 +11526,24 @@ virDomainFSDefParseXML(virDomainXMLOptionPtr xmlopt, def->accessmode = VIR_DOMAIN_FS_ACCESSMODE_PASSTHROUGH; } + fmode = virXMLPropString(node, "fmode"); + if (fmode) { + if (virStrToLong_uip(fmode, NULL, 8, &def->fmode) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("invalid fmode: '%s'"), fmode); + goto error; + } + } + + dmode = virXMLPropString(node, "dmode"); + if (dmode) { + if (virStrToLong_uip(dmode, NULL, 8, &def->dmode) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("invalid dmode: '%s'"), dmode); + goto error; + } + } + model = virXMLPropString(node, "model"); if (model) { if ((def->model = virDomainFSModelTypeFromString(model)) < 0 || @@ -26211,6 +26231,13 @@ virDomainFSDefFormat(virBufferPtr buf, } if (def->multidevs) virBufferAsprintf(buf, " multidevs='%s'", multidevs); + + if (def->fmode) + virBufferAsprintf(buf, " fmode='%04o'", def->fmode); + + if (def->dmode) + virBufferAsprintf(buf, " dmode='%04o'", def->dmode); + virBufferAddLit(buf, ">\n"); virBufferAdjustIndent(buf, 2); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 450686dfb5..51f70f9dd4 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -849,6 +849,8 @@ struct _virDomainFSDef { int wrpolicy; /* enum virDomainFSWrpolicy */ int format; /* virStorageFileFormat */ int model; /* virDomainFSModel */ + unsigned int fmode; + unsigned int dmode; int multidevs; /* virDomainFSMultidevs */ unsigned long long usage; /* in bytes */ virStorageSourcePtr src; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 476cf6972e..b2da53c664 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2275,6 +2275,12 @@ qemuBuildFSStr(virDomainFSDefPtr fs) } else if (fs->multidevs == VIR_DOMAIN_FS_MULTIDEVS_WARN) { virBufferAddLit(&opt, ",multidevs=warn"); } + if (fs->fmode) { + virBufferAsprintf(&opt, ",fmode=%04o", fs->fmode); + } + if (fs->dmode) { + virBufferAsprintf(&opt, ",dmode=%04o", fs->dmode); + } } else if (fs->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_HANDLE) { /* removed since qemu 4.0.0 see v3.1.0-29-g93aee84f57 */ virBufferAddLit(&opt, "handle"); diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index a212605579..4757c55e13 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -3530,6 +3530,19 @@ qemuValidateDomainDeviceDefFS(virDomainFSDefPtr fs, return -1; } + if ((fs->fmode != 0) || (fs->dmode != 0)) { + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_FSDEV_CREATEMODE)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("fmode and dmode are not supported with this QEMU binary")); + return -1; + } + if (fs->accessmode != VIR_DOMAIN_FS_ACCESSMODE_MAPPED) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("fmode and dmode must be used with accessmode=mapped")); + return -1; + } + } + switch ((virDomainFSDriverType) fs->fsdriver) { case VIR_DOMAIN_FS_DRIVER_TYPE_DEFAULT: case VIR_DOMAIN_FS_DRIVER_TYPE_PATH: @@ -3591,6 +3604,11 @@ qemuValidateDomainDeviceDefFS(virDomainFSDefPtr fs, _("virtiofs does not support multidevs")); return -1; } + if ((fs->fmode != 0) || (fs->dmode != 0)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("virtiofs does not support fmode and dmode")); + return -1; + } if (qemuValidateDomainDefVirtioFSSharedMemory(def) < 0) return -1; break; diff --git a/tests/qemuxml2argvdata/virtio-9p-createmode.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-9p-createmode.x86_64-latest.args new file mode 100644 index 0000000000..c4ef07a1fd --- /dev/null +++ b/tests/qemuxml2argvdata/virtio-9p-createmode.x86_64-latest.args @@ -0,0 +1,45 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/tmp/lib/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object secret,id=masterKey0,format=raw,\ +file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-cpu qemu64 \ +-m 214 \ +-overcommit mem-lock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot strict=on \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-fsdev local,security_model=mapped,fmode=0644,id=fsdev-fs0,path=/export/fs0 \ +-device virtio-9p-pci,id=fs0,fsdev=fsdev-fs0,mount_tag=fs0,bus=pci.0,addr=0x2 \ +-fsdev local,security_model=mapped,dmode=0755,id=fsdev-fs1,path=/export/fs1 \ +-device virtio-9p-pci,id=fs1,fsdev=fsdev-fs1,mount_tag=fs1,bus=pci.0,addr=0x3 \ +-fsdev local,security_model=mapped,fmode=0644,dmode=0755,id=fsdev-fs2,\ +path=/export/fs2 \ +-device virtio-9p-pci,id=fs2,fsdev=fsdev-fs2,mount_tag=fs2,bus=pci.0,addr=0x4 \ +-chardev pty,id=charserial0 \ +-fsdev local,security_model=mapped,id=fsdev-fs3,path=/export/fs2 \ +-device virtio-9p-pci,id=fs3,fsdev=fsdev-fs3,mount_tag=fs3,bus=pci.0,addr=0x5 \ +-device isa-serial,chardev=charserial0,id=serial0 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0xc \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ +resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/virtio-9p-createmode.xml b/tests/qemuxml2argvdata/virtio-9p-createmode.xml new file mode 100644 index 0000000000..bca9db02ad --- /dev/null +++ b/tests/qemuxml2argvdata/virtio-9p-createmode.xml @@ -0,0 +1,58 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <filesystem type='mount' accessmode='mapped' fmode='644'> + <source dir='/export/fs0'/> + <target dir='fs0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </filesystem> + <filesystem type='mount' accessmode='mapped' dmode='755'> + <source dir='/export/fs1'/> + <target dir='fs1'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </filesystem> + <filesystem type='mount' accessmode='mapped' fmode='640' dmode='750'> + <source dir='/export/fs2'/> + <target dir='fs2'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </filesystem> + <filesystem type='mount' accessmode='mapped'> + <source dir='/export/fs3'/> + <target dir='fs3'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> + </filesystem> + <serial type='pty'> + <target type='isa-serial' port='0'> + <model name='isa-serial'/> + </target> + </serial> + <console type='pty'> + <target type='serial' port='0'/> + </console> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x0c' function='0x0'/> + </memballoon> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/virtio-9p-createmode.x86_64-latest.xml b/tests/qemuxml2xmloutdata/virtio-9p-createmode.x86_64-latest.xml new file mode 100644 index 0000000000..7c374ca3a6 --- /dev/null +++ b/tests/qemuxml2xmloutdata/virtio-9p-createmode.x86_64-latest.xml @@ -0,0 +1,61 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu64</model> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <controller type='usb' index='0' model='piix3-uhci'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <filesystem type='mount' accessmode='mapped' fmode='0644'> + <source dir='/export/fs0'/> + <target dir='fs0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </filesystem> + <filesystem type='mount' accessmode='mapped' dmode='0755'> + <source dir='/export/fs1'/> + <target dir='fs1'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </filesystem> + <filesystem type='mount' accessmode='mapped' fmode='0640' dmode='0750'> + <source dir='/export/fs2'/> + <target dir='fs2'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </filesystem> + <filesystem type='mount' accessmode='mapped'> + <source dir='/export/fs3'/> + <target dir='fs3'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> + </filesystem> + <serial type='pty'> + <target type='isa-serial' port='0'> + <model name='isa-serial'/> + </target> + </serial> + <console type='pty'> + <target type='serial' port='0'/> + </console> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x0c' function='0x0'/> + </memballoon> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 2bf8dd5b14..17cbed97f9 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1496,6 +1496,7 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST("x86_64-default-cpu-tcg-q35-4.2", "x86_64"); DO_TEST_CAPS_LATEST("virtio-9p-multidevs"); + DO_TEST_CAPS_LATEST("virtio-9p-createmode"); DO_TEST("downscript", NONE); cleanup: -- 2.25.1

1 0

[PATCHv3 1/5] qemu: capabilities: add QEMU_CAPS_FSDEV_CREATEMODE
by Brian Turek 06 Oct '20

06 Oct '20

The QEMU 9pfs 'fmode' and 'dmode' options have existed since QEMU 2.10. Probe QEMU's command line set to check whether these options are available, and if yes, enable this new QEMU_CAPS_FSDEV_CREATEMODE capability on libvirt side. Signed-off-by: Brian Turek <brian.turek(a)gmail.com> --- src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml | 1 + tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml | 1 + tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml | 1 + tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml | 1 + tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 + tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 + 36 files changed, 37 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 38b901a6c4..d2a745d8c5 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -600,6 +600,7 @@ VIR_ENUM_IMPL(virQEMUCaps, /* 380 */ "usb-host.hostdevice", + "fsdev.createmode", ); @@ -3322,6 +3323,7 @@ static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = { { "smp-opts", "dies", QEMU_CAPS_SMP_DIES }, { "fsdev", "multidevs", QEMU_CAPS_FSDEV_MULTIDEVS }, { "fw_cfg", "file", QEMU_CAPS_FW_CFG }, + { "fsdev", "fmode", QEMU_CAPS_FSDEV_CREATEMODE }, /* Could have also checked fsdev->dmode */ }; static int diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 107056ba17..bd7412d6f7 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -580,6 +580,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ /* 380 */ QEMU_CAPS_USB_HOST_HOSTDEVICE, /* -device usb-host.hostdevice */ + QEMU_CAPS_FSDEV_CREATEMODE, /* fsdev.createmode */ QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index b0fcbc4218..77af6b0d7a 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -145,6 +145,7 @@ <flag name='fw_cfg'/> <flag name='migration-param.bandwidth'/> <flag name='migration-param.downtime'/> + <flag name='fsdev.createmode'/> <version>2010000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>61700287</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index edf01d2e2f..5fce7540f9 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -145,6 +145,7 @@ <flag name='fw_cfg'/> <flag name='migration-param.bandwidth'/> <flag name='migration-param.downtime'/> + <flag name='fsdev.createmode'/> <version>2010000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>42900287</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml index 98a3c0eec2..7b0153e272 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -111,6 +111,7 @@ <flag name='fw_cfg'/> <flag name='migration-param.bandwidth'/> <flag name='migration-param.downtime'/> + <flag name='fsdev.createmode'/> <version>2010000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>39100287</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index 98b1a94349..7f45a473cb 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -189,6 +189,7 @@ <flag name='fw_cfg'/> <flag name='migration-param.bandwidth'/> <flag name='migration-param.downtime'/> + <flag name='fsdev.createmode'/> <version>2010000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100287</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index 0391f4b81e..4b8ba3e557 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -119,6 +119,7 @@ <flag name='migration-param.bandwidth'/> <flag name='migration-param.downtime'/> <flag name='migration-param.xbzrle-cache-size'/> + <flag name='fsdev.createmode'/> <version>2011000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>39100288</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml index 9eaafb4ba6..b11d98a64f 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml @@ -196,6 +196,7 @@ <flag name='migration-param.bandwidth'/> <flag name='migration-param.downtime'/> <flag name='migration-param.xbzrle-cache-size'/> + <flag name='fsdev.createmode'/> <version>2011000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100288</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index a5d6dc3bef..224defd91d 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -162,6 +162,7 @@ <flag name='migration-param.bandwidth'/> <flag name='migration-param.downtime'/> <flag name='migration-param.xbzrle-cache-size'/> + <flag name='fsdev.createmode'/> <version>2012000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>61700289</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index d1ed9f6e28..c967c3f142 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -163,6 +163,7 @@ <flag name='migration-param.bandwidth'/> <flag name='migration-param.downtime'/> <flag name='migration-param.xbzrle-cache-size'/> + <flag name='fsdev.createmode'/> <version>2011090</version> <kvmVersion>0</kvmVersion> <microcodeVersion>42900289</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index cef6ebb9ad..f9e843e125 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -131,6 +131,7 @@ <flag name='migration-param.bandwidth'/> <flag name='migration-param.downtime'/> <flag name='migration-param.xbzrle-cache-size'/> + <flag name='fsdev.createmode'/> <version>2012000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>39100289</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index 6d48699e3e..7ec4c376e0 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -206,6 +206,7 @@ <flag name='migration-param.bandwidth'/> <flag name='migration-param.downtime'/> <flag name='migration-param.xbzrle-cache-size'/> + <flag name='fsdev.createmode'/> <version>2011090</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100289</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml index e4a560bac5..e57def86bf 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml @@ -165,6 +165,7 @@ <flag name='migration-param.bandwidth'/> <flag name='migration-param.downtime'/> <flag name='migration-param.xbzrle-cache-size'/> + <flag name='fsdev.createmode'/> <version>2012050</version> <kvmVersion>0</kvmVersion> <microcodeVersion>42900239</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml index 71f9b0c37f..b7a79a95d6 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml @@ -101,6 +101,7 @@ <flag name='migration-param.bandwidth'/> <flag name='migration-param.downtime'/> <flag name='migration-param.xbzrle-cache-size'/> + <flag name='fsdev.createmode'/> <version>3000000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>0</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml index 279078d541..66682cb112 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml @@ -101,6 +101,7 @@ <flag name='migration-param.bandwidth'/> <flag name='migration-param.downtime'/> <flag name='migration-param.xbzrle-cache-size'/> + <flag name='fsdev.createmode'/> <version>3000000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>0</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml index f1ed34c612..994e49040b 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml @@ -134,6 +134,7 @@ <flag name='migration-param.bandwidth'/> <flag name='migration-param.downtime'/> <flag name='migration-param.xbzrle-cache-size'/> + <flag name='fsdev.createmode'/> <version>3000000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>39100239</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml index ae1836b28f..c5b56d3917 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml @@ -212,6 +212,7 @@ <flag name='migration-param.bandwidth'/> <flag name='migration-param.downtime'/> <flag name='migration-param.xbzrle-cache-size'/> + <flag name='fsdev.createmode'/> <version>3000000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100239</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml index 0dc0393c22..a51b3b2164 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml @@ -170,6 +170,7 @@ <flag name='migration-param.bandwidth'/> <flag name='migration-param.downtime'/> <flag name='migration-param.xbzrle-cache-size'/> + <flag name='fsdev.createmode'/> <version>3000091</version> <kvmVersion>0</kvmVersion> <microcodeVersion>42900240</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml index d4ff21fdac..5f4afa9129 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml @@ -215,6 +215,7 @@ <flag name='migration-param.bandwidth'/> <flag name='migration-param.downtime'/> <flag name='migration-param.xbzrle-cache-size'/> + <flag name='fsdev.createmode'/> <version>3000092</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100240</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml index 404a39af03..c642f232b5 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml @@ -176,6 +176,7 @@ <flag name='migration-param.bandwidth'/> <flag name='migration-param.downtime'/> <flag name='migration-param.xbzrle-cache-size'/> + <flag name='fsdev.createmode'/> <version>4000000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>61700240</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml index cb0232173c..0581d0a9e8 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml @@ -184,6 +184,7 @@ <flag name='migration-param.bandwidth'/> <flag name='migration-param.downtime'/> <flag name='migration-param.xbzrle-cache-size'/> + <flag name='fsdev.createmode'/> <version>4000000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>42900240</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml index 11475306f9..cfd6325c8a 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml @@ -177,6 +177,7 @@ <flag name='migration-param.bandwidth'/> <flag name='migration-param.downtime'/> <flag name='migration-param.xbzrle-cache-size'/> + <flag name='fsdev.createmode'/> <version>4000000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>0</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml index 608590a35b..937b48ccfb 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml @@ -177,6 +177,7 @@ <flag name='migration-param.bandwidth'/> <flag name='migration-param.downtime'/> <flag name='migration-param.xbzrle-cache-size'/> + <flag name='fsdev.createmode'/> <version>4000000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>0</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml index f4d20169e0..ca253ba1de 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml @@ -142,6 +142,7 @@ <flag name='migration-param.bandwidth'/> <flag name='migration-param.downtime'/> <flag name='migration-param.xbzrle-cache-size'/> + <flag name='fsdev.createmode'/> <version>4000000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>39100240</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml index e3f83372c2..ae81d12df3 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml @@ -221,6 +221,7 @@ <flag name='migration-param.downtime'/> <flag name='migration-param.xbzrle-cache-size'/> <flag name='intel-iommu.aw-bits'/> + <flag name='fsdev.createmode'/> <version>4000000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100240</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml index c32d8ea5d8..b2d0c0b824 100644 --- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml @@ -227,6 +227,7 @@ <flag name='migration-param.downtime'/> <flag name='migration-param.xbzrle-cache-size'/> <flag name='intel-iommu.aw-bits'/> + <flag name='fsdev.createmode'/> <version>4001000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100241</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml index 11a964ed39..ffb4fbd552 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -189,6 +189,7 @@ <flag name='migration-param.downtime'/> <flag name='migration-param.xbzrle-cache-size'/> <flag name='blockdev-hostdev-scsi'/> + <flag name='fsdev.createmode'/> <version>4001050</version> <kvmVersion>0</kvmVersion> <microcodeVersion>61700242</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml index 60aef01f7b..129272d985 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -190,6 +190,7 @@ <flag name='migration-param.downtime'/> <flag name='migration-param.xbzrle-cache-size'/> <flag name='spapr-tpm-proxy'/> + <flag name='fsdev.createmode'/> <version>4001050</version> <kvmVersion>0</kvmVersion> <microcodeVersion>42900242</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml index 76e2747b65..fe9a5aa835 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -153,6 +153,7 @@ <flag name='migration-param.downtime'/> <flag name='migration-param.xbzrle-cache-size'/> <flag name='blockdev-hostdev-scsi'/> + <flag name='fsdev.createmode'/> <version>4002000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>39100242</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml index fd63a0ee02..00900f5477 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -236,6 +236,7 @@ <flag name='migration-param.xbzrle-cache-size'/> <flag name='intel-iommu.aw-bits'/> <flag name='blockdev-hostdev-scsi'/> + <flag name='fsdev.createmode'/> <version>4002000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100242</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml index 928af2a01c..da8d1de258 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -199,6 +199,7 @@ <flag name='migration-param.xbzrle-cache-size'/> <flag name='numa.hmat'/> <flag name='blockdev-hostdev-scsi'/> + <flag name='fsdev.createmode'/> <version>5000000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>61700241</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml index e8668a25a9..731676c06d 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -208,6 +208,7 @@ <flag name='spapr-tpm-proxy'/> <flag name='numa.hmat'/> <flag name='blockdev-hostdev-scsi'/> + <flag name='fsdev.createmode'/> <version>5000000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>42900241</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml index 85a8a46dac..34e6b11fe4 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -195,6 +195,7 @@ <flag name='migration-param.xbzrle-cache-size'/> <flag name='numa.hmat'/> <flag name='blockdev-hostdev-scsi'/> + <flag name='fsdev.createmode'/> <version>5000000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>0</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml index 546b9b0422..3dbfaa95c2 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -243,6 +243,7 @@ <flag name='intel-iommu.aw-bits'/> <flag name='numa.hmat'/> <flag name='blockdev-hostdev-scsi'/> + <flag name='fsdev.createmode'/> <version>5000000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100241</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml index 987beb965e..da64009d67 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -243,6 +243,7 @@ <flag name='numa.hmat'/> <flag name='blockdev-hostdev-scsi'/> <flag name='usb-host.hostdevice'/> + <flag name='fsdev.createmode'/> <version>5001000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100242</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml index 3ee678ef8f..a91bfd432b 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -243,6 +243,7 @@ <flag name='numa.hmat'/> <flag name='blockdev-hostdev-scsi'/> <flag name='usb-host.hostdevice'/> + <flag name='fsdev.createmode'/> <version>5001050</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100243</microcodeVersion> -- 2.25.1

1 0

[libvirt PATCH] rpm: include aarch64 & riscv64 in systemtap 64-bit arch tapset rename
by Daniel P. Berrangé 06 Oct '20

06 Oct '20

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- libvirt.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 682d43c290..d13aae5cf5 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1261,7 +1261,7 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_libxl.aug # Copied into libvirt-docs subpackage eventually mv $RPM_BUILD_ROOT%{_datadir}/doc/libvirt libvirt-docs -%ifarch %{power64} s390x x86_64 +%ifarch %{power64} s390x x86_64 aarch64 riscv64 mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_probes.stp \ $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_probes-64.stp -- 2.26.2

3 2

[PATCH V4] Modify virCPUarmCompare to perform compare actions
by Zhenyu Zheng 06 Oct '20

06 Oct '20

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

3 2

[PATCH] tests: cover disk, interface <backenddomain>
by Cole Robinson 05 Oct '20

05 Oct '20

There is present no XML test coverage for this. Add genericxml parse + formatting coverage. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- .../device-backenddomain.xml | 30 +++++++++++++++++++ .../device-backenddomain.xml | 1 + tests/genericxml2xmltest.c | 1 + 3 files changed, 32 insertions(+) create mode 100644 tests/genericxml2xmlindata/device-backenddomain.xml create mode 120000 tests/genericxml2xmloutdata/device-backenddomain.xml diff --git a/tests/genericxml2xmlindata/device-backenddomain.xml b/tests/genericxml2xmlindata/device-backenddomain.xml new file mode 100644 index 0000000000..8e89c7fec3 --- /dev/null +++ b/tests/genericxml2xmlindata/device-backenddomain.xml @@ -0,0 +1,30 @@ +<domain type='qemu'> + <name>foo</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <backenddomain name='bar'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <interface type='bridge'> + <mac address='aa:bb:cc:dd:ee:ff'/> + <source bridge='br0'/> + <backenddomain name='foo'/> + </interface> + </devices> +</domain> diff --git a/tests/genericxml2xmloutdata/device-backenddomain.xml b/tests/genericxml2xmloutdata/device-backenddomain.xml new file mode 120000 index 0000000000..f19471e3b5 --- /dev/null +++ b/tests/genericxml2xmloutdata/device-backenddomain.xml @@ -0,0 +1 @@ +../genericxml2xmlindata/device-backenddomain.xml \ No newline at end of file diff --git a/tests/genericxml2xmltest.c b/tests/genericxml2xmltest.c index 102abfdec2..5110bfba86 100644 --- a/tests/genericxml2xmltest.c +++ b/tests/genericxml2xmltest.c @@ -233,6 +233,7 @@ mymain(void) DO_TEST("launch-security-sev"); DO_TEST_DIFFERENT("cputune"); + DO_TEST("device-backenddomain"); #define DO_TEST_BACKUP_FULL(name, intrnl) \ do { \ -- 2.28.0

2 1

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

05 Oct '20

gitlab issue: https://gitlab.com/libvirt/libvirt/-/issues/79 The virtio-balloon device now has the ability to report free pages back to the hypervisor for reuse by other programs. This kernel feature allows for more stable and resource friendly systems. This feature is available in QEMU and is enabled with free-page-reporting=on default virt setting should be off but the user should be able to enable it. Nico Pache (1): Optional free-page-reporting can be enabled/disabled for memballon device of model 'virtio'. docs/formatdomain.rst | 6 ++++++ docs/schemas/domaincommon.rng | 5 +++++ src/conf/domain_conf.c | 21 +++++++++++++++++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 4 +++- src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 5 +++++ src/qemu/qemu_validate.c | 7 +++++++ .../caps_5.1.0.x86_64.xml | 1 + .../caps_5.2.0.x86_64.xml | 1 + 10 files changed, 51 insertions(+), 1 deletion(-) -- 2.18.4

4 6

[PATCH v2 0/4] Add support for QEMU's 'fmode' and 'dmode'
by Brian Turek 05 Oct '20

05 Oct '20

This second version of the patch incorporates Peter Krempa's feedback by tweaking a few things in the code and, more importantly, splitting up the singular large patch into smaller patches. Brian Turek (4): qemu: capabilities: add QEMU_CAPS_FSDEV_CREATEMODE qemu: add support for 'fmode' and 'dmode' options qemu: add schema 'fmode' and 'dmode' options qemu: add docs for 'fmode' and 'dmode' options docs/formatdomain.rst | 12 ++++ docs/schemas/domaincommon.rng | 16 +++++ src/conf/domain_conf.c | 27 ++++++++ src/conf/domain_conf.h | 2 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 6 ++ src/qemu/qemu_validate.c | 18 ++++++ .../caps_2.10.0.aarch64.xml | 1 + .../caps_2.10.0.ppc64.xml | 1 + .../caps_2.10.0.s390x.xml | 1 + .../caps_2.10.0.x86_64.xml | 1 + .../caps_2.11.0.s390x.xml | 1 + .../caps_2.11.0.x86_64.xml | 1 + .../caps_2.12.0.aarch64.xml | 1 + .../caps_2.12.0.ppc64.xml | 1 + .../caps_2.12.0.s390x.xml | 1 + .../caps_2.12.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 + .../caps_3.0.0.riscv32.xml | 1 + .../caps_3.0.0.riscv64.xml | 1 + .../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 1 + .../caps_3.0.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 + .../caps_3.1.0.x86_64.xml | 1 + .../caps_4.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 + .../caps_4.0.0.riscv32.xml | 1 + .../caps_4.0.0.riscv64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 + .../caps_4.0.0.x86_64.xml | 1 + .../caps_4.1.0.x86_64.xml | 1 + .../caps_4.2.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 + .../caps_4.2.0.x86_64.xml | 1 + .../caps_5.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 + .../caps_5.0.0.riscv64.xml | 1 + .../caps_5.0.0.x86_64.xml | 1 + .../caps_5.1.0.x86_64.xml | 1 + .../caps_5.2.0.x86_64.xml | 1 + .../virtio-9p-createmode.x86_64-latest.args | 45 ++++++++++++++ .../qemuxml2argvdata/virtio-9p-createmode.xml | 58 ++++++++++++++++++ .../virtio-9p-createmode.x86_64-latest.xml | 61 +++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 46 files changed, 283 insertions(+) create mode 100644 tests/qemuxml2argvdata/virtio-9p-createmode.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/virtio-9p-createmode.xml create mode 100644 tests/qemuxml2xmloutdata/virtio-9p-createmode.x86_64-latest.xml -- 2.25.1

1 5

[libvirt PATCH 1/2] esx: call freeaddrinfo earlier in esxUtil_ResolveHostname
by Pino Toscano 05 Oct '20

05 Oct '20

Call freeaddrinfo() as soon as @result is not needed anymore, i.e. right after getnameinfo(); this avoids calling freeaddrinfo() in two branches. Signed-off-by: Pino Toscano <ptoscano(a)redhat.com> --- src/esx/esx_util.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c index 9100873326..555158f953 100644 --- a/src/esx/esx_util.c +++ b/src/esx/esx_util.c @@ -310,17 +310,15 @@ esxUtil_ResolveHostname(const char *hostname, errcode = getnameinfo(result->ai_addr, result->ai_addrlen, ipAddress, ipAddress_length, NULL, 0, NI_NUMERICHOST); + freeaddrinfo(result); if (errcode != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Formatting IP address for host '%s' failed: %s"), hostname, gai_strerror(errcode)); - freeaddrinfo(result); return -1; } - freeaddrinfo(result); - return 0; } -- 2.26.2

2 3

[PATCH] docs/submitting-patches: add reference to DCO
by Mauro Matteo Cascella 05 Oct '20

05 Oct '20

Signed-off-by: Mauro Matteo Cascella <mcascell(a)redhat.com> --- docs/submitting-patches.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/submitting-patches.rst b/docs/submitting-patches.rst index 17b072655d..3ce8b347a0 100644 --- a/docs/submitting-patches.rst +++ b/docs/submitting-patches.rst @@ -22,7 +22,8 @@ patch. However, the usual workflow of libvirt developer is: (hack, committing any changes along the way) More hints on compiling can be found `here <compiling.html>`__. -When you want to post your patches: +Make sure to `sign off <hacking.html#developer-certificate-of-origin>`__ +your commit(s). When you want to post your patches: :: -- 2.26.2

2 2

[python-libvirt] RFC:PEP 484 type annotation - how to continue
by Philipp Hahn 05 Oct '20

05 Oct '20

Hello, currently my Merge Quests <https://gitlab.com/libvirt/libvirt-python/-/merge_requests/9> is stuck because there are some open technical discussions: 1. The Python binding consists of two layers: - libvirtmod* is the low-level C-like API, which mostly is just a thin wrapper around the C-library. It is generated from the API.xml files - The high-level libvirt* modules, providing an object oriented API, which is also generated from the API.xml files. In both cases there are many exceptions defines via libvirt*-override-api.xml or coded in generator.py: - skip_impl: Generate Python code, but skip C implementation - custom_function: Generate neither C nor Python code - hand crafted code - skip_function: Generate neither C nor Python code - not used at all - function_skip_python_impl: Generate C code, but skip python impl Previously the functions listed in "skip_impl" were also duplicated in the "libvirt-*override-api.xml" files, which is somehow hard to maintain. With d19699e48ce9c17481f94b4dc0715e18e05d5adb I removed all those names from "skip_impl", which are also listed in the overrides and added code to add them back when "generator.py" is invoked. For this to work I had to change several "files" attributes to start with "python", which looks okay to me, but still would like to get verified. 2. The low-level library works mostly with bytes, but the high-level Python API uses nested Lists, Tuples and Dicts. To get most out of the Python static type annotations the input and output parameters should be modled in as much detail as possible. This requires to store those types somewhere. My current 46592e28124858ed863bceba65c3dafa2bbb02cd adds some often used types to generator.py and then references them from the overrides.xml: > + 'PyListSecret': ('', 'List["virSecret"]', '', ''), > + 'PyDictAny': ('', 'Dict[str, Any]', '', ''), > + <return type='PyListSecret' info='the list of secrets or None in case of error'/> This still is very painful as there are many "used-once" types, which still must be declared and used in two places. So far the "return" type was used for the "C" type and currently I mis-use it for referencing it for my Python types. This doesn't look right, so I would prefer adding a new attribute which can be used to override the Python type. This also would probably nicely fit with functions like "virDomainOpenConsole", when "dev_name" is optional and can be "None", which the current type hint requires a "string". Is extending the libvirt*-override-api.xml files okay or must this be coordinated with the other parts of the project? Thank you for your time Philipp Hahn -- Philipp Hahn Open Source Software Engineer Univention GmbH be open. Mary-Somerville-Str. 1 D-28359 Bremen 📞 +49-421-22232-57 🖶 +49-421-22232-99 ✉️ hahn(a)univention.de 🌐 https://www.univention.de/ Geschäftsführer: Peter H. Ganten HRB 20755 Amtsgericht Bremen Steuer-Nr.: 71-597-02876

2 1

[libvirt PATCH] rpm: drop ia64, sparc64 and alpha architectures
by Daniel P. Berrangé 05 Oct '20

05 Oct '20

None of these arches are relevant to current Fedora or RHEL distros. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- libvirt.spec.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index aa2bc84be9..682d43c290 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -97,8 +97,8 @@ # Finally set the OS / architecture specific special cases -# Xen is available only on i386 x86_64 ia64 -%ifnarch %{ix86} x86_64 ia64 +# Xen is available only on i386 x86_64 +%ifnarch %{ix86} x86_64 %define with_libxl 0 %endif @@ -438,7 +438,7 @@ Requires: iproute-tc %endif Requires: polkit >= 0.112 -%ifarch %{ix86} x86_64 ia64 +%ifarch %{ix86} x86_64 # For virConnectGetSysinfo Requires: dmidecode %endif @@ -1261,7 +1261,7 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_libxl.aug # Copied into libvirt-docs subpackage eventually mv $RPM_BUILD_ROOT%{_datadir}/doc/libvirt libvirt-docs -%ifarch %{power64} s390x x86_64 ia64 alpha sparc64 +%ifarch %{power64} s390x x86_64 mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_probes.stp \ $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_probes-64.stp -- 2.26.2

2 1

[PATCH v2 0/7] virbitmaptest: Refactor and modernize
by Peter Krempa 05 Oct '20

05 Oct '20

This was split out from my series refactoring the virbitmap util module to address review feedback. Patches 1-5 are new, patches 6-7 were already part of the refactor but needed to be modified to fit on top of the changes needed to comply with review requirements. Peter Krempa (7): virbitmaptest: Split up test12 virbitmaptest: Split up test4 virbitmaptest: Use separate output strings in 'test5' virbitmaptest: Turn 'TEST_MAP' macro into a helper function virbitmaptest: Refactor checks in 'test6' virbitmaptest: Use g_auto(free) for cleanup virbitmaptest: Remove unnecessary error/cleanup labels tests/virbitmaptest.c | 512 ++++++++++++++++++------------------------ 1 file changed, 224 insertions(+), 288 deletions(-) -- 2.26.2

2 14

[libvirt PATCH 0/9] Make unknown XML elements fail CPU comparison
by Tim Wiederhake 05 Oct '20

05 Oct '20

We currently ignore unknown elements in the CPU XML description, e.g. with virsh cpu-compare and hypervisor-cpu-compare. This makes '<cpu><faeture name=3D"..."/></cpu>' (note the typo in "faeture") semantically identic to '<cpu/>'. No error is reported. This series adds checks for unrecognized attributes and elements in the "<cpu>" element, catching this kind of mistake. V1: https://www.redhat.com/archives/libvir-list/2020-September/msg00933.html Changed: * Factored out Schema defintion of different cpu elements * Performing validation against actual schema * Add "--validate" option to virsh [hypervisor-]cpu-compare to opt-in to vali= dation * Drive-by: Unify quotation style in docs/schemas/* Tim Wiederhake (9): schema: Unify apostrophe and quotation mark usage schema: Move host cpu definition to cputypes.rng schema: Move guest cpu definition to cputypes.rng schema: Add schema for guest or host cpu definition util: Allow validation for single XML node cpu: Validate XML virsh: Add "validate" argument to [hypervisor-]cpu-compare tests: cpu: Allow passing flags to cpuTestLoadXML tests: Add tests for unknown elements and attributes in cpu defintion docs/schemas/basictypes.rng | 82 +-- docs/schemas/capability.rng | 466 ++++++--------- docs/schemas/cpu.rng | 12 + docs/schemas/cputypes.rng | 117 +++- docs/schemas/domain.rng | 10 +- docs/schemas/domainbackup.rng | 178 +++--- docs/schemas/domaincaps.rng | 236 ++++---- docs/schemas/domaincheckpoint.rng | 62 +- docs/schemas/domaincommon.rng | 431 +++++++------- docs/schemas/domainsnapshot.rng | 104 ++-- docs/schemas/interface.rng | 6 +- docs/schemas/meson.build | 1 + docs/schemas/network.rng | 44 +- docs/schemas/networkcommon.rng | 26 +- docs/schemas/networkport.rng | 6 +- docs/schemas/nodedev.rng | 464 +++++++-------- docs/schemas/nwfilter.rng | 32 +- docs/schemas/nwfilterbinding.rng | 4 +- docs/schemas/secret.rng | 70 +-- docs/schemas/storagecommon.rng | 110 ++-- docs/schemas/storagepool.rng | 584 +++++++++---------- docs/schemas/storagepoolcaps.rng | 64 +- docs/schemas/storagevol.rng | 150 ++--- include/libvirt/libvirt-host.h | 1 + src/bhyve/bhyve_driver.c | 7 +- src/conf/cpu_conf.c | 28 +- src/conf/cpu_conf.h | 6 +- src/conf/domain_conf.c | 3 +- src/cpu/cpu.c | 5 +- src/cpu/cpu.h | 3 +- src/libxl/libxl_driver.c | 7 +- src/qemu/qemu_domain.c | 5 +- src/qemu/qemu_driver.c | 18 +- src/qemu/qemu_migration_cookie.c | 3 +- src/util/virxml.c | 15 + src/util/virxml.h | 6 + tests/cputest.c | 52 +- tests/cputestdata/x86_64-bogus-attribute.xml | 2 + tests/cputestdata/x86_64-bogus-element.xml | 3 + tools/virsh-host.c | 14 + 40 files changed, 1773 insertions(+), 1664 deletions(-) create mode 100644 docs/schemas/cpu.rng create mode 100644 tests/cputestdata/x86_64-bogus-attribute.xml create mode 100644 tests/cputestdata/x86_64-bogus-element.xml --=20 2.26.2

4 30

[libvirt PATCH v2] docs: use "::" instead of ".. code-block::"
by Daniel P. Berrangé 05 Oct '20

05 Oct '20

The former is a short hand for the latter and is already widely used in the docs. Using the short hand avoids incompatibility with the alternate impl of rst2html5. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Changed in v2: - Simplify to use "::" instead of adding a language to ".. code-block::" because the latter didn't work on macOS builds due to problems with pygments integration in homebrew docs/manpages/libvirtd.rst | 4 +- docs/manpages/virsh.rst | 582 ++++++++++++++--------------- docs/manpages/virt-admin.rst | 52 +-- docs/manpages/virt-login-shell.rst | 8 +- docs/manpages/virtlockd.rst | 4 +- docs/manpages/virtlogd.rst | 4 +- 6 files changed, 327 insertions(+), 327 deletions(-) diff --git a/docs/manpages/libvirtd.rst b/docs/manpages/libvirtd.rst index c88e2dd7e1..cd9976c5e4 100644 --- a/docs/manpages/libvirtd.rst +++ b/docs/manpages/libvirtd.rst @@ -199,7 +199,7 @@ EXAMPLES To retrieve the version of libvirtd: -.. code-block:: +:: # libvirtd --version libvirtd (libvirt) 0.8.2 @@ -207,7 +207,7 @@ To retrieve the version of libvirtd: To start libvirtd, instructing it to daemonize and create a PID file: -.. code-block:: +:: # libvirtd -d # ls -la @RUNSTATEDIR@/libvirtd.pid diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst index 9ac379a4b8..c855269041 100644 --- a/docs/manpages/virsh.rst +++ b/docs/manpages/virsh.rst @@ -38,7 +38,7 @@ KVM, LXC, OpenVZ, VirtualBox and VMware ESX. The basic structure of most virsh usage is: -.. code-block:: +:: virsh [OPTION]... <command> <domain> [ARG]... @@ -185,7 +185,7 @@ historical reasons, some commands default to bytes, while other commands default to kibibytes). The following case-insensitive suffixes can be used to select a specific scale: -.. code-block:: +:: b, byte byte 1 KB kilobyte 1,000 @@ -214,7 +214,7 @@ help **Syntax:** -.. code-block:: +:: help [command-or-group] @@ -228,7 +228,7 @@ group as an option. For example: **Example 1:** -.. code-block:: +:: virsh # help host @@ -250,7 +250,7 @@ option instead. For example: **Example 2:** -.. code-block:: +:: virsh # help list NAME @@ -272,7 +272,7 @@ quit, exit **Syntax:** -.. code-block:: +:: quit exit @@ -286,7 +286,7 @@ version **Syntax:** -.. code-block:: +:: version [--daemon] @@ -296,7 +296,7 @@ is included in the output. **Example:** -.. code-block:: +:: $ virsh version Compiled against library: libvirt 1.2.3 @@ -317,7 +317,7 @@ cd **Syntax:** -.. code-block:: +:: cd [directory] @@ -334,7 +334,7 @@ pwd **Syntax:** -.. code-block:: +:: pwd @@ -347,7 +347,7 @@ connect **Syntax:** -.. code-block:: +:: connect [URI] [--readonly] @@ -388,7 +388,7 @@ uri **Syntax:** -.. code-block:: +:: uri @@ -400,7 +400,7 @@ hostname **Syntax:** -.. code-block:: +:: hostname @@ -412,7 +412,7 @@ sysinfo **Syntax:** -.. code-block:: +:: sysinfo @@ -424,7 +424,7 @@ nodeinfo **Syntax:** -.. code-block:: +:: nodeinfo @@ -440,7 +440,7 @@ nodecpumap **Syntax:** -.. code-block:: +:: nodecpumap [--pretty] @@ -456,7 +456,7 @@ nodecpustats **Syntax:** -.. code-block:: +:: nodecpustats [cpu] [--percent] @@ -471,7 +471,7 @@ nodememstats **Syntax:** -.. code-block:: +:: nodememstats [cell] @@ -484,7 +484,7 @@ nodesuspend **Syntax:** -.. code-block:: +:: nodesuspend [target] [duration] @@ -503,7 +503,7 @@ node-memory-tune **Syntax:** -.. code-block:: +:: node-memory-tune [shm-pages-to-scan] [shm-sleep-millisecs] [shm-merge-across-nodes] @@ -525,7 +525,7 @@ capabilities **Syntax:** -.. code-block:: +:: capabilities @@ -545,7 +545,7 @@ domcapabilities **Syntax:** -.. code-block:: +:: domcapabilities [virttype] [emulatorbin] [arch] [machine] @@ -588,7 +588,7 @@ pool-capabilities **Syntax:** -.. code-block:: +:: pool-capabilities @@ -605,7 +605,7 @@ inject-nmi **Syntax:** -.. code-block:: +:: inject-nmi domain @@ -617,7 +617,7 @@ list **Syntax:** -.. code-block:: +:: list [--inactive | --all] [--managed-save] [--title] @@ -637,7 +637,7 @@ specified it prints out information about running domains. An example format for the list is as follows: -.. code-block:: +:: ``virsh`` list Id Name State @@ -775,7 +775,7 @@ printed in an extra column. This flag is usable only with the default **Example 2:** -.. code-block:: +:: $ virsh list --title Id Name State Title @@ -790,7 +790,7 @@ freecell **Syntax:** -.. code-block:: +:: freecell [{ [--cellno] cellno | --all }] @@ -809,7 +809,7 @@ freepages **Syntax:** -.. code-block:: +:: freepages [{ [--cellno] cellno [--pagesize] pagesize | --all }] @@ -824,7 +824,7 @@ allocpages **Syntax:** -.. code-block:: +:: allocpages [--pagesize] pagesize [--pagecount] pagecount [[--cellno] cellno] [--add] [--all] @@ -843,7 +843,7 @@ cpu-baseline **Syntax:** -.. code-block:: +:: cpu-baseline FILE [--features] [--migratable] @@ -864,7 +864,7 @@ cpu-compare **Syntax:** -.. code-block:: +:: cpu-compare FILE [--error] @@ -890,7 +890,7 @@ cpu-models **Syntax:** -.. code-block:: +:: cpu-models arch @@ -909,7 +909,7 @@ echo **Syntax:** -.. code-block:: +:: echo [--shell] [--xml] [err...] [arg...] @@ -926,7 +926,7 @@ hypervisor-cpu-compare **Syntax:** -.. code-block:: +:: hypervisor-cpu-compare FILE [virttype] [emulator] [arch] [machine] [--error] @@ -958,7 +958,7 @@ hypervisor-cpu-baseline **Syntax:** -.. code-block:: +:: hypervisor-cpu-baseline FILE [virttype] [emulator] [arch] [machine] [--features] [--migratable] @@ -1005,7 +1005,7 @@ autostart **Syntax:** -.. code-block:: +:: autostart [--disable] domain @@ -1020,7 +1020,7 @@ blkdeviotune **Syntax:** -.. code-block:: +:: blkdeviotune domain device [[--config] [--live] | [--current]] [[total-bytes-sec] | [read-bytes-sec] [write-bytes-sec]] @@ -1103,7 +1103,7 @@ blkiotune **Syntax:** -.. code-block:: +:: blkiotune domain [--weight weight] [--device-weights device-weights] [--device-read-iops-sec device-read-iops-sec] @@ -1165,7 +1165,7 @@ blockcommit **Syntax:** -.. code-block:: +:: blockcommit domain path [bandwidth] [--bytes] [base] [--shallow] [top] [--delete] [--keep-relative] @@ -1223,7 +1223,7 @@ blockcopy **Syntax:** -.. code-block:: +:: blockcopy domain path { dest [format] [--blockdev] | --xml file } [--shallow] [--reuse-external] [bandwidth] @@ -1295,7 +1295,7 @@ blockjob **Syntax:** -.. code-block:: +:: blockjob domain path { [--abort] [--async] [--pivot] | [--info] [--raw] [--bytes] | [bandwidth] } @@ -1345,7 +1345,7 @@ blockpull **Syntax:** -.. code-block:: +:: blockpull domain path [bandwidth] [--bytes] [base] [--wait [--verbose] [--timeout seconds] [--async]] @@ -1386,7 +1386,7 @@ blockresize **Syntax:** -.. code-block:: +:: blockresize domain path size @@ -1407,7 +1407,7 @@ console **Syntax:** -.. code-block:: +:: console domain [devname] [--safe] [--force] @@ -1428,7 +1428,7 @@ cpu-stats **Syntax:** -.. code-block:: +:: cpu-stats domain [--total] [start] [count] @@ -1444,7 +1444,7 @@ create **Syntax:** -.. code-block:: +:: create FILE [--console] [--paused] [--autodestroy] [--pass-fds N,M,...] [--validate] @@ -1475,7 +1475,7 @@ is only supported with container based virtualization. #. prepare a template from an existing domain (skip directly to 3a if writing one from scratch) - .. code-block:: + :: # virsh dumpxml <domain> > domain.xml @@ -1484,7 +1484,7 @@ is only supported with container based virtualization. a. DO CHANGE! <name> and <uuid> (<uuid> can also be removed), or b. DON'T CHANGE! either <name> or <uuid> - .. code-block:: + :: # $EDITOR domain.xml @@ -1495,7 +1495,7 @@ is only supported with container based virtualization. b. an existing persistent guest will run with a modified one-time configuration - .. code-block:: + :: # virsh create domain.xml @@ -1505,7 +1505,7 @@ define **Syntax:** -.. code-block:: +:: define FILE [--validate] @@ -1521,7 +1521,7 @@ desc **Syntax:** -.. code-block:: +:: desc domain [[--live] [--config] | [--current]] [--title] [--edit] [--new-desc @@ -1553,7 +1553,7 @@ destroy **Syntax:** -.. code-block:: +:: destroy domain [--graceful] @@ -1581,7 +1581,7 @@ domblkerror **Syntax:** -.. code-block:: +:: domblkerror domain @@ -1597,7 +1597,7 @@ domblkinfo **Syntax:** -.. code-block:: +:: domblkinfo domain [block-device --all] [--human] @@ -1617,7 +1617,7 @@ domblklist **Syntax:** -.. code-block:: +:: domblklist domain [--inactive] [--details] @@ -1637,7 +1637,7 @@ domblkstat **Syntax:** -.. code-block:: +:: domblkstat domain [block-device] [--human] @@ -1674,7 +1674,7 @@ domblkthreshold **Syntax:** -.. code-block:: +:: domblkthreshold domain dev threshold @@ -1689,7 +1689,7 @@ domcontrol **Syntax:** -.. code-block:: +:: domcontrol domain @@ -1703,7 +1703,7 @@ domdisplay **Syntax:** -.. code-block:: +:: domdisplay domain [--include-password] [[--type] type] [--all] @@ -1720,7 +1720,7 @@ domfsfreeze **Syntax:** -.. code-block:: +:: domfsfreeze domain [[--mountpoint] mountpoint...] @@ -1742,7 +1742,7 @@ domfsinfo **Syntax:** -.. code-block:: +:: domfsinfo domain @@ -1759,7 +1759,7 @@ domfsthaw **Syntax:** -.. code-block:: +:: domfsthaw domain [[--mountpoint] mountpoint...] @@ -1776,7 +1776,7 @@ domfstrim **Syntax:** -.. code-block:: +:: domfstrim domain [--minimum bytes] [--mountpoint mountPoint] @@ -1797,7 +1797,7 @@ domhostname **Syntax:** -.. code-block:: +:: domhostname domain [--source lease|agent] @@ -1814,7 +1814,7 @@ domid **Syntax:** -.. code-block:: +:: domid domain-name-or-uuid @@ -1826,7 +1826,7 @@ domif-getlink **Syntax:** -.. code-block:: +:: domif-getlink domain interface-device [--config] @@ -1842,7 +1842,7 @@ domif-setlink **Syntax:** -.. code-block:: +:: domif-setlink domain interface-device state [--config] @@ -1858,7 +1858,7 @@ domifaddr **Syntax:** -.. code-block:: +:: domifaddr domain [interface] [--full] [--source lease|agent|arp] @@ -1885,7 +1885,7 @@ backup-begin **Syntax:** -.. code-block:: +:: backup-begin domain [backupxml] [checkpointxml] [--reuse-external] @@ -1919,7 +1919,7 @@ backup-dumpxml **Syntax:** -.. code-block:: +:: backup-dumpxml domain @@ -1931,7 +1931,7 @@ domiflist **Syntax:** -.. code-block:: +:: domiflist domain [--inactive] @@ -1948,7 +1948,7 @@ domifstat **Syntax:** -.. code-block:: +:: domifstat domain interface-device @@ -1965,7 +1965,7 @@ domiftune **Syntax:** -.. code-block:: +:: domiftune domain interface-device [[--config] [--live] | [--current]] [*--inbound average,peak,burst,floor*] @@ -2000,7 +2000,7 @@ dominfo **Syntax:** -.. code-block:: +:: dominfo domain @@ -2012,7 +2012,7 @@ domjobabort **Syntax:** -.. code-block:: +:: domjobabort domain @@ -2024,7 +2024,7 @@ domjobinfo **Syntax:** -.. code-block:: +:: domjobinfo domain [--completed [--keep-completed]] [--anystats] [--rawstats] @@ -2051,7 +2051,7 @@ dommemstat **Syntax:** -.. code-block:: +:: dommemstat domain [--period seconds] [[--config] [--live] | [--current]] @@ -2106,7 +2106,7 @@ domname **Syntax:** -.. code-block:: +:: domname domain-id-or-uuid @@ -2118,7 +2118,7 @@ dompmsuspend **Syntax:** -.. code-block:: +:: dompmsuspend domain target [--duration] @@ -2149,7 +2149,7 @@ dompmwakeup **Syntax:** -.. code-block:: +:: dompmwakeup domain @@ -2164,7 +2164,7 @@ domrename **Syntax:** -.. code-block:: +:: domrename domain new-name @@ -2179,7 +2179,7 @@ domstate **Syntax:** -.. code-block:: +:: domstate domain [--reason] @@ -2192,7 +2192,7 @@ domstats **Syntax:** -.. code-block:: +:: domstats [--raw] [--enforce] [--backing] [--nowait] [--state] [--cpu-total] [--balloon] [--vcpu] [--interface] @@ -2426,7 +2426,7 @@ domtime **Syntax:** -.. code-block:: +:: domtime domain { [--now] [--pretty] [--sync] [--time time] } @@ -2451,7 +2451,7 @@ domuuid **Syntax:** -.. code-block:: +:: domuuid domain-name-or-id @@ -2463,7 +2463,7 @@ domxml-from-native **Syntax:** -.. code-block:: +:: domxml-from-native format config @@ -2481,7 +2481,7 @@ domxml-to-native **Syntax:** -.. code-block:: +:: domxml-to-native format { [--xml] xml | --domain domain-name-or-id-or-uuid } @@ -2496,7 +2496,7 @@ dump **Syntax:** -.. code-block:: +:: dump domain corefilepath [--bypass-cache] { [--live] | [--crash] | [--reset] } @@ -2538,7 +2538,7 @@ dumpxml **Syntax:** -.. code-block:: +:: dumpxml domain [--inactive] [--security-info] [--update-cpu] [--migratable] @@ -2559,7 +2559,7 @@ edit **Syntax:** -.. code-block:: +:: edit domain @@ -2568,7 +2568,7 @@ next boot of the guest. This is equivalent to: -.. code-block:: +:: virsh dumpxml --inactive --security-info domain > domain.xml vi domain.xml (or make changes with your other text editor) @@ -2585,7 +2585,7 @@ emulatorpin **Syntax:** -.. code-block:: +:: emulatorpin domain [cpulist] [[--live] [--config] | [--current]] @@ -2608,7 +2608,7 @@ event **Syntax:** -.. code-block:: +:: event {[domain] { event | --all } [--loop] [--timeout seconds] [--timestamp] | --list} @@ -2635,7 +2635,7 @@ guest-agent-timeout **Syntax:** -.. code-block:: +:: guest-agent-timeout domain [--timeout value] @@ -2655,7 +2655,7 @@ guestinfo **Syntax:** -.. code-block:: +:: guestinfo domain [--user] [--os] [--timezone] [--hostname] [--filesystem] @@ -2731,7 +2731,7 @@ guestvcpus **Syntax:** -.. code-block:: +:: guestvcpus domain [[--enable] | [--disable]] [cpulist] @@ -2750,7 +2750,7 @@ iothreadadd **Syntax:** -.. code-block:: +:: iothreadadd domain iothread_id [[--config] [--live] | [--current]] @@ -2770,7 +2770,7 @@ iothreaddel **Syntax:** -.. code-block:: +:: iothreaddel domain iothread_id [[--config] [--live] | [--current]] @@ -2792,7 +2792,7 @@ iothreadinfo **Syntax:** -.. code-block:: +:: iothreadinfo domain [[--live] [--config] | [--current]] @@ -2813,7 +2813,7 @@ iothreadpin **Syntax:** -.. code-block:: +:: iothreadpin domain iothread cpulist [[--live] [--config] | [--current]] @@ -2846,7 +2846,7 @@ iothreadset **Syntax:** -.. code-block:: +:: iothreadset domain iothread_id [[--poll-max-ns ns] [--poll-grow factor] [--poll-shrink divisor]] @@ -2878,7 +2878,7 @@ managedsave **Syntax:** -.. code-block:: +:: managedsave domain [--bypass-cache] [{--running | --paused}] [--verbose] @@ -2907,7 +2907,7 @@ managedsave-define **Syntax:** -.. code-block:: +:: managedsave-define domain xml [{--running | --paused}] @@ -2927,7 +2927,7 @@ managedsave-dumpxml **Syntax:** -.. code-block:: +:: managedsave-dumpxml domain [--security-info] @@ -2941,7 +2941,7 @@ managedsave-edit **Syntax:** -.. code-block:: +:: managedsave-edit domain [{--running | --paused}] @@ -2955,7 +2955,7 @@ will allow overriding which state the ``restore`` should use. This is equivalent to: -.. code-block:: +:: virsh managedsave-dumpxml domain-name > state-file.xml vi state-file.xml (or make changes with your other text editor) @@ -2972,7 +2972,7 @@ managedsave-remove **Syntax:** -.. code-block:: +:: managedsave-remove domain @@ -2985,7 +2985,7 @@ maxvcpus **Syntax:** -.. code-block:: +:: maxvcpus [type] @@ -2999,7 +2999,7 @@ memtune **Syntax:** -.. code-block:: +:: memtune domain [--hard-limit size] [--soft-limit size] [--swap-hard-limit size] [--min-guarantee size] [[--config] [--live] | [--current]] @@ -3058,7 +3058,7 @@ metadata **Syntax:** -.. code-block:: +:: metadata domain [[--live] [--config] | [--current]] [--edit] [uri] [key] [set] [--remove] @@ -3097,7 +3097,7 @@ migrate **Syntax:** -.. code-block:: +:: migrate [--live] [--offline] [--direct] [--p2p [--tunnelled]] [--persistent] [--undefinesource] [--suspend] [--copy-storage-all] @@ -3240,7 +3240,7 @@ and/or libvirt does not have network access to the remote side you can use a UNIX transport in the URI and specify a socket path in the query, for example with the qemu driver you could use this: -.. code-block:: +:: qemu+unix:///system?socket=/path/to/socket @@ -3274,7 +3274,7 @@ There are a few scenarios where specifying *migrateuri* may help: should not guess a *migrateuri* and it should be specified using UNIX socket path URI: -.. code-block:: +:: unix:///path/to/socket @@ -3289,7 +3289,7 @@ connected to and needs to connect through a proxy, *graphicsuri* may be used to specify the address the client should connect to. The URI is formed as follows: -.. code-block:: +:: protocol://hostname[:port]/[?parameters] @@ -3297,7 +3297,7 @@ where protocol is either "spice" or "vnc" and parameters is a list of protocol specific parameters separated by '&'. Currently recognized parameters are "tlsPort" and "tlsSubject". For example, -.. code-block:: +:: spice://target.host.com:1234/?tlsPort=4567 @@ -3327,7 +3327,7 @@ migrate-compcache **Syntax:** -.. code-block:: +:: migrate-compcache domain [--size bytes] @@ -3347,7 +3347,7 @@ migrate-getmaxdowntime **Syntax:** -.. code-block:: +:: migrate-getmaxdowntime domain @@ -3362,7 +3362,7 @@ migrate-getspeed **Syntax:** -.. code-block:: +:: migrate-getspeed domain [--postcopy] @@ -3376,7 +3376,7 @@ migrate-postcopy **Syntax:** -.. code-block:: +:: migrate-postcopy domain @@ -3389,7 +3389,7 @@ migrate-setmaxdowntime **Syntax:** -.. code-block:: +:: migrate-setmaxdowntime domain downtime @@ -3403,7 +3403,7 @@ migrate-setspeed **Syntax:** -.. code-block:: +:: migrate-setspeed domain bandwidth [--postcopy] @@ -3421,7 +3421,7 @@ numatune **Syntax:** -.. code-block:: +:: numatune domain [--mode mode] [--nodeset nodeset] [[--config] [--live] | [--current]] @@ -3459,7 +3459,7 @@ perf **Syntax:** -.. code-block:: +:: perf domain [--enable eventSpec] [--disable eventSpec] [[--config] [--live] | [--current]] @@ -3548,7 +3548,7 @@ reboot **Syntax:** -.. code-block:: +:: reboot domain [--mode MODE-LIST] @@ -3574,7 +3574,7 @@ reset **Syntax:** -.. code-block:: +:: reset domain @@ -3590,7 +3590,7 @@ restore **Syntax:** -.. code-block:: +:: restore state-file [--bypass-cache] [--xml file] [{--running | --paused}] @@ -3622,7 +3622,7 @@ resume **Syntax:** -.. code-block:: +:: resume domain @@ -3636,7 +3636,7 @@ save **Syntax:** -.. code-block:: +:: save domain state-file [--bypass-cache] [--xml file] [{--running | --paused}] [--verbose] @@ -3680,7 +3680,7 @@ save-image-define **Syntax:** -.. code-block:: +:: save-image-define file xml [{--running | --paused}] @@ -3702,7 +3702,7 @@ save-image-dumpxml **Syntax:** -.. code-block:: +:: save-image-dumpxml file [--security-info] @@ -3716,7 +3716,7 @@ save-image-edit **Syntax:** -.. code-block:: +:: save-image-edit file [{--running | --paused}] @@ -3730,7 +3730,7 @@ will allow overriding which state the ``restore`` should use. This is equivalent to: -.. code-block:: +:: virsh save-image-dumpxml state-file > state-file.xml vi state-file.xml (or make changes with your other text editor) @@ -3747,7 +3747,7 @@ schedinfo **Syntax:** -.. code-block:: +:: schedinfo domain [[--config] [--live] | [--current]] [[--set] parameter=value]... schedinfo [--weight number] [--cap number] domain @@ -3790,7 +3790,7 @@ screenshot **Syntax:** -.. code-block:: +:: screenshot domain [imagefilepath] [--screen screenID] @@ -3807,7 +3807,7 @@ send-key **Syntax:** -.. code-block:: +:: send-key domain [--codeset codeset] [--holdtime holdtime] keycode... @@ -3904,7 +3904,7 @@ distinct keypresses, you must use multiple send-key invocations. **Examples:** -.. code-block:: +:: # send three strokes 'k', 'e', 'y', using xt codeset. these # are all pressed simultaneously and may be received by the guest @@ -3924,7 +3924,7 @@ send-process-signal **Syntax:** -.. code-block:: +:: send-process-signal domain-id pid signame @@ -3935,7 +3935,7 @@ domain namespace. The *signame* argument may be either an integer signal constant number, or one of the symbolic names: -.. code-block:: +:: "nop", "hup", "int", "quit", "ill", "trap", "abrt", "bus", "fpe", "kill", @@ -3955,7 +3955,7 @@ may be in uppercase or lowercase. **Examples:** -.. code-block:: +:: virsh send-process-signal myguest 1 15 virsh send-process-signal myguest 1 term @@ -3968,7 +3968,7 @@ set-lifecycle-action **Syntax:** -.. code-block:: +:: set-lifecycle-action domain type action [[--config] [--live] | [--current]] @@ -3985,7 +3985,7 @@ set-user-password **Syntax:** -.. code-block:: +:: set-user-password domain user password [--encrypted] @@ -4003,7 +4003,7 @@ setmaxmem **Syntax:** -.. code-block:: +:: setmaxmem domain size [[--config] [--live] | [--current]] @@ -4035,7 +4035,7 @@ setmem **Syntax:** -.. code-block:: +:: setmem domain size [[--config] [--live] | [--current]] @@ -4071,7 +4071,7 @@ setvcpus **Syntax:** -.. code-block:: +:: setvcpus domain count [--maximum] [[--config] [--live] | [--current]] [--guest] [--hotpluggable] @@ -4123,7 +4123,7 @@ setvcpu **Syntax:** -.. code-block:: +:: setvcpu domain vcpulist [--enable] | [--disable] [[--live] [--config] | [--current]] @@ -4151,7 +4151,7 @@ shutdown **Syntax:** -.. code-block:: +:: shutdown domain [--mode MODE-LIST] @@ -4183,7 +4183,7 @@ start **Syntax:** -.. code-block:: +:: start domain-name-or-uuid [--console] [--paused] [--autodestroy] [--bypass-cache] [--force-boot] @@ -4212,7 +4212,7 @@ suspend **Syntax:** -.. code-block:: +:: suspend domain @@ -4225,7 +4225,7 @@ ttyconsole **Syntax:** -.. code-block:: +:: ttyconsole domain @@ -4238,7 +4238,7 @@ undefine **Syntax:** -.. code-block:: +:: undefine domain [--managed-save] [--snapshots-metadata] [--checkpoints-metadata] [--nvram] [--keep-nvram] @@ -4304,7 +4304,7 @@ vcpucount **Syntax:** -.. code-block:: +:: vcpucount domain [{--maximum | --active} {--config | --live | --current}] [--guest] @@ -4335,7 +4335,7 @@ vcpuinfo **Syntax:** -.. code-block:: +:: vcpuinfo domain [--pretty] @@ -4346,7 +4346,7 @@ With *--pretty*, cpu affinities are shown as ranges. **Example:** -.. code-block:: +:: $ virsh vcpuinfo fedora VCPU: 0 @@ -4399,7 +4399,7 @@ vcpupin **Syntax:** -.. code-block:: +:: vcpupin domain [vcpu] [cpulist] [[--live] [--config] | [--current]] @@ -4428,7 +4428,7 @@ vncdisplay **Syntax:** -.. code-block:: +:: vncdisplay domain @@ -4451,7 +4451,7 @@ attach-device **Syntax:** -.. code-block:: +:: attach-device domain FILE [[[--live] [--config] | [--current]] | [--persistent]] @@ -4488,7 +4488,7 @@ attach-disk **Syntax:** -.. code-block:: +:: attach-disk domain source target [[[--live] [--config] | [--current]] | [--persistent]] [--targetbus bus] @@ -4556,7 +4556,7 @@ attach-interface **Syntax:** -.. code-block:: +:: attach-interface domain type source [[[--live] [--config] | [--current]] | [--persistent]] @@ -4648,7 +4648,7 @@ detach-device **Syntax:** -.. code-block:: +:: detach-device domain FILE [[[--live] [--config] | [--current]] | [--persistent]] @@ -4695,7 +4695,7 @@ detach-device-alias **Syntax:** -.. code-block:: +:: detach-device-alias domain alias [[[--live] [--config] | [--current]]]] @@ -4717,7 +4717,7 @@ detach-disk **Syntax:** -.. code-block:: +:: detach-disk domain target [[[--live] [--config] | [--current]] | [--persistent]] [--print-xml] @@ -4751,7 +4751,7 @@ detach-interface **Syntax:** -.. code-block:: +:: detach-interface domain type [--mac mac] [[[--live] [--config] | [--current]] | [--persistent]] @@ -4784,7 +4784,7 @@ update-device **Syntax:** -.. code-block:: +:: update-device domain file [--force] [[[--live] [--config] | [--current]] | [--persistent]] @@ -4819,7 +4819,7 @@ change-media **Syntax:** -.. code-block:: +:: change-media domain path [--eject] [--insert] [--update] [source] [--force] [[--live] [--config] | @@ -4889,7 +4889,7 @@ nodedev-create **Syntax:** -.. code-block:: +:: nodedev-create FILE @@ -4905,7 +4905,7 @@ nodedev-destroy **Syntax:** -.. code-block:: +:: nodedev-destroy device @@ -4920,7 +4920,7 @@ nodedev-detach **Syntax:** -.. code-block:: +:: nodedev-detach nodedev [--driver backend_driver] @@ -4940,7 +4940,7 @@ nodedev-dumpxml **Syntax:** -.. code-block:: +:: nodedev-dumpxml device @@ -4957,7 +4957,7 @@ nodedev-list **Syntax:** -.. code-block:: +:: nodedev-list cap --tree @@ -4976,7 +4976,7 @@ nodedev-reattach **Syntax:** -.. code-block:: +:: nodedev-reattach nodedev @@ -4991,7 +4991,7 @@ nodedev-reset **Syntax:** -.. code-block:: +:: nodedev-reset nodedev @@ -5006,7 +5006,7 @@ nodedev-event **Syntax:** -.. code-block:: +:: nodedev-event {[nodedev] event [--loop] [--timeout seconds] [--timestamp] | --list} @@ -5042,7 +5042,7 @@ net-autostart **Syntax:** -.. code-block:: +:: net-autostart network [--disable] @@ -5055,7 +5055,7 @@ net-create **Syntax:** -.. code-block:: +:: net-create file @@ -5070,7 +5070,7 @@ net-define **Syntax:** -.. code-block:: +:: net-define file @@ -5083,7 +5083,7 @@ net-destroy **Syntax:** -.. code-block:: +:: net-destroy network @@ -5096,7 +5096,7 @@ net-dumpxml **Syntax:** -.. code-block:: +:: net-dumpxml network [--inactive] @@ -5111,7 +5111,7 @@ net-edit **Syntax:** -.. code-block:: +:: net-edit network @@ -5119,7 +5119,7 @@ Edit the XML configuration file for a network. This is equivalent to: -.. code-block:: +:: virsh net-dumpxml --inactive network > network.xml vi network.xml (or make changes with your other text editor) @@ -5136,7 +5136,7 @@ net-event **Syntax:** -.. code-block:: +:: net-event {[network] event [--loop] [--timeout seconds] [--timestamp] | --list} @@ -5161,7 +5161,7 @@ net-info **Syntax:** -.. code-block:: +:: net-info network @@ -5173,7 +5173,7 @@ net-list **Syntax:** -.. code-block:: +:: net-list [--inactive | --all] { [--table] | --name | --uuid } @@ -5204,7 +5204,7 @@ net-name **Syntax:** -.. code-block:: +:: net-name network-UUID @@ -5216,7 +5216,7 @@ net-start **Syntax:** -.. code-block:: +:: net-start network @@ -5228,7 +5228,7 @@ net-undefine **Syntax:** -.. code-block:: +:: net-undefine network @@ -5241,7 +5241,7 @@ net-uuid **Syntax:** -.. code-block:: +:: net-uuid network-name @@ -5253,7 +5253,7 @@ net-update **Syntax:** -.. code-block:: +:: net-update network command section xml [--parent-index index] [[--live] [--config] | [--current]] @@ -5301,7 +5301,7 @@ net-dhcp-leases **Syntax:** -.. code-block:: +:: net-dhcp-leases network [mac] @@ -5326,7 +5326,7 @@ net-port-list **Syntax:** -.. code-block:: +:: net-port-list { [--table] | --uuid } network @@ -5343,7 +5343,7 @@ net-port-create **Syntax:** -.. code-block:: +:: net-port-create network file @@ -5356,7 +5356,7 @@ net-port-dumpxml **Syntax:** -.. code-block:: +:: net-port-dumpxml network port @@ -5368,7 +5368,7 @@ net-port-delete **Syntax:** -.. code-block:: +:: net-port-delete network port @@ -5397,7 +5397,7 @@ iface-bridge **Syntax:** -.. code-block:: +:: iface-bridge interface bridge [--no-stp] [delay] [--no-start] @@ -5416,7 +5416,7 @@ iface-define **Syntax:** -.. code-block:: +:: iface-define file @@ -5429,7 +5429,7 @@ iface-destroy **Syntax:** -.. code-block:: +:: iface-destroy interface @@ -5442,7 +5442,7 @@ iface-dumpxml **Syntax:** -.. code-block:: +:: iface-dumpxml interface [--inactive] @@ -5456,7 +5456,7 @@ iface-edit **Syntax:** -.. code-block:: +:: iface-edit interface @@ -5464,7 +5464,7 @@ Edit the XML configuration file for a host interface. This is equivalent to: -.. code-block:: +:: virsh iface-dumpxml iface > iface.xml vi iface.xml (or make changes with your other text editor) @@ -5481,7 +5481,7 @@ iface-list **Syntax:** -.. code-block:: +:: iface-list [--inactive | --all] @@ -5495,7 +5495,7 @@ iface-name **Syntax:** -.. code-block:: +:: iface-name interface @@ -5510,7 +5510,7 @@ iface-mac **Syntax:** -.. code-block:: +:: iface-mac interface @@ -5524,7 +5524,7 @@ iface-start **Syntax:** -.. code-block:: +:: iface-start interface @@ -5536,7 +5536,7 @@ iface-unbridge **Syntax:** -.. code-block:: +:: iface-unbridge bridge [--no-start] @@ -5554,7 +5554,7 @@ iface-undefine **Syntax:** -.. code-block:: +:: iface-undefine interface @@ -5566,7 +5566,7 @@ iface-begin **Syntax:** -.. code-block:: +:: iface-begin @@ -5584,7 +5584,7 @@ iface-commit **Syntax:** -.. code-block:: +:: iface-commit @@ -5598,7 +5598,7 @@ iface-rollback **Syntax:** -.. code-block:: +:: iface-rollback @@ -5624,7 +5624,7 @@ find-storage-pool-sources **Syntax:** -.. code-block:: +:: find-storage-pool-sources type [srcSpec] @@ -5662,7 +5662,7 @@ find-pool-sources-as **Syntax:** -.. code-block:: +:: find-storage-pool-sources-as type [host] [port] [initiator] @@ -5686,7 +5686,7 @@ pool-autostart **Syntax:** -.. code-block:: +:: pool-autostart pool-or-uuid [--disable] @@ -5698,7 +5698,7 @@ pool-build **Syntax:** -.. code-block:: +:: pool-build pool-or-uuid [--overwrite] [--no-overwrite] @@ -5740,7 +5740,7 @@ pool-create **Syntax:** -.. code-block:: +:: pool-create file [--build] [[--overwrite] | [--no-overwrite]] @@ -5758,7 +5758,7 @@ pool-create-as **Syntax:** -.. code-block:: +:: pool-create-as name type [--source-host hostname] [--source-path path] [--source-dev path] @@ -5848,7 +5848,7 @@ pool-define **Syntax:** -.. code-block:: +:: pool-define file @@ -5861,7 +5861,7 @@ pool-define-as **Syntax:** -.. code-block:: +:: pool-define-as name type [--source-host hostname] [--source-path path] [--source-dev path] @@ -5887,7 +5887,7 @@ pool-destroy **Syntax:** -.. code-block:: +:: pool-destroy pool-or-uuid @@ -5902,7 +5902,7 @@ pool-delete **Syntax:** -.. code-block:: +:: pool-delete pool-or-uuid @@ -5916,7 +5916,7 @@ pool-dumpxml **Syntax:** -.. code-block:: +:: pool-dumpxml [--inactive] pool-or-uuid @@ -5930,7 +5930,7 @@ pool-edit **Syntax:** -.. code-block:: +:: pool-edit pool-or-uuid @@ -5938,7 +5938,7 @@ Edit the XML configuration file for a storage pool. This is equivalent to: -.. code-block:: +:: virsh pool-dumpxml pool > pool.xml vi pool.xml (or make changes with your other text editor) @@ -5955,7 +5955,7 @@ pool-info **Syntax:** -.. code-block:: +:: pool-info [--bytes] pool-or-uuid @@ -5968,7 +5968,7 @@ pool-list **Syntax:** -.. code-block:: +:: pool-list [--inactive] [--all] [--persistent] [--transient] @@ -6008,7 +6008,7 @@ pool-name **Syntax:** -.. code-block:: +:: pool-name uuid @@ -6020,7 +6020,7 @@ pool-refresh **Syntax:** -.. code-block:: +:: pool-refresh pool-or-uuid @@ -6032,7 +6032,7 @@ pool-start **Syntax:** -.. code-block:: +:: pool-start pool-or-uuid [--build] [[--overwrite] | [--no-overwrite]] @@ -6060,7 +6060,7 @@ pool-undefine **Syntax:** -.. code-block:: +:: pool-undefine pool-or-uuid @@ -6072,7 +6072,7 @@ pool-uuid **Syntax:** -.. code-block:: +:: pool-uuid pool @@ -6084,7 +6084,7 @@ pool-event **Syntax:** -.. code-block:: +:: pool-event {[pool] event [--loop] [--timeout seconds] [--timestamp] | --list} @@ -6112,7 +6112,7 @@ vol-create **Syntax:** -.. code-block:: +:: vol-create pool-or-uuid FILE [--prealloc-metadata] @@ -6131,7 +6131,7 @@ only slightly higher initial disk space usage. **Example:** -.. code-block:: +:: virsh vol-dumpxml --pool storagepool1 appvolume1 > newvolume.xml vi newvolume.xml (or make changes with your other text editor) @@ -6143,7 +6143,7 @@ vol-create-from **Syntax:** -.. code-block:: +:: vol-create-from pool-or-uuid FILE vol-name-or-key-or-path [--inputpool pool-or-uuid] [--prealloc-metadata] [--reflink] @@ -6174,7 +6174,7 @@ vol-create-as **Syntax:** -.. code-block:: +:: vol-create-as pool-or-uuid name capacity [--allocation size] [--format string] [--backing-vol vol-name-or-key-or-path] @@ -6223,7 +6223,7 @@ vol-clone **Syntax:** -.. code-block:: +:: vol-clone vol-name-or-key-or-path name [--pool pool-or-uuid] [--prealloc-metadata] [--reflink] @@ -6256,7 +6256,7 @@ vol-delete **Syntax:** -.. code-block:: +:: vol-delete vol-name-or-key-or-path [--pool pool-or-uuid] [--delete-snapshots] @@ -6280,7 +6280,7 @@ vol-upload **Syntax:** -.. code-block:: +:: vol-upload vol-name-or-key-or-path local-file [--pool pool-or-uuid] [--offset bytes] @@ -6318,7 +6318,7 @@ vol-download **Syntax:** -.. code-block:: +:: vol-download vol-name-or-key-or-path local-file [--pool pool-or-uuid] [--offset bytes] [--length bytes] @@ -6349,7 +6349,7 @@ vol-wipe **Syntax:** -.. code-block:: +:: vol-wipe vol-name-or-key-or-path [--pool pool-or-uuid] [--algorithm algorithm] @@ -6408,7 +6408,7 @@ vol-dumpxml **Syntax:** -.. code-block:: +:: vol-dumpxml vol-name-or-key-or-path [--pool pool-or-uuid] @@ -6428,7 +6428,7 @@ vol-info **Syntax:** -.. code-block:: +:: vol-info vol-name-or-key-or-path [--pool pool-or-uuid] [--bytes] [--physical] @@ -6457,7 +6457,7 @@ vol-list **Syntax:** -.. code-block:: +:: vol-list [--pool pool-or-uuid] [--details] @@ -6474,7 +6474,7 @@ vol-pool **Syntax:** -.. code-block:: +:: vol-pool vol-key-or-path [--uuid] @@ -6492,7 +6492,7 @@ vol-path **Syntax:** -.. code-block:: +:: vol-path vol-name-or-key [--pool pool-or-uuid] @@ -6511,7 +6511,7 @@ vol-name **Syntax:** -.. code-block:: +:: vol-name vol-key-or-path @@ -6525,7 +6525,7 @@ vol-key **Syntax:** -.. code-block:: +:: vol-key vol-name-or-path [--pool pool-or-uuid] @@ -6545,7 +6545,7 @@ vol-resize **Syntax:** -.. code-block:: +:: vol-resize vol-name-or-path capacity [--pool pool-or-uuid] [--allocate] [--delta] [--shrink] @@ -6590,7 +6590,7 @@ secret-define **Syntax:** -.. code-block:: +:: secret-define file @@ -6605,7 +6605,7 @@ secret-dumpxml **Syntax:** -.. code-block:: +:: secret-dumpxml secret @@ -6617,7 +6617,7 @@ secret-event **Syntax:** -.. code-block:: +:: secret-event {[secret] event [--loop] [--timeout seconds] [--timestamp] | --list} @@ -6642,7 +6642,7 @@ secret-set-value **Syntax:** -.. code-block:: +:: secret-set-value secret (--file filename [--plain] | --interactive | base64) @@ -6665,7 +6665,7 @@ secret-get-value **Syntax:** -.. code-block:: +:: secret-get-value [--plain] secret @@ -6682,7 +6682,7 @@ secret-undefine **Syntax:** -.. code-block:: +:: secret-undefine secret @@ -6696,7 +6696,7 @@ secret-list **Syntax:** -.. code-block:: +:: secret-list [--ephemeral] [--no-ephemeral] [--private] [--no-private] @@ -6723,7 +6723,7 @@ snapshot-create **Syntax:** -.. code-block:: +:: snapshot-create domain [xmlfile] {[--redefine [--current]] | [--no-metadata] [--halt] [--disk-only] [--reuse-external] @@ -6804,7 +6804,7 @@ snapshot-create-as **Syntax:** -.. code-block:: +:: snapshot-create-as domain {[--print-xml] [--no-metadata] [--halt] [--reuse-external]} [name] @@ -6843,7 +6843,7 @@ all three of *domain*, *name*, and *description* are also present. For example, a diskspec of "vda,snapshot=external,file=/path/to,,new" results in the following XML: -.. code-block:: +:: <disk name='vda' snapshot='external'> <source file='/path/to,new'/> @@ -6886,7 +6886,7 @@ snapshot-current **Syntax:** -.. code-block:: +:: snapshot-current domain {[--name] | [--security-info] | [snapshotname]} @@ -6905,7 +6905,7 @@ snapshot-edit **Syntax:** -.. code-block:: +:: snapshot-edit domain [snapshotname] [--current] {[--rename] | [--clone]} @@ -6917,7 +6917,7 @@ snapshot. This is equivalent to: -.. code-block:: +:: virsh snapshot-dumpxml dom name > snapshot.xml vi snapshot.xml (or make changes with your other text editor) @@ -6942,7 +6942,7 @@ snapshot-info **Syntax:** -.. code-block:: +:: snapshot-info domain {snapshot | --current} @@ -6955,7 +6955,7 @@ snapshot-list **Syntax:** -.. code-block:: +:: snapshot-list domain [--metadata] [--no-metadata] [{--parent | --roots | [{--tree | --name}]}] [--topological] @@ -7024,7 +7024,7 @@ snapshot-dumpxml **Syntax:** -.. code-block:: +:: snapshot-dumpxml domain snapshot [--security-info] @@ -7038,7 +7038,7 @@ snapshot-parent **Syntax:** -.. code-block:: +:: snapshot-parent domain {snapshot | --current} @@ -7051,7 +7051,7 @@ snapshot-revert **Syntax:** -.. code-block:: +:: snapshot-revert domain {snapshot | --current} [{--running | --paused}] [--force] @@ -7101,7 +7101,7 @@ snapshot-delete **Syntax:** -.. code-block:: +:: snapshot-delete domain {snapshot | --current} [--metadata] [{--children | --children-only}] @@ -7135,7 +7135,7 @@ checkpoint-create **Syntax:** -.. code-block:: +:: checkpoint-create domain [xmlfile] { --redefine | [--quiesce]} @@ -7174,7 +7174,7 @@ checkpoint-create-as **Syntax:** -.. code-block:: +:: checkpoint-create-as domain [--print-xml] [name] [description] [--quiesce] [--diskspec] diskspec]... @@ -7194,7 +7194,7 @@ all three of *domain*, *name*, and *description* are also present. For example, a diskspec of "vda,checkpoint=bitmap,bitmap=map1" results in the following XML: -.. code-block:: +:: <disk name='vda' checkpoint='bitmap' bitmap='map1'/> @@ -7212,7 +7212,7 @@ checkpoint-edit **Syntax:** -.. code-block:: +:: checkpoint-edit domain checkpointname @@ -7220,7 +7220,7 @@ Edit the XML configuration file for *checkpointname* of a domain. This is equivalent to: -.. code-block:: +:: virsh checkpoint-dumpxml dom name > checkpoint.xml vi checkpoint.xml (or make changes with your other text editor) @@ -7238,7 +7238,7 @@ checkpoint-info **Syntax:** -.. code-block:: +:: checkpoint-info domain checkpoint @@ -7250,7 +7250,7 @@ checkpoint-list **Syntax:** -.. code-block:: +:: checkpoint-list domain [{--parent | --roots | [{--tree | --name}]}] [--topological] @@ -7296,7 +7296,7 @@ checkpoint-dumpxml **Syntax:** -.. code-block:: +:: checkpoint-dumpxml domain checkpoint [--security-info] [--no-domain] [--size] @@ -7316,7 +7316,7 @@ checkpoint-parent **Syntax:** -.. code-block:: +:: checkpoint-parent domain checkpoint @@ -7328,7 +7328,7 @@ checkpoint-delete **Syntax:** -.. code-block:: +:: checkpoint-delete domain checkpoint [--metadata] [{--children | --children-only}] @@ -7365,7 +7365,7 @@ nwfilter-define **Syntax:** -.. code-block:: +:: nwfilter-define xmlfile @@ -7382,7 +7382,7 @@ nwfilter-undefine **Syntax:** -.. code-block:: +:: nwfilter-undefine nwfilter-name @@ -7395,7 +7395,7 @@ nwfilter-list **Syntax:** -.. code-block:: +:: nwfilter-list @@ -7407,7 +7407,7 @@ nwfilter-dumpxml **Syntax:** -.. code-block:: +:: nwfilter-dumpxml nwfilter-name @@ -7419,7 +7419,7 @@ nwfilter-edit **Syntax:** -.. code-block:: +:: nwfilter-edit nwfilter-name @@ -7427,7 +7427,7 @@ Edit the XML of a network filter. This is equivalent to: -.. code-block:: +:: virsh nwfilter-dumpxml myfilter > myfilter.xml vi myfilter.xml (or make changes with your other text editor) @@ -7458,7 +7458,7 @@ nwfilter-binding-create **Syntax:** -.. code-block:: +:: nwfilter-binding-create xmlfile @@ -7477,7 +7477,7 @@ nwfilter-binding-delete **Syntax:** -.. code-block:: +:: nwfilter-binding-delete port-name @@ -7495,7 +7495,7 @@ nwfilter-binding-list **Syntax:** -.. code-block:: +:: nwfilter-binding-list @@ -7507,7 +7507,7 @@ nwfilter-binding-dumpxml **Syntax:** -.. code-block:: +:: nwfilter-binding-dumpxml port-name @@ -7531,7 +7531,7 @@ qemu-attach **Syntax:** -.. code-block:: +:: qemu-attach pid @@ -7540,7 +7540,7 @@ The QEMU process must have been created with a monitor connection using the UNIX driver. Ideally the process will also have had the '-name' argument specified. -.. code-block:: +:: $ qemu-kvm -cdrom ~/demo.iso \ -monitor unix:/tmp/demo,server,nowait \ @@ -7561,7 +7561,7 @@ qemu-monitor-command **Syntax:** -.. code-block:: +:: qemu-monitor-command domain { [--hmp] | [--pretty] [--return-value] } command... @@ -7588,7 +7588,7 @@ qemu-agent-command **Syntax:** -.. code-block:: +:: qemu-agent-command domain [--timeout seconds | --async | --block] command... @@ -7606,7 +7606,7 @@ qemu-monitor-event **Syntax:** -.. code-block:: +:: qemu-monitor-event [domain] [--event event-name] [--loop] [--timeout seconds] [--pretty] [--regex] [--no-case] @@ -7637,7 +7637,7 @@ lxc-enter-namespace **Syntax:** -.. code-block:: +:: lxc-enter-namespace domain [--noseclabel] -- /path/to/binary [arg1, [arg2, ...]] diff --git a/docs/manpages/virt-admin.rst b/docs/manpages/virt-admin.rst index d5cb23a1c5..940a38bfce 100644 --- a/docs/manpages/virt-admin.rst +++ b/docs/manpages/virt-admin.rst @@ -28,7 +28,7 @@ as for monitoring and managing all clients connected to the daemon. The basic structure of most virt-admin usage is: -.. code-block:: +:: virt-admin [OPTION]... <command> [ARG]... @@ -107,7 +107,7 @@ help **Syntax:** -.. code-block:: +:: help [command-or-group] @@ -124,7 +124,7 @@ quit, exit **Syntax:** -.. code-block:: +:: quit exit @@ -136,7 +136,7 @@ version **Syntax:** -.. code-block:: +:: version @@ -146,7 +146,7 @@ the version of the daemon. **Example:** -.. code-block:: +:: $ virt-admin version Compiled against library: libvirt 1.2.21 @@ -160,7 +160,7 @@ cd **Syntax:** -.. code-block:: +:: cd [directory] @@ -175,7 +175,7 @@ pwd **Syntax:** -.. code-block:: +:: pwd @@ -187,7 +187,7 @@ connect **Syntax:** -.. code-block:: +:: connect [URI] @@ -206,7 +206,7 @@ uri **Syntax:** -.. code-block:: +:: uri @@ -230,7 +230,7 @@ server-list **Syntax:** -.. code-block:: +:: server-list @@ -243,7 +243,7 @@ daemon-log-filters **Syntax:** -.. code-block:: +:: daemon-log-filters [--filters string] @@ -264,7 +264,7 @@ space. Each filter must conform to the form described in detail by To define a filter which suppresses all e.g. 'virObjectUnref' DEBUG messages, use the following: -.. code-block:: +:: $ virt-admin daemon-log-filters "4:util.object" @@ -277,7 +277,7 @@ daemon-log-outouts **Syntax:** -.. code-block:: +:: daemon-log-outputs [--outputs string] @@ -298,13 +298,13 @@ space. Each output must conform to the form described in detail by To replace the current setting for logging outputs with one that writes to a file while logging errors only, the following could be used: -.. code-block:: +:: $ virt-admin daemon-log-outputs "4:file:<absolute_path_to_the_file>" To define multiple outputs at once they need to be delimited by spaces: -.. code-block:: +:: $ virt-admin daemon-log-outputs "4:stderr 2:syslog:<msg_ident>" @@ -320,7 +320,7 @@ server-threadpool-info **Syntax:** -.. code-block:: +:: server-threadpool-info server @@ -355,7 +355,7 @@ that, unlike tasks carried out by normal workers, are within libvirt's full control and libvirt guarantees that such a task cannot hang, thus will always finish. An example of such a task this would be destroying a domain: -.. code-block:: +:: $ virsh destroy <domain>. @@ -365,7 +365,7 @@ server-threadpool-set **Syntax:** -.. code-block:: +:: server-threadpool-set server [--min-workers count] [--max-workers count] [--priority-workers count] @@ -394,7 +394,7 @@ server-clients-info **Syntax:** -.. code-block:: +:: server-clients-info server @@ -407,7 +407,7 @@ runtime values, more specifically, the current number of clients connected to **Example:** -.. code-block:: +:: # virt-admin server-clients-info libvirtd nclients_max : 120 @@ -421,7 +421,7 @@ server-clients-set **Syntax:** -.. code-block:: +:: server-clients-set server [--max-clients count] [--max-unauth-clients count] @@ -447,7 +447,7 @@ server-update-tls **Syntax:** -.. code-block:: +:: server-update-tls server @@ -474,7 +474,7 @@ client-list **Syntax:** -.. code-block:: +:: client-list server @@ -488,7 +488,7 @@ client-info **Syntax:** -.. code-block:: +:: client-info server client @@ -504,7 +504,7 @@ enabled within daemon). **Examples:** -.. code-block:: +:: # virt-admin client-info libvirtd 1 id : 1 @@ -530,7 +530,7 @@ client-disconnect **Syntax:** -.. code-block:: +:: client-disconnect server client diff --git a/docs/manpages/virt-login-shell.rst b/docs/manpages/virt-login-shell.rst index 3833a3e912..bc0215294b 100644 --- a/docs/manpages/virt-login-shell.rst +++ b/docs/manpages/virt-login-shell.rst @@ -29,7 +29,7 @@ configured in ``/etc/libvirt/virt-login-shell.conf``. The basic structure of most ``virt-login-shell`` usage is: -.. code-block:: +:: virt-login-shell @@ -58,7 +58,7 @@ By default, ``virt-login-shell`` will execute the ``/bin/sh`` program for the user. You can modify this behaviour by defining the shell variable in ``/etc/libvirt/virt-login-shell.conf``. e.g. -.. code-block:: +:: shell = [ "/bin/bash" ] @@ -68,7 +68,7 @@ detect the shell from ``/etc/password`` inside the container. This should only be done if the container has a separate ``/etc`` directory from the host, otherwise it will end up recursively invoking ``virt-login-shell``. e.g. -.. code-block:: +:: auto_shell = 1 @@ -77,7 +77,7 @@ By default no users are allowed to use virt-login-shell, if you want to allow certain users to use virt-login-shell, you need to modify the allowed_users variable in /etc/libvirt/virt-login-shell.conf. e.g. -.. code-block:: +:: allowed_users = [ "tom", "dick", "harry" ] diff --git a/docs/manpages/virtlockd.rst b/docs/manpages/virtlockd.rst index ea37b25d05..8ca231d14f 100644 --- a/docs/manpages/virtlockd.rst +++ b/docs/manpages/virtlockd.rst @@ -120,14 +120,14 @@ EXAMPLES To retrieve the version of ``virtlockd``: -.. code-block:: +:: # virtlockd --version virtlockd (libvirt) 1.1.1 To start ``virtlockd``, instructing it to daemonize and create a PID file: -.. code-block:: +:: # virtlockd -d # ls -la @RUNSTATEDIR@/virtlockd.pid diff --git a/docs/manpages/virtlogd.rst b/docs/manpages/virtlogd.rst index edf8288230..4b749fe18e 100644 --- a/docs/manpages/virtlogd.rst +++ b/docs/manpages/virtlogd.rst @@ -121,14 +121,14 @@ EXAMPLES To retrieve the version of ``virtlogd``: -.. code-block:: +:: # virtlogd --version virtlogd (libvirt) 1.1.1 To start ``virtlogd``, instructing it to daemonize and create a PID file: -.. code-block:: +:: # virtlogd -d # ls -la @RUNSTATEDIR@/virtlogd.pid -- 2.26.2

2 1