On 26/05/15 17:25, Eduardo Habkost wrote:
On Tue, May 26, 2015 at 04:00:45PM +0200, Paolo Bonzini wrote:
CCing maintainer.
Paolo
On 26/05/2015 14:54, Ikey Doherty wrote:
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 <michael.i.dohe...@intel.com>
Can you separate this into two patches? First deleting the empty
target-x86_64.conf file from the tree & Makefile, then another patch
deleting the
{ CONFIG_QEMU_CONFDIR "/target-" TARGET_NAME ".conf", true }
line in arch_init.c?
Ack. End of day here, will submit a fresh patch-set tomorrow drawing
any further conversations had here into consideration.
We can delete sysconfigs/target/target-x86_64.conf from our source tree
immediately, but I am not sure we should disable loading of
/etc/qemu/target-*.conf with no warning (users may have their own
target-*.conf files in their systems).
Sure.
We should probably warn about it in the 2.4 release announcement, and
remove the arch_init.c line in 2.5.
I would even go further and argue for removing /etc/qemu config file
auto-loading entirely in QEMU 2.5 (including qemu.conf and
target-*.conf).
If that's needed/agreed-upon by tomorrow I can add that too, as another
patch.
-ikey
---
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
