[Qemu-devel] Re: [PATCH] vhost_net.c: v2 Fix build failure introduced by 0bfcd599e3f5c5679cc7d0165a0a1822e2f60de2

[Michael S. Tsirkin]

On Thu, May 27, 2010 at 12:22:29PM +0200, address@hidden wrote:
> From: Jes Sorensen <address@hidden>
> 
> Fix build failure introduced by 0bfcd599e3f5c5679cc7d0165a0a1822e2f60de2
> 
> The format statement expects unsigned long on x86_64, but receives
> unsigned long long, so gcc exits with an error.
> 
> Signed-off-by: Jes Sorensen <address@hidden>

I think this part of 0bfcd599e3f5c5679cc7d0165a0a1822e2f60de2
should just be reverted. We have unsigned long, it should be printed
woith %ll. Casting to uint64_t just so we can print with PRIu64 seems silly.

> ---
>  hw/vhost_net.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/hw/vhost_net.c b/hw/vhost_net.c
> index 26dae79..606aa0c 100644
> --- a/hw/vhost_net.c
> +++ b/hw/vhost_net.c
> @@ -100,7 +100,7 @@ struct vhost_net *vhost_net_init(VLANClientState 
> *backend, int devfd)
>      }
>      if (~net->dev.features & net->dev.backend_features) {
>          fprintf(stderr, "vhost lacks feature mask %" PRIu64 " for backend\n",
> -                ~net->dev.features & net->dev.backend_features);
> +                (uint64_t)(~net->dev.features & net->dev.backend_features));
>          vhost_dev_cleanup(&net->dev);
>          goto fail;
>      }

How about just (untested):

vhost: fix build broken by 0bfcd599e3f5c5679cc7d0165a0a1822e2f60de2

revert over-zealous PRIu64 conversion from
0bfcd599e3f5c5679cc7d0165a0a1822e2f60de2

Signed-off-by: Michael S. Tsirkin <address@hidden>

---

Does this help?

diff --git a/hw/vhost_net.c b/hw/vhost_net.c
index 26dae79..2e292ee 100644
--- a/hw/vhost_net.c
+++ b/hw/vhost_net.c
@@ -99,7 +99,7 @@ struct vhost_net *vhost_net_init(VLANClientState *backend, 
int devfd)
         goto fail;
     }
     if (~net->dev.features & net->dev.backend_features) {
-        fprintf(stderr, "vhost lacks feature mask %" PRIu64 " for backend\n",
+        fprintf(stderr, "vhost lacks feature mask %llu for backend\n",
                 ~net->dev.features & net->dev.backend_features);
         vhost_dev_cleanup(&net->dev);
         goto fail;