mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-07-31 22:17:17 +00:00
qemu: Refactor virQEMUCapsFormatAccel
And make it use virQEMUCapsGetAccel once rather than repeating the same code in all functions called from virQEMUCapsFormatAccel. Signed-off-by: Jiri Denemark <jdenemar@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
parent
4fd90d06e6
commit
fa4db8ed6a
@ -3907,12 +3907,11 @@ virQEMUCapsLoadCache(virArch hostArch,
|
|||||||
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
virQEMUCapsFormatHostCPUModelInfo(virQEMUCapsPtr qemuCaps,
|
virQEMUCapsFormatHostCPUModelInfo(virQEMUCapsAccelPtr caps,
|
||||||
virBufferPtr buf,
|
virBufferPtr buf,
|
||||||
virDomainVirtType type)
|
const char *typeStr)
|
||||||
{
|
{
|
||||||
qemuMonitorCPUModelInfoPtr model = virQEMUCapsGetCPUModelInfo(qemuCaps, type);
|
qemuMonitorCPUModelInfoPtr model = caps->hostCPU.info;
|
||||||
const char *typeStr = type == VIR_DOMAIN_VIRT_KVM ? "kvm" : "tcg";
|
|
||||||
size_t i;
|
size_t i;
|
||||||
|
|
||||||
if (!model)
|
if (!model)
|
||||||
@ -3962,22 +3961,13 @@ virQEMUCapsFormatHostCPUModelInfo(virQEMUCapsPtr qemuCaps,
|
|||||||
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
virQEMUCapsFormatCPUModels(virQEMUCapsPtr qemuCaps,
|
virQEMUCapsFormatCPUModels(virQEMUCapsAccelPtr caps,
|
||||||
virBufferPtr buf,
|
virBufferPtr buf,
|
||||||
virDomainVirtType type)
|
const char *typeStr)
|
||||||
{
|
{
|
||||||
qemuMonitorCPUDefsPtr defs;
|
qemuMonitorCPUDefsPtr defs = caps->cpuModels;
|
||||||
const char *typeStr;
|
|
||||||
size_t i;
|
size_t i;
|
||||||
|
|
||||||
if (type == VIR_DOMAIN_VIRT_KVM) {
|
|
||||||
typeStr = "kvm";
|
|
||||||
defs = qemuCaps->kvm.cpuModels;
|
|
||||||
} else {
|
|
||||||
typeStr = "tcg";
|
|
||||||
defs = qemuCaps->tcg.cpuModels;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!defs)
|
if (!defs)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@ -4015,8 +4005,11 @@ virQEMUCapsFormatAccel(virQEMUCapsPtr qemuCaps,
|
|||||||
virBufferPtr buf,
|
virBufferPtr buf,
|
||||||
virDomainVirtType type)
|
virDomainVirtType type)
|
||||||
{
|
{
|
||||||
virQEMUCapsFormatHostCPUModelInfo(qemuCaps, buf, type);
|
virQEMUCapsAccelPtr caps = virQEMUCapsGetAccel(qemuCaps, type);
|
||||||
virQEMUCapsFormatCPUModels(qemuCaps, buf, type);
|
const char *typeStr = type == VIR_DOMAIN_VIRT_KVM ? "kvm" : "tcg";
|
||||||
|
|
||||||
|
virQEMUCapsFormatHostCPUModelInfo(caps, buf, typeStr);
|
||||||
|
virQEMUCapsFormatCPUModels(caps, buf, typeStr);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user