Message ID | 1485868446-10587-1-git-send-email-mst@redhat.com |
---|---|
State | New |
Headers | show |
On 31 January 2017 at 13:14, 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 b16127353f6b5ccdbe1e61e48848a83a6d30e640: > > arm: add trailing ; after MISMATCH_CHECK (2017-01-31 15:11:35 +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> > > ---------------------------------------------------------------- Fails to build: /home/petmay01/linaro/qemu-for-merges/net/vhost-user.c: In function ‘vhost_user_cleanup’: /home/petmay01/linaro/qemu-for-merges/net/vhost-user.c:154:9: error: unknown type name ‘CharDriverSt ate’ CharDriverState *chr = qemu_chr_fe_get_driver(&s->chr); ^ /home/petmay01/linaro/qemu-for-merges/net/vhost-user.c:154:32: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types] CharDriverState *chr = qemu_chr_fe_get_driver(&s->chr); ^ /home/petmay01/linaro/qemu-for-merges/net/vhost-user.c:157:25: error: passing argument 1 of ‘qemu_chr_delete’ from incompatible pointer type [-Werror=incompatible-pointer-types] qemu_chr_delete(chr); ^ In file included from /home/petmay01/linaro/qemu-for-merges/net/vhost-user.c:15:0: /home/petmay01/linaro/qemu-for-merges/include/sysemu/char.h:185:6: note: expected ‘Chardev * {aka struct Chardev *}’ but argument is of type ‘int *’ void qemu_chr_delete(Chardev *chr); ^ Looks like something in your tree is semantically conflicting with the char device QOMification that landed via Paolo's tree yesterday. Can you rebase/fix/drop patches as appropriate, please? thanks -- PMM
On Tue, Jan 31, 2017 at 01:24:30PM +0000, Peter Maydell wrote: > On 31 January 2017 at 13:14, 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 b16127353f6b5ccdbe1e61e48848a83a6d30e640: > > > > arm: add trailing ; after MISMATCH_CHECK (2017-01-31 15:11:35 +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> > > > > ---------------------------------------------------------------- > > Fails to build: > > /home/petmay01/linaro/qemu-for-merges/net/vhost-user.c: In function > ‘vhost_user_cleanup’: > /home/petmay01/linaro/qemu-for-merges/net/vhost-user.c:154:9: error: > unknown type name ‘CharDriverSt > ate’ > CharDriverState *chr = qemu_chr_fe_get_driver(&s->chr); > ^ > /home/petmay01/linaro/qemu-for-merges/net/vhost-user.c:154:32: error: > initialization from incompatible pointer type > [-Werror=incompatible-pointer-types] > CharDriverState *chr = qemu_chr_fe_get_driver(&s->chr); > ^ > /home/petmay01/linaro/qemu-for-merges/net/vhost-user.c:157:25: error: > passing argument 1 of ‘qemu_chr_delete’ from incompatible pointer type > [-Werror=incompatible-pointer-types] > qemu_chr_delete(chr); > ^ > In file included from > /home/petmay01/linaro/qemu-for-merges/net/vhost-user.c:15:0: > /home/petmay01/linaro/qemu-for-merges/include/sysemu/char.h:185:6: > note: expected ‘Chardev * {aka struct Chardev *}’ but argument is of > type ‘int *’ > void qemu_chr_delete(Chardev *chr); > ^ > > Looks like something in your tree is semantically conflicting > with the char device QOMification that landed via Paolo's > tree yesterday. Can you rebase/fix/drop patches as appropriate, > please? > > thanks > -- PMM Right it's a trivial conflict. I'll rebase and resend with minimal testing.
Hi Michael On Tue, Jan 31, 2017 at 6:06 PM Peter Maydell <peter.maydell@linaro.org> wrote: > On 31 January 2017 at 13:14, 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 b16127353f6b5ccdbe1e61e48848a83a6d30e640: > > > > arm: add trailing ; after MISMATCH_CHECK (2017-01-31 15:11:35 +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> > > > > ---------------------------------------------------------------- > > Fails to build: > > /home/petmay01/linaro/qemu-for-merges/net/vhost-user.c: In function > ‘vhost_user_cleanup’: > /home/petmay01/linaro/qemu-for-merges/net/vhost-user.c:154:9: error: > unknown type name ‘CharDriverSt > ate’ > CharDriverState *chr = qemu_chr_fe_get_driver(&s->chr); > Sorry about that , all you need is to change the type to "Chardev". thanks ^ > /home/petmay01/linaro/qemu-for-merges/net/vhost-user.c:154:32: error: > initialization from incompatible pointer type > [-Werror=incompatible-pointer-types] > CharDriverState *chr = qemu_chr_fe_get_driver(&s->chr); > ^ > /home/petmay01/linaro/qemu-for-merges/net/vhost-user.c:157:25: error: > passing argument 1 of ‘qemu_chr_delete’ from incompatible pointer type > [-Werror=incompatible-pointer-types] > qemu_chr_delete(chr); > ^ > In file included from > /home/petmay01/linaro/qemu-for-merges/net/vhost-user.c:15:0: > /home/petmay01/linaro/qemu-for-merges/include/sysemu/char.h:185:6: > note: expected ‘Chardev * {aka struct Chardev *}’ but argument is of > type ‘int *’ > void qemu_chr_delete(Chardev *chr); > ^ > > Looks like something in your tree is semantically conflicting > with the char device QOMification that landed via Paolo's > tree yesterday. Can you rebase/fix/drop patches as appropriate, > please? > > thanks > -- PMM > > -- Marc-André Lureau
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 b16127353f6b5ccdbe1e61e48848a83a6d30e640: arm: add trailing ; after MISMATCH_CHECK (2017-01-31 15:11:35 +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 (10): compiler: drop ; after BUILD_BUG_ON qxl: switch to constants within BUILD_BUG_ON ppc: 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 arm: better stub version for MISMATCH_CHECK arm: add trailing ; after MISMATCH_CHECK 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 +- target/arm/kvm-consts.h | 102 +++++++++++----------- 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/ppc/spapr.c | 14 +-- 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 + 34 files changed, 485 insertions(+), 219 deletions(-) create mode 100644 hw/pci-bridge/gen_pcie_root_port.c create mode 100644 hw/pci-bridge/pcie_root_port.c