[libvirt] [PATCH] qemu: Don't fail driver startup with ancient qemu
Failure to extract version info (e.g., because qemu binary is so ancient that it doesn't even support -help) shouldn't be considered fatal since we only need it to detect whether qemu supports bootindex option. --- src/qemu/qemu_capabilities.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index f86e7f5..6d2a3f6 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -554,9 +554,10 @@ 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 (qemuCapsExtractVersionInfo(binary, info->arch, + NULL, &qemuCaps) == 0 && + qemuCapsGet(qemuCaps, QEMU_CAPS_BOOTINDEX) && + !virCapabilitiesAddGuestFeature(guest, "deviceboot", 1, 0)) goto error; if (hvm) { -- 1.7.4.1
On Mon, Apr 04, 2011 at 03:18:59PM +0200, Jiri Denemark wrote:
Failure to extract version info (e.g., because qemu binary is so ancient that it doesn't even support -help) shouldn't be considered fatal since we only need it to detect whether qemu supports bootindex option. --- src/qemu/qemu_capabilities.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)
What version QEMU doesn't support -help ? We only aim to work with QEMU >= 0.9.0 and I'm fairly sure that has -help support. Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
On Mon, Apr 04, 2011 at 14:23:59 +0100, Daniel P. Berrange wrote:
On Mon, Apr 04, 2011 at 03:18:59PM +0200, Jiri Denemark wrote:
Failure to extract version info (e.g., because qemu binary is so ancient that it doesn't even support -help) shouldn't be considered fatal since we only need it to detect whether qemu supports bootindex option. --- src/qemu/qemu_capabilities.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)
What version QEMU doesn't support -help ?
We only aim to work with QEMU >= 0.9.0 and I'm fairly sure that has -help support.
An ancient one, 0.6.0. But that was just an example. Extracting version info may fail for a bunch of reasons. The main thing is that it shouldn't fail qemu driver startup since that results in libvirtd startup failure. Jirka
On Mon, Apr 04, 2011 at 03:37:32PM +0200, Jiri Denemark wrote:
On Mon, Apr 04, 2011 at 14:23:59 +0100, Daniel P. Berrange wrote:
On Mon, Apr 04, 2011 at 03:18:59PM +0200, Jiri Denemark wrote:
Failure to extract version info (e.g., because qemu binary is so ancient that it doesn't even support -help) shouldn't be considered fatal since we only need it to detect whether qemu supports bootindex option. --- src/qemu/qemu_capabilities.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)
What version QEMU doesn't support -help ?
We only aim to work with QEMU >= 0.9.0 and I'm fairly sure that has -help support.
An ancient one, 0.6.0. But that was just an example. Extracting version info may fail for a bunch of reasons. The main thing is that it shouldn't fail qemu driver startup since that results in libvirtd startup failure.
Why does driver startup failure result in libvirtd startup failure? Shouldn't it only result in the lack of availability of the driver? Dave
On Mon, Apr 04, 2011 at 14:24:37 -0400, Dave Allan wrote:
On Mon, Apr 04, 2011 at 03:37:32PM +0200, Jiri Denemark wrote:
On Mon, Apr 04, 2011 at 14:23:59 +0100, Daniel P. Berrange wrote:
On Mon, Apr 04, 2011 at 03:18:59PM +0200, Jiri Denemark wrote:
Failure to extract version info (e.g., because qemu binary is so ancient that it doesn't even support -help) shouldn't be considered fatal since we only need it to detect whether qemu supports bootindex option. --- src/qemu/qemu_capabilities.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)
What version QEMU doesn't support -help ?
We only aim to work with QEMU >= 0.9.0 and I'm fairly sure that has -help support.
An ancient one, 0.6.0. But that was just an example. Extracting version info may fail for a bunch of reasons. The main thing is that it shouldn't fail qemu driver startup since that results in libvirtd startup failure.
Why does driver startup failure result in libvirtd startup failure? Shouldn't it only result in the lack of availability of the driver?
IIUC, driver startup is supposed to fail only on serious errors, such as ENOMEM. But it doesn't really matter anymore since I realized there's a better fix for this issue. Instead of not adding deviceboot flag to guest capabilities, we should rather ignore qemu binary for which we are not able to extract version info and don't put it into guest capabilities at all. I've sent a patch for that, which obsoletes this patch. Jirka
participants (3)
-
Daniel P. Berrange -
Dave Allan -
Jiri Denemark