gwj / at91sam9263 · Commits

Commit 10781c09ed7ab6a0e36d7b8f1fbf7c49128eb177

Authored by aliguori
1 parent 57003085

x86: fix warning without CONFIG_KVM (Mark McLoughlin) 

Warning is:

 target-i386/helper.c: In function `cpu_x86_cpuid':
 target-i386/helper.c:1373: warning: implicit declaration of function `host_cpuid'

Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>



git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5718 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
target-i386/helper.c
  View file @10781c0
@@ -1296,10 +1296,10 @@ target_phys_addr_t cpu_get_phys_page_debug(CPUState *env, target_ulong addr) @@ -1296,10 +1296,10 @@ target_phys_addr_t cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
1296 } 1296 }
1297 #endif /* !CONFIG_USER_ONLY */ 1297 #endif /* !CONFIG_USER_ONLY */
1298 1298
1299 -#if defined(CONFIG_KVM)  
1300 static void host_cpuid(uint32_t function, uint32_t *eax, uint32_t *ebx, 1299 static void host_cpuid(uint32_t function, uint32_t *eax, uint32_t *ebx,
1301 uint32_t *ecx, uint32_t *edx) 1300 uint32_t *ecx, uint32_t *edx)
1302 { 1301 {
  1302 +#if defined(CONFIG_KVM)
1303 uint32_t vec[4]; 1303 uint32_t vec[4];
1304 1304
1305 #ifdef __x86_64__ 1305 #ifdef __x86_64__
@@ -1327,8 +1327,8 @@ static void host_cpuid(uint32_t function, uint32_t *eax, uint32_t *ebx, @@ -1327,8 +1327,8 @@ static void host_cpuid(uint32_t function, uint32_t *eax, uint32_t *ebx,
1327 *ecx = vec[2]; 1327 *ecx = vec[2];
1328 if (edx) 1328 if (edx)
1329 *edx = vec[3]; 1329 *edx = vec[3];
1330 -}  
1331 #endif 1330 #endif
  1331 +}
1332 1332
1333 void cpu_x86_cpuid(CPUX86State *env, uint32_t index, 1333 void cpu_x86_cpuid(CPUX86State *env, uint32_t index,
1334 uint32_t *eax, uint32_t *ebx, 1334 uint32_t *eax, uint32_t *ebx,