diff options
| author | Peter Maydell | 2015-06-04 12:44:32 +0200 |
|---|---|---|
| committer | Peter Maydell | 2015-06-04 12:44:32 +0200 |
| commit | 6fa6b312765f698dc81b2c30e7eeb9683804a05b (patch) | |
| tree | 5d61ddafddac3c77c702b568c70040c3840fbe19 /arch_init.c | |
| parent | Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20150602'... (diff) | |
| parent | arch_init: Drop target-x86_64.conf (diff) | |
| download | qemu-6fa6b312765f698dc81b2c30e7eeb9683804a05b.tar.gz qemu-6fa6b312765f698dc81b2c30e7eeb9683804a05b.tar.xz qemu-6fa6b312765f698dc81b2c30e7eeb9683804a05b.zip | |
Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging
X86 queue 2015-06-02
# gpg: Signature made Tue Jun 2 20:21:17 2015 BST using RSA key ID 984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6
* remotes/ehabkost/tags/x86-pull-request:
arch_init: Drop target-x86_64.conf
target-i386: Register QOM properties for feature flags
apic: convert ->busdev.qdev casts to C casts
target-i386: Fix signedness of MSR_IA32_APICBASE_BASE
pc: Ensure non-zero CPU ref count after attaching to ICC bus
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
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 23d3feba44..b5d90a41fa 100644 --- a/arch_init.c +++ b/arch_init.c @@ -136,7 +136,6 @@ static struct defconfig_file { bool userconfig; } default_config_files[] = { { CONFIG_QEMU_CONFDIR "/qemu.conf", true }, - { CONFIG_QEMU_CONFDIR "/target-" TARGET_NAME ".conf", true }, { NULL }, /* end of list */ }; |