Patchwork xhci: fix bad print specifier

login
register
mail settings
Submitter Hervé Poussineau
Date Feb. 21, 2013, 9:58 p.m.
Message ID <1361483888-8976-1-git-send-email-hpoussin@reactos.org>
Download mbox | patch
Permalink /patch/222424/
State New
Headers show

Comments

Hervé Poussineau - Feb. 21, 2013, 9:58 p.m.
This fixes the following compilation error:
hw/usb/hcd-xhci.c:1156:17: error: format ‘%llx’ expects argument of type
‘long long unsigned int’, but argument 4 has type ‘unsigned int’

Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
---
 hw/usb/hcd-xhci.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Stefan Weil - Feb. 22, 2013, 5:40 a.m.
Am 21.02.2013 22:58, schrieb Hervé Poussineau:
> This fixes the following compilation error:
> hw/usb/hcd-xhci.c:1156:17: error: format ‘%llx’ expects argument of type
> ‘long long unsigned int’, but argument 4 has type ‘unsigned int’
>
> Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
> ---
>  hw/usb/hcd-xhci.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
> index 5796102..07afdee 100644
> --- a/hw/usb/hcd-xhci.c
> +++ b/hw/usb/hcd-xhci.c
> @@ -1152,8 +1152,8 @@ static XHCIStreamContext *xhci_find_stream(XHCIEPContext *epctx,
>  
>      if (sctx->sct == -1) {
>          xhci_dma_read_u32s(epctx->xhci, sctx->pctx, ctx, sizeof(ctx));
> -        fprintf(stderr, "%s: init sctx #%d @ %lx: %08x %08x\n", __func__,
> -                streamid, sctx->pctx, ctx[0], ctx[1]);
> +        fprintf(stderr, "%s: init sctx #%d @ " DMA_ADDR_FMT ": %08x %08x\n",
> +                __func__, streamid, sctx->pctx, ctx[0], ctx[1]);
>          sct = (ctx[0] >> 1) & 0x07;
>          if (epctx->lsa && sct != 1) {
>              *cc_error = CC_INVALID_STREAM_TYPE_ERROR;


Reviewed-by: Stefan Weil <sw@weilnetz.de>

Anthony, this is a build regression in git master, so we should not
wait for qemu-trivial to apply it.

Thanks,

Stefan
Gerd Hoffmann - Feb. 22, 2013, 11:26 a.m.
On 02/21/13 22:58, Hervé Poussineau wrote:
> This fixes the following compilation error:
> hw/usb/hcd-xhci.c:1156:17: error: format ‘%llx’ expects argument of type
> ‘long long unsigned int’, but argument 4 has type ‘unsigned int’
> 
> Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>

Acked-by: Gerd Hoffmann <kraxel@redhat.com>

cheers,
  Gerd
Blue Swirl - Feb. 23, 2013, 4:49 p.m.
Thanks, applied.

On Thu, Feb 21, 2013 at 9:58 PM, Hervé Poussineau <hpoussin@reactos.org> wrote:
> This fixes the following compilation error:
> hw/usb/hcd-xhci.c:1156:17: error: format ‘%llx’ expects argument of type
> ‘long long unsigned int’, but argument 4 has type ‘unsigned int’
>
> Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
> ---
>  hw/usb/hcd-xhci.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
> index 5796102..07afdee 100644
> --- a/hw/usb/hcd-xhci.c
> +++ b/hw/usb/hcd-xhci.c
> @@ -1152,8 +1152,8 @@ static XHCIStreamContext *xhci_find_stream(XHCIEPContext *epctx,
>
>      if (sctx->sct == -1) {
>          xhci_dma_read_u32s(epctx->xhci, sctx->pctx, ctx, sizeof(ctx));
> -        fprintf(stderr, "%s: init sctx #%d @ %lx: %08x %08x\n", __func__,
> -                streamid, sctx->pctx, ctx[0], ctx[1]);
> +        fprintf(stderr, "%s: init sctx #%d @ " DMA_ADDR_FMT ": %08x %08x\n",
> +                __func__, streamid, sctx->pctx, ctx[0], ctx[1]);
>          sct = (ctx[0] >> 1) & 0x07;
>          if (epctx->lsa && sct != 1) {
>              *cc_error = CC_INVALID_STREAM_TYPE_ERROR;
> --
> 1.7.10.4
>
>

Patch

diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
index 5796102..07afdee 100644
--- a/hw/usb/hcd-xhci.c
+++ b/hw/usb/hcd-xhci.c
@@ -1152,8 +1152,8 @@  static XHCIStreamContext *xhci_find_stream(XHCIEPContext *epctx,
 
     if (sctx->sct == -1) {
         xhci_dma_read_u32s(epctx->xhci, sctx->pctx, ctx, sizeof(ctx));
-        fprintf(stderr, "%s: init sctx #%d @ %lx: %08x %08x\n", __func__,
-                streamid, sctx->pctx, ctx[0], ctx[1]);
+        fprintf(stderr, "%s: init sctx #%d @ " DMA_ADDR_FMT ": %08x %08x\n",
+                __func__, streamid, sctx->pctx, ctx[0], ctx[1]);
         sct = (ctx[0] >> 1) & 0x07;
         if (epctx->lsa && sct != 1) {
             *cc_error = CC_INVALID_STREAM_TYPE_ERROR;