From patchwork Fri Jun 21 06:28:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, Chen" X-Patchwork-Id: 1119992 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=intel.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45VV1l1T0Bz9s4Y for ; Fri, 21 Jun 2019 17:00:10 +1000 (AEST) Received: from localhost ([::1]:55144 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1heDWq-0000Ob-Su for incoming@patchwork.ozlabs.org; Fri, 21 Jun 2019 03:00:08 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56628) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1heDLU-00087T-Me for qemu-devel@nongnu.org; Fri, 21 Jun 2019 02:48:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1heD75-0007zo-VZ for qemu-devel@nongnu.org; Fri, 21 Jun 2019 02:33:33 -0400 Received: from mga01.intel.com ([192.55.52.88]:19607) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1heD74-0007x3-CY; Fri, 21 Jun 2019 02:33:30 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Jun 2019 23:33:26 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,399,1557212400"; d="scan'208";a="358780519" Received: from unknown (HELO localhost.localdomain) ([10.239.13.19]) by fmsmga005.fm.intel.com with ESMTP; 20 Jun 2019 23:33:25 -0700 From: Zhang Chen To: Xie Changlong , Kevin Wolf , Max Reitz , qemu-block , qemu-dev Date: Fri, 21 Jun 2019 14:28:43 +0800 Message-Id: <20190621062843.1605-1-chen.zhang@intel.com> X-Mailer: git-send-email 2.17.GIT X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.88 Subject: [Qemu-devel] [PATCH V2 RESEND] block/replication.c: Fix crash issue after failover X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Zhang Chen , Zhang Chen Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Zhang Chen If we try to close replication after failover, it will crash here. So we need check the block job on active disk before cancel the job. Signed-off-by: Zhang Chen --- block/replication.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/block/replication.c b/block/replication.c index b41bc507c0..a68bc7e986 100644 --- a/block/replication.c +++ b/block/replication.c @@ -149,7 +149,9 @@ static void replication_close(BlockDriverState *bs) replication_stop(s->rs, false, NULL); } if (s->stage == BLOCK_REPLICATION_FAILOVER) { - job_cancel_sync(&s->commit_job->job); + if (s->commit_job) { + job_cancel_sync(&s->commit_job->job); + } } if (s->mode == REPLICATION_MODE_SECONDARY) {