From patchwork Tue Jul 21 14:02:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 11675721 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0619014E3 for ; Tue, 21 Jul 2020 14:03:35 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id D22302064B for ; Tue, 21 Jul 2020 14:03:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="bnBlymm+" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D22302064B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:48498 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jxsrm-00032G-1z for patchwork-qemu-devel@patchwork.kernel.org; Tue, 21 Jul 2020 10:03:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58526) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jxsrA-0001m6-68 for qemu-devel@nongnu.org; Tue, 21 Jul 2020 10:02:56 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:52656 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jxsr7-0008Rw-H1 for qemu-devel@nongnu.org; Tue, 21 Jul 2020 10:02:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595340172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=OWUSor2jFW3rAfjSO9X1iI6crPRAL0ej6N8zklWvu7k=; b=bnBlymm+k46FGjIFAm2CVTS2M9P+IA5czShfu/eZzfCfZ9jin0bggvJrdrXmR2efBOyjQo cRE48cPAsfpznoglwkM4ia4ndUhVh5wIl1sq93hGkqdiramrQ/flokfJ37OBzVt0pCDqKl HLwFJVMefni/1i6n7jxNBZnlY8Ea7z4= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-144-e4XJndb_PciJjG-zT0JAuQ-1; Tue, 21 Jul 2020 10:02:50 -0400 X-MC-Unique: e4XJndb_PciJjG-zT0JAuQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C2532102C7F4 for ; Tue, 21 Jul 2020 14:02:49 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-115-89.ams2.redhat.com [10.36.115.89]) by smtp.corp.redhat.com (Postfix) with ESMTP id C0C0687B05; Tue, 21 Jul 2020 14:02:46 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 03CF59D05; Tue, 21 Jul 2020 16:02:46 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 3/3] module: ignore NULL type Date: Tue, 21 Jul 2020 16:02:45 +0200 Message-Id: <20200721140245.14634-4-kraxel@redhat.com> In-Reply-To: <20200721140245.14634-1-kraxel@redhat.com> References: <20200721140245.14634-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=205.139.110.61; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/21 01:26:46 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, 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=-1, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Just return in case module_load_qom_one(NULL) is called. vga_interface_available() can do that. Signed-off-by: Gerd Hoffmann Message-Id: <20200720100352.2477-3-kraxel@redhat.com> --- util/module.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/util/module.c b/util/module.c index 90e9bd42c6c7..0ab00851f0a4 100644 --- a/util/module.c +++ b/util/module.c @@ -275,6 +275,9 @@ void module_load_qom_one(const char *type) { int i; + if (!type) { + return; + } if (module_loaded_qom_all) { return; }