| Message ID | 1345755722-25229-1-git-send-email-sw@weilnetz.de |
|---|---|
| State | Superseded |
| Headers | show |
Il 24/08/2012 10:31, Hannes Reinecke ha scritto: > >> Type casts from pointer to integer values must use uintptr_t >> instead of unsigned long. Otherwise the compiler complains on >> hosts with sizeof(pointer) != sizeof(long). >> >> The patch also replace magic number 32 by sizeof(info.serial_number) >> which has the same value but is better for code reviews. >> >> Signed-off-by: Stefan Weil <sw@weilnetz.de> > > Sigh. I never seem to get the hang of typecasting. > > Acked-by: Hannes Reinecke <hare@suse.de> Nope, this needs to be fixed using the same scheme that you used for SAS addresses. Quick before Anthony notices and disables MEGASAS. :) Paolo
On 08/23/2012 11:02 PM, Stefan Weil wrote: > Type casts from pointer to integer values must use uintptr_t > instead of unsigned long. Otherwise the compiler complains on > hosts with sizeof(pointer) != sizeof(long). > > The patch also replace magic number 32 by sizeof(info.serial_number) > which has the same value but is better for code reviews. > > Signed-off-by: Stefan Weil <sw@weilnetz.de> Sigh. I never seem to get the hang of typecasting. Acked-by: Hannes Reinecke <hare@suse.de> Cheers, Hannes
On 08/24/2012 10:16 AM, Paolo Bonzini wrote: > Il 24/08/2012 10:31, Hannes Reinecke ha scritto: >> >>> Type casts from pointer to integer values must use uintptr_t >>> instead of unsigned long. Otherwise the compiler complains on >>> hosts with sizeof(pointer) != sizeof(long). >>> >>> The patch also replace magic number 32 by sizeof(info.serial_number) >>> which has the same value but is better for code reviews. >>> >>> Signed-off-by: Stefan Weil <sw@weilnetz.de> >> >> Sigh. I never seem to get the hang of typecasting. >> >> Acked-by: Hannes Reinecke <hare@suse.de> > > Nope, this needs to be fixed using the same scheme that you used for SAS > addresses. Quick before Anthony notices and disables MEGASAS. :) > Ok, done. Cheers, Hannes
diff --git a/hw/megasas.c b/hw/megasas.c index c35a15d..f2d6783 100644 --- a/hw/megasas.c +++ b/hw/megasas.c @@ -698,8 +698,8 @@ static int megasas_ctrl_get_info(MegasasState *s, MegasasCmd *cmd) } memcpy(info.product_name, "MegaRAID SAS 8708EM2", 20); - snprintf(info.serial_number, 32, "QEMU%08lx", - (unsigned long)s & 0xFFFFFFFF); + snprintf(info.serial_number, sizeof(info.serial_number), + "QEMU%08" PRIxPTR, (uintptr_t)s & 0xFFFFFFFF); snprintf(info.package_version, 0x60, "%s-QEMU", QEMU_VERSION); memcpy(info.image_component[0].name, "APP", 3); memcpy(info.image_component[0].version, MEGASAS_VERSION "-QEMU", 9);
Type casts from pointer to integer values must use uintptr_t instead of unsigned long. Otherwise the compiler complains on hosts with sizeof(pointer) != sizeof(long). The patch also replace magic number 32 by sizeof(info.serial_number) which has the same value but is better for code reviews. Signed-off-by: Stefan Weil <sw@weilnetz.de> --- hw/megasas.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)