| Message ID | 1348427041-4913-9-git-send-email-colin.king@canonical.com |
|---|---|
| State | Accepted |
| Headers | show |
On Mon, Sep 24, 2012 at 3:03 AM, Colin King <colin.king@canonical.com> wrote: > From: Colin Ian King <colin.king@canonical.com> > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > src/bios/ebda_region/ebda_region.c | 12 +++++++----- > 1 file changed, 7 insertions(+), 5 deletions(-) > > diff --git a/src/bios/ebda_region/ebda_region.c b/src/bios/ebda_region/ebda_region.c > index ad03b36..cf74e05 100644 > --- a/src/bios/ebda_region/ebda_region.c > +++ b/src/bios/ebda_region/ebda_region.c > @@ -30,6 +30,7 @@ > #include <sys/stat.h> > #include <fcntl.h> > #include <unistd.h> > +#include <inttypes.h> > > static off_t ebda_addr = FWTS_NO_EBDA; > > @@ -73,19 +74,20 @@ static int ebda_test1(fwts_framework *fw) > fwts_log_info(fw, > "The Extended BIOS Data Area (EBDA) is normally located at " > "the end of the low 640K region and is typically 2-4K in " > - "size. It should be reserved in the %s table.", > + "size. It should be reserved in the %s table.", > memory_map_name); > > entry = fwts_memory_map_info(memory_map, (uint64_t)ebda_addr); > if ((entry != NULL) && > (entry->type == FWTS_MEMORY_MAP_RESERVED || > entry->type == FWTS_MEMORY_MAP_ACPI)) { > - fwts_passed(fw, "EBDA region mapped at 0x%lx and reserved as a %lldK region in the %s table at 0x%llx..0x%llx.", > + fwts_passed(fw, "EBDA region mapped at 0x%lx and reserved as a %" PRId64 > + "K region in the %s table at 0x%" PRIx64 "..0x%" PRIx64 ".", > ebda_addr, > - (unsigned long long int)(entry->end_address - entry->start_address) / 1024, > + (entry->end_address - entry->start_address) / 1024, > memory_map_name, > - (unsigned long long int)entry->start_address, > - (unsigned long long int)entry->end_address); > + entry->start_address, > + entry->end_address); > } else { > fwts_failed(fw, LOG_LEVEL_MEDIUM, > "EBDAMappedNotReserved", > -- > 1.7.10.4 > Acked-by: Keng-Yu Lin <kengyu@canonical.com>
On 09/24/2012 03:03 AM, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > src/bios/ebda_region/ebda_region.c | 12 +++++++----- > 1 file changed, 7 insertions(+), 5 deletions(-) > > diff --git a/src/bios/ebda_region/ebda_region.c b/src/bios/ebda_region/ebda_region.c > index ad03b36..cf74e05 100644 > --- a/src/bios/ebda_region/ebda_region.c > +++ b/src/bios/ebda_region/ebda_region.c > @@ -30,6 +30,7 @@ > #include <sys/stat.h> > #include <fcntl.h> > #include <unistd.h> > +#include <inttypes.h> > > static off_t ebda_addr = FWTS_NO_EBDA; > > @@ -73,19 +74,20 @@ static int ebda_test1(fwts_framework *fw) > fwts_log_info(fw, > "The Extended BIOS Data Area (EBDA) is normally located at " > "the end of the low 640K region and is typically 2-4K in " > - "size. It should be reserved in the %s table.", > + "size. It should be reserved in the %s table.", > memory_map_name); > > entry = fwts_memory_map_info(memory_map, (uint64_t)ebda_addr); > if ((entry != NULL) && > (entry->type == FWTS_MEMORY_MAP_RESERVED || > entry->type == FWTS_MEMORY_MAP_ACPI)) { > - fwts_passed(fw, "EBDA region mapped at 0x%lx and reserved as a %lldK region in the %s table at 0x%llx..0x%llx.", > + fwts_passed(fw, "EBDA region mapped at 0x%lx and reserved as a %" PRId64 > + "K region in the %s table at 0x%" PRIx64 "..0x%" PRIx64 ".", > ebda_addr, > - (unsigned long long int)(entry->end_address - entry->start_address) / 1024, > + (entry->end_address - entry->start_address) / 1024, > memory_map_name, > - (unsigned long long int)entry->start_address, > - (unsigned long long int)entry->end_address); > + entry->start_address, > + entry->end_address); > } else { > fwts_failed(fw, LOG_LEVEL_MEDIUM, > "EBDAMappedNotReserved", > Acked-by: Ivan Hu <ivan.hu@canonical.com>
diff --git a/src/bios/ebda_region/ebda_region.c b/src/bios/ebda_region/ebda_region.c index ad03b36..cf74e05 100644 --- a/src/bios/ebda_region/ebda_region.c +++ b/src/bios/ebda_region/ebda_region.c @@ -30,6 +30,7 @@ #include <sys/stat.h> #include <fcntl.h> #include <unistd.h> +#include <inttypes.h> static off_t ebda_addr = FWTS_NO_EBDA; @@ -73,19 +74,20 @@ static int ebda_test1(fwts_framework *fw) fwts_log_info(fw, "The Extended BIOS Data Area (EBDA) is normally located at " "the end of the low 640K region and is typically 2-4K in " - "size. It should be reserved in the %s table.", + "size. It should be reserved in the %s table.", memory_map_name); entry = fwts_memory_map_info(memory_map, (uint64_t)ebda_addr); if ((entry != NULL) && (entry->type == FWTS_MEMORY_MAP_RESERVED || entry->type == FWTS_MEMORY_MAP_ACPI)) { - fwts_passed(fw, "EBDA region mapped at 0x%lx and reserved as a %lldK region in the %s table at 0x%llx..0x%llx.", + fwts_passed(fw, "EBDA region mapped at 0x%lx and reserved as a %" PRId64 + "K region in the %s table at 0x%" PRIx64 "..0x%" PRIx64 ".", ebda_addr, - (unsigned long long int)(entry->end_address - entry->start_address) / 1024, + (entry->end_address - entry->start_address) / 1024, memory_map_name, - (unsigned long long int)entry->start_address, - (unsigned long long int)entry->end_address); + entry->start_address, + entry->end_address); } else { fwts_failed(fw, LOG_LEVEL_MEDIUM, "EBDAMappedNotReserved",