From patchwork Thu Jun 29 21:55:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksandr Bezzubikov X-Patchwork-Id: 9818051 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 8CA726020A for ; Thu, 29 Jun 2017 21:59:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7C7152845C for ; Thu, 29 Jun 2017 21:59:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6FFC62847A; Thu, 29 Jun 2017 21:59:47 +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 27CD42845C for ; Thu, 29 Jun 2017 21:59:47 +0000 (UTC) Received: from localhost ([::1]:41415 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQhTW-0007dn-8n for patchwork-qemu-devel@patchwork.kernel.org; Thu, 29 Jun 2017 17:59:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34393) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQhQJ-0005kb-KQ 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 1dQhQH-0000Qt-IY 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]:36215) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dQhQH-0000Qe-B2 for qemu-devel@nongnu.org; Thu, 29 Jun 2017 17:56:25 -0400 Received: by mail-lf0-x241.google.com with SMTP id f28so8682553lfi.3 for ; Thu, 29 Jun 2017 14:56:25 -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=9Rp4bOTIeFl+vlB5zjlUhqDhtQW9EJHN5fJD2Hz9D9w=; b=B9KvdFTUayLtOY1oV1O8KcAkHrMLp+W0e3H3pVC6sEsS/MeZ1L7DxXeoTW91qW+WuJ hp/jZrWrnOxlZBNP+uSa9NAqz6DEeDIFUqNmoS43rxc5dyu0xIWpKlNegE7JNJuGB6Qg QSxrEDHfVQv2MqCymuUlE/1l0/jv8EI1/U6ndtbsx/P/kwTn2KgGqQ0bStOWJGlFrTy5 Qj8AGdM4UPdfXFOnfiFJJSLpIUSbT52/x4ELKZR9maDZHZC3d4Olgq24fzkGxSAsyWxE tkwKcVcahqQzRctNHW3wNvK480hOpiMJGTdK2W+KutM3udCVfTsZ41Am+AQ3kzTrOnbY 3Rog== 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=9Rp4bOTIeFl+vlB5zjlUhqDhtQW9EJHN5fJD2Hz9D9w=; b=YiVM+mQNldna1W+K2ym98uwWP82E84xjMn4g+ZK44afvevpvykTAEhiDK1ekV3rOK/ RqjuPDycWL+nGl8R9v2d+R72qIbvJEWoJQGpCuYeTAUySc8gzN+StpHt9PjTR+kCJl3h rQmUdK9ljBSdwsyRnVChgSp/LLxReEABFO0t3fVhp17R7UX+vUHqTjx3YqQNQ9V5Gu/z nspto79v8QNQ6rkAPaTlpk3NIALfw8C9kyoHmNvRGXYVUjaHANvwxjBgKfFk5Zue0Hi3 RjLx3U5wVOBHcFfQB7Xp8nFOLCIWblfuR/s+/pem85eymMg8dGvoIwy4+UJLIUvu1dTp lQyQ== X-Gm-Message-State: AKS2vOzXx9iXswu95jrVFuccS93uKclNNqoXNZYgB+jpCMpOXX5sbb3o 7uHDFZMu0+Q5lU/pi4Y= X-Received: by 10.46.74.18 with SMTP id x18mr5832646lja.130.1498773383725; Thu, 29 Jun 2017 14:56:23 -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.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 29 Jun 2017 14:56:22 -0700 (PDT) From: Aleksandr Bezzubikov To: qemu-devel@nongnu.org Date: Fri, 30 Jun 2017 00:55:59 +0300 Message-Id: <1498773362-18675-4-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 3/6] hw/acpi: fix pcihp io initialization 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 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index b0dcd34..c99dbcc 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -129,17 +129,18 @@ static void acpi_get_pm_info(AcpiPmInfo *pm) Object *lpc = ich9_lpc_find(); Object *obj = NULL; QObject *o; + int pcihp_io_len, pcihp_io_base; pm->cpu_hp_io_base = 0; - pm->pcihp_io_base = 0; - pm->pcihp_io_len = 0; if (piix) { obj = piix; pm->cpu_hp_io_base = PIIX4_CPU_HOTPLUG_IO_BASE; - pm->pcihp_io_base = + pcihp_io_base = object_property_get_int(obj, ACPI_PCIHP_IO_BASE_PROP, NULL); - pm->pcihp_io_len = + 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;