| Message ID | 20231004114809.105672-1-thuth@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | hw/virtio/vhost: Silence compiler warnings in vhost code when using -Wshadow | expand |
On Wed, Oct 04, 2023 at 01:48:09PM +0200, Thomas Huth wrote: > Rename a variable in vhost_dev_sync_region() and remove a superfluous > declaration in vhost_commit() to make this code compilable with "-Wshadow". > > Signed-off-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> > --- > hw/virtio/vhost.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c > index e2f6ffb446..9cfac40fde 100644 > --- a/hw/virtio/vhost.c > +++ b/hw/virtio/vhost.c > @@ -66,12 +66,12 @@ static void vhost_dev_sync_region(struct vhost_dev *dev, > uint64_t mfirst, uint64_t mlast, > uint64_t rfirst, uint64_t rlast) > { > - vhost_log_chunk_t *log = dev->log->log; > + vhost_log_chunk_t *dev_log = dev->log->log; > > uint64_t start = MAX(mfirst, rfirst); > uint64_t end = MIN(mlast, rlast); > - vhost_log_chunk_t *from = log + start / VHOST_LOG_CHUNK; > - vhost_log_chunk_t *to = log + end / VHOST_LOG_CHUNK + 1; > + vhost_log_chunk_t *from = dev_log + start / VHOST_LOG_CHUNK; > + vhost_log_chunk_t *to = dev_log + end / VHOST_LOG_CHUNK + 1; > uint64_t addr = QEMU_ALIGN_DOWN(start, VHOST_LOG_CHUNK); > > if (end < start) { > @@ -549,7 +549,7 @@ static void vhost_commit(MemoryListener *listener) > changed = true; > } else { > /* Same size, lets check the contents */ > - for (int i = 0; i < n_old_sections; i++) { > + for (i = 0; i < n_old_sections; i++) { > if (!MemoryRegionSection_eq(&old_sections[i], > &dev->mem_sections[i])) { > changed = true; > -- > 2.41.0
Applied to my trivial-patches tree, thanks! Marcus, you picked up previous patches of this theme, -- you can continue this tradition if you like :) /mjt
Michael Tokarev <mjt@tls.msk.ru> writes: > Applied to my trivial-patches tree, thanks! > > Marcus, you picked up previous patches of this theme, -- > you can continue this tradition if you like :) I intend to post a pull request for the -Wshadow patches that have R-bys. I'm also tracking the unreviewed ones, and hope they get reviewed.
06.10.2023 11:55, Markus Armbruster пишет: > Michael Tokarev <mjt@tls.msk.ru> writes: > >> Applied to my trivial-patches tree, thanks! >> >> Marcus, you picked up previous patches of this theme, -- >> you can continue this tradition if you like :) > > I intend to post a pull request for the -Wshadow patches that have > R-bys. I'm also tracking the unreviewed ones, and hope they get > reviewed. Ahh, ok. I've added my own R-bys for the ones I picked up, and for this one by Thomas too: Reviewed-By: Michael Tokarev <mjt@tls.msk.ru> /mjt
Michael Tokarev <mjt@tls.msk.ru> writes: > 06.10.2023 11:55, Markus Armbruster пишет: >> Michael Tokarev <mjt@tls.msk.ru> writes: >> >>> Applied to my trivial-patches tree, thanks! >>> >>> Marcus, you picked up previous patches of this theme, -- >>> you can continue this tradition if you like :) >> I intend to post a pull request for the -Wshadow patches that have >> R-bys. I'm also tracking the unreviewed ones, and hope they get >> reviewed. > > Ahh, ok. > > I've added my own R-bys for the ones I picked up, and for this one > by Thomas too: > > Reviewed-By: Michael Tokarev <mjt@tls.msk.ru> Got it. I also got one for target/ppc: Rename variables to avoid local variable shadowing in VUPKPX but that's all. If you'd like me to add some more, please post them to the list.
On Fri, Oct 06, 2023 at 01:45:51PM +0300, Michael Tokarev wrote: > 06.10.2023 11:55, Markus Armbruster пишет: > > Michael Tokarev <mjt@tls.msk.ru> writes: > > > > > Applied to my trivial-patches tree, thanks! > > > > > > Marcus, you picked up previous patches of this theme, -- > > > you can continue this tradition if you like :) > > > > I intend to post a pull request for the -Wshadow patches that have > > R-bys. I'm also tracking the unreviewed ones, and hope they get > > reviewed. > > Ahh, ok. > > I've added my own R-bys for the ones I picked up, and for this one > by Thomas too: > > Reviewed-By: Michael Tokarev <mjt@tls.msk.ru> > > /mjt it would be better to deal with all of them in one place tbh.
"Michael S. Tsirkin" <mst@redhat.com> writes: > On Fri, Oct 06, 2023 at 01:45:51PM +0300, Michael Tokarev wrote: >> 06.10.2023 11:55, Markus Armbruster пишет: >> > Michael Tokarev <mjt@tls.msk.ru> writes: >> > >> > > Applied to my trivial-patches tree, thanks! >> > > >> > > Marcus, you picked up previous patches of this theme, -- >> > > you can continue this tradition if you like :) >> > >> > I intend to post a pull request for the -Wshadow patches that have >> > R-bys. I'm also tracking the unreviewed ones, and hope they get >> > reviewed. >> >> Ahh, ok. >> >> I've added my own R-bys for the ones I picked up, and for this one >> by Thomas too: >> >> Reviewed-By: Michael Tokarev <mjt@tls.msk.ru> >> >> /mjt > > it would be better to deal with all of them in one place tbh. I just sent a pull request. Thanks for all the reviews!
06.10.2023 14:24, Michael S. Tsirkin: > On Fri, Oct 06, 2023 at 01:45:51PM +0300, Michael Tokarev wrote: >> 06.10.2023 11:55, Markus Armbruster пишет: >>> Michael Tokarev <mjt@tls.msk.ru> writes: >>> >>>> Applied to my trivial-patches tree, thanks! >>>> >>>> Marcus, you picked up previous patches of this theme, -- >>>> you can continue this tradition if you like :) >>> >>> I intend to post a pull request for the -Wshadow patches that have >>> R-bys. I'm also tracking the unreviewed ones, and hope they get >>> reviewed. >> >> Ahh, ok. >> >> I've added my own R-bys for the ones I picked up, and for this one >> by Thomas too: >> >> Reviewed-By: Michael Tokarev <mjt@tls.msk.ru> > > it would be better to deal with all of them in one place tbh. This is exactly why I asked Marcus about this in the first place, being confused a bit with the stuff being especially sent to qemu-trivial@ :) /mjt
Michael Tokarev <mjt@tls.msk.ru> writes: > 06.10.2023 14:24, Michael S. Tsirkin: >> On Fri, Oct 06, 2023 at 01:45:51PM +0300, Michael Tokarev wrote: >>> 06.10.2023 11:55, Markus Armbruster пишет: >>>> Michael Tokarev <mjt@tls.msk.ru> writes: >>>> >>>>> Applied to my trivial-patches tree, thanks! >>>>> >>>>> Marcus, you picked up previous patches of this theme, -- >>>>> you can continue this tradition if you like :) >>>> >>>> I intend to post a pull request for the -Wshadow patches that have >>>> R-bys. I'm also tracking the unreviewed ones, and hope they get >>>> reviewed. >>> >>> Ahh, ok. >>> >>> I've added my own R-bys for the ones I picked up, and for this one >>> by Thomas too: >>> >>> Reviewed-By: Michael Tokarev <mjt@tls.msk.ru> >> >> it would be better to deal with all of them in one place tbh. > > This is exactly why I asked Marcus about this in the first place, > being confused a bit with the stuff being especially sent to > qemu-trivial@ :) This patch is in my latest PR[*], along with all the other shadow patches that were ready at the time. A few more are coming down the pipe, which I can take through my tree, too. [*] [PULL 00/32] -Wshadow=local patches patches for 2023-10-06 Message-ID: <20231006113657.3803180-1-armbru@redhat.com>
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index e2f6ffb446..9cfac40fde 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -66,12 +66,12 @@ static void vhost_dev_sync_region(struct vhost_dev *dev, uint64_t mfirst, uint64_t mlast, uint64_t rfirst, uint64_t rlast) { - vhost_log_chunk_t *log = dev->log->log; + vhost_log_chunk_t *dev_log = dev->log->log; uint64_t start = MAX(mfirst, rfirst); uint64_t end = MIN(mlast, rlast); - vhost_log_chunk_t *from = log + start / VHOST_LOG_CHUNK; - vhost_log_chunk_t *to = log + end / VHOST_LOG_CHUNK + 1; + vhost_log_chunk_t *from = dev_log + start / VHOST_LOG_CHUNK; + vhost_log_chunk_t *to = dev_log + end / VHOST_LOG_CHUNK + 1; uint64_t addr = QEMU_ALIGN_DOWN(start, VHOST_LOG_CHUNK); if (end < start) { @@ -549,7 +549,7 @@ static void vhost_commit(MemoryListener *listener) changed = true; } else { /* Same size, lets check the contents */ - for (int i = 0; i < n_old_sections; i++) { + for (i = 0; i < n_old_sections; i++) { if (!MemoryRegionSection_eq(&old_sections[i], &dev->mem_sections[i])) { changed = true;
Rename a variable in vhost_dev_sync_region() and remove a superfluous declaration in vhost_commit() to make this code compilable with "-Wshadow". Signed-off-by: Thomas Huth <thuth@redhat.com> --- hw/virtio/vhost.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)