External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 03:12:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Ignore unusable binaries

Browse Source 
When initializing qemu guest capabilities, we should ignore qemu
binaries that we are not able to extract version/help info from since
they will be unusable for creating domains anyway. Ignoring them is also
much better than letting initialization of qemu driver fail.
This commit is contained in:
Jiri Denemark 2011-04-04 15:01:22 +02:00
parent 69afdf14b8
commit ef264e82ee
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/qemu/qemu_capabilities.c
View File

@ -490,6 +490,12 @@ qemuCapsInitGuest(virCapsPtr caps,
if (!binary)
return 0;
/* Ignore binary if extracting version info fails */
if (qemuCapsExtractVersionInfo(binary, info->arch, NULL, &qemuCaps) < 0) {
ret = 0;
goto cleanup;
}
if (stat(binary, &st) == 0) {
binary_mtime = st.st_mtime;
} else {
@ -554,9 +560,8 @@ qemuCapsInitGuest(virCapsPtr caps,
!virCapabilitiesAddGuestFeature(guest, "cpuselection", 1, 0))
goto error;
if (qemuCapsExtractVersionInfo(binary, info->arch, NULL, &qemuCaps) < 0 ||
(qemuCapsGet(qemuCaps, QEMU_CAPS_BOOTINDEX) &&
!virCapabilitiesAddGuestFeature(guest, "deviceboot", 1, 0)))
if (qemuCapsGet(qemuCaps, QEMU_CAPS_BOOTINDEX) &&
!virCapabilitiesAddGuestFeature(guest, "deviceboot", 1, 0))
goto error;
if (hvm) {