[PULL,00/13] pc,virtio,pci: fixes and updates

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 e8b21f32f958dce5b6b23b7e52e731972619c834:

  virtio: define virtio_pci_cfg_cap in header. (2015-07-07 15:37:59 +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.

Signed-off-by: Michael S. Tsirkin <mst@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 (4):
      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.

Paulo Alcantara (3):
      ich9: add TCO interface emulation
      tests: add testcase for TCO watchdog emulation
      ich9: implement strap SPKR pin logic

 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 +-
 tests/tco-test.c                            | 474 ++++++++++++++++++
 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 +
 24 files changed, 1799 insertions(+), 810 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

On 7 July 2015 at 13:40, Michael S. Tsirkin <mst@redhat.com> wrote:
> 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 e8b21f32f958dce5b6b23b7e52e731972619c834:
>
>   virtio: define virtio_pci_cfg_cap in header. (2015-07-07 15:37:59 +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.
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
>
> ----------------------------------------------------------------


Hi. I'm afraid this fails 'make check' for me:

TEST: tests/tco-test... (pid=31872)
  /i386/tco/defaults:                                                  **
ERROR:/home/petmay01/linaro/qemu-for-merges/tests/tco-test.c:73:test_init:
assertion failed: (d->lpc_base != NULL)
FAIL
GTester: last random seed: R02Sc82f974c8f1bc58a33d8fcf745d1f185
(pid=31877)
  /i386/tco/counter:                                                   **
ERROR:/home/petmay01/linaro/qemu-for-merges/tests/tco-test.c:73:test_init:
assertion failed: (d->lpc_base != NULL)
FAIL
GTester: last random seed: R02S8b1278d09b684ee709c930999614f0e2
(pid=31882)
  /i386/tco/timeout/no_action:                                         **
ERROR:/home/petmay01/linaro/qemu-for-merges/tests/tco-test.c:73:test_init:
assertion failed: (d->lpc_base != NULL)
FAIL
GTester: last random seed: R02S6f8d92f2e699def43382f7ce55b2a413
(pid=31887)
  /i386/tco/timeout/no_action/max:                                     **
ERROR:/home/petmay01/linaro/qemu-for-merges/tests/tco-test.c:73:test_init:
assertion failed: (d->lpc_base != NULL)
FAIL
GTester: last random seed: R02S85024be7f22d06d9abc860d6408dda36
(pid=31892)
  /i386/tco/second_timeout/pause:                                      **
ERROR:/home/petmay01/linaro/qemu-for-merges/tests/tco-test.c:73:test_init:
assertion failed: (d->lpc_base != NULL)
FAIL
GTester: last random seed: R02S7d1a1d8c402f5e203f11afb19ed9753b
(pid=31897)

(repeated for all the other tco tests).


-- PMM