From patchwork Mon Jan 13 10:18:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 23156 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f69.google.com (mail-qa0-f69.google.com [209.85.216.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id CD06A202FA for ; Mon, 13 Jan 2014 10:19:37 +0000 (UTC) Received: by mail-qa0-f69.google.com with SMTP id w8sf8989967qac.0 for ; Mon, 13 Jan 2014 02:19:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:mime-version:in-reply-to:references :from:date:message-id:to:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list:content-type :content-transfer-encoding; bh=9i3cHIgu5v3JeSQ7LiGII+AwtqLf0dlKjMp8470K+bQ=; b=bPLy4vzuqVg7ks744EgiD0b6+L5Gxi2CF2cV/AR9Z+e4U7vhbraH3r7/j5xHYCyekQ HzOa+FaHyTil/wzTq8WSxm46C/Sf80iA6+FrHJyec4CEneTed43mn+PjYrGvHn1AZu3P ZhY09u0tqHDVrzYZFy+uFprnNCipvZ8Bm+lcyCfVO2U4Kj1vgjInhrQ6WRLqJ1r00FNs KMVBPPc+WW+1wu/Y46nvsaGLM1W+9hvWHYlRQuLNH/xJngGRS851SL54j3QMgTWLP2/C PGB2fG7iz5CN9SxKUHfAk4piEhi35t0S3gB8r7O2fkyxjAdsd9nEU46ir0fKijHgLVg+ qBPg== X-Gm-Message-State: ALoCoQm5ALxo0mZndpihL3dTRUSNVYfzbR/THlVj5EaW641Uqs4SRXRhUJ0MAY5qgoDls5rc3Ycg X-Received: by 10.236.128.243 with SMTP id f79mr7337299yhi.27.1389608377078; Mon, 13 Jan 2014 02:19:37 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.58.67 with SMTP id o3ls1134984qeq.99.gmail; Mon, 13 Jan 2014 02:19:37 -0800 (PST) X-Received: by 10.58.133.137 with SMTP id pc9mr574940veb.53.1389608377005; Mon, 13 Jan 2014 02:19:37 -0800 (PST) Received: from mail-ve0-f180.google.com (mail-ve0-f180.google.com [209.85.128.180]) by mx.google.com with ESMTPS id tj7si10813512vdc.46.2014.01.13.02.19.36 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 13 Jan 2014 02:19:36 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.180 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.180; Received: by mail-ve0-f180.google.com with SMTP id jz11so5017438veb.25 for ; Mon, 13 Jan 2014 02:19:36 -0800 (PST) X-Received: by 10.58.73.193 with SMTP id n1mr62673vev.75.1389608376932; Mon, 13 Jan 2014 02:19:36 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.59.13.131 with SMTP id ey3csp117049ved; Mon, 13 Jan 2014 02:19:36 -0800 (PST) X-Received: by 10.229.14.1 with SMTP id e1mr25126233qca.15.1389608376530; Mon, 13 Jan 2014 02:19:36 -0800 (PST) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id n2si1372515qac.14.2014.01.13.02.19.36 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 13 Jan 2014 02:19:36 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:41486 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W2ecK-0002nG-4L for patch@linaro.org; Mon, 13 Jan 2014 05:19:36 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48919) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W2ebq-0002WQ-3X for qemu-devel@nongnu.org; Mon, 13 Jan 2014 05:19:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W2ebh-0004n0-8n for qemu-devel@nongnu.org; Mon, 13 Jan 2014 05:19:06 -0500 Received: from mail-lb0-f172.google.com ([209.85.217.172]:37789) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W2ebh-0004mw-1Q for qemu-devel@nongnu.org; Mon, 13 Jan 2014 05:18:57 -0500 Received: by mail-lb0-f172.google.com with SMTP id c11so924714lbj.3 for ; Mon, 13 Jan 2014 02:18:56 -0800 (PST) X-Received: by 10.152.234.231 with SMTP id uh7mr10257000lac.10.1389608335837; Mon, 13 Jan 2014 02:18:55 -0800 (PST) MIME-Version: 1.0 Received: by 10.112.125.3 with HTTP; Mon, 13 Jan 2014 02:18:35 -0800 (PST) In-Reply-To: <1387554416-5837-4-git-send-email-stefanha@redhat.com> References: <1387554416-5837-1-git-send-email-stefanha@redhat.com> <1387554416-5837-4-git-send-email-stefanha@redhat.com> From: Peter Maydell Date: Mon, 13 Jan 2014 10:18:35 +0000 Message-ID: To: Stefan Hajnoczi X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.217.172 Cc: QEMU Developers , Anthony Liguori Subject: Re: [Qemu-devel] [PULL 03/18] vring: factor common code for error exits X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.180 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 On 20 December 2013 15:46, Stefan Hajnoczi wrote: > From: Paolo Bonzini > > Signed-off-by: Paolo Bonzini > Signed-off-by: Stefan Hajnoczi > --- > hw/block/dataplane/virtio-blk.c | 1 + > hw/virtio/dataplane/vring.c | 34 +++++++++++++++++++++------------- > 2 files changed, 22 insertions(+), 13 deletions(-) This results in a compile warning on gcc 4.6.3, I'm afraid: /home/petmay01/linaro/qemu-from-laptop/qemu/hw/virtio/dataplane/vring.c: In function ‘vring_pop’: /home/petmay01/linaro/qemu-from-laptop/qemu/hw/virtio/dataplane/vring.c:400:29: error: ‘ret’ may be used uninitialised in this function [-Werror=uninitialized] As you suggested on irc, this fixes it: thanks -- PMM diff --git a/hw/virtio/dataplane/vring.c b/hw/virtio/dataplane/vring.c index 250d45e..665a1ff 100644 --- a/hw/virtio/dataplane/vring.c +++ b/hw/virtio/dataplane/vring.c @@ -376,7 +376,7 @@ int vring_pop(VirtIODevice *vdev, Vring *vring, barrier(); if (desc.flags & VRING_DESC_F_INDIRECT) { - int ret = get_indirect(vring, elem, &desc); + ret = get_indirect(vring, elem, &desc); if (ret < 0) { goto out; }