From nobody Mon Feb 9 04:45:18 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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 170.10.129.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=1658753140; cv=none; d=zohomail.com; s=zohoarc; b=dIIOGIM1x3qMOAfiM+DG6npdzWaUlaYlMHWsCMRkjU6tQwJPrBo8IxSk4Oltuh5gBQaSDyelc/aGs1nJUmcJj26Prk2hddYeE5zfy+c4hCWI4wKj1KFI8pgwqYzL2167asJ+XKDKJP64IbAo/qIi0IeqPPcUC1HStswqtkY5OJM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658753140; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Xg+oX+NU+kCsWezSYvhqGZb9RDpkh96iChWhi1R1vyM=; b=Tc2cYSD+Vo3+yCtlkn1lR2dtd4dhnpjP5A+L9E+TFDzaufB+auqY3y1rlcs3jzfe6/F5WJFFDbnYuJxBf+EUrGaQib9Syyw8xI9v5DnONW9x37xEvS6e7JmEMfJVVshojnyulFegj/RcO+5DSn3Mh98MNAyGfXPFtCVodAdLSnQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1658753140934372.1728298820169; Mon, 25 Jul 2022 05:45:40 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-639-7UJBfKLfPOWbycqjrIOrrw-1; Mon, 25 Jul 2022 08:45:33 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2DA1B1019C8E; Mon, 25 Jul 2022 12:45:30 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 183C02166B26; Mon, 25 Jul 2022 12:45:30 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id E1E201945D87; Mon, 25 Jul 2022 12:45:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 0DAB61945D9D for ; Mon, 25 Jul 2022 12:45:28 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 006CC18EB5; Mon, 25 Jul 2022 12:45:28 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6B69490A04 for ; Mon, 25 Jul 2022 12:45:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658753139; 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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Xg+oX+NU+kCsWezSYvhqGZb9RDpkh96iChWhi1R1vyM=; b=jFn5PjgJVb94BjEUyvEhRms144d03VCkgZBxqxOEpx0hCsm+Agfa0iFImGtpI7JsnR1ZhC hZNEuPg5gt7zpF+TeLBEAdtKVrvyeDunJoFQDee3VboRjiiZ4fq8rLOZBp9S2xc1uOa4Z/ bi80CCMcC2QxQy0idUYWznh3AjtEsVc= X-MC-Unique: 7UJBfKLfPOWbycqjrIOrrw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 3/5] qemu: migration: Overwrite 'dname' only when NULL Date: Mon, 25 Jul 2022 14:45:20 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 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) X-ZM-MESSAGEID: 1658753141404100003 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa --- src/qemu/qemu_migration.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index a14b774a22..0d696e1d46 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -5422,7 +5422,8 @@ qemuMigrationSrcPerformPeer2Peer2(virQEMUDriver *driv= er, * status code from the sender to the destination host, * so it can do any cleanup if the migration failed. */ - dname =3D dname ? dname : vm->def->name; + if (!dname) + dname =3D vm->def->name; VIR_DEBUG("Finish2 %p ret=3D%d", dconn, ret); qemuDomainObjEnterRemote(vm); ddomain =3D dconn->driver->domainMigrateFinish2 @@ -5707,7 +5708,8 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriver *driv= er, goto cleanup; } } else { - dname =3D dname ? dname : vm->def->name; + if (!dname) + dname =3D vm->def->name; qemuDomainObjEnterRemote(vm); ddomain =3D dconn->driver->domainMigrateFinish3 (dconn, dname, cookiein, cookieinlen, &cookieout, &cookieoutle= n, --=20 2.36.1