Eduardo Habkost writes:
> On Wed, Aug 01, 2012 at 10:37:04PM +0300, Lluís Vilanova wrote:
>> Eduardo Habkost writes:
>>
>> > 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 621cb86..3722320 100644
>> > --- a/Makefile
>> > +++ b/Makefile
>> > @@ -298,7 +298,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 26f30ef..a8399e5 100644
>> > --- a/arch_init.c
>> > +++ b/arch_init.c
>> > @@ -131,7 +131,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
>> > --
>> > 1.7.11.2
>>
>> Without actually having looked at it, shouldn't the code handling its
>> parsing be
>> also removed?
> What's being removed is just the file for QEMU-provided cpudefs. The
> user may still add their own cpudef sections to the config files on
> /etc, or using -readconfig.
> (We can consider removing completely the support for [cpudef] config
> sections. If we do that, we will break compatibility with existing user
> configurations that use the feature).
True. Sorry for the confusion.
Lluis
--
"And it's much the same thing with knowledge, for whenever you learn
something new, the whole world becomes that much richer."
-- The Princess of Pure Reason, as told by Norton Juster in The Phantom
Tollbooth
