diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-03-02 15:17:45 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-03-02 15:17:45 +0000 |
| commit | 07dbfdd290cea5d75d3e21948dc54fdb6f5174ac (patch) | |
| tree | 0929d4483d347afc7082f0c6e4c9ddbaf8e59571 /docs/system/cpu-models-x86.rst.inc | |
| parent | cbcf09872a936ccefef6a34298046d3b9aefc148 (diff) | |
| parent | c45b426acd1ad8e30fbe1b9af8c07b2889c28c6b (diff) | |
| download | focaccia-qemu-07dbfdd290cea5d75d3e21948dc54fdb6f5174ac.tar.gz focaccia-qemu-07dbfdd290cea5d75d3e21948dc54fdb6f5174ac.zip | |
Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into staging
* fix --enable-fuzzing linker failures (Alexander) * target/i386: Add bus lock debug exception support (Chenyi) * update documentation for preferred boolean option syntax (Daniel) * make SCSI io_timeout configurable (Hannes) * fix handling of guest recoverable SCSI errors (myself) * misc fixes (Pavel, Zheng Zhan Liang, Zihao) * fix installation of binaries with entitlements (Akihiko) # gpg: Signature made Thu 25 Feb 2021 14:41:56 GMT # gpg: using RSA key F13338574B662389866C7682BFFBD25F78C7AE83 # gpg: issuer "pbonzini@redhat.com" # gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full] # gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" [full] # Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1 # Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83 * remotes/bonzini-gitlab/tags/for-upstream: (29 commits) tcg/i386: rdpmc: fix the the condtions chardev: do not use short form boolean options in non-QemuOpts character device descriptions vl: deprecate -writeconfig target/i386: Add bus lock debug exception support qom/object.c: Fix typo target/i386: update to show preferred boolean syntax for -cpu docs: update to show preferred boolean syntax for -cpu docs: update to show preferred boolean syntax for -vnc docs: update to show preferred boolean syntax for -chardev qemu-options: update to show preferred boolean syntax for -vnc qemu-options: update to show preferred boolean syntax for -incoming qemu-options: update to show preferred boolean syntax for -netdev qemu-options: update to show preferred boolean syntax for -spice qemu-options: update to show preferred boolean syntax for -chardev gdbstub: use preferred boolean option syntax char: don't fail when client is not connected scsi: drop 'result' argument from command_complete callback scsi-disk: pass guest recoverable errors through even for rerror=stop scsi-disk: pass SCSI status to scsi_handle_rw_error scsi: introduce scsi_sense_from_errno() ... Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'docs/system/cpu-models-x86.rst.inc')
| -rw-r--r-- | docs/system/cpu-models-x86.rst.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/system/cpu-models-x86.rst.inc b/docs/system/cpu-models-x86.rst.inc index 9a2327828e..867c8216b5 100644 --- a/docs/system/cpu-models-x86.rst.inc +++ b/docs/system/cpu-models-x86.rst.inc @@ -364,7 +364,7 @@ Host passthrough with feature customization: .. parsed-literal:: - |qemu_system| -cpu host,-vmx,... + |qemu_system| -cpu host,vmx=off,... Named CPU models: @@ -376,7 +376,7 @@ Named CPU models with feature customization: .. parsed-literal:: - |qemu_system| -cpu Westmere,+pcid,... + |qemu_system| -cpu Westmere,pcid=on,... Libvirt guest XML ^^^^^^^^^^^^^^^^^ |