Commit 97fe81d3 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'afaerber/qom-cpu' into staging 

* afaerber/qom-cpu:
  target-alpha: Initialize env->cpu_model_str
  target-i386: Drop unused setscalar() macro
  target-i386: Kill cpudef config section support
  target-i386: x86_cpudef_setup() coding style change
  Eliminate cpus-x86_64.conf file
  target-i386: Move CPU models from cpus-x86_64.conf to C
  target-i386: Add missing CPUID_* constants
  Drop cpu_list_id macro
  target-i386: Fold -cpu ?cpuid, ?model output into -cpu help, drop ?dump
  MAINTAINERS: Add entry for QOM CPU
parents d352210a 2b85cf0e

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -531,6 +531,12 @@ M: Anthony Liguori <aliguori@us.ibm.com> 
S: Maintained

F: qemu-char.c



CPU

M: Andreas Färber <afaerber@suse.de>

S: Supported

F: qom/cpu.c

F: include/qemu/cpu.h



Device Tree

M: Peter Crosthwaite <peter.crosthwaite@petalogix.com>

M: Alexander Graf <agraf@suse.de>

Makefile

+0 −1
Original line number Diff line number Diff line
@@ -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)"

arch_init.c

+0 −1
Original line number Diff line number Diff line
@@ -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 */

cpus.c

+2 −4
Original line number Diff line number Diff line
@@ -1192,10 +1192,8 @@ void set_cpu_log_filename(const char *optarg) 
void list_cpus(FILE *f, fprintf_function cpu_fprintf, const char *optarg)

{

    /* XXX: implement xxx_cpu_list for targets that still miss it */

#if defined(cpu_list_id)

    cpu_list_id(f, cpu_fprintf, optarg);

#elif defined(cpu_list)

    cpu_list(f, cpu_fprintf); /* deprecated */

#if defined(cpu_list)

    cpu_list(f, cpu_fprintf);

#endif

}

linux-user/main.c

+2 −4
Original line number Diff line number Diff line
@@ -3130,10 +3130,8 @@ static void handle_arg_cpu(const char *arg) 
    cpu_model = strdup(arg);

    if (cpu_model == NULL || is_help_option(cpu_model)) {

        /* XXX: implement xxx_cpu_list for targets that still miss it */

#if defined(cpu_list_id)

        cpu_list_id(stdout, &fprintf, "");

#elif defined(cpu_list)

        cpu_list(stdout, &fprintf); /* deprecated */

#if defined(cpu_list)

        cpu_list(stdout, &fprintf);

#endif

        exit(1);

    }