| Message ID | 1485447262-27014-1-git-send-email-mst@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 26 January 2017 at 16:15, Michael S. Tsirkin <mst@redhat.com> wrote: > The following changes since commit ae5045ae5b2bbd8ce1335d1b05f9ecacca83a6cf: > > Merge remote-tracking branch 'remotes/rth/tags/pull-nios-20170124' into staging (2017-01-25 13:30:23 +0000) > > 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 1954d8b17bbccad723c193edba961d49b7ac4a43: > > hw/pci: disable pci-bridge's shpc by default (2017-01-26 18:13:33 +0200) > > ---------------------------------------------------------------- > virtio, vhost, pci: fixes, features > > generic pci root port support > disable shpc by default > safer version of ARRAY_SIZE and QEMU_BUILD_BUG_ON > fixes and cleanups all over the place > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > Failure to build, x86: /home/petmay01/linaro/qemu-for-merges/hw/ppc/spapr.c: In function ‘spapr_phb_placement’: /home/petmay01/linaro/qemu-for-merges/hw/ppc/spapr.c:2643:20: error: bit-field ‘<anonymous>’ width n ot an integer constant QEMU_BUILD_BUG_ON((max_phbs * SPAPR_PCI_IO_WIN_SIZE) > SPAPR_PCI_MEM32_WIN_SIZE); ^ /home/petmay01/linaro/qemu-for-merges/hw/ppc/spapr.c:2644:20: error: bit-field ‘<anonymous>’ width not an integer constant QEMU_BUILD_BUG_ON((max_phbs * SPAPR_PCI_MEM32_WIN_SIZE) > SPAPR_PCI_MEM64_WIN_SIZE); ^ Failure to build, aarch64 and aarch32: In file included from /home/petmay01/qemu/target/arm/cpu.h:23:0, from /home/petmay01/qemu/trace/control-target.c:11: /home/petmay01/qemu/target/arm/kvm-consts.h:35:1: error: expected ',' or ';' before 'typedef' MISMATCH_CHECK(CP_REG_SIZE_MASK, KVM_REG_SIZE_MASK) ^ /home/petmay01/qemu/target/arm/kvm-consts.h:35:83: error: data definition has no type or storage cla ss [-Werror] MISMATCH_CHECK(CP_REG_SIZE_MASK, KVM_REG_SIZE_MASK) ^ /home/petmay01/qemu/target/arm/kvm-consts.h:35:83: error: type defaults to 'int' in declaration of ' qemu_build_bug_on__35' [-Werror=implicit-int] (repeated for all the other uses of MISMATCH_CHECK in that header) thanks -- PMM
The following changes since commit ae5045ae5b2bbd8ce1335d1b05f9ecacca83a6cf: Merge remote-tracking branch 'remotes/rth/tags/pull-nios-20170124' into staging (2017-01-25 13:30:23 +0000) 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 1954d8b17bbccad723c193edba961d49b7ac4a43: hw/pci: disable pci-bridge's shpc by default (2017-01-26 18:13:33 +0200) ---------------------------------------------------------------- virtio, vhost, pci: fixes, features generic pci root port support disable shpc by default safer version of ARRAY_SIZE and QEMU_BUILD_BUG_ON fixes and cleanups all over the place Signed-off-by: Michael S. Tsirkin <mst@redhat.com> ---------------------------------------------------------------- Cao jin (3): msix: Follow CODING_STYLE hcd-xhci: check & correct param before using it pci: Convert msix_init() to Error and fix callers Haozhong Zhang (1): hw/i386: check if nvdimm is enabled before plugging Jason Wang (1): intel_iommu: fix and simplify size calculation in process_device_iotlb_desc() Marc-André Lureau (1): vhost-user: delete chardev on cleanup Marcel Apfelbaum (4): hw/pcie: Introduce a base class for PCI Express Root Ports hw/ioh3420: derive from PCI Express Root Port base class hw/pcie: Introduce Generic PCI Express Root Port hw/pci: disable pci-bridge's shpc by default Michael S. Tsirkin (7): compiler: drop ; after BUILD_BUG_ON qxl: switch to constants within BUILD_BUG_ON compiler: rework BUG_ON using a struct compiler: expression version of QEMU_BUILD_BUG_ON ARRAY_SIZE: check that argument is an array pci: mark ROMs read-only vhost: skip ROM sections Paolo Bonzini (1): virtio: make virtio_should_notify static default-configs/arm-softmmu.mak | 1 + default-configs/i386-softmmu.mak | 1 + default-configs/x86_64-softmmu.mak | 1 + include/hw/compat.h | 4 + include/hw/pci/msix.h | 5 +- include/hw/pci/pci.h | 1 + include/hw/pci/pcie_port.h | 19 +++++ include/hw/virtio/virtio.h | 1 - include/qemu/compiler.h | 11 ++- include/qemu/osdep.h | 9 +- hw/block/nvme.c | 2 +- hw/display/qxl.c | 9 +- hw/i386/intel_iommu.c | 10 ++- hw/i386/pc.c | 5 ++ hw/misc/ivshmem.c | 8 +- hw/net/e1000e.c | 2 +- hw/net/rocker/rocker.c | 4 +- hw/net/vmxnet3.c | 2 +- hw/pci-bridge/gen_pcie_root_port.c | 87 +++++++++++++++++++ hw/pci-bridge/ioh3420.c | 121 ++++---------------------- hw/pci-bridge/pci_bridge_dev.c | 2 +- hw/pci-bridge/pcie_root_port.c | 171 +++++++++++++++++++++++++++++++++++++ hw/pci/msix.c | 44 ++++++++-- hw/pci/pci.c | 2 +- hw/scsi/megasas.c | 4 +- hw/usb/hcd-xhci.c | 41 +++++---- hw/vfio/pci.c | 8 +- hw/virtio/vhost.c | 3 +- hw/virtio/virtio-pci.c | 4 +- hw/virtio/virtio.c | 2 +- net/vhost-user.c | 3 + hw/pci-bridge/Makefile.objs | 1 + 32 files changed, 425 insertions(+), 163 deletions(-) create mode 100644 hw/pci-bridge/gen_pcie_root_port.c create mode 100644 hw/pci-bridge/pcie_root_port.c