From nobody Thu Nov 6 01:32:24 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1538818141188548.8688772151125; Sat, 6 Oct 2018 02:29:01 -0700 (PDT) Received: from localhost ([::1]:38460 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g8itP-0002ND-Hf for importer@patchew.org; Sat, 06 Oct 2018 05:28:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54013) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g8irQ-00013N-Kf for qemu-devel@nongnu.org; Sat, 06 Oct 2018 05:27:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g8ijO-0006VB-9a for qemu-devel@nongnu.org; Sat, 06 Oct 2018 05:18:43 -0400 Received: from m50-132.163.com ([123.125.50.132]:43422) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g8ijN-0006Rg-Ib for qemu-devel@nongnu.org; Sat, 06 Oct 2018 05:18:38 -0400 Received: from localhost.localdomain (unknown [183.159.200.5]) by smtp2 (Coremail) with SMTP id DNGowABHPSXhfbhbe4RHAA--.32S2; Sat, 06 Oct 2018 17:18:26 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=i4I0Rs5z6998Rqs2eF NvKHw10fozxD1FqhSjJd7u1qE=; b=b35JyaSUM/mwAIZzuy9PEJPY2Aaij+X2yY 6CVmYTZjRIp+Il+CHaXhduOw0jpKUGyYXnb9sk7Y48iDwJab1GLTJ2leD2P6Xjpw V3a7B+j44fUJz0XXc2AS/5wNnIQf8pDCe06f91NrueIBKr7k+otYxV/vvIIym5GU mlouYjNK4= From: Li Qiang To: pbonzini@redhat.com, dgilbert@redhat.com Date: Sat, 6 Oct 2018 02:18:16 -0700 Message-Id: <20181006091816.7659-1-liq3ea@163.com> X-Mailer: git-send-email 2.17.1 X-CM-TRANSID: DNGowABHPSXhfbhbe4RHAA--.32S2 X-Coremail-Antispam: 1Uf129KBjvdXoWrCr48CF4rKr1DXry5GrWruFg_yoWxWrX_u3 WIqw40gw4UZw1jya17A3ZxtF1Sqa1rtFnayw4xtayru345Wa15Ja1DtFs5ZryUua1xG345 Ar9xWry3Kr47tjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IUjpVbJUUUUU== X-Originating-IP: [183.159.200.5] X-CM-SenderInfo: 5oltjvrd6rljoofrz/xtbBLwLXbVUMGR15zgAAs9 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 123.125.50.132 Subject: [Qemu-devel] [PATCH] target/i386: kvm: just return after migrate_add_blocker failed 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: Li Qiang , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" When migrate_add_blocker failed, the invtsc_mig_blocker is not appended so no need to remove. This can save several instructions. Signed-off-by: Li Qiang --- target/i386/kvm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/i386/kvm.c b/target/i386/kvm.c index 0b2a07d3a4..6ba84a39f3 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -1153,7 +1153,7 @@ int kvm_arch_init_vcpu(CPUState *cs) if (local_err) { error_report_err(local_err); error_free(invtsc_mig_blocker); - goto fail; + return r; } /* for savevm */ vmstate_x86_cpu.unmigratable =3D 1; --=20 2.17.1