From patchwork Tue Jun 17 03:45:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 360307 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 2BD0C14008B for ; Tue, 17 Jun 2014 13:48:12 +1000 (EST) Received: from localhost ([::1]:47211 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwkNV-0002Kw-Ta for incoming@patchwork.ozlabs.org; Mon, 16 Jun 2014 23:48:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46062) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwkKZ-0006gq-Gj for qemu-devel@nongnu.org; Mon, 16 Jun 2014 23:45:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WwkKT-0007h7-D5 for qemu-devel@nongnu.org; Mon, 16 Jun 2014 23:45:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45901) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwkKT-0007gn-5E for qemu-devel@nongnu.org; Mon, 16 Jun 2014 23:45:01 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s5H3j0u7008377 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 16 Jun 2014 23:45:00 -0400 Received: from T430.redhat.com (vpn1-113-251.nay.redhat.com [10.66.113.251]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s5H3igHt016708; Mon, 16 Jun 2014 23:44:58 -0400 From: Fam Zheng To: qemu-devel@nongnu.org Date: Tue, 17 Jun 2014 11:45:01 +0800 Message-Id: <1402976701-10271-7-git-send-email-famz@redhat.com> In-Reply-To: <1402976701-10271-1-git-send-email-famz@redhat.com> References: <1402976701-10271-1-git-send-email-famz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Kevin Wolf , Paolo Bonzini , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH 6/6] virtio-blk: Rename complete_request_early to complete_request_vring 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The old name is misleading in its new usage, so rename it. Signed-off-by: Fam Zheng --- hw/block/dataplane/virtio-blk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/block/dataplane/virtio-blk.c b/hw/block/dataplane/virtio-blk.c index 47eb087..e79da1b 100644 --- a/hw/block/dataplane/virtio-blk.c +++ b/hw/block/dataplane/virtio-blk.c @@ -59,7 +59,7 @@ static void notify_guest(VirtIOBlockDataPlane *s) event_notifier_set(s->guest_notifier); } -static void complete_request_early(VirtIOBlockReq *req, unsigned char status) +static void complete_request_vring(VirtIOBlockReq *req, unsigned char status) { stb_p(&req->in->status, status); @@ -166,7 +166,7 @@ void virtio_blk_data_plane_create(VirtIODevice *vdev, VirtIOBlkConf *blk, bdrv_op_block_all(blk->conf.bs, s->blocker); *dataplane = s; - vblk->complete_request = complete_request_early; + vblk->complete_request = complete_request_vring; } /* Context: QEMU global mutex held */