diff options
Diffstat (limited to 'docs/system')
| -rw-r--r-- | docs/system/cpu-hotplug.rst | 2 | ||||
| -rw-r--r-- | docs/system/cpu-models-x86.rst.inc | 4 | ||||
| -rw-r--r-- | docs/system/deprecated.rst | 7 | ||||
| -rw-r--r-- | docs/system/s390x/3270.rst | 2 | ||||
| -rw-r--r-- | docs/system/target-avr.rst | 2 | ||||
| -rw-r--r-- | docs/system/vnc-security.rst | 8 |
6 files changed, 16 insertions, 9 deletions
diff --git a/docs/system/cpu-hotplug.rst b/docs/system/cpu-hotplug.rst index d0b06403f1..bd0663616e 100644 --- a/docs/system/cpu-hotplug.rst +++ b/docs/system/cpu-hotplug.rst @@ -14,7 +14,7 @@ vCPU hotplug $ qemu-system-x86_64 -display none -no-user-config -m 2048 \ -nodefaults -monitor stdio -machine pc,accel=kvm,usb=off \ -smp 1,maxcpus=2 -cpu IvyBridge-IBRS \ - -qmp unix:/tmp/qmp-sock,server,nowait + -qmp unix:/tmp/qmp-sock,server=on,wait=off (2) Run 'qmp-shell' (located in the source tree, under: "scripts/qmp/) to connect to the just-launched QEMU:: 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 ^^^^^^^^^^^^^^^^^ diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index 2fcac7861e..561c916da2 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -146,6 +146,13 @@ library enabled as a cryptography provider. Neither the ``nettle`` library, or the built-in cryptography provider are supported on FIPS enabled hosts. +``-writeconfig`` (since 6.0) +''''''''''''''''''''''''''''' + +The ``-writeconfig`` option is not able to serialize the entire contents +of the QEMU command line. It is thus considered a failed experiment +and deprecated, with no current replacement. + QEMU Machine Protocol (QMP) commands ------------------------------------ diff --git a/docs/system/s390x/3270.rst b/docs/system/s390x/3270.rst index 0554a70a9f..0e173b323f 100644 --- a/docs/system/s390x/3270.rst +++ b/docs/system/s390x/3270.rst @@ -24,7 +24,7 @@ Example configuration * Add a ``tn3270`` chardev and a ``x-terminal3270`` to the QEMU command line:: - -chardev socket,id=ch0,host=0.0.0.0,port=2300,nowait,server,tn3270 + -chardev socket,id=ch0,host=0.0.0.0,port=2300,wait=off,server=on,tn3270=on -device x-terminal3270,chardev=ch0,devno=fe.0.000a,id=terminal0 * Start the guest. In the guest, use ``chccwdev -e 0.0.000a`` to enable diff --git a/docs/system/target-avr.rst b/docs/system/target-avr.rst index 25ab46ef05..03d5ab51c1 100644 --- a/docs/system/target-avr.rst +++ b/docs/system/target-avr.rst @@ -24,7 +24,7 @@ AVR cpu - Continuous non interrupted execution with serial output into telnet window:: qemu-system-avr -M mega2560 -bios demo.elf -nographic \ - -serial tcp::5678,server,nowait + -serial tcp::5678,server=on,wait=off and then in another shell:: diff --git a/docs/system/vnc-security.rst b/docs/system/vnc-security.rst index ebca656d87..830f6acc73 100644 --- a/docs/system/vnc-security.rst +++ b/docs/system/vnc-security.rst @@ -44,7 +44,7 @@ the password all clients will be rejected. .. parsed-literal:: - |qemu_system| [...OPTIONS...] -vnc :1,password -monitor stdio + |qemu_system| [...OPTIONS...] -vnc :1,password=on -monitor stdio (qemu) change vnc password Password: ******** (qemu) @@ -104,7 +104,7 @@ authentication to provide two layers of authentication for clients. |qemu_system| [...OPTIONS...] \ -object tls-creds-x509,id=tls0,dir=/etc/pki/qemu,endpoint=server,verify-peer=on \ - -vnc :1,tls-creds=tls0,password -monitor stdio + -vnc :1,tls-creds=tls0,password=on -monitor stdio (qemu) change vnc password Password: ******** (qemu) @@ -128,7 +128,7 @@ can be launched with: .. parsed-literal:: - |qemu_system| [...OPTIONS...] -vnc :1,sasl -monitor stdio + |qemu_system| [...OPTIONS...] -vnc :1,sasl=on -monitor stdio .. _vnc_005fsec_005fcertificate_005fsasl: @@ -146,7 +146,7 @@ x509 options: |qemu_system| [...OPTIONS...] \ -object tls-creds-x509,id=tls0,dir=/etc/pki/qemu,endpoint=server,verify-peer=on \ - -vnc :1,tls-creds=tls0,sasl -monitor stdio + -vnc :1,tls-creds=tls0,sasl=on -monitor stdio .. _vnc_005fsetup_005fsasl: |