External/libvirt
1
0
Fork 0
Code

qemu: simplify use of virArchFromHost

Browse Source 
Reusing the result of virArchFromHost instead of calling it multiple times

Signed-off-by: Tal Kain <tal.kain@ravellosystems.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Tal Kain 2013-04-08 15:33:07 +03:00 committed by Eric Blake
parent 0f4f5cb26d
commit 9b3322c766
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/qemu/qemu_capabilities.c
View File

@ -864,8 +864,9 @@ virCapsPtr virQEMUCapsInit(virQEMUCapsCachePtr cache)
{ {
virCapsPtr caps; virCapsPtr caps;
int i; int i;
virArch hostarch = virArchFromHost();
if ((caps = virCapabilitiesNew(virArchFromHost(), if ((caps = virCapabilitiesNew(hostarch,
1, 1)) == NULL) 1, 1)) == NULL)
goto error; goto error;
@ -878,7 +879,7 @@ virCapsPtr virQEMUCapsInit(virQEMUCapsCachePtr cache)
VIR_WARN("Failed to query host NUMA topology, disabling NUMA capabilities"); VIR_WARN("Failed to query host NUMA topology, disabling NUMA capabilities");
} }
if (virQEMUCapsInitCPU(caps, virArchFromHost()) < 0) if (virQEMUCapsInitCPU(caps, hostarch) < 0)
VIR_WARN("Failed to get host CPU"); VIR_WARN("Failed to get host CPU");
/* Add the power management features of the host */ /* Add the power management features of the host */
@ -895,7 +896,7 @@ virCapsPtr virQEMUCapsInit(virQEMUCapsCachePtr cache)
*/ */
for (i = 0 ; i < VIR_ARCH_LAST ; i++) for (i = 0 ; i < VIR_ARCH_LAST ; i++)
if (virQEMUCapsInitGuest(caps, cache, if (virQEMUCapsInitGuest(caps, cache,
virArchFromHost(), hostarch,
i) < 0) i) < 0)
goto error; goto error;
@ -1643,17 +1644,19 @@ int virQEMUCapsGetDefaultVersion(virCapsPtr caps,
{ {
const char *binary; const char *binary;
virQEMUCapsPtr qemucaps; virQEMUCapsPtr qemucaps;
virArch hostarch;
if (*version > 0) if (*version > 0)
return 0; return 0;
hostarch = virArchFromHost();
if ((binary = virCapabilitiesDefaultGuestEmulator(caps, if ((binary = virCapabilitiesDefaultGuestEmulator(caps,
"hvm", "hvm",
virArchFromHost(), hostarch,
"qemu")) == NULL) { "qemu")) == NULL) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("Cannot find suitable emulator for %s"), _("Cannot find suitable emulator for %s"),
virArchToString(virArchFromHost())); virArchToString(hostarch));
return -1; return -1;
} }