From patchwork Thu May 27 10:44:14 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 53719 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A1A1DB7D17 for ; Thu, 27 May 2010 20:50:25 +1000 (EST) Received: from localhost ([127.0.0.1]:35867 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OHafO-00080i-0g for incoming@patchwork.ozlabs.org; Thu, 27 May 2010 06:50:22 -0400 Received: from [140.186.70.92] (port=47495 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OHadd-0006iI-Ox for qemu-devel@nongnu.org; Thu, 27 May 2010 06:48:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OHadc-0005IX-Ik for qemu-devel@nongnu.org; Thu, 27 May 2010 06:48:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:28450) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OHadc-0005IP-8h for qemu-devel@nongnu.org; Thu, 27 May 2010 06:48:32 -0400 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o4RAmT9i021479 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 27 May 2010 06:48:29 -0400 Received: from redhat.com (vpn-6-107.tlv.redhat.com [10.35.6.107]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id o4RAmQIa007424; Thu, 27 May 2010 06:48:27 -0400 Date: Thu, 27 May 2010 13:44:14 +0300 From: "Michael S. Tsirkin" To: Jes.Sorensen@redhat.com Message-ID: <20100527104414.GA7250@redhat.com> References: <1274955749-20689-1-git-send-email-Jes.Sorensen@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1274955749-20689-1-git-send-email-Jes.Sorensen@redhat.com> User-Agent: Mutt/1.5.19 (2009-01-05) X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: blauwirbel@gmail.com, qemu-devel@nongnu.org Subject: [Qemu-devel] Re: [PATCH] vhost_net.c: v2 Fix build failure introduced by 0bfcd599e3f5c5679cc7d0165a0a1822e2f60de2 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org On Thu, May 27, 2010 at 12:22:29PM +0200, Jes.Sorensen@redhat.com wrote: > From: Jes Sorensen > > 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 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 Acked-by: Jes Sorensen --- 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;