Patchwork hw/pc.c: add ULL suffix in ioport80_read and ioportF0_read return value

login
register
mail settings
Submitter Julien Grall
Date Jan. 11, 2013, 4:41 p.m.
Message ID <1357922503-20202-1-git-send-email-julien.grall@citrix.com>
Download mbox | patch
Permalink /patch/211449/
State New
Headers show

Comments

Julien Grall - Jan. 11, 2013, 4:41 p.m.
The commit c02e1eac887b1b0aee7361b1fcf889e7d47fed9d broke the compilation
for i386. ULL need to be specify for uint64_t value.

Signed-off-by: Julien Grall <julien.grall@citrix.com>
---
 hw/pc.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Stefan Weil - Jan. 12, 2013, 6:37 a.m.
Am 11.01.2013 17:41, schrieb Julien Grall:
> The commit c02e1eac887b1b0aee7361b1fcf889e7d47fed9d broke the compilation
> for i386. ULL need to be specify for uint64_t value.
>
> Signed-off-by: Julien Grall <julien.grall@citrix.com>
> ---
>   hw/pc.c |    4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/hw/pc.c b/hw/pc.c
> index dfa3144..ba1f19d 100644
> --- a/hw/pc.c
> +++ b/hw/pc.c
> @@ -105,7 +105,7 @@ static void ioport80_write(void *opaque, hwaddr addr, uint64_t data,
>   
>   static uint64_t ioport80_read(void *opaque, hwaddr addr, unsigned size)
>   {
> -    return 0xffffffffffffffff;
> +    return 0xffffffffffffffffULL;
>   }
>   
>   /* MSDOS compatibility mode FPU exception support */
> @@ -130,7 +130,7 @@ static void ioportF0_write(void *opaque, hwaddr addr, uint64_t data,
>   
>   static uint64_t ioportF0_read(void *opaque, hwaddr addr, unsigned size)
>   {
> -    return 0xffffffffffffffff;
> +    return 0xffffffffffffffffULL;
>   }
>   
>   /* TSC handling */


Better: use UINT64_MAX. Then reviewers don't have to count 'f's.

As this patch is a build fix, it should be committed directly without
waiting for a qemu-trivial pull request.

Stefan
Blue Swirl - Jan. 12, 2013, 4:11 p.m.
Thanks, applied.

On Fri, Jan 11, 2013 at 4:41 PM, Julien Grall <julien.grall@citrix.com> wrote:
> The commit c02e1eac887b1b0aee7361b1fcf889e7d47fed9d broke the compilation
> for i386. ULL need to be specify for uint64_t value.
>
> Signed-off-by: Julien Grall <julien.grall@citrix.com>
> ---
>  hw/pc.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/hw/pc.c b/hw/pc.c
> index dfa3144..ba1f19d 100644
> --- a/hw/pc.c
> +++ b/hw/pc.c
> @@ -105,7 +105,7 @@ static void ioport80_write(void *opaque, hwaddr addr, uint64_t data,
>
>  static uint64_t ioport80_read(void *opaque, hwaddr addr, unsigned size)
>  {
> -    return 0xffffffffffffffff;
> +    return 0xffffffffffffffffULL;
>  }
>
>  /* MSDOS compatibility mode FPU exception support */
> @@ -130,7 +130,7 @@ static void ioportF0_write(void *opaque, hwaddr addr, uint64_t data,
>
>  static uint64_t ioportF0_read(void *opaque, hwaddr addr, unsigned size)
>  {
> -    return 0xffffffffffffffff;
> +    return 0xffffffffffffffffULL;
>  }
>
>  /* TSC handling */
> --
> Julien Grall
>
>

Patch

diff --git a/hw/pc.c b/hw/pc.c
index dfa3144..ba1f19d 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -105,7 +105,7 @@  static void ioport80_write(void *opaque, hwaddr addr, uint64_t data,
 
 static uint64_t ioport80_read(void *opaque, hwaddr addr, unsigned size)
 {
-    return 0xffffffffffffffff;
+    return 0xffffffffffffffffULL;
 }
 
 /* MSDOS compatibility mode FPU exception support */
@@ -130,7 +130,7 @@  static void ioportF0_write(void *opaque, hwaddr addr, uint64_t data,
 
 static uint64_t ioportF0_read(void *opaque, hwaddr addr, unsigned size)
 {
-    return 0xffffffffffffffff;
+    return 0xffffffffffffffffULL;
 }
 
 /* TSC handling */