On Wed, 5 Sep 2012 17:41:11 -0300
Eduardo Habkost <ehabk...@redhat.com> wrote:
> This file is not needed anymore, as QEMU won't ship any config-based
> cpudefs out of the box, relying only on the builtin CPU models.
>
> Signed-off-by: Eduardo Habkost <ehabk...@redhat.com>
> ---
> Makefile | 1 -
> arch_init.c | 1 -
> sysconfigs/target/cpus-x86_64.conf | 1 -
> 3 files changed, 3 deletions(-)
> delete mode 100644 sysconfigs/target/cpus-x86_64.conf
>
> diff --git a/Makefile b/Makefile
> index 1cd5bc8..a8d9236 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -297,7 +297,6 @@ install-confdir:
>
> install-sysconfig: install-datadir install-confdir
> $(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/target-x86_64.conf
> "$(DESTDIR)$(qemu_confdir)"
> - $(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/cpus-x86_64.conf
> "$(DESTDIR)$(qemu_datadir)"
> install: all $(if $(BUILD_DOCS),install-doc) install-sysconfig
> install-datadir $(INSTALL_DIR) "$(DESTDIR)$(bindir)"
> diff --git a/arch_init.c b/arch_init.c
> index 5a1173e..510d3ef 100644
> --- a/arch_init.c
> +++ b/arch_init.c
> @@ -136,7 +136,6 @@ static struct defconfig_file {
> /* Indicates it is an user config file (disabled by -no-user-config) */
> bool userconfig;
> } default_config_files[] = {
> - { CONFIG_QEMU_DATADIR "/cpus-" TARGET_ARCH ".conf", false },
> { CONFIG_QEMU_CONFDIR "/qemu.conf", true },
> { CONFIG_QEMU_CONFDIR "/target-" TARGET_ARCH ".conf", true },
> { NULL }, /* end of list */
> diff --git a/sysconfigs/target/cpus-x86_64.conf
> b/sysconfigs/target/cpus-x86_64.conf deleted file mode 100644
> index 3902189..0000000
> --- a/sysconfigs/target/cpus-x86_64.conf
> +++ /dev/null
> @@ -1 +0,0 @@
> -# The CPU models from this file are now built-in in the QEMU source code
Reviewed-by: Igor Mammedov <imamm...@redhat.com>
