From: Peter Maydell Date: Mon, 11 Jan 2016 11:19:05 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d21ccd7bb98362565f4317c4a99f1aa2185c2c71;p=qemu.git Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging acpi dsdt rework, misc fixes This completes the dsdt rewrite, and includes misc fixes all over the place. Signed-off-by: Michael S. Tsirkin # gpg: Signature made Sat 09 Jan 2016 21:20:34 GMT using RSA key ID D28D5469 # gpg: Good signature from "Michael S. Tsirkin " # gpg: aka "Michael S. Tsirkin " * remotes/mst/tags/for_upstream: (59 commits) virtio: fix error message for number of queues ivshmem: Store file descriptor for vhost-user negotiation migration/virtio: Remove simple .get/.put use Add VMSTATE_STRUCT_VARRAY_KNOWN i386/pc: expose identifying the floppy controller pc: acpi: remove unused ASL templates and related blobs/utils pc: acpi: switch to AML API composed DSDT pc: acpi: q35: PCST, PCSB opregions and PCIB field into SSDT pc: acpi: q35: move PCI0 device definition into SSDT pc: acpi: q35: move PCI0._OSC() method into SSDT pc: acpi: q35: move _PIC() method into SSDT pc: acpi: q35: move PRTP routing table into SSDT pc: acpi: q35: move PRTA routing table into SSDT pc: acpi: q35: move _PRT() into SSDT pc: acpi: q35: move ISA bridge into SSDT pc: acpi: q35: move IQST() into SSDT pc: acpi: q35: move IQCR() into SSDT pc: acpi: q35: move link devices to SSDT pc: acpi: q35: move GSI links to SSDT pc: acpi: piix4: acpi move PCI0 device to SSDT ... Signed-off-by: Peter Maydell --- d21ccd7bb98362565f4317c4a99f1aa2185c2c71