From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:37571) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RWZPJ-0004xk-54 for qemu-devel@nongnu.org; Fri, 02 Dec 2011 15:08:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RWZPI-0005KW-9X for qemu-devel@nongnu.org; Fri, 02 Dec 2011 15:08:29 -0500 Received: from e4.ny.us.ibm.com ([32.97.182.144]:55137) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RWZPI-0005KO-72 for qemu-devel@nongnu.org; Fri, 02 Dec 2011 15:08:28 -0500 Received: from /spool/local by e4.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 2 Dec 2011 15:08:26 -0500 Received: from d01av03.pok.ibm.com (d01av03.pok.ibm.com [9.56.224.217]) by d01relay05.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id pB2K8OcU226376 for ; Fri, 2 Dec 2011 15:08:24 -0500 Received: from d01av03.pok.ibm.com (loopback [127.0.0.1]) by d01av03.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id pB2K8NmE018415 for ; Fri, 2 Dec 2011 18:08:23 -0200 Message-ID: <4ED93037.7070902@linux.vnet.ibm.com> Date: Fri, 02 Dec 2011 15:08:23 -0500 From: Stefan Berger MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH] Adapt libvirt's Qemu version parser for Qemu 1.0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: libvirt Cc: Anthony Liguori , Eric Blake , qemu-devel Qemu 1.0 does not show a micro version like 0.15.50 did. Adapt the Qemu version parser to handle this. --- src/qemu/qemu_capabilities.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) Index: libvirt-tpm/src/qemu/qemu_capabilities.c =================================================================== --- libvirt-tpm.orig/src/qemu/qemu_capabilities.c +++ libvirt-tpm/src/qemu/qemu_capabilities.c @@ -1147,15 +1147,24 @@ int qemuCapsParseHelpStr(const char *qem ++p; minor = virParseNumber(&p); - if (minor == -1 || *p != '.') + if (minor == -1) goto fail; + if (major == 0 && *p != '.') + goto fail; + + if (major > 0 && *p != '.') { + micro = 0; + goto skip_micro; + } + ++p; micro = virParseNumber(&p); if (micro == -1) goto fail; +skip_micro: SKIP_BLANKS(p); if (STRPREFIX(p, QEMU_KVM_VER_PREFIX)) {