From patchwork Mon Sep 9 17:34:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 173415 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp4667127ilq; Mon, 9 Sep 2019 10:34:25 -0700 (PDT) X-Google-Smtp-Source: APXvYqyO3aL/KVDBIr/eGYXVbGdRbFnrUMeMPYPzdMUK1RCu7mq8cXqB3k3scx7iqz7VDt5JVanZ X-Received: by 2002:ac8:2732:: with SMTP id g47mr17806462qtg.221.1568050465154; Mon, 09 Sep 2019 10:34:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568050465; cv=none; d=google.com; s=arc-20160816; b=UycRk5rrAaNL8dNOIucLC3x6UaSxComJnve3nCPjsuPjeLlEkGBatIWiwpuTVShoPZ 7cnzjJF1/JLeyvjJIjUFh4Q0y+0T6jRk+qnyItbStCquqr2flqIvGsJ4teCbL4D7X2Xn rla2je3jeBNax1aTwcOvKP8CwQPVmyR+ddeZ5+58jtaKzan5fuPGwOl2VlGluoxR5sri b7L8mf0xCKwmXMMH6t+6L70ZHck8L0tAO6ZsSwiN+BEwysIpWTwGUfWwfrlE7Cdhn9pP 4Pf5tRHaWS61NakaiflK5hOOkacW8sjzglAuUoE+EgkaKqHT0IOxGpWOpYRFBKxbEyPQ CeeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:message-id:date:to:from; bh=iklSIdYBMIc25a/sQ7jg2Dz/CvVOWRxlzLKykqzL7QQ=; b=RYWHrkgfEN14Wi4WzLjGJKv6oWLTnlz7+xvt2dw572f79QRlpUeWrcdqAi7oREQVfm jqptCRWUi9vu97dASAI+l1PAbhRc7sWg/mryW8Sx+h6GPG/YbXxHj+Rj1Jq2LkzZ7SWk yNEnCzxvLVARmnyWX4RJvrZ0/hPSN2r7zyemuWS+HkWyYmeAFshXhoPpXhSKejF0iAa7 KXeoroceMXq2dnQ6FjHXnvAQwlLqlI9DWBQxTWL/q5jgArxpJWvsUT74DGVyJfGaXFq2 4IHha942FDIqUJ8OWW3E33JThYotJNGbeUtjrsae9iFMzhKM0A6l/a5pid4xCiqRAmqZ LbkQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id x17si9799825qkh.293.2019.09.09.10.34.25 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 09 Sep 2019 10:34:25 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:59548 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7NYW-0001uK-ME for patch@linaro.org; Mon, 09 Sep 2019 13:34:24 -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) 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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(-) -- 2.21.0 diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index cd5ea391e8..ba3fb3ff50 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -25,4 +25,3 @@ CONFIG_ISAPC=y CONFIG_I440FX=y CONFIG_Q35=y -CONFIG_ACPI_PCI=y 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