Message ID | 1415168394-11503-1-git-send-email-syeon.hwang@samsung.com |
---|---|
State | New |
Headers | show |
On 05/11/2014 07:19, SeokYeon Hwang wrote: > Some of variables handling 64bit address must be changed from 'ram_addr_t' to 'uint64_t'. > > Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com> Thanks, applied. I modified the commit message as follows: smbios: change 'ram_addr_t' variables to 'uint64_t' 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()". Paolo > --- > 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 */ > >
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 */
Some of variables handling 64bit address must be changed from 'ram_addr_t' to 'uint64_t'. Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com> --- hw/i386/smbios.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)