External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-01 17:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Make virQEMUCapsInitCPUModel testable

Browse Source 
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
Jiri Denemark 2017-02-23 14:31:23 +01:00
parent bb3363c90b
commit 2f882dbfa9
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/qemu/qemu_capabilities.c
View File

@ -3222,7 +3222,7 @@ virQEMUCapsInitCPUModelX86(virQEMUCapsPtr qemuCaps,
* 1 when the caller should fall back to using virCapsPtr->host.cpu,
* -1 on error.
*/
static int
int
virQEMUCapsInitCPUModel(virQEMUCapsPtr qemuCaps,
virDomainVirtType type,
virCPUDefPtr cpu)
@ -3286,6 +3286,18 @@ virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps,
}
void
virQEMUCapsSetCPUModelInfo(virQEMUCapsPtr qemuCaps,
virDomainVirtType type,
qemuMonitorCPUModelInfoPtr modelInfo)
{
if (type == VIR_DOMAIN_VIRT_KVM)
qemuCaps->kvmCPUModelInfo = modelInfo;
else
qemuCaps->tcgCPUModelInfo = modelInfo;
}
static int
virQEMUCapsLoadHostCPUModelInfo(virQEMUCapsPtr qemuCaps,
xmlXPathContextPtr ctxt,
@ -3385,10 +3397,7 @@ virQEMUCapsLoadHostCPUModelInfo(virQEMUCapsPtr qemuCaps,
}
}
if (virtType == VIR_DOMAIN_VIRT_KVM)
qemuCaps->kvmCPUModelInfo = hostCPU;
else
qemuCaps->tcgCPUModelInfo = hostCPU;
virQEMUCapsSetCPUModelInfo(qemuCaps, virtType, hostCPU);
hostCPU = NULL;
ret = 0;

10
src/qemu/qemu_capspriv.h
View File

@ -77,4 +77,14 @@ void
virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps,
virCapsPtr caps,
virDomainVirtType type);
int
virQEMUCapsInitCPUModel(virQEMUCapsPtr qemuCaps,
virDomainVirtType type,
virCPUDefPtr cpu);
void
virQEMUCapsSetCPUModelInfo(virQEMUCapsPtr qemuCaps,
virDomainVirtType type,
qemuMonitorCPUModelInfoPtr modelInfo);
#endif