From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37403) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XowW9-0004sv-0G for qemu-devel@nongnu.org; Thu, 13 Nov 2014 10:41:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XowW2-0007pM-Tl for qemu-devel@nongnu.org; Thu, 13 Nov 2014 10:41:04 -0500 Received: from mail-wi0-x230.google.com ([2a00:1450:400c:c05::230]:54698) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XowW2-0007pA-NK for qemu-devel@nongnu.org; Thu, 13 Nov 2014 10:40:58 -0500 Received: by mail-wi0-f176.google.com with SMTP id ex7so1406165wid.9 for ; Thu, 13 Nov 2014 07:40:58 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 13 Nov 2014 16:40:27 +0100 Message-Id: <1415893228-25823-13-git-send-email-pbonzini@redhat.com> In-Reply-To: <1415893228-25823-1-git-send-email-pbonzini@redhat.com> References: <1415893228-25823-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 12/13] smbios: change 'ram_addr_t' variables to 'uint64_t' List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: SeokYeon Hwang From: SeokYeon Hwang ram_addr_t should not be used except if referring to a RAMBlobk. Using 'uint64_t' avoids a -Wconstant-conversion warning, which clang >= 3.4 produces in "smbios_get_tables()". Signed-off-by: SeokYeon Hwang Signed-off-by: Paolo Bonzini --- hw/i386/smbios.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/i386/smbios.c b/hw/i386/smbios.c index 8a7ad48..024e594 100644 --- a/hw/i386/smbios.c +++ b/hw/i386/smbios.c @@ -645,7 +645,7 @@ static void smbios_build_type_4_table(unsigned instance) static void smbios_build_type_16_table(unsigned dimm_cnt) { - ram_addr_t size_kb; + uint64_t size_kb; SMBIOS_BUILD_TABLE_PRE(16, 0x1000, true); /* required */ @@ -669,10 +669,10 @@ static void smbios_build_type_16_table(unsigned dimm_cnt) #define MAX_T17_STD_SZ 0x7FFF /* (32G - 1M), in Megabytes */ #define MAX_T17_EXT_SZ 0x80000000 /* 2P, in Megabytes */ -static void smbios_build_type_17_table(unsigned instance, ram_addr_t size) +static void smbios_build_type_17_table(unsigned instance, uint64_t size) { char loc_str[128]; - ram_addr_t size_mb; + uint64_t size_mb; SMBIOS_BUILD_TABLE_PRE(17, 0x1100 + instance, true); /* required */ @@ -711,9 +711,9 @@ static void smbios_build_type_17_table(unsigned instance, ram_addr_t size) } static void smbios_build_type_19_table(unsigned instance, - ram_addr_t start, ram_addr_t size) + uint64_t start, uint64_t size) { - ram_addr_t end, start_kb, end_kb; + uint64_t end, start_kb, end_kb; SMBIOS_BUILD_TABLE_PRE(19, 0x1300 + instance, true); /* required */ -- 1.8.3.1