Commit b91f0f25 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging 



pc, pci, virtio: fixes for rc1

A bunch of fixes all over the place.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>

# gpg: Signature made Thu 16 Nov 2017 16:37:21 GMT
# gpg:                using RSA key 0x281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17  0970 C350 3912 AFBE 8E67
#      Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA  8A0D 281F 0DB8 D28D 5469

* remotes/mst/tags/for_upstream:
  tests/bios-tables-test: Fix endianess problems when passing data to iasl
  build-sys: restrict vmcoreinfo to fw_cfg+dma capable targets
  vmcoreinfo: put it in the 'misc' device category
  NUMA: Enable adding NUMA node implicitly
  tests/acpi-test-data: update _CRS in DSDT
  hw/pcie-pci-bridge: restrict to X86 and ARM
  hw/pci-host: Fix x86 Host Bridges 64bit PCI hole
  pci: Initialize pci_dev->name before use
  fix: unrealize virtio device if we fail to hotplug it

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents afdad8b6 3831c07b

default-configs/arm-softmmu.mak

+2 −0
Original line number Diff line number Diff line
@@ -130,3 +130,5 @@ CONFIG_SMBIOS=y 
CONFIG_ASPEED_SOC=y

CONFIG_GPIO_KEY=y

CONFIG_MSF2=y



CONFIG_FW_CFG_DMA=y

default-configs/i386-softmmu.mak

+1 −0
Original line number Diff line number Diff line
@@ -60,3 +60,4 @@ CONFIG_SMBIOS=y 
CONFIG_HYPERV_TESTDEV=$(CONFIG_KVM)

CONFIG_PXB=y

CONFIG_ACPI_VMGENID=y

CONFIG_FW_CFG_DMA=y

default-configs/x86_64-softmmu.mak

+1 −0
Original line number Diff line number Diff line
@@ -60,3 +60,4 @@ CONFIG_SMBIOS=y 
CONFIG_HYPERV_TESTDEV=$(CONFIG_KVM)

CONFIG_PXB=y

CONFIG_ACPI_VMGENID=y

CONFIG_FW_CFG_DMA=y

hw/i386/pc.c

+23 −0
Original line number Diff line number Diff line
@@ -1448,6 +1448,28 @@ void pc_memory_init(PCMachineState *pcms, 
    pcms->ioapic_as = &address_space_memory;

}



/*

 * The 64bit pci hole starts after "above 4G RAM" and

 * potentially the space reserved for memory hotplug.

 */

uint64_t pc_pci_hole64_start(void)

{

    PCMachineState *pcms = PC_MACHINE(qdev_get_machine());

    PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms);

    uint64_t hole64_start = 0;



    if (pcmc->has_reserved_memory && pcms->hotplug_memory.base) {

        hole64_start = pcms->hotplug_memory.base;

        if (!pcmc->broken_reserved_end) {

            hole64_start += memory_region_size(&pcms->hotplug_memory.mr);

        }

    } else {

        hole64_start = 0x100000000ULL + pcms->above_4g_mem_size;

    }



    return ROUND_UP(hole64_start, 1ULL << 30);

}



qemu_irq pc_allocate_cpu_irq(void)

{

    return qemu_allocate_irq(pic_irq_request, NULL, 0);
@@ -2325,6 +2347,7 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) 
    mc->cpu_index_to_instance_props = pc_cpu_index_to_props;

    mc->get_default_cpu_node_id = pc_get_default_cpu_node_id;

    mc->possible_cpu_arch_ids = pc_possible_cpu_arch_ids;

    mc->auto_enable_numa_with_memhp = true;

    mc->has_hotpluggable_cpus = true;

    mc->default_boot_order = "cad";

    mc->hot_add_cpu = pc_hot_add_cpu;

hw/i386/pc_piix.c

+1 −0
Original line number Diff line number Diff line
@@ -446,6 +446,7 @@ static void pc_i440fx_2_10_machine_options(MachineClass *m) 
    m->is_default = 0;

    m->alias = NULL;

    SET_MACHINE_COMPAT(m, PC_COMPAT_2_10);

    m->auto_enable_numa_with_memhp = false;

}



DEFINE_I440FX_MACHINE(v2_10, "pc-i440fx-2.10", NULL,