diff options
| author | Ikey Doherty <michael.i.doherty@intel.com> | 2015-05-26 13:54:06 +0100 |
|---|---|---|
| committer | Eduardo Habkost <ehabkost@redhat.com> | 2015-06-02 15:15:52 -0300 |
| commit | 1b93c9a1040b3c12320cf55c6284882a2e6e8ff3 (patch) | |
| tree | 0a1372e58464a03d6367f532a77657f12bc560d8 | |
| parent | 38e5c119c2925812bd441450ab9e5e00fc79e662 (diff) | |
| download | focaccia-qemu-1b93c9a1040b3c12320cf55c6284882a2e6e8ff3.tar.gz focaccia-qemu-1b93c9a1040b3c12320cf55c6284882a2e6e8ff3.zip | |
arch_init: Drop target-x86_64.conf
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.doherty@intel.com> Acked-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | arch_init.c | 1 | ||||
| -rw-r--r-- | sysconfigs/target/target-x86_64.conf | 0 |
3 files changed, 1 insertions, 7 deletions
diff --git a/Makefile b/Makefile index d94580404c..2d5253680c 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 23d3feba44..b5d90a41fa 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 e69de29bb2..0000000000 --- a/sysconfigs/target/target-x86_64.conf +++ /dev/null |