From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44744) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyOf0-0007SD-7x for qemu-devel@nongnu.org; Fri, 29 May 2015 14:05:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YyOew-00074b-S9 for qemu-devel@nongnu.org; Fri, 29 May 2015 14:05:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41648) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyOew-00074V-O2 for qemu-devel@nongnu.org; Fri, 29 May 2015 14:05:30 -0400 From: Eduardo Habkost Date: Fri, 29 May 2015 15:04:24 -0300 Message-Id: <1432922664-15129-6-git-send-email-ehabkost@redhat.com> In-Reply-To: <1432922664-15129-1-git-send-email-ehabkost@redhat.com> References: <1432922664-15129-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PULL 5/5] arch_init: Drop target-x86_64.conf List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, Peter Maydell Cc: Paolo Bonzini , Ikey Doherty , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Richard Henderson From: Ikey Doherty The target-x86_64.conf sysconfig file has been empty and essentially ignored now for several years. This change removes the unused file to enable moving towards a stateless configuration. Signed-off-by: Ikey Doherty Acked-by: Paolo Bonzini Reviewed-by: Eduardo Habkost Signed-off-by: Eduardo Habkost --- Makefile | 7 +------ arch_init.c | 1 - sysconfigs/target/target-x86_64.conf | 0 3 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 sysconfigs/target/target-x86_64.conf diff --git a/Makefile b/Makefile index d945804..2d52536 100644 --- a/Makefile +++ b/Makefile @@ -389,13 +389,8 @@ ifneq (,$(findstring qemu-ga,$(TOOLS))) endif endif -install-confdir: - $(INSTALL_DIR) "$(DESTDIR)$(qemu_confdir)" -install-sysconfig: install-datadir install-confdir - $(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/target-x86_64.conf "$(DESTDIR)$(qemu_confdir)" - -install: all $(if $(BUILD_DOCS),install-doc) install-sysconfig \ +install: all $(if $(BUILD_DOCS),install-doc) \ install-datadir install-localstatedir ifneq ($(TOOLS),) $(call install-prog,$(TOOLS),$(DESTDIR)$(bindir)) diff --git a/arch_init.c b/arch_init.c index 23d3feb..b5d90a4 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 */ }; diff --git a/sysconfigs/target/target-x86_64.conf b/sysconfigs/target/target-x86_64.conf deleted file mode 100644 index e69de29..0000000 -- 2.1.0