From nobody Sat Sep 26 21:37:38 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=1787814617; cv=none; d=zohomail.com; s=zohoarc; b=LodRAp+wMFJZ8PD+7Yobi0+Nuk4Ltql8Q0p7kZzw/g2bjl/xJfDL/UiKgbTmX5WaYzhRyCq7mxeDXfwc+Kn3Uy+SQUA3uDQQQ8uHxCLfEeAlubYl9+blEbzsUAscYCi6/xYqLWvJUT14PytoOxq5Gsos0PW1LjbaE34i8w3VxSw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787814617; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=G6DrNHyZFGj9l31Wr7T1mKZMbMd3BAR8wdacwP7mjLQ=; b=Q9lCtWdDJTiHiZ1hN5okz73f2dScxOsi+bpEcn93C61oT6dG7M31SEfGlTLODIHS3g0nIk8ofl8w2/VfPBLioe8gMT8ToAFmFpeAsZXWNC6Ahxsd9+EwGHEo1SpMQNCVJK4QBIHivy0g6tL9y0rB5ADPmopf46Z/QT3IGimhchU= 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 1787814617594857.2350307116806; Thu, 27 Aug 2026 00:10:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wzUFM-0003Hb-3w; Thu, 27 Aug 2026 03:10:00 -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 1wzUFK-0003GM-8g for qemu-devel@nongnu.org; Thu, 27 Aug 2026 03:09:58 -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 1wzUFH-00041x-Va for qemu-devel@nongnu.org; Thu, 27 Aug 2026 03:09:58 -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-202-5xVvPpkdP5mVuiiBYEeZxw-1; Thu, 27 Aug 2026 03:09:47 -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 EE6981835ADB; Thu, 27 Aug 2026 07:09:45 +0000 (UTC) Received: from localhost (headnet05.pony-001.prod.iad2.dc.redhat.com [10.2.32.117]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 23B9B30001A2; Thu, 27 Aug 2026 07:09:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787814592; 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; bh=G6DrNHyZFGj9l31Wr7T1mKZMbMd3BAR8wdacwP7mjLQ=; b=jQ5zL7XF9eUExrW5hAFsEfkun1inMk8mntcVq3mW5eEVNySjtxfkKAKUypvnWvWA5vHt6U FIyTvia3Wbq+Rvr4VNQRDu92reHd1bpgGep8DHNAb/6SXO6t2Y+UqaVjVJUAlkLhhbzueH yl5rzr+ApQRYMuW8ckllD61H7/bfEJU= X-MC-Unique: 5xVvPpkdP5mVuiiBYEeZxw-1 X-Mimecast-MFC-AGG-ID: 5xVvPpkdP5mVuiiBYEeZxw_1787814586 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: akihiko.odaki@gmail.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PATCH] hw/display/virtio-gpu: introduce virtio_gpu_simple_resource_new() Date: Thu, 27 Aug 2026 11:09:41 +0400 Message-ID: <20260827070941.2875721-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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: 1787814618523158500 From: Marc-Andr=C3=A9 Lureau All allocation sites used g_new0() which zero-initializes fields. However share_handle must be SHAREABLE_NONE (-1 on Unix, NULL on Windows) and dmabuf_fd must be -1, not 0. Centralize allocation and field initialization in a single constructor to fix this and reduce code duplication. This fixes -display dbus with virtio-gpu blob resources. The other end is currently receiving qemu fd 0. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/display/virtio-gpu-rutabaga.c | 20 +++++------------- hw/display/virtio-gpu.c | 35 +++++++++++++++++++++----------- include/hw/virtio/virtio-gpu.h | 4 ++++ 3 files changed, 32 insertions(+), 27 deletions(-) diff --git a/hw/display/virtio-gpu-rutabaga.c b/hw/display/virtio-gpu-rutab= aga.c index 041216a10d04..234fe94b178b 100644 --- a/hw/display/virtio-gpu-rutabaga.c +++ b/hw/display/virtio-gpu-rutabaga.c @@ -100,12 +100,8 @@ rutabaga_cmd_create_resource_2d(VirtIOGPU *g, result =3D rutabaga_resource_create_3d(vr->rutabaga, c2d.resource_id, = &rc_3d); CHECK(!result, cmd); =20 - res =3D g_new0(struct virtio_gpu_simple_resource, 1); - res->width =3D c2d.width; - res->height =3D c2d.height; - res->format =3D c2d.format; - res->resource_id =3D c2d.resource_id; - + res =3D virtio_gpu_simple_resource_new(c2d.resource_id, c2d.width, + c2d.height, c2d.format); QTAILQ_INSERT_HEAD(&g->reslist, res, next); } =20 @@ -139,12 +135,8 @@ rutabaga_cmd_create_resource_3d(VirtIOGPU *g, result =3D rutabaga_resource_create_3d(vr->rutabaga, c3d.resource_id, = &rc_3d); CHECK(!result, cmd); =20 - res =3D g_new0(struct virtio_gpu_simple_resource, 1); - res->width =3D c3d.width; - res->height =3D c3d.height; - res->format =3D c3d.format; - res->resource_id =3D c3d.resource_id; - + res =3D virtio_gpu_simple_resource_new(c3d.resource_id, c3d.width, + c3d.height, c3d.format); QTAILQ_INSERT_HEAD(&g->reslist, res, next); } =20 @@ -634,9 +626,7 @@ rutabaga_cmd_resource_create_blob(VirtIOGPU *g, =20 CHECK(cblob.resource_id !=3D 0, cmd); =20 - res =3D g_new0(struct virtio_gpu_simple_resource, 1); - - res->resource_id =3D cblob.resource_id; + res =3D virtio_gpu_simple_resource_new(cblob.resource_id, 0, 0, 0); res->blob_size =3D cblob.size; =20 if (cblob.blob_mem !=3D VIRTIO_GPU_BLOB_MEM_HOST3D) { diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index 55a1c7f80fb8..d5405f0c715f 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -41,6 +41,24 @@ virtio_gpu_find_check_resource(VirtIOGPU *g, uint32_t re= source_id, =20 static void virtio_gpu_reset_bh(void *opaque); =20 +struct virtio_gpu_simple_resource * +virtio_gpu_simple_resource_new(uint32_t resource_id, uint32_t width, + uint32_t height, uint32_t format) +{ + struct virtio_gpu_simple_resource *res =3D + g_new0(struct virtio_gpu_simple_resource, 1); + + res->share_handle =3D SHAREABLE_NONE; + res->dmabuf_fd =3D -1; + + res->resource_id =3D resource_id; + res->width =3D width; + res->height =3D height; + res->format =3D format; + + return res; +} + void virtio_gpu_update_cursor_data(VirtIOGPU *g, struct virtio_gpu_scanout *s, uint32_t resource_id) @@ -259,12 +277,8 @@ static void virtio_gpu_resource_create_2d(VirtIOGPU *g, return; } =20 - res =3D g_new0(struct virtio_gpu_simple_resource, 1); - - res->width =3D c2d.width; - res->height =3D c2d.height; - res->format =3D c2d.format; - res->resource_id =3D c2d.resource_id; + res =3D virtio_gpu_simple_resource_new(c2d.resource_id, c2d.width, + c2d.height, c2d.format); =20 pformat =3D virtio_gpu_get_pixman_format(c2d.format); if (!pformat) { @@ -345,8 +359,7 @@ static void virtio_gpu_resource_create_blob(VirtIOGPU *= g, return; } =20 - res =3D g_new0(struct virtio_gpu_simple_resource, 1); - res->resource_id =3D cblob.resource_id; + res =3D virtio_gpu_simple_resource_new(cblob.resource_id, 0, 0, 0); res->blob_size =3D cblob.size; =20 if (cblob.nr_entries) { @@ -1442,8 +1455,7 @@ static int virtio_gpu_load(QEMUFile *f, void *opaque,= size_t size, return -EINVAL; } =20 - res =3D g_new0(struct virtio_gpu_simple_resource, 1); - res->resource_id =3D resource_id; + res =3D virtio_gpu_simple_resource_new(resource_id, 0, 0, 0); res->width =3D qemu_get_be32(f); res->height =3D qemu_get_be32(f); res->format =3D qemu_get_be32(f); @@ -1555,8 +1567,7 @@ static int virtio_gpu_blob_load(QEMUFile *f, void *op= aque, size_t size, return -EINVAL; } =20 - res =3D g_new0(struct virtio_gpu_simple_resource, 1); - res->resource_id =3D resource_id; + res =3D virtio_gpu_simple_resource_new(resource_id, 0, 0, 0); res->blob_size =3D qemu_get_be32(f); res->iov_cnt =3D qemu_get_be32(f); =20 diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h index 69b5ee2e382f..090719aa0522 100644 --- a/include/hw/virtio/virtio-gpu.h +++ b/include/hw/virtio/virtio-gpu.h @@ -64,6 +64,10 @@ struct virtio_gpu_simple_resource { QTAILQ_ENTRY(virtio_gpu_simple_resource) next; }; =20 +struct virtio_gpu_simple_resource * +virtio_gpu_simple_resource_new(uint32_t resource_id, uint32_t width, + uint32_t height, uint32_t format); + struct virtio_gpu_framebuffer { pixman_format_code_t format; uint32_t width, height; --=20 2.55.0.543.g5ebe2ebe4ea8