From patchwork Wed Sep 26 15:56:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 187109 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8B3932C007B for ; Thu, 27 Sep 2012 01:57:47 +1000 (EST) Received: from localhost ([::1]:39349 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGtzd-0000Zv-OT for incoming@patchwork.ozlabs.org; Wed, 26 Sep 2012 11:57:45 -0400 Received: from eggs.gnu.org ([208.118.235.92]:48236) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGtzG-0000Jr-LZ for qemu-devel@nongnu.org; Wed, 26 Sep 2012 11:57:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TGtz6-0004ZX-Se for qemu-devel@nongnu.org; Wed, 26 Sep 2012 11:57:22 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:36644) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGtz6-0004Z6-M7 for qemu-devel@nongnu.org; Wed, 26 Sep 2012 11:57:12 -0400 Received: by pbbrp2 with SMTP id rp2so2106416pbb.4 for ; Wed, 26 Sep 2012 08:57:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=aOYgE+etUe3vpCUjlFfau384Li2jPhYy8tBIL6wIApA=; b=uE/KahcJGTxQ8PRkvXVyS+Q6EfoNOwFFzP5HgBTE87/vp6yV+Fd2JIWMnIm8NyOBVQ EE2thRTseI3xYH4oSXJDZbE8mRdFNfebo5N6w4WMPeRB3GUuSpdtL/6LG+EYMOBTI7H/ UB1Sg5zL0b9SyToQlbqcvTDE2x60cF4ZklnsDY8svvBDiZX+GZSNHcn4S8tb6bOmArVT UHQkxU81GheqaZNLhrcsA6lzZPlG2J1UkANV+Rx+jzmbWwlTo3tv7RObGsI82CpeWFzd sSaQz7lk+HObkQ+LoNS9KHUKW0unLub0L8EYALDFLKFlL359cm6qchW0U4E//dUBRrnZ VVHg== Received: by 10.68.242.9 with SMTP id wm9mr3811717pbc.62.1348675031317; Wed, 26 Sep 2012 08:57:11 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-169-1.ip50.fastwebnet.it. [93.34.169.1]) by mx.google.com with ESMTPS id i2sm2114149pav.13.2012.09.26.08.57.07 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 26 Sep 2012 08:57:09 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 26 Sep 2012 17:56:08 +0200 Message-Id: <1348675011-8794-3-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.12 In-Reply-To: <1348675011-8794-1-git-send-email-pbonzini@redhat.com> References: <1348675011-8794-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Cc: kwolf@redhat.com, jcody@redhat.com Subject: [Qemu-devel] [PATCH v2 02/45] blockdev: rename block_stream_cb to a generic block_job_cb 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 From: Jeff Cody Signed-off-by: Jeff Cody --- v1->v2: now synced with Jeff's live commit patch, and moved towards the beginning of the series to minimize conflicts blockdev.c | 6 +++--- trace-events | 2 +- 2 file modificati, 4 inserzioni(+), 4 rimozioni(-) diff --git a/blockdev.c b/blockdev.c index de5457d..fa338fb 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1065,12 +1065,12 @@ static QObject *qobject_from_block_job(BlockJob *job) job->speed); } -static void block_stream_cb(void *opaque, int ret) +static void block_job_cb(void *opaque, int ret) { BlockDriverState *bs = opaque; QObject *obj; - trace_block_stream_cb(bs, bs->job, ret); + trace_block_job_cb(bs, bs->job, ret); assert(bs->job); obj = qobject_from_block_job(bs->job); @@ -1112,7 +1112,7 @@ void qmp_block_stream(const char *device, bool has_base, } stream_start(bs, base_bs, base, has_speed ? speed : 0, - block_stream_cb, bs, &local_err); + block_job_cb, bs, &local_err); if (error_is_set(&local_err)) { error_propagate(errp, local_err); return; diff --git a/trace-events b/trace-events index f5b5097..e90de71 100644 --- a/trace-events +++ b/trace-events @@ -77,7 +77,7 @@ stream_start(void *bs, void *base, void *s, void *co, void *opaque) "bs %p base # blockdev.c qmp_block_job_cancel(void *job) "job %p" -block_stream_cb(void *bs, void *job, int ret) "bs %p job %p ret %d" +block_job_cb(void *bs, void *job, int ret) "bs %p job %p ret %d" qmp_block_stream(void *bs, void *job) "bs %p job %p" # hw/virtio-blk.c