From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 88C01CFD375 for ; Tue, 25 Nov 2025 02:37:12 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vNiv8-0003qJ-EE; Mon, 24 Nov 2025 21:36:46 -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 1vNiv6-0003pB-SL for qemu-devel@nongnu.org; Mon, 24 Nov 2025 21:36:44 -0500 Received: from sender3-pp-f112.zoho.com ([136.143.184.112]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vNiv4-0001En-Ut for qemu-devel@nongnu.org; Mon, 24 Nov 2025 21:36:44 -0500 ARC-Seal: i=1; a=rsa-sha256; t=1764038190; cv=none; d=zohomail.com; s=zohoarc; b=UQZxUUMeeJNGHYtpslAtNJdJP+sM3dYkf0Ic/iIfJzcjs3nIaq4s5q6t1OVN3SoAItVWWA8UqA4CV+1+6Q10hO22eDwpzPc/7F31ukA2U1+j5rJP+r0JlZJO9wsKl26ntPbBfuZfnWiVHn4u215KNlx7L5qk1qcKRtkk1BnO4bo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764038190; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=p/ZNWLrKtd35wllldKwD3newHkQzWDosziXuoHDiTy4=; b=bqizJ6gkvkX3/nsv+IuIsTr0feWdyIFp5wDQRvppXOxF4+Vyp1khBUoxnqrW0aT93zyp3uLNYgxpkVLhvaFUjgikzuj5JLe/QICaZmYRhMosYrSSJuLb4CEmnedbLQgZX4i+D1BTr6Zb0mXN5cNUug36CWC8FldBWygSo02lXZg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=dmitry.osipenko@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1764038190; s=zohomail; d=collabora.com; i=dmitry.osipenko@collabora.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Message-Id:Reply-To; bh=p/ZNWLrKtd35wllldKwD3newHkQzWDosziXuoHDiTy4=; b=Lx3lJrQ9yhMOnCsbBWCU0S5RhjP0OhM6vOberXLLb+IzF8wHR+3Zz3tM2BaBi2Vn iDtFDe+hMAFFs1JubE7hgVT76dmXPaPvy1cVR4kBdgwzJrB6mfQlnbNZBtGyUVHxgfj NfCfz2+FlDQWx/1kQqcNCnmKJNnZoGQkr9RjBnc4= Received: by mx.zohomail.com with SMTPS id 1764038189061382.10479374188844; Mon, 24 Nov 2025 18:36:29 -0800 (PST) From: Dmitry Osipenko To: Akihiko Odaki , Huang Rui , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Pierre-Eric Pelloux-Prayer , "Michael S . Tsirkin" , Paolo Bonzini , Yiwei Zhang , Sergio Lopez Pascual Cc: Gert Wollny , qemu-devel@nongnu.org, Gurchetan Singh , Alyssa Ross , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Alex Deucher , Stefano Stabellini , =?UTF-8?q?Christian=20K=C3=B6nig?= , Xenia Ragiadakou , Honglei Huang , Julia Zhang , Chen Jiqian , Rob Clark , Robert Beckett Subject: [RFC PATCH v4 6/7] virtio-gpu: Make virtio_gpu_virgl_init() return -1 on error Date: Tue, 25 Nov 2025 05:35:16 +0300 Message-ID: <20251125023517.177714-7-dmitry.osipenko@collabora.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251125023517.177714-1-dmitry.osipenko@collabora.com> References: <20251125023517.177714-1-dmitry.osipenko@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-ZohoMailClient: External Received-SPF: pass client-ip=136.143.184.112; envelope-from=dmitry.osipenko@collabora.com; helo=sender3-pp-f112.zoho.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_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Make virtio_gpu_virgl_init() return -1 on error to make it consistent with virtio_gpu_virgl_reset() in regards to error handling codding style, adhering to QEMU's devel/style recommendations. Signed-off-by: Dmitry Osipenko --- hw/display/virtio-gpu-gl.c | 2 +- hw/display/virtio-gpu-virgl.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/display/virtio-gpu-gl.c b/hw/display/virtio-gpu-gl.c index bca7d489c1e3..d65da4863923 100644 --- a/hw/display/virtio-gpu-gl.c +++ b/hw/display/virtio-gpu-gl.c @@ -78,7 +78,7 @@ static void virtio_gpu_gl_handle_ctrl(VirtIODevice *vdev, VirtQueue *vq) } /* fallthrough */ case RS_START: - if (virtio_gpu_virgl_init(g)) { + if (virtio_gpu_virgl_init(g) < 0) { gl->renderer_state = RS_INIT_FAILED; return; } diff --git a/hw/display/virtio-gpu-virgl.c b/hw/display/virtio-gpu-virgl.c index 91951c3ffb0a..9b36b378c2fd 100644 --- a/hw/display/virtio-gpu-virgl.c +++ b/hw/display/virtio-gpu-virgl.c @@ -1371,7 +1371,7 @@ int virtio_gpu_virgl_init(VirtIOGPU *g) * Async-fence was bugged in virglrenderer versions <= 1.1.1. */ error_report("drm requires egl display and virglrenderer >= 1.2.0"); - return -EINVAL; + return -1; } } #endif @@ -1379,7 +1379,7 @@ int virtio_gpu_virgl_init(VirtIOGPU *g) ret = virgl_renderer_init(g, flags, &virtio_gpu_3d_cbs); if (ret != 0) { error_report("virgl could not be initialized: %d", ret); - return ret; + return -1; } gl->fence_poll = timer_new_ms(QEMU_CLOCK_VIRTUAL, -- 2.51.1