From: Eduardo Habkost <ehabkost@redhat.com>
To: qemu-devel@nongnu.org
Cc: Igor Mammedov <imammedo@redhat.com>,
Marcel Apfelbaum <marcel.a@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>
Subject: [Qemu-devel] [PATCH 10/13] acpi: Change acpi_pci_hotplug_enabled() argument to PCMachineState
Date: Wed, 2 Dec 2015 20:22:55 -0200 [thread overview]
Message-ID: <1449094978-22986-11-git-send-email-ehabkost@redhat.com> (raw)
In-Reply-To: <1449094978-22986-1-git-send-email-ehabkost@redhat.com>
Now that we just use PCMachineState::acpi_dev, we can change the
argument to acpi_pci_hotplug_enabled().
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
hw/i386/acpi-build.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 440d4e2..585100f 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -141,9 +141,10 @@ static void acpi_get_cpu_info(AcpiCpuInfo *cpu)
object_child_foreach(root, acpi_add_cpu_info, cpu);
}
-static bool acpi_pci_hotplug_enabled(Object *acpi_dev)
+static bool acpi_pci_hotplug_enabled(PCMachineState *pcms)
{
- return object_property_find(acpi_dev, ACPI_PCIHP_IO_BASE_PROP, NULL);
+ return object_property_find(OBJECT(pcms->acpi_dev),
+ ACPI_PCIHP_IO_BASE_PROP, NULL);
}
static void acpi_get_pm_info(AcpiPmInfo *pm, PCMachineState *pcms)
@@ -154,7 +155,7 @@ static void acpi_get_pm_info(AcpiPmInfo *pm, PCMachineState *pcms)
pm->pcihp_io_base = 0;
pm->pcihp_io_len = 0;
- if (acpi_pci_hotplug_enabled(obj)) {
+ if (acpi_pci_hotplug_enabled(pcms)) {
pm->pcihp_io_base =
object_property_get_int(obj, ACPI_PCIHP_IO_BASE_PROP,
&error_abort);
--
2.1.0
next prev parent reply other threads:[~2015-12-03 14:12 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-02 22:22 [Qemu-devel] [PATCH 00/13] acpi: Make piix-specific and q35-specific code generic Eduardo Habkost
2015-12-02 22:22 ` [Qemu-devel] [PATCH 01/13] pc: Add PCMachineState::pci_host field Eduardo Habkost
2015-12-03 15:35 ` Marcel Apfelbaum
2015-12-03 16:35 ` Eduardo Habkost
2015-12-02 22:22 ` [Qemu-devel] [PATCH 02/13] acpi: Remove unnecessary check for NULL pci_host Eduardo Habkost
2015-12-02 22:22 ` [Qemu-devel] [PATCH 03/13] acpi: Eliminate acpi_get_i386_pci_host() function Eduardo Habkost
2015-12-02 22:22 ` [Qemu-devel] [PATCH 04/13] acpi: Move DSDT info to PCMachineClass Eduardo Habkost
2015-12-02 22:22 ` [Qemu-devel] [PATCH 05/13] acpi: Simplify s3/s4 property querying Eduardo Habkost
2015-12-02 22:22 ` [Qemu-devel] [PATCH 06/13] acpi: Use &error_abort when getting PCI hotplug properties Eduardo Habkost
2015-12-02 22:22 ` [Qemu-devel] [PATCH 07/13] acpi: Use QOM property to get CPU hotplug I/O base Eduardo Habkost
2015-12-02 22:22 ` [Qemu-devel] [PATCH 08/13] acpi: Always try to init PCI " Eduardo Habkost
2015-12-02 22:22 ` [Qemu-devel] [PATCH 09/13] acpi: Use PCMachineState::acpi_dev to get ACPI dev Eduardo Habkost
2015-12-02 22:22 ` Eduardo Habkost [this message]
2015-12-02 22:22 ` [Qemu-devel] [PATCH 11/13] acpi: Don't use find_i440fx() when setting bsel properties Eduardo Habkost
2015-12-02 22:22 ` [Qemu-devel] [PATCH 12/13] intel_iommu.h: Missing sysbus.h include Eduardo Habkost
2015-12-02 22:22 ` [Qemu-devel] [PATCH 13/13] acpi: Don't include q35 and piix headers Eduardo Habkost
2015-12-03 15:19 ` [Qemu-devel] [PATCH 00/13] acpi: Make piix-specific and q35-specific code generic Igor Mammedov
2015-12-03 17:16 ` Eduardo Habkost
2015-12-04 13:24 ` Igor Mammedov
2015-12-04 14:08 ` Eduardo Habkost
2015-12-07 15:31 ` Marcel Apfelbaum
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1449094978-22986-11-git-send-email-ehabkost@redhat.com \
--to=ehabkost@redhat.com \
--cc=imammedo@redhat.com \
--cc=marcel.a@redhat.com \
--cc=mst@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).