From patchwork Fri May 24 06:35:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1104616 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 459Gr60t1Kz9s00 for ; Fri, 24 May 2019 16:37:10 +1000 (AEST) Received: from localhost ([127.0.0.1]:49701 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hU3pE-0002iX-4L for incoming@patchwork.ozlabs.org; Fri, 24 May 2019 02:37:08 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40560) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hU3oc-0002gt-BA for qemu-devel@nongnu.org; Fri, 24 May 2019 02:36:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hU3ob-0002kY-7F for qemu-devel@nongnu.org; Fri, 24 May 2019 02:36:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38166) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hU3ob-0002jr-2A for qemu-devel@nongnu.org; Fri, 24 May 2019 02:36:29 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4E8283082132; Fri, 24 May 2019 06:36:23 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-235.brq.redhat.com [10.40.204.235]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DB5E05B695; Fri, 24 May 2019 06:36:15 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Fri, 24 May 2019 08:35:35 +0200 Message-Id: <20190524063553.5339-3-philmd@redhat.com> In-Reply-To: <20190524063553.5339-1-philmd@redhat.com> References: <20190524063553.5339-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Fri, 24 May 2019 06:36:28 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 02/20] hw/i386/pc: Use size_t type to hold/return a size of array 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: Yang Zhong , Eduardo Habkost , Rob Bradford , "Michael S. Tsirkin" , Marcelo Tosatti , Paolo Bonzini , Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Samuel Ortiz Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Li Qiang --- hw/i386/pc.c | 4 ++-- include/hw/i386/pc.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index fc38b59d2d..df8600ac24 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -104,7 +104,7 @@ struct e820_table { static struct e820_table e820_reserve; static struct e820_entry *e820_table; -static unsigned e820_entries; +static size_t e820_entries; struct hpet_fw_config hpet_cfg = {.count = UINT8_MAX}; /* Physical Address of PVH entry point read from kernel ELF NOTE */ @@ -897,7 +897,7 @@ int e820_add_entry(uint64_t address, uint64_t length, uint32_t type) return e820_entries; } -int e820_get_num_entries(void) +size_t e820_get_num_entries(void) { return e820_entries; } diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index ad3a75d8fa..28b19173b0 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -290,7 +290,7 @@ void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid, #define E820_UNUSABLE 5 int e820_add_entry(uint64_t, uint64_t, uint32_t); -int e820_get_num_entries(void); +size_t e820_get_num_entries(void); bool e820_get_entry(unsigned int, uint32_t, uint64_t *, uint64_t *); extern GlobalProperty pc_compat_4_0[];