[libvirt] [PATCH] qemu: Fixed default machine detection in qemuCapsParseMachineTypesStr
The machine in the last output line of <qemu-binary> -M ? was always reported as default machine even if this wasn't the actual default. Trivial fix. Signed-off-by: Viktor Mihajlovski <mihajlov@linux.vnet.ibm.com> --- src/qemu/qemu_capabilities.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index fb0fe54..985d4de 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -284,7 +284,7 @@ qemuCapsParseMachineTypesStr(const char *output, goto no_memory; p = t; - if (!(t = strstr(p, "(default)")) && (!next || t < next)) + if ((t = strstr(p, "(default)")) && (!next || t < next)) defIdx = caps->nmachineTypes; if ((t = strstr(p, "(alias of ")) && (!next || t < next)) { -- 1.7.0.4
On 10/17/2012 08:48 AM, Viktor Mihajlovski wrote:
The machine in the last output line of <qemu-binary> -M ? was always reported as default machine even if this wasn't the actual default. Trivial fix.
Signed-off-by: Viktor Mihajlovski <mihajlov@linux.vnet.ibm.com> --- src/qemu/qemu_capabilities.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
ACK and pushed.
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index fb0fe54..985d4de 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -284,7 +284,7 @@ qemuCapsParseMachineTypesStr(const char *output, goto no_memory;
p = t; - if (!(t = strstr(p, "(default)")) && (!next || t < next)) + if ((t = strstr(p, "(default)")) && (!next || t < next)) defIdx = caps->nmachineTypes;
if ((t = strstr(p, "(alias of ")) && (!next || t < next)) {
-- Eric Blake eblake@redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
participants (2)
-
Eric Blake -
Viktor Mihajlovski