From a67aebd699ffce45886acbcf34d1593201a566bb Mon Sep 17 00:00:00 2001 From: Li Zhang Date: Mon, 18 Mar 2013 17:57:14 +0800 Subject: [PATCH] Clean redundant code about VCPU string checking Now that VCPU number are removed from qemu_monitor_text.c (commit cc78d7ba), VCPU string checking also should be removed. Report-by: John Ferlan Signed-off-by: Li Zhang --- src/qemu/qemu_monitor_text.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 1b6efba95d..25c82b6ef6 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -1,7 +1,7 @@ /* * qemu_monitor_text.c: interaction with QEMU monitor console * - * Copyright (C) 2006-2012 Red Hat, Inc. + * Copyright (C) 2006-2013 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -527,17 +527,10 @@ int qemuMonitorTextGetCPUInfo(qemuMonitorPtr mon, */ line = qemucpus; do { - char *offset = strchr(line, '#'); + char *offset = NULL; char *end = NULL; int tid = 0; - /* See if we're all done */ - if (offset == NULL) - break; - - if (end == NULL || *end != ':') - goto error; - /* Extract host Thread ID */ if ((offset = strstr(line, "thread_id=")) == NULL) goto error; @@ -550,7 +543,7 @@ int qemuMonitorTextGetCPUInfo(qemuMonitorPtr mon, if (VIR_REALLOC_N(cpupids, ncpupids+1) < 0) goto error; - VIR_DEBUG("pid=%d", tid); + VIR_DEBUG("tid=%d", tid); cpupids[ncpupids++] = tid; /* Skip to next data line */