From nobody Mon Sep 28 02:05:45 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1785153212; cv=none; d=zohomail.com; s=zohoarc; b=HJtgzRvvdYIm1zvcdvV5cUQ99w9723J2geej1QtimPmu3dQMmL4e3hbm3zbd/pjw4apPn8ftMOeSmzrHAR2591LZYoCsZl/tc+ThGWCz0wID9BFrguTgay7tWfvs6FQ9oLIM/43v8z5wFXOW/cVyGWVswo6JdWsDkzOGWbPIB1U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1785153212; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=dmJyhOrDhL5/20s5Y4V1M8+fG41aMSEtMEwupRxEmbE=; b=EfYcvli/RvEsR78FShjb7ennb2ERaJEdl7yJ1/5oXMzbig/zd94bRgpjQKCqP7LCHhCZCtryk9wKp8Oc4sHSneRTtr2VL/q6EV6R6D7C/HV5INnRHgarpHEHQXHWRq3FNQ3UYtcn/WO2pvabnPooqqG7YvtbkHtXCSAaKbCfj50= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1785153212730236.20026276681585; Mon, 27 Jul 2026 04:53:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1woJs2-0005Ag-9B; Mon, 27 Jul 2026 07:51:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1woJrz-00057m-Q7 for qemu-devel@nongnu.org; Mon, 27 Jul 2026 07:51:43 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1woJry-0003dz-1Y for qemu-devel@nongnu.org; Mon, 27 Jul 2026 07:51:43 -0400 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-527-1SpNLww6NcejNW-47Y-1mw-1; Mon, 27 Jul 2026 07:51:39 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9B2861955BD3; Mon, 27 Jul 2026 11:51:38 +0000 (UTC) Received: from localhost (unknown [10.44.24.5]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 74901180025F; Mon, 27 Jul 2026 11:51:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1785153101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dmJyhOrDhL5/20s5Y4V1M8+fG41aMSEtMEwupRxEmbE=; b=iMc1QffviziT7VmMpMgKFAE5vDLHp4svvYmoIQZTOVECEId9YpyY3YgqGrUhFpigrJvC3R qlfi+2riySBYZQh8gMuOfs4xl7ktv7DsKetklJhMcwvIvCbBa/sczjQYUjhy7k+yUJCoAd e3laeFAr2sy0MhypEeU7w8VDD0VCuUk= X-MC-Unique: 1SpNLww6NcejNW-47Y-1mw-1 X-Mimecast-MFC-AGG-ID: 1SpNLww6NcejNW-47Y-1mw_1785153098 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Mon, 27 Jul 2026 15:51:10 +0400 Subject: [GIT PULL 01/23] hw/display/virtio-gpu: Remove the bytes_pp field MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260727-fix-v1-1-ca3fa3851347@redhat.com> References: <20260727-fix-v1-0-ca3fa3851347@redhat.com> In-Reply-To: <20260727-fix-v1-0-ca3fa3851347@redhat.com> To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , =?utf-8?q?Alex_Benn=C3=A9e?= , Akihiko Odaki , Dmitry Osipenko , "Michael S. Tsirkin" X-Developer-Signature: v=1; a=openpgp-sha256; l=6117; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=HMZOoVecy0u+MFFPB8kxTy0tmTSpBAwIhoNPuqyS0GA=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqZ0Y++8GWwo/AL+H/hCWool9df/J/hkFir7LT8 kJWkDWj/cKJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCamdGPgAKCRDa6OEJdZac 5ftxD/9uiAr5CVgSgzMqiuipwTkEUkIQY9I5cvioo4oK1N8+0KF3wdO5y/J3nr99cVqStKX9zbM NAS0R+7OtXPw1lL8KnW52MBz0JVucH9fcCEmhaDnY+hrBok0u0ENSVX11ek1m2RBy01akNwc8bm iX+Bfmp8S/Wl4q/mNY6IDnEWEnEEyCd1RIYBXLCw4ZIock3ULAKu9VPlocFqL69r56PS69K1uOS KI3X27IOUXlHDi6Y+jUn7/N/QHlmwY0842bnmCSBQKeTaPSklcuaGevW/yRdN/isqaCdHVJKqDY mz9vSBDNr6z9xQH57FbxdtFLEy0at68vzXVluhe44vekAjTsI2TqM/kAJiK6TE4AFtp+pQJmDn1 r+NOiu8js0NEQzX1MPeAyrvvvpNNLg7yLlf1sPpoanqMCPaxilimg37yGZYyprMc28WyRhJgCk+ rfLt0yv837tv+xqMt/S99S7Q4RvoD7ELxrNZ5R5mIA+aVwpVh9dDgTQjinQN4WeQ1Y4N6E/K9C1 mvkSFsUONoOSB4bvSqn+1LEBlirKTqH3p/FbjAoS/HsvuRoPNHVzxBy3pFWFByl7kqU0m0cV5+a yLZwGY4DjlwBOiK57LSFsfzSFGvpwL6ZVdyInCavf4VpIOATsVAnIiUv2dH8f1q1Og46OWHmAR2 9k47icVAJ+jxMmw== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -2 X-Spam_score: -0.3 X-Spam_bar: / X-Spam_report: (-0.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.58, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1785153213060158500 From: Akihiko Odaki virtio_gpu_do_set_scanout() validates the stride field of struct virtio_gpu_framebuffer against the bytes_pp field, but bytes_pp in the migration stream may be inconsistent with the format field, which pixman_image_create_bits() uses when it accesses the framebuffer. That validation is therefore incomplete. To avoid the trouble of synchronizing the two fields, remove bytes_pp, and always derive its value from format. Removing bytes_pp is safe because no released version of QEMU uses its migrated value. Fixes: 7b5574225429 ("hw/display: check frame buffer can hold blob") Cc: qemu-stable@nongnu.org Reviewed-by: Dmitry Osipenko Reviewed-by: Philippe Mathieu-Daud=C3=A9 [ Marc-Andr=C3=A9 - fix rebase conflict ] Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Akihiko Odaki Message-ID: <20260719-bpp-v1-1-9b91946d6cf3@rsg.ci.i.u-tokyo.ac.jp> --- include/hw/virtio/virtio-gpu.h | 1 - hw/display/virtio-gpu.c | 27 +++++++++++++++++---------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h index b9bad27c97a8..2f60c72078b3 100644 --- a/include/hw/virtio/virtio-gpu.h +++ b/include/hw/virtio/virtio-gpu.h @@ -66,7 +66,6 @@ struct virtio_gpu_simple_resource { =20 struct virtio_gpu_framebuffer { pixman_format_code_t format; - uint32_t bytes_pp; uint32_t width, height; uint32_t stride; uint32_t offset; diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index 718ba3039290..eac039c3c366 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -617,6 +617,11 @@ void virtio_gpu_update_scanout(VirtIOGPU *g, scanout->fb =3D *fb; } =20 +static uint32_t virtio_gpu_format_bytes_pp(pixman_format_code_t format) +{ + return DIV_ROUND_UP(PIXMAN_FORMAT_BPP(format), 8); +} + static bool virtio_gpu_do_set_scanout(VirtIOGPU *g, uint32_t scanout_id, struct virtio_gpu_framebuffer *fb, @@ -625,6 +630,7 @@ static bool virtio_gpu_do_set_scanout(VirtIOGPU *g, uint32_t *error) { struct virtio_gpu_scanout *scanout; + uint32_t bytes_pp =3D virtio_gpu_format_bytes_pp(fb->format); uint8_t *data; =20 scanout =3D &g->parent_obj.scanout[scanout_id]; @@ -646,10 +652,10 @@ static bool virtio_gpu_do_set_scanout(VirtIOGPU *g, return false; } =20 - if (fb->stride < (uint64_t)fb->width * fb->bytes_pp) { + if (fb->stride < (uint64_t)fb->width * bytes_pp) { qemu_log_mask(LOG_GUEST_ERROR, "%s: stride %u too small for width %u at %u bpp\n", - __func__, fb->stride, fb->width, fb->bytes_pp); + __func__, fb->stride, fb->width, bytes_pp); *error =3D VIRTIO_GPU_RESP_ERR_INVALID_PARAMETER; return false; } @@ -720,6 +726,7 @@ static void virtio_gpu_set_scanout(VirtIOGPU *g, struct virtio_gpu_simple_resource *res; struct virtio_gpu_framebuffer fb =3D { 0 }; struct virtio_gpu_set_scanout ss; + uint32_t bytes_pp; =20 VIRTIO_GPU_FILL_CMD(ss); virtio_gpu_bswap_32(&ss, sizeof(ss)); @@ -745,11 +752,11 @@ static void virtio_gpu_set_scanout(VirtIOGPU *g, } =20 fb.format =3D pixman_image_get_format(res->image); - fb.bytes_pp =3D DIV_ROUND_UP(PIXMAN_FORMAT_BPP(fb.format), 8); + bytes_pp =3D virtio_gpu_format_bytes_pp(fb.format); fb.width =3D pixman_image_get_width(res->image); fb.height =3D pixman_image_get_height(res->image); fb.stride =3D pixman_image_get_stride(res->image); - fb.offset =3D ss.r.x * fb.bytes_pp + ss.r.y * fb.stride; + fb.offset =3D ss.r.x * bytes_pp + ss.r.y * fb.stride; =20 virtio_gpu_do_set_scanout(g, ss.scanout_id, &fb, res, &ss.r, &cmd->error); @@ -760,6 +767,7 @@ bool virtio_gpu_scanout_blob_to_fb(struct virtio_gpu_fr= amebuffer *fb, uint64_t blob_size) { uint64_t fbend; + uint32_t bytes_pp; =20 fb->format =3D virtio_gpu_get_pixman_format(ss->format); if (!fb->format) { @@ -769,15 +777,15 @@ bool virtio_gpu_scanout_blob_to_fb(struct virtio_gpu_= framebuffer *fb, return false; } =20 - fb->bytes_pp =3D DIV_ROUND_UP(PIXMAN_FORMAT_BPP(fb->format), 8); + bytes_pp =3D virtio_gpu_format_bytes_pp(fb->format); fb->width =3D ss->width; fb->height =3D ss->height; fb->stride =3D ss->strides[0]; =20 - if (fb->stride < (uint64_t)fb->width * fb->bytes_pp) { + if (fb->stride < (uint64_t)fb->width * bytes_pp) { qemu_log_mask(LOG_GUEST_ERROR, "%s: stride %u too small for width %u at %u bpp\n", - __func__, fb->stride, fb->width, fb->bytes_pp); + __func__, fb->stride, fb->width, bytes_pp); return false; } =20 @@ -788,7 +796,7 @@ bool virtio_gpu_scanout_blob_to_fb(struct virtio_gpu_fr= amebuffer *fb, return false; } =20 - fb->offset =3D ss->offsets[0] + ss->r.x * fb->bytes_pp + ss->r.y * fb-= >stride; + fb->offset =3D ss->offsets[0] + ss->r.x * bytes_pp + ss->r.y * fb->str= ide; =20 fbend =3D fb->offset; fbend +=3D (uint64_t) fb->stride * ss->r.height; @@ -1238,8 +1246,7 @@ static const VMStateDescription vmstate_virtio_gpu_sc= anout =3D { VMSTATE_UINT32(cursor.pos.y, struct virtio_gpu_scanout), VMSTATE_UINT32_TEST(fb.format, struct virtio_gpu_scanout, scanout_vmstate_after_v2), - VMSTATE_UINT32_TEST(fb.bytes_pp, struct virtio_gpu_scanout, - scanout_vmstate_after_v2), + VMSTATE_UNUSED_TEST(scanout_vmstate_after_v2, 4), VMSTATE_UINT32_TEST(fb.width, struct virtio_gpu_scanout, scanout_vmstate_after_v2), VMSTATE_UINT32_TEST(fb.height, struct virtio_gpu_scanout, --=20 2.55.0 From nobody Mon Sep 28 02:05:45 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1785153167; cv=none; d=zohomail.com; s=zohoarc; b=B54C78mv1kyWXxsPFjdZLs0WYvjdA1b4xttiv47/WPI9O11MnmjmWzAq8lhoo/wTQIZm3I19MkaY3vno44g4dK1HBUP3YgunFcOUn2KJl84M21Z2LijV5u6Snu33csYN1OyezrBv/7PkfFaHSl+lYbkCON4+alwxLDaIpanPuuY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1785153167; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=qehTNLc2Jh6L2YaZibtPwTJ9+4FXPg2W3cevn1UdqpU=; b=gmoMBxCqrGd8OvtvL7NbUdIopRd9kYwUCM8za9hG5zR0phAMr7ISJc8N0gNUNjlgygQx6w7OUdXCIkBIa6ctXoY1KFZeBcytMBlb9La3ScNkWNJ9ADum3Y8opkskHUJjEs9AXlU1+n1hcOALgjY73tAffTuC8843mEwHsVKEews= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1785153167259268.8183999512545; Mon, 27 Jul 2026 04:52:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1woJs7-0005MI-0n; Mon, 27 Jul 2026 07:51:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1woJs5-0005H8-CZ for qemu-devel@nongnu.org; Mon, 27 Jul 2026 07:51:49 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1woJs3-0003ee-IH for qemu-devel@nongnu.org; Mon, 27 Jul 2026 07:51:49 -0400 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-593-KONfBw0qOuSlOsNVgZQeRQ-1; Mon, 27 Jul 2026 07:51:45 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 29CD61954B28 for ; Mon, 27 Jul 2026 11:51:44 +0000 (UTC) Received: from localhost (unknown [10.44.24.5]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B9F221955F74; Mon, 27 Jul 2026 11:51:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1785153106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qehTNLc2Jh6L2YaZibtPwTJ9+4FXPg2W3cevn1UdqpU=; b=h4e9A1XbWkHNNkXqJ37tEG/vBQtjHRAmZDNvv2GxrynwDQXhgQEjOdozpJxsIJvvAhr1Vb 72Q/fbdl0hMdwewArLhK9mWtuxFS4p1sXhNobJrWQgSV4xKnudGGbvlng8WnCIrma8+FpE qXDGYP6aLLzjE86XujJT0C8xJClogrQ= X-MC-Unique: KONfBw0qOuSlOsNVgZQeRQ-1 X-Mimecast-MFC-AGG-ID: KONfBw0qOuSlOsNVgZQeRQ_1785153104 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Mon, 27 Jul 2026 15:51:11 +0400 Subject: [GIT PULL 02/23] hw/display/vhost-user-gpu: validate message payload sizes MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260727-fix-v1-2-ca3fa3851347@redhat.com> References: <20260727-fix-v1-0-ca3fa3851347@redhat.com> In-Reply-To: <20260727-fix-v1-0-ca3fa3851347@redhat.com> To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , "Michael S. Tsirkin" , Stefano Garzarella , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Developer-Signature: v=1; a=openpgp-sha256; l=3289; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=WeuQ+Ag+ovL1UQ7DOEoC3DSLDD6wamv5Uo4NoeqyEBE=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqZ0Y+ke2vrcz2BFO4gVThW6znI8hk+CZzaEH9Z yr03tm6GLKJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCamdGPgAKCRDa6OEJdZac 5acxEACabWuuymaXaJAldku+yJzRdXuZnF/5iZy2l0sOZK4yRqiOp6ODrMaEf9X0ge2dWxN6Iy9 ARWn+LzAqzkCnyIGPwmrYoqGFVmTHZTw+7Ac/aOc3o108M+Oidro4pxZOGFkJVBs7OhKjczaXd4 j6tyXXHpsH0SZe1TmxaoKXPP1XbFpE7iKFHKs/FFpQMVggAnJ8+b1wIHfa6chtC7y27j9bihXyc HneNjHXkHyXTfG7Td53Twfx0c/d6BEXPTMX4KhIuJn1UUqrSYIFNvKNRiBmlKSKfmvuGX1spGw3 PjJFJgvCNnOnZ1r6niYp8g+fEhmZXe4A8z19MY4y0W3vXhhIt8PGTOWpZ+u6xY2YW9szQClcN7c uZhFEYNDCBmYauM/EZ1qsI9MRr9co/df+OVEET9RWJV5kAbRSDmY7T2s1FDW5u4129GJ3m1xEgn syLlC2RAkIT0zH3gW71XMaDgvROc6zkhshHK3zbz0L0MpEQEYrmro+mT5EG/cV+6JuAmKBu7tsf Wk4O9uUwOsvn5vnHHqv21H/AqOMtlPbYdPcps5eByBPOcq02zHwkRY5NZxNyMPGRZ3PBcSThW2v E/L0qeIF+pOmxya276hvadmRSZMrx09HgkWPBdOP4n5CY8b7Gds6TfOq7gw7VqYBGVaSg01x8ta U0TEzv1vjkBvy6g== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -2 X-Spam_score: -0.3 X-Spam_bar: / X-Spam_report: (-0.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.58, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1785153168697158500 A malicious or buggy vhost-user-gpu backend can send messages with undersized payloads, leading to out-of-bounds reads when the handler accesses struct fields beyond the allocated buffer. However, vhost-user-gpu is considered trusted by QEMU by design (it has access to shared memory etc). Add a centralized minimum payload size check in vhost_user_gpu_chr_read() that rejects messages before dispatch, and a per-pixel bounds check in the VHOST_USER_GPU_UPDATE handler to ensure the variable-length data covers the declared width x height. Fixes: 267f66465 ("hw/display: add vhost-user-vga & gpu-pci") Resolves: https://gitlab.com/qemu-project/qemu/-/work_items/3866 Reported-by: Feifan Qian Reviewed-by: Thomas Huth Signed-off-by: Marc-Andr=C3=A9 Lureau --- hw/display/vhost-user-gpu.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/hw/display/vhost-user-gpu.c b/hw/display/vhost-user-gpu.c index 57360898ca0d..cd684d63639e 100644 --- a/hw/display/vhost-user-gpu.c +++ b/hw/display/vhost-user-gpu.c @@ -119,6 +119,31 @@ static VhostUserGpuMsg m __attribute__ ((unused)); =20 static void vhost_user_gpu_update_blocked(VhostUserGPU *g, bool blocked); =20 +static size_t +vhost_user_gpu_min_payload_size(VhostUserGpuRequest request) +{ + switch (request) { + case VHOST_USER_GPU_CURSOR_POS: + case VHOST_USER_GPU_CURSOR_POS_HIDE: + return sizeof(VhostUserGpuCursorPos); + case VHOST_USER_GPU_CURSOR_UPDATE: + return sizeof(VhostUserGpuCursorUpdate); + case VHOST_USER_GPU_GET_EDID: + return sizeof(VhostUserGpuEdidRequest); + case VHOST_USER_GPU_SCANOUT: + return sizeof(VhostUserGpuScanout); + case VHOST_USER_GPU_DMABUF_SCANOUT: + return sizeof(VhostUserGpuDMABUFScanout); + case VHOST_USER_GPU_DMABUF_SCANOUT2: + return sizeof(VhostUserGpuDMABUFScanout2); + case VHOST_USER_GPU_DMABUF_UPDATE: + case VHOST_USER_GPU_UPDATE: + return sizeof(VhostUserGpuUpdate); + default: + return 0; + } +} + static void vhost_user_gpu_handle_cursor(VhostUserGPU *g, VhostUserGpuMsg *msg) { @@ -322,6 +347,14 @@ vhost_user_gpu_handle_display(VhostUserGPU *g, VhostUs= erGpuMsg *msg) if (m->scanout_id >=3D g->parent_obj.conf.max_outputs) { break; } + + if ((uint64_t)m->width * m->height > + (msg->size - sizeof(VhostUserGpuUpdate)) / sizeof(uint32_t)) { + error_report("vhost-user-gpu: update payload too small" + " for %ux%u", m->width, m->height); + break; + } + s =3D &g->parent_obj.scanout[m->scanout_id]; con =3D s->con; pixman_image_t *image =3D @@ -396,6 +429,11 @@ vhost_user_gpu_chr_read(void *opaque) msg->flags =3D flags; msg->size =3D size; =20 + if (size < vhost_user_gpu_min_payload_size(request)) { + error_report("vhost-user-gpu: message %d payload too small", reque= st); + goto end; + } + if (request =3D=3D VHOST_USER_GPU_CURSOR_UPDATE || request =3D=3D VHOST_USER_GPU_CURSOR_POS || request =3D=3D VHOST_USER_GPU_CURSOR_POS_HIDE) { --=20 2.55.0 From nobody Mon Sep 28 02:05:45 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1785153128; cv=none; d=zohomail.com; s=zohoarc; b=cN8TISMV8K8yqx//yBvAv/Rzl+JrmhPUWz10U2CYSOmMNXMYxRDzUWOZL1wpj1k3WfR8tKdUNaG2JKQOer04lvKD/z/D9+xHt7N6kdhZfpxrrxoSRiasUBArBAyMTcXRrncal3w+gv47+HyTS8wttt/5gfN6n9Bsi+8cB7Ro9KU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1785153128; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=+6oOziT8zKOhtMdie8wWL3BR8gN2kUeDZsiiPMBFk9M=; b=SYneThbex6nkaTFsnkEwYvCujNoIvijgXSCG//XewvTao5HWUUKiykiY4LNRlIsFz03uTW/1PCXCyn7apQ8MuwjEEbMZ/8WJVIVHKpSbyUL2QVj9CeUJDZQvY58J4NTAXDUkK43P8edjDaDdW3LnBqpMr7l35v2YfUJE7H82Tfk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1785153128132985.2811910183821; Mon, 27 Jul 2026 04:52:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1woJsC-0005qQ-5b; Mon, 27 Jul 2026 07:51:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1woJsB-0005nM-1I for qemu-devel@nongnu.org; Mon, 27 Jul 2026 07:51:55 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1woJs9-0003gU-7N for qemu-devel@nongnu.org; Mon, 27 Jul 2026 07:51:54 -0400 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-611-_MtPq8RVN8eNQnWfyqNUaw-1; Mon, 27 Jul 2026 07:51:50 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 98E2A1955EAB for ; Mon, 27 Jul 2026 11:51:49 +0000 (UTC) Received: from localhost (unknown [10.44.24.5]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8B24E1955F22; Mon, 27 Jul 2026 11:51:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1785153112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+6oOziT8zKOhtMdie8wWL3BR8gN2kUeDZsiiPMBFk9M=; b=iVQCtNYsxGJy8hk9HxQgqZzOrrlsbZdFCXAake9B2evewog02Xg5zHq34KncpmgeUDpkwI COCa7hesPN40y0IKUkVRGzTd1JG9Pxhzput08nBzWw+Me6/cBgm8euQ/eVLXZ9jV+KvpAh Y10J/V1od4p1UfwGGqgVp7E15J4R52I= X-MC-Unique: _MtPq8RVN8eNQnWfyqNUaw-1 X-Mimecast-MFC-AGG-ID: _MtPq8RVN8eNQnWfyqNUaw_1785153109 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Mon, 27 Jul 2026 15:51:12 +0400 Subject: [GIT PULL 03/23] ui/vnc: remove redundant rows computation MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260727-fix-v1-3-ca3fa3851347@redhat.com> References: <20260727-fix-v1-0-ca3fa3851347@redhat.com> In-Reply-To: <20260727-fix-v1-0-ca3fa3851347@redhat.com> To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Developer-Signature: v=1; a=openpgp-sha256; l=862; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=Ui2GT2zPct7cr+xHjhQjJ+Nebg8xon+0MaA+K2O4ZJI=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqZ0Y++G1+SrhQRIC1tInTfFosa7YM/Ges4+eog XKwAQJVccSJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCamdGPgAKCRDa6OEJdZac 5U+7D/9/gX+rsEWTlR7JvgWvE2B4P6M0bMQnKLZ8GjJQ4HhaIc+tHzsy4x/d4VwnZseSetRnFyj sUKujw4m1FxpnXNwXQivTL+3zffSGAU9Ldl+6iPzQx81iPiaFP8+8SLecN0Tql673LbqjR4QIWZ 8sZYulVi63jp4q/yG/qpU6fw2ftDjV9RL8xML0n96Cb3bBlv8cVNPzzoGpnoKZSLfcuIgg4pHGI hsscG/3hrlHWgc4Ru8xCuQcpyn51jC7FbIk8q3+wGeG6L06OP5IvEde01lpD7E/i+c87TXlwlHo PA9bPeKQCob6spt6JwLxKFtlvPG9Z1a07xqKzGyWeVVKXDeGxucyYfdxYX9G3ApNyNSe77f6wBl hZngnT5CoSTbr41VAYJzpWgwaOqhSqB91MBb96xpWuzTXETT8cndhPVhgW4xGxUa+FXfGh0pU0Y 3LimAWt1utdXSMPgn9TCDk//ZULRBPpkGFJoZ42yxEHzIrOGoEU/iMJH1qeLI61OlzTAXge4WIG wnIY7uUA4SsFB0ybro+O9PlXHjvakprnzis1EMZ9XbHhZ80r//TJNodDXhYDVo/jH2ONSxQJsI8 YYhzgVnBMoe4y2MUtM4u1IQ/EMQPR6cMbp/vVtgAtBK1SkAXKpY2z5g6ko9WvL1xXHDPwZKQ0CC Z8+3sbpthvQs3gw== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -2 X-Spam_score: -0.3 X-Spam_bar: / X-Spam_report: (-0.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.58, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1785153130475158500 "rows" was already computed in an earlier commit 3543c2b855 ("ui/vnc: fix OOB write in vnc_refresh_lossy_rect"). Fixes: e650e4fe0f ("ui/vnc: fix out-of-bounds write in lossy refresh dirty = marking") Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Marc-Andr=C3=A9 Lureau --- ui/vnc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/ui/vnc.c b/ui/vnc.c index 24aa40f7308e..656768f9c998 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -3016,7 +3016,6 @@ static int vnc_refresh_lossy_rect(VncDisplay *vd, int= x, int y, =20 y =3D QEMU_ALIGN_DOWN(y, VNC_STAT_RECT); x =3D QEMU_ALIGN_DOWN(x, VNC_STAT_RECT); - rows =3D MIN(VNC_STAT_RECT, height - y); =20 rows =3D MIN(VNC_STAT_RECT, height - y); if (rows <=3D 0) { --=20 2.55.0 From nobody Mon Sep 28 02:05:45 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1785153154; cv=none; d=zohomail.com; s=zohoarc; b=mJhc3Ocq6rPa4C3h8ZgVC9I+4QinEhKaLXOe06VQ6hGFgqodSihrAPgdaH5QjHl3bsEkTZkHL3cPSbwmhQ/vG76pB1u8jpVP1dvukSSVOm79cIqyTZ5vGcoegrFQKHXn1cQHkeAMhxQ8bU0UzS12WA91qS/TzHPE6omQzYWrc+E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1785153154; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=u2ZZmmA7la3LPIJb4HIyU9FC0Vdh1HZQjE97gHf8bEo=; b=iwBi/7y10lGNJsY4F5jWkZ8qZTYBO5JDCsMpcOanAlkpwFcub/QLr8YtOh/XsCu8DhKMQ9B5HWUikJoKfp1Fl0GBQXB5tMoAWh4WxTy0HF8t5peAcCXCgBJSjfvyqlm7F8qzrhhCSZ/K0vAB65sQAeBCfNROWCSbbUgpqe99+I8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1785153154400386.1703039423535; Mon, 27 Jul 2026 04:52:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1woJsH-0006Ak-V9; Mon, 27 Jul 2026 07:52:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1woJsF-00061T-KL for qemu-devel@nongnu.org; Mon, 27 Jul 2026 07:51:59 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1woJsD-0003ha-Kw for qemu-devel@nongnu.org; Mon, 27 Jul 2026 07:51:59 -0400 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-66-fo0m1F-OPDOsi-ScUYlNBQ-1; Mon, 27 Jul 2026 07:51:55 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id BA754195E919 for ; Mon, 27 Jul 2026 11:51:54 +0000 (UTC) Received: from localhost (unknown [10.44.24.5]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id BD97B30010CC; Mon, 27 Jul 2026 11:51:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1785153117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=u2ZZmmA7la3LPIJb4HIyU9FC0Vdh1HZQjE97gHf8bEo=; b=WnAl57lC0MSWvZNtbGj7NIdnDLtZgKV0uPujM//Si6uIT0p5zPpzMaOjPBUIBvO2yraSsP LGsht4L10jvK68sel0UfmL7t+cvxkLjJOMjt/FhyVEx0bguFk4MfKMww/PRNIfiks83138 W/bP5PYIK9JvD+Rm7XaXsFEc6sbRcgI= X-MC-Unique: fo0m1F-OPDOsi-ScUYlNBQ-1 X-Mimecast-MFC-AGG-ID: fo0m1F-OPDOsi-ScUYlNBQ_1785153115 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Mon, 27 Jul 2026 15:51:13 +0400 Subject: [GIT PULL 04/23] hw/display/qxl: unregister vm_change_state handler and BHs MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260727-fix-v1-4-ca3fa3851347@redhat.com> References: <20260727-fix-v1-0-ca3fa3851347@redhat.com> In-Reply-To: <20260727-fix-v1-0-ca3fa3851347@redhat.com> To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi X-Developer-Signature: v=1; a=openpgp-sha256; l=3556; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=H9fIokRleIlkTHgJZ2eUvb/iq6NOB2CFAfALJqXMA6Q=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqZ0Y+HW8m6PdkG5/CMb/0371yVzAc/23S+nLIH VDLE+t1vIiJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCamdGPgAKCRDa6OEJdZac 5V/xEACvalF74K4x19tCzcY/C7scyYjAEuBI5EJXnNAYw7xbU7SJxHmVDyEmPaGr1kYSsO0oX3f 8bO/ID+FQQdCbQsDOrSBuZhTRjlwGRzQhmMahgJNsVWt08AG/gY+bgXmLfJtvhU+wUm7JQmCDyX JrvI4TZOVVy6l/HEFoJqJbrpXzTUQ/Zw52pCN0K/Xrsnw1OySqJjKfJvKKuq05WVJYPykHKQxzr nR+77NaNCo5w9c2obq5DzBkVTH7yXg5DyQGtZK3700pse1SoP81jtm+/zK89jBkxpik6aSOFzlL Om1oJ5/ZPSAL0XFw3YhCkBTP6qYGXhGoHOK7K61L2NnXtH9rzoDIJWss5j3xw3JjY30xV75m4EP 2bnCCgMW+JHsIpGNf7fKD0ozwPzjR8OrTykM+mIeWp8sCQHj7geDzJGJWTkQy5LGEgtW/J8SJDz 21MKzEcuv25JBINQ4SmoIZeLg3BKshKl5kIjzGnk6OnS1pV3alBM/6m3AfMfFuJYHRHQaJyrgnB S+4nLW/CLRfKd53gGF0CJNbjiOAf5zTL/e7C3ihzitORJ68Dee034gCfwhYEmk0Oorhf2bt2Ghs 9odkcK+4VJ1LxknEITBtQdDqmjz3IxmcEzYV56R3B2br7pSxugNOhBtj2Bser18grepR+gehNYp /wsLcmWwcL8N/wQ== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -2 X-Spam_score: -0.3 X-Spam_bar: / X-Spam_report: (-0.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.58, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1785153154649158500 From: Haotian Jiang qxl_realize_common() registers a vm_change_state handler via qemu_add_vm_change_state_handler() and creates three bottom halves (update_irq, update_area_bh, cursor_bh), but none are ever cleaned up. The return value of qemu_add_vm_change_state_handler() is discarded, so the handler is never removed from the global list, and there is no PCIDeviceClass.exit callback to delete the BHs. When a secondary QXL device (hotpluggable by default) is hot-unplugged via device_del, the PCIQXLDevice memory is freed but the vm_state handler and BH entries remain with dangling opaque pointers. On the next VM state change (stop/cont/migrate) or BH dispatch, the callback dereferences freed memory, causing a use-after-free. Fix this by storing the VMChangeStateEntry returned by qemu_add_vm_change_state_handler() and adding a qxl_exit() callback that deletes the vm_state handler, all three BHs, and the guest_surfaces.cmds allocation before the device memory is freed. Fixes: a19cbfb34642 ("spice: add qxl device") Fixes: CVE-2026-63322 Resolves: https://gitlab.com/qemu-project/qemu/-/work_items/3607 Signed-off-by: Haotian Jiang Cc: qemu-stable@nongnu.org [ Marc-Andr=C3=A9 - tweak commit message, add TODO ] Reviewed-by: Marc-Andr=C3=A9 Lureau Message-ID: <20260720024855.3757499-1-jianghaotian.sunday@gmail.com> --- hw/display/qxl.h | 1 + hw/display/qxl.c | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/hw/display/qxl.h b/hw/display/qxl.h index ad8a9128785e..48d664f77736 100644 --- a/hw/display/qxl.h +++ b/hw/display/qxl.h @@ -83,6 +83,7 @@ struct PCIQXLDevice { =20 /* thread signaling */ QEMUBH *update_irq; + VMChangeStateEntry *vmstate_handler; =20 /* ram pci bar */ QXLRam *ram; diff --git a/hw/display/qxl.c b/hw/display/qxl.c index 3df796175c29..b7d871b9ee33 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -2203,7 +2203,8 @@ static void qxl_realize_common(PCIQXLDevice *qxl, Err= or **errp) error_report_err(err); } =20 - qemu_add_vm_change_state_handler(qxl_vm_change_state_handler, qxl); + qxl->vmstate_handler =3D + qemu_add_vm_change_state_handler(qxl_vm_change_state_handler, qxl); =20 qxl->update_irq =3D qemu_bh_new_guarded(qxl_update_irq_bh, qxl, &DEVICE(qxl)->mem_reentrancy_gua= rd); @@ -2475,6 +2476,18 @@ static const Property qxl_properties[] =3D { DEFINE_PROP_UINT32("yres", PCIQXLDevice, yres, 0), }; =20 +static void qxl_exit(PCIDevice *dev) +{ + PCIQXLDevice *qxl =3D PCI_QXL(dev); + + /* TODO: complete cleanup, error paths etc */ + g_clear_pointer(&qxl->vmstate_handler, qemu_del_vm_change_state_handle= r); + g_clear_pointer(&qxl->update_irq, qemu_bh_delete); + g_clear_pointer(&qxl->update_area_bh, qemu_bh_delete); + g_clear_pointer(&qxl->ssd.cursor_bh, qemu_bh_delete); + g_clear_pointer(&qxl->guest_surfaces.cmds, g_free); +} + static void qxl_pci_class_init(ObjectClass *klass, const void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); @@ -2482,6 +2495,7 @@ static void qxl_pci_class_init(ObjectClass *klass, co= nst void *data) =20 k->vendor_id =3D REDHAT_PCI_VENDOR_ID; k->device_id =3D QXL_DEVICE_ID_STABLE; + k->exit =3D qxl_exit; set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories); device_class_set_legacy_reset(dc, qxl_reset_handler); dc->vmsd =3D &qxl_vmstate; --=20 2.55.0 From nobody Mon Sep 28 02:05:45 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1785153137; cv=none; d=zohomail.com; s=zohoarc; b=PGMGRWMzfFiDodKhr/DLnDmvCYyUr6778t7p80SqOXXAV+lvv9Se15yoaqwR/Db8OiVodUYaN4/2K8MlydeUqSF0rBrizwDwhyqM5mJIX7Z2zl+GbPcjKJp2vKl2vG7Lye0Gz3NumM+yNfIr+v6b6LPyqASxOZfrtfGTZlDq9ss= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1785153137; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=/Un9MFmgiI0GYdEwtMJsqGn6/GL6Qv/asRCSZZkrtJY=; b=JaRkqZFWFqHGeXVxDXdtzLxnaPgDsEhTcWGE2lozbkHw67MuRkhLPWDtM4OjTKyvshedgFX2AVm9iG/VZqB7/gY2EnLzgFGuhL12nWHLGjKSHwCmuKlcNu4UPi5vuocTqqxSMoMBHHvkSGjAvkGTgXWmpOzIIdSjRbcDm7sCX+Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1785153137251641.6764622079595; Mon, 27 Jul 2026 04:52:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1woJsN-0006LH-R6; Mon, 27 Jul 2026 07:52:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1woJsM-0006J2-Sz for qemu-devel@nongnu.org; Mon, 27 Jul 2026 07:52:06 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1woJsL-0003j8-E0 for qemu-devel@nongnu.org; Mon, 27 Jul 2026 07:52:06 -0400 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-41-I-QVTRD2Ob6Konlnq9-NUA-1; Mon, 27 Jul 2026 07:52:01 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 20666180067C; Mon, 27 Jul 2026 11:52:00 +0000 (UTC) Received: from localhost (unknown [10.44.24.5]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id AE0291800480; Mon, 27 Jul 2026 11:51:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1785153124; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/Un9MFmgiI0GYdEwtMJsqGn6/GL6Qv/asRCSZZkrtJY=; b=ZGvVSRkwFNroWxJfxWGe6IzLJuCYiscp1ZNRXh3mqZEVhWt1FKWQBmDH+swjb8Ai8oHUnQ nryWDp+FkKarNGKbYa0Yzh3gWI+x29u7HW4u1fGY3p69CGKAFgVsclV1GKfpijaVX3ROeA a9K+1YIuHX5dm+0r7zEQ+g4LFoUCT3g= X-MC-Unique: I-QVTRD2Ob6Konlnq9-NUA-1 X-Mimecast-MFC-AGG-ID: I-QVTRD2Ob6Konlnq9-NUA_1785153120 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Mon, 27 Jul 2026 15:51:14 +0400 Subject: [GIT PULL 05/23] net/colo: fix g_hash_table_destroy assertion on uninitialized filter MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260727-fix-v1-5-ca3fa3851347@redhat.com> References: <20260727-fix-v1-0-ca3fa3851347@redhat.com> In-Reply-To: <20260727-fix-v1-0-ca3fa3851347@redhat.com> To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , Zhang Chen , Li Zhijian , Jason Wang X-Developer-Signature: v=1; a=openpgp-sha256; l=1171; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=OqIbE6DWbJhM40ezkRA+84k6vHrSNl5lG0Vfhey8LQQ=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqZ0Y+Qyqzv2w6egFn0YRrs8cUQPYDHCooJeLCU NCTZyGRZB+JAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCamdGPgAKCRDa6OEJdZac 5b2CEACDP4CIUSatf/8X5R3nuQg+TEFNt6UsskWrIOgTQLZWIGuaA63F6fvxXdv907k7RQoZHfo 8tJYSOrXBwNgjjgPmhu1MJWwg86Mixeq0oxjb/4ALXw5PUOVUsbYet7tx7fDZvbQVyB8q+mshEE RqCME6wsv295etw1uigoAFZniF1416/tKE7aOxW3romAgnlHNiSKOfIUO/AccuwmabdP9CFup8n k2a7T+xcLcSDZabwqXPrLJ9cwrddCdX/eWDq07etx8VYDCMnAt5wZIN0FfFjajITzAN59jFkmIp livyVr1ZmaD/6TLJ8VqiBZ3+2L873IQMjAvkAVwq/V7nQDwDVki5xLQ3JmsxboXRt5b24GNA5Es nzRR1rIYPtg1ekaGmQzhZNtIlI9zrD7rIm1dmChucavyAfk2TWYAaOrpltIJZbHXOu9rJdTqsqQ JTtHiWmXUDTPP3OMIg39mkfWyLpxXAYu41Zm+h6aWaKscprBrt6YukFYNluvqMUKc4vB+u+wl7b ZJJJu8KevU7PJIADOg5x0VIOjpat5Hw4KrHeOB4hVd2CCyjWv3duvAi1by9NHJ6zo6XcDlr8VJU zP4+VwAJn8sKKa5B34x/Y2sYpu0HvKn5TixhJAqfX/Hy0BoYgbPC/OD6ein7ZineetjmcluVRrc ryRf+19w4As3drw== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -36 X-Spam_score: -3.7 X-Spam_bar: --- X-Spam_report: (-3.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.58, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1785153138518158500 colo_rewriter_cleanup() unconditionally destroys connection_track_table, but the table is only allocated in colo_rewriter_setup(). When the filter-rewriter object is finalized without having been set up (e.g. during qom-test property enumeration), the pointer is NULL and g_hash_table_destroy() fires an assertion. Use g_clear_pointer() to skip the destroy when the table was never initialized. Signed-off-by: Marc-Andre Lureau Reviewed-by: Zhang Chen Message-ID: <20260709111315.1108185-1-marcandre.lureau@redhat.com> --- net/filter-rewriter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/filter-rewriter.c b/net/filter-rewriter.c index cdf85aa5eed3..c85d180eb963 100644 --- a/net/filter-rewriter.c +++ b/net/filter-rewriter.c @@ -373,7 +373,7 @@ static void colo_rewriter_cleanup(NetFilterState *nf) g_free(s->incoming_queue); } =20 - g_hash_table_destroy(s->connection_track_table); + g_clear_pointer(&s->connection_track_table, g_hash_table_destroy); } =20 static void colo_rewriter_setup(NetFilterState *nf, Error **errp) --=20 2.55.0 From nobody Mon Sep 28 02:05:45 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1785153163; cv=none; d=zohomail.com; s=zohoarc; b=k32bnx5Roy/loMJt9e089ppO9S0popN9EFlZT/4XJ3Mpvi+zQRzoCorXzIAwdNYKyUmvKUz9Ry9AtuZTGabAbfuRj0Ois3mlpL48Px45dqYHEMYzGuKz/yLoK6ikYHjmUnIt/JVUt7bspTj4fpGZxnO5G3yRByjLvzg/WGXqOAg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1785153163; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=i5UQGqeTaYi2kaAkB+026BcAjPwRZW9Yj5wzH4u9ATk=; b=m5S7ka1XFma+aR5704gGFDiOXUVo/fjZus2tOipWA2+0cEuk/3XjBnpPVjN4WM1C6w2bWGJF2fuDA7As6HDJanbDn4XSlTynmE1zdXbt0epfYBvp6/Ij3OqFnbZwEYk7MaPHGQYpF46dE78H33o6bwa52F5GSmZD4ZjrGJBQfvA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1785153163501893.9021573887775; Mon, 27 Jul 2026 04:52:43 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1woJsV-0006aR-Vg; Mon, 27 Jul 2026 07:52:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1woJsS-0006VS-6K for qemu-devel@nongnu.org; Mon, 27 Jul 2026 07:52:12 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1woJsQ-0003jf-K4 for qemu-devel@nongnu.org; Mon, 27 Jul 2026 07:52:11 -0400 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-355-BLrv8nnUN0q04OGhaR7ezw-1; Mon, 27 Jul 2026 07:52:07 -0400 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id EACF8180264B; Mon, 27 Jul 2026 11:52:05 +0000 (UTC) Received: from localhost (unknown [10.44.24.5]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 7B732429; Mon, 27 Jul 2026 11:52:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1785153130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=i5UQGqeTaYi2kaAkB+026BcAjPwRZW9Yj5wzH4u9ATk=; b=CIUM+vo5YvAg0esckBw1nJVNHX6Du8+BPFepo8sbPmLGJk44jIkT+F6cJlrgrRsGwnf/1d XS4LmswazC3NfqR95YBhd1RnfroSfxyv2cMN/MQ36tycwU4vE+BLA3tbk08pZ6dnQ7QCxZ 527LB7mc0wm6kY84nYRkUkQh7geb84E= X-MC-Unique: BLrv8nnUN0q04OGhaR7ezw-1 X-Mimecast-MFC-AGG-ID: BLrv8nnUN0q04OGhaR7ezw_1785153126 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Mon, 27 Jul 2026 15:51:15 +0400 Subject: [GIT PULL 06/23] target/i386/sev: fix MemoryRegion reference leaks in gpa2hva callers MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260727-fix-v1-6-ca3fa3851347@redhat.com> References: <20260727-fix-v1-0-ca3fa3851347@redhat.com> In-Reply-To: <20260727-fix-v1-0-ca3fa3851347@redhat.com> To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , Paolo Bonzini , Peter Xu , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Zhao Liu , Marcelo Tosatti , kvm@vger.kernel.org X-Developer-Signature: v=1; a=openpgp-sha256; l=1828; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=Mhhc24sMg3/r/S38Qe+3S85s7KlVq/EDYB1GAklx+k4=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqZ0Y+fGj1ciGYg3/G6BtXKbg01aMqoGrpUPrq6 0Eq0DGF1/WJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCamdGPgAKCRDa6OEJdZac 5RgqEACKwy8dkLIU6JwSGzDKMtVXkr7DEfaFR3siAcCWRK56vUVxeOAjrGtp7g6AGSeQusDHnTK JRF379tFVLKYhql12Y2sMGF9OFA+0ttIeSgzujJhqZvpcL5Tpf6EE9UUE0aEjZooDJNCsw8/dik DnKcpLzXSHueyJCVcbtOQDzX+TxV3hwGaRu5NOykg1xIvJZdF0ydMrtgltiSAnpSanHNbIJ5mdQ ydwHv/QXaoEVbn9qGHsdRdXs4P9fAHUvkZtJ44zXps3+MPsFsXoz6r767J17oEcpyoBjBnwQ8bA y1BaM4Owwm/QPRRmlUa6DjdDrGphJ3QTfGkedTmfSuoK4vrXpK6EMeKwNs/sN/Mk6WAYGXCqkhq I15cWgKFMR35c2Ye/czw9wlQK26TSRXvjmSVG8YWcM0Pwt5ZWLqQnJFaG3Cl3G9r8rJuAJPRR1d 0xfD+G+RUzGAqWtn4Zd/koJjhgwN2IrYcdIe9P1Umw1IdOzVjhIKoGodZpKLQWmMQCE0q/2RIpV de1L2pYHHjY+x/s9SGuqXnSHF7CrZ0udwZRsaItFM1RPaiFb3fkWnsmOCZBbcnnPKuF4tnLYZM9 R2rJO7r8VbuZvKGo0un507lqwc6Ob7XeUeiCqcq1kx9wND0tUae5GEY2yB5L3XvBavWFaERtzie U01/X2mJUzRjcqw== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -36 X-Spam_score: -3.7 X-Spam_bar: --- X-Spam_report: (-3.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.58, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1785153164806158500 gpa2hva() returns a referenced MemoryRegion via its p_mr out-parameter (inherited from memory_region_find()), but both SEV callers were failing to release it. Fixes: c7f7e6970d3b ("sev: add sev-inject-launch-secret") Reviewed-by: Peter Xu Reviewed-by: Zhao Liu Signed-off-by: Marc-Andr=C3=A9 Lureau Message-ID: <20260521145451.1831984-1-marcandre.lureau@redhat.com> --- include/system/memory.h | 2 ++ target/i386/sev.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/system/memory.h b/include/system/memory.h index 47a0e06fbf8a..2192fc9bdc5b 100644 --- a/include/system/memory.h +++ b/include/system/memory.h @@ -1085,6 +1085,8 @@ void memory_region_ref(MemoryRegion *mr); */ void memory_region_unref(MemoryRegion *mr); =20 +G_DEFINE_AUTOPTR_CLEANUP_FUNC(MemoryRegion, memory_region_unref) + /** * memory_region_init_io: Initialize an I/O memory region. * diff --git a/target/i386/sev.c b/target/i386/sev.c index debe6344ab4d..d7dcefc8ecf5 100644 --- a/target/i386/sev.c +++ b/target/i386/sev.c @@ -1569,7 +1569,7 @@ snp_populate_metadata_pages(SevSnpGuestState *sev_snp, OvmfSevMetadataDesc *desc; int type, ret, i; void *hva; - MemoryRegion *mr =3D NULL; + g_autoptr(MemoryRegion) mr =3D NULL; =20 for (i =3D 0; i < metadata->num_desc; i++) { desc =3D &metadata->descs[i]; @@ -2063,7 +2063,7 @@ int sev_inject_launch_secret(const char *packet_hdr, = const char *secret, int error, ret =3D 1; void *hva; gsize hdr_sz =3D 0, data_sz =3D 0; - MemoryRegion *mr =3D NULL; + g_autoptr(MemoryRegion) mr =3D NULL; SevCommonState *sev_common =3D SEV_COMMON(MACHINE(qdev_get_machine())-= >cgs); =20 if (!sev_common) { --=20 2.55.0 From nobody Mon Sep 28 02:05:45 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1785153151; cv=none; d=zohomail.com; s=zohoarc; b=jnG92I4KTeJ2krcWnvcpjE07eaTytDcCMRfQcXf1l5Q0xR7IT/gAz5s/Rwx0Wqvvx3MEme34731cnffAuySizpTPE8JvbsYQgo/WcYEqOdM8B9Sj/OqrREFC1A/cUF2yxuHmX9WAn7gmrX4T/waBipyhHRp9mAi77giYNgyvdLo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1785153151; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=aNiaflyhGXOxa4ggjEKmuQj2KeuWOsy9yNfa0BhTzi0=; b=UqUs8W3zakIKekgTYU5DRqnaZGjvc61wE5e6Zh26WluTUadx/KKAXWPYJpd51+VYt7KLFDuU7pEuyye+8qJItqeiGEJkCFSSW9gi2GeWN29esMjyVU/bymSKnQKAXGbpPCQ0QQn5+ZFe3aAqZutAHm1t1PVuETbPVdGCYPo/TAo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1785153151451858.7469844060986; Mon, 27 Jul 2026 04:52:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1woJsZ-0006iR-Rn; Mon, 27 Jul 2026 07:52:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1woJsY-0006gC-CF for qemu-devel@nongnu.org; Mon, 27 Jul 2026 07:52:18 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1woJsW-0003kA-NY for qemu-devel@nongnu.org; Mon, 27 Jul 2026 07:52:18 -0400 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-196-S3XMUpTWOEicrmPGYzTTTA-1; Mon, 27 Jul 2026 07:52:12 -0400 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 724151955E9E; Mon, 27 Jul 2026 11:52:11 +0000 (UTC) Received: from localhost (unknown [10.44.24.5]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6D918429; Mon, 27 Jul 2026 11:52:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1785153136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aNiaflyhGXOxa4ggjEKmuQj2KeuWOsy9yNfa0BhTzi0=; b=KMiOGSllG0gJGz+6KALKf/go2D3APxkFbt914jlqJBekZ1VG+F5W0FXyJoN0n6NActTy00 yKl1UgncxYHp2H91nEGrcp/RNiqz6H3tSKXg67Q2ypdEoIKGpgGdu30CuNsmGL/xyjy0L1 eOl5IzbdKht02aDu6LgFhhLhyzBWooE= X-MC-Unique: S3XMUpTWOEicrmPGYzTTTA-1 X-Mimecast-MFC-AGG-ID: S3XMUpTWOEicrmPGYzTTTA_1785153131 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Mon, 27 Jul 2026 15:51:16 +0400 Subject: [GIT PULL 07/23] virtio-gpu: fix NULL deref in rutabaga set_scanout MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260727-fix-v1-7-ca3fa3851347@redhat.com> References: <20260727-fix-v1-0-ca3fa3851347@redhat.com> In-Reply-To: <20260727-fix-v1-0-ca3fa3851347@redhat.com> To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , =?utf-8?q?Alex_Benn=C3=A9e?= , Akihiko Odaki , Dmitry Osipenko , "Michael S. Tsirkin" X-Developer-Signature: v=1; a=openpgp-sha256; l=1811; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=ca/+vDvzNn20KqwVuvwprKoP35ci4y5uRFaQhtejmpk=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqZ0Y+doM5nxOlbjtZicvqtd1vwdcOnK3GfztKR +RL4GJYMiSJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCamdGPgAKCRDa6OEJdZac 5RwTD/9I7Way+E1yudIw7nrI0aZZqykRBcquIQsvy81chWMJvZuXNuevDlkpPZKc5td+8byKPKD Kk6o9TubM4FtLlNTUxuHgWwdufr4PPf+9wq3SpaeX4NyCHCSqWYPw60072elsobQqk8sjXe+8gu h4X01jRxfHNb/HVRmkGLubhJ8Np3UvpmNOvoHS4HpQYCr5vbSvt83XEYxAwNWC6tCDfg9/UgTzJ n6Jy1+3axkfte21bNh7SujnyS6kn3vKZcmpL4eOnAWek8tCLr53hijIERIeLIN+dxDy4UIlM66l tJ1555/eGYlgNfnPmKwZ3SxFjjZJqdXAOYpneM8NLtug5dUtuQEAjHIEDsbagQVA87Mwwm3b7zZ oSZU3qkapFBTTyqqtWyvphNuPxFaz2L5PNS+DagVpRNjNfkAnZpbzXeOywxRFsgABnp6hHcyq04 w4Fr8BTrafh5eyhYXpBJ/O9KnGE9oBrDX92h4y6s9Ag9FocaJ4yiRjfREDIwFmmmE8+5Q/9bbi8 kSl0/hlm32dh3pFWI+Bzuesn5CIejyjuuVYpQYGOGbpbI90m75blQ/OE3SKvhxJBjrN15CPvR1x 4rGGoX/0ol5GyQJGcncOjeyaKqtd5LBUQDzHG/qLZsNKBcqwqzE4ZvezumKi2wAV37jDviiSFpV 4TMLoLbJ7tlsTPw== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -2 X-Spam_score: -0.3 X-Spam_bar: / X-Spam_report: (-0.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.58, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1785153152655158500 From: Haotian Jiang rutabaga_cmd_set_scanout() checks scanout_id < VIRTIO_GPU_MAX_SCANOUTS (16), but does not check scanout_id < conf.max_outputs like the base class (virtio-gpu.c) and virgl backend (virtio-gpu-virgl.c) do. With the default max_outputs=3D1, virtio_gpu_base_device_realize only initializes scanout[0].con. A guest submitting SET_SCANOUT with scanout_id >=3D 1 takes the con=3DNULL path, and qemu_console_set_surface(NULL, NULL) dereferences con->ds, crashing QEMU. Replace VIRTIO_GPU_MAX_SCANOUTS with vb->conf.max_outputs in the CHECK, since realization already ensures max_outputs <=3D VIRTIO_GPU_MAX_SCANOUTS. Fixes: 1dcc6adbc168 ("gfxstream + rutabaga: add initial support for gfxstre= am") Resolves: https://gitlab.com/qemu-project/qemu/-/work_items/3897 Cc: qemu-stable@nongnu.org Message-ID: <20260720071556.106003-1-jianghaotian.sunday@gmail.com> Reviewed-by: Dmitry Osipenko Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Haotian Jiang --- hw/display/virtio-gpu-rutabaga.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/display/virtio-gpu-rutabaga.c b/hw/display/virtio-gpu-rutab= aga.c index 4d7d7b245929..6af5c2514d23 100644 --- a/hw/display/virtio-gpu-rutabaga.c +++ b/hw/display/virtio-gpu-rutabaga.c @@ -302,7 +302,7 @@ rutabaga_cmd_set_scanout(VirtIOGPU *g, struct virtio_gp= u_ctrl_command *cmd) trace_virtio_gpu_cmd_set_scanout(ss.scanout_id, ss.resource_id, ss.r.width, ss.r.height, ss.r.x, ss.r= .y); =20 - CHECK(ss.scanout_id < VIRTIO_GPU_MAX_SCANOUTS, cmd); + CHECK(ss.scanout_id < vb->conf.max_outputs, cmd); scanout =3D &vb->scanout[ss.scanout_id]; =20 if (ss.resource_id =3D=3D 0) { --=20 2.55.0 From nobody Mon Sep 28 02:05:45 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1785153193; cv=none; d=zohomail.com; s=zohoarc; b=gTyPttNqTO7anlHsVfI7H1xeuwqNasSm2PqCqP9XmqY3fsh8nPie1O6qeppW+172NLtKUcUjDVCDZT/ZRphtfCmktVLfc9AIiSqd1sD6sFejTQIEpqFtpAsXuKbgE52wyD0JW8Hj2iaf+HqQ3qsj5unv4E248sTr7PXy2lbo5E0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1785153193; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=lUsEKDENP5KDAItOjUu9l7KMJdCOMqwDHqD2UVqTyGc=; b=C5eZShrrGksktGM/fLGX+Ea/mjufiV85kVVuJenHNosdvFxbUfBDSVecMbmpt3qWX9oXb7TKyjuxNWe8QIuc7HLM8JRcFfMob83KIfiAYudY98QEM7PJ0PdITKSrPjvmi3r13VKETS5Wj6EbwMQZEjHms4nVU4HdGXk099mF+QI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1785153193869240.98039320158966; Mon, 27 Jul 2026 04:53:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1woJsj-000721-3H; Mon, 27 Jul 2026 07:52:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1woJse-0006tk-Qo for qemu-devel@nongnu.org; Mon, 27 Jul 2026 07:52:25 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1woJsd-0003kv-CC for qemu-devel@nongnu.org; Mon, 27 Jul 2026 07:52:24 -0400 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-644-HDEx8qiUNlmrFhWpgo0xCQ-1; Mon, 27 Jul 2026 07:52:17 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C91FC180135F; Mon, 27 Jul 2026 11:52:16 +0000 (UTC) Received: from localhost (unknown [10.44.24.5]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B751D30010C8; Mon, 27 Jul 2026 11:52:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1785153142; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lUsEKDENP5KDAItOjUu9l7KMJdCOMqwDHqD2UVqTyGc=; b=D4Fc8ce5Mh9+biy4GgtTDCNCWj5SQreXXgZpViwW6j2oVvxUfQgjgxSyQhUzvWijPeX1/t kaR1ynI4zc4zG3Cv75n77YK4+e47VtqFeiWVZkM673apw7B9gq/oEwM4kz/PdF+6x+PpjZ JPsapEXV+wMG/eEWpcoGxFdM5+Ix3Lo= X-MC-Unique: HDEx8qiUNlmrFhWpgo0xCQ-1 X-Mimecast-MFC-AGG-ID: HDEx8qiUNlmrFhWpgo0xCQ_1785153136 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Mon, 27 Jul 2026 15:51:17 +0400 Subject: [GIT PULL 08/23] docs/hyperv: fix misleading hv-crash shutdown description MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260727-fix-v1-8-ca3fa3851347@redhat.com> References: <20260727-fix-v1-0-ca3fa3851347@redhat.com> In-Reply-To: <20260727-fix-v1-0-ca3fa3851347@redhat.com> To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , Paolo Bonzini , Zhao Liu , Pierrick Bouvier X-Developer-Signature: v=1; a=openpgp-sha256; l=2505; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=37ToipwIaXpMMjvpg8YSWf1licth1SjqGNKBZN8+5bE=; b=owEBbAKT/ZANAwAKAdro4Ql1lpzlAcsmYgBqZ0Y/pYW0pTY+5t39HHKRU2Hc46khOktK7TOrX 0ZI4coFs2CJAjIEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCamdGPwAKCRDa6OEJdZac 5a8mD/MFIxGGXiFJTJzQ1r+YnfZXNk+pVyevsckdw1eOMUce84rMwC0+LOHxwZcQfZIA2uQxBzx kCxMnOzww2NJ6VRKXSV+TIQA7j/LVAKyEvV9nrHIlL+YPhV+wt5BZRaHJrbp8/5tmxYiIxdaDTO cegqOK/XX1LA9LFJuaXXbIER3GJvCYpUi/zVD95DfuzdqfZ8OdLblwUcJHvP3Yqn3skDOw9UTuD EoRLF88O5tgZ4S3pBC/kYfhObHfQZTBsNYEEsCsItAmPkY0JsUS1P0tgY0mcLW0QIxSMSX89HfR ygZo4Aca3nZ+vdLksjHqwHo47R+q6gZnW/Orm4twkp5B1Osc4TA4ydZxCKrET3vkiA7tic5r4JQ Vomhb1bbYHrkFAxGm59y+IokEvLUMnyInemfapm3rLke5oMigkYdbJ6s80PLCi4GTmryO5cjXJa gx27KxwP/YJJk/DW2B5RmZUIsK0c0O5po7MKxX5fWKrsOSzRWqvl57tTNYIGWzQ5oOvLTvmfWGX AgbLVuDXZTnYVvrcn/vOmtQW225XIa4CkT8bcaF/YEbOMC9rQYg26Qcs1msMVOBsQcXjrZBlIeQ 4uBQB140ub1A2Rhrn+nKIuE3aDFFxtu5SFmYTT+jFMKoIgsQvpmtmDWDQ3wVhlCWJdTDpPQTpx/ uBSKwC+pQDh7e X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -36 X-Spam_score: -3.7 X-Spam_bar: --- X-Spam_report: (-3.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.58, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1785153194836158500 The documentation stated that writing to HV_X64_MSR_CRASH_CTL unconditionally causes the guest to shutdown. In reality, it triggers qemu_system_guest_panicked() via KVM_SYSTEM_EVENT_CRASH and the resulting action depends on the generic panic action policy (-action panic=3D...), which defaults to shutdown. Reviewed-by: Vitaly Kuznetsov Signed-off-by: Marc-Andr=C3=A9 Lureau Message-ID: <20260701122135.3168729-1-marcandre.lureau@redhat.com> --- docs/system/i386/hyperv.rst | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/docs/system/i386/hyperv.rst b/docs/system/i386/hyperv.rst index 1c1de77feb65..e1babffb0f99 100644 --- a/docs/system/i386/hyperv.rst +++ b/docs/system/i386/hyperv.rst @@ -71,8 +71,11 @@ Existing enlightenments by the guest when it crashes, HV_X64_MSR_CRASH_P0..HV_X64_MSR_CRASH_P5 M= SRs contain additional crash information. This information is outputted in Q= EMU log and through QAPI. - Note: unlike under genuine Hyper-V, write to HV_X64_MSR_CRASH_CTL causes= guest - to shutdown. This effectively blocks crash dump generation by Windows. + Note: unlike under genuine Hyper-V, write to HV_X64_MSR_CRASH_CTL trigge= rs + ``qemu_system_guest_panicked()`` via ``KVM_SYSTEM_EVENT_CRASH`` and the + resulting action depends on the ``-action panic=3D...`` policy (default: + ``shutdown``). With the default action, this effectively blocks crash du= mp + generation by Windows. =20 ``hv-time`` Enables two Hyper-V-specific clocksources available to the guest: MSR-ba= sed @@ -304,8 +307,9 @@ currently implemented Hyper-V enlightenments with the f= ollowing exceptions: ``hv-version-id-snumber`` can be left unchanged, guests are not supposed= to behave differently when different Hyper-V version is presented to them. - ``hv-crash`` must only be enabled if the crash information is consumed v= ia - QAPI by higher levels of the virtualization stack. Enabling this feature - effectively prevents Windows from creating dumps upon crashes. + QAPI by higher levels of the virtualization stack. With the default + ``-action panic=3Dshutdown`` policy, enabling this feature effectively + prevents Windows from creating dumps upon crashes. - ``hv-reenlightenment`` can only be used on hardware which supports TSC scaling or when guest migration is not needed. - ``hv-spinlocks`` should be set to e.g. 0xfff when host CPUs are overcomm= ited --=20 2.55.0 From nobody Mon Sep 28 02:05:45 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1785153222; cv=none; d=zohomail.com; s=zohoarc; b=XTPJqsYobVpmTXhMg0qfWQRQCkTVkqpekEORk9Cm4iwJsfPzqPsU5TJzFSpAIhNKT/tGD1dgn9yr1kIQN21HnSSIGtEqJFZ+2rTlUmen+bEP59p8NI30X12PVugtdwku8YKht+QhYt39if+lv/PTPi9MIcTsFkZ/Dr1D036nnAg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1785153222; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=YZ7lBwn2sR/htsLc0oYMxnHZZMHTS+rJWyREf3S1JTo=; b=gUe4VESJ0zD/yNQSVkF4SY4X6R2Gps1dwRvtowlAffixu2fXJvvrMgYnUOJkpdTCfkkGyHTcBQzzZwApNy6hjMpLxTshSxyri8PLn4uQZK/xe5aW6kwANbj9H2Btbh4nTBxvMQZayJIM44/X5cEGbY9Y6w/s20685iN69h0TUSo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1785153222322730.0631531703871; Mon, 27 Jul 2026 04:53:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1woJsn-0007N4-Ai; Mon, 27 Jul 2026 07:52:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1woJsk-0007Dj-Uj for qemu-devel@nongnu.org; Mon, 27 Jul 2026 07:52:30 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1woJsh-0003lM-3i for qemu-devel@nongnu.org; Mon, 27 Jul 2026 07:52:29 -0400 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-301-d1rBBfHYMuubf9RUpSw7eA-1; Mon, 27 Jul 2026 07:52:25 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id F16251955D7C; Mon, 27 Jul 2026 11:52:23 +0000 (UTC) Received: from localhost (unknown [10.44.24.5]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C83CF1800611; Mon, 27 Jul 2026 11:52:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1785153146; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YZ7lBwn2sR/htsLc0oYMxnHZZMHTS+rJWyREf3S1JTo=; b=OklJ7ZilKDeyZ9kJ8VuNi3WFYKSooA7N12aQ8/IXM7S0kL+xxp589R6lS8zwrE0Ht1EEyY 2n6Fh6xMzCD9Kv1SzPS4BBRmo7yYrvCVqtTmDpxyjS2lKepp9yDZ0dUkF09JrW3miN5USL pigpoaCfF1h+oTHLAhtFpx4Lknm/cz8= X-MC-Unique: d1rBBfHYMuubf9RUpSw7eA-1 X-Mimecast-MFC-AGG-ID: d1rBBfHYMuubf9RUpSw7eA_1785153144 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Mon, 27 Jul 2026 15:51:18 +0400 Subject: [GIT PULL 09/23] hw/display/virtio-gpu: Fix empty blob discrimination MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260727-fix-v1-9-ca3fa3851347@redhat.com> References: <20260727-fix-v1-0-ca3fa3851347@redhat.com> In-Reply-To: <20260727-fix-v1-0-ca3fa3851347@redhat.com> To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , "Michael S. Tsirkin" , =?utf-8?q?Alex_Benn=C3=A9e?= , Akihiko Odaki , Dmitry Osipenko X-Developer-Signature: v=1; a=openpgp-sha256; l=2287; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=F4qIZ1V325eC9D8X2pTrZSJB39kji7EVJArdTLQMEHU=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqZ0Y/7Pm8LBD+BLn3UHioncJmUcNyYGEahTfUz 5BtQ1Z56PyJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCamdGPwAKCRDa6OEJdZac 5apxEACVMCHXK/CuiKj+EzEkoBn9Qn8K94b78Zb/R6UU60sZYTN+vF2YocQKbM5/HGjfpsMWBfW XFJ1WTvTRjb2Lver+HNuhyPxUPGs1Ei885fsmdHYolIPC/Tw3bY+3Cs2jAzvbOEx2NvOpyi/IIz /NRpl1idoYhpJojhX2eKnNcRuD5BZQkjq3J7kepthEe/hSN6WploKEbMHZHGFd7ZRoraRRqTes1 8yCwbTZTcRSScJ8ABMNQElaBIl34Vc+DBn+7K0LkNmxc7X7QQoY5IpKmWSe922W7PbXOwzAT5rY UKjS+h+VwWRiiyV3tX7k57IDJG9LHN2pgiiSlJCTUeTwwlVy49DwAqgyx6IzB5uEBl/l1GEpclc 3kq9jbG12yl5YLr2QbnxDI9ZF4NpH/VcbQKyQ78sBfqNAwPRAO51hXxEUnu8wHl0/L31Pg7pSor NjIJoAAckdYDuNj1rr9ggl245MF74C004Hi8S4yuX1iMBQfPICeTTM4QkM3YgdUDyiZsPSLfW0e cIIObLfyLcjzdTjnRDrwwUpl5sh2CqjIQUaCPlNg1vyvmaLQyG/3eWcdXszxOv6T7XOjlg62yZ7 9Xct0RyYNBt6Grta8PMuQ9I8rjDCJFzkjI6EAsdMKz46xCNnRRGZ6FlGeAR8EPNY8/jlkmv09yg tI9vLNlhJ3zXiqA== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -2 X-Spam_score: -0.3 X-Spam_bar: / X-Spam_report: (-0.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.58, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1785153223480158500 From: Akihiko Odaki Discriminating blobs by checking whether blob_size is nonzero fails for empty blobs. Identify 2D resources by their non-NULL image instead. Fixes: bdd53f739273 ("virtio-gpu: Update cursor data using blob") Fixes: f66767f75c9c ("virtio-gpu: add virtio-gpu/blob vmstate subsection") Signed-off-by: Akihiko Odaki Reviewed-by: Marc-Andr=C3=A9 Lureau Message-ID: <20260725-image-v1-1-4698a805afde@rsg.ci.i.u-tokyo.ac.jp> --- hw/display/virtio-gpu.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index eac039c3c366..add60926f366 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -56,18 +56,18 @@ void virtio_gpu_update_cursor_data(VirtIOGPU *g, return; } =20 - if (res->blob_size) { - if (res->blob_size < (s->current_cursor->width * - s->current_cursor->height * 4)) { - return; - } - data =3D res->blob; - } else { + if (res->image) { if (pixman_image_get_width(res->image) !=3D s->current_cursor->wi= dth || pixman_image_get_height(res->image) !=3D s->current_cursor->he= ight) { return; } data =3D pixman_image_get_data(res->image); + } else { + if (res->blob_size < (s->current_cursor->width * + s->current_cursor->height * 4)) { + return; + } + data =3D res->blob; } =20 pixels =3D s->current_cursor->width * s->current_cursor->height; @@ -1286,7 +1286,7 @@ static int virtio_gpu_save(QEMUFile *f, void *opaque,= size_t size, assert(QTAILQ_EMPTY(&g->cmdq)); =20 QTAILQ_FOREACH(res, &g->reslist, next) { - if (res->blob_size) { + if (!res->image) { continue; } qemu_put_be32(f, res->resource_id); @@ -1437,7 +1437,7 @@ static int virtio_gpu_blob_save(QEMUFile *f, void *op= aque, size_t size, assert(QTAILQ_EMPTY(&g->cmdq)); =20 QTAILQ_FOREACH(res, &g->reslist, next) { - if (!res->blob_size) { + if (res->image) { continue; } assert(!res->image); --=20 2.55.0 From nobody Mon Sep 28 02:05:45 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1785153201; cv=none; d=zohomail.com; s=zohoarc; b=Ym8s03AZp16VQj8tB2WuJ8zu1iAMvMIsfZ09lpBPlLtdM9tPPfpEhAbni5WrQzsFs4iJvB2NzhqmE+wAkPFeBV6shMfOcf3cauQM52eJCCvwFYfw11bHmIl8Npe6cgHvfVw6+HmYF3mKKw/sBKUW2VZmj66Zuz1Ow4g6ZZck4Ds= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1785153201; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=PySdd9kmhQ4/OexigL6IUaVOmr/wGNdJk0mxf1caIFk=; b=cPwi2WOilni8yn6uWD6MMIVm30vhc/GbhrgRMZh1DiOSOFTCvN1nImJXCEA6F9jQ+9RS/vOF8IbPQXYmzj8bEBDq7TV3WNGxN7fS4kJ5YLqNmfpxW9aQNl8drQ6f74e5opLFaYUNBs6GPymSgDWOivsIEekIpNGDoRe+J7oNGOk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1785153201945559.6552883044536; Mon, 27 Jul 2026 04:53:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1woJsy-0007eW-B1; Mon, 27 Jul 2026 07:52:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1woJso-0007SP-IP for qemu-devel@nongnu.org; Mon, 27 Jul 2026 07:52:36 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1woJsn-0003m1-6z for qemu-devel@nongnu.org; Mon, 27 Jul 2026 07:52:34 -0400 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-142-9WC51eO6PPqMvNj21mdIkA-1; Mon, 27 Jul 2026 07:52:31 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 029071955EAC; Mon, 27 Jul 2026 11:52:30 +0000 (UTC) Received: from localhost (unknown [10.44.24.5]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id DC36E1955F78; Mon, 27 Jul 2026 11:52:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1785153152; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PySdd9kmhQ4/OexigL6IUaVOmr/wGNdJk0mxf1caIFk=; b=GNe9g+jbSn4L4fUDGlWcmD5tEiYsyvY/ZxN0AjVdX+eU/W+PniBi+zdtVrN8iJEYG1FG80 Fv/JmLYDMlw5MV11pZYAQM7zACeevQIHiPZfk44tcRBZTsNaLoV9lJN+5+mSFgzZD/eV6k 5MsvGdrCspf8XkzSqR7d4nOfRzvAsT8= X-MC-Unique: 9WC51eO6PPqMvNj21mdIkA-1 X-Mimecast-MFC-AGG-ID: 9WC51eO6PPqMvNj21mdIkA_1785153150 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Mon, 27 Jul 2026 15:51:19 +0400 Subject: [GIT PULL 10/23] hw/display/virtio-gpu: Initialize blob mapping for ATTACH_BACKING MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260727-fix-v1-10-ca3fa3851347@redhat.com> References: <20260727-fix-v1-0-ca3fa3851347@redhat.com> In-Reply-To: <20260727-fix-v1-0-ca3fa3851347@redhat.com> To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , =?utf-8?q?Alex_Benn=C3=A9e?= , Akihiko Odaki , Dmitry Osipenko , "Michael S. Tsirkin" X-Developer-Signature: v=1; a=openpgp-sha256; l=821; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=AphGHdMyaQx0iYaan/tu3RkN+OsCovS+ivR+la/MPzo=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqZ0Y/93tOty/X0PWqOdzkFMnZVkWdNxKiji+lP RDY/XAAlyOJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCamdGPwAKCRDa6OEJdZac 5bRKD/wNUzuANEjBi2nA4dsznnKCz8DgdSGOJrgGoxgSkzuHRQ8vhuPZ/vIp1GYF0vwEY1VbMeo IRSfLZ+CiH6NoCvGuogXLLHUaL7rNF/dsVGtVYm8P48wAl0lNFcy8xW8i/B5GuIOiy2LP7CUnld 8nzFbO83Ln1zXQalQlsERm5wRccne2YUWxosg3nOlC5vxf/jUxmwdWVHFAgWvp5y4wlKBmOJ5Jd xN1fqIRcefYHkuz9+0aigmtbHI8cYtm0HAb6T7yT4czdkW3QCvas2OM6UkKftwDyRA4mOWCqocp 34Osjsda5lK6rO9GwN2PRpewZu2+b//RmZuVWxttjD80TurQdShDKc5i4tX7nI9+zFpyD5X8LV5 aM9aNsSeuxSV80saCrcYy9jZOcSx+498vm0vOzMiLcfLqN8OGSrzESgqyZeC7wZ+D7LW1t2T55K Lx0MobfV0vu6O3s6v7JmlT88s2sDmiaUWbpzh3bAzOymtl204IE+5TSILTQ1NA42zQAgbbjrp6+ Jn20xi4bHQmHZhZ8wN262ob/nJ1ieH9QefEWbCstbvldUPB/2BGCH0EnvMWw2mtoQE7mEOkg8Eg 9mhp6fvrVZ40kXfkiLqv0fBOdmFKX5lMULRBWvQxCGzmjSkAJ4LgHzEtwDSCmLFGZquhAhsx2UM 5Dy3zdNIQ/tmg+Q== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -2 X-Spam_score: -0.3 X-Spam_bar: / X-Spam_report: (-0.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.58, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1785153202840158500 From: Akihiko Odaki It is necessary for blob cursor and scanout. Fixes: e0933d91b1cd ("virtio-gpu: Add virtio_gpu_resource_create_blob") Signed-off-by: Akihiko Odaki Reviewed-by: Marc-Andr=C3=A9 Lureau Message-ID: <20260725-backing-v1-1-5b584bf7df5a@rsg.ci.i.u-tokyo.ac.jp> --- hw/display/virtio-gpu.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index add60926f366..4d46a4eb10fa 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -992,6 +992,10 @@ virtio_gpu_resource_attach_backing(VirtIOGPU *g, cmd->error =3D VIRTIO_GPU_RESP_ERR_UNSPEC; return; } + + if (!res->image) { + virtio_gpu_init_udmabuf(res); + } } =20 static void --=20 2.55.0 From nobody Mon Sep 28 02:05:45 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1785153227; cv=none; d=zohomail.com; s=zohoarc; b=krom0I9Rx9AVbVYZnHcwxSCo5/AEniHVx+r0gTVYZ5/6eCqkTWnjOGrXMv3KUNytvJiITePnwNVBZBd5QJ+4RRC67WGxHvaLaDFDDhh5WSwmDCOg+X6L6srpy2rNXYOKsHhPiqXzvg4Qfzdz8GGDth7dU2Xf8EBvVw/mBpIOvAs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1785153227; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=qDbGts2Qj/e3weoWlViViYkpfzH+enItTpsc+fYe5EM=; b=TT7Glc+3RwDlRzdCfGYaNouzyY3R4xH3IvvIWpbBGpAhI1KXXd5wjLvrwT6ljx/XnqZkOfn6CyoseMxfOyKqD0CYfie4pAe0EvNMpIwiTy3kWC4l/J98eaYSZM8tDCMxrhEHJWfy2IKDAyA++0eYOCrneIFiglc/My8apIwj1qs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1785153227973367.2317058183572; Mon, 27 Jul 2026 04:53:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1woJsz-0007zN-UK; Mon, 27 Jul 2026 07:52:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1woJsu-0007a7-41 for qemu-devel@nongnu.org; Mon, 27 Jul 2026 07:52:41 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1woJss-0003mz-La for qemu-devel@nongnu.org; Mon, 27 Jul 2026 07:52:39 -0400 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-407-MheDuLj_PUewXxkMeKtjZA-1; Mon, 27 Jul 2026 07:52:36 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 658AE1944D2B; Mon, 27 Jul 2026 11:52:35 +0000 (UTC) Received: from localhost (unknown [10.44.24.5]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 295F01800480; Mon, 27 Jul 2026 11:52:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1785153157; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qDbGts2Qj/e3weoWlViViYkpfzH+enItTpsc+fYe5EM=; b=gkHojkeIBm0yrJWkrho0iWSc1KF0G5O9J+f6Ty8XQgzx1xgfSb5l0Cms1RCf0Yps3+q8XB k11H9f0UAhglrktvSGSd7CQAjYy+jQxRV/ArXTndzz4PqR9lnIVyqhXdykLr7oemoCxH3i F/SmCAxq0vDwBvM6EuT0DitgHA7nMKE= X-MC-Unique: MheDuLj_PUewXxkMeKtjZA-1 X-Mimecast-MFC-AGG-ID: MheDuLj_PUewXxkMeKtjZA_1785153155 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Mon, 27 Jul 2026 15:51:20 +0400 Subject: [GIT PULL 11/23] hw/display/virtio-gpu: Avoid leaking migration blocker MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260727-fix-v1-11-ca3fa3851347@redhat.com> References: <20260727-fix-v1-0-ca3fa3851347@redhat.com> In-Reply-To: <20260727-fix-v1-0-ca3fa3851347@redhat.com> To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , "Michael S. Tsirkin" , =?utf-8?q?Alex_Benn=C3=A9e?= , Akihiko Odaki , Dmitry Osipenko X-Developer-Signature: v=1; a=openpgp-sha256; l=3088; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=e8YKTUPX8S1llzMY0wj2VebqiGgtbCyfgI/ryqSqL/k=; b=kA0DAAoB2ujhCXWWnOUByyZiAGpnRj+iVZO5nN+cVNRAVqrXLX6epcSoRePlRah6Na+49d1pD 4kCMwQAAQoAHRYhBIepvZM/h8YG0nb2Ldro4Ql1lpzlBQJqZ0Y/AAoJENro4Ql1lpzlqD4QAJPl flbIl8XBNN1BwRZvRnZlOEzOrmUtudw/EVvD5yIGwA7mUqdBqcopP3P9r1lMx6F0d7uRuv2ANAs cN759sZQVoREckytnlICyRjPGeBSZLimwmMH2Dv899hEUzQkPNydSwADkn8505IkupZRfAlaDU1 2RsHl692dTg6/X7OJ6QYA0G2JPcZQDiH+iJ7ghsMcj7P7QUF2755yx2S5tF6JGgj97r7YZT8s5E 6bW5akQEmOUjUkY85qBUJ44aC+iYPFhRvhLkzKC14ZnvJLdjLPdN2ClIZTE0GkjWztFElnBW2b+ pvPIkxYiTh9DYSBfbcWxrgLvPfFhEHzMxZ3RPC8pspTOorAWZEFPiENCslqJ3Z2bsqOIsR8xRrN siFreIzcuTCvi93+8NAA/syDcaoTlbqGhFi1S0LSgk6/r9HJch+OV1Qb+CdxfuDex2h8NTfmrkD XkA+oQ6PZtC6dyZUyWQpSjwjJBZO0O0UMBShmRiAy3pFak5N36oKKnwJxWfA0aCy2KAVAqbZf3D 6TJAWXKaI12dReZ6xqwhaaQwsSlzvPtjZjL4mFXvjLZhJZNZ22xc7m2EZl56APUf3TVkvHhYPKI Erzi87DtFNjRlcDoKaH0R6GKG4H7UX/SlBPG1E4U67aIo8vyY877bsV8E6eDRL3M8tZ5k8Flx3/ mflG4 X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -2 X-Spam_score: -0.3 X-Spam_bar: / X-Spam_report: (-0.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.58, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1785153229026158500 From: Akihiko Odaki virtio_gpu_base_device_realize() leaks a migration blocker if a check of the output list fails after adding one. Perform the check before adding a migration blocker to avoid the leak. This also simplifies the code by merging two loops. Fixes: d3a4969dc5ac ("Support per-head resolutions with virtio-gpu") Signed-off-by: Akihiko Odaki Reviewed-by: Marc-Andr=C3=A9 Lureau Message-ID: <20260725-virgl-v1-1-58bb51e60da5@rsg.ci.i.u-tokyo.ac.jp> --- hw/display/virtio-gpu-base.c | 37 ++++++++++++++++--------------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/hw/display/virtio-gpu-base.c b/hw/display/virtio-gpu-base.c index a68b18482956..946e56b42f61 100644 --- a/hw/display/virtio-gpu-base.c +++ b/hw/display/virtio-gpu-base.c @@ -195,6 +195,11 @@ virtio_gpu_base_device_realize(DeviceState *qdev, return false; } =20 + g->enabled_output_bitmask =3D 1; + + g->req_state[0].width =3D g->conf.xres; + g->req_state[0].height =3D g->conf.yres; + for (output_idx =3D 0, node =3D g->conf.outputs; node; output_idx++, node =3D node->next) { if (output_idx =3D=3D g->conf.max_outputs) { @@ -207,6 +212,17 @@ virtio_gpu_base_device_realize(DeviceState *qdev, node->value->name, EDID_NAME_MAX_LENGTH); return false; } + if (node->value->has_xres !=3D node->value->has_yres) { + error_setg(errp, + "must set both outputs[%zd].xres and outputs[%zd].y= res", + output_idx, output_idx); + return false; + } + if (node->value->has_xres && node->value->has_yres) { + g->enabled_output_bitmask |=3D (1 << output_idx); + g->req_state[output_idx].width =3D node->value->xres; + g->req_state[output_idx].height =3D node->value->yres; + } } =20 if (virtio_gpu_virgl_enabled(g->conf)) { @@ -229,27 +245,6 @@ virtio_gpu_base_device_realize(DeviceState *qdev, virtio_add_queue(vdev, 16, cursor_cb); } =20 - g->enabled_output_bitmask =3D 1; - - g->req_state[0].width =3D g->conf.xres; - g->req_state[0].height =3D g->conf.yres; - - for (output_idx =3D 0, node =3D g->conf.outputs; - node && output_idx < g->conf.max_outputs; - output_idx++, node =3D node->next) { - if (node->value->has_xres !=3D node->value->has_yres) { - error_setg(errp, - "must set both outputs[%zd].xres and outputs[%zd].y= res", - output_idx, output_idx); - return false; - } - if (node->value->has_xres && node->value->has_yres) { - g->enabled_output_bitmask |=3D (1 << output_idx); - g->req_state[output_idx].width =3D node->value->xres; - g->req_state[output_idx].height =3D node->value->yres; - } - } - g->hw_ops =3D &virtio_gpu_ops; for (i =3D 0; i < g->conf.max_outputs; i++) { g->scanout[i].con =3D --=20 2.55.0 From nobody Mon Sep 28 02:05:45 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1785153226; cv=none; d=zohomail.com; s=zohoarc; b=Sxoh/TnBkdlexLx4xY7gqwnCaUQ+sd/FiURAgUBGhskNBMW36trdQsRwuT8w6i4r/rLqAkdOQRbEFkNwTCSwWPhM0HvNvKdKzLsvpqfdP5aNnAalwEez+JSQvv1MUcZuQg6ebU5Dl4OzfEd9rsI4OrhOLC2xrMIE7aME50S5zhY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1785153226; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ClKqZ8SQB9pmyx4+E3qqqZkmRVLZI5VxkGmfMXWPSu8=; b=MFE1d1ZuwKH3MNNjS8Y5c+DtGFkez4ypZnWtKDJF+q79Xx/oRHDtav8qnw2JSXSklUBEs06CvQxnnUoDaOHR3U5TSZ1tLvwVzTdoH5zVnV1jBWQfZao+JEIxNUVQVV9ewYB1obbI85Tx4C/wSsRVFNjMDuJYGglwYLW+PoAQkoU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1785153226838705.7332206883843; Mon, 27 Jul 2026 04:53:46 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1woJt1-0008Ci-LD; Mon, 27 Jul 2026 07:52:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1woJsz-0007yr-Oa for qemu-devel@nongnu.org; Mon, 27 Jul 2026 07:52:45 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1woJsy-0003nJ-7H for qemu-devel@nongnu.org; Mon, 27 Jul 2026 07:52:45 -0400 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-411-uwMxzboZPVO2NzftGG5z5A-1; Mon, 27 Jul 2026 07:52:41 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 371E71800676; Mon, 27 Jul 2026 11:52:40 +0000 (UTC) Received: from localhost (unknown [10.44.24.5]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 4A12118001DD; Mon, 27 Jul 2026 11:52:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1785153163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ClKqZ8SQB9pmyx4+E3qqqZkmRVLZI5VxkGmfMXWPSu8=; b=J0jRtctCapbPYzqIe6PRP31P7F2uCGJ67PffU7UqDdjacjXFN+DKn4zk1uJGJPzUT2dQnh XiO8G0i33BIyw9hJC2PT4BYSuc65ucp2udPxmmME7HL7mSK9hHU9phr7cV0XfoCsZLGQSd v1rHdVvWscfPNXU1O7aoKhTIIc99JRs= X-MC-Unique: uwMxzboZPVO2NzftGG5z5A-1 X-Mimecast-MFC-AGG-ID: uwMxzboZPVO2NzftGG5z5A_1785153160 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Mon, 27 Jul 2026 15:51:21 +0400 Subject: [GIT PULL 12/23] hw/display/virtio-gpu: Block Rutabaga migration MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260727-fix-v1-12-ca3fa3851347@redhat.com> References: <20260727-fix-v1-0-ca3fa3851347@redhat.com> In-Reply-To: <20260727-fix-v1-0-ca3fa3851347@redhat.com> To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , "Michael S. Tsirkin" , =?utf-8?q?Alex_Benn=C3=A9e?= , Akihiko Odaki , Dmitry Osipenko X-Developer-Signature: v=1; a=openpgp-sha256; l=2255; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=8H7aHF564PPSdrDCHsEIUSfW9MwvqwYs25NvNKnd2fo=; b=owEBbAKT/ZANAwAKAdro4Ql1lpzlAcsmYgBqZ0Y/5GyRXJ0EfoXta5E19NRH8dAZZQpDVX8Hk Je2CwubU+KJAjIEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCamdGPwAKCRDa6OEJdZac 5afND/iBN7b9owmJspL8bDyBI4MrBQvW4Zn4KlTPKdpTIpGKG6oU+416kpLSSDgLRlkg3DIdQFJ KaW3vJNh4iEteqSragCowZUfji4n6LHDs16oXKK6Rnw2fN9pTMIn0k+mKwrlFAu8GvhdcFddzCx 1isNu6lhcATAOfy/dAxR7GDEioK4lTT5NnBOjMkeLyGnc+NFsbDKrz+nfdHvG1MjOpBtzueqNQW gZZIb0OW1cNntbfoAR15N8nbj78LeRAKTLV/0a/X8xCoEf0onbWFpQblGOZ7xSDkDfYFsLPjA2Q KXUQhoyGCPHXz0XiI2kq0DE2V2TR10cg8hnboYLZbefWv74qNS4l2WVkB/AFcUnvvOROZR/MHti dAZyrFcYgQ4OYW7aR8/yusDEsDAKw+tzR9R2PPPPIDdRJs9cbcZZ3NZ4trMZoX4li/Do2faeWtp chfjPXimy9LLe1o0UCEmv7MetbzTHZFNv/e+xYfM8+fYemL/KsaLzcXgzCk2oPitSiy33V07M/F GGNN9wi7ot9YVuKo6wgDurrHSi39udjvSjYcoe+/MZh+4vA31ledpAaaq3yEhVVi32RADG4X7xt /R9prSRc/4T/EbNWH+7/h999KpNSh+8czIr9uKP1EPY8YvoYRjWgeU8n1EEhGtl4Ap9EJEyhgU1 dEwPS4ZxeoY4g X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -36 X-Spam_score: -3.7 X-Spam_bar: --- X-Spam_report: (-3.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.58, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1785153228981158500 From: Akihiko Odaki The migration stream encoding is not defined for Rutabaga yet. Fixes: 1dcc6adbc168 ("gfxstream + rutabaga: add initial support for gfxstre= am") Signed-off-by: Akihiko Odaki Reviewed-by: Marc-Andr=C3=A9 Lureau Message-ID: <20260725-rutabaga-v1-1-4832b56e679d@rsg.ci.i.u-tokyo.ac.jp> --- hw/display/virtio-gpu-rutabaga.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/hw/display/virtio-gpu-rutabaga.c b/hw/display/virtio-gpu-rutab= aga.c index 6af5c2514d23..8e6c7a0d5ddc 100644 --- a/hw/display/virtio-gpu-rutabaga.c +++ b/hw/display/virtio-gpu-rutabaga.c @@ -9,6 +9,7 @@ #include "hw/virtio/virtio-gpu.h" #include "hw/virtio/virtio-gpu-pixman.h" #include "hw/virtio/virtio-iommu.h" +#include "migration/blocker.h" =20 #include #include @@ -1078,6 +1079,7 @@ static void virtio_gpu_rutabaga_handle_ctrl(VirtIODev= ice *vdev, VirtQueue *vq) =20 static void virtio_gpu_rutabaga_realize(DeviceState *qdev, Error **errp) { + ERRP_GUARD(); uint32_t num_capsets; VirtIOGPUBase *bdev =3D VIRTIO_GPU_BASE(qdev); VirtIOGPU *gpudev =3D VIRTIO_GPU(qdev); @@ -1087,12 +1089,17 @@ static void virtio_gpu_rutabaga_realize(DeviceState= *qdev, Error **errp) return; #endif =20 - if (!virtio_gpu_rutabaga_init(gpudev, errp)) { + error_setg(&bdev->migration_blocker, "rutabaga is not yet migratable"); + if (migrate_add_blocker(&bdev->migration_blocker, errp) < 0) { return; } =20 + if (!virtio_gpu_rutabaga_init(gpudev, errp)) { + goto fail; + } + if (!virtio_gpu_rutabaga_get_num_capsets(gpudev, &num_capsets, errp)) { - return; + goto fail; } =20 bdev->conf.flags |=3D (1 << VIRTIO_GPU_FLAG_RUTABAGA_ENABLED); @@ -1101,6 +1108,12 @@ static void virtio_gpu_rutabaga_realize(DeviceState = *qdev, Error **errp) =20 bdev->virtio_config.num_capsets =3D num_capsets; virtio_gpu_device_realize(qdev, errp); + if (!*errp) { + return; + } + +fail: + migrate_del_blocker(&bdev->migration_blocker); } =20 static const Property virtio_gpu_rutabaga_properties[] =3D { --=20 2.55.0 From nobody Mon Sep 28 02:05:45 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1785153181; cv=none; d=zohomail.com; s=zohoarc; b=A8mJe10okamzw8suLTmo8BeDkM3R0CwVZJ1Xr4mBccxeJrUJbyO+oCe0/5wXUCbikrm+2/X01AG3WCJxdI1vlfuU2225pBhVwuIO9+4iURqtMGSoHM/N/T2uzV5YuifGBepZ7VAZVrPU1nd4HD4ZqCvIIm9bfFzofxPwLR8U4Jg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1785153181; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=I/0isXKD3/hBm2hphOJMNjEF/saHYsIPIuvxzEaJYnA=; b=LThkgSFFrRvP6ftnAiJ9XW4r+xLZB6NjqQKzQ9cRUEEHnOCz4lRAfKEbjanXSeJZpEDpmJGO2u+TKiMokmgf53o8jBC+ovbD78jNuQKc4jZAeqMQg+MFuX0ETSl8b+lF10iuObGM1qdG8/yy0GwC0nqWsbvBc4FIeVlNERAxKxY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 178515318196727.269441675076905; Mon, 27 Jul 2026 04:53:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1woJt5-0008N7-Qi; Mon, 27 Jul 2026 07:52:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1woJt4-0008MR-E4 for qemu-devel@nongnu.org; Mon, 27 Jul 2026 07:52:50 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1woJt2-0003oh-U8 for qemu-devel@nongnu.org; Mon, 27 Jul 2026 07:52:50 -0400 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-458-MhzpsPIYOlO7VgUDfH-Q9w-1; Mon, 27 Jul 2026 07:52:46 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id AA5B718015DF; Mon, 27 Jul 2026 11:52:45 +0000 (UTC) Received: from localhost (unknown [10.44.24.5]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 896B11955F78; Mon, 27 Jul 2026 11:52:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1785153168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=I/0isXKD3/hBm2hphOJMNjEF/saHYsIPIuvxzEaJYnA=; b=cKpJZ4QO1rP0/HbSVkWUmJn9sqLEwQFRCYjrMc7uf/oiNXUzbpcTI48gRLroeNm3yQPYYr c3ZuR0SfVohFADgBgz3uj5bEAR2i3bTgFxar1sjPaYhN978KPlfEAOFtstOGm+Ln5zp/iz xkWJoqe7i1oxPq9wKBWwa79wswWSBqQ= X-MC-Unique: MhzpsPIYOlO7VgUDfH-Q9w-1 X-Mimecast-MFC-AGG-ID: MhzpsPIYOlO7VgUDfH-Q9w_1785153165 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Mon, 27 Jul 2026 15:51:22 +0400 Subject: [GIT PULL 13/23] hw/display/virtio-gpu-rutabaga: zero-init capset info response MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260727-fix-v1-13-ca3fa3851347@redhat.com> References: <20260727-fix-v1-0-ca3fa3851347@redhat.com> In-Reply-To: <20260727-fix-v1-0-ca3fa3851347@redhat.com> To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , "Michael S. Tsirkin" , =?utf-8?q?Alex_Benn=C3=A9e?= , Akihiko Odaki , Dmitry Osipenko X-Developer-Signature: v=1; a=openpgp-sha256; l=1561; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=r58tj1oUeJZbOynomaBno1bx+WtjtaCGEeJ5HQ+OHNw=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqZ0Y/SUbhFSMMVsWZ4VgcsfHu1GsSztRcEwiEU C8qteFx+WeJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCamdGPwAKCRDa6OEJdZac 5c9hEACZttDd77GO+gOv37BXbSohLFjjY6ZJW48jFJ1RQ08txpECNV+C0iIUtVLle76dypxSSCt 1UR6g6RMGDooOFXM1+1CpGSAGkU0AVx7gIoX68D+ApSYdiavzD3KswD6+tZu2PmC3UtHxnJbhVV JKcPgbSnSjykQSqNEtSZOWls5L7uMQU9BlUKxTrOVoOBkKmzTNKRy+rV8fd3FKXZj4Lp2qoMAKm PyOBPvlUvtMeXulCMcewQ/yksoy6HZ1bVH4xbLGFU6CpRBZ0KE9wJbmNv7FC6umcT8pO8nNqZb+ v4hisH+oOUasgDPG36VZkRaekdyTG4GBcDVCyObgcExhhgXFmZwwLiRNkYaoUISQpZV/AeicHnP uZXHvI/vOwdGro92MjDevlaHPaHLxChYkyVPZ5xbv1N7dm59TFZwsXy6RnkcN1LWrD00TrCd1rf XVronA/NlN6bfQiwPEJtgG89W45LFpJWfLhFp0Nt+F0MtFI1fBccC+gTlAYhq8/QhkRs+21Jt7Q 8h4kHT+4QU2kb/aL/1PT6t5ssxgXzIb6AhJBEYNHL9ui65xBMSNAwlodG3x+gaBIdQ3CC2gUrI/ yMN/1mFifMHEvgRQuahn7cGUoc1+vPag1indxyaJk0JfPwRRItGJEJV5NC05sw+iChBlSTen2Ct ppAd6wIVOwqE1pA== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -36 X-Spam_score: -3.7 X-Spam_bar: --- X-Spam_report: (-3.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.58, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1785153182765158500 rutabaga_cmd_get_capset_info() only fills in capset_id, capset_max_version and capset_max_size before sending the response to the guest. The remaining fields of struct virtio_gpu_resp_capset_info, including hdr.fence_id, hdr.ctx_id and hdr.ring_idx, are left with stack garbage and leaked to the guest, including host pointers useful for an ASLR bypass. Zero the response first, matching virgl_cmd_get_capset_info(). Not a real risk thanks to -ftrivial-auto-var-init=3Dzero, but only with gcc >=3D 12 or clang >=3D 16. Resolves: https://gitlab.com/qemu-project/qemu/-/work_items/3609 Fixes: 1dcc6adbc168 ("gfxstream + rutabaga: add initial support for gfxstre= am") Reported-by: Haotian Jiang Reviewed-by: Akihiko Odaki Signed-off-by: Marc-Andr=C3=A9 Lureau --- hw/display/virtio-gpu-rutabaga.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/display/virtio-gpu-rutabaga.c b/hw/display/virtio-gpu-rutab= aga.c index 8e6c7a0d5ddc..e28aad94eead 100644 --- a/hw/display/virtio-gpu-rutabaga.c +++ b/hw/display/virtio-gpu-rutabaga.c @@ -556,6 +556,8 @@ rutabaga_cmd_get_capset_info(VirtIOGPU *g, struct virti= o_gpu_ctrl_command *cmd) =20 VIRTIO_GPU_FILL_CMD(info); =20 + memset(&resp, 0, sizeof(resp)); + result =3D rutabaga_get_capset_info(vr->rutabaga, info.capset_index, &resp.capset_id, &resp.capset_max_ve= rsion, &resp.capset_max_size); --=20 2.55.0 From nobody Mon Sep 28 02:05:45 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1785153215; cv=none; d=zohomail.com; s=zohoarc; b=DdPXlpqE0j+XjPkSWe2tYZTsF+4qDOHyxcD47kFe/Ecflm3/jYSYTQphw5llQt5kJDlKm45rM/5dHPF7q+YkxXoeJFv3sMnqpk1qnY9ezGTChjh9Ik5Hr4pluzM+zyRoo5BT5yeM/LeahsPeqovzyb5WHk3uPCqsBGzuRrpSDnM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1785153215; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=hg/6mZLwJawyAIaPx/2xXdNrUgeKWONDLxGhJl1XA4c=; b=dD+fKCum3dIUfu1oyG7CiC1pCrK+e7CNevhOa6zihGIU8JvGgz/lgVN8tE0xPyBhNGrxyBAf2lBl+17eGbLh96W8Z6HZfcRp5Ry0Ak+cvqBos62c/5Gc/7ZFRrEHs2vDczdbMHTuSpGddqQGm0TwKf8oQ/QTVC68gwkeEngcRe0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1785153215368819.2389081919814; Mon, 27 Jul 2026 04:53:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1woJtH-0000QT-NA; Mon, 27 Jul 2026 07:53:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1woJtB-0008W5-Us for qemu-devel@nongnu.org; Mon, 27 Jul 2026 07:52:58 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1woJtA-0003rp-G8 for qemu-devel@nongnu.org; Mon, 27 Jul 2026 07:52:57 -0400 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-117-ZNuW-qaZP16ddG1vwbwRcg-1; Mon, 27 Jul 2026 07:52:52 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0A0C11954122; Mon, 27 Jul 2026 11:52:51 +0000 (UTC) Received: from localhost (unknown [10.44.24.5]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1B17130010C8; Mon, 27 Jul 2026 11:52:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1785153175; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hg/6mZLwJawyAIaPx/2xXdNrUgeKWONDLxGhJl1XA4c=; b=CZ97lTYWr4yxg1at6YJuFnBRO93TDCZKHaaUrV8jWWwoVqv8rEqcbv3qiDfWtXtYIccaNz 39Daj2vZmU40SUjHLIZ61LpSIhPgf5xraQ30a93APBS++p2/+EXzTEFUZ4qc7GnPivfh4U hdpUVz4nOBaWR2Fj6G2XbPqLEfqRc6o= X-MC-Unique: ZNuW-qaZP16ddG1vwbwRcg-1 X-Mimecast-MFC-AGG-ID: ZNuW-qaZP16ddG1vwbwRcg_1785153171 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Mon, 27 Jul 2026 15:51:23 +0400 Subject: [GIT PULL 14/23] hw/cxl: fix invalid free on early return MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260727-fix-v1-14-ca3fa3851347@redhat.com> References: <20260727-fix-v1-0-ca3fa3851347@redhat.com> In-Reply-To: <20260727-fix-v1-0-ca3fa3851347@redhat.com> To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , Jonathan Cameron , linux-cxl@vger.kernel.org X-Developer-Signature: v=1; a=openpgp-sha256; l=1063; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=fAZjMS/5LPJsdxD5l3VZWDpjLs9glFNuH9tNjnRelIg=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqZ0Y/z2GfSRvUfq832eIkZAZ9baw2wDMnXXDVF Ptc/4DpMi6JAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCamdGPwAKCRDa6OEJdZac 5So4EACytTrT2zL/32GNr4CYt7t+p5UsdAPXmE8zgMekfkzkHcwIDdrN1bUK+l6eIS3QTJa6Ugn 46S8qnnSOOa1djm4ny4ROA9vsf13XH7MsAmGJ5PHLzbc9qOynLqkDgjd4DIttknnBrjMop7/Q6H o/Y2dJ4BHhtKjoNpnD45ltCv5EzyTV8diCPoIn9zGrzOIaT18AK+Do0WV2od3W77OCDNoTl6wo+ CRDryNJc6mFXvyOTm8K4Yn1+ppkUlhGo0T5anCnFid68SkeOTz3CQXA87fHALz3hPv0E1C7MtcN L13Me8YgGexcstDIk2WRKiwbImzrcLyqdKcbJbnW2w8ZBs4nMpOJ50qlwLUSjd1+FpA4MjD0gCs AnyAwvj9epcsrV5JodelzRpi+3FEfIiUqcNgTkFLCHO/h2CT+uiqnvxg/CbMjDJTU2pIlZuehL7 gKSkBLKzWAbIOxbvThxfxHR1/nfui3SYUbIbKPsD6PrfaVtt5ikAgr300Vk9u5eE4+jL5DUDXFL Re9/IM2IsdooC+OPHnSJhOw3Pxx3WAuDpYMNsRtAFAJTki1icR+pE4xKmLejkec56RCrZqW+nI/ CV7MnpDl8mqOvIV5nBbGQPDVO0XXFsn3TB7iaVxtg2zTXC80KqYdnr9MlewM2921bCCKeYRVhfF 9+4mPPBLGVq/N/w== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -2 X-Spam_score: -0.3 X-Spam_bar: / X-Spam_report: (-0.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.58, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1785153216917158500 docs/devel/style.rst: * Variables declared with g_auto* MUST always be initialized, otherwise the cleanup function will use uninitialized stack memory Fixes: 680935c9a6ff ("hw/cxl: Add a performant (and correct) path for the n= on interleaved cases") Reviewed-by: Akihiko Odaki Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Marc-Andr=C3=A9 Lureau --- hw/cxl/cxl-host.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/cxl/cxl-host.c b/hw/cxl/cxl-host.c index 7e744312f1d8..eba13c9e7cba 100644 --- a/hw/cxl/cxl-host.c +++ b/hw/cxl/cxl-host.c @@ -279,7 +279,7 @@ static void cxl_fmws_direct_passthrough_setup(CXLDirect= PTState *state, MemoryRegion *mr =3D NULL; uint64_t vmr_size =3D 0, pmr_size =3D 0, offset =3D 0; MemoryRegion *direct_mr; - g_autofree char *direct_mr_name; + g_autofree char *direct_mr_name =3D NULL; unsigned int idx =3D state->hdm_decoder_idx; =20 if (ct3d->hostvmem) { --=20 2.55.0 From nobody Mon Sep 28 02:05:45 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1785153209; cv=none; d=zohomail.com; s=zohoarc; b=jY4K/zGPMxLjOybDsmTB2wCpt71o1/nWJnAMZYP86eeadBJAoJGlYzpGp7nGkprIfHZFJ1H6V1PDpxM3VcjmD53bWpi5sZAXWLhgBAFkLAdjNd3XwCApD8lNBnWFcmJXy8lGbf8zoqg/MDaNBJ7lg5X4sdTIyYV9tJ9H3XUhK+E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1785153209; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=nPm8Vf4l9uf9AJqUVHnAtIZ7hNE28mt3apZFpqXO+vQ=; b=g3Luh+IRci6sCwJNz764tvwtZoKaIGtrS+9EtcQ/2yR8x3dfOP7L65LqORHjNmVJjEyPwDKn2YTXy72EiW5B22VDqVOW+GQH7R1Yf/icABh7ybsSMFaMFRvhZCDF3eTMcUssz0CGAEwlX0Ek1S+g0Q7ivNbkvdJHBkk2QK6zYJo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1785153209306627.3825463271503; Mon, 27 Jul 2026 04:53:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1woJtK-0000eH-LP; Mon, 27 Jul 2026 07:53:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1woJtH-0000LM-37 for qemu-devel@nongnu.org; Mon, 27 Jul 2026 07:53:03 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1woJtF-0003wt-Fd for qemu-devel@nongnu.org; Mon, 27 Jul 2026 07:53:02 -0400 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-189-2z9ByVa8NCuiHHV5dT-OnA-1; Mon, 27 Jul 2026 07:52:57 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 56EF81955E86; Mon, 27 Jul 2026 11:52:56 +0000 (UTC) Received: from localhost (unknown [10.44.24.5]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 3C77D180034F; Mon, 27 Jul 2026 11:52:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1785153180; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nPm8Vf4l9uf9AJqUVHnAtIZ7hNE28mt3apZFpqXO+vQ=; b=LLui4kVudOeMZTGDr+XPlq1IYJCf9YdaVCM5Er3jnvLZKMeyGBC/ZlktsHwPH9oraww+BN yEyLaMt0Ri98+JoAd4eDH6innjzn5/Bp1hDF1KbF+k3OWoUUOigpJO85NELF16tXFHONnR fDCz7yWMyLOOnQWWH+DO7TIR5CTr5yc= X-MC-Unique: 2z9ByVa8NCuiHHV5dT-OnA-1 X-Mimecast-MFC-AGG-ID: 2z9ByVa8NCuiHHV5dT-OnA_1785153176 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Mon, 27 Jul 2026 15:51:24 +0400 Subject: [GIT PULL 15/23] hw/hexagon: fix machine->fdt leak in qom-test MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260727-fix-v1-15-ca3fa3851347@redhat.com> References: <20260727-fix-v1-0-ca3fa3851347@redhat.com> In-Reply-To: <20260727-fix-v1-0-ca3fa3851347@redhat.com> To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , Brian Cain , Pierrick Bouvier X-Developer-Signature: v=1; a=openpgp-sha256; l=1842; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=qAXGTuubxIbIhkEEcJPIbjJTilc1xDRew6qMQFBSIOw=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqZ0Y/IQB/oLY+UazuWcsrdZKA1Z4N/KK6M3M9I trjt2Z81c6JAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCamdGPwAKCRDa6OEJdZac 5XQ0D/4pL6JgDTn9gkeyu7gyqQ5IYVlns+ITsjzsD4auFQ5oOejo2zKW5l1sAA5AyL4wzBXqrkn Zs7EJcWjAXqr/dyc836QzrgKNlz3ucmZmseChk/4Zr95DgsD0kdh4lvc0N08km/7wQM/mrkOzOn IVT6t3a0XxCSGCvYNfPSTtHaXvvZa9K8+NOPt8Jbvf9XQhiXf5DvYSHTCFQFwev4gls5EKPDaqj om4SbubzboTwxlWG1DmTAxRqGUJAbZCrckLFGEnKXsRiHTMQcWr/g9i2yrUWacs60Oq5B0JRQH0 mm5xs8TbQFLIpOvrIIRSq1F8MvTKp5M5ERsU7tvFP4zXUI/nfRVFtXvmcohGW3i1GKmSf5L/Azq qgSnudvxpK2uE7F+e6ZqhUQ4m8gvzXqBENwUoX5T7lAPStg7oUpZzCpX3ZumzOCVDxknNzrFGJE fqe+pJhoSjPHAct4cFVAzuLRVHzVdHv7skoaKMsVtTD+gUc8P55qajhgDLp0Pa0C/avYKH9bxBv lUsQdVSQg/rZK9RRY6ZqLpPAKRI1KrJOjQQeyELHlqLMAo1f0gjVfC/7RCP4cmOwBJPAY5g57D9 h6djO/x9QxJ5SKEqboyK2ZN+lz7D6nfnp6nAK8cPXI37MrGkT3LTr7tpuhL9Hfp0ifhITO1gos2 o3lAhl8R2h18+hg== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -2 X-Spam_score: -0.3 X-Spam_bar: / X-Spam_report: (-0.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.58, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1785153210903158500 virt_instance_init() built the FDT unconditionally at QOM instance-init time, so simply instantiating the object (e.g. via qom-test's introspection, without ever realizing the machine) leaked the 1MB FDT blob: machine_finalize() does not free machine->fdt. Other boards (arm/virt, riscv/virt, ...) build the FDT lazily from their MachineClass::init callback, which only runs when the machine is actually selected to boot. Do the same here by moving create_fdt() into virt_init(). Fixes: 88a8bc7f43ff ("hw/hexagon: Define hexagon "virt" machine") Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Marc-Andr=C3=A9 Lureau --- hw/hexagon/virt.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/hw/hexagon/virt.c b/hw/hexagon/virt.c index a3638998b873..b75047250260 100644 --- a/hw/hexagon/virt.c +++ b/hw/hexagon/virt.c @@ -175,13 +175,6 @@ static void fdt_add_cpu_nodes(const HexagonVirtMachine= State *vms) =20 =20 =20 -static void virt_instance_init(Object *obj) -{ - HexagonVirtMachineState *vms =3D HEXAGON_VIRT_MACHINE(obj); - - create_fdt(vms); -} - void hexagon_load_fdt(const HexagonVirtMachineState *vms) { MachineState *ms =3D MACHINE(vms); @@ -242,6 +235,7 @@ static void virt_init(MachineState *ms) DeviceState *cpu0; int32_t clk_phandle; =20 + create_fdt(vms); qemu_fdt_setprop_string(ms->fdt, "/chosen", "bootargs", ms->kernel_cmd= line); =20 vms->sys =3D get_system_memory(); @@ -341,7 +335,6 @@ static const TypeInfo virt_machine_types[] =3D { { .parent =3D TYPE_HEXAGON_COMMON_MACHINE, .instance_size =3D sizeof(HexagonVirtMachineState), .class_init =3D virt_class_init, - .instance_init =3D virt_instance_init, } }; =20 DEFINE_TYPES(virt_machine_types) --=20 2.55.0 From nobody Mon Sep 28 02:05:45 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1785153287; cv=none; d=zohomail.com; s=zohoarc; b=XuA8E871X5SIwOM/ruOesnvsbYSIiZBmZ5iqSHk87a1pp67dOuJik01jq/RR+JTOMyLtaujJ6uc8JufHH+hEuUVseBj+Z312VTG9Lf00fqobNZ4Mq84P3EHimI8/wCD/106x+xD36jIl1BiyJSJDA6by3d6RsxS82I0pFdqUKkw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1785153287; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=hZKEHVo3ZzLDv/RGBdvdxXc3UPVSehiDLCN0yHal6ik=; b=c+0qB7ctKzcjaxzYtnk2VcLkk38ZOWg7RNF9jAkSblQJBxv75QxYcEOEwEhX6vyMHJpsLTuto/VwaivGV5dbEBW6ti0T43DxC+lUCX0lF334IgBPuVtjDrRLFHfJV9G0VJyuW6GKhDZYzUttFJD9Y4F2Zo0/WDVuahg3sBk3U3Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1785153287119767.9414902104068; Mon, 27 Jul 2026 04:54:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1woJtL-0000kK-E4; Mon, 27 Jul 2026 07:53:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1woJtJ-0000dE-R9 for qemu-devel@nongnu.org; Mon, 27 Jul 2026 07:53:06 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1woJtI-0003xV-EN for qemu-devel@nongnu.org; Mon, 27 Jul 2026 07:53:05 -0400 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-528-9sHPpEkpOoaPVe6e-DGecw-1; Mon, 27 Jul 2026 07:53:02 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 80EAD180066E; Mon, 27 Jul 2026 11:53:01 +0000 (UTC) Received: from localhost (unknown [10.44.24.5]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 4B29F18001DD; Mon, 27 Jul 2026 11:52:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1785153183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hZKEHVo3ZzLDv/RGBdvdxXc3UPVSehiDLCN0yHal6ik=; b=a3mcDB9N5vZ0Gj+qnOGA8X60IPIEkGjb9ErRre63ZX+LhVOtejoFJ5lE1GfmSktGZR9jsI SuxbU81OMWppQ3oxWf6a5fYNzHMaUuCnRT1aT/JJ0dxxvv12PsoW7EuKItIG3KngFFWYOL TNTndhAC4OtAkTR0639rER/ffWzw6Ac= X-MC-Unique: 9sHPpEkpOoaPVe6e-DGecw-1 X-Mimecast-MFC-AGG-ID: 9sHPpEkpOoaPVe6e-DGecw_1785153181 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Mon, 27 Jul 2026 15:51:25 +0400 Subject: [GIT PULL 16/23] block/blkio: fix compiler false-positive warning MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260727-fix-v1-16-ca3fa3851347@redhat.com> References: <20260727-fix-v1-0-ca3fa3851347@redhat.com> In-Reply-To: <20260727-fix-v1-0-ca3fa3851347@redhat.com> To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , Kevin Wolf , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=1163; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=b4aunSxFIZR8zEd4fYoUZnkOi/BDIcfBKX/rl+ZoFfM=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqZ0Y/OWtUmyokGiKzZh3nhZF19sqM3xCGP1/XM b9UCgEP0cKJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCamdGPwAKCRDa6OEJdZac 5c75D/9KHPaNrPNn05oeCu1enlACjxvLlCZ9oNDO9fbQkPlTn9iW3Np/eOh6YVcZOjYwgyEusdc yoY9pypx1d37F8ckTrs+mxLGLu+qD4du5h45mSZ6gv+PJbwSuZA+/ttkXRF4DQMVtvPSWimVimC vzaJzZZC0H1kfJcyfo4Yow4Cz6xPd3rbVzcWLfaACtGFhJ4iHh3NLJh9gzdU7IiFwCXdPvMLn/L OD7NHKpDurSyasDLnxahaAUW0Dx8h+cD3fJOS22Curm+ZD98LswEqt4cwEaY0wsIvmR2c5kU88w mCbkyMp1aP0ATOFGWz/bBXp4raEsKcz3RT3PgMXFOO7Eh05yU/D+/YspGKBg28RALRvs+a0kQYD wxIJWTW5hDgy1n0VSiDfsgJQff3OjrKoPKxkbDgx9i6cuSmGNgbu0KwrHslamTPccuxLr6kon5J 8EcgfDkde4g6E/xuCaFYUxMKceC02Pd5PEHI4qMqwMfxd7Ib8u694+3w2rp4pYp94jLa85K29af KFQ7fsfWsf7+k2t1QMG23r6p/UsRdUljDKvEoc4h/ncnq8RKu1xJ8Kcq7USuRTdirPztSKeMY5w 4zYqyfg89ViKh5H1J7AB4ncqxuLONIHtieZbNfLh3NZGBpYmMdpziFfnLFe0lokvcLqNw6m6vzP aS6pjLp/E0nBabQ== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -36 X-Spam_score: -3.7 X-Spam_bar: --- X-Spam_report: (-3.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.58, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1785153289430158500 Under some optimization, gcc produces a false-positive: ../block/blkio.c: In function =E2=80=98blkio_co_getlength=E2=80=99: ../block/blkio.c:943:8: error: =E2=80=98ret=E2=80=99 may be used uninit= ialized [-Werror=3Dmaybe-uninitialized] 943 | if (ret < 0) { | ^ Replace WITH_QEMU_LOCK_GUARD with the simpler QEMU_LOCK_GUARD. Suggested-by: Akihiko Odaki Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Marc-Andr=C3=A9 Lureau --- block/blkio.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/block/blkio.c b/block/blkio.c index fb8bec27d71a..008320bf2061 100644 --- a/block/blkio.c +++ b/block/blkio.c @@ -937,9 +937,8 @@ static int64_t coroutine_fn blkio_co_getlength(BlockDri= verState *bs) uint64_t capacity; int ret; =20 - WITH_QEMU_LOCK_GUARD(&s->blkio_lock) { - ret =3D blkio_get_uint64(s->blkio, "capacity", &capacity); - } + QEMU_LOCK_GUARD(&s->blkio_lock); + ret =3D blkio_get_uint64(s->blkio, "capacity", &capacity); if (ret < 0) { return -ret; } --=20 2.55.0 From nobody Mon Sep 28 02:05:45 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1785153208; cv=none; d=zohomail.com; s=zohoarc; b=BJb60eewDr6ubHe0bsroN6uLSukNWC+cuoiFpeFZdp55PeG2ZW0yu8qPl1Z3g7MryDtgWDMGRMvXaKM5hCz26jT2d0AEUbYKiI3BGYCQFSuCfr31Vs56cwdD/XevPisrrJ6T8/6FVYnsM87UsYsiDeO8vM0jO0Hdgi6jn0DXJjw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1785153208; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=dPp6/Iz6emP9faagVMHidtrIEEZa8zoC+YjDWgEts3k=; b=VokAHWsiuAPktgJjDkdDw02YG+IxSrBGO5t1EbpMQmethMd+ljmx60Q1HywbhZ0f3Kru53JFcX3p3k7GcpDiykEOP8nOWnZaGfgM6p5Qnh7/7lJb1WGZ4SY7oIc83E7egWc+s0gWmY4RQXzQXA4Xy7ib99Z2+q1OUCVcE9+zI+Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1785153208284404.95865239658553; Mon, 27 Jul 2026 04:53:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1woJtR-0001Yb-DM; Mon, 27 Jul 2026 07:53:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1woJtQ-0001Sp-6E for qemu-devel@nongnu.org; Mon, 27 Jul 2026 07:53:12 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1woJtO-0003yl-JD for qemu-devel@nongnu.org; Mon, 27 Jul 2026 07:53:11 -0400 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-671-9i4V26UuOVKA4FY5nNPMlw-1; Mon, 27 Jul 2026 07:53:07 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C2645180264B for ; Mon, 27 Jul 2026 11:53:06 +0000 (UTC) Received: from localhost (unknown [10.44.24.5]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 825C2180029F; Mon, 27 Jul 2026 11:53:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1785153189; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dPp6/Iz6emP9faagVMHidtrIEEZa8zoC+YjDWgEts3k=; b=D8kowrS6ptXwXuNoaszFODlwDddIfJPcH8zx3HBwHzpz5R+SsINgD1zR+27bNen/FTxn3u WxKhjRZE4Fjj8E4AT65Uz7RiLVUCllDxf1la02XFPMNPofRaZ6SFoXrt/budHRUYYjvenn 7WTHMoXT8Xde7uk/RsWJF6EVuuKxcV4= X-MC-Unique: 9i4V26UuOVKA4FY5nNPMlw-1 X-Mimecast-MFC-AGG-ID: 9i4V26UuOVKA4FY5nNPMlw_1785153186 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Mon, 27 Jul 2026 15:51:26 +0400 Subject: [GIT PULL 17/23] monitor: annotate monitor_qmp_dispatcher_pop_any() as coroutine MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260727-fix-v1-17-ca3fa3851347@redhat.com> References: <20260727-fix-v1-0-ca3fa3851347@redhat.com> In-Reply-To: <20260727-fix-v1-0-ca3fa3851347@redhat.com> To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , Markus Armbruster X-Developer-Signature: v=1; a=openpgp-sha256; l=859; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=u5SYt6HOlXpoYkBe8zmUhNbcCVIM7I1SQQWsPqoY/1g=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqZ0Y/5QPEg5KL1rJsLnNf6I+DP6f6zidKuoF4k S/QEJZ0Ue2JAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCamdGPwAKCRDa6OEJdZac 5fU0D/40NwzjMKD1q6N8CBeO/Xb5jvVU2qMLbmccD4x4ASQB/D7byAYGcjuQs+QwJv+CBPWwft1 AsjWYwmm4itFyzhKPvSprP4BVr3eRZmsmZI0UwarHvLgg5Yl35JUISPsVHfXrT6Ozqo+682CiKC ls1ZLGNAqqocgkTWtOpr9Kj063uiE2Bgzgt36+TtUVmj/D1M6d4Y/eay8jkr5XnxEvbberGgFoc K+BzCaPpdGGHkpkUDlwL1GckKm5ZNgTm0w772pd4LGvzt87o6VI5/w0hodjTLKdu/OQbHP3+ayg mFMKU+5ubTMRmvfxMjntGtxD8jgnyD3CXwu4P/b9Vv89m2tzXRtN4LdLKJ44j9ZC3mwLwQGnoBL V5Q01HUDPTr2G+AdNFpXi3o/dN3mDjXxYgWv+yfGLpuUFYgdCNjF34cVvc3x6jXTyTLNtpTWh0h gkSAtqfibR0MKMASNAm7myG/xroXIlaQ+13v9++u3yG2LD3oP71JwShU9NNd/KCnqXgBBjCAYaz wSpLQAm364LYZR9gb27HpCPqU9WwGHYwjNBiV0ZNrIYZcRxhP3Z2J7vX0/iQ3OzkFuKS87WJ7xR M0gFTqoAQ2yHpMT1m61Q4SEDOe07l/k+NzNO4417V3uqIr8tkDOYk8pbfBtQUe3gQCoMJTDGze6 RtcCQrVxAzdl38Q== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -36 X-Spam_score: -3.7 X-Spam_bar: --- X-Spam_report: (-3.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.58, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1785153208877158500 The function calls qemu_coroutine_yield(), and is called from monitor_qmp_dispatcher_co(). Fixes: 60f4f62efeb ("monitor: extract request dequeuing to a new function") Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Markus Armbruster Signed-off-by: Marc-Andr=C3=A9 Lureau --- monitor/qmp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/monitor/qmp.c b/monitor/qmp.c index 223e0643c2ad..338d37cb7e5a 100644 --- a/monitor/qmp.c +++ b/monitor/qmp.c @@ -342,7 +342,8 @@ static QMPRequest *monitor_qmp_requests_pop_any_with_lo= ck(void) return req_obj; } =20 -static QMPRequest *monitor_qmp_dispatcher_pop_any(void) +static QMPRequest * coroutine_fn +monitor_qmp_dispatcher_pop_any(void) { while (true) { /* --=20 2.55.0 From nobody Mon Sep 28 02:05:45 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1785153246; cv=none; d=zohomail.com; s=zohoarc; b=UIPrzYt2bPMEHmfTj1hMLOQu6h59PRJe7S7qayr19gBm556a5yRqBucqbQFErf6YOt9tKazHWRK3IEMFCiXut/qc50fagVgLSLt2CN51xrDyrSH8BwH/jldupDJOBLpxIm5YVnJuECJ8DVsc+ej5thxzv8cOHc4XxZ+QEWhFpT4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1785153246; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=o/K+1AUXVnWWVKlHiV4xOB2JHy4bJFnMoNAwKxtUWMM=; b=EDo+Dbm6fZX3LyQU2nT1fnPxewlWtao4c+zdYvveARzRvWmcpHXG8fjELdUcAbuxRqkusIF8e9b8iLW1hYHc/5uCMa8o665MVEMxjM6V+7XOow8DsG40P94MfNM1bRg9R//vunT8EH9h0qrs+uBsHizn5I5gYYiIxZnXVGnlfUE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1785153246479506.3449211147507; Mon, 27 Jul 2026 04:54:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1woJtX-0001i1-Hr; Mon, 27 Jul 2026 07:53:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1woJtW-0001hQ-BP for qemu-devel@nongnu.org; Mon, 27 Jul 2026 07:53:18 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1woJtV-0003zH-1g for qemu-devel@nongnu.org; Mon, 27 Jul 2026 07:53:18 -0400 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-287-bHfj6XDAP8qi2dWl3GAD7A-1; Mon, 27 Jul 2026 07:53:13 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4FB071935314; Mon, 27 Jul 2026 11:53:12 +0000 (UTC) Received: from localhost (unknown [10.44.24.5]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2085F1955F74; Mon, 27 Jul 2026 11:53:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1785153196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=o/K+1AUXVnWWVKlHiV4xOB2JHy4bJFnMoNAwKxtUWMM=; b=Ho7EPGwV+6MGq7f/e0yH+jya7cwPL9+t9DBi3iyLQln9tg3uP4o5sfPvr0jVR7wgB4y7aC /cVphXQOFN5Zz8mxOMVNR2Rz3QB4Ktf0Cx+fKFCI4235oobo8T6Ia0Q7J6QAp6AdhYC/yY ubTGkdpIuC3Kisprn+1ITjN6vQkgoZI= X-MC-Unique: bHfj6XDAP8qi2dWl3GAD7A-1 X-Mimecast-MFC-AGG-ID: bHfj6XDAP8qi2dWl3GAD7A_1785153192 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Mon, 27 Jul 2026 15:51:27 +0400 Subject: [GIT PULL 18/23] migration: fix qemu_get_counted_string annotation MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260727-fix-v1-18-ca3fa3851347@redhat.com> References: <20260727-fix-v1-0-ca3fa3851347@redhat.com> In-Reply-To: <20260727-fix-v1-0-ca3fa3851347@redhat.com> To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , Peter Xu , Fabiano Rosas X-Developer-Signature: v=1; a=openpgp-sha256; l=908; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=30QVK4Yftj1iMTz1RR+q67DvyJxcMY1WCMPrbYrInjc=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqZ0Y/v0XT2lSZWRp3OQW6ix/qG17ybK4fxxXro iJsPicAcI+JAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCamdGPwAKCRDa6OEJdZac 5e/SD/42i+N9Eyz3oy+CmpP6KJNPNVk8FJuznzO7p2flHGXnXJsDGoRWAOJbTtWGHpUja6jGseD 44/BKERmLtRtkyyoLnoK3T3q1Pc18gH1AfnmcqKIPGzPJ1cunHe85aA114D+g3oHIJXQ9Rmeddn 74WXt1gEz6K9CR137FxKa0/4S6ZG0WDF3amMGY4VC1bhNj9sNi5029gMIjhdwDcL9HzY+fWQh6N t3lOFPpVqyX3i+eMw1/6yg9vUvQBT+jnxitL91xPvKImbs5lk4ZzfrzWewLEiARcAMGIQDtdNA9 rGJazDnzl5yLdmGNC4gr1+gZpdrf95Lchm4Ah+uULe2I+FGwEVQPyTJUd1PH2Mef1sOcE5hZw3F HI6HVEJQ8/xYL0FafXkHqb/3HoLffLEBjgLzbITvj+kZR5zbxJe/1nnOtGN1wnn+4MvdxYkQkMb Zz+xow9NWpNTwJ7+SkhR5VCEMbmYCyVvHiiMgM3DQdlx6ED0tD/Q4D2cbcO+kEiMXh1R+463xkc 3qfreG/6ZEa/AH7eE8eoOqwJn2bL3c4ZjaDDFLOkv6ADh9WtBhYaeTK5a6lG7Qvszu4DdVVaXx8 RMTVC2k9Jj9NTeXaN8rIk1+MAHoZ0hfJUH1pzQvWjRcEkQ57HwGgvzLO0y+jqfF99at24peoOgg WWh1XaXOAuvdzUA== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -2 X-Spam_score: -0.3 X-Spam_bar: / X-Spam_report: (-0.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.58, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1785153247091158500 Fixes: 394b9407e4c ("migration: mark mixed functions that can suspend") Reviewed-by: Peter Xu Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Marc-Andr=C3=A9 Lureau --- migration/qemu-file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migration/qemu-file.c b/migration/qemu-file.c index d5a48115bd63..f30e13c66d77 100644 --- a/migration/qemu-file.c +++ b/migration/qemu-file.c @@ -830,7 +830,7 @@ uint64_t qemu_get_be64(QEMUFile *f) * else 0 * (Note a 0 length string will return 0 either way) */ -size_t coroutine_fn qemu_get_counted_string(QEMUFile *f, char buf[256]) +size_t coroutine_mixed_fn qemu_get_counted_string(QEMUFile *f, char buf[25= 6]) { size_t len =3D qemu_get_byte(f); size_t res =3D qemu_get_buffer(f, (uint8_t *)buf, len); --=20 2.55.0 From nobody Mon Sep 28 02:05:45 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1785153223; cv=none; d=zohomail.com; s=zohoarc; b=WLityVxa3PgvWQbig/zbdXzRL99tki9iQyr3EGeoiRz6qLD+woMKFNaD4tiP1n82N3IdDSmzLF8vLaGV8t2tjKyQ1z690MhLqyTnZxMxp7AdunugmYbVGTEASdmqBSlonX0OH8A3rQ80v2XuvhY9/hEx0/2xXw6eupkdvcWpd3w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1785153223; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=om5CIye3i6lrnEkPPfiq+UulgaM6eC6H/1XHPK2zRuA=; b=QSCLbgUTFS41i2B+prFyy20aLRzqBgeAjMWMg/QNOibPNz3DsMx0osa3ucAQeQ37yZ6d/87i8sIfR9ilD/XQ4tf9zeSnC4kSR6/3mepEx2JIryW2PW2E28ZNfTx0vcQgWHR7Dc4AAi9oaXEmsmOzLIFaKycPVuBKEDsvApeUshg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1785153223357513.3555783470053; Mon, 27 Jul 2026 04:53:43 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1woJtd-0001sO-2f; Mon, 27 Jul 2026 07:53:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1woJtb-0001oh-Ds for qemu-devel@nongnu.org; Mon, 27 Jul 2026 07:53:23 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1woJta-00040K-0d for qemu-devel@nongnu.org; Mon, 27 Jul 2026 07:53:23 -0400 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-182-3LJ2C3foOMe3je7V0tzn6g-1; Mon, 27 Jul 2026 07:53:20 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2B75C1800752 for ; Mon, 27 Jul 2026 11:53:19 +0000 (UTC) Received: from localhost (unknown [10.44.24.5]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 3F0A0180025F; Mon, 27 Jul 2026 11:53:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1785153201; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=om5CIye3i6lrnEkPPfiq+UulgaM6eC6H/1XHPK2zRuA=; b=iz6zN+ck++oBWCVcXX5omDCZ3hUvwCLXC/BQBFtRFFixDL5HFkhlg2cET+H3dhJ1uGikZ7 S/uPSwmRahrXUjxUdTw3JAwswshAw4CBvpaIPFcWKXbzwaIDGudCs5o76gCijDunYWRwDe hFSLKL7jk2VCbRtaYImFxh2h55//pxY= X-MC-Unique: 3LJ2C3foOMe3je7V0tzn6g-1 X-Mimecast-MFC-AGG-ID: 3LJ2C3foOMe3je7V0tzn6g_1785153199 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Mon, 27 Jul 2026 15:51:28 +0400 Subject: [GIT PULL 19/23] io: add missing coroutine annotation MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260727-fix-v1-19-ca3fa3851347@redhat.com> References: <20260727-fix-v1-0-ca3fa3851347@redhat.com> In-Reply-To: <20260727-fix-v1-0-ca3fa3851347@redhat.com> To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= X-Developer-Signature: v=1; a=openpgp-sha256; l=1443; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=hhK3avKdImCgAXvIB7NvRmE1p7D0COK7cwqKnWNle/g=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqZ0Y/67H3Qeq+xFEr3MLAxSAUzdX7aUz96M2Gd utN3CvdNHyJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCamdGPwAKCRDa6OEJdZac 5Uq8EAClBIF2YrZQsGXy46Vf/p4AkkSY7A/lU34Qw0uBMaQ6xCpOLO9qQVlkyUPEjg55XY1Ett8 pA41sZAsf1bgq1cziEX50hRrf0voTNlnXv5tXZiXiK8LsRsnjkCaViQnXGBB27scCs13PE83Pdw rNzH0q0AQokpTjuQlhmOzKKR9cwBna/bVl924KBhW00NiWF1bUER47NB7BgCTsnCC17Rh3AwGFR TTi6GyLUtpLNXx1mHgJrjgABj7PaIlsQ+rQa0i5q+nkFFS6lye+f7i4QvfCZ2eHEIiVvswXI0nD ia/7npQrB70EMLIjaFsom9f86LG4uSSF/Qx9dPS2Cjy5adHH4B6/dzZxlxryswM4kbeyh+Wh8kX E6XoWUbv1PhVcZEAxNTysQqqX1Fa1i02JyOPZFAa0gzYN4BQdlwYVt0BHg28Eb75kifN80c4gcV FglwiUC4KqYApz9b34WHKxBLaXD2UO8Mxntq9oTzbrvX5r47p3WOGQQJxxBUlumxg4E+JrUDrwy 9UPFU/8u0MpwhSg7fsRIIahg/YZ7+9JGVk18mh4haP1U+pIoJuyV+5DodPvEDOTJxnG0tiGF9c6 LQbyC4oul1aC/9uUcTGlw00y337/Zka+IcgkQtkBjKaWtNknFcXr+y9HXxE/YuIST1LFzKaSnda f8mDX5dN9NQMwNg== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -36 X-Spam_score: -3.7 X-Spam_bar: --- X-Spam_report: (-3.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.58, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1785153224998158500 Fixes: 1edf0df28409 ("io: Add qio_channel_wait_cond() helper") Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Marc-Andr=C3=A9 Lureau --- include/io/channel.h | 4 ++-- io/channel.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/io/channel.h b/include/io/channel.h index 98485c9280a6..c90ace20d535 100644 --- a/include/io/channel.h +++ b/include/io/channel.h @@ -1016,8 +1016,8 @@ void qio_channel_wait(QIOChannel *ioc, * This will work with/without a coroutine context, by automatically select * the proper API to wait. */ -void qio_channel_wait_cond(QIOChannel *ioc, - GIOCondition condition); +void coroutine_mixed_fn qio_channel_wait_cond(QIOChannel *ioc, + GIOCondition condition); =20 /** * qio_channel_set_aio_fd_handler: diff --git a/io/channel.c b/io/channel.c index 2853dadb684e..620256f310db 100644 --- a/io/channel.c +++ b/io/channel.c @@ -905,8 +905,9 @@ void qio_channel_wait(QIOChannel *ioc, g_main_context_unref(ctxt); } =20 -void qio_channel_wait_cond(QIOChannel *ioc, - GIOCondition condition) +void coroutine_mixed_fn +qio_channel_wait_cond(QIOChannel *ioc, + GIOCondition condition) { if (qemu_in_coroutine()) { qio_channel_yield(ioc, condition); --=20 2.55.0 From nobody Mon Sep 28 02:05:45 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1785153229; cv=none; d=zohomail.com; s=zohoarc; b=J2p7UIw7UAftskRwY76YvzE4SQswMfZd0z+i2QgbMG3m6Ga9qPIcyskMXLEWIHew3VFAyqOqRPM1jd7ILwgDfpf2lcT6JaMVf60Sv77v9kRIxUN6NoqqbsLk9zR7L8BsVESRmG34YLodRMeYBA/jEIxIlRPjmDTOEl/wvjyP1Uw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1785153229; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=HBzav5r/PRxvX7B889078bhSww2+z17xh67+UFrqARc=; b=VkedrpI9sZRc0O5lEQ61HwSG4LCTwAA4SjXIPkQX/pM/sHJnp0xPYaWviDJUpULVEcmvjI4ZWTIGvr26tkhIxMFM5KGqZEatJIiL5YyMujSZ6N8IiQUOrqgv04MeWvwPSqJNjxjEcbTKFhEGzTOqyWD+xDCe7jq5oka4X63pESw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1785153229579520.5838061374575; Mon, 27 Jul 2026 04:53:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1woJtl-0002kT-NI; Mon, 27 Jul 2026 07:53:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1woJtj-0002Xa-I7 for qemu-devel@nongnu.org; Mon, 27 Jul 2026 07:53:31 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1woJth-00041Y-SB for qemu-devel@nongnu.org; Mon, 27 Jul 2026 07:53:31 -0400 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-537-R7dGkwH4O86MTm3ub-zcUQ-1; Mon, 27 Jul 2026 07:53:25 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9AEC11800652; Mon, 27 Jul 2026 11:53:24 +0000 (UTC) Received: from localhost (unknown [10.44.24.5]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 55E581955F74; Mon, 27 Jul 2026 11:53:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1785153209; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HBzav5r/PRxvX7B889078bhSww2+z17xh67+UFrqARc=; b=UKq1LXeh1HNlfg78J096xcajcxVYneA5FRYqmMLYtyLd71nOe1kr+/KM4TqI/Wy5i0AeB2 Wld7vpozr4jrP9gQ8bvppGlKuQ0AWrcbw5KlM6SvdlhDshv4Q04pVzaG5PNvyiWomnkwHm oK/ZgmA8hrJrhg2bkWt0e/ewL/Qv+8Y= X-MC-Unique: R7dGkwH4O86MTm3ub-zcUQ-1 X-Mimecast-MFC-AGG-ID: R7dGkwH4O86MTm3ub-zcUQ_1785153205 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Mon, 27 Jul 2026 15:51:29 +0400 Subject: [GIT PULL 20/23] block: add missing coroutine annotation MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260727-fix-v1-20-ca3fa3851347@redhat.com> References: <20260727-fix-v1-0-ca3fa3851347@redhat.com> In-Reply-To: <20260727-fix-v1-0-ca3fa3851347@redhat.com> To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , John Snow , Vladimir Sementsov-Ogievskiy , Kevin Wolf , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=971; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=abdp1jnclsipbx9mt5zdr1x5wsYMVTEvTXCKXSBolV8=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqZ0Y/kZftvKs1zl+AQgu3YmdqMOHDjglaIll+u +3ECNSoU5CJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCamdGPwAKCRDa6OEJdZac 5RN5D/9dWipxOoJTl2IVNraclkRjish1n879iDuaCgKPtB0ImT6B3QIsYqFXtmDr4TcYV43P83B zaeNCguayF9bODCBTjlsPBM8WrPla0+fosIdeEym9BRQhqKZBuCCuwy+mQ0ZFoMPV3TvKgNuRi2 Z1L5Eokh8hBGdpieWbYCGfEQVXLyZ4Q4eY5aUVbiQOuzHfziYOOFqwY4IqQp9Q99v9M3Htq6I91 cEL0562ekeHdVVQLBCvHmRo8vTHOO5iCYnWw6NTF8URTZE7LKzn6XYo8LbQyyELbFWZ3JHyAkIi stnmC6v60HRcxhY2QOYDB1x+U8vPVU4PmD9ZP1KIZy3FzFZf3nU9Cx/87VouK3BhtrFE9EZhBDJ 3HJaSh3THEVDxZAw1nFeQ6SDgHlcLwiLaXqO/I5en+yin/A74JuzmWZFINU+iAcfiTXqlSSwkuI tVzrdyrUCcoXU+WZjrC4lq1M06hl90vS2z3xqOKjLg3MWh6i5bxLWkw1bh3y/umeHzF8C/R4xEE a2FfOzkDOyYE7tDgEZ9ELga+/0RL3sgsnwUeRB/4d1tldhD09CAux7QUr6KXKsjHku9rR0xkTs8 AQ0wWvRQ2KggJWL301LiwGJ2x26JKxKQDz6B5vfioU6KiCrUIAKirydO4hjCvkQV9ZP5GfLuA9i yZmqERoslKW7iTA== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -36 X-Spam_score: -3.7 X-Spam_bar: --- X-Spam_report: (-3.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.58, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1785153231502158500 The function was extracted without carrying the annotation. Fixes: 23743ab282af ("block: move commit_run loop to separate function") Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Kevin Wolf Signed-off-by: Marc-Andr=C3=A9 Lureau --- block/commit.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/block/commit.c b/block/commit.c index c5e3ef03a21b..2d52c39594cd 100644 --- a/block/commit.c +++ b/block/commit.c @@ -128,8 +128,9 @@ static void commit_clean(Job *job) blk_unref(s->top); } =20 -static int commit_iteration(CommitBlockJob *s, int64_t offset, - int64_t *requested_bytes, void *buf) +static int coroutine_fn +commit_iteration(CommitBlockJob *s, int64_t offset, + int64_t *requested_bytes, void *buf) { BlockErrorAction action; int64_t bytes =3D *requested_bytes; --=20 2.55.0 From nobody Mon Sep 28 02:05:45 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1785153341; cv=none; d=zohomail.com; s=zohoarc; b=Jp5GISsk2WdAsefdXIobMtYZuL4wsU4RfcfZxeWtBHWUvB0JQZMlCmD0p0V/VtWIsCxkitecrXTfweYAiiRPcPKYmAiUfOc9ir6UNCQO62swcBC/0y3CQNmj4zoH7Sz2TzKGu3/w/AW1HFqDiLtg+QygEJcJA1kRZyVAbrg9Ou8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1785153341; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=w9P2W4JHcW8gHi5z7gIDq25C1oCq7ThbiMkHET5NoPI=; b=LrfAZ3iya57bU66f5xvUAQ5c+h15HtThsd8IRNyYKBF0V07gGP+cpQRZsxXjDMAicTYFuqe0fNXUf3iKV7h6XRTNJlCLg2k9ypeqsRjQyM0gJL4dviTyOzeZ4h5dseBmw5e+Q0UB9zV16RRcoCGEkMRmMqw0X28tH45Ut48vaHY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1785153341252145.44744094070234; Mon, 27 Jul 2026 04:55:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1woJtq-0002uL-18; Mon, 27 Jul 2026 07:53:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1woJto-0002tY-VT for qemu-devel@nongnu.org; Mon, 27 Jul 2026 07:53:36 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1woJtn-00042Y-Iy for qemu-devel@nongnu.org; Mon, 27 Jul 2026 07:53:36 -0400 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-280-flTmZKK5O-yU4SrRfAWnrA-1; Mon, 27 Jul 2026 07:53:32 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 29143195C27F; Mon, 27 Jul 2026 11:53:31 +0000 (UTC) Received: from localhost (unknown [10.44.24.5]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id CA1521954B01; Mon, 27 Jul 2026 11:53:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1785153215; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=w9P2W4JHcW8gHi5z7gIDq25C1oCq7ThbiMkHET5NoPI=; b=XAACt6uQiilraPGtPcQfq4IiLwOoLEWNA6tlbwzpr3Q9p4dhi69ZIuC+CW6jaLmRw3CncS SUiM0ZDSwfqPH/Gh4rA0zDLqnwdov6r2r7CehvrZbeEaBjqkElW0gp0VicljKkNSLj/mk9 elrCzYE1j4NlRYdlv56krl60xTMXpr4= X-MC-Unique: flTmZKK5O-yU4SrRfAWnrA-1 X-Mimecast-MFC-AGG-ID: flTmZKK5O-yU4SrRfAWnrA_1785153211 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Mon, 27 Jul 2026 15:51:30 +0400 Subject: [GIT PULL 21/23] qcow2: remove invalid qcow2_check_refcounts calls MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260727-fix-v1-21-ca3fa3851347@redhat.com> References: <20260727-fix-v1-0-ca3fa3851347@redhat.com> In-Reply-To: <20260727-fix-v1-0-ca3fa3851347@redhat.com> To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , Kevin Wolf , Hanna Reitz , qemu-block@nongnu.org X-Developer-Signature: v=1; a=openpgp-sha256; l=1528; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=OO6u4jc/oE85ygnu76Eff+BQJm9qaSylokab/TrhS7g=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqZ0Y/VJqW0pBGn/XLy87cE7C+CmRbkAfc464rT ATUd1fk4j6JAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCamdGPwAKCRDa6OEJdZac 5dD2D/468ErqfxB6+H7woPdWXH6K4/sBdwOdEkuKVFfURcms4jXsYTixCz2O3rXXRAqyqOPnOWH eATcu9luqcY2ZkOVbzJeNV5MUBPiDQVxoICefWnkM4cCLjmTZU2WXWm685A40DI88z/XfLBFTp3 J47nttxegS3t7ZbzEUNuDpT4s2mt4/0IJL/FlQChxlQQL3NfLvE89LKzWYqx8gDFgl0YeMPgrbV ebfZi7j0lKug6A5X4Xi1rhytu7SBaWPEZE3yOXnqobDN0XX7KQYcYdd9BA+Li4droWpsQjyQm8h wWcneqo9wjHcmX2BdnPt4HXL7pnoTJj9UspcydeVw1S+uFk1pw7GCAnb+GAX8I8n2rHmiCgakA8 YP3q9HS5w0VJhiB4CJauZ4AQGV6lb0VgaZADh7lxJ0a2UR3uzvNtmhap/l3I3hIPW2xR3hOKZzs EoTu7mIBOrGjkhvSci/NWT9xVprrIQgpjiSzXo9XiTsqPKn1PPmIVQOFvLTi7ThmIkj28T0+GMn pXkXq79yfgk1uypSl1opS0FyryzBm3MIefSdE/ABm+QwEkQxx3nWq7oSlQP3n9GlOZz0OoV5qbA JXhT52LTfR8ETn0tnKf1x3s7zao27LplS+24XGmeK7sApvpwCwUD+F1zdWmP4+947m9P3JoyT+T S803MfjiBL6MV5A== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -2 X-Spam_score: -0.3 X-Spam_bar: / X-Spam_report: (-0.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.58, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1785153341980158500 Those DEBUG_ALLOC-guarded are dead code incorrectly calling coroutine fn from non-coroutine. Remove it. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Fixes: 70bacc44532 ("qcow2: mark more functions as coroutine_fns and GRAPH= _RDLOCK") Signed-off-by: Marc-Andr=C3=A9 Lureau --- block/qcow2-snapshot.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/block/qcow2-snapshot.c b/block/qcow2-snapshot.c index 1e8dc48be1c5..8453ad73d10f 100644 --- a/block/qcow2-snapshot.c +++ b/block/qcow2-snapshot.c @@ -740,12 +740,6 @@ int qcow2_snapshot_create(BlockDriverState *bs, QEMUSn= apshotInfo *sn_info) ROUND_UP(sn->vm_state_size, s->cluster_size), QCOW2_DISCARD_NEVER, false); =20 -#ifdef DEBUG_ALLOC - { - BdrvCheckResult result =3D {0}; - qcow2_check_refcounts(bs, &result, 0); - } -#endif return 0; =20 fail: @@ -893,12 +887,6 @@ int qcow2_snapshot_goto(BlockDriverState *bs, const ch= ar *snapshot_id) goto fail; } =20 -#ifdef DEBUG_ALLOC - { - BdrvCheckResult result =3D {0}; - qcow2_check_refcounts(bs, &result, 0); - } -#endif return 0; =20 fail: @@ -975,12 +963,6 @@ int qcow2_snapshot_delete(BlockDriverState *bs, return ret; } =20 -#ifdef DEBUG_ALLOC - { - BdrvCheckResult result =3D {0}; - qcow2_check_refcounts(bs, &result, 0); - } -#endif return 0; } =20 --=20 2.55.0 From nobody Mon Sep 28 02:05:45 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1785153241; cv=none; d=zohomail.com; s=zohoarc; b=TJ6WSGH8P9l+rwV3OpbO4Moxkr9Ze5QasuBPQ5iYb70W2HJsF9ftEop8kETwy6CWe6A3Cog23KznT+EblMKYsu2+3AFW0GdDs35616gQ4L4QWgauryGaKWvgaVa1iQnUM18qpREBcwk4fMyNevV6rmACkBc2rBSk8k8DpDYrQmc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1785153241; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=9oYIu6ucbeyhcRhj8yqHtduIC8JKpxj/ZV2BhttSk7M=; b=IDTsUCDo4cLk2ANkQPk1satVHOn6ohSHyYWkLuauI+yHJoXDQbYufQecwbo2YRuEbPXXwHWvEfWsLATavYKZO3N57+LZqEJaVztAHt5Os4PkyTLUTfu38pe+uotMepvJ/iJNCtj/PqAImnH5U9Wpryd0nAM6JdpyH5AU1/+aS4I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1785153241466161.4322808252124; Mon, 27 Jul 2026 04:54:01 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1371626.1619108 (Exim 4.92) (envelope-from ) id 1woJtw-0008He-CU; Mon, 27 Jul 2026 11:53:44 +0000 Received: by outflank-mailman (output) from mailman id 1371626.1619108; Mon, 27 Jul 2026 11:53:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1woJtw-0008HX-9t; Mon, 27 Jul 2026 11:53:44 +0000 Received: by outflank-mailman (input) for mailman id 1371626; Mon, 27 Jul 2026 11:53:43 +0000 Received: from mx.expurgate.net ([195.190.135.10]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1woJtv-0008HR-7L for xen-devel@lists.xenproject.org; Mon, 27 Jul 2026 11:53:43 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1woJtt-007uEr-W8 for xen-devel@lists.xenproject.org; Mon, 27 Jul 2026 13:53:42 +0200 Received: from [10.42.69.5] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 6a6746c4-2eae-0a2a0a5409dd-0a2a4505df56-4 for ; Mon, 27 Jul 2026 13:53:41 +0200 Received: from [170.10.133.124] (helo=us-smtp-delivery-124.mimecast.com) by tlsNG-c201ff.mxtls.expurgate.net with ESMTPS (eXpurgate 4.57.1) (envelope-from ) id 6a6746c4-4cb1-0a2a45050019-aa0a857c7d71-3 for ; Mon, 27 Jul 2026 13:53:41 +0200 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-308-7mzw_8iXNTqT0Td6tTII9Q-1; Mon, 27 Jul 2026 07:53:38 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 097571955F3D; Mon, 27 Jul 2026 11:53:37 +0000 (UTC) Received: from localhost (unknown [10.44.24.5]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6C8E5180025A; Mon, 27 Jul 2026 11:53:34 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" Authentication-Results: eu.smtp.expurgate.cloud; dkim=pass header.s=mimecast20190719 header.d=redhat.com header.i="@redhat.com" header.h="From:Subject:Date:Message-Id:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1785153220; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9oYIu6ucbeyhcRhj8yqHtduIC8JKpxj/ZV2BhttSk7M=; b=BHhQ7g8E+XZO0aFKdIOFy5METvwLgb4eSgRVyjrG6wBCmIiB2XdPZbu+8PuH+/hb0qv42G jufszB3FYgEOWSaoe4BLBTePRojKbREatPzwJWJuEdpZPyWmxH2X+FOGkfhHJ4Xh6TUS4M YM224PnfyENDXYOAGyKXkWT6F5RkoLo= X-MC-Unique: 7mzw_8iXNTqT0Td6tTII9Q-1 X-Mimecast-MFC-AGG-ID: 7mzw_8iXNTqT0Td6tTII9Q_1785153217 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Mon, 27 Jul 2026 15:51:31 +0400 Subject: [GIT PULL 22/23] hw/9pfs: annotate V9fsTransport callbacks as coroutine_fn MIME-Version: 1.0 Message-Id: <20260727-fix-v1-22-ca3fa3851347@redhat.com> References: <20260727-fix-v1-0-ca3fa3851347@redhat.com> In-Reply-To: <20260727-fix-v1-0-ca3fa3851347@redhat.com> To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , Christian Schoenebeck , Greg Kurz , "Michael S. Tsirkin" , Stefano Stabellini , Anthony PERARD , "Edgar E. Iglesias" , xen-devel@lists.xenproject.org X-Developer-Signature: v=1; a=openpgp-sha256; l=12210; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=kIVXvSiYvzjRZ5/GpYFflICxn39LG3s3JicrtUIOOKw=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqZ0Y/InBqkiqgdux+2VziZo11jHAPJh08la6E6 AaTlKt6htqJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCamdGPwAKCRDa6OEJdZac 5cQ0EACCWlZ8GGsTXxQvK81AsXtdlhpWUKq7GI/rQlpxXM+XuTBJKER+BlIWnLNaPdhWA2he5Db SJPMVkVXaTDunQv3RGE0K+PByfftg0GI3T1QgpxfUz9sBe2R7oDBX7wLWnkafpgHDaJOCJbcr1M SGn8iH2iiBEqyB8XhtHVvK6OiNtrIjtW152yRdvYK1cFoCUUPHNcnWNyyk9kRW71KyP1t876Zu4 Iv+rBW/nHlfva796PBdFwqkCuRtX5YlM/v1zH5SHHQ3+z9pyolNnHz8meigEIC1L+N1hm7Cuu5c ke4YbEwLgB1wj/71vug9qOt9MGYnPxekE6osZxMjGMStxxpd/AvK1sWlg4xZFTv0C3cpPUpXbz3 kjrILkbAdDsj9gOpiwVzD73/3O+PBIvXKT4Ua6ht0uQSVIPCuqVbOuKIDw0ZUXkVj8ocsA/5NRq DbclLmil8vvfU6VXfPjAvZksKQuyJTJ6tSPYd9Wyv6g05g3zRfuu0nbvGRnA5BTXZrhbDmZ3VFW qjQDj9wuInuNtdPDBWHlAeDiQzWklxLgbePNxypQDefIV+h/7NfMPxIM58mPD3E7pD5kiXVdA48 1/4plEo+L6eqUmR32H15UrgymlrklgclH2ym4VVDkYX6/uR6PqejQAPka7Ld0+CNejMAlVA/9W9 TiypcFk/ky/YTbQ== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-MFC-PROC-ID: MSn5grMGLaPVzUZ_2N9qC6llwOiza6v_PowqN69UJpc_1785153217 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-purgate-ID: tlsNG-c201ff/1785153221-F4EA12A1-F25F1B9D/0/0 X-purgate-type: clean X-purgate-size: 12212 X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1785153243287158500 All V9fsTransport callbacks are invoked exclusively from coroutine context (the v9fs_* PDU handlers). Annotate the function pointer types in V9fsTransport and all implementations (virtio and xen backends), as well as intermediate callers in 9p.c (pdu_marshal, pdu_unmarshal, v9fs_init_qiov_from_pdu, etc.). Acked-by: Christian Schoenebeck Signed-off-by: Marc-Andr=C3=A9 Lureau --- hw/9pfs/9p.h | 26 +++++++++++++++----------- hw/9pfs/9p.c | 31 +++++++++++++++++++------------ hw/9pfs/virtio-9p-device.c | 24 +++++++++++++----------- hw/9pfs/xen-9p-backend.c | 34 +++++++++++++++++----------------- 4 files changed, 64 insertions(+), 51 deletions(-) diff --git a/hw/9pfs/9p.h b/hw/9pfs/9p.h index 1a309664f6e3..0e52ffbdf38b 100644 --- a/hw/9pfs/9p.h +++ b/hw/9pfs/9p.h @@ -472,17 +472,21 @@ void pdu_submit(V9fsPDU *pdu, P9MsgHeader *hdr); void v9fs_reset(V9fsState *s); =20 struct V9fsTransport { - ssize_t (*pdu_vmarshal)(V9fsPDU *pdu, size_t offset, const char *f= mt, - va_list ap); - ssize_t (*pdu_vunmarshal)(V9fsPDU *pdu, size_t offset, const char = *fmt, - va_list ap); - void (*init_in_iov_from_pdu)(V9fsPDU *pdu, struct iovec **piov, - unsigned int *pniov, size_t size); - void (*init_out_iov_from_pdu)(V9fsPDU *pdu, struct iovec **piov, - unsigned int *pniov, size_t size); - void (*push_and_notify)(V9fsPDU *pdu); - size_t (*msize_limit)(V9fsState *s); - size_t (*response_buffer_size)(V9fsPDU *pdu); + ssize_t coroutine_fn (*pdu_vmarshal)(V9fsPDU *pdu, size_t offset, + const char *fmt, va_list ap); + ssize_t coroutine_fn (*pdu_vunmarshal)(V9fsPDU *pdu, size_t offset, + const char *fmt, va_list ap= ); + void coroutine_fn (*init_in_iov_from_pdu)(V9fsPDU *pdu, + struct iovec **piov, + unsigned int *pniov, + size_t size); + void coroutine_fn (*init_out_iov_from_pdu)(V9fsPDU *pdu, + struct iovec **piov, + unsigned int *pniov, + size_t size); + void coroutine_fn (*push_and_notify)(V9fsPDU *pdu); + size_t coroutine_fn (*msize_limit)(V9fsState *s); + size_t coroutine_fn (*response_buffer_size)(V9fsPDU *pdu); }; =20 #endif diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c index 1c61e6b3e773..4764d9db13b1 100644 --- a/hw/9pfs/9p.c +++ b/hw/9pfs/9p.c @@ -55,7 +55,8 @@ enum { =20 P9ARRAY_DEFINE_TYPE(V9fsPath, v9fs_path_free); =20 -static ssize_t pdu_marshal(V9fsPDU *pdu, size_t offset, const char *fmt, .= ..) +static ssize_t coroutine_fn +pdu_marshal(V9fsPDU *pdu, size_t offset, const char *fmt, ...) { ssize_t ret; va_list ap; @@ -67,7 +68,8 @@ static ssize_t pdu_marshal(V9fsPDU *pdu, size_t offset, c= onst char *fmt, ...) return ret; } =20 -static ssize_t pdu_unmarshal(V9fsPDU *pdu, size_t offset, const char *fmt,= ...) +static ssize_t coroutine_fn +pdu_unmarshal(V9fsPDU *pdu, size_t offset, const char *fmt, ...) { ssize_t ret; va_list ap; @@ -1841,7 +1843,8 @@ out_nofid: pdu_complete(pdu, err); } =20 -static int v9fs_walk_marshal(V9fsPDU *pdu, uint16_t nwnames, V9fsQID *qids) +static int coroutine_fn +v9fs_walk_marshal(V9fsPDU *pdu, uint16_t nwnames, V9fsQID *qids) { int i; ssize_t err; @@ -2363,9 +2366,10 @@ out_nofid: * The resulting QEMUIOVector has heap-allocated iovecs and must be cleane= d up * with qemu_iovec_destroy(). */ -static void v9fs_init_qiov_from_pdu(QEMUIOVector *qiov, V9fsPDU *pdu, - size_t skip, size_t size, - bool is_write) +static void coroutine_fn +v9fs_init_qiov_from_pdu(QEMUIOVector *qiov, V9fsPDU *pdu, + size_t skip, size_t size, + bool is_write) { QEMUIOVector elem; struct iovec *iov; @@ -2382,8 +2386,9 @@ static void v9fs_init_qiov_from_pdu(QEMUIOVector *qio= v, V9fsPDU *pdu, qemu_iovec_concat(qiov, &elem, skip, size); } =20 -static int v9fs_xattr_read(V9fsState *s, V9fsPDU *pdu, V9fsFidState *fidp, - uint64_t off, uint32_t max_count) +static int coroutine_fn +v9fs_xattr_read(V9fsState *s, V9fsPDU *pdu, V9fsFidState *fidp, + uint64_t off, uint32_t max_count) { ssize_t err; size_t offset =3D 7; @@ -2793,9 +2798,10 @@ out_nofid: pdu_complete(pdu, retval); } =20 -static int v9fs_xattr_write(V9fsState *s, V9fsPDU *pdu, V9fsFidState *fidp, - uint64_t off, uint32_t count, - struct iovec *sg, int cnt) +static int coroutine_fn +v9fs_xattr_write(V9fsState *s, V9fsPDU *pdu, V9fsFidState *fidp, + uint64_t off, uint32_t count, + struct iovec *sg, int cnt) { int i, to_copy; ssize_t err =3D 0; @@ -3729,7 +3735,8 @@ out_nofid: pdu_complete(pdu, err); } =20 -static int v9fs_fill_statfs(V9fsState *s, V9fsPDU *pdu, struct statfs *stb= uf) +static int coroutine_fn +v9fs_fill_statfs(V9fsState *s, V9fsPDU *pdu, struct statfs *stbuf) { uint32_t f_type; uint32_t f_bsize; diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c index 576a794ea434..2774fc2290a8 100644 --- a/hw/9pfs/virtio-9p-device.c +++ b/hw/9pfs/virtio-9p-device.c @@ -28,7 +28,7 @@ #include "qemu/module.h" #include "system/qtest.h" =20 -static void virtio_9p_push_and_notify(V9fsPDU *pdu) +static void coroutine_fn virtio_9p_push_and_notify(V9fsPDU *pdu) { V9fsState *s =3D pdu->s; V9fsVirtioState *v =3D container_of(s, V9fsVirtioState, state); @@ -117,8 +117,8 @@ static void virtio_9p_reset(VirtIODevice *vdev) v9fs_reset(&v->state); } =20 -static ssize_t virtio_pdu_vmarshal(V9fsPDU *pdu, size_t offset, - const char *fmt, va_list ap) +static ssize_t coroutine_fn +virtio_pdu_vmarshal(V9fsPDU *pdu, size_t offset, const char *fmt, va_list = ap) { V9fsState *s =3D pdu->s; V9fsVirtioState *v =3D container_of(s, V9fsVirtioState, state); @@ -135,8 +135,8 @@ static ssize_t virtio_pdu_vmarshal(V9fsPDU *pdu, size_t= offset, return ret; } =20 -static ssize_t virtio_pdu_vunmarshal(V9fsPDU *pdu, size_t offset, - const char *fmt, va_list ap) +static ssize_t coroutine_fn +virtio_pdu_vunmarshal(V9fsPDU *pdu, size_t offset, const char *fmt, va_lis= t ap) { V9fsState *s =3D pdu->s; V9fsVirtioState *v =3D container_of(s, V9fsVirtioState, state); @@ -152,8 +152,9 @@ static ssize_t virtio_pdu_vunmarshal(V9fsPDU *pdu, size= _t offset, return ret; } =20 -static void virtio_init_in_iov_from_pdu(V9fsPDU *pdu, struct iovec **piov, - unsigned int *pniov, size_t size) +static void coroutine_fn +virtio_init_in_iov_from_pdu(V9fsPDU *pdu, struct iovec **piov, + unsigned int *pniov, size_t size) { V9fsState *s =3D pdu->s; V9fsVirtioState *v =3D container_of(s, V9fsVirtioState, state); @@ -172,8 +173,9 @@ static void virtio_init_in_iov_from_pdu(V9fsPDU *pdu, s= truct iovec **piov, *pniov =3D elem->in_num; } =20 -static void virtio_init_out_iov_from_pdu(V9fsPDU *pdu, struct iovec **piov, - unsigned int *pniov, size_t size) +static void coroutine_fn +virtio_init_out_iov_from_pdu(V9fsPDU *pdu, struct iovec **piov, + unsigned int *pniov, size_t size) { V9fsState *s =3D pdu->s; V9fsVirtioState *v =3D container_of(s, V9fsVirtioState, state); @@ -192,13 +194,13 @@ static void virtio_init_out_iov_from_pdu(V9fsPDU *pdu= , struct iovec **piov, *pniov =3D elem->out_num; } =20 -static size_t virtio_9p_msize_limit(V9fsState *s) +static size_t coroutine_fn virtio_9p_msize_limit(V9fsState *s) { const size_t guestPageSize =3D 4096; return (VIRTQUEUE_MAX_SIZE - 2) * guestPageSize; } =20 -static size_t virtio_9p_response_buffer_size(V9fsPDU *pdu) +static size_t coroutine_fn virtio_9p_response_buffer_size(V9fsPDU *pdu) { V9fsState *s =3D pdu->s; V9fsVirtioState *v =3D container_of(s, V9fsVirtioState, state); diff --git a/hw/9pfs/xen-9p-backend.c b/hw/9pfs/xen-9p-backend.c index d44fa8d61e2e..06709d54084b 100644 --- a/hw/9pfs/xen-9p-backend.c +++ b/hw/9pfs/xen-9p-backend.c @@ -136,10 +136,10 @@ static void xen_9pfs_out_sg(Xen9pfsRing *ring, } } =20 -static ssize_t xen_9pfs_pdu_vmarshal(V9fsPDU *pdu, - size_t offset, - const char *fmt, - va_list ap) +static ssize_t coroutine_fn xen_9pfs_pdu_vmarshal(V9fsPDU *pdu, + size_t offset, + const char *fmt, + va_list ap) { Xen9pfsDev *xen_9pfs =3D container_of(pdu->s, Xen9pfsDev, state); struct iovec in_sg[2]; @@ -161,10 +161,10 @@ static ssize_t xen_9pfs_pdu_vmarshal(V9fsPDU *pdu, return ret; } =20 -static ssize_t xen_9pfs_pdu_vunmarshal(V9fsPDU *pdu, - size_t offset, - const char *fmt, - va_list ap) +static ssize_t coroutine_fn xen_9pfs_pdu_vunmarshal(V9fsPDU *pdu, + size_t offset, + const char *fmt, + va_list ap) { Xen9pfsDev *xen_9pfs =3D container_of(pdu->s, Xen9pfsDev, state); struct iovec out_sg[2]; @@ -185,10 +185,10 @@ static ssize_t xen_9pfs_pdu_vunmarshal(V9fsPDU *pdu, return ret; } =20 -static void xen_9pfs_init_out_iov_from_pdu(V9fsPDU *pdu, - struct iovec **piov, - unsigned int *pniov, - size_t size) +static void coroutine_fn xen_9pfs_init_out_iov_from_pdu(V9fsPDU *pdu, + struct iovec **pio= v, + unsigned int *pnio= v, + size_t size) { Xen9pfsDev *xen_9pfs =3D container_of(pdu->s, Xen9pfsDev, state); Xen9pfsRing *ring =3D &xen_9pfs->rings[pdu->tag % xen_9pfs->num_rings]; @@ -202,10 +202,10 @@ static void xen_9pfs_init_out_iov_from_pdu(V9fsPDU *p= du, *pniov =3D num; } =20 -static void xen_9pfs_init_in_iov_from_pdu(V9fsPDU *pdu, - struct iovec **piov, - unsigned int *pniov, - size_t size) +static void coroutine_fn xen_9pfs_init_in_iov_from_pdu(V9fsPDU *pdu, + struct iovec **piov, + unsigned int *pniov, + size_t size) { Xen9pfsDev *xen_9pfs =3D container_of(pdu->s, Xen9pfsDev, state); Xen9pfsRing *ring =3D &xen_9pfs->rings[pdu->tag % xen_9pfs->num_rings]; @@ -234,7 +234,7 @@ again: *pniov =3D num; } =20 -static void xen_9pfs_push_and_notify(V9fsPDU *pdu) +static void coroutine_fn xen_9pfs_push_and_notify(V9fsPDU *pdu) { RING_IDX prod; Xen9pfsDev *priv =3D container_of(pdu->s, Xen9pfsDev, state); --=20 2.55.0 From nobody Mon Sep 28 02:05:45 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1785153287; cv=none; d=zohomail.com; s=zohoarc; b=WVtxVF6RwRXOs88swaksDU37hkx84h6umNbyonfKLu4ecD4tJaGnCWjfWCrlyc4HGj+vcrcPCr9/Quminaez4UP4TFFa/Ucc5swWW/n/CFKV1eMnF97epLT6cVT4WCGegRKtgwzmW7FLRh38APgPJBY6hh5BEZ/PeTWneJatgG0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1785153287; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=3otxHHzF848aWH4w40n6EBe3Am3b5Xd5NRbN2eJgj1c=; b=e0LGdJ1OdfCNC2TUTUHQQMUj8WX3HErhZ4xPO7wHu3kYNWcNpZMPPQHyLmmDVZ26NYcPtjQHQflyd383FuORESNOJhFWyH3HeWBgtsGhuW2UDxKty1Vp9+m2YvKd9ZhD+NlbqsVHpWnqL0DZ6+avbeTjzIr5vdu4fPmhJtmRh3w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1785153287098755.5408916605727; Mon, 27 Jul 2026 04:54:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1woJu6-0003ee-Av; Mon, 27 Jul 2026 07:53:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1woJu3-0003Xu-V3 for qemu-devel@nongnu.org; Mon, 27 Jul 2026 07:53:51 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1woJu2-000448-I0 for qemu-devel@nongnu.org; Mon, 27 Jul 2026 07:53:51 -0400 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-500-o6EfhtJnOzyPJvRzVXbY4g-1; Mon, 27 Jul 2026 07:53:43 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 60A341956056; Mon, 27 Jul 2026 11:53:42 +0000 (UTC) Received: from localhost (unknown [10.44.24.5]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 3BBE618001E1; Mon, 27 Jul 2026 11:53:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1785153229; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3otxHHzF848aWH4w40n6EBe3Am3b5Xd5NRbN2eJgj1c=; b=ht7pUOhHWnZhFaQGuq4RckyYgDc2PxZbKoVxyhriijqTZXI+NIvRhqxaMV6uHLU0Tlbsb4 Q8GneFHeSQhVNxF38jtF9o78uD1bXISh/3o7cbzmALPzWqrtOf+r7LiY+hWbjE21e8pBB1 a1++HXWSgxIq0lcVBesr70YuqSwL/mQ= X-MC-Unique: o6EfhtJnOzyPJvRzVXbY4g-1 X-Mimecast-MFC-AGG-ID: o6EfhtJnOzyPJvRzVXbY4g_1785153222 From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Date: Mon, 27 Jul 2026 15:51:32 +0400 Subject: [GIT PULL 23/23] migration/rdma: annotate and simplify wait_comp_channel() MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260727-fix-v1-23-ca3fa3851347@redhat.com> References: <20260727-fix-v1-0-ca3fa3851347@redhat.com> In-Reply-To: <20260727-fix-v1-0-ca3fa3851347@redhat.com> To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , Peter Xu , Fabiano Rosas , Li Zhijian X-Developer-Signature: v=1; a=openpgp-sha256; l=1623; i=marcandre.lureau@redhat.com; h=from:subject:message-id; bh=2C5ZqBaQBwSshXxXMaaT5VaLMkO28qyCe2lqnv2+Heg=; b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBqZ0ZAIQzm3kTQNC9rWFyTB1HJNrd6AgNFE2EUz 1zMv2gd1Q2JAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCamdGQAAKCRDa6OEJdZac 5cYWD/9oQ1KhBgsluzazVr8IK3k15uxTcBqtPzz2rVuPl8xFStnREmPbVfPSFgllO7DMCoNfnG2 nD4GScVszxzTtRlRuxGxNnhqa5ehvdTBpNAKocpoV3l3Qzvaho+bWYlOQKkhyw+FTqQBMwFdzat 8nHZiLhHZYo8ek/zN/t2vVkb41qxJIK+3OxX8WlivniI+7HoNe74wk92TgGxIlmu+2Fo/Dk7bxZ 9iSrrx5F5wS68/1QAncTlr+/zUpanX1QJQAXrSMTMW3VbPxlsJg8yToSVtBqVj17TAmHmCw9LGA ysAb8HMc1TP3OjQduMaCJSxv9DOuwdgxedNmfQMB7mUyVLw74VcPEe1GHsDvRI7cTS7a4zZ0SUz ah0Xhg/efsYseyXJz2kvQG6mK0Ol91GI4GG8akQoKXAT2zRCdx9XcSe8MVHn6a/vk1pzR/d/IRx nqNlRbVLeiWWOt3XHYCG+uBzK8eX/dyrDC9PA0sLzJ1dcFOL8QxGVyNOJ+6+gHaWN8OjRqp4A6Y KW/MnXYSBsbzN4m1rMcbTrRflS6ib64deCK2jHDo/Q2CWwEu5xDYco0Dqdy+v720x3y1IzZjB3N 3KE4kifKdnvpovW1iGdtw0QIB/PxIlSNpiGNnrZMO161lN/hVb4xw5zXUpW+O3lZ+Xgwzxbrxol 2NUNHhdm3XeEVYw== X-Developer-Key: i=marcandre.lureau@redhat.com; a=openpgp; fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -2 X-Spam_score: -0.3 X-Spam_bar: / X-Spam_report: (-0.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.58, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1785153287457158500 The function calls yield_until_fd_readable() (coroutine_fn) when in coroutine context, and polls with qemu_poll_ns() otherwise. Replace the migration-state proxy check with qemu_in_coroutine(), which directly tests what matters. Fixes: 2da776db4846 ("rdma: core logic") Reviewed-by: Peter Xu Signed-off-by: Marc-Andr=C3=A9 Lureau --- migration/rdma.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/migration/rdma.c b/migration/rdma.c index 3e37a1d44013..438419d18943 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -1348,17 +1348,13 @@ static int qemu_rdma_poll(RDMAContext *rdma, struct= ibv_cq *cq, /* Wait for activity on the completion channel. * Returns 0 on success, none-0 on error. */ -static int qemu_rdma_wait_comp_channel(RDMAContext *rdma, - struct ibv_comp_channel *comp_chann= el) +static int coroutine_mixed_fn +qemu_rdma_wait_comp_channel(RDMAContext *rdma, + struct ibv_comp_channel *comp_channel) { struct rdma_cm_event *cm_event; =20 - /* - * Coroutine doesn't start until migration_fd_process_incoming() - * so don't yield unless we know we're running inside of a coroutine. - */ - if (rdma->migration_started_on_destination && - migration_incoming_get_current()->state =3D=3D MIGRATION_STATUS_AC= TIVE) { + if (qemu_in_coroutine()) { yield_until_fd_readable(comp_channel->fd); } else { /* This is the source side, we're in a separate thread --=20 2.55.0