From patchwork Fri Jun 21 05:52:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, Chen" X-Patchwork-Id: 11008471 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C6AA714E5 for ; Fri, 21 Jun 2019 06:17:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B4AD928795 for ; Fri, 21 Jun 2019 06:17:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9CB292897D; Fri, 21 Jun 2019 06:17:14 +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=-0.4 required=2.0 tests=BAYES_00,FROM_ADDR_WS, FROM_WSP_TRAIL,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=no version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 553BD28795 for ; Fri, 21 Jun 2019 06:17:14 +0000 (UTC) Received: from localhost ([::1]:55020 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1heCrJ-0003QY-GR for patchwork-qemu-devel@patchwork.kernel.org; Fri, 21 Jun 2019 02:17:13 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47109) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1heClQ-0005C7-AY for qemu-devel@nongnu.org; Fri, 21 Jun 2019 02:11:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1heCXe-0005rf-JH for qemu-devel@nongnu.org; Fri, 21 Jun 2019 01:56:55 -0400 Received: from mga09.intel.com ([134.134.136.24]:60483) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1heCXd-0005l6-DS; Fri, 21 Jun 2019 01:56:53 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Jun 2019 22:56:46 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,399,1557212400"; d="scan'208";a="171116418" Received: from unknown (HELO localhost.localdomain) ([10.239.13.19]) by orsmga002.jf.intel.com with ESMTP; 20 Jun 2019 22:56:44 -0700 From: Zhang Chen To: Xie Changlong , Kevin Wolf , Max Reitz , qemu-block , qemu-dev Date: Fri, 21 Jun 2019 13:52:02 +0800 Message-Id: <20190621055202.28270-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: 134.134.136.24 Subject: [Qemu-devel] [PATCH V2] 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 3d4dedddfc..845f796dd4 100644 --- a/block/replication.c +++ b/block/replication.c @@ -146,7 +146,9 @@ static void replication_close(BlockDriverState *bs) replication_stop(s->rs, false, NULL); } if (s->stage == BLOCK_REPLICATION_FAILOVER) { - job_cancel_sync(&s->active_disk->bs->job->job); + if (s->active_disk->bs->job) { + job_cancel_sync(&s->active_disk->bs->job->job); + } } if (s->mode == REPLICATION_MODE_SECONDARY) {