[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 03/13] cpuid: moved host_cpuid function and remo
From: |
Aurelien Jarno |
Subject: |
Re: [Qemu-devel] [PATCH 03/13] cpuid: moved host_cpuid function and remove prototype |
Date: |
Sat, 6 Mar 2010 19:26:15 +0100 |
User-agent: |
Mutt/1.5.20 (2009-06-14) |
On Tue, Feb 02, 2010 at 11:08:11AM +0100, Andre Przywara wrote:
> the host_cpuid function was located at the end of the file and had
> a prototype before it's first use. Move it up and remove the
> prototype.
>
> Signed-off-by: Andre Przywara <address@hidden>
Acked-by: Aurelien Jarno <address@hidden>
> ---
> target-i386/cpuid.c | 70 ++++++++++++++++++++++++--------------------------
> 1 files changed, 34 insertions(+), 36 deletions(-)
>
> diff --git a/target-i386/cpuid.c b/target-i386/cpuid.c
> index 0a17020..cc080f4 100644
> --- a/target-i386/cpuid.c
> +++ b/target-i386/cpuid.c
> @@ -338,8 +338,40 @@ static x86_def_t x86_defs[] = {
> },
> };
>
> -static void host_cpuid(uint32_t function, uint32_t count, uint32_t *eax,
> - uint32_t *ebx, uint32_t *ecx, uint32_t *edx);
> +static void host_cpuid(uint32_t function, uint32_t count,
> + uint32_t *eax, uint32_t *ebx,
> + uint32_t *ecx, uint32_t *edx)
> +{
> +#if defined(CONFIG_KVM)
> + uint32_t vec[4];
> +
> +#ifdef __x86_64__
> + asm volatile("cpuid"
> + : "=a"(vec[0]), "=b"(vec[1]),
> + "=c"(vec[2]), "=d"(vec[3])
> + : "0"(function), "c"(count) : "cc");
> +#else
> + asm volatile("pusha \n\t"
> + "cpuid \n\t"
> + "mov %%eax, 0(%2) \n\t"
> + "mov %%ebx, 4(%2) \n\t"
> + "mov %%ecx, 8(%2) \n\t"
> + "mov %%edx, 12(%2) \n\t"
> + "popa"
> + : : "a"(function), "c"(count), "S"(vec)
> + : "memory", "cc");
> +#endif
> +
> + if (eax)
> + *eax = vec[0];
> + if (ebx)
> + *ebx = vec[1];
> + if (ecx)
> + *ecx = vec[2];
> + if (edx)
> + *edx = vec[3];
> +#endif
> +}
>
> static int cpu_x86_fill_model_id(char *str)
> {
> @@ -578,40 +610,6 @@ int cpu_x86_register (CPUX86State *env, const char
> *cpu_model)
> return 0;
> }
>
> -static void host_cpuid(uint32_t function, uint32_t count,
> - uint32_t *eax, uint32_t *ebx,
> - uint32_t *ecx, uint32_t *edx)
> -{
> -#if defined(CONFIG_KVM)
> - uint32_t vec[4];
> -
> -#ifdef __x86_64__
> - asm volatile("cpuid"
> - : "=a"(vec[0]), "=b"(vec[1]),
> - "=c"(vec[2]), "=d"(vec[3])
> - : "0"(function), "c"(count) : "cc");
> -#else
> - asm volatile("pusha \n\t"
> - "cpuid \n\t"
> - "mov %%eax, 0(%2) \n\t"
> - "mov %%ebx, 4(%2) \n\t"
> - "mov %%ecx, 8(%2) \n\t"
> - "mov %%edx, 12(%2) \n\t"
> - "popa"
> - : : "a"(function), "c"(count), "S"(vec)
> - : "memory", "cc");
> -#endif
> -
> - if (eax)
> - *eax = vec[0];
> - if (ebx)
> - *ebx = vec[1];
> - if (ecx)
> - *ecx = vec[2];
> - if (edx)
> - *edx = vec[3];
> -#endif
> -}
>
> static void get_cpuid_vendor(CPUX86State *env, uint32_t *ebx,
> uint32_t *ecx, uint32_t *edx)
> --
> 1.6.4
>
>
>
>
>
--
Aurelien Jarno GPG: 1024D/F1BCDB73
address@hidden http://www.aurel32.net
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Re: [Qemu-devel] [PATCH 03/13] cpuid: moved host_cpuid function and remove prototype,
Aurelien Jarno <=