From nobody Sat May 4 10:52:59 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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=1568050503; cv=none; d=zoho.com; s=zohoarc; b=cqcpFHvPsW59HLrb+Gvlg6F7p36Wr+OkQaEzJNPf1aqJcoB2AzGHaQ0/vPqbMBxuobJgDzljklrm+jwZImTgFeNeIiAbK19Q6znSdthhg5YVbxi9Ep7oxJeHI3ntqKoPxSSCXeblrwUOEmojqhN898hvlL8F4+E0xlkFKdWDdms= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568050503; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=iklSIdYBMIc25a/sQ7jg2Dz/CvVOWRxlzLKykqzL7QQ=; b=oHmUUUFonh8zEIiWXvBRbCKOa4g4EsJ90wUoEdhXp7mlB5XUoHqakVLIV2bWxJvZZqR+Icnn/kCFJm6T6ZPXk4ICqHLbxf7cmPQXh85uWF/9C0K70Pf2gsb+j/ESsUOmD5Qyw4DLhg+DlpliLmfX8NSlo59n7UB1GhY9r1dWuTg= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.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 1568050503406259.854978320016; Mon, 9 Sep 2019 10:35:03 -0700 (PDT) Received: from localhost ([::1]:59558 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7NZ8-0002dW-B8 for importer@patchew.org; Mon, 09 Sep 2019 13:35:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49642) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7NYH-0001sY-Sy for qemu-devel@nongnu.org; Mon, 09 Sep 2019 13:34:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7NYG-0006by-D7 for qemu-devel@nongnu.org; Mon, 09 Sep 2019 13:34:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51756) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i7NYG-0006bQ-80 for qemu-devel@nongnu.org; Mon, 09 Sep 2019 13:34:08 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E8E4B8980EE; Mon, 9 Sep 2019 17:34:06 +0000 (UTC) Received: from worklaptop.redhat.com (ovpn-122-2.rdu2.redhat.com [10.10.122.2]) by smtp.corp.redhat.com (Postfix) with ESMTP id 60E265D6B7; Mon, 9 Sep 2019 17:34:01 +0000 (UTC) From: Cole Robinson To: qemu-devel@nongnu.org Date: Mon, 9 Sep 2019 13:34:10 -0400 Message-Id: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.67]); Mon, 09 Sep 2019 17:34:06 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] hw/i386: Move CONFIG_ACPI_PCI to CONFIG_PC 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: Paolo Bonzini , Cole Robinson , richardw.yang@linux.intel.com, "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" CONFIG_ACPI_PCI is a hard requirement of acpi-build.c, which is built unconditionally for x86 target. Putting it in default-configs/ suggests that it can be easily disabled, which isn't true. Relocate the symbol with the other acpi-build.c requirements, under 'config PC'. This is similar to what is done for the arm 'virt' machine type and CONFIG_ACPI_PCI Signed-off-by: Cole Robinson --- default-configs/i386-softmmu.mak | 1 - hw/i386/Kconfig | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index cd5ea391e8..ba3fb3ff50 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -25,4 +25,3 @@ CONFIG_ISAPC=3Dy CONFIG_I440FX=3Dy CONFIG_Q35=3Dy -CONFIG_ACPI_PCI=3Dy diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index 6350438036..c7a9d6315c 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -29,6 +29,7 @@ config PC select MC146818RTC # For ACPI builder: select SERIAL_ISA + select ACPI_PCI select ACPI_VMGENID select VIRTIO_PMEM_SUPPORTED =20 --=20 2.21.0