From nobody Sat May 18 21:26:50 2024 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=1563432224; cv=none; d=zoho.com; s=zohoarc; b=FcT5xAqMqLx6jNxVAFKV7hZp73TsXFAxQnMxExiqPJZd6mZjGzmL0KhNLz23Peod3D1QA049mPnRcjqC4UZrxcuhahr0cIKu2OoAqe7t4Ml/mWHFsKAp9+VfqOb9C3qXmi+MWWeQNbNAlVkJ+HMnD/nftbb0eSJ0nF0qNFkrQes= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563432224; h=Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=vT8tcLiDVIS8YeW5zS37qjf4Iv9K5ruFmttfnyOLlvM=; b=nBVYrd9C4gRFvvhQLnI8xrNcvILbPZ1CfXfyR1ddqkZRAWSAjoOPtDixdMuW5pY7/JCMyqPHsX+MoA8RNAeY+5sZMnVOLW7lfkHzPuIoYVy+gjTGFgAYk6CBRvsXm233qCre3t8jKHblaFiKzURBPno4vV5kKO6nw2kjtewtMqE= 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 15634322247768.761274361871529; Wed, 17 Jul 2019 23:43:44 -0700 (PDT) Received: from localhost ([::1]:34832 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1ho08f-0005Kv-56 for importer@patchew.org; Thu, 18 Jul 2019 02:43:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50941) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1ho08V-0004wY-2u for qemu-devel@nongnu.org; Thu, 18 Jul 2019 02:43:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ho08U-0003ka-2J for qemu-devel@nongnu.org; Thu, 18 Jul 2019 02:43:27 -0400 Received: from mga06.intel.com ([134.134.136.31]:4794) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ho08T-0003ef-QN for qemu-devel@nongnu.org; Thu, 18 Jul 2019 02:43:26 -0400 Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Jul 2019 23:43:23 -0700 Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by fmsmga007.fm.intel.com with ESMTP; 17 Jul 2019 23:43:23 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,276,1559545200"; d="scan'208";a="169768427" From: Wei Yang To: qemu-devel@nongnu.org Date: Thu, 18 Jul 2019 14:42:57 +0800 Message-Id: <20190718064257.29218-1-richardw.yang@linux.intel.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: 134.134.136.31 Subject: [Qemu-devel] [PATCH] migration: equation is more proper than and to check LOADVM_QUIT 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-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" LOADVM_QUIT allows a command to quit all layers of nested loadvm loops, while current return value check is not that proper even it works now. Current return value check "ret & LOADVM_QUIT" would return true if bit[0] is 1. This would be true when ret is -1 which is used to indicate an error of handling a command. Since there is only one place return LOADVM_QUIT and no other combination of return value, use "ret =3D=3D LOADVM_QUIT" would be more proper. Signed-off-by: Wei Yang Reviewed-by: Dr. David Alan Gilbert --- migration/savevm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migration/savevm.c b/migration/savevm.c index 1a9b1f411e..25fe7ea05a 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2429,7 +2429,7 @@ retry: case QEMU_VM_COMMAND: ret =3D loadvm_process_command(f); trace_qemu_loadvm_state_section_command(ret); - if ((ret < 0) || (ret & LOADVM_QUIT)) { + if ((ret < 0) || (ret =3D=3D LOADVM_QUIT)) { goto out; } break; --=20 2.17.1