Commit 8ca27ce2 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

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

# By Igor Mammedov (21) and others
# Via Andreas Färber
* afaerber/qom-cpu: (29 commits)
  Drop redundant resume_all_vcpus() from main()
  cpus: Fix pausing TCG CPUs while in vCPU thread
  target-i386: Replace cpuid_*features fields with a feature word array
  target-i386: Break CPUID feature definition lines
  target-i386/kvm.c: Code formatting changes
  target-i386: Group together level, xlevel, xlevel2 fields
  pc: Implement QEMUMachine::hot_add_cpu hook
  QMP: Add cpu-add command
  Add hot_add_cpu hook to QEMUMachine
  target-i386: Move APIC to ICC bus
  target-i386: Attach ICC bus to CPU on its creation
  target-i386: Introduce ICC bus/device/bridge
  cpu: Move cpu_write_elfXX_note() functions to CPUState
  kvmvapic: Make dependency on sysbus.h explicit
  target-i386: Replace MSI_SPACE_SIZE with APIC_SPACE_SIZE
  target-i386: Do not allow to set apic-id once CPU is realized
  target-i386: Introduce apic-id CPU property
  target-i386: Introduce feat2prop() for CPU properties
  acpi_piix4: Add infrastructure to send CPU hot-plug GPE to guest
  cpu: Add helper cpu_exists(), to check if CPU with specified id exists
  ...
parents 0db4c324 e7bdf659

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -644,6 +644,12 @@ F: qom/cpu.c 
F: include/qemu/cpu.h

F: target-i386/cpu.c



ICC Bus

M: Igor Mammedov <imammedo@redhat.com>

S: Supported

F: include/hw/cpu/icc_bus.h

F: hw/cpu/icc_bus.c



Device Tree

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

M: Alexander Graf <agraf@suse.de>

Makefile.target

+7 −7
Original line number Diff line number Diff line
@@ -60,6 +60,12 @@ all: $(PROGS) stap 
# Dummy command so that make thinks it has done something

	@true



CONFIG_NO_PCI = $(if $(subst n,,$(CONFIG_PCI)),n,y)

CONFIG_NO_KVM = $(if $(subst n,,$(CONFIG_KVM)),n,y)

CONFIG_NO_XEN = $(if $(subst n,,$(CONFIG_XEN)),n,y)

CONFIG_NO_GET_MEMORY_MAPPING = $(if $(subst n,,$(CONFIG_HAVE_GET_MEMORY_MAPPING)),n,y)

CONFIG_NO_CORE_DUMP = $(if $(subst n,,$(CONFIG_HAVE_CORE_DUMP)),n,y)



#########################################################

# cpu emulator library

obj-y = exec.o translate-all.o cpu-exec.o
@@ -70,6 +76,7 @@ obj-y += fpu/softfloat.o 
obj-y += target-$(TARGET_BASE_ARCH)/

obj-y += disas.o

obj-$(CONFIG_GDBSTUB_XML) += gdbstub-xml.o

obj-$(CONFIG_NO_KVM) += kvm-stub.o



#########################################################

# Linux user emulator target
@@ -98,18 +105,11 @@ endif #CONFIG_BSD_USER 
#########################################################

# System emulator target

ifdef CONFIG_SOFTMMU

CONFIG_NO_PCI = $(if $(subst n,,$(CONFIG_PCI)),n,y)

CONFIG_NO_KVM = $(if $(subst n,,$(CONFIG_KVM)),n,y)

CONFIG_NO_XEN = $(if $(subst n,,$(CONFIG_XEN)),n,y)

CONFIG_NO_GET_MEMORY_MAPPING = $(if $(subst n,,$(CONFIG_HAVE_GET_MEMORY_MAPPING)),n,y)

CONFIG_NO_CORE_DUMP = $(if $(subst n,,$(CONFIG_HAVE_CORE_DUMP)),n,y)



obj-y += arch_init.o cpus.o monitor.o gdbstub.o balloon.o ioport.o

obj-y += qtest.o

obj-y += hw/

obj-$(CONFIG_FDT) += device_tree.o

obj-$(CONFIG_KVM) += kvm-all.o

obj-$(CONFIG_NO_KVM) += kvm-stub.o

obj-y += memory.o savevm.o cputlb.o

obj-$(CONFIG_HAVE_GET_MEMORY_MAPPING) += memory_mapping.o

obj-$(CONFIG_HAVE_CORE_DUMP) += dump.o

bsd-user/elfload.c

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ static const char *get_elf_platform(void) 


static uint32_t get_elf_hwcap(void)

{

  return thread_env->cpuid_features;

    return thread_env->features[FEAT_1_EDX];

}



#ifdef TARGET_X86_64

bsd-user/main.c

+2 −2
Original line number Diff line number Diff line
@@ -1004,13 +1004,13 @@ int main(int argc, char **argv) 


    env->cr[0] = CR0_PG_MASK | CR0_WP_MASK | CR0_PE_MASK;

    env->hflags |= HF_PE_MASK;

    if (env->cpuid_features & CPUID_SSE) {

    if (env->features[FEAT_1_EDX] & CPUID_SSE) {

        env->cr[4] |= CR4_OSFXSR_MASK;

        env->hflags |= HF_OSFXSR_MASK;

    }

#ifndef TARGET_ABI32

    /* enable 64 bit mode if possible */

    if (!(env->cpuid_ext2_features & CPUID_EXT2_LM)) {

    if (!(env->features[FEAT_8000_0001_EDX] & CPUID_EXT2_LM)) {

        fprintf(stderr, "The selected x86 CPU does not support 64 bit mode\n");

        exit(1);

    }

cpus.c

+17 −10
Original line number Diff line number Diff line
@@ -812,6 +812,12 @@ static void *qemu_dummy_cpu_thread_fn(void *arg) 


static void tcg_exec_all(void);



static void tcg_signal_cpu_creation(CPUState *cpu, void *data)

{

    cpu->thread_id = qemu_get_thread_id();

    cpu->created = true;

}



static void *qemu_tcg_cpu_thread_fn(void *arg)

{

    CPUState *cpu = arg;
@@ -820,13 +826,8 @@ static void *qemu_tcg_cpu_thread_fn(void *arg) 
    qemu_tcg_init_cpu_signals();

    qemu_thread_get_self(cpu->thread);



    /* signal CPU creation */

    qemu_mutex_lock(&qemu_global_mutex);

    for (env = first_cpu; env != NULL; env = env->next_cpu) {

        cpu = ENV_GET_CPU(env);

        cpu->thread_id = qemu_get_thread_id();

        cpu->created = true;

    }

    qemu_for_each_cpu(tcg_signal_cpu_creation, NULL);

    qemu_cond_signal(&qemu_cpu_cond);



    /* wait for initial kick-off after machine start */
@@ -973,9 +974,10 @@ void pause_all_vcpus(void) 
    if (qemu_in_vcpu_thread()) {

        cpu_stop_current();

        if (!kvm_enabled()) {

            penv = first_cpu;

            while (penv) {

                CPUState *pcpu = ENV_GET_CPU(penv);

                pcpu->stop = 0;

                pcpu->stop = false;

                pcpu->stopped = true;

                penv = penv->next_cpu;

            }
@@ -993,6 +995,13 @@ void pause_all_vcpus(void) 
    }

}



void cpu_resume(CPUState *cpu)

{

    cpu->stop = false;

    cpu->stopped = false;

    qemu_cpu_kick(cpu);

}



void resume_all_vcpus(void)

{

    CPUArchState *penv = first_cpu;
@@ -1000,9 +1009,7 @@ void resume_all_vcpus(void) 
    qemu_clock_enable(vm_clock, true);

    while (penv) {

        CPUState *pcpu = ENV_GET_CPU(penv);

        pcpu->stop = false;

        pcpu->stopped = false;

        qemu_cpu_kick(pcpu);

        cpu_resume(pcpu);

        penv = penv->next_cpu;

    }

}