External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: remove use of implicit boolean syntax for guest features

Browse Source 
Some guest features that map to the -cpu arg are still added using
implicit syntax "feature" which is a deprecated shorthand for
"feature=on".

Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2021-10-05 18:00:41 +01:00
parent e28ce3885d
commit f18592adb1
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/qemu/qemu_command.c
View File

@ -6757,7 +6757,7 @@ qemuBuildCpuCommandLine(virCommand *cmd,
break; break;
case VIR_DOMAIN_TIMER_NAME_HYPERVCLOCK: case VIR_DOMAIN_TIMER_NAME_HYPERVCLOCK:
if (timer->present == 1) if (timer->present == 1)
virBufferAddLit(&buf, ",hv-time"); virBufferAddLit(&buf, ",hv-time=on");
break; break;
case VIR_DOMAIN_TIMER_NAME_TSC: case VIR_DOMAIN_TIMER_NAME_TSC:
if (timer->frequency > 0) if (timer->frequency > 0)
@ -6816,11 +6816,11 @@ qemuBuildCpuCommandLine(virCommand *cmd,
case VIR_DOMAIN_HYPERV_IPI: case VIR_DOMAIN_HYPERV_IPI:
case VIR_DOMAIN_HYPERV_EVMCS: case VIR_DOMAIN_HYPERV_EVMCS:
if (def->hyperv_features[i] == VIR_TRISTATE_SWITCH_ON) if (def->hyperv_features[i] == VIR_TRISTATE_SWITCH_ON)
virBufferAsprintf(&buf, ",hv-%s", virBufferAsprintf(&buf, ",hv-%s=on",
virDomainHypervTypeToString(i)); virDomainHypervTypeToString(i));
if ((i == VIR_DOMAIN_HYPERV_STIMER) && if ((i == VIR_DOMAIN_HYPERV_STIMER) &&
(def->hyperv_stimer_direct == VIR_TRISTATE_SWITCH_ON)) (def->hyperv_stimer_direct == VIR_TRISTATE_SWITCH_ON))
virBufferAsprintf(&buf, ",%s", VIR_CPU_x86_HV_STIMER_DIRECT); virBufferAsprintf(&buf, ",%s=on", VIR_CPU_x86_HV_STIMER_DIRECT);
break; break;
case VIR_DOMAIN_HYPERV_SPINLOCKS: case VIR_DOMAIN_HYPERV_SPINLOCKS:

2
tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
View File

@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=none \
-S \ -S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-machine pc,accel=kvm,usb=off,dump-guest-core=off \ -machine pc,accel=kvm,usb=off,dump-guest-core=off \
-cpu qemu32,hv-time \ -cpu qemu32,hv-time=on \
-m 214 \ -m 214 \
-realtime mlock=off \ -realtime mlock=off \
-smp 6,sockets=6,cores=1,threads=1 \ -smp 6,sockets=6,cores=1,threads=1 \

2
tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args
View File

@ -11,7 +11,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-S \ -S \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
-machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ -machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \
-cpu qemu64,hv-vpindex,hv-synic,hv-stimer,hv-stimer-direct \ -cpu qemu64,hv-vpindex=on,hv-synic=on,hv-stimer=on,hv-stimer-direct=on \
-m 214 \ -m 214 \
-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
-overcommit mem-lock=off \ -overcommit mem-lock=off \

2
tests/qemuxml2argvdata/hyperv.x86_64-4.0.0.args
View File

@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=none \
-S \ -S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \ -machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \
-cpu 'qemu32,hv-relaxed,hv-vapic,hv-spinlocks=0x2fff,hv-vpindex,hv-runtime,hv-synic,hv-stimer,hv-reset,hv-vendor-id=KVM Hv,hv-frequencies,hv-reenlightenment,hv-tlbflush,hv-ipi,hv-evmcs' \ -cpu 'qemu32,hv-relaxed=on,hv-vapic=on,hv-spinlocks=0x2fff,hv-vpindex=on,hv-runtime=on,hv-synic=on,hv-stimer=on,hv-reset=on,hv-vendor-id=KVM Hv,hv-frequencies=on,hv-reenlightenment=on,hv-tlbflush=on,hv-ipi=on,hv-evmcs=on' \
-m 214 \ -m 214 \
-overcommit mem-lock=off \ -overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \ -smp 6,sockets=6,cores=1,threads=1 \

2
tests/qemuxml2argvdata/hyperv.x86_64-latest.args
View File

@ -11,7 +11,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-S \ -S \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
-machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ -machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \
-cpu 'qemu64,hv-relaxed,hv-vapic,hv-spinlocks=0x2fff,hv-vpindex,hv-runtime,hv-synic,hv-stimer,hv-reset,hv-vendor-id=KVM Hv,hv-frequencies,hv-reenlightenment,hv-tlbflush,hv-ipi,hv-evmcs' \ -cpu 'qemu64,hv-relaxed=on,hv-vapic=on,hv-spinlocks=0x2fff,hv-vpindex=on,hv-runtime=on,hv-synic=on,hv-stimer=on,hv-reset=on,hv-vendor-id=KVM Hv,hv-frequencies=on,hv-reenlightenment=on,hv-tlbflush=on,hv-ipi=on,hv-evmcs=on' \
-m 214 \ -m 214 \
-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
-overcommit mem-lock=off \ -overcommit mem-lock=off \