From nobody Sun Feb 8 20:59:45 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 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=1569514816; cv=none; d=zoho.com; s=zohoarc; b=JIBQvPHq95ba1BTZXCNF9pfDg+g2QS+7aPX8DAEXSQ3XrRUwE2ML2Z0FC5s6tTpKzCEIrQLRbsMyHwLddIzcTJmOvBkuBBPuUcZGE5mEG7Y7VslWoP6nw10CbPHh1PSKEfznC7Ld0DkUM/fM1eJA+mLrfzcXKUmGebFpBE4lf5E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569514816; 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:ARC-Authentication-Results; bh=WgNZGb2YUlmiqHdH8uboFQJNaBcsICzj0ofbOKA5spY=; b=SHMxDzPXaeBf55SNhUM9LLgyB/l78KrORGYlA+toKsHGRmLYDMvGleqeOgtZgHpl0hLo10Pq4SRObH8BoBIOynGWBFA9aZJr+/q6GVpt8ievx4bhF6mTPZLDY0/prIIEee+0rjCWqeblqEOddANdDyxMtqjxICn4UlOxw/rU0C4= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1569514816540753.2270911922627; Thu, 26 Sep 2019 09:20:16 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EA93C10DCCA4; Thu, 26 Sep 2019 16:20:14 +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 4BD3F60C80; Thu, 26 Sep 2019 16:20:14 +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 6A5311803517; Thu, 26 Sep 2019 16:20:13 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x8QGE97o003451 for ; Thu, 26 Sep 2019 12:14:09 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5599E5D9CD; Thu, 26 Sep 2019 16:14:09 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id D28175D9C3 for ; Thu, 26 Sep 2019 16:14:07 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Thu, 26 Sep 2019 18:12:13 +0200 Message-Id: <06b78b6eef635bf33751f2fab3930c4ed8ad53ef.1569514291.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 17/39] qemuMigrationSrcIsSafe: Rework slightly 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.64]); Thu, 26 Sep 2019 16:20:15 +0000 (UTC) Content-Type: text/plain; charset="utf-8" There are going to be more disk types that are considered unsafe with respect to migration. Therefore, move the error reporting call outside of if() body and rework if-else combo to switch(). Signed-off-by: Michal Privoznik --- src/qemu/qemu_migration.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index a98ec2d55a..693240ed3d 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1239,6 +1239,8 @@ qemuMigrationSrcIsSafe(virDomainDefPtr def, for (i =3D 0; i < def->ndisks; i++) { virDomainDiskDefPtr disk =3D def->disks[i]; const char *src =3D virDomainDiskGetSource(disk); + int actualType =3D virStorageSourceGetActualType(disk->src); + bool unsafe =3D false; =20 /* Disks without any source (i.e. floppies and CD-ROMs) * OR readonly are safe. */ @@ -1252,21 +1254,34 @@ qemuMigrationSrcIsSafe(virDomainDefPtr def, continue; =20 /* However, disks on local FS (e.g. ext4) are not safe. */ - if (virStorageSourceGetActualType(disk->src) =3D=3D VIR_STORAGE_TY= PE_FILE) { + switch ((virStorageType) actualType) { + case VIR_STORAGE_TYPE_FILE: if ((rc =3D virFileIsSharedFS(src)) < 0) { return false; } else if (rc =3D=3D 0) { - virReportError(VIR_ERR_MIGRATE_UNSAFE, "%s", - _("Migration without shared storage is unsa= fe")); - return false; + unsafe =3D true; } if ((rc =3D virStorageFileIsClusterFS(src)) < 0) return false; else if (rc =3D=3D 1) continue; - } else if (virStorageSourceGetActualType(disk->src) =3D=3D VIR_STO= RAGE_TYPE_NETWORK) { + break; + case VIR_STORAGE_TYPE_NETWORK: /* But network disks are safe again. */ continue; + + case VIR_STORAGE_TYPE_NONE: + case VIR_STORAGE_TYPE_BLOCK: + case VIR_STORAGE_TYPE_DIR: + case VIR_STORAGE_TYPE_VOLUME: + case VIR_STORAGE_TYPE_LAST: + break; + } + + if (unsafe) { + virReportError(VIR_ERR_MIGRATE_UNSAFE, "%s", + _("Migration without shared storage is unsafe")= ); + return false; } =20 /* Our code elsewhere guarantees shared disks are either readonly = (in --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list