a8263c0693
- Include upstream patches designated as stable material and reviewed for applicability to include here block-Separate-blk_is_writable-and-blk_s.patch hw-intc-arm_gic-Fix-interrupt-ID-in-GICD.patch hw-net-lan9118-Fix-RX-Status-FIFO-PEEK-v.patch hw-timer-slavio_timer-Allow-64-bit-acces.patch net-Fix-handling-of-id-in-netdev_add-and.patch target-arm-Don-t-decode-insns-in-the-XSc.patch target-arm-Fix-MTE0_ACTIVE.patch target-arm-Introduce-PREDDESC-field-defi.patch target-arm-Update-PFIRST-PNEXT-for-pred_.patch target-arm-Update-REV-PUNPK-for-pred_des.patch target-arm-Update-ZIP-UZP-TRN-for-pred_d.patch tcg-Use-memset-for-large-vector-byte-rep.patch ui-vnc-Add-missing-lock-for-send_color_m.patch virtio-move-use-disabled-flag-property-t.patch - binutils v2.36 has changed the handling of the assembler's -mx86-used-note, resulting in a build failure. To compensate, we now explicitly specify -mx86-used-note=no in the seabios Makefile (boo#1181775) build-be-explicit-about-mx86-used-note-n.patch OBS-URL: https://build.opensuse.org/request/show/869843 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=614
39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
Diff
From: Peng Liang <liangpeng10@huawei.com>
|
|
Date: Mon, 16 Nov 2020 22:13:38 +0800
|
|
Subject: ui/vnc: Add missing lock for send_color_map
|
|
|
|
Git-commit: 947191b4312a547621566d77d7b922d9e13bb63d
|
|
vnc_write() should be locked after the RFB protocol is initialized.
|
|
|
|
Fixes: 0c426e4534b4 ("vnc: Add support for color map")
|
|
Cc: qemu-stable@nongnu.org
|
|
Reported-by: Euler Robot <euler.robot@huawei.com>
|
|
Signed-off-by: Peng Liang <liangpeng10@huawei.com>
|
|
Message-id: 20201116141338.148911-1-liangpeng10@huawei.com
|
|
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
ui/vnc.c | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/ui/vnc.c b/ui/vnc.c
|
|
index 49235056f7a893f5f7c86500afbc..ca3fc376aeb547681e5a26a480b6 100644
|
|
--- a/ui/vnc.c
|
|
+++ b/ui/vnc.c
|
|
@@ -2156,6 +2156,7 @@ static void send_color_map(VncState *vs)
|
|
{
|
|
int i;
|
|
|
|
+ vnc_lock_output(vs);
|
|
vnc_write_u8(vs, VNC_MSG_SERVER_SET_COLOUR_MAP_ENTRIES);
|
|
vnc_write_u8(vs, 0); /* padding */
|
|
vnc_write_u16(vs, 0); /* first color */
|
|
@@ -2168,6 +2169,7 @@ static void send_color_map(VncState *vs)
|
|
vnc_write_u16(vs, (((i >> pf->gshift) & pf->gmax) << (16 - pf->gbits)));
|
|
vnc_write_u16(vs, (((i >> pf->bshift) & pf->bmax) << (16 - pf->bbits)));
|
|
}
|
|
+ vnc_unlock_output(vs);
|
|
}
|
|
|
|
static void set_pixel_format(VncState *vs, int bits_per_pixel,
|