Re: [Qemu-devel] [PATCH v3 1/2] arch_init: Drop target-x86_64.conf

[Eduardo Habkost]

On Tue, May 26, 2015 at 01:54:06PM +0100, 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 <address@hidden>

Reviewed-by: Eduardo Habkost <address@hidden>

I am queueing it in the x86 tree. Thanks!

> ---
>  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
> -- 
> 1.9.1
> 
> 

-- 
Eduardo