| Message ID | 1434569795-10524-1-git-send-email-mst@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 17 June 2015 at 20:38, Michael S. Tsirkin <mst@redhat.com> wrote: > OK things seem to be calming down nicely. > Here's to an uneventful 2.4! > > The following changes since commit 4ebc736e9938a7e88ecc785734b17145bf802a56: > > i386/acpi-build: fix PXB workarounds for unsupported BIOSes (2015-06-11 12:40:30 +0200) > > 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 e352ced61b6030232338de59fd3fc69633b0755b: > > vhost: enable vhost without without MSI-X (2015-06-17 21:27:40 +0200) > > ---------------------------------------------------------------- > virtio, pci fixes, enhancements > > Most notably this includes virtio cross-endian patches. > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Hi. I'm afraid this fails to build for OSX: LINK arm-softmmu/qemu-system-arm Undefined symbols for architecture x86_64: "_tap_fd_set_vnet_be", referenced from: _tap_set_vnet_be in tap.o "_tap_fd_set_vnet_le", referenced from: _tap_set_vnet_le in tap.o thanks -- PMM
On Thu, Jun 18, 2015 at 11:36:26AM +0100, Peter Maydell wrote: > On 17 June 2015 at 20:38, Michael S. Tsirkin <mst@redhat.com> wrote: > > OK things seem to be calming down nicely. > > Here's to an uneventful 2.4! > > > > The following changes since commit 4ebc736e9938a7e88ecc785734b17145bf802a56: > > > > i386/acpi-build: fix PXB workarounds for unsupported BIOSes (2015-06-11 12:40:30 +0200) > > > > 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 e352ced61b6030232338de59fd3fc69633b0755b: > > > > vhost: enable vhost without without MSI-X (2015-06-17 21:27:40 +0200) > > > > ---------------------------------------------------------------- > > virtio, pci fixes, enhancements > > > > Most notably this includes virtio cross-endian patches. > > > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > > Hi. I'm afraid this fails to build for OSX: > > LINK arm-softmmu/qemu-system-arm > Undefined symbols for architecture x86_64: > "_tap_fd_set_vnet_be", referenced from: > _tap_set_vnet_be in tap.o > "_tap_fd_set_vnet_le", referenced from: > _tap_set_vnet_le in tap.o > > thanks > -- PMM Will fix, thanks!
On 18 June 2015 at 12:14, Michael S. Tsirkin <mst@redhat.com> wrote: > On Thu, Jun 18, 2015 at 11:36:26AM +0100, Peter Maydell wrote: >> Hi. I'm afraid this fails to build for OSX: >> >> LINK arm-softmmu/qemu-system-arm >> Undefined symbols for architecture x86_64: >> "_tap_fd_set_vnet_be", referenced from: >> _tap_set_vnet_be in tap.o >> "_tap_fd_set_vnet_le", referenced from: >> _tap_set_vnet_le in tap.o >> > Will fix, thanks! The updated version of this tag seems to build OK -- did you want me to apply it? (Are the differences only trivial?) thanks -- PMM
On Thu, Jun 18, 2015 at 05:29:23PM +0100, Peter Maydell wrote: > On 18 June 2015 at 12:14, Michael S. Tsirkin <mst@redhat.com> wrote: > > On Thu, Jun 18, 2015 at 11:36:26AM +0100, Peter Maydell wrote: > >> Hi. I'm afraid this fails to build for OSX: > >> > >> LINK arm-softmmu/qemu-system-arm > >> Undefined symbols for architecture x86_64: > >> "_tap_fd_set_vnet_be", referenced from: > >> _tap_set_vnet_be in tap.o > >> "_tap_fd_set_vnet_le", referenced from: > >> _tap_set_vnet_le in tap.o > >> > > > Will fix, thanks! > > The updated version of this tag seems to build OK -- did you want me to > apply it? (Are the differences only trivial?) > > thanks > -- PMM They are trivial - a single patch on top that adds stubs for missing platforms. And I think breaking bisect on non-linux isn't a big deal. If you agree, please apply.
On 19 June 2015 at 08:30, Michael S. Tsirkin <mst@redhat.com> wrote: > They are trivial - a single patch on top that adds stubs for missing > platforms. And I think breaking bisect on non-linux isn't a big deal. > If you agree, please apply. I would prefer the fix folded in to the correct point in the patchset, please. We have the opportunity to avoid breaking OSX bisection, we should take it. -- PMM
On Fri, Jun 19, 2015 at 09:32:48AM +0100, Peter Maydell wrote: > On 19 June 2015 at 08:30, Michael S. Tsirkin <mst@redhat.com> wrote: > > They are trivial - a single patch on top that adds stubs for missing > > platforms. And I think breaking bisect on non-linux isn't a big deal. > > If you agree, please apply. > > I would prefer the fix folded in to the correct point in the > patchset, please. We have the opportunity to avoid breaking > OSX bisection, we should take it. > > -- PMM OK, done and pushed (same place). I verified that the resulting tree is identical to the previous one, so your testing on OSX should still hold.
On 19 June 2015 at 11:19, Michael S. Tsirkin <mst@redhat.com> wrote: > On Fri, Jun 19, 2015 at 09:32:48AM +0100, Peter Maydell wrote: >> On 19 June 2015 at 08:30, Michael S. Tsirkin <mst@redhat.com> wrote: >> > They are trivial - a single patch on top that adds stubs for missing >> > platforms. And I think breaking bisect on non-linux isn't a big deal. >> > If you agree, please apply. >> >> I would prefer the fix folded in to the correct point in the >> patchset, please. We have the opportunity to avoid breaking >> OSX bisection, we should take it. >> >> -- PMM > > OK, done and pushed (same place). I verified that the resulting tree is > identical to the previous one, so your testing on OSX should still hold. Applied this version, thanks. -- PMM
OK things seem to be calming down nicely. Here's to an uneventful 2.4! The following changes since commit 4ebc736e9938a7e88ecc785734b17145bf802a56: i386/acpi-build: fix PXB workarounds for unsupported BIOSes (2015-06-11 12:40:30 +0200) 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 e352ced61b6030232338de59fd3fc69633b0755b: vhost: enable vhost without without MSI-X (2015-06-17 21:27:40 +0200) ---------------------------------------------------------------- virtio, pci fixes, enhancements Most notably this includes virtio cross-endian patches. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> ---------------------------------------------------------------- Cédric Le Goater (1): vhost_net: re-enable when cross endian Greg Kurz (5): linux-headers: sync vhost.h virtio: introduce virtio_legacy_is_cross_endian() vhost: set vring endianness for legacy virtio tap: add VNET_LE/VNET_BE operations vhost-net: tell tap backend about the vnet endianness Laszlo Ersek (1): hw/core: rebase sysbus_get_fw_dev_path() to g_strdup_printf() Michael S. Tsirkin (1): vhost-user: part of virtio Pankaj Gupta (1): vhost: enable vhost without without MSI-X Shmulik Ladkani (1): pci: Don't register a specialized 'config_write' if default behavior is intended include/hw/virtio/vhost.h | 3 +- include/hw/virtio/virtio-access.h | 13 ++++++++ include/net/net.h | 6 ++++ include/net/vhost_net.h | 2 -- linux-headers/linux/vhost.h | 14 +++++++++ net/tap-linux.h | 2 ++ net/tap_int.h | 2 ++ hw/core/sysbus.c | 16 ++++------ hw/misc/ivshmem.c | 1 - hw/net/vhost_net.c | 60 ++++++++++++++++++------------------ hw/net/virtio-net.c | 4 --- hw/net/vmxnet3.c | 9 ------ hw/scsi/megasas.c | 8 ----- hw/scsi/vhost-scsi.c | 2 +- hw/scsi/vmw_pvscsi.c | 8 ----- hw/virtio/vhost.c | 64 ++++++++++++++++++++++++++++++--------- net/net.c | 18 +++++++++++ net/tap-linux.c | 34 +++++++++++++++++++++ net/tap.c | 17 ++++++++++- net/vhost-user.c | 1 - MAINTAINERS | 1 + 21 files changed, 195 insertions(+), 90 deletions(-)