From: Ján Tomko <jtomko@redhat.com>
Date: Fri, 14 Sep 2012 12:50:51 +0000 (+0200)
Subject: qemu: fix uninitialized variable in qemuParseCommandLine
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=b4418464e1379ff57847c4ad4af8e949ff9a29b0;p=people%2Fliuw%2Flibxenctrl-split%2Flibvirt.git

qemu: fix uninitialized variable in qemuParseCommandLine

Newly added if branch for kvm_pv_eoi did not set the ret variable.
---

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index ec825bcad..d0c8e22af 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -7655,7 +7655,7 @@ qemuParseCommandLineCPU(virDomainDefPtr dom,
         else if (*p == '+' || *p == '-') {
             char *feature;
             int policy;
-            int ret;
+            int ret = 0;
 
             if (*p == '+')
                 policy = VIR_CPU_FEATURE_REQUIRE;
@@ -7702,7 +7702,6 @@ qemuParseCommandLineCPU(virDomainDefPtr dom,
                     goto error;
                 }
                 dom->clock.timers[i]->present = present;
-                ret = 0;
             } else if (STREQ(feature, "kvm_pv_eoi")) {
                 if (policy == VIR_CPU_FEATURE_REQUIRE)
                     dom->apic_eoi = VIR_DOMAIN_APIC_EOI_ON;