ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

-Wshadow=local patches for 2023-10-12 

-----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEENUvIs9frKmtoZ05fOHC0AOuRhlMFAmUoCNsSHGFybWJydUBy
 ZWRoYXQuY29tAAoJEDhwtADrkYZTTocP/iQ6RggqcHrBxwZZtyydvpWCFrqfuBTk
 6GQtKGm51UcQ9kmAIsoV90pOzdUdjwrpXzKKJwsLzMcVcp1NDPsQIL54wdsRmZfH
 E9mxI7UlZf/KWzrfP1nFLcU8T5+cuXosDgjx55Y1Kq+ZRn+7x0DInBGdRryokWTG
 zcKh9T3n9KWKscLL7hvxLZS5054V9HBDYIpBBEyV2GtRrCLL0Y+9aaKkBrejHMgY
 oKrLKHz1cOGOTzQ7AbhA+Wv3eN+GYVyjnCSUXK/270jbU8Xg4m1vSbrPq2PWy5kV
 IGGKZtZsrSq0VBoTi+i9++vP5djKVUYQLqx10L+NYCp25wBnTgXKSDtdAqI68aev
 TYrOlQ1ldKXJT4ghPqoWCjRKkryV6/Gj9fHbbvsHJ7SB84VO8G/kpn5zXvN/BosG
 8vxLEL0xc1Q3Sxi91DCjVsP7UebjBt1j/JugU9zVr8OFJWriFmllYB67AOOo3gS2
 c+FNVPLle3udw5EHClMapcGSzTun4iHeEsiJMOOgGOHC09Bi+Om6LlneFWljmvQp
 a6ma+bebxCjzuO6heey2Q/1JjltR8Ex0bnbWIoNsysA6OnDtTlbxDqZEca1h6As+
 Rm9XFKf7nVQIHFKW3sjbx6MgqAL6sBakfeJah5Pj5iIKtLaZR591RyAfvfB2sBlS
 ZYtp95GIKWXZ
 =AArx
 -----END PGP SIGNATURE-----

Merge tag 'pull-shadow-2023-10-12' of https://repo.or.cz/qemu/armbru into staging

-Wshadow=local patches for 2023-10-12

# -----BEGIN PGP SIGNATURE-----
#
# iQJGBAABCAAwFiEENUvIs9frKmtoZ05fOHC0AOuRhlMFAmUoCNsSHGFybWJydUBy
# ZWRoYXQuY29tAAoJEDhwtADrkYZTTocP/iQ6RggqcHrBxwZZtyydvpWCFrqfuBTk
# 6GQtKGm51UcQ9kmAIsoV90pOzdUdjwrpXzKKJwsLzMcVcp1NDPsQIL54wdsRmZfH
# E9mxI7UlZf/KWzrfP1nFLcU8T5+cuXosDgjx55Y1Kq+ZRn+7x0DInBGdRryokWTG
# zcKh9T3n9KWKscLL7hvxLZS5054V9HBDYIpBBEyV2GtRrCLL0Y+9aaKkBrejHMgY
# oKrLKHz1cOGOTzQ7AbhA+Wv3eN+GYVyjnCSUXK/270jbU8Xg4m1vSbrPq2PWy5kV
# IGGKZtZsrSq0VBoTi+i9++vP5djKVUYQLqx10L+NYCp25wBnTgXKSDtdAqI68aev
# TYrOlQ1ldKXJT4ghPqoWCjRKkryV6/Gj9fHbbvsHJ7SB84VO8G/kpn5zXvN/BosG
# 8vxLEL0xc1Q3Sxi91DCjVsP7UebjBt1j/JugU9zVr8OFJWriFmllYB67AOOo3gS2
# c+FNVPLle3udw5EHClMapcGSzTun4iHeEsiJMOOgGOHC09Bi+Om6LlneFWljmvQp
# a6ma+bebxCjzuO6heey2Q/1JjltR8Ex0bnbWIoNsysA6OnDtTlbxDqZEca1h6As+
# Rm9XFKf7nVQIHFKW3sjbx6MgqAL6sBakfeJah5Pj5iIKtLaZR591RyAfvfB2sBlS
# ZYtp95GIKWXZ
# =AArx
# -----END PGP SIGNATURE-----
# gpg: Signature made Thu 12 Oct 2023 10:55:23 EDT
# gpg:                using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg:                issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* tag 'pull-shadow-2023-10-12' of https://repo.or.cz/qemu/armbru:
  target/i386: fix shadowed variable pasto
  contrib/vhost-user-gpu: Fix compiler warning when compiling with -Wshadow
  hw/virtio/virtio-gpu: Fix compiler warning when compiling with -Wshadow
  libvhost-user: Fix compiler warning with -Wshadow=local
  libvduse: Fix compiler warning with -Wshadow=local

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Stefan Hajnoczi 2023-10-16 12:34:32 -04:00
parent bc2b89b385 c35b2fb1fd
commit 32bfaa4ea7
6 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/vhost-user-gpu/vhost-user-gpu.c
View File

@ -834,7 +834,7 @@ vg_resource_flush(VuGpu *g,
.width = width, .width = width,
.height = height, .height = height,
}; };
pixman_image_t *i = pixman_image_t *img =
pixman_image_create_bits(pixman_image_get_format(res->image), pixman_image_create_bits(pixman_image_get_format(res->image),
msg->payload.update.width, msg->payload.update.width,
msg->payload.update.height, msg->payload.update.height,
@ -842,11 +842,11 @@ vg_resource_flush(VuGpu *g,
payload.update.data), payload.update.data),
width * bpp); width * bpp);
pixman_image_composite(PIXMAN_OP_SRC, pixman_image_composite(PIXMAN_OP_SRC,
res->image, NULL, i, res->image, NULL, img,
extents->x1, extents->y1, extents->x1, extents->y1,
0, 0, 0, 0, 0, 0, 0, 0,
width, height); width, height);
pixman_image_unref(i); pixman_image_unref(img);
vg_send_msg(g, msg, -1); vg_send_msg(g, msg, -1);
g_free(msg); g_free(msg);
} }

8
contrib/vhost-user-gpu/vugpu.h
View File

@ -164,12 +164,12 @@ struct virtio_gpu_ctrl_command {
}; };
#define VUGPU_FILL_CMD(out) do { \ #define VUGPU_FILL_CMD(out) do { \
size_t s; \ size_t vugpufillcmd_s_ = \
s = iov_to_buf(cmd->elem.out_sg, cmd->elem.out_num, 0, \ iov_to_buf(cmd->elem.out_sg, cmd->elem.out_num, 0, \
&out, sizeof(out)); \ &out, sizeof(out)); \
if (s != sizeof(out)) { \ if (vugpufillcmd_s_ != sizeof(out)) { \
g_critical("%s: command size incorrect %zu vs %zu", \ g_critical("%s: command size incorrect %zu vs %zu", \
__func__, s, sizeof(out)); \ __func__, vugpufillcmd_s_, sizeof(out)); \
return; \ return; \
} \ } \
} while (0) } while (0)

8
include/hw/virtio/virtio-gpu.h
View File

@ -225,13 +225,13 @@ struct VhostUserGPU {
}; };
#define VIRTIO_GPU_FILL_CMD(out) do { \ #define VIRTIO_GPU_FILL_CMD(out) do { \
size_t s; \ size_t virtiogpufillcmd_s_ = \
s = iov_to_buf(cmd->elem.out_sg, cmd->elem.out_num, 0, \ iov_to_buf(cmd->elem.out_sg, cmd->elem.out_num, 0, \
&out, sizeof(out)); \ &out, sizeof(out)); \
if (s != sizeof(out)) { \ if (virtiogpufillcmd_s_ != sizeof(out)) { \
qemu_log_mask(LOG_GUEST_ERROR, \ qemu_log_mask(LOG_GUEST_ERROR, \
"%s: command size incorrect %zu vs %zu\n", \ "%s: command size incorrect %zu vs %zu\n", \
__func__, s, sizeof(out)); \ __func__, virtiogpufillcmd_s_, sizeof(out)); \
return; \ return; \
} \ } \
} while (0) } while (0)

2
subprojects/libvduse/libvduse.c
View File

@ -1031,7 +1031,7 @@ int vduse_dev_handler(VduseDev *dev)
/* The iova will be updated by iova_to_va() later, so just remove it */ /* The iova will be updated by iova_to_va() later, so just remove it */
vduse_iova_remove_region(dev, req.iova.start, req.iova.last); vduse_iova_remove_region(dev, req.iova.start, req.iova.last);
for (i = 0; i < dev->num_queues; i++) { for (i = 0; i < dev->num_queues; i++) {
VduseVirtq *vq = &dev->vqs[i]; vq = &dev->vqs[i];
if (vq->ready) { if (vq->ready) {
if (vduse_queue_update_vring(vq, vq->vring.desc_addr, if (vduse_queue_update_vring(vq, vq->vring.desc_addr,
vq->vring.avail_addr, vq->vring.avail_addr,

12
subprojects/libvhost-user/libvhost-user.c
View File

@ -870,10 +870,10 @@ vu_rem_mem_reg(VuDev *dev, VhostUserMsg *vmsg) {
for (i = 0; i < dev->nregions; i++) { for (i = 0; i < dev->nregions; i++) {
if (reg_equal(&dev->regions[i], msg_region)) { if (reg_equal(&dev->regions[i], msg_region)) {
VuDevRegion *r = &dev->regions[i]; VuDevRegion *r = &dev->regions[i];
void *m = (void *) (uintptr_t) r->mmap_addr; void *ma = (void *) (uintptr_t) r->mmap_addr;
if (m) { if (ma) {
munmap(m, r->size + r->mmap_offset); munmap(ma, r->size + r->mmap_offset);
} }
/* /*
@ -1005,10 +1005,10 @@ vu_set_mem_table_exec(VuDev *dev, VhostUserMsg *vmsg)
for (i = 0; i < dev->nregions; i++) { for (i = 0; i < dev->nregions; i++) {
VuDevRegion *r = &dev->regions[i]; VuDevRegion *r = &dev->regions[i];
void *m = (void *) (uintptr_t) r->mmap_addr; void *ma = (void *) (uintptr_t) r->mmap_addr;
if (m) { if (ma) {
munmap(m, r->size + r->mmap_offset); munmap(ma, r->size + r->mmap_offset);
} }
} }
dev->nregions = memory->nregions; dev->nregions = memory->nregions;

2
target/i386/tcg/seg_helper.c
View File

@ -229,7 +229,7 @@ static void tss_load_seg(CPUX86State *env, X86Seg seg_reg, int selector,
static void tss_set_busy(CPUX86State *env, int tss_selector, bool value, static void tss_set_busy(CPUX86State *env, int tss_selector, bool value,
uintptr_t retaddr) uintptr_t retaddr)
{ {
target_ulong ptr = env->gdt.base + (env->tr.selector & ~7); target_ulong ptr = env->gdt.base + (tss_selector & ~7);
uint32_t e2 = cpu_ldl_kernel_ra(env, ptr + 4, retaddr); uint32_t e2 = cpu_ldl_kernel_ra(env, ptr + 4, retaddr);
if (value) { if (value) {