From 75e3149264fcb3e4466cba989892ca8a1b25367a Mon Sep 17 00:00:00 2001 From: Jiri Denemark Date: Tue, 27 Sep 2011 14:46:35 +0200 Subject: [PATCH] qemu: Relax -no-shutdown check to [0.14.0, 0.15.50) SIGTERM handling for -no-shutdown is already fixed in qemu git and libvirt can safely use it. The downside is that 0.15.50 version of qemu can be any qemu compiled from git, even that without the fix for SIGTERM. However, I think this patch is worth it since excluding 0.15.50 from the check makes testing current qemu with libvirt much easier and someone running qemu from git should be able to rebuild fixed qemu from git if they hit the problem with a hang on shutdown. --- src/qemu/qemu_capabilities.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 8e20e3f32c..4325f77101 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1017,9 +1017,9 @@ qemuCapsComputeCmdFlags(const char *help, /* Do not use -no-shutdown if qemu doesn't support it or SIGTERM handling * is most likely buggy when used with -no-shutdown (which applies for qemu - * 0.14.* and 0.15.*) + * 0.14.* and <0.15.50) */ - if (strstr(help, "-no-shutdown") && (version < 14000 || version > 15999)) + if (strstr(help, "-no-shutdown") && (version < 14000 || version >= 15050)) qemuCapsSet(flags, QEMU_CAPS_NO_SHUTDOWN); /* -- 2.47.2