Commit 32f0f68b authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/ehabkost/tags/x86-and-machine-pull-request' into staging 



x86, cpu queue, 2017-09-01

CPU creation refactor plus x86 patches.

# gpg: Signature made Fri 01 Sep 2017 15:59:02 BST
# gpg:                using RSA key 0x2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D C5A6

* remotes/ehabkost/tags/x86-and-machine-pull-request: (29 commits)
  ppc: replace cpu_ppc_init() with cpu_generic_init()
  unicore32: replace uc32_cpu_init() with cpu_generic_init()
  openrisc: replace cpu_openrisc_init() with cpu_generic_init()
  moxie: replace cpu_moxie_init() with cpu_generic_init()
  lm32: replace cpu_lm32_init() with cpu_generic_init()
  x86: replace cpu_x86_init() with cpu_generic_init()
  cris: replace cpu_cris_init() with cpu_generic_init()
  arm: replace cpu_arm_init() with cpu_generic_init()
  sh4: replace cpu_sh4_init() with cpu_generic_init()
  tricore: replace cpu_tricore_init() with cpu_generic_init()
  xtensa: replace cpu_xtensa_init() with cpu_generic_init()
  tilegx: replace cpu_tilegx_init() with cpu_generic_init()
  nios2: replace cpu_nios2_init() with cpu_generic_init()
  microblaze: replace cpu_mb_init() with cpu_generic_init()
  m68k: replace cpu_m68k_init() with cpu_generic_init()
  hppa: replace cpu_hppa_init() with cpu_generic_init()
  alpha: replace cpu_alpha_init() with cpu_generic_init()
  s390x: replace cpu_s390x_init() with cpu_generic_init()
  sparc: replace cpu_sparc_init() with cpu_generic_init()
  sparc: make cpu feature parsing property based
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 223cd0e1 84efa64c

backends/cryptodev.c

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ bool cryptodev_backend_is_ready(CryptoDevBackend *backend) 
}



static bool

cryptodev_backend_can_be_deleted(UserCreatable *uc, Error **errp)

cryptodev_backend_can_be_deleted(UserCreatable *uc)

{

    return !cryptodev_backend_is_used(CRYPTODEV_BACKEND(uc));

}

backends/hostmem.c

+1 −1
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ out: 
}



static bool

host_memory_backend_can_be_deleted(UserCreatable *uc, Error **errp)

host_memory_backend_can_be_deleted(UserCreatable *uc)

{

    if (host_memory_backend_is_mapped(MEMORY_BACKEND(uc))) {

        return false;

hmp-commands-info.hx

+4 −3
Original line number Diff line number Diff line
@@ -115,9 +115,10 @@ ETEXI 
#if defined(TARGET_I386)

    {

        .name       = "lapic",

        .args_type  = "",

        .params     = "",

        .help       = "show local apic state",

        .args_type  = "apic-id:i?",

        .params     = "[apic-id]",

        .help       = "show local apic state (apic-id: local apic to read, default is which of current CPU)",



        .cmd        = hmp_info_local_apic,

    },

#endif

hw/alpha/dp264.c

+6 −2
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static int clipper_pci_map_irq(PCIDevice *d, int irq_num) 
static void clipper_init(MachineState *machine)

{

    ram_addr_t ram_size = machine->ram_size;

    const char *cpu_model = machine->cpu_model;

    const char *cpu_model = machine->cpu_model ? machine->cpu_model : "ev67";

    const char *kernel_filename = machine->kernel_filename;

    const char *kernel_cmdline = machine->kernel_cmdline;

    const char *initrd_filename = machine->initrd_filename;
@@ -67,7 +67,11 @@ static void clipper_init(MachineState *machine) 
    /* Create up to 4 cpus.  */

    memset(cpus, 0, sizeof(cpus));

    for (i = 0; i < smp_cpus; ++i) {

        cpus[i] = cpu_alpha_init(cpu_model ? cpu_model : "ev67");

        cpus[i] = ALPHA_CPU(cpu_generic_init(TYPE_ALPHA_CPU, cpu_model));

        if (!cpus[i]) {

            error_report("Unable to find CPU definition");

            exit(1);

        }

    }



    cpus[0]->env.trap_arg0 = ram_size;

hw/arm/musicpal.c

+1 −1
Original line number Diff line number Diff line
@@ -1593,7 +1593,7 @@ static void musicpal_init(MachineState *machine) 
    if (!cpu_model) {

        cpu_model = "arm926";

    }

    cpu = cpu_arm_init(cpu_model);

    cpu = ARM_CPU(cpu_generic_init(TYPE_ARM_CPU, cpu_model));

    if (!cpu) {

        fprintf(stderr, "Unable to find CPU definition\n");

        exit(1);