From patchwork Wed Oct 24 16:35:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 10654805 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 C990313BF for ; Wed, 24 Oct 2018 16:36:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B42952B11C for ; Wed, 24 Oct 2018 16:36:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A80092B11E; Wed, 24 Oct 2018 16:36:55 +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=-7.7 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,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 523742B11C for ; Wed, 24 Oct 2018 16:36:55 +0000 (UTC) Received: from localhost ([::1]:49396 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gFM9O-00005X-L0 for patchwork-qemu-devel@patchwork.kernel.org; Wed, 24 Oct 2018 12:36:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51570) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gFM8I-0007va-2g for qemu-devel@nongnu.org; Wed, 24 Oct 2018 12:35:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gFM8E-0006Gm-U7 for qemu-devel@nongnu.org; Wed, 24 Oct 2018 12:35:46 -0400 Received: from mail-pf1-x436.google.com ([2607:f8b0:4864:20::436]:43351) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gFM8E-0006GJ-Md for qemu-devel@nongnu.org; Wed, 24 Oct 2018 12:35:42 -0400 Received: by mail-pf1-x436.google.com with SMTP id q1-v6so2680913pfh.10 for ; Wed, 24 Oct 2018 09:35:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=ecvoe0u/DMRkPGfPJpG+mbj4SBpXQ8LWmTrm0L2joWs=; b=W1FYl1WMC1pEpCdsOUVE6jt933NgvAfCYRJq8nqKqgWhidXyICn5pImY4NjN9nH9Py /mA2BYa/QK1CA5jjj/II0WS8fopakSAPxCTZZ3JdbA3+j+jQZeqd5NI/cMSFJr0t+jBv At71xbEP6InDFpEqs8FTDxpVhDOAxtvk3PHL0BjqGLu77jle4+LV1xn6C57X4bNRUqBm K8R8feYyrz6qpkt8tu6OdZevDZLwBn/OfzLO+IKuVmCHcADb9Q1C2f2uEfMfmV5+GJro UXz6fb19szfMfHM+FN58XrCkNJWjLpiO/UxppeAK/9troQX92A3AXFG27P4kTpOfn6Zm OESg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=ecvoe0u/DMRkPGfPJpG+mbj4SBpXQ8LWmTrm0L2joWs=; b=dknLdk8qAwz0jQD0Ey6NbdhhCSW27RsbEcBz0lYuDXVLX/T62kVU3xldFRFHY4k9Ua 4Ehxy5Hnq+yhC9weuRiwVOmGa0E5hcz9otL7v/jHxKhqYVzLbhFtLY4nPXEe6h0Fysmd 8hSUJsqU3U1O6OX8mkTvIKo/TESuqsK1nTUOhBOSE+SBx7Mhc2Zn2Vjq5Mif53BgizJL E7mhkKa22aEq8ogIP6F00Bp8QUeoYUVb4/zEWz1+wk8QHH6+osFH0oOHKUS50M7P6UV6 H4DA+Yb/qw81dDvoJE8AP/oymxKBWL7bZUXxVBZ08gjMJZPUq3R93Hnc918QqLsUQ2rb GNGQ== X-Gm-Message-State: AGRZ1gJVoG/lEQe96mCo3d49zlaOElnbhxzSfEqkJkoquyKTZlNKZ4fe 2+DFt5FozeGBSpc8qaznC/vxDaxe X-Google-Smtp-Source: AJdET5cZRXzKkMiqWyZYZ6GAAMeOFL8ZtSLvFm0TxfPiaUAE2dL4sCYCZuVgk+5pL2Gm9s+vrpNuTg== X-Received: by 2002:a62:a50d:: with SMTP id v13-v6mr3338920pfm.18.1540398941164; Wed, 24 Oct 2018 09:35:41 -0700 (PDT) Received: from localhost.localdomain (155.150.229.35.bc.googleusercontent.com. [35.229.150.155]) by smtp.gmail.com with ESMTPSA id k12-v6sm7897226pgr.81.2018.10.24.09.35.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Oct 2018 09:35:40 -0700 (PDT) From: Zhang Chen To: qemu-devel@nongnu.org, zhanghailiang , "Dr. David Alan Gilbert" Date: Thu, 25 Oct 2018 00:35:29 +0800 Message-Id: <20181024163529.15665-1-zhangckid@gmail.com> X-Mailer: git-send-email 2.17.1 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::436 Subject: [Qemu-devel] [PATCH] migration/colo.c: Fix compilation issue when disable replication 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: Thomas Huth , Zhang Chen Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP This compilation issue will occur when user use --disable-replication to config Qemu. Reported-by: Thomas Huth Signed-off-by: Zhang Chen Reviewed-by: Dr. David Alan Gilbert --- migration/colo.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/migration/colo.c b/migration/colo.c index 956ac236b7..b81e6ec5bb 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -59,6 +59,8 @@ static bool colo_runstate_is_stopped(void) static void secondary_vm_do_failover(void) { +/* COLO needs enable block-replication */ +#ifdef CONFIG_REPLICATION int old_state; MigrationIncomingState *mis = migration_incoming_get_current(); Error *local_err = NULL; @@ -121,10 +123,14 @@ static void secondary_vm_do_failover(void) if (mis->migration_incoming_co) { qemu_coroutine_enter(mis->migration_incoming_co); } +#else + abort(); +#endif } static void primary_vm_do_failover(void) { +#ifdef CONFIG_REPLICATION MigrationState *s = migrate_get_current(); int old_state; Error *local_err = NULL; @@ -165,6 +171,9 @@ static void primary_vm_do_failover(void) /* Notify COLO thread that failover work is finished */ qemu_sem_post(&s->colo_exit_sem); +#else + abort(); +#endif } COLOMode get_colo_mode(void) @@ -373,6 +382,7 @@ static int colo_do_checkpoint_transaction(MigrationState *s, QIOChannelBuffer *bioc, QEMUFile *fb) { +#ifdef CONFIG_REPLICATION Error *local_err = NULL; int ret = -1; @@ -483,6 +493,9 @@ out: error_report_err(local_err); } return ret; +#else + abort(); +#endif } static void colo_compare_notify_checkpoint(Notifier *notifier, void *data) @@ -790,13 +803,16 @@ void *colo_process_incoming_thread(void *opaque) qemu_mutex_unlock_iothread(); goto out; } +#ifdef CONFIG_REPLICATION /* discard colo disk buffer */ replication_do_checkpoint_all(&local_err); if (local_err) { qemu_mutex_unlock_iothread(); goto out; } - +#else + abort(); +#endif /* Notify all filters of all NIC to do checkpoint */ colo_notify_filters_event(COLO_EVENT_CHECKPOINT, &local_err);