Patchwork [06/11] Eliminate cpus-x86_64.conf file

login
register
mail settings
Submitter Andreas Färber
Date Sept. 21, 2012, 2:38 p.m.
Message ID <1348238315-29748-7-git-send-email-afaerber@suse.de>
Download mbox | patch
Permalink /patch/185819/
State New
Headers show

Comments

Andreas Färber - Sept. 21, 2012, 2:38 p.m.
From: Eduardo Habkost <ehabkost@redhat.com>

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>
---
 Makefile                           |    1 -
 arch_init.c                        |    1 -
 sysconfigs/target/cpus-x86_64.conf |    1 -
 3 Dateien geändert, 3 Zeilen entfernt(-)
 delete mode 100644 sysconfigs/target/cpus-x86_64.conf

Patch

diff --git a/Makefile b/Makefile
index 971e92f..def2ae2 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 f849f9b..9904f95 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 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