diff options
| author | Peter Maydell | 2016-05-24 14:06:32 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-05-24 14:06:33 +0200 |
| commit | 287db79df8af8e31f18e262feb5e05103a09e4d4 (patch) | |
| tree | 6dfb7a7530923d0c1b1995043c4227f1b2f8831a /linux-user | |
| parent | Merge remote-tracking branch 'remotes/amit-migration/tags/migration-2.7-1' in... (diff) | |
| parent | target-i386: kvm: Eliminate kvm_msr_entry_set() (diff) | |
| download | qemu-287db79df8af8e31f18e262feb5e05103a09e4d4.tar.gz qemu-287db79df8af8e31f18e262feb5e05103a09e4d4.tar.xz qemu-287db79df8af8e31f18e262feb5e05103a09e4d4.zip | |
Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging
X86 queue, 2016-05-23
# gpg: Signature made Mon 23 May 2016 23:48:27 BST using RSA key ID 984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
* remotes/ehabkost/tags/x86-pull-request:
target-i386: kvm: Eliminate kvm_msr_entry_set()
target-i386: kvm: Simplify MSR setting functions
target-i386: kvm: Simplify MSR array construction
target-i386: kvm: Increase MSR_BUF_SIZE
target-i386: kvm: Allocate kvm_msrs struct once per VCPU
target-i386: Call cpu_exec_init() on realize
target-i386: Move TCG initialization to realize time
target-i386: Move TCG initialization check to tcg_x86_init()
cpu: Eliminate cpudef_init(), cpudef_setup()
target-i386: Set constant model_id for qemu64/qemu32/athlon
pc: Set CPU model-id on compat_props for pc <= 2.4
osdep: Move default qemu_hw_version() value to a macro
target-i386: kvm: Use X86XSaveArea struct for xsave save/load
target-i386: Use xsave structs for ext_save_area
target-i386: Define structs for layout of xsave area
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user')
| -rw-r--r-- | linux-user/main.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/linux-user/main.c b/linux-user/main.c index ba38aed431..95ed11d85c 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -4154,9 +4154,6 @@ int main(int argc, char **argv, char **envp) } cpu_model = NULL; -#if defined(cpudef_setup) - cpudef_setup(); /* parse cpu definitions in target config file (TBD) */ -#endif srand(time(NULL)); |