[PULL,v2,0/9] pc, virtio, misc bugfixes

The following changes since commit 5f77ef69a195098baddfdc6d189f1b4a94587378:

  glib: add compatibility interface for g_strcmp0() (2014-10-16 23:02:31 +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 8b4c5b49268123687334d5753128f4cb78d7f88c:

  tests: fix rebuild-expected-aml.sh for acpi-test rename (2014-10-22 11:16:13 +0300)

----------------------------------------------------------------
pc, virtio, misc bugfixes

A bunch of minor bugfixes all over the place.

changes from v1:
    fix for test re-generation script
    add missing acks to two patches

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

----------------------------------------------------------------
Eduardo Habkost (1):
      smbios: Fix assertion on socket count calculation

Gal Hammer (1):
      i386: Add an ACPI_EXTRACT_NAME_BUFFER16 directive.

Gonglei (1):
      pcie: change confused comment clearer

Jan Kiszka (1):
      pc: Fix disabling of vapic for compat PC models

Laszlo Ersek (2):
      well-defined listing order for machine types
      i386/pc: add piix and q35 machtypes to sorting families for -M \?

Michael S. Tsirkin (2):
      virtio-pci: fix migration for pci bus master
      intel_iommu: fix VTD_SID_TO_BUS

Paolo Bonzini (1):
      tests: fix rebuild-expected-aml.sh for acpi-test rename

 hw/virtio/virtio-pci.h                       |  5 ++++
 include/hw/boards.h                          |  2 ++
 include/hw/compat.h                          | 23 +++++++++++++++++
 include/hw/i386/intel_iommu.h                |  2 +-
 include/hw/i386/pc.h                         | 18 ++-----------
 hw/i386/pc.c                                 |  1 +
 hw/i386/pc_piix.c                            |  5 ++--
 hw/i386/pc_q35.c                             |  3 ++-
 hw/i386/smbios.c                             |  2 +-
 hw/pci/pcie.c                                |  2 +-
 hw/ppc/spapr.c                               |  7 +++++
 hw/virtio/virtio-pci.c                       | 29 ++++++++-------------
 vl.c                                         | 38 +++++++++++++++++++++++++++-
 scripts/acpi_extract.py                      | 23 ++++++++++-------
 tests/acpi-test-data/rebuild-expected-aml.sh |  6 ++---
 15 files changed, 113 insertions(+), 53 deletions(-)
 create mode 100644 include/hw/compat.h

On 22 October 2014 09:18, Michael S. Tsirkin <mst@redhat.com> wrote:
> The following changes since commit 5f77ef69a195098baddfdc6d189f1b4a94587378:
>
>   glib: add compatibility interface for g_strcmp0() (2014-10-16 23:02:31 +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 8b4c5b49268123687334d5753128f4cb78d7f88c:
>
>   tests: fix rebuild-expected-aml.sh for acpi-test rename (2014-10-22 11:16:13 +0300)
>
> ----------------------------------------------------------------
> pc, virtio, misc bugfixes
>
> A bunch of minor bugfixes all over the place.
>
> changes from v1:
>     fix for test re-generation script
>     add missing acks to two patches
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
>
> ----------------------------------------------------------------


Hi. I'm afraid this has a merge conflict in include/hw/i386/pc.h
which I don't understand well enough to fix. Could you rebase and
resend, please?

thanks
-- PMM