[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 24/29] target-i386: Group together level, xlevel, xl
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH 24/29] target-i386: Group together level, xlevel, xlevel2 fields |
Date: |
Thu, 2 May 2013 15:35:50 +0200 |
From: Eduardo Habkost <address@hidden>
Consolidate level, xlevel, xlevel2 fields in x86_def_t and CPUX86State.
Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
target-i386/cpu.c | 4 ++--
target-i386/cpu.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index bba41fe..081b579 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -350,6 +350,8 @@ static void add_flagname_to_bitmaps(const char *flagname,
typedef struct x86_def_t {
const char *name;
uint32_t level;
+ uint32_t xlevel;
+ uint32_t xlevel2;
/* vendor is zero-terminated, 12 character ASCII string */
char vendor[CPUID_VENDOR_SZ + 1];
int family;
@@ -357,11 +359,9 @@ typedef struct x86_def_t {
int stepping;
uint32_t features, ext_features, ext2_features, ext3_features;
uint32_t kvm_features, svm_features;
- uint32_t xlevel;
char model_id[48];
/* Store the results of Centaur's CPUID instructions */
uint32_t ext4_features;
- uint32_t xlevel2;
/* The feature bits on CPUID[EAX=7,ECX=0].EBX */
uint32_t cpuid_7_0_ebx_features;
} x86_def_t;
diff --git a/target-i386/cpu.h b/target-i386/cpu.h
index f193752..5d16428 100644
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -836,19 +836,19 @@ typedef struct CPUX86State {
/* processor features (e.g. for CPUID insn) */
uint32_t cpuid_level;
+ uint32_t cpuid_xlevel;
+ uint32_t cpuid_xlevel2;
uint32_t cpuid_vendor1;
uint32_t cpuid_vendor2;
uint32_t cpuid_vendor3;
uint32_t cpuid_version;
uint32_t cpuid_features;
uint32_t cpuid_ext_features;
- uint32_t cpuid_xlevel;
uint32_t cpuid_model[12];
uint32_t cpuid_ext2_features;
uint32_t cpuid_ext3_features;
uint32_t cpuid_apic_id;
/* Store the results of Centaur's CPUID instructions */
- uint32_t cpuid_xlevel2;
uint32_t cpuid_ext4_features;
/* Flags from CPUID[EAX=7,ECX=0].EBX */
uint32_t cpuid_7_0_ebx_features;
--
1.8.1.4
- [Qemu-devel] [PATCH 19/29] target-i386: Attach ICC bus to CPU on its creation, (continued)
- [Qemu-devel] [PATCH 19/29] target-i386: Attach ICC bus to CPU on its creation, Andreas Färber, 2013/05/02
- [Qemu-devel] [PATCH 22/29] QMP: Add cpu-add command, Andreas Färber, 2013/05/02
- [Qemu-devel] [PATCH 23/29] pc: Implement QEMUMachine::hot_add_cpu hook, Andreas Färber, 2013/05/02
- [Qemu-devel] [PATCH 29/29] Drop redundant resume_all_vcpus() from main(), Andreas Färber, 2013/05/02
- [Qemu-devel] [PATCH 18/29] target-i386: Introduce ICC bus/device/bridge, Andreas Färber, 2013/05/02
- [Qemu-devel] [PATCH 28/29] cpus: Fix pausing TCG CPUs while in vCPU thread, Andreas Färber, 2013/05/02
- [Qemu-devel] [PATCH 16/29] kvmvapic: Make dependency on sysbus.h explicit, Andreas Färber, 2013/05/02
- [Qemu-devel] [PATCH 25/29] target-i386/kvm.c: Code formatting changes, Andreas Färber, 2013/05/02
- [Qemu-devel] [PATCH 07/29] cpu: Introduce get_arch_id() method and override it for X86CPU, Andreas Färber, 2013/05/02
- [Qemu-devel] [PATCH 15/29] target-i386: Replace MSI_SPACE_SIZE with APIC_SPACE_SIZE, Andreas Färber, 2013/05/02
- [Qemu-devel] [PATCH 24/29] target-i386: Group together level, xlevel, xlevel2 fields,
Andreas Färber <=
- [Qemu-devel] [PATCH 26/29] target-i386: Break CPUID feature definition lines, Andreas Färber, 2013/05/02
- [Qemu-devel] [PATCH 17/29] cpu: Move cpu_write_elfXX_note() functions to CPUState, Andreas Färber, 2013/05/02
- [Qemu-devel] [PATCH 20/29] target-i386: Move APIC to ICC bus, Andreas Färber, 2013/05/02
- [Qemu-devel] [PATCH 27/29] target-i386: Replace cpuid_*features fields with a feature word array, Andreas Färber, 2013/05/02