From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:51990) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Swduz-0002Dx-IL for qemu-devel@nongnu.org; Wed, 01 Aug 2012 14:45:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SwduJ-0001NS-G8 for qemu-devel@nongnu.org; Wed, 01 Aug 2012 14:45:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:63642) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SwduJ-0001Mw-8l for qemu-devel@nongnu.org; Wed, 01 Aug 2012 14:44:31 -0400 From: Eduardo Habkost Date: Wed, 1 Aug 2012 15:45:28 -0300 Message-Id: <1343846728-8611-4-git-send-email-ehabkost@redhat.com> In-Reply-To: <1343846728-8611-1-git-send-email-ehabkost@redhat.com> References: <1343846728-8611-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH 3/3] eliminate cpus-x86_64.conf file List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Anthony Liguori 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 --- Makefile | 1 - arch_init.c | 1 - sysconfigs/target/cpus-x86_64.conf | 1 - 3 files changed, 3 deletions(-) delete mode 100644 sysconfigs/target/cpus-x86_64.conf diff --git a/Makefile b/Makefile index 621cb86..3722320 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 26f30ef..a8399e5 100644 --- a/arch_init.c +++ b/arch_init.c @@ -131,7 +131,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 3902189..0000000 --- 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 -- 1.7.11.2