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

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



x86 and machine queue, 2019-10-15

Features:
* Snowridge-v2 (no MPX) CPU model (Xiaoyao Li)

Bug fixes:
* cpu-plug-test: fix device_add for pc/q35 machines (Igor Mammedov)
* Fix legacy guest with xsave panic on older Linux kernel (Bingsong Si)
* Omit all-zeroes entries from KVM CPUID table (Eduardo Habkost)

Cleanups:
* Convert reset handlers to DeviceReset (Philippe Mathieu-Daudé)
* MachineClass::auto_enable_numa field (Tao Xu)
* target/i386/cpu.h cleanups (Tao Xu)
* memory_device_get_free_addr() cleanups (Wei Yang)

# gpg: Signature made Tue 15 Oct 2019 22:35:43 BST
# gpg:                using RSA key 5A322FD5ABC4D3DBACCFD1AA2807936F984DC5A6
# gpg:                issuer "ehabkost@redhat.com"
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" [full]
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D C5A6

* remotes/ehabkost/tags/machine-next-pull-request:
  target/i386: Add Snowridge-v2 (no MPX) CPU model
  i386: Omit all-zeroes entries from KVM CPUID table
  i386: Fix legacy guest with xsave panic on host kvm without update cpuid.
  target/i386: drop the duplicated definition of cpuid AVX512_VBMI macro
  target/i386: clean up comments over 80 chars per line
  memory-device: break the loop if tmp exceed the hinted range
  memory-device: not necessary to use goto for the last check
  hw/misc/vmcoreinfo: Add comment about reset handler
  hw/input/lm832x: Convert reset handler to DeviceReset
  hw/isa/vt82c686: Convert reset handler to DeviceReset
  hw/ide/via82c: Convert reset handler to DeviceReset
  hw/ide/sii3112: Convert reset handler to DeviceReset
  hw/ide/piix: Convert reset handler to DeviceReset
  hw/isa/piix4: Convert reset handler to DeviceReset
  hw/acpi/piix4: Convert reset handler to DeviceReset
  numa: Introduce MachineClass::auto_enable_numa for implicit NUMA node
  tests: cpu-plug-test: fix device_add for pc/q35 machines
  tests: add qtest_qmp_device_add_qdict() helper

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents f22f553e 69edb0f3

hw/acpi/piix4.c

+3 −4
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include "hw/pci/pci.h"

#include "hw/qdev-properties.h"

#include "hw/acpi/acpi.h"

#include "sysemu/reset.h"

#include "sysemu/runstate.h"

#include "sysemu/sysemu.h"

#include "qapi/error.h"
@@ -344,9 +343,9 @@ static const VMStateDescription vmstate_acpi = { 
    }

};



static void piix4_reset(void *opaque)

static void piix4_pm_reset(DeviceState *dev)

{

    PIIX4PMState *s = opaque;

    PIIX4PMState *s = PIIX4_PM(dev);

    PCIDevice *d = PCI_DEVICE(s);

    uint8_t *pci_conf = d->config;
@@ -542,7 +541,6 @@ static void piix4_pm_realize(PCIDevice *dev, Error **errp) 


    s->machine_ready.notify = piix4_pm_machine_ready;

    qemu_add_machine_init_done_notifier(&s->machine_ready);

    qemu_register_reset(piix4_reset, s);



    piix4_acpi_system_hot_add_init(pci_address_space_io(dev),

                                   pci_get_bus(dev), s);
@@ -692,6 +690,7 @@ static void piix4_pm_class_init(ObjectClass *klass, void *data) 
    k->device_id = PCI_DEVICE_ID_INTEL_82371AB_3;

    k->revision = 0x03;

    k->class_id = PCI_CLASS_BRIDGE_OTHER;

    dc->reset = piix4_pm_reset;

    dc->desc = "PM";

    dc->vmsd = &vmstate_acpi;

    dc->props = piix4_pm_properties;

hw/core/numa.c

+8 −2
Original line number Diff line number Diff line
@@ -378,11 +378,17 @@ void numa_complete_configuration(MachineState *ms) 
     *   guest tries to use it with that drivers.

     *

     * Enable NUMA implicitly by adding a new NUMA node automatically.

     *

     * Or if MachineClass::auto_enable_numa is true and no NUMA nodes,

     * assume there is just one node with whole RAM.

     */

    if (ms->ram_slots > 0 && ms->numa_state->num_nodes == 0 &&

        mc->auto_enable_numa_with_memhp) {

    if (ms->numa_state->num_nodes == 0 &&

        ((ms->ram_slots > 0 &&

        mc->auto_enable_numa_with_memhp) ||

        mc->auto_enable_numa)) {

            NumaNodeOptions node = { };

            parse_numa_node(ms, &node, &error_abort);

            numa_info[0].node_mem = ram_size;

    }



    assert(max_numa_nodeid <= MAX_NODES);

hw/ide/piix.c

+4 −5
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 
#include "sysemu/block-backend.h"

#include "sysemu/blockdev.h"

#include "sysemu/dma.h"

#include "sysemu/reset.h"



#include "hw/ide/pci.h"

#include "trace.h"
@@ -103,9 +102,9 @@ static void bmdma_setup_bar(PCIIDEState *d) 
    }

}



static void piix3_reset(void *opaque)

static void piix_ide_reset(DeviceState *dev)

{

    PCIIDEState *d = opaque;

    PCIIDEState *d = PCI_IDE(dev);

    PCIDevice *pd = PCI_DEVICE(d);

    uint8_t *pci_conf = pd->config;

    int i;
@@ -154,8 +153,6 @@ static void pci_piix_ide_realize(PCIDevice *dev, Error **errp) 


    pci_conf[PCI_CLASS_PROG] = 0x80; // legacy ATA mode



    qemu_register_reset(piix3_reset, d);



    bmdma_setup_bar(d);

    pci_register_bar(dev, 4, PCI_BASE_ADDRESS_SPACE_IO, &d->bmdma_bar);
@@ -247,6 +244,7 @@ static void piix3_ide_class_init(ObjectClass *klass, void *data) 
    DeviceClass *dc = DEVICE_CLASS(klass);

    PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);



    dc->reset = piix_ide_reset;

    k->realize = pci_piix_ide_realize;

    k->exit = pci_piix_ide_exitfn;

    k->vendor_id = PCI_VENDOR_ID_INTEL;
@@ -273,6 +271,7 @@ static void piix4_ide_class_init(ObjectClass *klass, void *data) 
    DeviceClass *dc = DEVICE_CLASS(klass);

    PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);



    dc->reset = piix_ide_reset;

    k->realize = pci_piix_ide_realize;

    k->exit = pci_piix_ide_exitfn;

    k->vendor_id = PCI_VENDOR_ID_INTEL;

hw/ide/sii3112.c

+3 −4
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include "qemu/osdep.h"

#include "hw/ide/pci.h"

#include "qemu/module.h"

#include "sysemu/reset.h"

#include "trace.h"



#define TYPE_SII3112_PCI "sii3112"
@@ -237,9 +236,9 @@ static void sii3112_set_irq(void *opaque, int channel, int level) 
    sii3112_update_irq(s);

}



static void sii3112_reset(void *opaque)

static void sii3112_reset(DeviceState *dev)

{

    SiI3112PCIState *s = opaque;

    SiI3112PCIState *s = SII3112_PCI(dev);

    int i;



    for (i = 0; i < 2; i++) {
@@ -290,7 +289,6 @@ static void sii3112_pci_realize(PCIDevice *dev, Error **errp) 
        s->bmdma[i].bus = &s->bus[i];

        ide_register_restart_cb(&s->bus[i]);

    }

    qemu_register_reset(sii3112_reset, s);

}



static void sii3112_pci_class_init(ObjectClass *klass, void *data)
@@ -303,6 +301,7 @@ static void sii3112_pci_class_init(ObjectClass *klass, void *data) 
    pd->class_id = PCI_CLASS_STORAGE_RAID;

    pd->revision = 1;

    pd->realize = sii3112_pci_realize;

    dc->reset = sii3112_reset;

    dc->desc = "SiI3112A SATA controller";

    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);

}

hw/ide/via.c

+4 −6
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include "migration/vmstate.h"

#include "qemu/module.h"

#include "sysemu/dma.h"

#include "sysemu/reset.h"



#include "hw/ide/pci.h"

#include "trace.h"
@@ -120,10 +119,10 @@ static void via_ide_set_irq(void *opaque, int n, int level) 
    }

}



static void via_ide_reset(void *opaque)

static void via_ide_reset(DeviceState *dev)

{

    PCIIDEState *d = opaque;

    PCIDevice *pd = PCI_DEVICE(d);

    PCIIDEState *d = PCI_IDE(dev);

    PCIDevice *pd = PCI_DEVICE(dev);

    uint8_t *pci_conf = pd->config;

    int i;
@@ -172,8 +171,6 @@ static void via_ide_realize(PCIDevice *dev, Error **errp) 
    pci_set_long(pci_conf + PCI_CAPABILITY_LIST, 0x000000c0);

    dev->wmask[PCI_INTERRUPT_LINE] = 0xf;



    qemu_register_reset(via_ide_reset, d);



    memory_region_init_io(&d->data_bar[0], OBJECT(d), &pci_ide_data_le_ops,

                          &d->bus[0], "via-ide0-data", 8);

    pci_register_bar(dev, 0, PCI_BASE_ADDRESS_SPACE_IO, &d->data_bar[0]);
@@ -229,6 +226,7 @@ static void via_ide_class_init(ObjectClass *klass, void *data) 
    DeviceClass *dc = DEVICE_CLASS(klass);

    PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);



    dc->reset = via_ide_reset;

    k->realize = via_ide_realize;

    k->exit = via_ide_exitfn;

    k->vendor_id = PCI_VENDOR_ID_VIA;