Skip to content
  • Peter Maydell's avatar
    c43e853a
    Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging · c43e853a
    Peter Maydell authored
    
    
    x86 and CPU queue, 2016-10-24
    
    x2APIC support to APIC code, cpu_exec_init() refactor on all
    architectures, and other x86 changes.
    
    # gpg: Signature made Mon 24 Oct 2016 20:51:14 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-pull-request:
      exec: call cpu_exec_exit() from a CPU unrealize common function
      exec: move cpu_exec_init() calls to realize functions
      exec: split cpu_exec_init()
      pc: q35: Bump max_cpus to 288
      pc: Require IRQ remapping and EIM if there could be x2APIC CPUs
      pc: Add 'etc/boot-cpus' fw_cfg file for machine with more than 255 CPUs
      Increase MAX_CPUMASK_BITS from 255 to 288
      pc: Clarify FW_CFG_MAX_CPUS usage comment
      pc: kvm_apic: Pass APIC ID depending on xAPIC/x2APIC mode
      pc: apic_common: Reset APIC ID to initial ID when switching into x2APIC mode
      pc: apic_common: Restore APIC ID to initial ID on reset
      pc: apic_common: Extend APIC ID property to 32bit
      pc: Leave max apic_id_limit only in legacy cpu hotplug code
      acpi: cphp: Force switch to modern cpu hotplug if APIC ID > 254
      pc: acpi: x2APIC support for SRAT table
      pc: acpi: x2APIC support for MADT table and _MAT method
    
    Conflicts:
    	target-arm/cpu.c
    
    Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
    c43e853a
    Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging
    Peter Maydell authored
    
    
    x86 and CPU queue, 2016-10-24
    
    x2APIC support to APIC code, cpu_exec_init() refactor on all
    architectures, and other x86 changes.
    
    # gpg: Signature made Mon 24 Oct 2016 20:51:14 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-pull-request:
      exec: call cpu_exec_exit() from a CPU unrealize common function
      exec: move cpu_exec_init() calls to realize functions
      exec: split cpu_exec_init()
      pc: q35: Bump max_cpus to 288
      pc: Require IRQ remapping and EIM if there could be x2APIC CPUs
      pc: Add 'etc/boot-cpus' fw_cfg file for machine with more than 255 CPUs
      Increase MAX_CPUMASK_BITS from 255 to 288
      pc: Clarify FW_CFG_MAX_CPUS usage comment
      pc: kvm_apic: Pass APIC ID depending on xAPIC/x2APIC mode
      pc: apic_common: Reset APIC ID to initial ID when switching into x2APIC mode
      pc: apic_common: Restore APIC ID to initial ID on reset
      pc: apic_common: Extend APIC ID property to 32bit
      pc: Leave max apic_id_limit only in legacy cpu hotplug code
      acpi: cphp: Force switch to modern cpu hotplug if APIC ID > 254
      pc: acpi: x2APIC support for SRAT table
      pc: acpi: x2APIC support for MADT table and _MAT method
    
    Conflicts:
    	target-arm/cpu.c
    
    Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Loading