Commit 36b5e43a authored by Peter Maydell's avatar Peter Maydell
Browse files

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



pc, pci, virtio: features, fixes, cleanups

A bunch of fixes, cleanus and new features all over the place.

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

# gpg: Signature made Thu 11 Jan 2018 20:04:57 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: (23 commits)
  smbus: do not immediately complete commands
  dump-guest-memory.py: fix "You can't do that without a process to debug"
  virtio-pci: Don't force Subsystem Vendor ID = Vendor ID
  intel_iommu: fix error param in string
  intel_iommu: remove X86_IOMMU_PCI_DEVFN_MAX
  vhost-user: document memory accesses
  vhost-user: fix indentation in protocol specification
  hw/pci-host/xilinx: QOM'ify the AXI-PCIe host bridge
  hw/pci-host/piix: QOM'ify the IGD Passthrough host bridge
  tests/pxe-test: Add some extra tests
  tests/pxe-test: Test net booting over IPv6 in some cases
  tests/pxe-test: Use table of testcases rather than open-coding
  tests/pxe-test: Remove unnecessary special case test functions
  virtio_error: don't invoke status callbacks
  pci: Eliminate pci_find_primary_bus()
  pci: Eliminate redundant PCIDevice::bus pointer
  pci: Add pci_dev_bus_num() helper
  pci: Move bridge data structures from pci_bus.h to pci_bridge.h
  pci: Rename root bus initialization functions for clarity
  tests: add test to check VirtQueue object
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 997eba28 acc95bc8

docs/interop/vhost-user.txt

+32 −5
Original line number Diff line number Diff line
@@ -66,11 +66,14 @@ Depending on the request type, payload can be: 


   Index: a 32-bit vring index

   Flags: a 32-bit vring flags

   Descriptor: a 64-bit user address of the vring descriptor table

   Used: a 64-bit user address of the vring used ring

   Available: a 64-bit user address of the vring available ring

   Descriptor: a 64-bit ring address of the vring descriptor table

   Used: a 64-bit ring address of the vring used ring

   Available: a 64-bit ring address of the vring available ring

   Log: a 64-bit guest address for logging



   Note that a ring address is an IOVA if VIRTIO_F_IOMMU_PLATFORM has been

   negotiated.  Otherwise it is a user address.



 * Memory regions description

   ---------------------------------------------------

   | num regions | padding | region0 | ... | region7 |
@@ -273,6 +276,30 @@ Once the source has finished migration, rings will be stopped by 
the source. No further update must be done before rings are

restarted.



Memory access

-------------



The master sends a list of vhost memory regions to the slave using the

VHOST_USER_SET_MEM_TABLE message.  Each region has two base addresses: a guest

address and a user address.



Messages contain guest addresses and/or user addresses to reference locations

within the shared memory.  The mapping of these addresses works as follows.



User addresses map to the vhost memory region containing that user address.



When the VIRTIO_F_IOMMU_PLATFORM feature has not been negotiated:



 * Guest addresses map to the vhost memory region containing that guest

   address.



When the VIRTIO_F_IOMMU_PLATFORM feature has been negotiated:



 * Guest addresses are also called I/O virtual addresses (IOVAs).  They are

   translated to user addresses via the IOTLB.



 * The vhost memory region guest address is not used.



IOMMU support

-------------

hw/acpi/pcihp.c

+2 −2
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ void acpi_pcihp_device_plug_cb(HotplugHandler *hotplug_dev, AcpiPciHpState *s, 
{

    PCIDevice *pdev = PCI_DEVICE(dev);

    int slot = PCI_SLOT(pdev->devfn);

    int bsel = acpi_pcihp_get_bsel(pdev->bus);

    int bsel = acpi_pcihp_get_bsel(pci_get_bus(pdev));

    if (bsel < 0) {

        error_setg(errp, "Unsupported bus. Bus doesn't have property '"

                   ACPI_PCIHP_PROP_BSEL "' set");
@@ -246,7 +246,7 @@ void acpi_pcihp_device_unplug_cb(HotplugHandler *hotplug_dev, AcpiPciHpState *s, 
{

    PCIDevice *pdev = PCI_DEVICE(dev);

    int slot = PCI_SLOT(pdev->devfn);

    int bsel = acpi_pcihp_get_bsel(pdev->bus);

    int bsel = acpi_pcihp_get_bsel(pci_get_bus(pdev));

    if (bsel < 0) {

        error_setg(errp, "Unsupported bus. Bus doesn't have property '"

                   ACPI_PCIHP_PROP_BSEL "' set");

hw/acpi/piix4.c

+4 −3
Original line number Diff line number Diff line
@@ -460,9 +460,9 @@ static void piix4_pm_machine_ready(Notifier *n, void *opaque) 
        (memory_region_present(io_as, 0x2f8) ? 0x90 : 0);



    if (s->use_acpi_pci_hotplug) {

        pci_for_each_bus(d->bus, piix4_update_bus_hotplug, s);

        pci_for_each_bus(pci_get_bus(d), piix4_update_bus_hotplug, s);

    } else {

        piix4_update_bus_hotplug(d->bus, s);

        piix4_update_bus_hotplug(pci_get_bus(d), s);

    }

}
@@ -535,7 +535,8 @@ static void piix4_pm_realize(PCIDevice *dev, Error **errp) 
    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), dev->bus, s);

    piix4_acpi_system_hot_add_init(pci_address_space_io(dev),

                                   pci_get_bus(dev), s);



    piix4_pm_add_propeties(s);

}

hw/acpi/vmgenid.c

+8 −22
Original line number Diff line number Diff line
@@ -162,21 +162,6 @@ static void vmgenid_update_guest(VmGenIdState *vms) 
    }

}



static void vmgenid_set_guid(Object *obj, const char *value, Error **errp)

{

    VmGenIdState *vms = VMGENID(obj);



    if (!strcmp(value, "auto")) {

        qemu_uuid_generate(&vms->guid);

    } else if (qemu_uuid_parse(value, &vms->guid) < 0) {

        error_setg(errp, "'%s. %s': Failed to parse GUID string: %s",

                   object_get_typename(OBJECT(vms)), VMGENID_GUID, value);

        return;

    }



    vmgenid_update_guest(vms);

}



/* After restoring an image, we need to update the guest memory and notify

 * it of a potential change to VM Generation ID

 */
@@ -224,23 +209,24 @@ static void vmgenid_realize(DeviceState *dev, Error **errp) 
    }



    qemu_register_reset(vmgenid_handle_reset, vms);



    vmgenid_update_guest(vms);

}



static Property vmgenid_device_properties[] = {

    DEFINE_PROP_UUID(VMGENID_GUID, VmGenIdState, guid),

    DEFINE_PROP_END_OF_LIST(),

};



static void vmgenid_device_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);



    dc->vmsd = &vmstate_vmgenid;

    dc->realize = vmgenid_realize;

    dc->props = vmgenid_device_properties;

    dc->hotpluggable = false;

    set_bit(DEVICE_CATEGORY_MISC, dc->categories);



    object_class_property_add_str(klass, VMGENID_GUID, NULL,

                                  vmgenid_set_guid, NULL);

    object_class_property_set_description(klass, VMGENID_GUID,

                                    "Set Global Unique Identifier "

                                    "(big-endian) or auto for random value",

                                    NULL);

}



static const TypeInfo vmgenid_device_info = {

hw/alpha/typhoon.c

+4 −4
Original line number Diff line number Diff line
@@ -881,7 +881,7 @@ PCIBus *typhoon_init(ram_addr_t ram_size, ISABus **isa_bus, 
    memory_region_add_subregion(addr_space, 0x801fc000000ULL,

                                &s->pchip.reg_io);



    b = pci_register_bus(dev, "pci",

    b = pci_register_root_bus(dev, "pci",

                              typhoon_set_irq, sys_map_irq, s,

                              &s->pchip.reg_mem, &s->pchip.reg_io,

                              0, 64, TYPE_PCI_BUS);