From nobody Fri Nov 14 16:52:19 2025 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=1588678860; cv=none; d=zohomail.com; s=zohoarc; b=QnmKqEWOUBlWwrBVJiJXFj1TpmlR/Gc/Bmejn15eBP8n/k1Vhg7i9xGO/TGPcrgALTysLZoQd41lV5wwSw0ZE6ufiPwe86r5BRt5ZZbA2hKOE/5J1L+YBBC0PMGgiJo67LbNNDwaJhaZZApXRcRTdmPU5IZd5p7ju7WGvHak1xU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588678860; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=I0qh2xPxJYLmXMo2QOX76vG75M0qxBOZz6gOO+mWZOY=; b=EYDPqEIcW7lxTRMMOt/r/PyeoMk9cSfNTg4Kd2Exlg+4YqffxbDSqD+xv4ojEKoGCXUPFROpUevK1WyLK8mBcLI8y717c8YLuu3XmA1wVOku4VoTWw0qXtrw9ZHI1ijxPYqNt/FBN+gf9GW6Y8ZPOPxT5S/zrKjP1gk1E8t24Io= 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 1588678860812793.7346332731456; Tue, 5 May 2020 04:41:00 -0700 (PDT) Received: from localhost ([::1]:56874 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jVvwZ-0007wl-HT for importer@patchew.org; Tue, 05 May 2020 07:40:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48110) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jVvuv-00064b-NO for qemu-devel@nongnu.org; Tue, 05 May 2020 07:39:17 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:44711 helo=us-smtp-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 1jVvuv-0003Zh-2b for qemu-devel@nongnu.org; Tue, 05 May 2020 07:39:17 -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-409-oWeQKbWQPiq0b-e53CTD8g-1; Tue, 05 May 2020 07:39:13 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D0E66800D24; Tue, 5 May 2020 11:39:11 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-113-193.ams2.redhat.com [10.36.113.193]) by smtp.corp.redhat.com (Postfix) with ESMTP id 23B007053E; Tue, 5 May 2020 11:39:01 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 1614F9D56; Tue, 5 May 2020 13:38:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588678756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=I0qh2xPxJYLmXMo2QOX76vG75M0qxBOZz6gOO+mWZOY=; b=eE/uiHKVZfifVsyEuvX6Csr3QhcxlybWegrLdHYc051FYP7RLEQOnE+L6fvnS8C8ZqPAF+ FZ0/nAJMNtwo3JQxERzk/0SFj2T5gOUyXG4yTNi6qaQRXdGfn/Lr8Pj/zh8X/7kiH9zxcf 1LCSGgrQh/TDrGB1fL67flcKFK6gvqY= X-MC-Unique: oWeQKbWQPiq0b-e53CTD8g-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v4 11/13] acpi: simplify build_isa_devices_aml() Date: Tue, 5 May 2020 13:38:41 +0200 Message-Id: <20200505113843.22012-12-kraxel@redhat.com> In-Reply-To: <20200505113843.22012-1-kraxel@redhat.com> References: <20200505113843.22012-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=207.211.31.120; envelope-from=kraxel@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/05 00:37:38 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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_H2=-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 , Paolo Bonzini , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , 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) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 cb3913d2ee76..1922868f3401 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1061,19 +1061,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