From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53534) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bI5uE-0000HB-R2 for qemu-devel@nongnu.org; Tue, 28 Jun 2016 23:11:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bI5uD-0002ap-S8 for qemu-devel@nongnu.org; Tue, 28 Jun 2016 23:11:14 -0400 From: Jeff Cody Date: Tue, 28 Jun 2016 23:10:43 -0400 Message-Id: <1467169844-18111-10-git-send-email-jcody@redhat.com> In-Reply-To: <1467169844-18111-1-git-send-email-jcody@redhat.com> References: <1467169844-18111-1-git-send-email-jcody@redhat.com> Subject: [Qemu-devel] [PULL 09/10] blockjob: assert(cb) when create job List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: peter.maydell@linaro.org, jcody@redhat.com, qemu-devel@nongnu.org From: Changlong Xie Callback for block job should always exist Suggested-by: Paolo Bonzini Suggested-by: Kevin Wolf Signed-off-by: Changlong Xie Reviewed-by: Fam Zheng Reviewed-by: Stefan Hajnoczi Reviewed-by: Jeff Cody Message-id: 1466672241-22485-2-git-send-email-xiecl.fnst@cn.fujitsu.com Signed-off-by: Jeff Cody --- block/backup.c | 1 - blockjob.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/block/backup.c b/block/backup.c index 581269b..f87f8d5 100644 --- a/block/backup.c +++ b/block/backup.c @@ -489,7 +489,6 @@ void backup_start(BlockDriverState *bs, BlockDriverState *target, assert(bs); assert(target); - assert(cb); if (bs == target) { error_setg(errp, "Source and target cannot be the same"); diff --git a/blockjob.c b/blockjob.c index 90c4e26..205da9d 100644 --- a/blockjob.c +++ b/blockjob.c @@ -110,6 +110,7 @@ void *block_job_create(const BlockJobDriver *driver, BlockDriverState *bs, BlockBackend *blk; BlockJob *job; + assert(cb); if (bs->job) { error_setg(errp, QERR_DEVICE_IN_USE, bdrv_get_device_name(bs)); return NULL; -- 1.9.3