From patchwork Thu Jun 29 21:56:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksandr Bezzubikov X-Patchwork-Id: 9818047 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id ACFB9603F2 for ; Thu, 29 Jun 2017 21:57:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A3B8F2846F for ; Thu, 29 Jun 2017 21:57:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 989CE28487; Thu, 29 Jun 2017 21:57:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3E091284EA for ; Thu, 29 Jun 2017 21:57:33 +0000 (UTC) Received: from localhost ([::1]:41408 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQhRN-0005lM-4O for patchwork-qemu-devel@patchwork.kernel.org; Thu, 29 Jun 2017 17:57:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34396) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQhQJ-0005kc-LB for qemu-devel@nongnu.org; Thu, 29 Jun 2017 17:56:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dQhQI-0000Rc-Un for qemu-devel@nongnu.org; Thu, 29 Jun 2017 17:56:27 -0400 Received: from mail-lf0-x241.google.com ([2a00:1450:4010:c07::241]:34990) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dQhQI-0000R7-NI for qemu-devel@nongnu.org; Thu, 29 Jun 2017 17:56:26 -0400 Received: by mail-lf0-x241.google.com with SMTP id n136so8680247lfn.2 for ; Thu, 29 Jun 2017 14:56:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7Phr/bi4ohsr6siI/LjCseR/dSQN5xnjh+37HQ/DJD0=; b=MMc7Ee2oO6AJTGUaknMqVSF6XPRk3Tib2SWY1NdAeY9Q5fLaPZnEvmVGGRtZXWP5C+ SZdABrk00vni/1n1AOmRa0I7YaDSoVWi7sYiHXgYkP3rGXNso/nvsai9x65TxM5KmYi3 iAr5Rqy6J+fLbMcVJT/utAF71we1qq/31S0W4LFH+DX/mSo27r17xzLUofScULxR0GMp jshAyt+y+q20idwuNurIVH79uvVQcEiC3Y1iqJCCnancg9uZdDruoBihmiw90wwOo4YF t/0Jes5AhzM9wEuoFy7boeRfhw8Dvadcaw0y6IB6uAiMtdPEgPhB7IIvNYLb7mjWj/ft 8xPw== 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; bh=7Phr/bi4ohsr6siI/LjCseR/dSQN5xnjh+37HQ/DJD0=; b=AE/uCw+vMz2o8UVmwalUZGGaNCjxgZpS7sG//ohc+2she15hfkCGJTw8MTUo0OjplK kWBcq7JRLr8vOwDCjFkJ4L0ccBSnYKnMgbUfgElljibBtGyeKMXUWAtwIa0Iud3fkChS wAMz2m6yS5TMDI8R1dkfKqfFJ30nxzcp3B07kfta40VSGbR3AAIQGQ7ZhxHfxnJRJ26B LCuHy3AMCDzawJOFqhil09kFF/XP4/GgDDxNaHUfjWwNsTApNcWj307+LiwM3rMJ2+58 M2TVb7gfKa1aWP5N+zItV51YP0VHg82dsxbktvqDufHgmtV9Rc6rUYn7YiR88MdX/ukW vG/g== X-Gm-Message-State: AKS2vOx1lvuFXjTA6o2RJTRLlI69CS//zPVQGMqb2pSEfvSfO7pxIUD3 5ivXMCUtMf0I8jh7Y1c= X-Received: by 10.46.76.10 with SMTP id z10mr5573276lja.41.1498773385101; Thu, 29 Jun 2017 14:56:25 -0700 (PDT) Received: from localhost.localdomain (broadband-5-228-183-39.moscow.rt.ru. [5.228.183.39]) by smtp.gmail.com with ESMTPSA id l69sm1532906lfl.10.2017.06.29.14.56.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 29 Jun 2017 14:56:24 -0700 (PDT) From: Aleksandr Bezzubikov To: qemu-devel@nongnu.org Date: Fri, 30 Jun 2017 00:56:00 +0300 Message-Id: <1498773362-18675-5-git-send-email-zuban32s@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1498773362-18675-1-git-send-email-zuban32s@gmail.com> References: <1498773362-18675-1-git-send-email-zuban32s@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4010:c07::241 Subject: [Qemu-devel] [PATCH RFC 4/6] hw/acpi: prepare pci hotplug IO for ich9 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ehabkost@redhat.com, mst@redhat.com, Aleksandr Bezzubikov , pbonzini@redhat.com, marcel@redhat.com, imammedo@redhat.com, rth@twiddle.net Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Aleksandr Bezzubikov --- hw/i386/acpi-build.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index c99dbcc..e434efe 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -135,12 +135,6 @@ static void acpi_get_pm_info(AcpiPmInfo *pm) if (piix) { obj = piix; pm->cpu_hp_io_base = PIIX4_CPU_HOTPLUG_IO_BASE; - pcihp_io_base = - object_property_get_int(obj, ACPI_PCIHP_IO_BASE_PROP, NULL); - pcihp_io_len = - object_property_get_int(obj, ACPI_PCIHP_IO_LEN_PROP, NULL); - pm->pcihp_io_base = (pcihp_io_base == -1) ? 0 : pcihp_io_base; - pm->pcihp_io_len = (pcihp_io_len == -1) ? 0 : pcihp_io_len; } if (lpc) { obj = lpc; @@ -148,6 +142,13 @@ static void acpi_get_pm_info(AcpiPmInfo *pm) } assert(obj); + pcihp_io_base = + object_property_get_int(obj, ACPI_PCIHP_IO_BASE_PROP, NULL); + pcihp_io_len = + object_property_get_int(obj, ACPI_PCIHP_IO_LEN_PROP, NULL); + pm->pcihp_io_base = (pcihp_io_base == -1) ? 0 : pcihp_io_base; + pm->pcihp_io_len = (pcihp_io_len == -1) ? 0 : pcihp_io_len; + /* Fill in optional s3/s4 related properties */ o = object_property_get_qobject(obj, ACPI_PM_PROP_S3_DISABLED, NULL); if (o) {