From patchwork Mon Sep 16 14:41:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 173855 Delivered-To: patch@linaro.org Received: by 2002:ac9:19ad:0:0:0:0:0 with SMTP id d45csp4045629oce; Mon, 16 Sep 2019 08:37:34 -0700 (PDT) X-Google-Smtp-Source: APXvYqyN2MwUt2um5yBohGBFIrXX+PPPpAPeH2Wl7CmT+Fccfi8pCYbln5sFX6QTPZfyQDJ67PFC X-Received: by 2002:a50:eb07:: with SMTP id y7mr26874906edp.240.1568648254688; Mon, 16 Sep 2019 08:37:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568648254; cv=none; d=google.com; s=arc-20160816; b=qWeY9vwTTMOcD9j36zRPo3j843fLthw6C8Cur1KG1hLGwAeJ0g66PXDCPq696/nhDx /4muPkU+8TcIwJR4epR1DU8OWO9bAo6K7qH4EHnECdixFwQinpmLERGYuGXhjG+VDKM3 OPKy93jAVxpR/jDJYa5IQl+go3gj2EriGa+Q1lzyl08VB1ruKuqtLeIWiPcRAGH1ZAAQ KZEP0gdzYPMlM8oDJKhaztUefdwQqYrG2UzmYqI+DwZJeRDBRBAtkdA0JCmDoq482rG+ 821u+Lmiabjc3Nyq/PVM8LW6Si/5LIAnHOWbytuBoaUAiObsqnMZuQ5GPEvhSSg0Hd4r g/6A== 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:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=GX4JaDIbHHodc8bsVUgp1wGeHcMPOFe7Qx97BWjaFus=; b=rW/qb+4kXdOMt5Sm1N4pHI1JlX/ACqXS2xnAiDmUOSolfgP+P7H6GY7O7H0xSguJnh YwmTRbyyGt1bOZ8F+RTJxpaTY/+c6RZhFHPeS9PkS9dIr2izruFmIfm3X7kl2VyY1ZDs L3dKyUD13lt/tuT0NEWNIlxqHwkjBn+lGTkCj16v0HbzHdsj1ZfRwE4OHUBeKnKs6Z7P 170t1v00q1r1Nwi0vTTDyPdwVrpHR0jHAntKb01QjD+jDdOvZzRhxdfH96Kw5b8vl1eG 8GFcxuugCF1/tyjBY481EUpROrvYj1szJCHxzfdF2Cy6N2haypKH8WfAWI0X3YoLvGqN G56w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=FCxFw+xg; 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 v13si2509577edy.441.2019.09.16.08.37.34 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 16 Sep 2019 08:37:34 -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; dkim=fail header.i=@gmail.com header.s=20161025 header.b=FCxFw+xg; 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]:35998 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i9t4H-0002i5-45 for patch@linaro.org; Mon, 16 Sep 2019 11:37:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53676) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i9sCu-0006Rj-Q5 for qemu-devel@nongnu.org; Mon, 16 Sep 2019 10:42:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i9sCs-0007Se-Jj for qemu-devel@nongnu.org; Mon, 16 Sep 2019 10:42:24 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:34582) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i9sCs-0007SB-7k for qemu-devel@nongnu.org; Mon, 16 Sep 2019 10:42:22 -0400 Received: by mail-wm1-x332.google.com with SMTP id y135so189765wmc.1 for ; Mon, 16 Sep 2019 07:42:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=GX4JaDIbHHodc8bsVUgp1wGeHcMPOFe7Qx97BWjaFus=; b=FCxFw+xghXiUmKYNhE198znwVLIUZda2m/8UBJJgbDBcLRsPQjbEdx1kvjU0oUHkiA RSyDqqnqhqoVGj0PUf6hb4RpT/Kx8IDymD3Z5go/2K/ZYYqr3iYvo5RskL5dCGF4LZc7 /VUUzm9Qd2H5McNfNj1qzvSvseDSbSstr5ynJZIvm3I9zRoAzkBPfOMramMYJAXKWLAJ 53fxp+PFjxZ+Rf37+OP7eueu09jPvRycRypQi82/L7KNQNzz431NVc9PX3H9O0YGE194 tSPFlYz80Y9KrWRJbu7QFGmlRKdnfomT8W2ThBfFIHOZvqy9KXx8mU/W65F2S3qEP3VQ mvdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=GX4JaDIbHHodc8bsVUgp1wGeHcMPOFe7Qx97BWjaFus=; b=k4EWq5FsksboCmsVs20wQA9i+htDm5wRtWDvrdouVOX4AKvO5pMRFpHagR0xAghwIK JG/nEaU5oF2BAMMQZnyVATgDleNcZ9fLndUMBq/9OV2cm9OSzQehdbxgYaJig6CpMKXD yKycnrnUh0oLtRHz51vd5xkbM0oTQyRIvmARcXgSi2wWNBcVoUF3LxHKT9O+5meahgZ/ 2WPo+UQT/68SAU2Tqj71sZWQ9ISQCXzF1/T8xPaypHukyx/bKtt23Irkxev4g0DRTAIa InxXML2hejbmOQBeQ6aPliMcH6SGC+cxUktNE+N6gnIUBHPoxPvJmIMQrljv8mUvdYkn dMwA== X-Gm-Message-State: APjAAAUKJId6TMJsLeUAOCi1HhXJamM0l9RZBDyCx9QEDBI19PpILu36 VByapI5TDwP7EfJubyZwiBmZYe2C X-Received: by 2002:a1c:3b06:: with SMTP id i6mr80372wma.6.1568644940650; Mon, 16 Sep 2019 07:42:20 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id i14sm17024298wra.78.2019.09.16.07.42.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Sep 2019 07:42:19 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 16 Sep 2019 16:41:49 +0200 Message-Id: <1568644929-9124-10-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1568644929-9124-1-git-send-email-pbonzini@redhat.com> References: <1568644929-9124-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::332 Subject: [Qemu-devel] [PULL 09/29] 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: Cole Robinson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Cole Robinson 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 Message-Id: Signed-off-by: Paolo Bonzini --- default-configs/i386-softmmu.mak | 1 - hw/i386/Kconfig | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) -- 1.8.3.1 diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index cd5ea39..ba3fb3f 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 6350438..c7a9d63 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