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 <th...@redhat.com>
Reviewed-by: Michael S. Tsirkin <m...@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
