On Thu, Jul 09, 2020 at 11:32:05AM +0100, Peter Maydell wrote:
> On Tue, 7 Jul 2020 at 18:50, Peter Maydell <peter.mayd...@linaro.org> wrote:
> >
> > On Tue, 7 Jul 2020 at 13:04, Michael S. Tsirkin <m...@redhat.com> wrote:
> > > Precisely. Sorry about missing this.
> > > I made this change and pushed to the same tag - don't want to spam
> > > the list for a small thing like this. Can you pick this up pls?
> > > Commit 849c48004df0e123b53fe9888770cb4f6eb5e8ab now
> >
> > Sure. (You can always just resend a new v2 cover letter without
> > all the patches; that's what most people do for minor respins.)
> >
> > Applied, thanks.
>
> I've just noticed that the commit that got merged was not the
> one you quote but 1e0a84ea49b68b7cf60e -- can you check whether
> anything was missed or the wrong version ?
>
> thanks
> -- PMM
Yea not a big deal:
diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
index fb7de972f3..a3d17fe0f9 100644
--- a/hw/virtio/vhost-vdpa.c
+++ b/hw/virtio/vhost-vdpa.c
@@ -45,7 +45,7 @@ static int vhost_vdpa_dma_map(struct vhost_vdpa *v, hwaddr
iova, hwaddr size,
msg.type = v->msg_type;
msg.iotlb.iova = iova;
msg.iotlb.size = size;
- msg.iotlb.uaddr = (uintptr_t)vaddr;
+ msg.iotlb.uaddr = (uint64_t)(uintptr_t)vaddr;
msg.iotlb.perm = readonly ? VHOST_ACCESS_RO : VHOST_ACCESS_RW;
msg.iotlb.type = VHOST_IOTLB_UPDATE;
I guess I forgot to push or something. Sorry.
--
MST
