From nobody Tue Nov 11 03:21:02 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linux.intel.com ARC-Seal: i=1; a=rsa-sha256; t=1561127355; cv=none; d=zoho.com; s=zohoarc; b=jlHPuOEc5AKOnjN7wyawN2TQJl4oFY92i9NU1az0X738FEolve71q3XGPScMaxTVAFnNLU3umrHwfTH/lGW++BTm3kGn3bmvVEwWsMoEkRT853cVEYBsFmNLZ00UHDpDKSQO33lJITtivPoq9K9QqHVzuDul5QPQpU8poocpf4w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1561127355; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=0JF31jY00pLw/SPROqdP7wMrJlKQZ+vdgjqn4Gerw78=; b=fBsqBPlAAkFpc9WZ+7n6CjZiwtax83cqMYGFYnkAa4ZzVFW5LMldVeyXHGMVMTYSkSB2qs7QxO1kw5GwIcHCxbLMLfkjki4NQ9dmGWE9hHHkyRBJQ9VvTUVKz99EyYi7BxxtIr3DYZTBx7jYHFxGezgtF2sjWNnFcHaxZ+E7zpU= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 15611273549571016.8391592826085; Fri, 21 Jun 2019 07:29:14 -0700 (PDT) Received: from localhost ([::1]:35646 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1heKXM-00084U-AS for importer@patchew.org; Fri, 21 Jun 2019 10:29:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42126) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1heKWZ-0007cO-Oe for qemu-devel@nongnu.org; Fri, 21 Jun 2019 10:28:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1heKWX-0001jQ-NS for qemu-devel@nongnu.org; Fri, 21 Jun 2019 10:28:18 -0400 Received: from mga07.intel.com ([134.134.136.100]:22046) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1heKWV-0001gG-S5 for qemu-devel@nongnu.org; Fri, 21 Jun 2019 10:28:16 -0400 Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Jun 2019 07:28:12 -0700 Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by fmsmga008.fm.intel.com with ESMTP; 21 Jun 2019 07:28:11 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,400,1557212400"; d="scan'208";a="160981182" From: Wei Yang To: qemu-devel@nongnu.org Date: Fri, 21 Jun 2019 22:27:39 +0800 Message-Id: <20190621142739.23703-1-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.100 Subject: [Qemu-devel] [PATCH] migrtion: define MigrationState/MigrationIncomingState.state as MigrationStatus 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: Wei Yang , dgilbert@redhat.com, quintela@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" No functional change. Add default case to fix warning. Signed-off-by: Wei Yang --- migration/migration.c | 8 +++++++- migration/migration.h | 6 +++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index 2865ae3fa9..0fd2364961 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -946,6 +946,8 @@ static void fill_source_migration_info(MigrationInfo *i= nfo) case MIGRATION_STATUS_CANCELLED: info->has_status =3D true; break; + default: + return; } info->status =3D s->state; } @@ -1054,6 +1056,8 @@ static void fill_destination_migration_info(Migration= Info *info) info->has_status =3D true; fill_destination_postcopy_migration_info(info); break; + default: + return; } info->status =3D mis->state; } @@ -1446,7 +1450,7 @@ void qmp_migrate_start_postcopy(Error **errp) =20 /* shared migration helpers */ =20 -void migrate_set_state(int *state, int old_state, int new_state) +void migrate_set_state(MigrationStatus *state, int old_state, int new_stat= e) { assert(new_state < MIGRATION_STATUS__MAX); if (atomic_cmpxchg(state, old_state, new_state) =3D=3D old_state) { @@ -1683,6 +1687,8 @@ bool migration_is_idle(void) return false; case MIGRATION_STATUS__MAX: g_assert_not_reached(); + default: + g_assert_not_reached(); } =20 return false; diff --git a/migration/migration.h b/migration/migration.h index 5e8f09c6db..418ee00053 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -65,7 +65,7 @@ struct MigrationIncomingState { =20 QEMUBH *bh; =20 - int state; + MigrationStatus state; =20 bool have_colo_incoming_thread; QemuThread colo_incoming_thread; @@ -151,7 +151,7 @@ struct MigrationState /* params from 'migrate-set-parameters' */ MigrationParameters parameters; =20 - int state; + MigrationStatus state; =20 /* State related to return path */ struct { @@ -234,7 +234,7 @@ struct MigrationState bool decompress_error_check; }; =20 -void migrate_set_state(int *state, int old_state, int new_state); +void migrate_set_state(MigrationStatus *state, int old_state, int new_stat= e); =20 void migration_fd_process_incoming(QEMUFile *f); void migration_ioc_process_incoming(QIOChannel *ioc, Error **errp); --=20 2.19.1