From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a5d:6089:0:0:0:0:0 with SMTP id w9csp2336474wrt; Thu, 29 Nov 2018 05:27:48 -0800 (PST) X-Google-Smtp-Source: AFSGD/WF0v/hnhu5+rJCaF4MJHC/4dAbfSvh2nkZKyyH4CFEjQPPrLf+sbXcPK9TP1Hgo4awfb/m X-Received: by 2002:a25:a1aa:: with SMTP id a39-v6mr1199222ybi.381.1543498068633; Thu, 29 Nov 2018 05:27:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543498068; cv=none; d=google.com; s=arc-20160816; b=TBx+QZAPfGWRlPrsllBemzW1qe+LKIJx0OTGsCW55jv3X2fbJEH3IDJJn4z4YXn1FR uGrInx1yHlJmu84Ti/2wwd3BAZNN/NxEBL4Xaia2PAHsUPUz8svvfyBpKmn36d6/SoWH hUiSsqZGQFiIUrNNMJFd6ua96N+QCq6T1NLNyQZWcdp35Pt27/Er9BYqSmJ05PpDfylz ERq/+pfHJVJVMabumMvnOIIYoiiNH1tqfCCyu4gpMSsdFJ9dPGryhSQ3xb8sMtssRDEw LncAtSN/HZaZs1ypouDq15CcvDNsACgrugTaSsXbMtu08CSq62bZQ+k1fI0xsc5T3xX6 DW0g== 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 :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from; bh=bnKyBOuWpQ233u86lTXd2KuIXF9Z64mNa3ztm++A0/8=; b=nesQiTlFXuxFTmBNVBcUFTwzz3fRj+/z5BO7Eu2bJicmrDRkNNQA9CEuzF0a+MlvNT HnZ+x7uIMFagkZ8f1bOtqLopxVOm8nZIaazh76B9ikGBO/m9ZfwRRtDnYUgpBXfTorsT yqeRHU6dfgTvla3NBt8EduiQf5JWljIyoyrZZTvCUZzMga8n70V9N1XdPrlXc1AGABph wavE0VL9udSx4RMmG7QTVNKMQSXVxqxH+q1Po3i5Pe+rcqW8xmlE9emeS+jMZ571fFGU FQEGtO/V4JOSh5xHvD75OPIK0c5JK+fn3asq9XP9J4JnoPTXuSLZMHVx20G9+Xzy0K7Y swew== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id o83si1089266ywc.73.2018.11.29.05.27.48 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 29 Nov 2018 05:27:48 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from localhost ([::1]:54138 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gSMM8-0001XO-1P for alex.bennee@linaro.org; Thu, 29 Nov 2018 08:27:48 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58584) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gSMJf-0000Ba-95 for qemu-devel@nongnu.org; Thu, 29 Nov 2018 08:25:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gSMJb-0001bd-7q for qemu-devel@nongnu.org; Thu, 29 Nov 2018 08:25:15 -0500 Received: from mga09.intel.com ([134.134.136.24]:31202) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gSMJa-00019W-Rt; Thu, 29 Nov 2018 08:25:11 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Nov 2018 05:25:10 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,294,1539673200"; d="scan'208";a="97547175" Received: from hharjula-mobl.ger.corp.intel.com (HELO localhost.localdomain) ([10.252.29.114]) by fmsmga008.fm.intel.com with ESMTP; 29 Nov 2018 05:25:05 -0800 From: Samuel Ortiz To: qemu-devel@nongnu.org Date: Thu, 29 Nov 2018 14:24:21 +0100 Message-Id: <20181129132428.333-2-sameo@linux.intel.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181129132428.333-1-sameo@linux.intel.com> References: <20181129132428.333-1-sameo@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.24 Subject: [Qemu-devel] [PATCH v2 1/8] hw: acpi: The RSDP build API can return void 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: Laurent Vivier , Peter Maydell , Thomas Huth , Eduardo Habkost , Ben Warren , "Michael S. Tsirkin" , Shannon Zhao , qemu-arm@nongnu.org, Igor Mammedov , Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-devel" X-TUID: yFeKKVfsgRYR For both x86 and ARM architectures, the internal RSDP build API can return void as the current return value is unused. Signed-off-by: Samuel Ortiz Reviewed-by: Igor Mammedov Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth --- hw/arm/virt-acpi-build.c | 4 +--- hw/i386/acpi-build.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 5785fb697c..fcaa350892 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -367,7 +367,7 @@ static void acpi_dsdt_add_power_button(Aml *scope) } /* RSDP */ -static GArray * +static void build_rsdp(GArray *rsdp_table, BIOSLinker *linker, unsigned xsdt_tbl_offset) { AcpiRsdpDescriptor *rsdp = acpi_data_push(rsdp_table, sizeof *rsdp); @@ -392,8 +392,6 @@ build_rsdp(GArray *rsdp_table, BIOSLinker *linker, unsigned xsdt_tbl_offset) bios_linker_loader_add_checksum(linker, ACPI_BUILD_RSDP_FILE, (char *)rsdp - rsdp_table->data, sizeof *rsdp, (char *)&rsdp->checksum - rsdp_table->data); - - return rsdp_table; } static void diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 236a20eaa8..35f17d0d91 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -2547,7 +2547,7 @@ build_amd_iommu(GArray *table_data, BIOSLinker *linker) "IVRS", table_data->len - iommu_start, 1, NULL, NULL); } -static GArray * +static void build_rsdp(GArray *rsdp_table, BIOSLinker *linker, unsigned rsdt_tbl_offset) { AcpiRsdpDescriptor *rsdp = acpi_data_push(rsdp_table, sizeof *rsdp); @@ -2569,8 +2569,6 @@ build_rsdp(GArray *rsdp_table, BIOSLinker *linker, unsigned rsdt_tbl_offset) bios_linker_loader_add_checksum(linker, ACPI_BUILD_RSDP_FILE, (char *)rsdp - rsdp_table->data, sizeof *rsdp, (char *)&rsdp->checksum - rsdp_table->data); - - return rsdp_table; } typedef -- 2.19.2