From 98925a4e21e24e32171d1ba5ac2597d2d6931c63 Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Mon, 25 Feb 2008 11:30:14 +0200 Subject: Revert "kvm: qemu: fix host_cpuid() on x86_64" This reverts commit e2353e4100c19b68968a3f8d0350f929924d33db, which breaks cpuid on i386 hosts. Signed-off-by: Avi Kivity --- qemu-kvm-x86.c | 37 +++++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c index 3af86253d..37354fb73 100644 --- a/qemu-kvm-x86.c +++ b/qemu-kvm-x86.c @@ -427,19 +427,36 @@ static void host_cpuid(uint32_t function, uint32_t *eax, uint32_t *ebx, { uint32_t vec[4]; + vec[0] = function; + asm volatile ( #ifdef __x86_64__ - asm volatile("cpuid" - : "=a"(vec[0]), "=b"(vec[1]), "=c"(vec[2]), "=d"(vec[3]) - : "0"(function)); + "sub $128, %%rsp \n\t" /* skip red zone */ + "push %0; push %%rsi \n\t" + "push %%rax; push %%rbx; push %%rcx; push %%rdx \n\t" + "mov 8*5(%%rsp), %%rsi \n\t" + "mov (%%rsi), %%eax \n\t" + "cpuid \n\t" + "mov %%eax, (%%rsi) \n\t" + "mov %%ebx, 4(%%rsi) \n\t" + "mov %%ecx, 8(%%rsi) \n\t" + "mov %%edx, 12(%%rsi) \n\t" + "pop %%rdx; pop %%rcx; pop %%rbx; pop %%rax \n\t" + "pop %%rsi; pop %0 \n\t" + "add $128, %%rsp" #else - asm volatile("movl %%ebx, %%esi \n\t" - "cpuid \n\t" - "movl %%ebx, %1 \n\t" - "movl %%esi, %%ebx" - : "=a"(vec[0]), "=r"(vec[1]), "=c"(vec[2]), "=d"(vec[3]) - : "0"(function) - : "esi"); + "push %0; push %%esi \n\t" + "push %%eax; push %%ebx; push %%ecx; push %%edx \n\t" + "mov 4*5(%%esp), %%esi \n\t" + "mov (%%esi), %%eax \n\t" + "cpuid \n\t" + "mov %%eax, (%%esi) \n\t" + "mov %%ebx, 4(%%esi) \n\t" + "mov %%ecx, 8(%%esi) \n\t" + "mov %%edx, 12(%%esi) \n\t" + "pop %%edx; pop %%ecx; pop %%ebx; pop %%eax \n\t" + "pop %%esi; pop %0 \n\t" #endif + : : "rm"(vec) : "memory"); if (eax) *eax = vec[0]; if (ebx) -- cgit v1.2.3