diff options
| -rw-r--r-- | docs/COLO-FT.txt | 4 | ||||
| -rw-r--r-- | docs/interop/firmware.json | 2 | ||||
| -rw-r--r-- | docs/system/cpu-models-x86.rst.inc | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/docs/COLO-FT.txt b/docs/COLO-FT.txt index 8874690e83..8d6d53a5a2 100644 --- a/docs/COLO-FT.txt +++ b/docs/COLO-FT.txt @@ -158,7 +158,7 @@ instance. # imagefolder="/mnt/vms/colo-test-primary" -# qemu-system-x86_64 -enable-kvm -cpu qemu64,+kvmclock -m 512 -smp 1 -qmp stdio \ +# qemu-system-x86_64 -enable-kvm -cpu qemu64,kvmclock=on -m 512 -smp 1 -qmp stdio \ -device piix3-usb-uhci -device usb-tablet -name primary \ -netdev tap,id=hn0,vhost=off,helper=/usr/lib/qemu/qemu-bridge-helper \ -device rtl8139,id=e0,netdev=hn0 \ @@ -189,7 +189,7 @@ any IP's here, except for the $primary_ip variable. # qemu-img create -f qcow2 $imagefolder/secondary-hidden.qcow2 10G -# qemu-system-x86_64 -enable-kvm -cpu qemu64,+kvmclock -m 512 -smp 1 -qmp stdio \ +# qemu-system-x86_64 -enable-kvm -cpu qemu64,kvmclock=on -m 512 -smp 1 -qmp stdio \ -device piix3-usb-uhci -device usb-tablet -name secondary \ -netdev tap,id=hn0,vhost=off,helper=/usr/lib/qemu/qemu-bridge-helper \ -device rtl8139,id=e0,netdev=hn0 \ diff --git a/docs/interop/firmware.json b/docs/interop/firmware.json index 989f10b626..9d94ccafa9 100644 --- a/docs/interop/firmware.json +++ b/docs/interop/firmware.json @@ -129,7 +129,7 @@ # "-machine smm=on". (On the "pc-q35-*" machine types of # the @i386 emulation target, @requires-smm presents # further CPU requirements; one combination known to work -# is "-cpu coreduo,-nx".) If the firmware is marked as +# is "-cpu coreduo,nx=off".) If the firmware is marked as # both @secure-boot and @requires-smm, then write # accesses to the pflash chip (NVRAM) that holds the UEFI # variable store must be restricted to code that executes 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 ^^^^^^^^^^^^^^^^^ |