From patchwork Fri Sep 28 15:22:45 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 187802 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 38D2F2C009E for ; Sat, 29 Sep 2012 01:24:05 +1000 (EST) Received: from localhost ([::1]:39999 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THcQ7-0005PI-99 for incoming@patchwork.ozlabs.org; Fri, 28 Sep 2012 11:24:03 -0400 Received: from eggs.gnu.org ([208.118.235.92]:33635) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THcPg-00054h-Up for qemu-devel@nongnu.org; Fri, 28 Sep 2012 11:23:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1THcPc-000188-Ht for qemu-devel@nongnu.org; Fri, 28 Sep 2012 11:23:36 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:42589) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THcPc-00017r-BT for qemu-devel@nongnu.org; Fri, 28 Sep 2012 11:23:32 -0400 Received: by padfb10 with SMTP id fb10so2389923pad.4 for ; Fri, 28 Sep 2012 08:23:31 -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=68+L7G7seNKH2WsZYesFuGGHhklXaAPXnuvVFsInLWU=; b=LSI67E6/FTqan2zmAIQ3EF+JoHRXb/Wwl5KbGgqlgeatpO9T3agTAFVUC9p38DSECh F9caHiSLYO3UsCPna6ttwoTaK20yS3k6myVChGo+wnIH+GFQ4ZqmudfvLSuqqAQ853WP z974BhUvb7xL5kFCjPClMiWSSDjknSYQ545rE4JVb6zKA8q8i1GseaGeFMl52DwYj+p/ HsboGPWQmj+zmYWI8SY3GrPR++7OOSxcpCKkBqCCiYvuX8InYcdftUnM0Gx72vsILrYN vrP+OMrhHkTZSDICs7ZYBbFR08kgWyXlxfVf+MGXR4IJID1wlqcg5mijFFcomTbEsOSO u3rA== Received: by 10.66.81.231 with SMTP id d7mr18245550pay.50.1348845811498; Fri, 28 Sep 2012 08:23:31 -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 e9sm5648599pay.34.2012.09.28.08.23.28 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 28 Sep 2012 08:23:30 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 28 Sep 2012 17:22:45 +0200 Message-Id: <1348845782-15073-3-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.12 In-Reply-To: <1348845782-15073-1-git-send-email-pbonzini@redhat.com> References: <1348845782-15073-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.220.45 Cc: kwolf@redhat.com, Jeff Cody Subject: [Qemu-devel] [PATCH 02/19] 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 Signed-off-by: Paolo Bonzini --- 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