Patchwork hw/qxl: fir build break with newer spice

login
register
mail settings
Submitter Alon Levy
Date Aug. 9, 2011, 12:21 p.m.
Message ID <1312892475-20237-1-git-send-email-alevy@redhat.com>
Download mbox | patch
Permalink /patch/109224/
State New
Headers show

Comments

Alon Levy - Aug. 9, 2011, 12:21 p.m.
ioport_write's val was changed from uint32_t to uint64_t, this
broke two printfs. Use PRId64 instead of %d.

Signed-off-by: Alon Levy <alevy@redhat.com>
---
 hw/qxl.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
Alon Levy - Aug. 9, 2011, 4:26 p.m.
On Tue, Aug 09, 2011 at 03:21:15PM +0300, Alon Levy wrote:
> ioport_write's val was changed from uint32_t to uint64_t, this
> broke two printfs. Use PRId64 instead of %d.

Nack, missed a 'd' on the second fix. And the subject has a typo.

> 
> Signed-off-by: Alon Levy <alevy@redhat.com>
> ---
>  hw/qxl.c |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/qxl.c b/hw/qxl.c
> index db7ae7a..2335e4b 100644
> --- a/hw/qxl.c
> +++ b/hw/qxl.c
> @@ -1189,7 +1189,7 @@ async_common:
>          }
>          d->current_async = orig_io_port;
>          qemu_mutex_unlock(&d->async_lock);
> -        dprint(d, 2, "start async %d (%d)\n", io_port, val);
> +        dprint(d, 2, "start async %d (%"PRId64")\n", io_port, val);
>          break;
>      default:
>          break;
> @@ -1305,7 +1305,8 @@ async_common:
>          break;
>      }
>      case QXL_IO_FLUSH_SURFACES_ASYNC:
> -        dprint(d, 1, "QXL_IO_FLUSH_SURFACES_ASYNC (%d) (%s, s#=%d, res#=%d)\n",
> +        dprint(d, 1, "QXL_IO_FLUSH_SURFACES_ASYNC"
> +                     " (%"PRId64"d) (%s, s#=%d, res#=%d)\n",
>                 val, qxl_mode_to_string(d->mode), d->guest_surfaces.count,
>                 d->num_free_res);
>          qxl_spice_flush_surfaces_async(d);
> -- 
> 1.7.6
> 
>

Patch

diff --git a/hw/qxl.c b/hw/qxl.c
index db7ae7a..2335e4b 100644
--- a/hw/qxl.c
+++ b/hw/qxl.c
@@ -1189,7 +1189,7 @@  async_common:
         }
         d->current_async = orig_io_port;
         qemu_mutex_unlock(&d->async_lock);
-        dprint(d, 2, "start async %d (%d)\n", io_port, val);
+        dprint(d, 2, "start async %d (%"PRId64")\n", io_port, val);
         break;
     default:
         break;
@@ -1305,7 +1305,8 @@  async_common:
         break;
     }
     case QXL_IO_FLUSH_SURFACES_ASYNC:
-        dprint(d, 1, "QXL_IO_FLUSH_SURFACES_ASYNC (%d) (%s, s#=%d, res#=%d)\n",
+        dprint(d, 1, "QXL_IO_FLUSH_SURFACES_ASYNC"
+                     " (%"PRId64"d) (%s, s#=%d, res#=%d)\n",
                val, qxl_mode_to_string(d->mode), d->guest_surfaces.count,
                d->num_free_res);
         qxl_spice_flush_surfaces_async(d);