From nobody Sat Dec 28 10:02:55 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1721043915; cv=none; d=zohomail.com; s=zohoarc; b=VWp5MuiDK+FlRMcmDeb/xITbHcmvbUNz0Rzi73BUaDhWOnuHi5HgDMGLteU7HKjYh5VRAldMIOBavn0ZNfylGGqAbSQa5gu7awwM29AlG2X3S8Yj9quE/205SkRIIEZccVtGn4sJiOBUuzrnsWrt1cdYmCvZaHNRDVCy0NPlMsU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1721043915; 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=I4MRZV9iiQREmx5w+sdeHz4sn0ouKabcvNq9Op16iz0=; b=L59TtXAUita8A6KzDlnU4pjotnOReq+4Prj6TL0xi82AScClsh/WHmJ6H2HuCKvq9e5l8cTj8MTfW+R+m8ILSJmPyVaoNek/+1MUEndENnmUHzJ0hvCdndrlUpmqOXha14ThN5i/3YVS583HgBoieT37rutQfAly6QXohV9pYUs= 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+importer2=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 1721043915279322.2902579079214; Mon, 15 Jul 2024 04:45:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sTK8K-0006zG-2p; Mon, 15 Jul 2024 07:44:45 -0400 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 1sTK8D-0006wa-Tb for qemu-devel@nongnu.org; Mon, 15 Jul 2024 07:44:38 -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 1sTK8A-0004h0-8U for qemu-devel@nongnu.org; Mon, 15 Jul 2024 07:44:35 -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-301-LTgUdP_mO5WgiVStTKnpRQ-1; Mon, 15 Jul 2024 07:44:31 -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 6BEFB195421A for ; Mon, 15 Jul 2024 11:44:30 +0000 (UTC) Received: from localhost (unknown [10.39.208.10]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id DD17F1955DC7; Mon, 15 Jul 2024 11:44:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1721043872; 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=I4MRZV9iiQREmx5w+sdeHz4sn0ouKabcvNq9Op16iz0=; b=iFMgtoIOInV56rhQ8eBME3QzRV/e0ASJUR7UPmC6RF/Z2AMdOSc7lGTDGv+edo5OcJPoDY 6Ujf9s0kw5BpZpnXOxXe81NHCB4TEtnQEOEQTHNQigqmVv85EjkH0h3Qb4koOTO11yhK/P U6kCdrSbZe5S1BJ/ayYPeHvNlWfUur8= X-MC-Unique: LTgUdP_mO5WgiVStTKnpRQ-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini Subject: [PATCH] vl: fix "type is NULL" in -vga help Date: Mon, 15 Jul 2024 15:44:20 +0400 Message-ID: <20240715114420.2062870-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.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+importer2=patchew.org@nongnu.org; helo=lists.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: -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_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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1721043915979116300 From: Marc-Andr=C3=A9 Lureau Don't pass NULL to module_object_class_by_name(), when the interface is unavailable. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- system/vl.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/system/vl.c b/system/vl.c index bdd2f6ecf6..9e8f16f155 100644 --- a/system/vl.c +++ b/system/vl.c @@ -1000,9 +1000,16 @@ static bool vga_interface_available(VGAInterfaceType= t) const VGAInterfaceInfo *ti =3D &vga_interfaces[t]; =20 assert(t < VGA_TYPE_MAX); - return !ti->class_names[0] || - module_object_class_by_name(ti->class_names[0]) || - module_object_class_by_name(ti->class_names[1]); + + if (!ti->class_names[0] || module_object_class_by_name(ti->class_names= [0])) { + return true; + } + + if (ti->class_names[1] && module_object_class_by_name(ti->class_names[= 1])) { + return true; + } + + return false; } =20 static const char * --=20 2.45.2.827.g557ae147e6