diff options
author | Cédric Le Goater <clg@redhat.com> | 2022-11-07 17:13:48 +0100 |
---|---|---|
committer | Thomas Huth <thuth@redhat.com> | 2022-11-08 10:10:57 +0100 |
commit | 57702891376d4636b5eab4a89145152a0342c987 (patch) | |
tree | 03b7be87fe65f8302d77b47d420c599536d4ed2a /qemu-options.hx | |
parent | 524fc737431d240f9d9f10aaf381003092868bac (diff) | |
download | qemu-57702891376d4636b5eab4a89145152a0342c987.zip qemu-57702891376d4636b5eab4a89145152a0342c987.tar.gz qemu-57702891376d4636b5eab4a89145152a0342c987.tar.bz2 |
Revert "s390x/s390-virtio-ccw: add zpcii-disable machine property"
This reverts commit 59d1ce44396e3ad2330dc3261ff3da7ad3a16184.
The "zpcii-disable" machine property is redundant with the "interpret"
zPCI device property. Remove it for clarification.
Signed-off-by: Cédric Le Goater <clg@redhat.com>
Message-Id: <20221107161349.1032730-2-clg@kaod.org>
Reviewed-by: Matthew Rosato <mjrosato@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'qemu-options.hx')
-rw-r--r-- | qemu-options.hx | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/qemu-options.hx b/qemu-options.hx index dbdf9c3..8b8a4a5 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -37,8 +37,7 @@ DEF("machine", HAS_ARG, QEMU_OPTION_machine, \ " memory-encryption=@var{} memory encryption object to use (default=none)\n" " hmat=on|off controls ACPI HMAT support (default=off)\n" " memory-backend='backend-id' specifies explicitly provided backend for main RAM (default=none)\n" - " cxl-fmw.0.targets.0=firsttarget,cxl-fmw.0.targets.1=secondtarget,cxl-fmw.0.size=size[,cxl-fmw.0.interleave-granularity=granularity]\n" - " zpcii-disable=on|off disables zPCI interpretation facilities (default=off)\n", + " cxl-fmw.0.targets.0=firsttarget,cxl-fmw.0.targets.1=secondtarget,cxl-fmw.0.size=size[,cxl-fmw.0.interleave-granularity=granularity]\n", QEMU_ARCH_ALL) SRST ``-machine [type=]name[,prop=value[,...]]`` @@ -158,11 +157,6 @@ SRST :: -machine cxl-fmw.0.targets.0=cxl.0,cxl-fmw.0.targets.1=cxl.1,cxl-fmw.0.size=128G,cxl-fmw.0.interleave-granularity=512k - - ``zpcii-disable=on|off`` - Disables zPCI interpretation facilties on s390-ccw hosts. - This feature can be used to disable hardware virtual assists - related to zPCI devices. The default is off. ERST DEF("M", HAS_ARG, QEMU_OPTION_M, |