[perl PATCH v2 0/3] gitlab: introduce CI coverage
by Daniel P. Berrangé
This series introduces CI jobs for the Perl binding, enabling the switch
over to use of Merge Requests with pre-merge build validation.
Daniel P. Berrangé (3):
gitlab: add CI jobs for validating build across platforms
gitlab: add a simple job that publishes the API docs as HTML
gitlab: add CONTRIBUTING.rst file to indicate use of merge requests
.gitlab-ci.yml | 173 +++++++++++++++++++++++++++
.gitpublish | 4 -
CONTRIBUTING.rst | 28 +++++
ci/README.rst | 14 +++
ci/libvirt-centos-7.Dockerfile | 97 +++++++++++++++
ci/libvirt-centos-8.Dockerfile | 68 +++++++++++
ci/libvirt-debian-10.Dockerfile | 68 +++++++++++
ci/libvirt-debian-9.Dockerfile | 71 +++++++++++
ci/libvirt-debian-sid.Dockerfile | 68 +++++++++++
ci/libvirt-fedora-31.Dockerfile | 66 ++++++++++
ci/libvirt-fedora-32.Dockerfile | 66 ++++++++++
ci/libvirt-fedora-rawhide.Dockerfile | 67 +++++++++++
ci/libvirt-opensuse-151.Dockerfile | 66 ++++++++++
ci/libvirt-ubuntu-1804.Dockerfile | 71 +++++++++++
ci/libvirt-ubuntu-2004.Dockerfile | 68 +++++++++++
ci/refresh | 22 ++++
16 files changed, 1013 insertions(+), 4 deletions(-)
delete mode 100644 .gitpublish
create mode 100644 CONTRIBUTING.rst
create mode 100644 ci/README.rst
create mode 100644 ci/libvirt-centos-7.Dockerfile
create mode 100644 ci/libvirt-centos-8.Dockerfile
create mode 100644 ci/libvirt-debian-10.Dockerfile
create mode 100644 ci/libvirt-debian-9.Dockerfile
create mode 100644 ci/libvirt-debian-sid.Dockerfile
create mode 100644 ci/libvirt-fedora-31.Dockerfile
create mode 100644 ci/libvirt-fedora-32.Dockerfile
create mode 100644 ci/libvirt-fedora-rawhide.Dockerfile
create mode 100644 ci/libvirt-opensuse-151.Dockerfile
create mode 100644 ci/libvirt-ubuntu-1804.Dockerfile
create mode 100644 ci/libvirt-ubuntu-2004.Dockerfile
create mode 100755 ci/refresh
--
2.26.2
5 years
[go PATCH 0/3] introduce GitLab CI jobs and merge requests
by Daniel P. Berrangé
This introduces GitLab CI jobs for the Go bindings and indicates that
contributors should submit merge requests.
Daniel P. Berrangé (3):
Fix tests on Ubuntu 18.04 / Debian 9 with missing screenshot file
gitlab: introduce CI jobs testing git master & distro libvirt
gitlab: add CONTRIBUTING.rst file to indicate use of merge requests
.gitlab-ci.yml | 168 +++++++++++++++++++++++++++
.gitpublish | 4 -
CONTRIBUTING.rst | 28 +++++
ci/README.rst | 12 ++
ci/libvirt-centos-7.Dockerfile | 84 ++++++++++++++
ci/libvirt-centos-8.Dockerfile | 62 ++++++++++
ci/libvirt-debian-10.Dockerfile | 54 +++++++++
ci/libvirt-debian-9.Dockerfile | 57 +++++++++
ci/libvirt-debian-sid.Dockerfile | 54 +++++++++
ci/libvirt-fedora-31.Dockerfile | 51 ++++++++
ci/libvirt-fedora-32.Dockerfile | 51 ++++++++
ci/libvirt-fedora-rawhide.Dockerfile | 52 +++++++++
ci/libvirt-opensuse-151.Dockerfile | 53 +++++++++
ci/libvirt-ubuntu-1804.Dockerfile | 57 +++++++++
ci/libvirt-ubuntu-2004.Dockerfile | 54 +++++++++
ci/refresh | 27 +++++
domain_test.go | 5 +
17 files changed, 869 insertions(+), 4 deletions(-)
delete mode 100644 .gitpublish
create mode 100644 CONTRIBUTING.rst
create mode 100644 ci/README.rst
create mode 100644 ci/libvirt-centos-7.Dockerfile
create mode 100644 ci/libvirt-centos-8.Dockerfile
create mode 100644 ci/libvirt-debian-10.Dockerfile
create mode 100644 ci/libvirt-debian-9.Dockerfile
create mode 100644 ci/libvirt-debian-sid.Dockerfile
create mode 100644 ci/libvirt-fedora-31.Dockerfile
create mode 100644 ci/libvirt-fedora-32.Dockerfile
create mode 100644 ci/libvirt-fedora-rawhide.Dockerfile
create mode 100644 ci/libvirt-opensuse-151.Dockerfile
create mode 100644 ci/libvirt-ubuntu-1804.Dockerfile
create mode 100644 ci/libvirt-ubuntu-2004.Dockerfile
create mode 100755 ci/refresh
--
2.26.2
5 years
[PATCH] conf: Add qemu_job_wait_time option
by MIKI Nobuhiro
The waiting time to acquire the lock times out, which leads to a segment fault.
In essence we should make improvements around locks, but as a workaround we
will change the timeout to allow the user to increase it.
This value was defined as 30 seconds, so use it as the default value.
The logs are as follows:
```
Timed out during operation: cannot acquire state change lock \
(held by monitor=remoteDispatchDomainCreateWithFlags)
libvirtd.service: main process exited, code=killed,status=11/SEGV
```
Signed-off-by: MIKI Nobuhiro <nmiki(a)yahoo-corp.jp>
---
docs/news.xml | 9 +++++++++
src/qemu/libvirtd_qemu.aug | 1 +
src/qemu/qemu.conf | 3 +++
src/qemu/qemu_conf.c | 3 +++
src/qemu/qemu_conf.h | 2 ++
src/qemu/qemu_domain.c | 7 ++-----
src/qemu/test_libvirtd_qemu.aug.in | 1 +
7 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/docs/news.xml b/docs/news.xml
index 80819ae..3755c49 100644
--- a/docs/news.xml
+++ b/docs/news.xml
@@ -119,6 +119,15 @@
Bounds Checking) and IBS (Indirect Branch Speculation).
</description>
</change>
+ <change>
+ <summary>
+ conf: Add job wait time setting to qemu.conf
+ </summary>
+ <description>
+ How many seconds the new job waits for the existing job to finish.
+ This only affects if you are using qemu as driver.
+ </description>
+ </change>
</section>
<section title="Improvements">
</section>
diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug
index 404498b..76c896e 100644
--- a/src/qemu/libvirtd_qemu.aug
+++ b/src/qemu/libvirtd_qemu.aug
@@ -97,6 +97,7 @@ module Libvirtd_qemu =
| bool_entry "dump_guest_core"
| str_entry "stdio_handler"
| int_entry "max_threads_per_process"
+ | int_entry "qemu_job_wait_time"
let device_entry = bool_entry "mac_filter"
| bool_entry "relaxed_acs_check"
diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf
index abdbf07..a05aaa5 100644
--- a/src/qemu/qemu.conf
+++ b/src/qemu/qemu.conf
@@ -612,6 +612,9 @@
#
#max_threads_per_process = 0
+# How many seconds the new job waits for the existing job to finish.
+#qemu_job_wait_time = 30
+
# If max_core is set to a non-zero integer, then QEMU will be
# permitted to create core dumps when it crashes, provided its
# RAM size is smaller than the limit set.
diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index c598240..34d29ec 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -272,6 +272,7 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged,
cfg->keepAliveInterval = 5;
cfg->keepAliveCount = 5;
cfg->seccompSandbox = -1;
+ cfg->qemuJobWaitTime = 30;
cfg->logTimestamp = true;
cfg->glusterDebugLevel = 4;
@@ -655,6 +656,8 @@ virQEMUDriverConfigLoadProcessEntry(virQEMUDriverConfigPtr cfg,
return -1;
if (virConfGetValueUInt(conf, "max_threads_per_process", &cfg->maxThreadsPerProc) < 0)
return -1;
+ if (virConfGetValueUInt(conf, "qemu_job_wait_time", &cfg->qemuJobWaitTime) < 0)
+ return -1;
if (virConfGetValueType(conf, "max_core") == VIR_CONF_STRING) {
if (virConfGetValueString(conf, "max_core", &corestr) < 0)
diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
index b9ef455..49dd7b6 100644
--- a/src/qemu/qemu_conf.h
+++ b/src/qemu/qemu_conf.h
@@ -218,6 +218,8 @@ struct _virQEMUDriverConfig {
gid_t swtpm_group;
char **capabilityfilters;
+
+ unsigned int qemuJobWaitTime;
};
G_DEFINE_AUTOPTR_CLEANUP_FUNC(virQEMUDriverConfig, virObjectUnref);
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index d63ec23..4badc0f 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -6212,9 +6212,6 @@ qemuDomainObjCanSetJob(qemuDomainObjPrivatePtr priv,
priv->job.agentActive == QEMU_AGENT_JOB_NONE));
}
-/* Give up waiting for mutex after 30 seconds */
-#define QEMU_JOB_WAIT_TIME (1000ull * 30)
-
/**
* qemuDomainObjBeginJobInternal:
* @driver: qemu driver
@@ -6225,7 +6222,7 @@ qemuDomainObjCanSetJob(qemuDomainObjPrivatePtr priv,
*
* Acquires job for a domain object which must be locked before
* calling. If there's already a job running waits up to
- * QEMU_JOB_WAIT_TIME after which the functions fails reporting
+ * cfg->qemuJobWaitTime after which the functions fails reporting
* an error unless @nowait is set.
*
* If @nowait is true this function tries to acquire job and if
@@ -6272,7 +6269,7 @@ qemuDomainObjBeginJobInternal(virQEMUDriverPtr driver,
return -1;
priv->jobs_queued++;
- then = now + QEMU_JOB_WAIT_TIME;
+ then = now + 1000ull * cfg->qemuJobWaitTime;
retry:
if ((!async && job != QEMU_JOB_DESTROY) &&
diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in
index 19da591..b2886df 100644
--- a/src/qemu/test_libvirtd_qemu.aug.in
+++ b/src/qemu/test_libvirtd_qemu.aug.in
@@ -76,6 +76,7 @@ module Test_libvirtd_qemu =
{ "max_processes" = "0" }
{ "max_files" = "0" }
{ "max_threads_per_process" = "0" }
+{ "qemu_job_wait_time" = "30" }
{ "max_core" = "unlimited" }
{ "dump_guest_core" = "1" }
{ "mac_filter" = "1" }
--
1.8.3.1
5 years
Release of libvirt-6.3.0
by Daniel Veillard
It's out, tagged in git and the signed sources tarball and rpm are
available from the usual place:
https://libvirt.org/sources/
I have also pushed the python bindings 6.3.0 release at their usual place
https://libvirt.org/sources/python/
Among the things to note is the revamp of the vbox support, deprecating old
5.x versions but adding new 6.x API to control the hypervisor.
New features:
- qemu: support disabling hotplug/unplug of PCIe devices
libvirt can now set the "hotplug" option for pcie-root-ports and
pcie-switch-downstream-ports, which can be used to disable
hotplug/unplug of devices from these ports (default behavior is for
these controllers to accept all hotplug/unplug attempts, but this is
often undesireable).
- vbox: added support for version 6.0 and 6.1 APIs
libvirt can now support use of the VirtualBox 6.0 and 6.1 APIs. This is
compile tested only, so we are looking for feedback from users on how
well it works in practice.
- xen: Add support for 'e820_host' hypervisor feature
e820_host is a Xen-specific option only available for PV guests. When
enabled it provides the guest with a virtual e820 memory map based on
the host one. It must be enabled to allow hotplugging PCI devices to PV
guests, particularly when memory ballooning is enabled.
- xen: Add support for 'passthrough' hypervisor feature
passthrough is a Xen-specific option new to Xen 4.13 that enables PCI
passthrough for guests. It must be enabled to allow hotplugging PCI
devices.
- qemu: support async IO mode 'io_uring'
Linux 5.1 introduces a fast and efficient async IO interface io_uring,
then qemu implements that in version 5.0. It could be used in file,
host device and host cdrom backend by io='io_uring' of disk XML.
- Lease time option included for network DHCP settings
Users can now configure expiry time for leases for networks where
libvirt manages DHCP. The time can be specified for whole range and/or
fine tuned per individual host.
- qemu: Implement pSeries Spectre mitigation features
Users can now setup the following capabilities of pSeries guests: CFPC
(Cache Flush on Privilege Change), SBBC (Speculation Barrier Bounds
Checking) and IBS (Indirect Branch Speculation).
Improvements:
- qemu: Allow checkpoint redefine for offline VMs
Skip the liveness and capability checks when redefining checkpoints as
we don't need QEMU interactions to update the metadata.
- daemons: Improve timeout handling
Daemons now support --timeout 0 which suppresses daemon killing after
given time of inactivity.
- qemu: Add support for 'multidevs' option
This option prevents misbehaviours on guest if a QEMU 9pfs export
contains multiple devices, due to the potential file ID collisions this
otherwise may cause.
Bug fixes:
- qemu: Various embed driver fixes
When using shared resources from embed driver (e.g. hugepages,
machined, etc.) libvirt now generates an unique handler that is not
conflicting with other embed drivers or system or session daemons.
- cpu: Distinguish Cascadelake-Server from Skylake-Server
Libvirt now properly detects Cascadelake-Server and Skylake-Server
processors which differ only in stepping.
- qemu: Fix domain restore from a block device
When using namespaces, libvirt was unable to restore a domain from a
block device because libvirt tried to relabel the device inside the
namespace while QEMU was given FD to the block device in the host.
- node_device_udev: Handle move events
Libvirt now handles move event which is emitted on a NIC rename.
- qemu: Fix capabilities probing with TCG
Libvirt no long assumes TCG is always available. It now detects whether
QEMU supports TCG and reports it accordingly.
Removed features:
- vbox: removed support for version 5.0 and 5.1 APIs
libvirt no longer supports use of VirtualBox 5.0 and 5.1 since these
versions reached their end of life on 2017/05 and 2018/04 respectively.
Thanks everybody for your help with this release,
stay safe, enjoy !
Daniel
--
Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/
veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/
http://veillard.com/ | virtualization library http://libvirt.org/
5 years
[libvirt-ocaml PATCH 0/2] Introduce GitLab CI and merge requests
by Daniel P. Berrangé
Add GitLab CI jobs for the build and basic test, along with use of
merge requests for contributions.
Daniel P. Berrangé (2):
gitlab: introduce CI jobs testing git master & distro libvirt
gitlab: add CONTRIBUTING.rst file to indicate use of merge requests
.gitlab-ci.yml | 172 +++++++++++++++++++++++++++
CONTRIBUTING.rst | 28 +++++
MANIFEST | 1 +
Makefile.in | 2 +-
ci/README.rst | 14 +++
ci/libvirt-centos-7.Dockerfile | 85 +++++++++++++
ci/libvirt-centos-8.Dockerfile | 63 ++++++++++
ci/libvirt-debian-10.Dockerfile | 55 +++++++++
ci/libvirt-debian-9.Dockerfile | 58 +++++++++
ci/libvirt-debian-sid.Dockerfile | 55 +++++++++
ci/libvirt-fedora-31.Dockerfile | 52 ++++++++
ci/libvirt-fedora-32.Dockerfile | 52 ++++++++
ci/libvirt-fedora-rawhide.Dockerfile | 53 +++++++++
ci/libvirt-opensuse-151.Dockerfile | 54 +++++++++
ci/libvirt-ubuntu-1804.Dockerfile | 58 +++++++++
ci/libvirt-ubuntu-2004.Dockerfile | 55 +++++++++
ci/refresh | 27 +++++
17 files changed, 883 insertions(+), 1 deletion(-)
create mode 100644 CONTRIBUTING.rst
create mode 100644 ci/README.rst
create mode 100644 ci/libvirt-centos-7.Dockerfile
create mode 100644 ci/libvirt-centos-8.Dockerfile
create mode 100644 ci/libvirt-debian-10.Dockerfile
create mode 100644 ci/libvirt-debian-9.Dockerfile
create mode 100644 ci/libvirt-debian-sid.Dockerfile
create mode 100644 ci/libvirt-fedora-31.Dockerfile
create mode 100644 ci/libvirt-fedora-32.Dockerfile
create mode 100644 ci/libvirt-fedora-rawhide.Dockerfile
create mode 100644 ci/libvirt-opensuse-151.Dockerfile
create mode 100644 ci/libvirt-ubuntu-1804.Dockerfile
create mode 100644 ci/libvirt-ubuntu-2004.Dockerfile
create mode 100755 ci/refresh
--
2.26.2
5 years
[libvirt-php 0/6] introduce GitLab CI and merge requests
by Daniel P. Berrangé
This series introduces use of GitLab CI and merge requests. In doing
so several current build problems are fixes.
Daniel P. Berrangé (6):
m4: ignore --php-binary if it doesn't exist
src: don't declare global variables in header files
tests: mark skipped tests with exit status 77
tests: skip test if not running on host with running libvirtd
gitlab: add CI jobs for validating build across platforms
gitlab: add CONTRIBUTING.rst file to indicate use of merge requests
.gitlab-ci.yml | 146 +++++++++++++++++++++++++++
.gitpublish | 4 -
CONTRIBUTING.rst | 28 +++++
ci/README.rst | 12 +++
ci/libvirt-centos-7.Dockerfile | 92 +++++++++++++++++
ci/libvirt-debian-10.Dockerfile | 64 ++++++++++++
ci/libvirt-debian-9.Dockerfile | 67 ++++++++++++
ci/libvirt-debian-sid.Dockerfile | 64 ++++++++++++
ci/libvirt-fedora-31.Dockerfile | 60 +++++++++++
ci/libvirt-fedora-32.Dockerfile | 60 +++++++++++
ci/libvirt-fedora-rawhide.Dockerfile | 61 +++++++++++
ci/libvirt-opensuse-151.Dockerfile | 62 ++++++++++++
ci/libvirt-ubuntu-1804.Dockerfile | 67 ++++++++++++
ci/libvirt-ubuntu-2004.Dockerfile | 64 ++++++++++++
ci/refresh | 22 ++++
m4/virt-php-extension.m4 | 2 +-
src/libvirt-connection.c | 2 +
src/libvirt-connection.h | 2 +-
src/libvirt-domain.c | 2 +
src/libvirt-domain.h | 2 +-
src/libvirt-network.c | 2 +
src/libvirt-network.h | 2 +-
src/libvirt-nodedev.c | 2 +
src/libvirt-nodedev.h | 2 +-
src/libvirt-nwfilter.c | 2 +
src/libvirt-nwfilter.h | 2 +-
src/libvirt-php.c | 2 +
src/libvirt-php.h | 2 +-
src/libvirt-snapshot.c | 2 +
src/libvirt-snapshot.h | 2 +-
src/libvirt-storage.c | 3 +
src/libvirt-storage.h | 4 +-
src/libvirt-stream.c | 2 +
src/libvirt-stream.h | 2 +-
tests/functions.phpt.in | 2 +-
tests/runtests.sh | 2 +-
tests/test-get-models.phpt | 4 +-
37 files changed, 903 insertions(+), 19 deletions(-)
delete mode 100644 .gitpublish
create mode 100644 CONTRIBUTING.rst
create mode 100644 ci/README.rst
create mode 100644 ci/libvirt-centos-7.Dockerfile
create mode 100644 ci/libvirt-debian-10.Dockerfile
create mode 100644 ci/libvirt-debian-9.Dockerfile
create mode 100644 ci/libvirt-debian-sid.Dockerfile
create mode 100644 ci/libvirt-fedora-31.Dockerfile
create mode 100644 ci/libvirt-fedora-32.Dockerfile
create mode 100644 ci/libvirt-fedora-rawhide.Dockerfile
create mode 100644 ci/libvirt-opensuse-151.Dockerfile
create mode 100644 ci/libvirt-ubuntu-1804.Dockerfile
create mode 100644 ci/libvirt-ubuntu-2004.Dockerfile
create mode 100755 ci/refresh
--
2.26.2
5 years
[libvirt-rust 0/2] Introduce GitLab CI and merge requests
by Daniel P. Berrangé
Add GitLab CI jobs for the build and basic test, along with use of
merge requests for contributions.
Daniel P. Berrangé (2):
gitlab: introduce GitLab CI job for build
gitlab: add CONTRIBUTING.rst file to indicate use of merge requests
.gitlab-ci.yml | 166 +++++++++++++++++++++++++++
.gitpublish | 5 -
CONTRIBUTING.rst | 28 +++++
ci/README.rst | 14 +++
ci/libvirt-centos-7.Dockerfile | 85 ++++++++++++++
ci/libvirt-centos-8.Dockerfile | 63 ++++++++++
ci/libvirt-debian-10.Dockerfile | 55 +++++++++
ci/libvirt-debian-9.Dockerfile | 58 ++++++++++
ci/libvirt-debian-sid.Dockerfile | 55 +++++++++
ci/libvirt-fedora-31.Dockerfile | 52 +++++++++
ci/libvirt-fedora-32.Dockerfile | 52 +++++++++
ci/libvirt-fedora-rawhide.Dockerfile | 53 +++++++++
ci/libvirt-opensuse-151.Dockerfile | 54 +++++++++
ci/libvirt-ubuntu-1804.Dockerfile | 58 ++++++++++
ci/libvirt-ubuntu-2004.Dockerfile | 55 +++++++++
ci/refresh | 27 +++++
16 files changed, 875 insertions(+), 5 deletions(-)
delete mode 100644 .gitpublish
create mode 100644 CONTRIBUTING.rst
create mode 100644 ci/README.rst
create mode 100644 ci/libvirt-centos-7.Dockerfile
create mode 100644 ci/libvirt-centos-8.Dockerfile
create mode 100644 ci/libvirt-debian-10.Dockerfile
create mode 100644 ci/libvirt-debian-9.Dockerfile
create mode 100644 ci/libvirt-debian-sid.Dockerfile
create mode 100644 ci/libvirt-fedora-31.Dockerfile
create mode 100644 ci/libvirt-fedora-32.Dockerfile
create mode 100644 ci/libvirt-fedora-rawhide.Dockerfile
create mode 100644 ci/libvirt-opensuse-151.Dockerfile
create mode 100644 ci/libvirt-ubuntu-1804.Dockerfile
create mode 100644 ci/libvirt-ubuntu-2004.Dockerfile
create mode 100755 ci/refresh
--
2.26.2
5 years
[libvirt PATCH] keycodemapdb: update submodule for win32 keycode fix
by Daniel P. Berrangé
Fix win32 keycode for VK_OEM_102
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
src/keycodemapdb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/keycodemapdb b/src/keycodemapdb
index 317d3eeb96..27acf0ef82 160000
--- a/src/keycodemapdb
+++ b/src/keycodemapdb
@@ -1 +1 @@
-Subproject commit 317d3eeb963a515e15a63fa356d8ebcda7041a51
+Subproject commit 27acf0ef828bf719b2053ba398b195829413dbdd
--
2.26.2
5 years
[PATCH v2] Improve blockpull man entry
by Sebastian Mitterle
1. Fix usage of bandwidth, base arguments.
2. Explain valid arguments for `base`.
3. Move explanation for `--keep-relative` to end considering it's
not a very frequent use case.
4. Add reference to documentation for relative paths in backing chains.
Signed-off-by: Sebastian Mitterle <smitterl(a)redhat.com>
---
docs/manpages/virsh.rst | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst
index dc404ddfe8..71bd968fab 100644
--- a/docs/manpages/virsh.rst
+++ b/docs/manpages/virsh.rst
@@ -1345,7 +1345,7 @@ blockpull
.. code-block::
- blockpull domain path [bandwidth] [--bytes] [base]
+ blockpull domain path [bandwidth [--bytes] [base]]
[--wait [--verbose] [--timeout seconds] [--async]]
[--keep-relative]
@@ -1356,6 +1356,12 @@ the new backing file and only the intermediate portion of the chain is
pulled. Once all requested data from the backing image chain has been
pulled, the disk no longer depends on that portion of the backing chain.
+*base* can be specified in two ways: either as indexed target name 'name[i]'
+where 'name' corresponds to the disk target name (<target dev='name'/>) and
+'i' corresponds to the 'index' of the '<backingStore>'; or as the file name
+of the backing file (<source file='name'/>).
+
+
By default, this command returns as soon as possible, and data for
the entire disk is pulled in the background; the progress of the
operation can be checked with ``blockjob``. However, if *--wait* is
@@ -1367,16 +1373,19 @@ is triggered, *--async* will return control to the user as fast as
possible, otherwise the command may continue to block a little while
longer until the job is done cleaning up.
-Using the *--keep-relative* flag will keep the backing chain names
-relative.
-
*path* specifies fully-qualified path of the disk; it corresponds
to a unique target name (<target dev='name'/>) or source file (<source
file='name'/>) for one of the disk devices attached to *domain* (see
also ``domblklist`` for listing these names).
+
*bandwidth* specifies copying bandwidth limit in MiB/s. For further information
on the *bandwidth* argument see the corresponding section for the ``blockjob``
-command.
+command. Using *--bytes* flag indicates the value in *bandwidth* is given in
+bytes.
+
+Using the *--keep-relative* flag will keep the backing chain names
+relative (details on `https://www.libvirt.org/kbase/backing_chains.html
+<https://www.libvirt.org/kbase/backing_chains.html>`__).
blockresize
--
2.25.2
5 years
