[PATCH v2 0/4] support for virtio packed virtqueues
by Bjoern Walk
QEMU recently (86044b24e) introduced packed virtqueues for virtio that
supposedly have better cache utilization and performance compared to the
default split queues. So here's a patch set that expose the virtio
parameter as a optional libvirt XML attribute to virtio-backed devices,
e.g.:
<interface type='user'>
<mac address='00:11:22:33:44:55'/>
<model type='virtio'/>
<driver packed='on'/>
</interface>
The default value if the attribute is omitted is still 'off' and regular
split virtqueues are used.
v1 -> v2:
* rebased on current master
* reworded documentation as suggested by Jason and Michael
Bjoern Walk (4):
qemu: capabilities: add 'packed' capability
conf: domain: support for virtio packed option
qemu: command: support for virtio packed option
docs: documentation for virtio packed option
docs/formatdomain.html.in | 10 ++++++
docs/schemas/domaincommon.rng | 5 +++
src/conf/domain_conf.c | 28 ++++++++++++++++
src/conf/domain_conf.h | 1 +
src/qemu/qemu_capabilities.c | 6 ++++
src/qemu/qemu_capabilities.h | 1 +
src/qemu/qemu_command.c | 10 ++++++
.../caps_4.2.0.aarch64.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.x86_64.xml | 1 +
tests/qemuxml2argvdata/virtio-options.args | 32 ++++++++++---------
tests/qemuxml2argvdata/virtio-options.xml | 26 +++++++--------
tests/qemuxml2argvtest.c | 3 +-
tests/qemuxml2xmltest.c | 3 +-
16 files changed, 100 insertions(+), 30 deletions(-)
--
2.24.1
4 years, 7 months
[libvirt-jenkins-ci PATCH v2 0/6] Introduce the new 'gitlab' flavor
by Erik Skultety
since v1:
- .bash_logout is removed from the user home environment (causes builds to fail
on Debian)
- gitlab-runner is now downloaded to and executed from user's bin/ directory
instead of using /usr/local/bin
- both RC and systemd service files now define the user explicitly that the init
system changes to when spawning the gitlab-runner service
- the gitlab flavour tasks file now relies on shell's 'creates' module argument
so that the agent registration is idempotent rather than touching the
dirs/files explicitly
- both gitlab URL and runner token are now files editable under
~/.config/lcitool
Both the config.toml improvement in terms of replacing the ~/.config/lcitool
files as discussed during the v1 review process as well as cloudinit usage is
planned for a separate respective series, so for now, we'll have to live with 2
new config files and cloud images will need to be built manually.
Erik Skultety (6):
guests: users: Discard the .bash_logout skeleton file
guests: users: Create a bin/ directory in the flavor user's home
guests: templates: Introduce a gitlab-runner systemd service template
guests: templates: Introduce a gitlab-runner RC init service template
guests: Introduce the new 'gitlab' flavor
guests: lcitool: Enable the new 'gitlab' flavor in the lcitool script
guests/lcitool | 50 ++++++++++++++++--
guests/playbooks/update/main.yml | 5 ++
guests/playbooks/update/tasks/gitlab.yml | 52 +++++++++++++++++++
guests/playbooks/update/tasks/users.yml | 10 +++-
.../update/templates/gitlab-runner.j2 | 31 +++++++++++
.../update/templates/gitlab-runner.service.j2 | 14 +++++
6 files changed, 156 insertions(+), 6 deletions(-)
create mode 100644 guests/playbooks/update/tasks/gitlab.yml
create mode 100644 guests/playbooks/update/templates/gitlab-runner.j2
create mode 100644 guests/playbooks/update/templates/gitlab-runner.service.j2
--
2.25.1
4 years, 7 months
[libvirt PATCH 00/39] Distinguish Cascadelake-Server from Skylake-Server
by Jiri Denemark
The signatures of these two CPU model differ only in stepping as both
report family 6 and model 85. Skylake-Server uses stepping 4 or less and
Cascadelake-Server uses stepping 5..7.
https://bugzilla.redhat.com/show_bug.cgi?id=1761678
Jiri Denemark (39):
cpu_x86: Drop noTSX hint for incompatible CPUs
cpu_x86: Use glib allocation for virCPU{,x86}Data
cpu_x86: Use glib allocation for virCPUx86Vendor
cpu_x86: Use glib allocation for virCPUx86Feature
cpu_x86: Use glib allocation for virCPUx86Model
cpu_x86: Use glib allocation for virCPUx86Map
cpu_x86: Use glib allocation in virCPUx86GetModels
cpu_x86: Use g_auto* in x86DataToCPU
cpu_x86: Use g_auto* in x86VendorParse
cpu_x86: Use g_auto* in x86FeatureParse
cpu_x86: Use g_auto* in x86ModelFromCPU
cpu_x86: Use g_auto* in x86ModelParse
cpu_x86: Use g_auto* in virCPUx86LoadMap
cpu_x86: Use g_auto* in virCPUx86DataParse
cpu_x86: Use g_auto* in x86Compute
cpu_x86: Use g_auto* in virCPUx86Compare
cpu_x86: Use g_auto* in x86Decode
cpu_x86: Use g_auto* in x86EncodePolicy
cpu_x86: Use g_auto* in x86Encode
cpu_x86: Use g_auto* in virCPUx86CheckFeature
cpu_x86: Use g_auto* in virCPUx86GetHost
cpu_x86: Use g_auto* in virCPUx86Baseline
cpu_x86: Use g_auto* in x86UpdateHostModel
cpu_x86: Use g_auto* in virCPUx86Update
cpu_x86: Use g_auto* in virCPUx86UpdateLive
cpu_x86: Use g_auto* in virCPUx86Translate
cpu_x86: Use g_auto* in virCPUx86ExpandFeatures
cpu_x86: Use g_auto* in virCPUx86CopyMigratable
cpu_x86: Move and rename x86ModelCopySignatures
cpu_x86: Move and rename x86ModelHasSignature
cpu_x86: Move and rename x86FormatSignatures
cpu_x86: Introduce virCPUx86SignaturesFree
cpu_x86: Introduce virCPUx86SignatureFromCPUID
cpu_x86: Replace 32b signatures in virCPUx86Model with a struct
cpu_x86: Don't check return value of x86ModelCopy
cpu_x86: Add support for stepping part of CPU signature
cputest: Add data for Intel(R) Xeon(R) Platinum 9242 CPU
cputest: Add data for Intel(R) Xeon(R) Gold 6130 CPU
cpu_map: Distinguish Cascadelake-Server from Skylake-Server
src/cpu/cpu_x86.c | 936 +++++------
src/cpu_map/x86_Cascadelake-Server-noTSX.xml | 2 +-
src/cpu_map/x86_Cascadelake-Server.xml | 2 +-
src/cpu_map/x86_Skylake-Server-IBRS.xml | 2 +-
src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml | 2 +-
src/cpu_map/x86_Skylake-Server.xml | 2 +-
tests/cputest.c | 2 +
.../x86_64-cpuid-Xeon-Gold-6130-disabled.xml | 7 +
.../x86_64-cpuid-Xeon-Gold-6130-enabled.xml | 9 +
.../x86_64-cpuid-Xeon-Gold-6130-guest.xml | 34 +
.../x86_64-cpuid-Xeon-Gold-6130-host.xml | 35 +
.../x86_64-cpuid-Xeon-Gold-6130-json.xml | 17 +
.../x86_64-cpuid-Xeon-Gold-6130.json | 1201 ++++++++++++++
.../x86_64-cpuid-Xeon-Gold-6130.sig | 4 +
.../x86_64-cpuid-Xeon-Gold-6130.xml | 54 +
...6_64-cpuid-Xeon-Platinum-9242-disabled.xml | 7 +
...86_64-cpuid-Xeon-Platinum-9242-enabled.xml | 10 +
.../x86_64-cpuid-Xeon-Platinum-9242-guest.xml | 38 +
.../x86_64-cpuid-Xeon-Platinum-9242-host.xml | 39 +
.../x86_64-cpuid-Xeon-Platinum-9242-json.xml | 21 +
.../x86_64-cpuid-Xeon-Platinum-9242.json | 1405 +++++++++++++++++
.../x86_64-cpuid-Xeon-Platinum-9242.sig | 4 +
.../x86_64-cpuid-Xeon-Platinum-9242.xml | 68 +
23 files changed, 3372 insertions(+), 529 deletions(-)
create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-disabled.xml
create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-enabled.xml
create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml
create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml
create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-json.xml
create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130.json
create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130.sig
create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130.xml
create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-disabled.xml
create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-enabled.xml
create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-guest.xml
create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml
create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml
create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242.json
create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242.sig
create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242.xml
--
2.26.0
4 years, 7 months
[libvirt] [PATCH v2 1/1] qemu: hide details of fake reboot
by Nikolay Shirokovskiy
If we use fake reboot then domain goes thru running->shutdown->running
state changes with shutdown state only for short period of time. At
least this is implementation details leaking into API. And also there is
one real case when this is not convinient. I'm doing a backup with the
help of temporary block snapshot (with the help of qemu's API which is
used in the newly created libvirt's backup API). If guest is shutdowned
I want to continue to backup so I don't kill the process and domain is
in shutdown state. Later when backup is finished I want to destroy qemu
process. So I check if it is in shutdowned state and destroy it if it
is. Now if instead of shutdown domain got fake reboot then I can destroy
process in the middle of fake reboot process.
After shutdown event we also get stop event and now as domain state is
running it will be transitioned to paused state and back to running
later. Though this is not critical for the described case I guess it is
better not to leak these details to user too. So let's leave domain in
running state on stop event if fake reboot is in process.
Reconnection code handles this patch without modification. It detects
that qemu is not running due to shutdown and then calls qemuProcessShutdownOrReboot
which reboots as fake reboot flag is set.
Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com>
---
Changes from v1[1]:
- rebase on current master
- add comments
- use special flag to check if we should go paused or not*
- add notes about reconnection to commit message
* Using just fake reboot flag is not reliable. What if ACPI shutdown is
ignored by guest? Reboot flag will remain set and now domain state
will remain running on plain pause.
[1] https://www.redhat.com/archives/libvir-list/2019-October/msg01827.html
src/qemu/qemu_domain.h | 1 +
src/qemu/qemu_process.c | 61 ++++++++++++++++++++++++-----------------
2 files changed, 37 insertions(+), 25 deletions(-)
diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index a32852047c..a39b9546ae 100644
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -319,6 +319,7 @@ struct _qemuDomainObjPrivate {
char *lockState;
bool fakeReboot;
+ bool pausedShutdown;
virTristateBool allowReboot;
int jobs_queued;
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 7e1db50e8f..3e5fe3b6de 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -505,6 +505,7 @@ qemuProcessFakeReboot(void *opaque)
qemuDomainObjEndJob(driver, vm);
cleanup:
+ priv->pausedShutdown = false;
if (ret == -1)
ignore_value(qemuProcessKill(vm, VIR_QEMU_PROCESS_KILL_FORCE));
virDomainObjEndAPI(&vm);
@@ -528,6 +529,7 @@ qemuProcessShutdownOrReboot(virQEMUDriverPtr driver,
vm) < 0) {
VIR_ERROR(_("Failed to create reboot thread, killing domain"));
ignore_value(qemuProcessKill(vm, VIR_QEMU_PROCESS_KILL_NOWAIT));
+ priv->pausedShutdown = false;
virObjectUnref(vm);
}
} else {
@@ -589,35 +591,41 @@ qemuProcessHandleShutdown(qemuMonitorPtr mon G_GNUC_UNUSED,
goto unlock;
}
- VIR_DEBUG("Transitioned guest %s to shutdown state",
- vm->def->name);
- virDomainObjSetState(vm,
- VIR_DOMAIN_SHUTDOWN,
- VIR_DOMAIN_SHUTDOWN_UNKNOWN);
+ /* In case of fake reboot qemu shutdown state is transient so don't
+ * change domain state nor send events. */
+ if (!priv->fakeReboot) {
+ VIR_DEBUG("Transitioned guest %s to shutdown state",
+ vm->def->name);
+ virDomainObjSetState(vm,
+ VIR_DOMAIN_SHUTDOWN,
+ VIR_DOMAIN_SHUTDOWN_UNKNOWN);
- switch (guest_initiated) {
- case VIR_TRISTATE_BOOL_YES:
- detail = VIR_DOMAIN_EVENT_SHUTDOWN_GUEST;
- break;
+ switch (guest_initiated) {
+ case VIR_TRISTATE_BOOL_YES:
+ detail = VIR_DOMAIN_EVENT_SHUTDOWN_GUEST;
+ break;
- case VIR_TRISTATE_BOOL_NO:
- detail = VIR_DOMAIN_EVENT_SHUTDOWN_HOST;
- break;
+ case VIR_TRISTATE_BOOL_NO:
+ detail = VIR_DOMAIN_EVENT_SHUTDOWN_HOST;
+ break;
- case VIR_TRISTATE_BOOL_ABSENT:
- case VIR_TRISTATE_BOOL_LAST:
- default:
- detail = VIR_DOMAIN_EVENT_SHUTDOWN_FINISHED;
- break;
- }
+ case VIR_TRISTATE_BOOL_ABSENT:
+ case VIR_TRISTATE_BOOL_LAST:
+ default:
+ detail = VIR_DOMAIN_EVENT_SHUTDOWN_FINISHED;
+ break;
+ }
- event = virDomainEventLifecycleNewFromObj(vm,
- VIR_DOMAIN_EVENT_SHUTDOWN,
- detail);
+ event = virDomainEventLifecycleNewFromObj(vm,
+ VIR_DOMAIN_EVENT_SHUTDOWN,
+ detail);
- if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) {
- VIR_WARN("Unable to save status on vm %s after state change",
- vm->def->name);
+ if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) {
+ VIR_WARN("Unable to save status on vm %s after state change",
+ vm->def->name);
+ }
+ } else {
+ priv->pausedShutdown = true;
}
if (priv->agent)
@@ -651,7 +659,10 @@ qemuProcessHandleStop(qemuMonitorPtr mon G_GNUC_UNUSED,
reason = priv->pausedReason;
priv->pausedReason = VIR_DOMAIN_PAUSED_UNKNOWN;
- if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_RUNNING) {
+ /* In case of fake reboot qemu paused state is transient so don't
+ * reveal it in domain state nor sent events */
+ if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_RUNNING &&
+ !priv->pausedShutdown) {
if (priv->job.asyncJob == QEMU_ASYNC_JOB_MIGRATION_OUT) {
if (priv->job.current->status == QEMU_DOMAIN_JOB_STATUS_POSTCOPY)
reason = VIR_DOMAIN_PAUSED_POSTCOPY;
--
2.23.0
4 years, 7 months
[PATCH] qemu: backup: Fix handling of backing store for backup target images
by Peter Krempa
We always tried to install backing store for the image even if it didn't
make sesne, e.g. for a full backup into a raw image. Additionally we
didn't record the backing file into the qcow2 metadata so the image
itself contained the diff of data but reading from it would be
incomplete as it depends on the backing image.
This patch fixes both issues by carefully installing the correct backing
file when appropriate and also recording it into the metadata when
creating the image.
https://bugzilla.redhat.com/show_bug.cgi?id=1813310
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_backup.c | 26 ++++++++++++++++++++++----
1 file changed, 22 insertions(+), 4 deletions(-)
diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c
index 9a056fa407..5d18720f53 100644
--- a/src/qemu/qemu_backup.c
+++ b/src/qemu/qemu_backup.c
@@ -105,6 +105,8 @@ struct qemuBackupDiskData {
virDomainDiskDefPtr domdisk;
qemuBlockJobDataPtr blockjob;
virStorageSourcePtr store;
+ virStorageSourcePtr terminator;
+ virStorageSourcePtr backingStore;
char *incrementalBitmap;
qemuBlockStorageSourceChainDataPtr crdata;
bool labelled;
@@ -146,6 +148,7 @@ qemuBackupDiskDataCleanupOne(virDomainObjPtr vm,
qemuBlockJobStartupFinalize(vm, dd->blockjob);
qemuBlockStorageSourceChainDataFree(dd->crdata);
+ virObjectUnref(dd->terminator);
}
@@ -295,6 +298,7 @@ qemuBackupDiskPrepareDataOne(virDomainObjPtr vm,
virDomainBackupDiskDefPtr backupdisk,
struct qemuBackupDiskData *dd,
virJSONValuePtr actions,
+ bool pull,
virDomainMomentDefPtr *incremental,
virHashTablePtr blockNamedNodeData,
virQEMUDriverConfigPtr cfg)
@@ -314,6 +318,19 @@ qemuBackupDiskPrepareDataOne(virDomainObjPtr vm,
if (!dd->store->format)
dd->store->format = VIR_STORAGE_FILE_QCOW2;
+ /* calculate backing store to use:
+ * push mode:
+ * full backups: no backing store
+ * incremental: original disk if format supports backing store
+ * pull mode:
+ * both: original disk
+ */
+ if (pull || (incremental && dd->store->format >= VIR_STORAGE_FILE_BACKING)) {
+ dd->backingStore = dd->domdisk->src;
+ } else {
+ dd->backingStore = dd->terminator = virStorageSourceNew();
+ }
+
if (qemuDomainStorageFileInit(priv->driver, vm, dd->store, dd->domdisk->src) < 0)
return -1;
@@ -337,7 +354,7 @@ qemuBackupDiskPrepareDataOne(virDomainObjPtr vm,
/* use original disk as backing to prevent opening the backing chain */
if (!(dd->crdata = qemuBuildStorageSourceChainAttachPrepareBlockdevTop(dd->store,
- dd->domdisk->src,
+ dd->backingStore,
priv->qemuCaps)))
return -1;
@@ -398,6 +415,7 @@ qemuBackupDiskPrepareData(virDomainObjPtr vm,
struct qemuBackupDiskData *disks = NULL;
ssize_t ndisks = 0;
size_t i;
+ bool pull = def->type == VIR_DOMAIN_BACKUP_TYPE_PULL;
disks = g_new0(struct qemuBackupDiskData, def->ndisks);
@@ -410,12 +428,12 @@ qemuBackupDiskPrepareData(virDomainObjPtr vm,
ndisks++;
- if (qemuBackupDiskPrepareDataOne(vm, backupdisk, dd, actions,
+ if (qemuBackupDiskPrepareDataOne(vm, backupdisk, dd, actions, pull,
incremental, blockNamedNodeData,
cfg) < 0)
goto error;
- if (def->type == VIR_DOMAIN_BACKUP_TYPE_PULL) {
+ if (pull) {
if (qemuBackupDiskPrepareDataOnePull(actions, dd) < 0)
goto error;
} else {
@@ -480,7 +498,7 @@ qemuBackupDiskPrepareOneStorage(virDomainObjPtr vm,
dd->store, dd->domdisk->src) < 0)
return -1;
- if (qemuBlockStorageSourceCreate(vm, dd->store, NULL, NULL,
+ if (qemuBlockStorageSourceCreate(vm, dd->store, dd->backingStore, NULL,
dd->crdata->srcdata[0],
QEMU_ASYNC_JOB_BACKUP) < 0)
return -1;
--
2.25.1
4 years, 7 months
[PATCH v2] qemu: capabilities: update qemu-4.2 capabilities for s390x
by Bjoern Walk
Update s390x capabilities for QEMU 4.2 with the actual GA version for
QEMU and on the latest z15 machine.
This picks up the new blockdev capability, so we need to refresh a bunch
of test cases as well.
Acked-by: Christian Borntraeger <borntraeger(a)de.ibm.com>
Reviewed-by: Peter Krempa <pkrempa(a)redhat.com>
Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com>
Signed-off-by: Bjoern Walk <bwalk(a)linux.ibm.com>
---
Replies are stripped, full patch here:
https://gitlab.com/bwalk/libvirt/-/commit/90d7b52567fdce4ad5158ff4e0863d0...
tests/domaincapsdata/qemu_4.2.0.s390x.xml | 47 +-
.../caps_4.2.0.s390x.replies | 3230 +++++++++--------
.../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 216 +-
...default-video-type-s390x.s390x-latest.args | 8 +-
.../disk-error-policy-s390x.s390x-latest.args | 30 +-
.../fs9p-ccw.s390x-latest.args | 7 +-
...othreads-virtio-scsi-ccw.s390x-latest.args | 14 +-
...t-cpu-kvm-ccw-virtio-4.2.s390x-latest.args | 8 +-
.../s390x-ccw-graphics.s390x-latest.args | 8 +-
.../s390x-ccw-headless.s390x-latest.args | 8 +-
.../vhost-vsock-ccw-auto.s390x-latest.args | 7 +-
.../vhost-vsock-ccw.s390x-latest.args | 7 +-
12 files changed, 1892 insertions(+), 1698 deletions(-)
diff --git a/tests/domaincapsdata/qemu_4.2.0.s390x.xml b/tests/domaincapsdata/qemu_4.2.0.s390x.xml
index fbb3905f..6b87e450 100644
--- a/tests/domaincapsdata/qemu_4.2.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_4.2.0.s390x.xml
@@ -27,9 +27,17 @@
<cpu>
<mode name='host-passthrough' supported='yes'/>
<mode name='host-model' supported='yes'>
- <model fallback='forbid'>z13.2-base</model>
+ <model fallback='forbid'>gen15a-base</model>
<feature policy='require' name='aen'/>
+ <feature policy='require' name='cmmnt'/>
+ <feature policy='require' name='vxpdeh'/>
<feature policy='require' name='aefsi'/>
+ <feature policy='require' name='csske'/>
+ <feature policy='require' name='mepoch'/>
+ <feature policy='require' name='msa9'/>
+ <feature policy='require' name='msa8'/>
+ <feature policy='require' name='msa7'/>
+ <feature policy='require' name='msa6'/>
<feature policy='require' name='msa5'/>
<feature policy='require' name='msa4'/>
<feature policy='require' name='msa3'/>
@@ -38,15 +46,26 @@
<feature policy='require' name='sthyi'/>
<feature policy='require' name='edat'/>
<feature policy='require' name='ri'/>
+ <feature policy='require' name='deflate'/>
<feature policy='require' name='edat2'/>
+ <feature policy='require' name='etoken'/>
<feature policy='require' name='vx'/>
<feature policy='require' name='ipter'/>
+ <feature policy='require' name='mepochptff'/>
<feature policy='require' name='ap'/>
+ <feature policy='require' name='vxeh'/>
+ <feature policy='require' name='vxpd'/>
<feature policy='require' name='esop'/>
+ <feature policy='require' name='msa9_pckmo'/>
+ <feature policy='require' name='vxeh2'/>
+ <feature policy='require' name='esort'/>
+ <feature policy='require' name='apqi'/>
<feature policy='require' name='apft'/>
+ <feature policy='require' name='iep'/>
<feature policy='require' name='apqci'/>
<feature policy='require' name='cte'/>
<feature policy='require' name='bpb'/>
+ <feature policy='require' name='gs'/>
<feature policy='require' name='ppa15'/>
<feature policy='require' name='zpci'/>
<feature policy='require' name='sea_esop2'/>
@@ -58,8 +77,8 @@
<model usable='yes'>z890.2-base</model>
<model usable='yes'>z9EC.2</model>
<model usable='yes'>z13.2</model>
- <model usable='yes'>z990.5-base</model>
<model usable='yes'>z9BC-base</model>
+ <model usable='yes'>z990.5-base</model>
<model usable='yes'>z890.2</model>
<model usable='yes'>z890</model>
<model usable='yes'>z9BC</model>
@@ -69,9 +88,9 @@
<model usable='yes'>z990.3</model>
<model usable='yes'>z13s-base</model>
<model usable='yes'>z9EC</model>
- <model usable='no'>gen15a</model>
- <model usable='no'>z14ZR1-base</model>
- <model usable='no'>z14.2-base</model>
+ <model usable='yes'>gen15a</model>
+ <model usable='yes'>z14ZR1-base</model>
+ <model usable='yes'>z14.2-base</model>
<model usable='yes'>z900.3-base</model>
<model usable='yes'>z13.2-base</model>
<model usable='yes'>z196.2-base</model>
@@ -86,18 +105,18 @@
<model usable='yes'>z10EC.2</model>
<model usable='yes'>z10EC-base</model>
<model usable='yes'>z900.3</model>
- <model usable='no'>z14ZR1</model>
+ <model usable='yes'>z14ZR1</model>
<model usable='yes'>z10BC</model>
<model usable='yes'>z10BC.2-base</model>
- <model usable='yes'>z9BC.2</model>
<model usable='yes'>z990.2</model>
+ <model usable='yes'>z9BC.2</model>
<model usable='yes'>z990</model>
- <model usable='no'>z14</model>
- <model usable='no'>gen15b-base</model>
+ <model usable='yes'>z14</model>
+ <model usable='yes'>gen15b-base</model>
<model usable='yes'>z990.4</model>
<model usable='yes'>max</model>
<model usable='yes'>z10EC.2-base</model>
- <model usable='no'>gen15a-base</model>
+ <model usable='yes'>gen15a-base</model>
<model usable='yes'>z800</model>
<model usable='yes'>zEC12.2</model>
<model usable='yes'>z10EC</model>
@@ -111,12 +130,12 @@
<model usable='yes'>z196-base</model>
<model usable='yes'>z9EC.2-base</model>
<model usable='yes'>z196.2</model>
- <model usable='no'>z14.2</model>
+ <model usable='yes'>z14.2</model>
<model usable='yes'>z990-base</model>
<model usable='yes'>z900.2</model>
<model usable='yes'>z890-base</model>
<model usable='yes'>z10EC.3</model>
- <model usable='no'>z14-base</model>
+ <model usable='yes'>z14-base</model>
<model usable='yes'>z990.4-base</model>
<model usable='yes'>z10EC.3-base</model>
<model usable='yes'>z10BC-base</model>
@@ -126,7 +145,7 @@
<model usable='yes'>zBC12</model>
<model usable='yes'>z890.3-base</model>
<model usable='yes'>z990.5</model>
- <model usable='no'>gen15b</model>
+ <model usable='yes'>gen15b</model>
<model usable='no'>qemu</model>
</mode>
</cpu>
@@ -198,7 +217,7 @@
<gic supported='no'/>
<vmcoreinfo supported='no'/>
<genid supported='no'/>
- <backingStoreInput supported='no'/>
+ <backingStoreInput supported='yes'/>
<backup supported='no'/>
<sev supported='no'/>
</features>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies
index be709b3c..82b60bf0 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies
@@ -17,11 +17,11 @@
[...]
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index 47894de6..ae52b0c9 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -8,12 +8,14 @@
<flag name='virtio-blk-pci.ioeventfd'/>
<flag name='virtio-blk-pci.event_idx'/>
<flag name='virtio-net-pci.event_idx'/>
+ <flag name='usb-redir'/>
<flag name='virtio-blk-pci.scsi'/>
<flag name='scsi-disk.channel'/>
<flag name='scsi-block'/>
<flag name='dump-guest-memory'/>
<flag name='virtio-scsi-pci'/>
<flag name='blockio'/>
+ <flag name='usb-redir.filter'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
@@ -49,6 +51,7 @@
<flag name='gic-version'/>
<flag name='incoming-defer'/>
<flag name='virtio-gpu'/>
+ <flag name='virtio-gpu.virgl'/>
<flag name='virtio-keyboard'/>
<flag name='virtio-mouse'/>
<flag name='virtio-tablet'/>
@@ -115,6 +118,7 @@
<flag name='chardev-fd-pass'/>
<flag name='egl-headless'/>
<flag name='vfio-pci.display'/>
+ <flag name='blockdev'/>
<flag name='vfio-ap'/>
<flag name='zpci'/>
<flag name='memory-backend-memfd'/>
@@ -134,20 +138,30 @@
<flag name='query-cpu-model-baseline'/>
<flag name='query-cpu-model-comparison'/>
<flag name='blockdev-file-dynamic-auto-read-only'/>
+ <flag name='savevm-monitor-nodes'/>
<flag name='drive-nvme'/>
<flag name='smp-dies'/>
<flag name='rng-builtin'/>
+ <flag name='virtio-net.failover'/>
<flag name='vhost-user-fs'/>
<flag name='storage.werror'/>
<flag name='fsdev.multidevs'/>
- <version>4001050</version>
+ <version>4002000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>39100242</microcodeVersion>
- <package>v4.1.0-1686-g419af24e7e-dirty</package>
+ <package>qemu-4.2.0-20200115.0.1e4aa2da.fc31</package>
<arch>s390x</arch>
- <hostCPU type='kvm' model='z13.2-base' migratability='no'>
+ <hostCPU type='kvm' model='gen15a-base' migratability='no'>
<property name='aen' type='boolean' value='true'/>
+ <property name='cmmnt' type='boolean' value='true'/>
+ <property name='vxpdeh' type='boolean' value='true'/>
<property name='aefsi' type='boolean' value='true'/>
+ <property name='csske' type='boolean' value='true'/>
+ <property name='mepoch' type='boolean' value='true'/>
+ <property name='msa9' type='boolean' value='true'/>
+ <property name='msa8' type='boolean' value='true'/>
+ <property name='msa7' type='boolean' value='true'/>
+ <property name='msa6' type='boolean' value='true'/>
<property name='msa5' type='boolean' value='true'/>
<property name='msa4' type='boolean' value='true'/>
<property name='msa3' type='boolean' value='true'/>
@@ -156,15 +170,26 @@
<property name='sthyi' type='boolean' value='true'/>
<property name='edat' type='boolean' value='true'/>
<property name='ri' type='boolean' value='true'/>
+ <property name='deflate' type='boolean' value='true'/>
<property name='edat2' type='boolean' value='true'/>
+ <property name='etoken' type='boolean' value='true'/>
<property name='vx' type='boolean' value='true'/>
<property name='ipter' type='boolean' value='true'/>
+ <property name='mepochptff' type='boolean' value='true'/>
<property name='ap' type='boolean' value='true'/>
+ <property name='vxeh' type='boolean' value='true'/>
+ <property name='vxpd' type='boolean' value='true'/>
<property name='esop' type='boolean' value='true'/>
+ <property name='msa9_pckmo' type='boolean' value='true'/>
+ <property name='vxeh2' type='boolean' value='true'/>
+ <property name='esort' type='boolean' value='true'/>
+ <property name='apqi' type='boolean' value='true'/>
<property name='apft' type='boolean' value='true'/>
+ <property name='iep' type='boolean' value='true'/>
<property name='apqci' type='boolean' value='true'/>
<property name='cte' type='boolean' value='true'/>
<property name='bpb' type='boolean' value='true'/>
+ <property name='gs' type='boolean' value='true'/>
<property name='ppa15' type='boolean' value='true'/>
<property name='zpci' type='boolean' value='true'/>
<property name='sea_esop2' type='boolean' value='true'/>
@@ -175,8 +200,8 @@
<cpu type='kvm' name='z890.2-base' typename='z890.2-base-s390x-cpu' usable='yes'/>
<cpu type='kvm' name='z9EC.2' typename='z9EC.2-s390x-cpu' usable='yes'/>
<cpu type='kvm' name='z13.2' typename='z13.2-s390x-cpu' usable='yes'/>
- <cpu type='kvm' name='z990.5-base' typename='z990.5-base-s390x-cpu' usable='yes'/>
<cpu type='kvm' name='z9BC-base' typename='z9BC-base-s390x-cpu' usable='yes'/>
+ <cpu type='kvm' name='z990.5-base' typename='z990.5-base-s390x-cpu' usable='yes'/>
<cpu type='kvm' name='z890.2' typename='z890.2-s390x-cpu' usable='yes'/>
<cpu type='kvm' name='z890' typename='z890-s390x-cpu' usable='yes'/>
<cpu type='kvm' name='z9BC' typename='z9BC-s390x-cpu' usable='yes'/>
@@ -187,46 +212,9 @@
<cpu type='kvm' name='z990.3' typename='z990.3-s390x-cpu' usable='yes'/>
<cpu type='kvm' name='z13s-base' typename='z13s-base-s390x-cpu' usable='yes'/>
<cpu type='kvm' name='z9EC' typename='z9EC-s390x-cpu' usable='yes'/>
- <cpu type='kvm' name='gen15a' typename='gen15a-s390x-cpu' usable='no'>
- <blocker name='etoken'/>
- <blocker name='vxpdeh'/>
- <blocker name='vxeh2'/>
- <blocker name='mepoch'/>
- <blocker name='vxeh'/>
- <blocker name='vxpd'/>
- <blocker name='gs'/>
- <blocker name='iep'/>
- <blocker name='minste3'/>
- <blocker name='tsi'/>
- <blocker name='sema'/>
- <blocker name='minste2'/>
- <blocker name='eec'/>
- <blocker name='opc'/>
- <blocker name='deflate'/>
- <blocker name='mepochptff'/>
- <blocker name='msa9_pckmo'/>
- <blocker name='msa9'/>
- <blocker name='msa8'/>
- <blocker name='msa7'/>
- <blocker name='msa6'/>
- <blocker name='type'/>
- </cpu>
- <cpu type='kvm' name='z14ZR1-base' typename='z14ZR1-base-s390x-cpu' usable='no'>
- <blocker name='tsi'/>
- <blocker name='sema'/>
- <blocker name='minste2'/>
- <blocker name='eec'/>
- <blocker name='opc'/>
- <blocker name='type'/>
- </cpu>
- <cpu type='kvm' name='z14.2-base' typename='z14.2-base-s390x-cpu' usable='no'>
- <blocker name='tsi'/>
- <blocker name='sema'/>
- <blocker name='minste2'/>
- <blocker name='eec'/>
- <blocker name='opc'/>
- <blocker name='type'/>
- </cpu>
+ <cpu type='kvm' name='gen15a' typename='gen15a-s390x-cpu' usable='yes'/>
+ <cpu type='kvm' name='z14ZR1-base' typename='z14ZR1-base-s390x-cpu' usable='yes'/>
+ <cpu type='kvm' name='z14.2-base' typename='z14.2-base-s390x-cpu' usable='yes'/>
<cpu type='kvm' name='z900.3-base' typename='z900.3-base-s390x-cpu' usable='yes'/>
<cpu type='kvm' name='z13.2-base' typename='z13.2-base-s390x-cpu' usable='yes'/>
<cpu type='kvm' name='z196.2-base' typename='z196.2-base-s390x-cpu' usable='yes'/>
@@ -241,66 +229,18 @@
<cpu type='kvm' name='z10EC.2' typename='z10EC.2-s390x-cpu' usable='yes'/>
<cpu type='kvm' name='z10EC-base' typename='z10EC-base-s390x-cpu' usable='yes'/>
<cpu type='kvm' name='z900.3' typename='z900.3-s390x-cpu' usable='yes'/>
- <cpu type='kvm' name='z14ZR1' typename='z14ZR1-s390x-cpu' usable='no'>
- <blocker name='mepoch'/>
- <blocker name='vxeh'/>
- <blocker name='vxpd'/>
- <blocker name='gs'/>
- <blocker name='iep'/>
- <blocker name='tsi'/>
- <blocker name='sema'/>
- <blocker name='minste2'/>
- <blocker name='eec'/>
- <blocker name='opc'/>
- <blocker name='mepochptff'/>
- <blocker name='msa8'/>
- <blocker name='msa7'/>
- <blocker name='msa6'/>
- <blocker name='type'/>
- </cpu>
+ <cpu type='kvm' name='z14ZR1' typename='z14ZR1-s390x-cpu' usable='yes'/>
<cpu type='kvm' name='z10BC' typename='z10BC-s390x-cpu' usable='yes'/>
<cpu type='kvm' name='z10BC.2-base' typename='z10BC.2-base-s390x-cpu' usable='yes'/>
- <cpu type='kvm' name='z9BC.2' typename='z9BC.2-s390x-cpu' usable='yes'/>
<cpu type='kvm' name='z990.2' typename='z990.2-s390x-cpu' usable='yes'/>
+ <cpu type='kvm' name='z9BC.2' typename='z9BC.2-s390x-cpu' usable='yes'/>
<cpu type='kvm' name='z990' typename='z990-s390x-cpu' usable='yes'/>
- <cpu type='kvm' name='z14' typename='z14-s390x-cpu' usable='no'>
- <blocker name='mepoch'/>
- <blocker name='vxeh'/>
- <blocker name='vxpd'/>
- <blocker name='gs'/>
- <blocker name='iep'/>
- <blocker name='tsi'/>
- <blocker name='sema'/>
- <blocker name='minste2'/>
- <blocker name='eec'/>
- <blocker name='opc'/>
- <blocker name='mepochptff'/>
- <blocker name='msa8'/>
- <blocker name='msa7'/>
- <blocker name='msa6'/>
- <blocker name='type'/>
- </cpu>
- <cpu type='kvm' name='gen15b-base' typename='gen15b-base-s390x-cpu' usable='no'>
- <blocker name='minste3'/>
- <blocker name='tsi'/>
- <blocker name='sema'/>
- <blocker name='minste2'/>
- <blocker name='eec'/>
- <blocker name='opc'/>
- <blocker name='type'/>
- </cpu>
+ <cpu type='kvm' name='z14' typename='z14-s390x-cpu' usable='yes'/>
+ <cpu type='kvm' name='gen15b-base' typename='gen15b-base-s390x-cpu' usable='yes'/>
<cpu type='kvm' name='z990.4' typename='z990.4-s390x-cpu' usable='yes'/>
<cpu type='kvm' name='max' typename='max-s390x-cpu' usable='yes'/>
<cpu type='kvm' name='z10EC.2-base' typename='z10EC.2-base-s390x-cpu' usable='yes'/>
- <cpu type='kvm' name='gen15a-base' typename='gen15a-base-s390x-cpu' usable='no'>
- <blocker name='minste3'/>
- <blocker name='tsi'/>
- <blocker name='sema'/>
- <blocker name='minste2'/>
- <blocker name='eec'/>
- <blocker name='opc'/>
- <blocker name='type'/>
- </cpu>
+ <cpu type='kvm' name='gen15a-base' typename='gen15a-base-s390x-cpu' usable='yes'/>
<cpu type='kvm' name='z800' typename='z800-s390x-cpu' usable='yes'/>
<cpu type='kvm' name='zEC12.2' typename='zEC12.2-s390x-cpu' usable='yes'/>
<cpu type='kvm' name='z10EC' typename='z10EC-s390x-cpu' usable='yes'/>
@@ -314,35 +254,12 @@
<cpu type='kvm' name='z196-base' typename='z196-base-s390x-cpu' usable='yes'/>
<cpu type='kvm' name='z9EC.2-base' typename='z9EC.2-base-s390x-cpu' usable='yes'/>
<cpu type='kvm' name='z196.2' typename='z196.2-s390x-cpu' usable='yes'/>
- <cpu type='kvm' name='z14.2' typename='z14.2-s390x-cpu' usable='no'>
- <blocker name='mepoch'/>
- <blocker name='vxeh'/>
- <blocker name='vxpd'/>
- <blocker name='gs'/>
- <blocker name='iep'/>
- <blocker name='tsi'/>
- <blocker name='sema'/>
- <blocker name='minste2'/>
- <blocker name='eec'/>
- <blocker name='opc'/>
- <blocker name='mepochptff'/>
- <blocker name='msa8'/>
- <blocker name='msa7'/>
- <blocker name='msa6'/>
- <blocker name='type'/>
- </cpu>
+ <cpu type='kvm' name='z14.2' typename='z14.2-s390x-cpu' usable='yes'/>
<cpu type='kvm' name='z990-base' typename='z990-base-s390x-cpu' usable='yes'/>
<cpu type='kvm' name='z900.2' typename='z900.2-s390x-cpu' usable='yes'/>
<cpu type='kvm' name='z890-base' typename='z890-base-s390x-cpu' usable='yes'/>
<cpu type='kvm' name='z10EC.3' typename='z10EC.3-s390x-cpu' usable='yes'/>
- <cpu type='kvm' name='z14-base' typename='z14-base-s390x-cpu' usable='no'>
- <blocker name='tsi'/>
- <blocker name='sema'/>
- <blocker name='minste2'/>
- <blocker name='eec'/>
- <blocker name='opc'/>
- <blocker name='type'/>
- </cpu>
+ <cpu type='kvm' name='z14-base' typename='z14-base-s390x-cpu' usable='yes'/>
<cpu type='kvm' name='z990.4-base' typename='z990.4-base-s390x-cpu' usable='yes'/>
<cpu type='kvm' name='z10EC.3-base' typename='z10EC.3-base-s390x-cpu' usable='yes'/>
<cpu type='kvm' name='z10BC-base' typename='z10BC-base-s390x-cpu' usable='yes'/>
@@ -352,30 +269,7 @@
<cpu type='kvm' name='zBC12' typename='zBC12-s390x-cpu' usable='yes'/>
<cpu type='kvm' name='z890.3-base' typename='z890.3-base-s390x-cpu' usable='yes'/>
<cpu type='kvm' name='z990.5' typename='z990.5-s390x-cpu' usable='yes'/>
- <cpu type='kvm' name='gen15b' typename='gen15b-s390x-cpu' usable='no'>
- <blocker name='etoken'/>
- <blocker name='vxpdeh'/>
- <blocker name='vxeh2'/>
- <blocker name='mepoch'/>
- <blocker name='vxeh'/>
- <blocker name='vxpd'/>
- <blocker name='gs'/>
- <blocker name='iep'/>
- <blocker name='minste3'/>
- <blocker name='tsi'/>
- <blocker name='sema'/>
- <blocker name='minste2'/>
- <blocker name='eec'/>
- <blocker name='opc'/>
- <blocker name='deflate'/>
- <blocker name='mepochptff'/>
- <blocker name='msa9_pckmo'/>
- <blocker name='msa9'/>
- <blocker name='msa8'/>
- <blocker name='msa7'/>
- <blocker name='msa6'/>
- <blocker name='type'/>
- </cpu>
+ <cpu type='kvm' name='gen15b' typename='gen15b-s390x-cpu' usable='yes'/>
<cpu type='kvm' name='qemu' typename='qemu-s390x-cpu' usable='no'>
<blocker name='ais'/>
</cpu>
@@ -595,7 +489,7 @@
<blocker name='gen13ptff'/>
<blocker name='tods'/>
</cpu>
- <cpu type='tcg' name='z990.5-base' typename='z990.5-base-s390x-cpu' usable='no'>
+ <cpu type='tcg' name='z9BC-base' typename='z9BC-base-s390x-cpu' usable='no'>
<blocker name='klmd-sha-1'/>
<blocker name='kimd-sha-1'/>
<blocker name='km-tdea-192'/>
@@ -607,9 +501,13 @@
<blocker name='kmac-tdea-192'/>
<blocker name='kmac-tdea-128'/>
<blocker name='kmac-dea'/>
+ <blocker name='dateh2'/>
+ <blocker name='hfpue'/>
<blocker name='hfpm'/>
+ <blocker name='asnlxr'/>
+ <blocker name='tods'/>
</cpu>
- <cpu type='tcg' name='z9BC-base' typename='z9BC-base-s390x-cpu' usable='no'>
+ <cpu type='tcg' name='z990.5-base' typename='z990.5-base-s390x-cpu' usable='no'>
<blocker name='klmd-sha-1'/>
<blocker name='kimd-sha-1'/>
<blocker name='km-tdea-192'/>
@@ -621,11 +519,7 @@
<blocker name='kmac-tdea-192'/>
<blocker name='kmac-tdea-128'/>
<blocker name='kmac-dea'/>
- <blocker name='dateh2'/>
- <blocker name='hfpue'/>
<blocker name='hfpm'/>
- <blocker name='asnlxr'/>
- <blocker name='tods'/>
</cpu>
<cpu type='tcg' name='z890.2' typename='z890.2-s390x-cpu' usable='no'>
<blocker name='klmd-sha-1'/>
@@ -1869,7 +1763,7 @@
<blocker name='asnlxr'/>
<blocker name='tods'/>
</cpu>
- <cpu type='tcg' name='z9BC.2' typename='z9BC.2-s390x-cpu' usable='no'>
+ <cpu type='tcg' name='z990.2' typename='z990.2-s390x-cpu' usable='no'>
<blocker name='klmd-sha-1'/>
<blocker name='kimd-sha-1'/>
<blocker name='km-tdea-192'/>
@@ -1881,16 +1775,9 @@
<blocker name='kmac-tdea-192'/>
<blocker name='kmac-tdea-128'/>
<blocker name='kmac-dea'/>
- <blocker name='cmm'/>
- <blocker name='dateh2'/>
- <blocker name='sthyi'/>
- <blocker name='hfpue'/>
<blocker name='hfpm'/>
- <blocker name='asnlxr'/>
- <blocker name='msa1'/>
- <blocker name='tods'/>
</cpu>
- <cpu type='tcg' name='z990.2' typename='z990.2-s390x-cpu' usable='no'>
+ <cpu type='tcg' name='z9BC.2' typename='z9BC.2-s390x-cpu' usable='no'>
<blocker name='klmd-sha-1'/>
<blocker name='kimd-sha-1'/>
<blocker name='km-tdea-192'/>
@@ -1902,7 +1789,14 @@
<blocker name='kmac-tdea-192'/>
<blocker name='kmac-tdea-128'/>
<blocker name='kmac-dea'/>
+ <blocker name='cmm'/>
+ <blocker name='dateh2'/>
+ <blocker name='sthyi'/>
+ <blocker name='hfpue'/>
<blocker name='hfpm'/>
+ <blocker name='asnlxr'/>
+ <blocker name='msa1'/>
+ <blocker name='tods'/>
</cpu>
<cpu type='tcg' name='z990' typename='z990-s390x-cpu' usable='no'>
<blocker name='klmd-sha-1'/>
diff --git a/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args b/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args
index 934c5d59..47818085 100644
--- a/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args
+++ b/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args
@@ -13,9 +13,11 @@ QEMU_AUDIO_DRV=none \
-object secret,id=masterKey0,format=raw,\
file=/tmp/lib/domain--1-default-video-type-s/master-key.aes \
-machine s390-ccw-virtio,accel=kvm,usb=off,dump-guest-core=off \
--cpu z13.2-base,aen=on,aefsi=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,\
-sthyi=on,edat=on,ri=on,edat2=on,vx=on,ipter=on,ap=on,esop=on,apft=on,apqci=on,\
-cte=on,bpb=on,ppa15=on,zpci=on,sea_esop2=on,te=on,cmm=on \
+-cpu gen15a-base,aen=on,cmmnt=on,vxpdeh=on,aefsi=on,csske=on,mepoch=on,msa9=on,\
+msa8=on,msa7=on,msa6=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,sthyi=on,\
+edat=on,ri=on,deflate=on,edat2=on,etoken=on,vx=on,ipter=on,mepochptff=on,ap=on,\
+vxeh=on,vxpd=on,esop=on,msa9_pckmo=on,vxeh2=on,esort=on,apqi=on,apft=on,iep=on,\
+apqci=on,cte=on,bpb=on,gs=on,ppa15=on,zpci=on,sea_esop2=on,te=on,cmm=on \
-m 1024 \
-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
diff --git a/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args
index 0d9254e1..414ffdba 100644
--- a/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args
+++ b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args
@@ -26,17 +26,29 @@ file=/tmp/lib/domain--1-guest/master-key.aes \
-rtc base=utc \
-no-shutdown \
-boot strict=on \
--drive file=/var/images/image1,format=qcow2,if=none,id=drive-virtio-disk0,\
-cache=none \
--device virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=drive-virtio-disk0,\
+-blockdev '{"driver":"file","filename":"/var/images/image1",\
+"node-name":"libvirt-3-storage","cache":{"direct":true,"no-flush":false},\
+"auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-3-format","read-only":false,\
+"cache":{"direct":true,"no-flush":false},"driver":"qcow2",\
+"file":"libvirt-3-storage"}' \
+-device virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=libvirt-3-format,\
id=virtio-disk0,bootindex=1,write-cache=on,werror=stop,rerror=stop \
--drive file=/var/images/image2,format=qcow2,if=none,id=drive-virtio-disk1,\
-cache=none \
--device virtio-blk-ccw,scsi=off,devno=fe.0.0001,drive=drive-virtio-disk1,\
+-blockdev '{"driver":"file","filename":"/var/images/image2",\
+"node-name":"libvirt-2-storage","cache":{"direct":true,"no-flush":false},\
+"auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-2-format","read-only":false,\
+"cache":{"direct":true,"no-flush":false},"driver":"qcow2",\
+"file":"libvirt-2-storage"}' \
+-device virtio-blk-ccw,scsi=off,devno=fe.0.0001,drive=libvirt-2-format,\
id=virtio-disk1,write-cache=on,werror=enospc \
--drive file=/var/images/image3,format=qcow2,if=none,id=drive-virtio-disk2,\
-cache=none \
--device virtio-blk-ccw,scsi=off,devno=fe.0.0002,drive=drive-virtio-disk2,\
+-blockdev '{"driver":"file","filename":"/var/images/image3",\
+"node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},\
+"auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":false,\
+"cache":{"direct":true,"no-flush":false},"driver":"qcow2",\
+"file":"libvirt-1-storage"}' \
+-device virtio-blk-ccw,scsi=off,devno=fe.0.0002,drive=libvirt-1-format,\
id=virtio-disk2,write-cache=on,werror=report,rerror=ignore \
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
resourcecontrol=deny \
diff --git a/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args b/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args
index 4a93ee37..50d4bc42 100644
--- a/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args
+++ b/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args
@@ -26,8 +26,11 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-rtc base=utc \
-no-shutdown \
-boot strict=on \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
--device virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=drive-virtio-disk0,\
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1",\
+"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw",\
+"file":"libvirt-1-storage"}' \
+-device virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=libvirt-1-format,\
id=virtio-disk0,bootindex=1 \
-fsdev local,security_model=passthrough,id=fsdev-fs0,path=/export/to/guest \
-device virtio-9p-ccw,id=fs0,fsdev=fsdev-fs0,mount_tag=/import/from/host,\
diff --git a/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args b/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args
index bdc060aa..20288f2a 100644
--- a/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args
+++ b/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args
@@ -29,12 +29,18 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-no-shutdown \
-boot strict=on \
-device virtio-scsi-ccw,iothread=iothread2,id=scsi0,devno=fe.0.0001 \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1",\
+"node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw",\
+"file":"libvirt-2-storage"}' \
-device virtio-blk-ccw,iothread=iothread1,scsi=off,devno=fe.0.0000,\
-drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
--drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-scsi0-0-2-0 \
+drive=libvirt-2-format,id=virtio-disk0,bootindex=1 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2",\
+"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw",\
+"file":"libvirt-1-storage"}' \
-device scsi-hd,bus=scsi0.0,channel=0,scsi-id=2,lun=0,\
-device_id=drive-scsi0-0-2-0,drive=drive-scsi0-0-2-0,id=scsi0-0-2-0 \
+device_id=drive-scsi0-0-2-0,drive=libvirt-1-format,id=scsi0-0-2-0 \
-device virtio-balloon-ccw,id=balloon0,devno=fe.0.000a \
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
resourcecontrol=deny \
diff --git a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args b/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args
index 03860194..35093d4f 100644
--- a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args
+++ b/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args
@@ -13,9 +13,11 @@ QEMU_AUDIO_DRV=none \
-object secret,id=masterKey0,format=raw,\
file=/tmp/lib/domain--1-test/master-key.aes \
-machine s390-ccw-virtio-4.2,accel=kvm,usb=off,dump-guest-core=off \
--cpu z13.2-base,aen=on,aefsi=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,\
-sthyi=on,edat=on,ri=on,edat2=on,vx=on,ipter=on,ap=on,esop=on,apft=on,apqci=on,\
-cte=on,bpb=on,ppa15=on,zpci=on,sea_esop2=on,te=on,cmm=on \
+-cpu gen15a-base,aen=on,cmmnt=on,vxpdeh=on,aefsi=on,csske=on,mepoch=on,msa9=on,\
+msa8=on,msa7=on,msa6=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,sthyi=on,\
+edat=on,ri=on,deflate=on,edat2=on,etoken=on,vx=on,ipter=on,mepochptff=on,ap=on,\
+vxeh=on,vxpd=on,esop=on,msa9_pckmo=on,vxeh2=on,esort=on,apqi=on,apft=on,iep=on,\
+apqci=on,cte=on,bpb=on,gs=on,ppa15=on,zpci=on,sea_esop2=on,te=on,cmm=on \
-m 256 \
-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
diff --git a/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args b/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args
index 8f72b20b..5850b265 100644
--- a/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args
+++ b/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args
@@ -26,9 +26,11 @@ file=/tmp/lib/domain--1-guest/master-key.aes \
-no-shutdown \
-boot strict=on \
-device virtio-serial-ccw,id=virtio-serial0,devno=fe.0.0003 \
--drive file=/var/lib/libvirt/images/guest.qcow2,format=qcow2,if=none,\
-id=drive-virtio-disk0 \
--device virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=drive-virtio-disk0,\
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.qcow2",\
+"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2",\
+"file":"libvirt-1-storage"}' \
+-device virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=libvirt-1-format,\
id=virtio-disk0,bootindex=1 \
-netdev user,id=hostnet0 \
-device virtio-net-ccw,netdev=hostnet0,id=net0,mac=52:54:00:09:1a:29,\
diff --git a/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args b/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args
index 95caf9e9..211cc24b 100644
--- a/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args
+++ b/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args
@@ -27,9 +27,11 @@ file=/tmp/lib/domain--1-guest/master-key.aes \
-no-shutdown \
-boot strict=on \
-device virtio-serial-ccw,id=virtio-serial0,devno=fe.0.0002 \
--drive file=/var/lib/libvirt/images/guest.qcow2,format=qcow2,if=none,\
-id=drive-virtio-disk0 \
--device virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=drive-virtio-disk0,\
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.qcow2",\
+"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2",\
+"file":"libvirt-1-storage"}' \
+-device virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=libvirt-1-format,\
id=virtio-disk0,bootindex=1 \
-netdev user,id=hostnet0 \
-device virtio-net-ccw,netdev=hostnet0,id=net0,mac=52:54:00:09:a4:37,\
diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args b/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args
index 17b5ded6..4c5542d8 100644
--- a/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args
+++ b/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args
@@ -26,8 +26,11 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-rtc base=utc \
-no-shutdown \
-boot strict=on \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
--device virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=drive-virtio-disk0,\
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1",\
+"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw",\
+"file":"libvirt-1-storage"}' \
+-device virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=libvirt-1-format,\
id=virtio-disk0,bootindex=1 \
-device virtio-balloon-ccw,id=balloon0,devno=fe.0.0001 \
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args b/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args
index 81a6b8cb..de229bd0 100644
--- a/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args
+++ b/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args
@@ -26,8 +26,11 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-rtc base=utc \
-no-shutdown \
-boot strict=on \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
--device virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=drive-virtio-disk0,\
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1",\
+"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw",\
+"file":"libvirt-1-storage"}' \
+-device virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=libvirt-1-format,\
id=virtio-disk0,bootindex=1 \
-device virtio-balloon-ccw,id=balloon0,devno=fe.0.0001 \
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
--
2.24.1
4 years, 7 months
[PATCH v2] util: virdaemon: fix waiting for child processes
by Rafael Fonseca
Unlike `waitpid`, `virProcessWait` only returns -1 (error) or 0
(success), so comparing that to `pid` will always be false and the
parent will report failure with:
error : main:851 : Failed to fork as daemon: No such file or directory
even though the grandchild process is succesfully running. Note that the
errno message is misleading: it was last set when trying to find a
restart state file.
Signed-off-by: Rafael Fonseca <r4f4rfs(a)gmail.com>
Reported-by: Marcin Krol <hawk(a)tld-linux.org>
---
src/util/virdaemon.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/util/virdaemon.c b/src/util/virdaemon.c
index 5d92c7def7..99530fd146 100644
--- a/src/util/virdaemon.c
+++ b/src/util/virdaemon.c
@@ -97,15 +97,14 @@ virDaemonForkIntoBackground(const char *argv0)
default:
{
/* parent */
- int got, exitstatus = 0;
+ int exitstatus = 0;
int ret;
char status;
VIR_FORCE_CLOSE(statuspipe[1]);
/* We wait to make sure the first child forked successfully */
- if ((got = virProcessWait(pid, &exitstatus, 0)) < 0 ||
- got != pid ||
+ if (virProcessWait(pid, &exitstatus, 0) < 0 ||
exitstatus != 0) {
goto error;
}
--
2.25.2
4 years, 7 months
[libvirt PATCH 00/10] Disable hotplug on pcie-root-ports
by Laine Stump
This series enables use of QEMU 5.0's new "hotplug=off" setting for
pcie-root-ports and pcie-switch-downstream-ports. When set (in the
<target> subelement of the <controller> config), the emulated
controller will report to the guest OS that devices cannot be
hotplugged into or, maybe more importantly, out of the port. The
result is that when a device is plugged into such a port at boot time,
"certain guest OSes" won't show a menu to all users listing all PCIe
devices as available to "Safely Remove".
I had to hand-edit several capabilities results files in patch 1,
since the pcie-root-port device has been present in QEMU for a long
time, but we previously had not been gathering the list of options for
that device. If someone has a setup to regenerate *actual* results for
all those versions of QEMU, I would be very appreciative and gladly
use that instead (Hi Kyle Two!)
NB: the last 3 patches are each trivial, and I'd be happy to squash
them, but had already committed them separately, and thought it helped
in explaining.
This resolves https://bugzilla.redhat.com/1802592
Laine Stump (10):
qemu: new capabilities flag pcie-root-port.hotplug
conf: new attribute "hotplug" for pci controllers
qemu: hook up pcie-root-port hotplug='off' option
docs: mention hotplug='off' in news.xml
conf: add new PCI_CONNECT flag AUTOASSIGN
conf/qemu: s/VIR_PCI_CONNECT_HOTPLUGGABLE/VIR_PCI_CONNECT_AUTOASSIGN/g
conf: simplify logic when checking for AUTOASSIGN PCI addresses
qemu/conf: set HOTPLUGGABLE connect flag during PCI address set init
conf: check HOTPLUGGABLE connect flag when validating a PCI address
conf: during PCI hotplug, require that the controller support hotplug
docs/formatdomain.html.in | 11 ++
docs/news.xml | 12 ++
docs/schemas/domaincommon.rng | 5 +
src/conf/domain_addr.c | 85 ++++----
src/conf/domain_addr.h | 44 +++--
src/conf/domain_conf.c | 20 +-
src/conf/domain_conf.h | 1 +
src/qemu/qemu_capabilities.c | 8 +
src/qemu/qemu_capabilities.h | 1 +
src/qemu/qemu_command.c | 4 +
src/qemu/qemu_domain_address.c | 24 ++-
src/qemu/qemu_validate.c | 31 +++
.../caps_2.10.0.aarch64.replies | 142 ++++++++++++--
.../caps_2.10.0.x86_64.replies | 154 ++++++++++++---
.../caps_2.11.0.x86_64.replies | 154 ++++++++++++---
.../caps_2.12.0.aarch64.replies | 158 ++++++++++++---
.../caps_2.12.0.x86_64.replies | 170 +++++++++++++---
.../caps_2.9.0.x86_64.replies | 154 ++++++++++++---
.../caps_3.0.0.x86_64.replies | 170 +++++++++++++---
.../caps_3.1.0.x86_64.replies | 170 +++++++++++++---
.../caps_4.0.0.aarch64.replies | 158 ++++++++++++---
.../caps_4.0.0.ppc64.replies | 150 +++++++++++++--
.../caps_4.0.0.riscv32.replies | 150 +++++++++++++--
.../caps_4.0.0.riscv64.replies | 150 +++++++++++++--
.../caps_4.0.0.x86_64.replies | 170 +++++++++++++---
.../caps_4.1.0.x86_64.replies | 162 +++++++++++++---
.../caps_4.2.0.aarch64.replies | 166 +++++++++++++---
.../caps_4.2.0.ppc64.replies | 150 +++++++++++++--
.../caps_4.2.0.x86_64.replies | 162 +++++++++++++---
.../caps_5.0.0.aarch64.replies | 166 +++++++++++++---
.../caps_5.0.0.ppc64.replies | 150 +++++++++++++--
.../caps_5.0.0.x86_64.replies | 181 +++++++++++++++---
.../caps_5.0.0.x86_64.xml | 1 +
.../pcie-root-port-nohotplug.args | 39 ++++
.../pcie-root-port-nohotplug.xml | 35 ++++
tests/qemuxml2argvtest.c | 7 +
.../pcie-root-port-nohotplug.xml | 64 +++++++
tests/qemuxml2xmltest.c | 7 +
38 files changed, 3038 insertions(+), 548 deletions(-)
create mode 100644 tests/qemuxml2argvdata/pcie-root-port-nohotplug.args
create mode 100644 tests/qemuxml2argvdata/pcie-root-port-nohotplug.xml
create mode 100644 tests/qemuxml2xmloutdata/pcie-root-port-nohotplug.xml
--
2.25.2
4 years, 7 months
[PATCH] storage: use local dom_disk parameter
by Yi Li
replace vm->def->disks[i] with dom_disk parameter
Signed-off-by: Yi Li <yili(a)winhong.com>
---
src/qemu/qemu_driver.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index daa3cb397d..27f43124ac 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -14841,14 +14841,13 @@ qemuDomainSnapshotPrepare(virDomainObjPtr vm,
active) < 0)
return -1;
- if (vm->def->disks[i]->src->format > 0 &&
- vm->def->disks[i]->src->format != VIR_STORAGE_FILE_QCOW2) {
+ if (dom_disk->src->format > 0 &&
+ dom_disk->src->format != VIR_STORAGE_FILE_QCOW2) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("internal snapshot for disk %s unsupported "
"for storage type %s"),
disk->name,
- virStorageFileFormatTypeToString(
- vm->def->disks[i]->src->format));
+ virStorageFileFormatTypeToString(dom_disk->src->format));
return -1;
}
break;
--
2.13.6
4 years, 7 months
[PATCH] util: virdaemon: fix waiting for child processes
by Rafael Fonseca
Unlike `waitpid`, `virProcessWait` only returns -1 (error) or 0
(success), so comparing that to `pid` will always be false and the
parent will report failure with:
error : main:851 : Failed to fork as daemon: No such file or directory
even though the grandchild process is succesfully running. Note that the
errno message is misleading: it was last set when trying to find a
restart state file.
Signed-off-by: Rafael Fonseca <r4f4rfs(a)gmail.com>
---
src/util/virdaemon.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/util/virdaemon.c b/src/util/virdaemon.c
index 5d92c7def7..99530fd146 100644
--- a/src/util/virdaemon.c
+++ b/src/util/virdaemon.c
@@ -97,15 +97,14 @@ virDaemonForkIntoBackground(const char *argv0)
default:
{
/* parent */
- int got, exitstatus = 0;
+ int exitstatus = 0;
int ret;
char status;
VIR_FORCE_CLOSE(statuspipe[1]);
/* We wait to make sure the first child forked successfully */
- if ((got = virProcessWait(pid, &exitstatus, 0)) < 0 ||
- got != pid ||
+ if (virProcessWait(pid, &exitstatus, 0) < 0 ||
exitstatus != 0) {
goto error;
}
--
2.25.1
4 years, 7 months
