From nobody Thu May 16 04:13:12 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1713179763; cv=none; d=zohomail.com; s=zohoarc; b=BqbHNsSufwtAvIjFoc8hT5WO36tL0r6hwtbwZsKl11RkcJI2wuyhhZqjlYYPPYc2ViC1Gg2l2ZHasxJOafyZT55xiXedJzb/aXseIuiLckOu9RwEhNlW99qaX18DIyzC14CMOpU+jyQ9wVnJ+L4viWvxioWVN745FBJDigKwHcw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1713179763; 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=oGN80y/NYg6+61c3CmljsuoAsD/BXBOInAqtcGNCyKc=; b=QpHXR+AAkBWK/q2wGAfOyr0TCgLiRBnX/h4Sfch4NfhvsVAP9MD9erJ98TCf3NRgiDBHRVVhcc8dfKmS+J+YIOYzWeHJkk3XewBZ5IZ9/dv8DUtQM2kcARxkNybyv25EalYuz/F7A55zpeoLSF1zGKw7K6PrxlgpXyGILChrfUc= 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 1713179763025254.21871634852937; Mon, 15 Apr 2024 04:16:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rwKJL-00049K-33; Mon, 15 Apr 2024 07:15:43 -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 1rwKJG-00045A-FK for qemu-devel@nongnu.org; Mon, 15 Apr 2024 07:15:40 -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 1rwKJD-0000Rd-7Y for qemu-devel@nongnu.org; Mon, 15 Apr 2024 07:15:37 -0400 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-382-7M_ww1QAPKOQXIKldTTzkg-1; Mon, 15 Apr 2024 07:15:31 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2DBEC1C2CBE2 for ; Mon, 15 Apr 2024 11:15:31 +0000 (UTC) Received: from localhost (unknown [10.39.208.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id ED5FB2026962; Mon, 15 Apr 2024 11:15:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1713179733; 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=oGN80y/NYg6+61c3CmljsuoAsD/BXBOInAqtcGNCyKc=; b=hhwm4C/jKvxTANrvulIX97BD3k495rBjwnGlU8gYQgGjbDHQ1y/Hfki+uflQlCp0q58fRt 2/cdDpei0f9t36oTyiLvC9bJwL7b4WEeAkJg5ZrkksrBFiaiGgTcLqrGAA0dZUyv8Axwp0 HTtStjNCNR7wS0ldeUEIBPaKK8QV2dE= X-MC-Unique: 7M_ww1QAPKOQXIKldTTzkg-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 Apr 2024 15:15:23 +0400 Message-ID: <20240415111523.2732691-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.11.54.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=lists.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: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.185, 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_H4=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1713179765077100003 From: Marc-Andr=C3=A9 Lureau Don't pass NULL to module_object_class_by_name(). Signed-off-by: Marc-Andr=C3=A9 Lureau --- system/vl.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/system/vl.c b/system/vl.c index c644222982..23e1cb016f 100644 --- a/system/vl.c +++ b/system/vl.c @@ -992,9 +992,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.41.0.28.gd7d8841f67