[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 5/5] arch_init: Drop target-x86_64.conf
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 5/5] arch_init: Drop target-x86_64.conf |
Date: |
Tue, 2 Jun 2015 16:22:08 -0300 |
From: Ikey Doherty <address@hidden>
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 <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
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
- [Qemu-devel] [PULL 0/5] X86 queue 2015-06-02, Eduardo Habkost, 2015/06/02
- [Qemu-devel] [PULL 1/5] pc: Ensure non-zero CPU ref count after attaching to ICC bus, Eduardo Habkost, 2015/06/02
- [Qemu-devel] [PULL 2/5] target-i386: Fix signedness of MSR_IA32_APICBASE_BASE, Eduardo Habkost, 2015/06/02
- [Qemu-devel] [PULL 3/5] apic: convert ->busdev.qdev casts to C casts, Eduardo Habkost, 2015/06/02
- [Qemu-devel] [PULL 4/5] target-i386: Register QOM properties for feature flags, Eduardo Habkost, 2015/06/02
- [Qemu-devel] [PULL 5/5] arch_init: Drop target-x86_64.conf,
Eduardo Habkost <=
- Re: [Qemu-devel] [PULL 0/5] X86 queue 2015-06-02, Peter Maydell, 2015/06/04