From nobody Tue Nov 26 17:36:32 2024 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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1706543206; cv=none; d=zohomail.com; s=zohoarc; b=Uf6FKPmV4WYq40st5sKOn3wN8GjcwFgLCXH5U/iYp925JQ5huQs+69HSYv7SpbemsA+vBKsmLuq34/lAGIDhwkseJv/JHvrJH3XMQSaIT31Vcr427OCct3l538U8vzAxl4hgzMZYfQf2HJgBFyu7s11ruP5YSFRAfmfOoptqFQY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1706543206; 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=OO1Xd496GZU9VnfGz8L9/dfv4mIbaz4PPUfJmAWvi4E=; b=mgGTcO55BWrELAJDmqbvvHj/GARAMJJBgSRU+mYE6cqG7pXpFBVPhXgn6bWXzz9rAIyhmL8tWy5AWn+g+u2paJ1G7MqSKdm/cl3oqJeOU9hc28duIStMIzJT2n+37x8kWEGn0y7xSEAyCuimqGXFrVOmpc/F1C8Ie+VfacdGjE0= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1706543206856626.8632843741404; Mon, 29 Jan 2024 07:46:46 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rUTqF-0000Np-3q; Mon, 29 Jan 2024 10:46:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rUTqD-0000N5-7x for qemu-devel@nongnu.org; Mon, 29 Jan 2024 10:46:33 -0500 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rUTqB-0005Eh-4q for qemu-devel@nongnu.org; Mon, 29 Jan 2024 10:46:32 -0500 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-40e80046246so15777095e9.1 for ; Mon, 29 Jan 2024 07:46:30 -0800 (PST) Received: from localhost.localdomain (adsl-101.109.242.224.tellas.gr. [109.242.224.101]) by smtp.gmail.com with ESMTPSA id h15-20020a05600016cf00b0033aedfc5581sm2852608wrf.32.2024.01.29.07.46.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jan 2024 07:46:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1706543189; x=1707147989; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=OO1Xd496GZU9VnfGz8L9/dfv4mIbaz4PPUfJmAWvi4E=; b=XCNw98moHjT8fWX3O1Olh0L3dWS/IRlLm//uLtt37asDAOFKd7eNSm3cB1DJUT3wnH smZI/d6y76HErxFm5OfvylwjaguEkZVXpXuTVNHHueWBbNmdtTfmUVSWtgU/zOlK0NOL CaXHRc05QRMpmwh6NxxPeM1v15gs2GE324toeo0hnNjm2foZT+hGC016MqdMNi+lA+CE kIsolTi1IN0WJybt11VlGw5ndW4bd6kNzfxzSRdh5XBXhx42mlWkVZsxXN23e44OizEU R3uiI8zTN1wtD1EMm6INDmYx6xievFVHyItnoZSK1JnY9LO8bqh5LS0xfpzNHyc05U5R KlNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706543189; x=1707147989; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OO1Xd496GZU9VnfGz8L9/dfv4mIbaz4PPUfJmAWvi4E=; b=CNuxS1RjcEizLPxrMQ8MPFVCFf9nFC6SQsse3jEvT+e8w68zdRn9yEfBFRh/HP4oUp zXjlVZUG4TZydR22GWbZmdZYY5/a6DCkeIJdkvXL0aaSeqFEHWKuxgn+dH+9kIc/QipP uOcIOGn4HiReRPIQ7ENiBCak48XCSUkct9NkPDsSzLnGt3E1LKU1+GaeKIJ/kOT5jjja sVp5xHV6WH03e3wYEHhzvjabXNDM7nEMKB8I5Tc0kxpp7646AZp68TtQcjh480ETYitf i//6b2vmbIC7jK65KmTu5A7MbhVbDz5wvaR7yuLaMjUiDIr0Yr9BaspkWuK8LBr/cna5 ntwQ== X-Gm-Message-State: AOJu0YyA7teKgKaU914lNf81y73pi01v2I3XyCJM0uyuxU6PyHP8tfbP qGAIQZbkyiVzcsNKkvUBPXEdCgFtBKz2QvQRv7M10J2L4YNPhcXeWvBI2q1p1lUV+yu7chAAyal N6uM= X-Google-Smtp-Source: AGHT+IEbhvq46WfB26KVKDoPqwu7uC6IFLXmRvAJVSOMGlQWMYSorr/E+rcAzgUP67285OgCXI9Iaw== X-Received: by 2002:a05:600c:5108:b0:40e:f14c:e1a6 with SMTP id o8-20020a05600c510800b0040ef14ce1a6mr3889537wms.6.1706543189201; Mon, 29 Jan 2024 07:46:29 -0800 (PST) From: Manos Pitsidianakis To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann , "Michael S. Tsirkin" , Gurchetan Singh , Alyssa Ross Subject: [PATCH v2 2/3] virtio-gpu.c: add resource_destroy class method Date: Mon, 29 Jan 2024 17:45:24 +0200 Message-Id: <78b15e8f7e2af529aeaed2e6ef37efa508cf405f.1706542958.git.manos.pitsidianakis@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=manos.pitsidianakis@linaro.org; helo=mail-wm1-x32a.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: 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 @linaro.org) X-ZM-MESSAGEID: 1706543208755100001 Content-Type: text/plain; charset="utf-8" When destroying/unrefing resources, devices such as virtio-gpu-rutabaga need to do their own bookkeeping (free rutabaga resources that are associated with the virtio_gpu_simple_resource). This commit adds a class method so that virtio-gpu-rutabaga can override it in the next commit. Signed-off-by: Manos Pitsidianakis Reviewed-by: Marc-Andr=C3=A9 Lureau --- include/hw/virtio/virtio-gpu.h | 3 +++ hw/display/virtio-gpu.c | 25 ++++++++++++++++++++++--- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h index 584ba2ed73..b28e7ef0d2 100644 --- a/include/hw/virtio/virtio-gpu.h +++ b/include/hw/virtio/virtio-gpu.h @@ -219,6 +219,9 @@ struct VirtIOGPUClass { void (*update_cursor_data)(VirtIOGPU *g, struct virtio_gpu_scanout *s, uint32_t resource_id); + void (*resource_destroy)(VirtIOGPU *g, + struct virtio_gpu_simple_resource *res, + Error **errp); }; =20 struct VirtIOGPUGL { diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index 2b73ae585b..1c1ee230b3 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -402,7 +402,8 @@ static void virtio_gpu_disable_scanout(VirtIOGPU *g, in= t scanout_id) } =20 static void virtio_gpu_resource_destroy(VirtIOGPU *g, - struct virtio_gpu_simple_resource = *res) + struct virtio_gpu_simple_resource = *res, + Error **errp) { int i; =20 @@ -438,7 +439,11 @@ static void virtio_gpu_resource_unref(VirtIOGPU *g, cmd->error =3D VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID; return; } - virtio_gpu_resource_destroy(g, res); + /* + * virtio_gpu_resource_destroy does not set any errors, so pass a NULL= errp + * to ignore them. + */ + virtio_gpu_resource_destroy(g, res, NULL); } =20 static void virtio_gpu_transfer_to_host_2d(VirtIOGPU *g, @@ -1488,11 +1493,24 @@ static void virtio_gpu_device_unrealize(DeviceState= *qdev) static void virtio_gpu_reset_bh(void *opaque) { VirtIOGPU *g =3D VIRTIO_GPU(opaque); + VirtIOGPUClass *vgc =3D VIRTIO_GPU_GET_CLASS(g); struct virtio_gpu_simple_resource *res, *tmp; + uint32_t resource_id; + Error *local_err =3D NULL; int i =3D 0; =20 QTAILQ_FOREACH_SAFE(res, &g->reslist, next, tmp) { - virtio_gpu_resource_destroy(g, res); + resource_id =3D res->resource_id; + vgc->resource_destroy(g, res, &local_err); + if (local_err) { + error_append_hint(&local_err, "%s: %s resource_destroy" + "for resource_id =3D %"PRIu32" failed.\n", + __func__, object_get_typename(OBJECT(g)), + resource_id); + /* error_report_err frees the error object for us */ + error_report_err(local_err); + local_err =3D NULL; + } } =20 for (i =3D 0; i < g->parent_obj.conf.max_outputs; i++) { @@ -1632,6 +1650,7 @@ static void virtio_gpu_class_init(ObjectClass *klass,= void *data) vgc->handle_ctrl =3D virtio_gpu_handle_ctrl; vgc->process_cmd =3D virtio_gpu_simple_process_cmd; vgc->update_cursor_data =3D virtio_gpu_update_cursor_data; + vgc->resource_destroy =3D virtio_gpu_resource_destroy; vgbc->gl_flushed =3D virtio_gpu_handle_gl_flushed; =20 vdc->realize =3D virtio_gpu_device_realize; --=20 =CE=B3=CE=B1=E1=BF=96=CE=B1 =CF=80=CF=85=CF=81=CE=AF =CE=BC=CE=B9=CF=87=CE= =B8=CE=AE=CF=84=CF=89