The following changes since commit f6e3035f75e5c6a73485335765ae070304c7a110:
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream-smm' into staging (2015-07-06 23:37:53 +0100) are available in the git repository at: git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream for you to fetch changes up to c4fc82bf1ad088a84ccedf779f6aa928e4fadb5f: tco-test: fix up config accesses and re-enable (2015-07-08 12:38:30 +0300) ---------------------------------------------------------------- pc,virtio,pci: fixes and updates Most notably, this includes the TCO support for ICH: the last feature for 2.4 as we are entering the hard freeze. Bugfixes only from now on. virtio pci also gained cfg access capability - arguably a bugfix since virtio spec makes it mandatory, but it's a big patch. Signed-off-by: Michael S. Tsirkin <m...@redhat.com> ---------------------------------------------------------------- Benjamin Herrenschmidt (1): pcie: Set the "link active" in the link status register Cornelia Huck (1): Revert "dataplane: allow virtio-1 devices" Greg Kurz (1): dataplane: fix cross-endian issues Laszlo Ersek (3): hw/i386/pc: factor out pc_cmos_init_floppy() hw/i386/pc: reflect any FDC @ ioport 0x3f0 in the CMOS hw/i386/pc: don't carry FDC from pc_basic_device_init() to pc_cmos_init() Michael S. Tsirkin (7): acpi: split out ICH ACPI support virtio_net: reuse constants from linux pci_regs.h: import from linux virtio: define virtio_pci_cfg_cap in header. virtio-pci: implement cfg capability virtio fix cfg endian-ness for BE targets tco-test: fix up config accesses and re-enable Paulo Alcantara (3): ich9: add TCO interface emulation tests: add testcase for TCO watchdog emulation ich9: implement strap SPKR pin logic hw/virtio/virtio-pci.h | 3 + include/hw/acpi/ich9.h | 8 +- include/hw/acpi/tco.h | 82 ++++ include/hw/boards.h | 3 +- include/hw/i386/ich9.h | 16 +- include/hw/i386/pc.h | 4 +- include/hw/pci/pci_regs.h | 720 +--------------------------- include/hw/virtio/virtio-net.h | 12 - include/standard-headers/linux/pci_regs.h | 719 +++++++++++++++++++++++++++ include/standard-headers/linux/virtio_net.h | 16 + include/standard-headers/linux/virtio_pci.h | 6 + hw/acpi/ich9.c | 57 ++- hw/acpi/tco.c | 264 ++++++++++ hw/i386/pc.c | 129 +++-- hw/i386/pc_piix.c | 5 +- hw/i386/pc_q35.c | 9 +- hw/isa/lpc_ich9.c | 21 +- hw/pci/pcie.c | 2 +- hw/virtio/dataplane/vring.c | 53 +- hw/virtio/virtio-pci.c | 151 +++++- tests/tco-test.c | 465 ++++++++++++++++++ default-configs/i386-softmmu.mak | 1 + default-configs/x86_64-softmmu.mak | 1 + hw/acpi/Makefile.objs | 3 +- scripts/update-linux-headers.sh | 2 +- tests/Makefile | 2 + 26 files changed, 1943 insertions(+), 811 deletions(-) create mode 100644 include/hw/acpi/tco.h create mode 100644 include/standard-headers/linux/pci_regs.h create mode 100644 hw/acpi/tco.c create mode 100644 tests/tco-test.c