From nobody Mon Feb 9 08:56:40 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1591782491; cv=none; d=zohomail.com; s=zohoarc; b=jfPJfIPZYG2nHdUrDVv+3P4LtoTNW+fR8AcIPbQfnwWts161e2gbMq+S7IcO0paGHPins7ZO3/j8d5Tt4lMVd1kB/I9Je6fxN+DTl2q3LsehNoH8XadnWApzGIY6/MTjcGTJiaf7K7enUX9LApHzmNsjZcsCzlL3w3GPD4B0tjk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591782491; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=q/FjwBLKzVq6/82OVquguZUIfN7aJ7ZiA74RDZbhct0=; b=kHacnlytK8tD0S4Ic6whGYiamoPCuQyIAFu+w3CIkNxl5lbWebSqPUlqxfUjuQishOPLgDtsnI6plui5fq7GARNeOB0Tcc23JCHsW+Rzgz+n7rdJ7KPx/oc3incUo3DPLc7zCwLfbBCEFg+Wu6/VKNpOFLinSPojc1aMdAtNdG8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1591782491262771.8084065494603; Wed, 10 Jun 2020 02:48:11 -0700 (PDT) Received: from localhost ([::1]:33156 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jixL8-00079i-1D for importer@patchew.org; Wed, 10 Jun 2020 05:48:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51046) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jixFA-0006O7-8y for qemu-devel@nongnu.org; Wed, 10 Jun 2020 05:42:00 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:28730 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 1jixF9-0001dq-9a for qemu-devel@nongnu.org; Wed, 10 Jun 2020 05:41:59 -0400 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-426-1dUgAqulPo6Ttynuy8ihTg-1; Wed, 10 Jun 2020 05:41:55 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 43EAD8014D4; Wed, 10 Jun 2020 09:41:51 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-113-50.ams2.redhat.com [10.36.113.50]) by smtp.corp.redhat.com (Postfix) with ESMTP id CA4FD10190DE; Wed, 10 Jun 2020 09:41:50 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id E0B1317538; Wed, 10 Jun 2020 11:41:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591782118; 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: in-reply-to:in-reply-to:references:references; bh=q/FjwBLKzVq6/82OVquguZUIfN7aJ7ZiA74RDZbhct0=; b=SwpITIYr7SS9njLUM5SrST66ES6pgNabvr/8BPZ/xA9aXWec/R/nZJh9cqod9EcQmvq1SL RF85RPJy5I39aHE/UBFEjXSHDFbIjlzDWdOwNyNL6f8zjEGGEcGDCnoC22blBVA7Jes+ls bb51/iP6w/dlSC2N0yuR4UcpC4Ce3TY= X-MC-Unique: 1dUgAqulPo6Ttynuy8ihTg-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v7 6/9] acpi: simplify build_isa_devices_aml() Date: Wed, 10 Jun 2020 11:41:28 +0200 Message-Id: <20200610094131.13346-7-kraxel@redhat.com> In-Reply-To: <20200610094131.13346-1-kraxel@redhat.com> References: <20200610094131.13346-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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=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/06/09 23:51:15 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.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_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: Laurent Vivier , Kevin Wolf , Thomas Huth , Eduardo Habkost , qemu-block@nongnu.org, "Michael S. Tsirkin" , Max Reitz , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Gerd Hoffmann , Paolo Bonzini , Igor Mammedov , John Snow , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) x86 machines can have a single ISA bus only. Signed-off-by: Gerd Hoffmann Reviewed-by: Igor Mammedov Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/i386/acpi-build.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 86be45eea17c..c8e47700fc53 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -940,19 +940,14 @@ static void build_hpet_aml(Aml *table) static void build_isa_devices_aml(Aml *table) { bool ambiguous; - - Aml *scope =3D aml_scope("_SB.PCI0.ISA"); Object *obj =3D object_resolve_path_type("", TYPE_ISA_BUS, &ambiguous); + Aml *scope; =20 - if (ambiguous) { - error_report("Multiple ISA busses, unable to define IPMI ACPI data= "); - } else if (!obj) { - error_report("No ISA bus, unable to define IPMI ACPI data"); - } else { - build_acpi_ipmi_devices(scope, BUS(obj), "\\_SB.PCI0.ISA"); - isa_build_aml(ISA_BUS(obj), scope); - } + assert(obj && !ambiguous); =20 + scope =3D aml_scope("_SB.PCI0.ISA"); + build_acpi_ipmi_devices(scope, BUS(obj), "\\_SB.PCI0.ISA"); + isa_build_aml(ISA_BUS(obj), scope); aml_append(table, scope); } =20 --=20 2.18.4