External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

capabilities: Advertise cpuselection if -cpu host is usable

Browse Source 
When -cpu host is supported by a QEMU binary, a user can use
<cpu mode='host-passthrough'/> in domain XML even when libvirtd failed
to find a matching model for the host CPU. Let's make it obvious by
advertising <cpuselection/> guest capability whenever -cpu host is
supported.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
Jiri Denemark 2016-04-13 09:06:23 +02:00
parent 1522503189
commit ced1e846a0
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/qemu/qemu_capabilities.c
View File

@ -928,9 +928,10 @@ virQEMUCapsInitGuestFromBinary(virCapsPtr caps,
machines = NULL; machines = NULL;
nmachines = 0; nmachines = 0;
if (caps->host.cpu && if ((virQEMUCapsGet(qemubinCaps, QEMU_CAPS_CPU_HOST) ||
caps->host.cpu->model && (caps->host.cpu &&
virQEMUCapsGetCPUDefinitions(qemubinCaps, NULL) > 0 && caps->host.cpu->model &&
virQEMUCapsGetCPUDefinitions(qemubinCaps, NULL) > 0)) &&
!virCapabilitiesAddGuestFeature(guest, "cpuselection", true, false)) !virCapabilitiesAddGuestFeature(guest, "cpuselection", true, false))
goto cleanup; goto cleanup;

1
tests/qemucaps2xmldata/all_1.6.0-1.xml
View File

@ -18,6 +18,7 @@
</domain> </domain>
</arch> </arch>
<features> <features>
<cpuselection/>
<deviceboot/> <deviceboot/>
<disksnapshot default='on' toggle='no'/> <disksnapshot default='on' toggle='no'/>
<acpi default='on' toggle='yes'/> <acpi default='on' toggle='yes'/>

1
tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.xml
View File

@ -18,6 +18,7 @@
</domain> </domain>
</arch> </arch>
<features> <features>
<cpuselection/>
<deviceboot/> <deviceboot/>
<disksnapshot default='off' toggle='no'/> <disksnapshot default='off' toggle='no'/>
<acpi default='on' toggle='yes'/> <acpi default='on' toggle='yes'/>