diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2012-09-05 17:41:11 -0300 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2012-09-21 15:12:58 +0200 |
| commit | ba6212d8a809b89151a9d76b452b814836474029 (patch) | |
| tree | 686dd1f14b0cabd2527bf2511c8cc2d6afcafa11 | |
| parent | 3eca46420c9f727ea5c50086d50a610f939affe5 (diff) | |
| download | focaccia-qemu-ba6212d8a809b89151a9d76b452b814836474029.tar.gz focaccia-qemu-ba6212d8a809b89151a9d76b452b814836474029.zip | |
Eliminate cpus-x86_64.conf file
This file is not needed anymore, as QEMU won't ship any config-based cpudefs out of the box, relying only on the builtin CPU models. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> Signed-off-by: Andreas Färber <afaerber@suse.de>
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | arch_init.c | 1 | ||||
| -rw-r--r-- | sysconfigs/target/cpus-x86_64.conf | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/Makefile b/Makefile index 971e92fd79..def2ae23cd 100644 --- a/Makefile +++ b/Makefile @@ -298,7 +298,6 @@ install-confdir: install-sysconfig: install-datadir install-confdir $(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/target-x86_64.conf "$(DESTDIR)$(qemu_confdir)" - $(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/cpus-x86_64.conf "$(DESTDIR)$(qemu_datadir)" install: all $(if $(BUILD_DOCS),install-doc) install-sysconfig install-datadir $(INSTALL_DIR) "$(DESTDIR)$(bindir)" 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 */ diff --git a/sysconfigs/target/cpus-x86_64.conf b/sysconfigs/target/cpus-x86_64.conf deleted file mode 100644 index 3902189836..0000000000 --- a/sysconfigs/target/cpus-x86_64.conf +++ /dev/null @@ -1 +0,0 @@ -# The CPU models from this file are now built-in in the QEMU source code |