External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 12:25:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Expect a single binary in virQEMUCapsInitGuest()

Browse Source 
We're only ever passing a single binary when calling this
function, so we can remove all code dealing with the
possibility of a second binary being specified.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
This commit is contained in:
Andrea Bolognani 2018-09-18 16:55:20 +02:00
parent 83d86e348e
commit 943f2d53c6
3 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/qemu/qemu_capabilities.c
View File

@ -789,7 +789,6 @@ virQEMUCapsInitGuest(virCapsPtr caps,
ret = virQEMUCapsInitGuestFromBinary(caps,
binary, qemubinCaps,
NULL, NULL,
guestarch);
VIR_FREE(binary);
@ -802,8 +801,6 @@ int
virQEMUCapsInitGuestFromBinary(virCapsPtr caps,
const char *binary,
virQEMUCapsPtr qemubinCaps,
const char *kvmbin,
virQEMUCapsPtr kvmbinCaps,
virArch guestarch)
{
virCapsGuestPtr guest;
@ -816,8 +813,7 @@ virQEMUCapsInitGuestFromBinary(virCapsPtr caps,
if (!binary)
return 0;
if (virQEMUCapsGet(qemubinCaps, QEMU_CAPS_KVM) ||
kvmbin)
if (virQEMUCapsGet(qemubinCaps, QEMU_CAPS_KVM))
haskvm = true;
if (virQEMUCapsGetMachineTypesCaps(qemubinCaps, &nmachines, &machines) < 0)
@ -863,21 +859,14 @@ virQEMUCapsInitGuestFromBinary(virCapsPtr caps,
if (haskvm) {
virCapsGuestDomainPtr dom;
if (kvmbin &&
virQEMUCapsGetMachineTypesCaps(kvmbinCaps, &nmachines, &machines) < 0)
goto cleanup;
if ((dom = virCapabilitiesAddGuestDomain(guest,
VIR_DOMAIN_VIRT_KVM,
kvmbin ? kvmbin : NULL,
NULL,
nmachines,
machines)) == NULL) {
NULL,
0,
NULL)) == NULL) {
goto cleanup;
}
machines = NULL;
nmachines = 0;
}
if ((ARCH_IS_X86(guestarch) || guestarch == VIR_ARCH_AARCH64) &&

2
src/qemu/qemu_capabilities.h
View File

@ -612,8 +612,6 @@ const char *virQEMUCapsGetPreferredMachine(virQEMUCapsPtr qemuCaps);
int virQEMUCapsInitGuestFromBinary(virCapsPtr caps,
const char *binary,
virQEMUCapsPtr qemubinCaps,
const char *kvmbin,
virQEMUCapsPtr kvmbinCaps,
virArch guestarch);
int virQEMUCapsFillDomainCaps(virCapsPtr caps,

2
tests/qemucaps2xmltest.c
View File

@ -106,8 +106,6 @@ testGetCaps(char *capsData, const testQemuData *data)
if (virQEMUCapsInitGuestFromBinary(caps,
binary,
qemuCaps,
NULL,
NULL,
arch) < 0) {
fprintf(stderr, "failed to create the capabilities from qemu");
goto error;