From nobody Sat Sep 26 21:37:38 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1787903634; cv=none; d=zohomail.com; s=zohoarc; b=UfshhzF8+rwO1Spp80DEpeh5iB/oH9GOsbc8vlyMWDJKuH12XyKU+vIW3cH0dNwldHIzvKvuODccILgu1Wr04eNDKFlpWdEoXipKOnl+bRojkR5izfHa5sFJxtjZ7Uns74a3v71pMM/vmyYs0StDuuWqeEyeI1nyKPlBt3wtx8g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787903634; 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:Reply-To:Reply-To:Sender:Subject:Subject:To:To:Message-Id; bh=xkDd4wCNMtKFs+b4ZdS3TviUinobjNMqCI6a7EfVAjs=; b=glemdGLwn/eMRdCCuyQbJNTM05r2yW21QyalIkZZg08pMwDSzNrLB7zHHsA4GsxA7EP7lQsIRxIym1qjXIcX0BNnWIOvV1hZBkoH4DXYc4M3vGDbDxHYFncKdEdfEShCtAw+t0Au/ZvAF7YabrrAzz+rRCD1nYLbagBVWINh0ZA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1787903634719257.57541323982787; Fri, 28 Aug 2026 00:53:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wzrOt-0000kg-UG; Fri, 28 Aug 2026 03:53:23 -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 1wzrOs-0000kY-Kj for qemu-devel@nongnu.org; Fri, 28 Aug 2026 03:53:22 -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 1wzrOq-0000ba-BB for qemu-devel@nongnu.org; Fri, 28 Aug 2026 03:53:22 -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-153-f6kBxBXLOjSIcnobj5uZaQ-1; Fri, 28 Aug 2026 03:53:13 -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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 893BD1955DB0; Fri, 28 Aug 2026 07:53:12 +0000 (UTC) Received: from localhost (headnet05.pony-001.prod.iad2.dc.redhat.com [10.2.32.117]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 7741A18005B0; Fri, 28 Aug 2026 07:53:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787903598; 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=xkDd4wCNMtKFs+b4ZdS3TviUinobjNMqCI6a7EfVAjs=; b=Hz/ny30ROlqyDMHt7BttlArfscBSDsKAIMQLonQWxjFNbGlgqlp/x5w5b5yp8m4L4ckxKU zC1KDnPTYy0YmZsDSSJarwWCyNAibr6ntS+QSpzARCQaz+f11J+mxvA4x396hNJkFx4eTr pg70cY70RwJZkBczAzSuRMlPWAw4XcI= X-MC-Unique: f6kBxBXLOjSIcnobj5uZaQ-1 X-Mimecast-MFC-AGG-ID: f6kBxBXLOjSIcnobj5uZaQ_1787903592 To: qemu-devel@nongnu.org Cc: akihiko.odaki@gmail.com, philmd@oss.qualcomm.com, berrange@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PATCH v2] hw/display/virtio-gpu: introduce virtio_gpu_{simple, virgl}_resource_new() Date: Fri, 28 Aug 2026 11:53:08 +0400 Message-ID: <20260828075308.3882813-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.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: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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_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: , Reply-to: marcandre.lureau@redhat.com From: marcandre.lureau--- via qemu development Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1787903635892158500 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 new constructors 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 --- v2: add virgl_gpu_virgl_resource_new() --- hw/display/virtio-gpu-rutabaga.c | 20 +++++------------- hw/display/virtio-gpu-virgl.c | 34 ++++++++++++++++++------------- hw/display/virtio-gpu.c | 35 +++++++++++++++++++++----------- include/hw/virtio/virtio-gpu.h | 4 ++++ 4 files changed, 52 insertions(+), 41 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-virgl.c b/hw/display/virtio-gpu-virgl.c index 9bda572426b2..d32801c3893a 100644 --- a/hw/display/virtio-gpu-virgl.c +++ b/hw/display/virtio-gpu-virgl.c @@ -309,6 +309,23 @@ virtio_gpu_virgl_unmap_resource_blob(VirtIOGPU *g, } #endif =20 +static struct virtio_gpu_virgl_resource * +virtio_gpu_virgl_resource_new(uint32_t resource_id, uint32_t width, + uint32_t height, uint32_t format) +{ + struct virtio_gpu_virgl_resource *res =3D g_new0(struct virtio_gpu_vir= gl_resource, 1); + + res->base.share_handle =3D SHAREABLE_NONE; + res->base.dmabuf_fd =3D -1; + + res->base.resource_id =3D resource_id; + res->base.width =3D width; + res->base.height =3D height; + res->base.format =3D format; + + return res; +} + static void virgl_cmd_create_resource_2d(VirtIOGPU *g, struct virtio_gpu_ctrl_command *c= md) { @@ -335,12 +352,7 @@ static void virgl_cmd_create_resource_2d(VirtIOGPU *g, return; } =20 - res =3D g_new0(struct virtio_gpu_virgl_resource, 1); - res->base.width =3D c2d.width; - res->base.height =3D c2d.height; - res->base.format =3D c2d.format; - res->base.resource_id =3D c2d.resource_id; - res->base.dmabuf_fd =3D -1; + res =3D virtio_gpu_virgl_resource_new(c2d.resource_id, c2d.width, c2d.= height, c2d.format); QTAILQ_INSERT_HEAD(&g->reslist, &res->base, next); =20 args.handle =3D c2d.resource_id; @@ -383,12 +395,7 @@ static void virgl_cmd_create_resource_3d(VirtIOGPU *g, return; } =20 - res =3D g_new0(struct virtio_gpu_virgl_resource, 1); - res->base.width =3D c3d.width; - res->base.height =3D c3d.height; - res->base.format =3D c3d.format; - res->base.resource_id =3D c3d.resource_id; - res->base.dmabuf_fd =3D -1; + res =3D virtio_gpu_virgl_resource_new(c3d.resource_id, c3d.width, c3d.= height, c3d.format); QTAILQ_INSERT_HEAD(&g->reslist, &res->base, next); =20 args.handle =3D c3d.resource_id; @@ -853,8 +860,7 @@ static void virgl_cmd_resource_create_blob(VirtIOGPU *g, return; } =20 - res =3D g_new0(struct virtio_gpu_virgl_resource, 1); - res->base.resource_id =3D cblob.resource_id; + res =3D virtio_gpu_virgl_resource_new(cblob.resource_id, 0, 0, 0); res->base.blob_size =3D cblob.size; res->base.dmabuf_fd =3D -1; =20 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