From patchwork Wed Aug 25 03:19:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ani Sinha X-Patchwork-Id: 12456283 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6CB53C4338F for ; Wed, 25 Aug 2021 03:21:09 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 367FF60FE6 for ; Wed, 25 Aug 2021 03:21:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 367FF60FE6 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=anisinha.ca Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:39064 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIjTQ-0001UQ-CE for qemu-devel@archiver.kernel.org; Tue, 24 Aug 2021 23:21:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46268) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIjSR-0007hP-EI for qemu-devel@nongnu.org; Tue, 24 Aug 2021 23:20:07 -0400 Received: from mail-pj1-x102a.google.com ([2607:f8b0:4864:20::102a]:38669) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mIjSO-0005YS-9g for qemu-devel@nongnu.org; Tue, 24 Aug 2021 23:20:07 -0400 Received: by mail-pj1-x102a.google.com with SMTP id om1-20020a17090b3a8100b0017941c44ce4so3183607pjb.3 for ; Tue, 24 Aug 2021 20:20:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=anisinha-ca.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XD7CH6PtFEM6PzrrdSSPuX4DbBlROf9i/Uo9ehMlyoM=; b=gQplbBXRBU0IcVJtJgFkpTt58bhUHTM9q0VV+1yXdmkpo284hgPfO0GXhpTSJ00axZ 50HM2ho3qBiYE3vMHykGDiY2TEpaUh7xEPdBcRnojURjQxoxE+nNTff9tZ0G9MLOlU6E g952I1wdbCXoSDypnuM7aDCx1pS/Cbbik0+1rkU/T9i1Cp3QwT+MVO2qMEFVevhsWLEb n2qJIZMZKK3exKx+j9YXSZhLnQODwFaCU76EeG7P6nnxDxGn0tZDQRXkjCy+LwRlTdi7 cCZuQEj4fSbqjINp1HERtp/SpChjjkBPuSSnkhK7umySiTJbEZqHwZvUxG7DuNpyEhVs VBPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XD7CH6PtFEM6PzrrdSSPuX4DbBlROf9i/Uo9ehMlyoM=; b=jvdd+oeUe8ZEd9wYMLm1xay/kGNubZoqKWlSJcpt6ZflS9tdLUpkp/SADfPovXVGFw DfWRe5VGY7e3AyiUcG2ygbMgUWNspIzDBVpuVtHm+O2qBN73HwiSKKz0GVgMu7Bh2u1K xgOkoXknzSnMW3edA1pRTWKaiyrfR4TkllhfZiSCZMyF8ed1R2pyUfvQG6xdEAMS8gI1 UQZqrZBMRJvtj0m48Gx1JEaeioaWwY4pGvBBzwIw4HZmjzmTWFZvQHkbL/9RAVPEc0ef ywc7hVtjqc0EmJigN16Um7WcVyAWvqBphyfKvJQhaVk11F9uurxt6VyiiWY16C2yClFJ CorA== X-Gm-Message-State: AOAM531BiFXCYuefics4jtND9mTvRzlIT9a/Crw52jQVVYuqQOM8P/kU OMm9JBZAAqmO+dCVdBlJqU/tKddqJqvOfw== X-Google-Smtp-Source: ABdhPJzitTgtvCXJ6zUX+ITkXpzFCM+Q29WJA08Z5/dIzjCsXlzMqpSFE2OmNGbkBezPcFYJTH1Cxg== X-Received: by 2002:a17:90a:d3d0:: with SMTP id d16mr8111121pjw.103.1629861603085; Tue, 24 Aug 2021 20:20:03 -0700 (PDT) Received: from anisinha-lenovo.ba.nuagenetworks.net ([115.96.155.195]) by smtp.googlemail.com with ESMTPSA id c19sm3404895pjs.1.2021.08.24.20.20.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Aug 2021 20:20:02 -0700 (PDT) From: Ani Sinha To: mst@redhat.com Subject: [PATCH 1/5] hw/pci: remove all references to find_i440fx function Date: Wed, 25 Aug 2021 08:49:45 +0530 Message-Id: <20210825031949.919376-2-ani@anisinha.ca> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210825031949.919376-1-ani@anisinha.ca> References: <20210825031949.919376-1-ani@anisinha.ca> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::102a; envelope-from=ani@anisinha.ca; helo=mail-pj1-x102a.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no 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: ani@anisinha.ca, Peter Maydell , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" commit c0e427d6eb5fefc538 ("hw/acpi/ich9: Enable ACPI PCI hot-plug") removed all uses of find_i440fx() function. This has been replaced by the more generic call acpi_get_i386_pci_host() which maybe able to find the root bus both for i440fx machine type as well as for the q35 machine type. There seems to be no more any need to maintain a i440fx specific version of the api call. Remove it. Tested by building from a clean tree successfully. Signed-off-by: Ani Sinha Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé --- hw/pci-host/i440fx.c | 8 -------- include/hw/pci-host/i440fx.h | 1 - stubs/meson.build | 1 - stubs/pci-host-piix.c | 7 ------- 4 files changed, 17 deletions(-) delete mode 100644 stubs/pci-host-piix.c diff --git a/hw/pci-host/i440fx.c b/hw/pci-host/i440fx.c index 28c9bae899..e08716142b 100644 --- a/hw/pci-host/i440fx.c +++ b/hw/pci-host/i440fx.c @@ -314,14 +314,6 @@ PCIBus *i440fx_init(const char *host_type, const char *pci_type, return b; } -PCIBus *find_i440fx(void) -{ - PCIHostState *s = OBJECT_CHECK(PCIHostState, - object_resolve_path("/machine/i440fx", NULL), - TYPE_PCI_HOST_BRIDGE); - return s ? s->bus : NULL; -} - static void i440fx_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); diff --git a/include/hw/pci-host/i440fx.h b/include/hw/pci-host/i440fx.h index 7fcfd9485c..f068aaba8f 100644 --- a/include/hw/pci-host/i440fx.h +++ b/include/hw/pci-host/i440fx.h @@ -45,6 +45,5 @@ PCIBus *i440fx_init(const char *host_type, const char *pci_type, MemoryRegion *pci_memory, MemoryRegion *ram_memory); -PCIBus *find_i440fx(void); #endif diff --git a/stubs/meson.build b/stubs/meson.build index d3fa8646b3..0faa2a74b7 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -27,7 +27,6 @@ stub_ss.add(files('module-opts.c')) stub_ss.add(files('monitor.c')) stub_ss.add(files('monitor-core.c')) stub_ss.add(files('pci-bus.c')) -stub_ss.add(files('pci-host-piix.c')) stub_ss.add(files('qemu-timer-notify-cb.c')) stub_ss.add(files('qmp_memory_device.c')) stub_ss.add(files('qmp-command-available.c')) diff --git a/stubs/pci-host-piix.c b/stubs/pci-host-piix.c deleted file mode 100644 index 93975adbfe..0000000000 --- a/stubs/pci-host-piix.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "qemu/osdep.h" -#include "hw/pci-host/i440fx.h" - -PCIBus *find_i440fx(void) -{ - return NULL; -} From patchwork Wed Aug 25 03:19:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ani Sinha X-Patchwork-Id: 12456289 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 429A3C4338F for ; Wed, 25 Aug 2021 03:23:02 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 008BC61247 for ; Wed, 25 Aug 2021 03:23:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 008BC61247 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=anisinha.ca Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:46650 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIjVF-0006bP-80 for qemu-devel@archiver.kernel.org; Tue, 24 Aug 2021 23:23:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46286) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIjSY-0007xC-Ca for qemu-devel@nongnu.org; Tue, 24 Aug 2021 23:20:14 -0400 Received: from mail-pf1-x42a.google.com ([2607:f8b0:4864:20::42a]:40950) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mIjSW-0005h3-RN for qemu-devel@nongnu.org; Tue, 24 Aug 2021 23:20:14 -0400 Received: by mail-pf1-x42a.google.com with SMTP id y190so20113746pfg.7 for ; Tue, 24 Aug 2021 20:20:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=anisinha-ca.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bKbc+f4bQs5XTTICu9SVnSh/UAlBzY4g0vt/DD+jm+Y=; b=0c0pXkvS72WAGdRLEz37P8IcuNb5G1ganWehBOwfPczgRQHVvz3Ex3CQwdkRZBDHCJ BjjTYWV12vtIxT2KK/2k5MoQ/Tv/OtON1sOXgByXQsdTalXuAl1qIE52vnQbFZxppCTk roX5QKOs+iu8azSJAV05VYs9bo22ZShwiEeXcQSZcL+LUKqJ666W7tXQmxvE2PSVm51Q s1mw6YYKiGS6bjSIbo2c1r0BcnD3b/ksg+UwcNnr4YkqI1fHWdNBGmvXlex32WJiXh8h 6T53i6KTJXMf61Nt1huiGs4rTFNHsMp7V9o7/2U3FBGIjFti/gpnvXROQjtKYM/z+Ku9 B4+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bKbc+f4bQs5XTTICu9SVnSh/UAlBzY4g0vt/DD+jm+Y=; b=ZKmwoQLiIKwtfSFw3PHEwBuY16l/1Coxf4JrtEOik9iMj/YY82gzztHp+HN/fn/Sab NRLB5SYx7mA45DEFB3+OikyotUNBpzURqCAZWqstlvjo0p62EqToohLJX2BwZHb3je7T R+iZRR2pWHvhBM0PFUi5hwsIbDdA4ujh2b4Zc/irRxQSuicQHUjEgbfynRO2nu1WXxEk Zx6AIrWVcrKFQtCECHpRdauxGR1GIHbJgXFrlaD/TG5oXgffZU2XaHrpTeEQx3iB8q+V SKcSxOaDk2AI5Qy34GcDisoiL2ZvkIemdIIqYISoTMJexAtWlBulVu0bGK3mT1KdBUEc pkLw== X-Gm-Message-State: AOAM533r6i+jqBnpQzCNiZeO4ldr890ZPdOG73bHNJk/z7jJp+MkfE36 wt1pzAzQOvLLHgoWzgrxAQc3fg== X-Google-Smtp-Source: ABdhPJximQquIWJHjU7pkSq2VhXCoCsqo4KlQxeKHUoHfZzwgAryoiL4AEfsOdTxWy1/3Lpb3OEenA== X-Received: by 2002:a63:1e4b:: with SMTP id p11mr40100930pgm.295.1629861611508; Tue, 24 Aug 2021 20:20:11 -0700 (PDT) Received: from anisinha-lenovo.ba.nuagenetworks.net ([115.96.155.195]) by smtp.googlemail.com with ESMTPSA id c19sm3404895pjs.1.2021.08.24.20.20.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Aug 2021 20:20:11 -0700 (PDT) From: Ani Sinha To: mst@redhat.com Subject: [PATCH 2/5] hw/acpi: use existing references to pci device struct within functions Date: Wed, 25 Aug 2021 08:49:46 +0530 Message-Id: <20210825031949.919376-3-ani@anisinha.ca> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210825031949.919376-1-ani@anisinha.ca> References: <20210825031949.919376-1-ani@anisinha.ca> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::42a; envelope-from=ani@anisinha.ca; helo=mail-pf1-x42a.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no 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: ani@anisinha.ca, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" There is no need to use fresh typecasts to get references to pci device structs when there is an existing reference to pci device struct. Use existing reference. Minor cleanup. Signed-off-by: Ani Sinha Reviewed-by: Philippe Mathieu-Daudé --- hw/acpi/pcihp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c index f4d706e47d..f610a25d2e 100644 --- a/hw/acpi/pcihp.c +++ b/hw/acpi/pcihp.c @@ -283,7 +283,7 @@ void acpi_pcihp_device_pre_plug_cb(HotplugHandler *hotplug_dev, /* Only hotplugged devices need the hotplug capability. */ if (dev->hotplugged && - acpi_pcihp_get_bsel(pci_get_bus(PCI_DEVICE(dev))) < 0) { + acpi_pcihp_get_bsel(pci_get_bus(pdev)) < 0) { error_setg(errp, "Unsupported bus. Bus doesn't have property '" ACPI_PCIHP_PROP_BSEL "' set"); return; @@ -363,8 +363,8 @@ void acpi_pcihp_device_unplug_cb(HotplugHandler *hotplug_dev, AcpiPciHpState *s, { PCIDevice *pdev = PCI_DEVICE(dev); - trace_acpi_pci_unplug(PCI_SLOT(PCI_DEVICE(dev)->devfn), - acpi_pcihp_get_bsel(pci_get_bus(PCI_DEVICE(dev)))); + trace_acpi_pci_unplug(PCI_SLOT(pdev->devfn), + acpi_pcihp_get_bsel(pci_get_bus(pdev))); /* * clean up acpi-index so it could reused by another device From patchwork Wed Aug 25 03:19:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ani Sinha X-Patchwork-Id: 12456285 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8987CC4338F for ; Wed, 25 Aug 2021 03:21:20 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 24E0B61040 for ; Wed, 25 Aug 2021 03:21:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 24E0B61040 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=anisinha.ca Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:40232 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIjTb-0002Fd-A0 for qemu-devel@archiver.kernel.org; Tue, 24 Aug 2021 23:21:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46312) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIjSb-00086D-U9 for qemu-devel@nongnu.org; Tue, 24 Aug 2021 23:20:17 -0400 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]:42864) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mIjSa-0005kJ-GS for qemu-devel@nongnu.org; Tue, 24 Aug 2021 23:20:17 -0400 Received: by mail-pl1-x630.google.com with SMTP id w6so13482859plg.9 for ; Tue, 24 Aug 2021 20:20:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=anisinha-ca.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fi5WxhhadR2UM/qthU4X06h6DIcMmGAlSCkO9HVYdao=; b=qyl3s4Rx7MZUwn1w7LHunmL6L2lepkP9JyZ4bJa/YqYraiNJl2CdCRx6+gVVZUhjko WcDv2LPwWSMcq7Ere6q23Ueh1T9e0rCH1ZwMhur+os30NIcxSWpqt/JPXZKq2LTnpo8b nJzLqDz9D2qzAf/2yN4VyFnGue7c2bN17/9a/rkRNDJJNZlRgdPn6ffDzXpbcwxmpdz6 78Fs3eKxaGdxX6+ki2GCuCPY92+G4pROWaRFul1vSLeFx4E6MX0Wf030W+hU7OZ5gdEw yUEV9u634rCTZWGXK+PioYZSwkA6xJDMqCWRkNpqWc5jbYx76wDK5uNlBV1F/h1Nc7Va FVHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fi5WxhhadR2UM/qthU4X06h6DIcMmGAlSCkO9HVYdao=; b=DW6yFWka2NgbL3+9UA3biBurEAcnekYgcpML4pKPdfVvywWqc2bRnq+brFbZMToFbe lMSl2jjXJiCLj/uETXfgocmRXoHc1znaS2/4gF/CaWQ45cK9/rFT0WPOZ56FyHy2SEzE 9cRdZNeXPQb/HPBp7lMGRI4HIN+FoK3klOlfkWQTdBoe6iMJ2OA7qZ0ZnT4Sff1zItLD /brumIGv/01Lk4v5vLTeUPFvU2/toshc+Dkj0kcRr6AmErQfrrdPmtDVCkjF2e9gK1Nt U25RDj0A9UwviI1Hk/yLVM5wZe6GGBJIrMHJ6WguS7i91UVlIdQEh/7Zob9b1mBWHGGq CPkQ== X-Gm-Message-State: AOAM533eyBSNZYZCzjxCAF4PpbCmCbvlhBoWvnqdsRoy8Q4Cc59N/LdE 7uVfwCLkZGFTMUWao3TXWC/5bw== X-Google-Smtp-Source: ABdhPJwqEiWXwrkYpOAtFTa1rDLnk1LYhSLp7SoVX98fejP70170MOEYxGAKLj56ms9MVTqaYKYMUw== X-Received: by 2002:a17:90a:5147:: with SMTP id k7mr8057237pjm.204.1629861615264; Tue, 24 Aug 2021 20:20:15 -0700 (PDT) Received: from anisinha-lenovo.ba.nuagenetworks.net ([115.96.155.195]) by smtp.googlemail.com with ESMTPSA id c19sm3404895pjs.1.2021.08.24.20.20.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Aug 2021 20:20:14 -0700 (PDT) From: Ani Sinha To: mst@redhat.com Subject: [PATCH 3/5] MAINTAINERS: Added myself as a reviewer for acpi/smbios subsystem Date: Wed, 25 Aug 2021 08:49:47 +0530 Message-Id: <20210825031949.919376-4-ani@anisinha.ca> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210825031949.919376-1-ani@anisinha.ca> References: <20210825031949.919376-1-ani@anisinha.ca> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::630; envelope-from=ani@anisinha.ca; helo=mail-pl1-x630.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no 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: ani@anisinha.ca, Igor Mammedov , =?utf-8?q?Philippe?= =?utf-8?q?_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" I have developed an interest in this space and hopefully can lend some helping hand to Igor and Michael in reviewing simpler patches. Signed-off-by: Ani Sinha Reviewed-by: Philippe Mathieu-Daudé Acked-by: Igor Mammedov --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 6b3697962c..79b3e19931 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1739,6 +1739,7 @@ F: docs/specs/*pci* ACPI/SMBIOS M: Michael S. Tsirkin M: Igor Mammedov +R: Ani Sinha S: Supported F: include/hw/acpi/* F: include/hw/firmware/smbios.h From patchwork Wed Aug 25 03:19:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ani Sinha X-Patchwork-Id: 12456291 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 30A02C4338F for ; Wed, 25 Aug 2021 03:23:59 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A33CD61052 for ; Wed, 25 Aug 2021 03:23:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org A33CD61052 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=anisinha.ca Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:48850 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIjW9-00084z-Nm for qemu-devel@archiver.kernel.org; Tue, 24 Aug 2021 23:23:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46326) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIjSg-0008Hi-DN for qemu-devel@nongnu.org; Tue, 24 Aug 2021 23:20:22 -0400 Received: from mail-pj1-x1031.google.com ([2607:f8b0:4864:20::1031]:53215) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mIjSe-0005qW-N7 for qemu-devel@nongnu.org; Tue, 24 Aug 2021 23:20:22 -0400 Received: by mail-pj1-x1031.google.com with SMTP id h1so9771477pjs.2 for ; Tue, 24 Aug 2021 20:20:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=anisinha-ca.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vDT7CBKhzYnUt0nin0M2pvP1zZOQb4gzQ9x6r3/qVno=; b=G7N5woljmaRKL8qsIhZ16mpqdwncm68MBUfe5E8HD4dYUrnl17SQOEHiqB55jhPJiF cKvt0u0T9CSrwUemgKZBzrs7oMCIVe+3dBhbLI3paCfkSXHJMB3IRnQ4YwAC8TBfLLWx cuBkaBY3SZc7YgenG7OMxfx9Y0nAgrVpDO9c/bEfv6xvd3TmzU/pRL+quXlPEQKn8UUA WF+ZVz4RexN74JRQBuqgEgoAcEfbc29COP+hyLuPuyGQCWMCXZYvXvuqe/TNAA0gkgFD d1/uX0o8bf6jbZcSze1fOKD9nAKIomm0on+Wcy3FZSQiXfJmXz/yYMna6NyT7lxfKnVg j2Tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vDT7CBKhzYnUt0nin0M2pvP1zZOQb4gzQ9x6r3/qVno=; b=d+MC437c7JCRo8YDEvZzCvSij3OQmYBijWdrrax1LIpxSZML+B3Wwf7g4OCLtmsZrl G3KB+uasyOyhIl5ybuDY3XaW7mKxf7XuAsFFSMgxlklofOWkBgfEFDM9jgX6ysHm3AW/ puEDttBD40XnhYPcQUsVafa3SzysOM8PjmY2hG9VrKxLItS9tlifETu/ZCXiedHDvnOv OrXFv/Z7q45xHdWW24mcE0QC7PRh+vF22Trkucx1HqNvva2bPQesc8gyKNyxS956hDc7 ajNDbQK+kquSgX6+U3C5Bt6ay1gbrb/aJQN70rGdLsdZxki5ZY/NN58xC0zgvwztxHZd Q8SA== X-Gm-Message-State: AOAM530iYS2cns+9slk0MQx/o+RNTATvcf/XDFVqBjKCf0KazfclPzCv Y1odyPXlBHnMnechJDGMDFohZRe+4oKzzA== X-Google-Smtp-Source: ABdhPJxz0cCSC/E0szcMHRNBiqs5cQB/fO4OQIFvjtfI+H4CEeD5A6cboStiNw23bT1lYgXmXiSOxg== X-Received: by 2002:a17:902:b691:b029:12d:2b6:d116 with SMTP id c17-20020a170902b691b029012d02b6d116mr36509692pls.71.1629861619424; Tue, 24 Aug 2021 20:20:19 -0700 (PDT) Received: from anisinha-lenovo.ba.nuagenetworks.net ([115.96.155.195]) by smtp.googlemail.com with ESMTPSA id c19sm3404895pjs.1.2021.08.24.20.20.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Aug 2021 20:20:19 -0700 (PDT) From: Ani Sinha To: mst@redhat.com Subject: [PATCH 4/5] hw/acpi: define PIIX4 acpi pci hotplug property strings at a single place Date: Wed, 25 Aug 2021 08:49:48 +0530 Message-Id: <20210825031949.919376-5-ani@anisinha.ca> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210825031949.919376-1-ani@anisinha.ca> References: <20210825031949.919376-1-ani@anisinha.ca> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::1031; envelope-from=ani@anisinha.ca; helo=mail-pj1-x1031.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no 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: ani@anisinha.ca, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Now that we have "acpi-pci-hotplug-with-bridge-support" PIIX4 PM property being used for both q35 and i440fx machine types, it is better that we defined this property string at a single place within a header file like other PIIX4 properties. We can then use this single definition at all the places that needs it instead of duplicating the string everywhere. While at it, this change also adds a definition for "acpi-root-pci-hotplug" PIIX4 PM property and uses this definition at all places that were formally using the string value. Signed-off-by: Ani Sinha Reviewed-by: Philippe Mathieu-Daudé --- hw/acpi/ich9.c | 2 +- hw/acpi/piix4.c | 4 ++-- hw/i386/acpi-build.c | 4 ++-- hw/i386/pc.c | 4 ++-- hw/i386/pc_q35.c | 2 +- include/hw/acpi/acpi.h | 2 ++ 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c index 778e27b659..1ee2ba2c50 100644 --- a/hw/acpi/ich9.c +++ b/hw/acpi/ich9.c @@ -451,7 +451,7 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm) object_property_add_bool(obj, ACPI_PM_PROP_TCO_ENABLED, ich9_pm_get_enable_tco, ich9_pm_set_enable_tco); - object_property_add_bool(obj, "acpi-pci-hotplug-with-bridge-support", + object_property_add_bool(obj, ACPI_PM_PROP_ACPI_PCIHP_BRIDGE, ich9_pm_get_acpi_pci_hotplug, ich9_pm_set_acpi_pci_hotplug); } diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 48f7a1edbc..f0b5fac44a 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -647,9 +647,9 @@ static Property piix4_pm_properties[] = { DEFINE_PROP_UINT8(ACPI_PM_PROP_S3_DISABLED, PIIX4PMState, disable_s3, 0), DEFINE_PROP_UINT8(ACPI_PM_PROP_S4_DISABLED, PIIX4PMState, disable_s4, 0), DEFINE_PROP_UINT8(ACPI_PM_PROP_S4_VAL, PIIX4PMState, s4_val, 2), - DEFINE_PROP_BOOL("acpi-pci-hotplug-with-bridge-support", PIIX4PMState, + DEFINE_PROP_BOOL(ACPI_PM_PROP_ACPI_PCIHP_BRIDGE, PIIX4PMState, use_acpi_hotplug_bridge, true), - DEFINE_PROP_BOOL("acpi-root-pci-hotplug", PIIX4PMState, + DEFINE_PROP_BOOL(ACPI_PM_PROP_ACPI_PCI_ROOTHP, PIIX4PMState, use_acpi_root_pci_hotplug, true), DEFINE_PROP_BOOL("memory-hotplug-support", PIIX4PMState, acpi_memory_hotplug.is_enabled, true), diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index a33ac8b91e..6c27e12e2a 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -267,10 +267,10 @@ static void acpi_get_pm_info(MachineState *machine, AcpiPmInfo *pm) qobject_unref(o); pm->pcihp_bridge_en = - object_property_get_bool(obj, "acpi-pci-hotplug-with-bridge-support", + object_property_get_bool(obj, ACPI_PM_PROP_ACPI_PCIHP_BRIDGE, NULL); pm->pcihp_root_en = - object_property_get_bool(obj, "acpi-root-pci-hotplug", + object_property_get_bool(obj, ACPI_PM_PROP_ACPI_PCI_ROOTHP, NULL); } diff --git a/hw/i386/pc.c b/hw/i386/pc.c index c2b9d62a35..25ae3881e9 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -99,7 +99,7 @@ GlobalProperty pc_compat_6_0[] = { { "qemu64" "-" TYPE_X86_CPU, "model", "6" }, { "qemu64" "-" TYPE_X86_CPU, "stepping", "3" }, { TYPE_X86_CPU, "x-vendor-cpuid-only", "off" }, - { "ICH9-LPC", "acpi-pci-hotplug-with-bridge-support", "off" }, + { "ICH9-LPC", ACPI_PM_PROP_ACPI_PCIHP_BRIDGE, "off" }, }; const size_t pc_compat_6_0_len = G_N_ELEMENTS(pc_compat_6_0); @@ -311,7 +311,7 @@ const size_t pc_compat_2_0_len = G_N_ELEMENTS(pc_compat_2_0); GlobalProperty pc_compat_1_7[] = { PC_CPU_MODEL_IDS("1.7.0") { TYPE_USB_DEVICE, "msos-desc", "no" }, - { "PIIX4_PM", "acpi-pci-hotplug-with-bridge-support", "off" }, + { "PIIX4_PM", ACPI_PM_PROP_ACPI_PCIHP_BRIDGE, "off" }, { "hpet", HPET_INTCAP, "4" }, }; const size_t pc_compat_1_7_len = G_N_ELEMENTS(pc_compat_1_7); diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 04b4a4788d..5327ad5abc 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -239,7 +239,7 @@ static void pc_q35_init(MachineState *machine) OBJECT(lpc), &error_abort); acpi_pcihp = object_property_get_bool(OBJECT(lpc), - "acpi-pci-hotplug-with-bridge-support", + ACPI_PM_PROP_ACPI_PCIHP_BRIDGE, NULL); if (acpi_pcihp) { diff --git a/include/hw/acpi/acpi.h b/include/hw/acpi/acpi.h index 9e8a76f2e2..cc0d370745 100644 --- a/include/hw/acpi/acpi.h +++ b/include/hw/acpi/acpi.h @@ -47,6 +47,8 @@ #define ACPI_PM_PROP_PM_IO_BASE "pm_io_base" #define ACPI_PM_PROP_GPE0_BLK "gpe0_blk" #define ACPI_PM_PROP_GPE0_BLK_LEN "gpe0_blk_len" +#define ACPI_PM_PROP_ACPI_PCIHP_BRIDGE "acpi-pci-hotplug-with-bridge-support" +#define ACPI_PM_PROP_ACPI_PCI_ROOTHP "acpi-root-pci-hotplug" /* PM Timer ticks per second (HZ) */ #define PM_TIMER_FREQUENCY 3579545 From patchwork Wed Aug 25 03:19:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ani Sinha X-Patchwork-Id: 12456287 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A4EEBC4338F for ; Wed, 25 Aug 2021 03:21:29 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 565AB61247 for ; Wed, 25 Aug 2021 03:21:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 565AB61247 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=anisinha.ca Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:40978 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIjTk-0002kv-Et for qemu-devel@archiver.kernel.org; Tue, 24 Aug 2021 23:21:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46356) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIjSk-0008T2-Qo for qemu-devel@nongnu.org; Tue, 24 Aug 2021 23:20:26 -0400 Received: from mail-pj1-x1032.google.com ([2607:f8b0:4864:20::1032]:45760) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mIjSj-0005w6-BZ for qemu-devel@nongnu.org; Tue, 24 Aug 2021 23:20:26 -0400 Received: by mail-pj1-x1032.google.com with SMTP id f11-20020a17090aa78b00b0018e98a7cddaso3764879pjq.4 for ; Tue, 24 Aug 2021 20:20:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=anisinha-ca.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=z/hNyxdV8zUruhznwyJ0JRbrPFDcZu9AJ+1RZ5zF/ik=; b=1WMgGfkO82WCAaYTyZ6PO4FU9QjifUwMY6Kenn4TQ9TZEje4q3PGwtM3vPrmx7xT4a JI7JMYY+i10EqOogfimDl5/nb14rHLgkPzZ73+/NX/cNkflbxombXY97+6mP4I9zjL9x 4/Du5jPVh5GWmzZ6voJsmlU36HknZPCPhJjb3jqYR1n3hXNdH1xAQyIhbYtvf7uyUMTe yI32bZloG3kitMcDYXKjl2iOe1Cs52iv5KHY3vQtoBWo3L3JL+NOt7bWEhOlyXJUecm0 2coJgqtIWANPOo4DFS8ScOGWVpufj9sSzMZPdn1G1mhcCoQdTwmpK+OeFSQhMDz0mo1v VaZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=z/hNyxdV8zUruhznwyJ0JRbrPFDcZu9AJ+1RZ5zF/ik=; b=GmkMwzmvhlKDtdnMVEJVJ36bli0L98XENpGKs6Eqiq0IJlvSJgiPuYJAO9F/RLwxPX zKp5n6IE3zBvtw3bAxK9vnFrh6aEhZRYVxahrtnEdu1eLQjpeJW1xEVU4fuadxzOru7T 60AdqyObwrj3QNDqXtP5Z7NYKszPLjSpwnOo1RbSC774W47vNt2ikJwFW0Qa6+3AeK8d APwpM2p7ujBBrASK8ZOTvpPn+HRzReRSDFZL8eVC2xcBv6+MsBVGiy6QXwSFsIfvMesk MWD7s5D3y+EePjMDYWAaFrU7JB1sBb7O4DbD5t79A3MLIr3Dbbo/dkFx4v5PL4Rd+Rzf 7cbQ== X-Gm-Message-State: AOAM531iWEz06IgN2mBfdiktla0UrktTmrsjjBq3BlwjCmp8jZ9Sf8wh ugZTxCAJzifhv4ZFZTHbHYpUg24gJl1u2w== X-Google-Smtp-Source: ABdhPJyMCb3PrT9b5t3RvggcBjDJ99UkMVw5EcYnqXUvAXJXqxqYtffxcRTgkeCSQkTWiBiTV0ISMw== X-Received: by 2002:a17:90b:1c92:: with SMTP id oo18mr8173310pjb.56.1629861623493; Tue, 24 Aug 2021 20:20:23 -0700 (PDT) Received: from anisinha-lenovo.ba.nuagenetworks.net ([115.96.155.195]) by smtp.googlemail.com with ESMTPSA id c19sm3404895pjs.1.2021.08.24.20.20.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Aug 2021 20:20:23 -0700 (PDT) From: Ani Sinha To: mst@redhat.com Subject: [PATCH 5/5] hw/arm/Kconfig: no need to enable ACPI_MEMORY_HOTPLUG/ACPI_NVDIMM explicitly Date: Wed, 25 Aug 2021 08:49:49 +0530 Message-Id: <20210825031949.919376-6-ani@anisinha.ca> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210825031949.919376-1-ani@anisinha.ca> References: <20210825031949.919376-1-ani@anisinha.ca> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::1032; envelope-from=ani@anisinha.ca; helo=mail-pj1-x1032.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no 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: ani@anisinha.ca, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Since commit 36b79e3219d ("hw/acpi/Kconfig: Add missing Kconfig dependencies (build error)"), ACPI_MEMORY_HOTPLUG and ACPI_NVDIMM is implicitly turned on when ACPI_HW_REDUCED is selected. ACPI_HW_REDUCED is already enabled. No need to turn on ACPI_MEMORY_HOTPLUG or ACPI_NVDIMM explicitly. This is a minor cleanup. Signed-off-by: Ani Sinha Reviewed-by: Philippe Mathieu-Daudé --- hw/arm/Kconfig | 2 -- 1 file changed, 2 deletions(-) diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 4ba0aca067..dc050b5c37 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -25,9 +25,7 @@ config ARM_VIRT select ACPI_PCI select MEM_DEVICE select DIMM - select ACPI_MEMORY_HOTPLUG select ACPI_HW_REDUCED - select ACPI_NVDIMM select ACPI_APEI config CHEETAH