From: Eduardo Habkost <ehabkost@redhat.com>
Date: Thu, 4 Oct 2012 20:48:55 +0000 (-0300)
Subject: i386: kvm: kvm_arch_get_supported_cpuid: use 'entry' variable
X-Git-Tag: v1.3.0-rc0~90^2~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=47111e2cfa1a83a99ac10ed19c7c8b02be4fe973;p=thirdparty%2Fqemu.git

i386: kvm: kvm_arch_get_supported_cpuid: use 'entry' variable

The reg switch will be moved to a separate function, so store the entry
pointer in a variable.

No behavior change, just code movement.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
---

diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 56addf1866b..18782e49db6 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -140,19 +140,20 @@ uint32_t kvm_arch_get_supported_cpuid(KVMState *s, uint32_t function,
     for (i = 0; i < cpuid->nent; ++i) {
         if (cpuid->entries[i].function == function &&
             cpuid->entries[i].index == index) {
+            struct kvm_cpuid_entry2 *entry = &cpuid->entries[i];
             found = true;
             switch (reg) {
             case R_EAX:
-                ret = cpuid->entries[i].eax;
+                ret = entry->eax;
                 break;
             case R_EBX:
-                ret = cpuid->entries[i].ebx;
+                ret = entry->ebx;
                 break;
             case R_ECX:
-                ret = cpuid->entries[i].ecx;
+                ret = entry->ecx;
                 break;
             case R_EDX:
-                ret = cpuid->entries[i].edx;
+                ret = entry->edx;
                 break;
             }
         }