External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-07 18:35:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: capabilities: Remove unused virQEMUCapsInitQMPBasicArch

Browse Source 
The function doesn't set any capability and we don't want to add
arch-dependent always-peresent capabilities in the future.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2023-03-06 21:27:33 +01:00
parent 8f2fb353e4
commit c0e60063c9
5 changed files with 0 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/qemu/qemu_capabilities.c
View File

@ -5462,61 +5462,6 @@ virQEMUCapsInitQMPArch(virQEMUCaps *qemuCaps,
}
/**
* virQEMUCapsInitQMPBasicArch:
* @qemuCaps: QEMU capabilities
*
* Initialize @qemuCaps with basic always present and architecture-dependent
* capabilities.
*/
void
virQEMUCapsInitQMPBasicArch(virQEMUCaps *qemuCaps)
{
switch (qemuCaps->arch) {
case VIR_ARCH_S390:
case VIR_ARCH_S390X:
case VIR_ARCH_AARCH64:
case VIR_ARCH_I686:
case VIR_ARCH_X86_64:
case VIR_ARCH_ALPHA:
case VIR_ARCH_PPC:
case VIR_ARCH_PPCEMB:
case VIR_ARCH_SH4:
case VIR_ARCH_SH4EB:
case VIR_ARCH_RISCV32:
case VIR_ARCH_RISCV64:
case VIR_ARCH_SPARC:
case VIR_ARCH_SPARC64:
case VIR_ARCH_ARMV6L:
case VIR_ARCH_ARMV7L:
case VIR_ARCH_ARMV7B:
case VIR_ARCH_CRIS:
case VIR_ARCH_ITANIUM:
case VIR_ARCH_LM32:
case VIR_ARCH_M68K:
case VIR_ARCH_MICROBLAZE:
case VIR_ARCH_MICROBLAZEEL:
case VIR_ARCH_MIPS:
case VIR_ARCH_MIPSEL:
case VIR_ARCH_MIPS64:
case VIR_ARCH_MIPS64EL:
case VIR_ARCH_OR32:
case VIR_ARCH_PARISC:
case VIR_ARCH_PARISC64:
case VIR_ARCH_PPCLE:
case VIR_ARCH_PPC64:
case VIR_ARCH_PPC64LE:
case VIR_ARCH_UNICORE32:
case VIR_ARCH_XTENSA:
case VIR_ARCH_XTENSAEB:
case VIR_ARCH_NONE:
case VIR_ARCH_LAST:
default:
break;
}
}
/**
* virQEMUCapsInitQMPVersionCaps:
* @qemuCaps: QEMU capabilities
@ -5666,8 +5611,6 @@ virQEMUCapsInitQMPMonitor(virQEMUCaps *qemuCaps,
if (virQEMUCapsInitQMPArch(qemuCaps, mon) < 0)
return -1;
virQEMUCapsInitQMPBasicArch(qemuCaps);
/* initiate all capabilities based on qemu version */
virQEMUCapsInitQMPVersionCaps(qemuCaps);

3
src/qemu/qemu_capspriv.h
View File

@ -66,9 +66,6 @@ virQEMUCapsInitCPUModel(virQEMUCaps *qemuCaps,
virCPUDef *cpu,
bool migratable);
void
virQEMUCapsInitQMPBasicArch(virQEMUCaps *qemuCaps);
qemuMonitorCPUModelInfo *
virQEMUCapsGetCPUModelInfo(virQEMUCaps *qemuCaps,
virDomainVirtType type);

2
tests/qemuhotplugtest.c
View File

@ -70,8 +70,6 @@ qemuHotplugCreateObjects(virDomainXMLOption *xmlopt,
priv->qemuCaps = virQEMUCapsNew();
virQEMUCapsInitQMPBasicArch(priv->qemuCaps);
virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_VIRTIO_SCSI);
virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DEVICE_USB_STORAGE);
virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DEVICE_IVSHMEM_PLAIN);

2
tests/qemuxml2argvtest.c
View File

@ -345,8 +345,6 @@ testUpdateQEMUCaps(const struct testQemuInfo *info,
virQEMUCapsSetArch(info->qemuCaps, arch);
virQEMUCapsInitQMPBasicArch(info->qemuCaps);
if (testAddCPUModels(info->qemuCaps,
!!(info->flags & FLAG_SKIP_LEGACY_CPUS)) < 0)
return -1;

3
tests/qemuxml2xmltest.c
View File

@ -41,9 +41,6 @@ testXML2XMLCommon(const struct testQemuInfo *info)
else
driver.caps = linuxCaps;
if (!(info->flags & FLAG_REAL_CAPS))
virQEMUCapsInitQMPBasicArch(info->qemuCaps);
virFileCacheClear(driver.qemuCapsCache);
if (info->args.hostOS == HOST_OS_MACOS)