From nobody Tue May 7 22:10:50 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1615290783; cv=none; d=zohomail.com; s=zohoarc; b=MDfZQO+XC57WEydLXnZi4tcM6biZdBMFJc36aWGF9lF3nRLmxHZ6sFgd5bUivoyoLaOdC2YxSCNUgsbqE8fhgkDF2fHaVBt2zFgq9FB9viRwBskT2kdJkgF92hOiE0pKv6kHHCUUc56Jvf7ftYYSMIqBR2j4Xbr4Je6Whjpf0Mg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615290783; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=Qq2m+UIMHM+qG9ZJs0/yB6F/tXHiUtKBGyjhPHwiVwU=; b=AZF3/KcYMhtoXpspVIz2kdVvTfvFl5Zzz6dIe4DY2DFUHUXJCAkKCGwH9yk21Z5U9cF0cedOVl8KPx3qdCzH+jv2Sq58JQeiTP2/4j3GWdduO9/zKiKZL3Tzu5X4pVg2//e3ENNdxfGpOT/6NfkuyCWi2eFmkxrb7Eo4RLs7RxM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1615290783194886.0689642792877; Tue, 9 Mar 2021 03:53:03 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-135-9wTAbTL9M2eq5GRpKRtuxg-1; Tue, 09 Mar 2021 06:52:59 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 44A6C835BDC; Tue, 9 Mar 2021 11:52:52 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BDBDDE14E; Tue, 9 Mar 2021 11:52:50 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id EA6A91809C86; Tue, 9 Mar 2021 11:52:48 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 129Bp9Ha002385 for ; Tue, 9 Mar 2021 06:51:09 -0500 Received: by smtp.corp.redhat.com (Postfix) id 1AB8C60C13; Tue, 9 Mar 2021 11:51:09 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7114C60C04 for ; Tue, 9 Mar 2021 11:51:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615290782; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Qq2m+UIMHM+qG9ZJs0/yB6F/tXHiUtKBGyjhPHwiVwU=; b=Q5rZk9lGVAW37Qay2iw/8W6S/r5hLfASUJXzE6EhXJ+OiWsuJKu1TR2W1+D0P9PoFokoS4 sytxThVTndRugqX9TqTtmHCcMJsCeoRx3cVe0o18A64e3NaJwAHcA1Xu2rB6EqZ8TvPxc5 MViCbwkBWXOgyb9jVkkllJQ820sDZhk= X-MC-Unique: 9wTAbTL9M2eq5GRpKRtuxg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH] qemuMigrationSrcRun: Don't jump to 'exit_monitor' from outside of the monitor Date: Tue, 9 Mar 2021 12:51:04 +0100 Message-Id: <823b48dfb1227335fd80e57c02b0051af4938a70.1615290664.git.pkrempa@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Failure of 'qemuMigrationSetDBusVMState' would jump to 'exit_monitor' but the function isn't called inside of the monitor context. Signed-off-by: Peter Krempa Reviewed-by: Jiri Denemark --- src/qemu/qemu_migration.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index e44931dcfa..79dcb4a15d 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -4156,7 +4156,7 @@ qemuMigrationSrcRun(virQEMUDriverPtr driver, } if (qemuMigrationSetDBusVMState(driver, vm) < 0) - goto exit_monitor; + goto error; /* Before EnterMonitor, since already qemuProcessStopCPUs does that */ if (!(flags & VIR_MIGRATE_LIVE) && --=20 2.29.2