From patchwork Tue Jul 5 14:29:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Garcia X-Patchwork-Id: 9214355 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A4A6B6048F for ; Tue, 5 Jul 2016 14:35:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9652C20453 for ; Tue, 5 Jul 2016 14:35:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8B1F424B48; Tue, 5 Jul 2016 14:35:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7879420453 for ; Tue, 5 Jul 2016 14:35:30 +0000 (UTC) Received: from localhost ([::1]:55449 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKRRh-00027E-Gu for patchwork-qemu-devel@patchwork.kernel.org; Tue, 05 Jul 2016 10:35:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43868) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKRMY-0005G0-DG for qemu-devel@nongnu.org; Tue, 05 Jul 2016 10:30:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bKRMT-0004Aw-Fs for qemu-devel@nongnu.org; Tue, 05 Jul 2016 10:30:09 -0400 Received: from smtp3.mundo-r.com ([212.51.32.191]:49080 helo=smtp4.mundo-r.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKRMT-00048c-6R; Tue, 05 Jul 2016 10:30:05 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2BFAgAbw3tX/5tjdVtcHQGDIIFSjSqXNQUBgRCRQYIPgXeFCAGBDwKBMjgUAQEBAQEBAWUnhE0CBHkQPxI8GxmINAG6VwEwhV+CSIdZhQ8FjgRwih+OR4lLhV9Ij0IeNoIIHIFPa4h5AQEB X-IPAS-Result: A2BFAgAbw3tX/5tjdVtcHQGDIIFSjSqXNQUBgRCRQYIPgXeFCAGBDwKBMjgUAQEBAQEBAWUnhE0CBHkQPxI8GxmINAG6VwEwhV+CSIdZhQ8FjgRwih+OR4lLhV9Ij0IeNoIIHIFPa4h5AQEB X-IronPort-AV: E=Sophos;i="5.26,580,1459807200"; d="scan'208";a="81596963" Received: from fanzine.igalia.com ([91.117.99.155]) by smtp4.mundo-r.com with ESMTP; 05 Jul 2016 16:29:32 +0200 Received: from [194.100.51.2] (helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim) id 1bKRLw-00017e-Ej; Tue, 05 Jul 2016 16:29:32 +0200 Received: from berto by perseus.local with local (Exim 4.87) (envelope-from ) id 1bKRLU-0003ZN-Vm; Tue, 05 Jul 2016 17:29:04 +0300 From: Alberto Garcia To: qemu-devel@nongnu.org Date: Tue, 5 Jul 2016 17:29:01 +0300 Message-Id: X-Mailer: git-send-email 2.8.1 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 212.51.32.191 Subject: [Qemu-devel] [PATCH v4 10/11] qemu-img: Set the ID of the block job in img_commit() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Alberto Garcia , qemu-block@nongnu.org, Jeff Cody , Max Reitz , John Snow Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP img_commit() creates a block job without an ID. This is no longer allowed now that we require it to be unique and well-formed. We were solving this by having a fallback in block_job_create(), but now that we extended the API of commit_active_start() we can finally set an explicit ID and revert that change. Signed-off-by: Alberto Garcia Reviewed-by: Max Reitz Reviewed-by: Kevin Wolf --- blockjob.c | 6 ------ qemu-img.c | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/blockjob.c b/blockjob.c index 511c0db..3b9cec7 100644 --- a/blockjob.c +++ b/blockjob.c @@ -132,12 +132,6 @@ void *block_job_create(const char *job_id, const BlockJobDriver *driver, if (job_id == NULL) { job_id = bdrv_get_device_name(bs); - /* Assign a default ID if the BDS does not have a device - * name. We'll get rid of this soon when we finish extending - * the API of all commands that create block jobs. */ - if (job_id[0] == '\0') { - job_id = "default_job"; - } } if (!id_wellformed(job_id)) { diff --git a/qemu-img.c b/qemu-img.c index a78f598..521724c 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -921,7 +921,7 @@ static int img_commit(int argc, char **argv) .bs = bs, }; - commit_active_start(NULL, bs, base_bs, 0, BLOCKDEV_ON_ERROR_REPORT, + commit_active_start("commit", bs, base_bs, 0, BLOCKDEV_ON_ERROR_REPORT, common_block_job_cb, &cbi, &local_err); if (local_err) { goto done;