qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: QEMU Developers <qemu-devel@nongnu.org>
Subject: Re: [PULL v2 00/41] virtio,acpi: features, fixes, cleanups.
Date: Thu, 9 Jul 2020 13:46:55 -0400	[thread overview]
Message-ID: <20200709134600-mutt-send-email-mst@kernel.org> (raw)
In-Reply-To: <CAFEAcA_sD0ZPJ7YNk+2bdhwqAFdoKipEPfg-E-xQQh-ukUsiUA@mail.gmail.com>

On Thu, Jul 09, 2020 at 11:32:05AM +0100, Peter Maydell wrote:
> On Tue, 7 Jul 2020 at 18:50, Peter Maydell <peter.maydell@linaro.org> wrote:
> >
> > On Tue, 7 Jul 2020 at 13:04, Michael S. Tsirkin <mst@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



      reply	other threads:[~2020-07-09 17:48 UTC|newest]

Thread overview: 54+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-04 18:29 [PULL v2 00/41] virtio,acpi: features, fixes, cleanups Michael S. Tsirkin
2020-07-04 18:29 ` [PULL v2 01/41] tests: disassemble-aml.sh: generate AML in readable format Michael S. Tsirkin
2020-07-04 18:29 ` [PULL v2 02/41] Revert "tests/migration: Reduce autoconverge initial bandwidth" Michael S. Tsirkin
2020-07-04 18:29 ` [PULL v2 03/41] virtio-balloon: always indicate S_DONE when migration fails Michael S. Tsirkin
2020-07-04 18:29 ` [PULL v2 04/41] pc: Support coldplugging of virtio-pmem-pci devices on all buses Michael S. Tsirkin
2020-07-04 18:29 ` [PULL v2 05/41] exec: Introduce ram_block_discard_(disable|require)() Michael S. Tsirkin
2020-07-04 18:29 ` [PULL v2 06/41] vfio: Convert to ram_block_discard_disable() Michael S. Tsirkin
2020-07-04 18:29 ` [PULL v2 07/41] accel/kvm: " Michael S. Tsirkin
2020-07-04 18:29 ` [PULL v2 08/41] s390x/pv: " Michael S. Tsirkin
2020-07-04 18:29 ` [PULL v2 09/41] virtio-balloon: Rip out qemu_balloon_inhibit() Michael S. Tsirkin
2020-07-04 18:29 ` [PULL v2 10/41] target/i386: sev: Use ram_block_discard_disable() Michael S. Tsirkin
2020-07-04 18:29 ` [PULL v2 11/41] migration/rdma: " Michael S. Tsirkin
2020-07-04 18:29 ` [PULL v2 12/41] migration/colo: " Michael S. Tsirkin
2020-07-04 18:29 ` [PULL v2 13/41] virtio-mem: Paravirtualized memory hot(un)plug Michael S. Tsirkin
2020-07-04 18:30 ` [PULL v2 14/41] virtio-pci: Proxy for virtio-mem Michael S. Tsirkin
2020-07-04 18:30 ` [PULL v2 15/41] MAINTAINERS: Add myself as virtio-mem maintainer Michael S. Tsirkin
2020-07-04 18:30 ` [PULL v2 16/41] hmp: Handle virtio-mem when printing memory device info Michael S. Tsirkin
2020-07-04 18:30 ` [PULL v2 17/41] numa: Handle virtio-mem in NUMA stats Michael S. Tsirkin
2020-07-04 18:30 ` [PULL v2 18/41] pc: Support for virtio-mem-pci Michael S. Tsirkin
2020-07-04 18:30 ` [PULL v2 19/41] virtio-mem: Allow notifiers for size changes Michael S. Tsirkin
2020-07-04 18:30 ` [PULL v2 20/41] virtio-pci: Send qapi events when the virtio-mem " Michael S. Tsirkin
2020-07-04 18:30 ` [PULL v2 21/41] virtio-mem: Migration sanity checks Michael S. Tsirkin
2020-07-04 18:30 ` [PULL v2 22/41] virtio-mem: Add trace events Michael S. Tsirkin
2020-07-04 18:30 ` [PULL v2 23/41] virtio-mem: Exclude unplugged memory during migration Michael S. Tsirkin
2020-07-04 18:30 ` [PULL v2 24/41] numa: Auto-enable NUMA when any memory devices are possible Michael S. Tsirkin
2020-07-04 18:30 ` [PULL v2 25/41] tests/acpi: remove stale allowed tables Michael S. Tsirkin
2020-07-04 18:30 ` [PULL v2 26/41] docs: vhost-user: add Virtio status protocol feature Michael S. Tsirkin
2020-07-04 18:30 ` [PULL v2 27/41] MAINTAINERS: add VT-d entry Michael S. Tsirkin
2020-07-04 18:30 ` [PULL v2 28/41] net: introduce qemu_get_peer Michael S. Tsirkin
2020-07-04 18:30 ` [PULL v2 29/41] vhost_net: use the function qemu_get_peer Michael S. Tsirkin
2020-07-04 18:30 ` [PULL v2 30/41] virtio-bus: introduce queue_enabled method Michael S. Tsirkin
2020-07-04 18:30 ` [PULL v2 31/41] virtio-pci: implement " Michael S. Tsirkin
2020-07-27 13:51   ` Laurent Vivier
2020-07-27 14:00     ` Michael S. Tsirkin
2020-07-27 14:06       ` Laurent Vivier
2020-07-04 18:30 ` [PULL v2 32/41] vhost: check the existence of vhost_set_iotlb_callback Michael S. Tsirkin
2020-07-04 18:30 ` [PULL v2 33/41] vhost: introduce new VhostOps vhost_dev_start Michael S. Tsirkin
2020-07-04 18:30 ` [PULL v2 34/41] vhost: implement vhost_dev_start method Michael S. Tsirkin
2020-07-04 18:30 ` [PULL v2 35/41] vhost: introduce new VhostOps vhost_vq_get_addr Michael S. Tsirkin
2020-07-04 18:30 ` [PULL v2 36/41] vhost: implement vhost_vq_get_addr method Michael S. Tsirkin
2020-07-04 18:30 ` [PULL v2 37/41] vhost: introduce new VhostOps vhost_force_iommu Michael S. Tsirkin
2020-07-04 18:31 ` [PULL v2 38/41] vhost: implement vhost_force_iommu method Michael S. Tsirkin
2020-07-04 18:31 ` [PULL v2 39/41] vhost_net: introduce set_config & get_config Michael S. Tsirkin
2020-07-04 18:31 ` [PULL v2 40/41] vhost-vdpa: introduce vhost-vdpa backend Michael S. Tsirkin
2020-07-09 15:14   ` Peter Maydell
2020-07-10  2:07     ` Cindy Lu
2020-07-04 18:31 ` [PULL v2 41/41] vhost-vdpa: introduce vhost-vdpa net client Michael S. Tsirkin
2020-07-07 11:40 ` [PULL v2 00/41] virtio,acpi: features, fixes, cleanups Peter Maydell
2020-07-07 12:03   ` Michael S. Tsirkin
2020-07-07 17:50     ` Peter Maydell
2020-07-08  6:45       ` Michael S. Tsirkin
2020-07-08 10:19         ` Peter Maydell
2020-07-09 10:32       ` Peter Maydell
2020-07-09 17:46         ` Michael S. Tsirkin [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200709134600-mutt-send-email-mst@kernel.org \
    --to=mst@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).