Commit dc1e1350 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



virtio, pci fixes, enhancements

Almost exclusively bugfixes, though in this case,
we are adding functionality to the pxb in order
to make OVMF work on it.

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

# gpg: Signature made Fri Jun 26 14:43:27 2015 BST using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"

* remotes/mst/tags/for_upstream:
  Fix glib_subprocess test
  hw/pci-bridge: format special OFW unit address for PXB host
  hw/core: explicit OFW unit address callback for SysBusDeviceClass
  hw/pci-bridge: disable SHPC in PXB
  hw/pci-bridge: introduce "shpc" property
  hw/pci: introduce shpc_present() helper function
  hw/pci-bridge: add macro for "msi" property
  hw/pci-bridge: add macro for "chassis_nr" property
  hw/pci-bridge: expose _test parameter in SHPC_VMSTATE()
  migration: introduce VMSTATE_BUFFER_UNSAFE_INFO_TEST()
  add pci-bridge-seat
  pc: cleanup and convert TMP ACPI device description to AML API
  MAINTAINERS: add ACPI entry
  vhost: correctly pass error to caller in vhost_dev_enable_notifiers()
  balloon: add a feature bit to let Guest OS deflate balloon on oom
  qdev: fix OVERFLOW_BEFORE_WIDEN
  virito-pci: fix OVERRUN problem

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents d14b9d79 d46f7c9e

MAINTAINERS

+12 −0
Original line number Diff line number Diff line
@@ -644,7 +644,19 @@ M: Michael S. Tsirkin <mst@redhat.com> 
S: Supported

F: include/hw/pci/*

F: hw/pci/*



ACPI

M: Michael S. Tsirkin <mst@redhat.com>

M: Igor Mammedov <imammedo@redhat.com>

S: Supported

F: include/hw/acpi/*

F: hw/mem/*

F: hw/acpi/*

F: hw/i386/acpi-build.[hc]

F: hw/i386/*dsl

F: hw/arm/virt-acpi-build.c

F: include/hw/arm/virt-acpi-build.h

F: scripts/acpi*py



ppc4xx

M: Alexander Graf <agraf@suse.de>

configure

+1 −1
Original line number Diff line number Diff line
@@ -4773,7 +4773,7 @@ if test "$bluez" = "yes" ; then 
  echo "CONFIG_BLUEZ=y" >> $config_host_mak

  echo "BLUEZ_CFLAGS=$bluez_cflags" >> $config_host_mak

fi

if test "glib_subprocess" = "yes" ; then

if test "$glib_subprocess" = "yes" ; then

  echo "CONFIG_HAS_GLIB_SUBPROCESS_TESTS=y" >> $config_host_mak

fi

echo "GLIB_CFLAGS=$glib_cflags" >> $config_host_mak

docs/multiseat.txt

+19 −0
Original line number Diff line number Diff line
@@ -106,6 +106,25 @@ the devices attached to the seat. 
Background info is here:

  http://www.freedesktop.org/wiki/Software/systemd/multiseat/





guest side with pci-bridge-seat

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



Qemu version FIXME and newer has a new pci-bridge-seat device which

can be used instead of pci-bridge.  Just swap the device name in the

qemu command line above.  The only difference between the two devices

is the pci id.  We can match the pci id instead of the device path

with a nice generic rule now, which simplifies the guest

configuration:



    [root@fedora ~]# cat /etc/udev/rules.d/70-qemu-pci-bridge-seat.rules

    SUBSYSTEM=="pci", ATTR{vendor}=="0x1b36", ATTR{device}=="0x000a", \

            TAG+="seat", ENV{ID_AUTOSEAT}="1"



Patch with this rule will be submitted to upstream udev/systemd, so

long-term, when systemd with this lands in distros, things will work

just fine without any manual guest configuration.



Enjoy!



--

docs/specs/pci-ids.txt

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ PCI devices (other than virtio): 
1b36:0005  PCI test device (docs/specs/pci-testdev.txt)

1b36:0006  PCI Rocker Ethernet switch device

1b36:0007  PCI SD Card Host Controller Interface (SDHCI)

1b36:000a  PCI-PCI bridge (multiseat)



All these devices are documented in docs/specs.

hw/core/qdev-properties.c

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ PropertyInfo qdev_prop_bit = { 
static uint64_t qdev_get_prop_mask64(Property *prop)

{

    assert(prop->info == &qdev_prop_bit);

    return 0x1 << prop->bitnr;

    return 0x1ull << prop->bitnr;

}



static void bit64_prop_set(DeviceState *dev, Property *props, bool val)