Commit 4ff1fac4 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

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

QOM CPUState refactorings

* Fix x86 cpu-add
* Change KVM PMU behavior for 1.6

# gpg: Signature made Mon 29 Jul 2013 10:28:18 AM CDT using RSA key ID 3E7E013F
# gpg: Can't check signature: public key not found

# By Eduardo Habkost (2) and Andreas Färber (1)
# Via Andreas Färber
* afaerber/tags/qom-cpu-for-anthony:
  target-i386: Disable PMU CPUID leaf by default
  target-i386: Pass X86CPU object to cpu_x86_find_by_name()
  cpu: Partially revert "cpu: Change qemu_init_vcpu() argument to CPUState"
parents 3a1da42e 9337e3b6

include/hw/i386/pc.h

+4 −0
Original line number Diff line number Diff line
@@ -235,6 +235,10 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t); 
            .driver   = "virtio-net-pci",\

            .property = "any_layout",\

            .value    = "off",\

        },{\

            .driver = TYPE_X86_CPU,\

            .property = "pmu",\

            .value = "on",\

        }



#define PC_COMPAT_1_4 \

qom/cpu.c

+0 −2
Original line number Diff line number Diff line
@@ -228,8 +228,6 @@ static void cpu_common_realizefn(DeviceState *dev, Error **errp) 
{

    CPUState *cpu = CPU(dev);



    qemu_init_vcpu(cpu);



    if (dev->hotplugged) {

        cpu_synchronize_post_init(cpu);

        notifier_list_notify(&cpu_added_notifiers, dev);

target-alpha/cpu.c

+3 −0
Original line number Diff line number Diff line
@@ -33,8 +33,11 @@ static void alpha_cpu_set_pc(CPUState *cs, vaddr value) 


static void alpha_cpu_realizefn(DeviceState *dev, Error **errp)

{

    CPUState *cs = CPU(dev);

    AlphaCPUClass *acc = ALPHA_CPU_GET_CLASS(dev);



    qemu_init_vcpu(cs);



    acc->parent_realize(dev, errp);

}

target-arm/cpu.c

+3 −1
Original line number Diff line number Diff line
@@ -159,6 +159,7 @@ static void arm_cpu_finalizefn(Object *obj) 


static void arm_cpu_realizefn(DeviceState *dev, Error **errp)

{

    CPUState *cs = CPU(dev);

    ARMCPU *cpu = ARM_CPU(dev);

    ARMCPUClass *acc = ARM_CPU_GET_CLASS(dev);

    CPUARMState *env = &cpu->env;
@@ -214,7 +215,8 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp) 


    init_cpreg_list(cpu);



    cpu_reset(CPU(cpu));

    cpu_reset(cs);

    qemu_init_vcpu(cs);



    acc->parent_realize(dev, errp);

}

target-cris/cpu.c

+3 −2
Original line number Diff line number Diff line
@@ -137,10 +137,11 @@ void cris_cpu_list(FILE *f, fprintf_function cpu_fprintf) 


static void cris_cpu_realizefn(DeviceState *dev, Error **errp)

{

    CRISCPU *cpu = CRIS_CPU(dev);

    CPUState *cs = CPU(dev);

    CRISCPUClass *ccc = CRIS_CPU_GET_CLASS(dev);



    cpu_reset(CPU(cpu));

    cpu_reset(cs);

    qemu_init_vcpu(cs);



    ccc->parent_realize(dev, errp);

}