NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Drop virQEMUCapsGetHostCPUData

Browse Source 
It was very similar to virQEMUCapsGetAccel.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Jiri Denemark 2019-10-23 12:57:20 +02:00
parent 9a6fc6987c
commit 948d2fbb66
1 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/qemu/qemu_capabilities.c
View File

@ -1951,24 +1951,14 @@ virQEMUCapsGetCPUModels(virQEMUCapsPtr qemuCaps,
} }
static virQEMUCapsHostCPUDataPtr
virQEMUCapsGetHostCPUData(virQEMUCapsPtr qemuCaps,
virDomainVirtType type)
{
if (type == VIR_DOMAIN_VIRT_KVM)
return &qemuCaps->kvm.hostCPU;
else
return &qemuCaps->tcg.hostCPU;
}
virCPUDefPtr virCPUDefPtr
virQEMUCapsGetHostModel(virQEMUCapsPtr qemuCaps, virQEMUCapsGetHostModel(virQEMUCapsPtr qemuCaps,
virDomainVirtType type, virDomainVirtType type,
virQEMUCapsHostCPUType cpuType) virQEMUCapsHostCPUType cpuType)
{ {
virQEMUCapsHostCPUDataPtr cpuData = virQEMUCapsGetHostCPUData(qemuCaps, type); virQEMUCapsHostCPUDataPtr cpuData;
cpuData = &virQEMUCapsGetAccel(qemuCaps, type)->hostCPU;
switch (cpuType) { switch (cpuType) {
case VIR_QEMU_CAPS_HOST_CPU_REPORTED: case VIR_QEMU_CAPS_HOST_CPU_REPORTED:
return cpuData->reported; return cpuData->reported;
@ -1993,8 +1983,9 @@ virQEMUCapsSetHostModel(virQEMUCapsPtr qemuCaps,
virCPUDefPtr migratable, virCPUDefPtr migratable,
virCPUDefPtr full) virCPUDefPtr full)
{ {
virQEMUCapsHostCPUDataPtr cpuData = virQEMUCapsGetHostCPUData(qemuCaps, type); virQEMUCapsHostCPUDataPtr cpuData;
cpuData = &virQEMUCapsGetAccel(qemuCaps, type)->hostCPU;
cpuData->reported = reported; cpuData->reported = reported;
cpuData->migratable = migratable; cpuData->migratable = migratable;
cpuData->full = full; cpuData->full = full;
@ -3335,9 +3326,7 @@ qemuMonitorCPUModelInfoPtr
virQEMUCapsGetCPUModelInfo(virQEMUCapsPtr qemuCaps, virQEMUCapsGetCPUModelInfo(virQEMUCapsPtr qemuCaps,
virDomainVirtType type) virDomainVirtType type)
{ {
virQEMUCapsHostCPUDataPtr cpuData = virQEMUCapsGetHostCPUData(qemuCaps, type); return virQEMUCapsGetAccel(qemuCaps, type)->hostCPU.info;
return cpuData->info;
} }
@ -3346,9 +3335,7 @@ virQEMUCapsSetCPUModelInfo(virQEMUCapsPtr qemuCaps,
virDomainVirtType type, virDomainVirtType type,
qemuMonitorCPUModelInfoPtr modelInfo) qemuMonitorCPUModelInfoPtr modelInfo)
{ {
virQEMUCapsHostCPUDataPtr cpuData = virQEMUCapsGetHostCPUData(qemuCaps, type); virQEMUCapsGetAccel(qemuCaps, type)->hostCPU.info = modelInfo;
cpuData->info = modelInfo;
} }