External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemu: Rename qemubinCaps => qemuCaps

Browse Source 
The latter is used throughout libvirt, so use it here as
well for consistency.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
This commit is contained in:
Andrea Bolognani 2018-09-18 18:24:35 +02:00
parent 3df264080e
commit e9e3a3c0fe
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/qemu/qemu_capabilities.c
View File

@ -747,7 +747,7 @@ virQEMUCapsInitGuest(virCapsPtr caps,
virArch guestarch) virArch guestarch)
{ {
char *binary = NULL; char *binary = NULL;
virQEMUCapsPtr qemubinCaps = NULL; virQEMUCapsPtr qemuCaps = NULL;
int ret = -1; int ret = -1;
/* Check for existence of base emulator, or alternate base /* Check for existence of base emulator, or alternate base
@ -764,18 +764,18 @@ virQEMUCapsInitGuest(virCapsPtr caps,
/* Ignore binary if extracting version info fails */ /* Ignore binary if extracting version info fails */
if (binary) { if (binary) {
if (!(qemubinCaps = virQEMUCapsCacheLookup(cache, binary))) { if (!(qemuCaps = virQEMUCapsCacheLookup(cache, binary))) {
virResetLastError(); virResetLastError();
VIR_FREE(binary); VIR_FREE(binary);
} }
} }
ret = virQEMUCapsInitGuestFromBinary(caps, ret = virQEMUCapsInitGuestFromBinary(caps,
binary, qemubinCaps, binary, qemuCaps,
guestarch); guestarch);
VIR_FREE(binary); VIR_FREE(binary);
virObjectUnref(qemubinCaps); virObjectUnref(qemuCaps);
return ret; return ret;
} }
@ -783,7 +783,7 @@ virQEMUCapsInitGuest(virCapsPtr caps,
int int
virQEMUCapsInitGuestFromBinary(virCapsPtr caps, virQEMUCapsInitGuestFromBinary(virCapsPtr caps,
const char *binary, const char *binary,
virQEMUCapsPtr qemubinCaps, virQEMUCapsPtr qemuCaps,
virArch guestarch) virArch guestarch)
{ {
virCapsGuestPtr guest; virCapsGuestPtr guest;
@ -795,7 +795,7 @@ virQEMUCapsInitGuestFromBinary(virCapsPtr caps,
if (!binary) if (!binary)
return 0; return 0;
if (virQEMUCapsGetMachineTypesCaps(qemubinCaps, &nmachines, &machines) < 0) if (virQEMUCapsGetMachineTypesCaps(qemuCaps, &nmachines, &machines) < 0)
goto cleanup; goto cleanup;
/* We register kvm as the base emulator too, since we can /* We register kvm as the base emulator too, since we can
@ -820,7 +820,7 @@ virQEMUCapsInitGuestFromBinary(virCapsPtr caps,
if (!virCapabilitiesAddGuestFeature(guest, "deviceboot", true, false)) if (!virCapabilitiesAddGuestFeature(guest, "deviceboot", true, false))
goto cleanup; goto cleanup;
if (virQEMUCapsGet(qemubinCaps, QEMU_CAPS_DISK_SNAPSHOT)) if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DISK_SNAPSHOT))
hasdisksnapshot = true; hasdisksnapshot = true;
if (!virCapabilitiesAddGuestFeature(guest, "disksnapshot", hasdisksnapshot, if (!virCapabilitiesAddGuestFeature(guest, "disksnapshot", hasdisksnapshot,
@ -835,7 +835,7 @@ virQEMUCapsInitGuestFromBinary(virCapsPtr caps,
NULL) == NULL) NULL) == NULL)
goto cleanup; goto cleanup;
if (virQEMUCapsGet(qemubinCaps, QEMU_CAPS_KVM)) { if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM)) {
if (virCapabilitiesAddGuestDomain(guest, if (virCapabilitiesAddGuestDomain(guest,
VIR_DOMAIN_VIRT_KVM, VIR_DOMAIN_VIRT_KVM,
NULL, NULL,

2
src/qemu/qemu_capabilities.h
View File

@ -611,7 +611,7 @@ const char *virQEMUCapsGetPreferredMachine(virQEMUCapsPtr qemuCaps);
int virQEMUCapsInitGuestFromBinary(virCapsPtr caps, int virQEMUCapsInitGuestFromBinary(virCapsPtr caps,
const char *binary, const char *binary,
virQEMUCapsPtr qemubinCaps, virQEMUCapsPtr qemuCaps,
virArch guestarch); virArch guestarch);
int virQEMUCapsFillDomainCaps(virCapsPtr caps, int virQEMUCapsFillDomainCaps(virCapsPtr caps,