diff options
| author | Anthony Liguori | 2012-09-25 23:06:16 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2012-09-25 23:06:16 +0200 |
| commit | 97fe81d3e8613be13754ff096c16b73010fd60ad (patch) | |
| tree | ba81dd99c4b379c58b3aa362bef351a319075281 /arch_init.c | |
| parent | Merge remote-tracking branch 'bonzini/scsi-next' into staging (diff) | |
| parent | target-alpha: Initialize env->cpu_model_str (diff) | |
| download | qemu-97fe81d3e8613be13754ff096c16b73010fd60ad.tar.gz qemu-97fe81d3e8613be13754ff096c16b73010fd60ad.tar.xz qemu-97fe81d3e8613be13754ff096c16b73010fd60ad.zip | |
Merge remote-tracking branch 'afaerber/qom-cpu' into staging
* afaerber/qom-cpu:
target-alpha: Initialize env->cpu_model_str
target-i386: Drop unused setscalar() macro
target-i386: Kill cpudef config section support
target-i386: x86_cpudef_setup() coding style change
Eliminate cpus-x86_64.conf file
target-i386: Move CPU models from cpus-x86_64.conf to C
target-i386: Add missing CPUID_* constants
Drop cpu_list_id macro
target-i386: Fold -cpu ?cpuid, ?model output into -cpu help, drop ?dump
MAINTAINERS: Add entry for QOM CPU
Diffstat (limited to 'arch_init.c')
| -rw-r--r-- | arch_init.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch_init.c b/arch_init.c index f849f9b872..9904f95478 100644 --- a/arch_init.c +++ b/arch_init.c @@ -136,7 +136,6 @@ static struct defconfig_file { /* Indicates it is an user config file (disabled by -no-user-config) */ bool userconfig; } default_config_files[] = { - { CONFIG_QEMU_DATADIR "/cpus-" TARGET_ARCH ".conf", false }, { CONFIG_QEMU_CONFDIR "/qemu.conf", true }, { CONFIG_QEMU_CONFDIR "/target-" TARGET_ARCH ".conf", true }, { NULL }, /* end of list */ |