[libvirt] [PATCH] qemu: Relax -no-shutdown check to [0.14.0, 0.15.0]
The patch that fixes SIGTERM handling with -no-shutdown was taken into 0.15.1 stable release of qemu. --- src/qemu/qemu_capabilities.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 8f16a49..2f55000 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1018,9 +1018,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.50) + * 0.14.* and 0.15.0) */ - if (strstr(help, "-no-shutdown") && (version < 14000 || version >= 15050)) + if (strstr(help, "-no-shutdown") && (version < 14000 || version > 15000)) qemuCapsSet(flags, QEMU_CAPS_NO_SHUTDOWN); /* -- 1.7.7
On 17.10.2011 12:18, Jiri Denemark wrote:
The patch that fixes SIGTERM handling with -no-shutdown was taken into 0.15.1 stable release of qemu. --- src/qemu/qemu_capabilities.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 8f16a49..2f55000 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1018,9 +1018,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.50) + * 0.14.* and 0.15.0) */ - if (strstr(help, "-no-shutdown") && (version < 14000 || version >= 15050)) + if (strstr(help, "-no-shutdown") && (version < 14000 || version > 15000)) qemuCapsSet(flags, QEMU_CAPS_NO_SHUTDOWN);
/*
I'd just add it's fixed by commit v0.15.0-rc0-885-gd9389b9 in qemu, so ACK Michal
On Mon, Oct 17, 2011 at 12:39:23 +0200, Michal Privoznik wrote:
On 17.10.2011 12:18, Jiri Denemark wrote:
The patch that fixes SIGTERM handling with -no-shutdown was taken into 0.15.1 stable release of qemu. --- src/qemu/qemu_capabilities.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 8f16a49..2f55000 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1018,9 +1018,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.50) + * 0.14.* and 0.15.0) */ - if (strstr(help, "-no-shutdown") && (version < 14000 || version >= 15050)) + if (strstr(help, "-no-shutdown") && (version < 14000 || version > 15000)) qemuCapsSet(flags, QEMU_CAPS_NO_SHUTDOWN);
/*
I'd just add it's fixed by commit v0.15.0-rc0-885-gd9389b9 in qemu, so
ACK
The commit in stable-0.15 is actually v0.15.0-14-gfb52404; the one you mentioned is the fix in master branch. Anyway I somehow pushed it without this reference to qemu commit that fixed the issue. Jirka
participants (2)
-
Jiri Denemark -
Michal Privoznik