From patchwork Thu Nov 1 02:12:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 10663467 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 CFB3B13B5 for ; Thu, 1 Nov 2018 02:14:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B899E2BCA7 for ; Thu, 1 Nov 2018 02:14:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AD0472BCAB; Thu, 1 Nov 2018 02:14:27 +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 507332BCA7 for ; Thu, 1 Nov 2018 02:14:27 +0000 (UTC) Received: from localhost ([::1]:34505 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gI2V8-0005GW-NU for patchwork-qemu-devel@patchwork.kernel.org; Wed, 31 Oct 2018 22:14:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48977) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gI2TQ-0003Cc-B3 for qemu-devel@nongnu.org; Wed, 31 Oct 2018 22:12:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gI2TN-0001Fo-7e for qemu-devel@nongnu.org; Wed, 31 Oct 2018 22:12:40 -0400 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]:47011) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gI2TN-0001F1-00 for qemu-devel@nongnu.org; Wed, 31 Oct 2018 22:12:37 -0400 Received: by mail-pl1-x631.google.com with SMTP id c13-v6so313048plz.13 for ; Wed, 31 Oct 2018 19:12:36 -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=HGMlcocrof4XfMxkfhE1cIVaXL+LXFqJGsugWx1pL3o=; b=OJ6I3M/w1gMbOlPWTSw4v1bS/zKr6/FpfpGwxohxziMbT6AKPb8mB0MemqevAWAZyz N0pe/fjJOSn5Gkn7k1P74UFTYNOG8rXaqjJwy+mb+/M9IVk7BCOPugQmX0HBKkRLFAgl 1UFt0lubshGQngTQdULKbPEjXLH78glZNxmFAabu1lW7GOZXM8VrjE6r3LKLVab9ixRE PCbxDfwvEIPd+x0abeotDnytVMIWpqcPveW0QcY7iz+IEaUqpUN6tJa2jIBA6FXc4LAy zv/LdeWiYGD9W7IJE2U7yTUX54YN8T1Jd9kjfIChDBqc9ioH4lNCNtTmDYcItR32ox17 8w+g== 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=HGMlcocrof4XfMxkfhE1cIVaXL+LXFqJGsugWx1pL3o=; b=AeNrFzDqrPdVrIxQtrMUd8lG0A9kW9uHp7v86hj9rIsrSDsQjm4mocgNqb9FsHUqpB /ZoxJ72M8OgxnQ1GJb/NK5x9gc/xL21nU6uQ6NuxRd1Y6RQrw7xE/cnOo8GZFcRjsgfX OtRsoGxyTVWJ2uepVl1D7lDFBWpZr4HQHCB/bPM6GVAiKDm8rHDyd207o50xMaezTng6 yyiXbSxJqpsywXatQmNbOq1iWiMQUSPMkFggKL5I/MdYT6cNwyHiXqNcM33HwPOODq64 vQPPYrieeonaBy0snpqNw02taBpwhp9Xzq+XduP/U7kglwDuZ9es3yeVTNmPV8JX0fJR Xojw== X-Gm-Message-State: AGRZ1gJBPu812N9+hlCFLfVDuQai7m2nHxe6L+18nnKMGf6OqAGLDDMM 4IlV2xP99lXLMTJd+ZkYZjpIRBhY X-Google-Smtp-Source: AJdET5d1iCIekCbC3mWBG1aTa3fR3tTmymeLBnpWd0/K5f5hJayN7B1yX9ReKh/JJlfCJ1LmhVLc6A== X-Received: by 2002:a17:902:7004:: with SMTP id y4-v6mr5767224plk.35.1541038355646; Wed, 31 Oct 2018 19:12:35 -0700 (PDT) Received: from localhost.localdomain (155.150.229.35.bc.googleusercontent.com. [35.229.150.155]) by smtp.gmail.com with ESMTPSA id n26-v6sm13550517pfh.166.2018.10.31.19.12.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 31 Oct 2018 19:12:34 -0700 (PDT) From: Zhang Chen To: qemu-devel@nongnu.org, zhanghailiang , "Dr. David Alan Gilbert" Date: Thu, 1 Nov 2018 10:12:26 +0800 Message-Id: <20181101021226.6353-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::631 Subject: [Qemu-devel] [PATCH V2] 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 Tested-by: Thomas Huth --- migration/colo.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/migration/colo.c b/migration/colo.c index 956ac236b7..fcff04c78c 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) @@ -415,11 +424,16 @@ static int colo_do_checkpoint_transaction(MigrationState *s, /* Disable block migration */ migrate_set_block_enabled(false, &local_err); qemu_mutex_lock_iothread(); + +#ifdef CONFIG_REPLICATION replication_do_checkpoint_all(&local_err); if (local_err) { qemu_mutex_unlock_iothread(); goto out; } +#else + abort(); +#endif colo_send_message(s->to_dst_file, COLO_MESSAGE_VMSTATE_SEND, &local_err); if (local_err) { @@ -523,11 +537,15 @@ static void colo_process_checkpoint(MigrationState *s) object_unref(OBJECT(bioc)); qemu_mutex_lock_iothread(); +#ifdef CONFIG_REPLICATION replication_start_all(REPLICATION_MODE_PRIMARY, &local_err); if (local_err) { qemu_mutex_unlock_iothread(); goto out; } +#else + abort(); +#endif vm_start(); qemu_mutex_unlock_iothread(); @@ -690,11 +708,15 @@ void *colo_process_incoming_thread(void *opaque) object_unref(OBJECT(bioc)); qemu_mutex_lock_iothread(); +#ifdef CONFIG_REPLICATION replication_start_all(REPLICATION_MODE_SECONDARY, &local_err); if (local_err) { qemu_mutex_unlock_iothread(); goto out; } +#else + abort(); +#endif vm_start(); trace_colo_vm_state_change("stop", "run"); qemu_mutex_unlock_iothread(); @@ -785,18 +807,22 @@ void *colo_process_incoming_thread(void *opaque) goto out; } +#ifdef CONFIG_REPLICATION replication_get_error_all(&local_err); if (local_err) { qemu_mutex_unlock_iothread(); goto out; } + /* 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);