NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Remove redundant parameter in virQEMUCapsFillDomainCaps

Browse Source 
virttype is already included in domCaps, no need to pass it separately.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
Jiri Denemark 2016-06-27 15:12:34 +02:00
parent 324d2cdda4
commit 5343dd4a31
4 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/qemu/qemu_capabilities.c
View File

@ -4337,8 +4337,7 @@ int
virQEMUCapsFillDomainCaps(virDomainCapsPtr domCaps, virQEMUCapsFillDomainCaps(virDomainCapsPtr domCaps,
virQEMUCapsPtr qemuCaps, virQEMUCapsPtr qemuCaps,
virFirmwarePtr *firmwares, virFirmwarePtr *firmwares,
size_t nfirmwares, size_t nfirmwares)
virDomainVirtType virttype)
{ {
virDomainCapsOSPtr os = &domCaps->os; virDomainCapsOSPtr os = &domCaps->os;
virDomainCapsDeviceDiskPtr disk = &domCaps->disk; virDomainCapsDeviceDiskPtr disk = &domCaps->disk;
@ -4348,7 +4347,7 @@ virQEMUCapsFillDomainCaps(virDomainCapsPtr domCaps,
domCaps->maxvcpus = virQEMUCapsGetMachineMaxCpus(qemuCaps, domCaps->maxvcpus = virQEMUCapsGetMachineMaxCpus(qemuCaps,
domCaps->machine); domCaps->machine);
if (virttype == VIR_DOMAIN_VIRT_KVM) { if (domCaps->virttype == VIR_DOMAIN_VIRT_KVM) {
int hostmaxvcpus = virHostCPUGetKVMMaxVCPUs(); int hostmaxvcpus = virHostCPUGetKVMMaxVCPUs();
if (hostmaxvcpus >= 0) if (hostmaxvcpus >= 0)
domCaps->maxvcpus = MIN(domCaps->maxvcpus, hostmaxvcpus); domCaps->maxvcpus = MIN(domCaps->maxvcpus, hostmaxvcpus);

3
src/qemu/qemu_capabilities.h
View File

@ -492,7 +492,6 @@ int virQEMUCapsInitGuestFromBinary(virCapsPtr caps,
int virQEMUCapsFillDomainCaps(virDomainCapsPtr domCaps, int virQEMUCapsFillDomainCaps(virDomainCapsPtr domCaps,
virQEMUCapsPtr qemuCaps, virQEMUCapsPtr qemuCaps,
virFirmwarePtr *firmwares, virFirmwarePtr *firmwares,
size_t nfirmwares, size_t nfirmwares);
virDomainVirtType virttype);
#endif /* __QEMU_CAPABILITIES_H__*/ #endif /* __QEMU_CAPABILITIES_H__*/

2
src/qemu/qemu_driver.c
View File

@ -18411,7 +18411,7 @@ qemuConnectGetDomainCapabilities(virConnectPtr conn,
goto cleanup; goto cleanup;
if (virQEMUCapsFillDomainCaps(domCaps, qemuCaps, if (virQEMUCapsFillDomainCaps(domCaps, qemuCaps,
cfg->firmwares, cfg->nfirmwares, virttype) < 0) cfg->firmwares, cfg->nfirmwares) < 0)
goto cleanup; goto cleanup;
ret = virDomainCapsFormat(domCaps); ret = virDomainCapsFormat(domCaps);

3
tests/domaincapstest.c
View File

@ -129,8 +129,7 @@ fillQemuCaps(virDomainCapsPtr domCaps,
if (virQEMUCapsFillDomainCaps(domCaps, qemuCaps, if (virQEMUCapsFillDomainCaps(domCaps, qemuCaps,
cfg->firmwares, cfg->firmwares,
cfg->nfirmwares, cfg->nfirmwares) < 0)
VIR_DOMAIN_VIRT_QEMU) < 0)
goto cleanup; goto cleanup;
/* The function above tries to query host's KVM & VFIO capabilities by /* The function above tries to query host's KVM & VFIO capabilities by