From nobody Wed May 1 23:01:41 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1579662291; cv=none; d=zohomail.com; s=zohoarc; b=Jce7O3NU9kkjJmhVJR26rIYV6m2/UUJPisjCffH2si/bRSN1IPAEGeoVrv6YczE9ziSFFWU9YMXnKf5qaypE3aHdvWSg+x7jZuzcGVG4TQuH+Nz11Y4Ja7Se6QrrCE9xXrEh/Tm6Mx9eIgihXbyFKtLwcKZJp/fhcPUPEDjvABs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579662291; 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=RurOQKRn765f8gHb5FB4t/X9nOGW18aD18tgfZu+8cM=; b=ghVzVV5yBgiFZYLIynkaakjtqxXqxhyLxaxlGi847DEiFixBr7lSm++hrHjclb6Sp9zxOMbOd5JiH/Y5FQHpREWJNRGPKeNdvxgktWhj/NnOpF6s2gaNzkAxhwCl+Z+3CjTtt8o/BRPCZmBByOUt/zrw5xB85ku0DIDBaIeS190= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1579662291128810.4560631729856; Tue, 21 Jan 2020 19:04:51 -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-295-73t5s0ENMP6SgM9YDbHj5A-1; Tue, 21 Jan 2020 22:04:48 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9DA97477; Wed, 22 Jan 2020 03:04:39 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 75B0B86430; Wed, 22 Jan 2020 03:04:36 +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 2400981984; Wed, 22 Jan 2020 03:04:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 00M34SFx010285 for ; Tue, 21 Jan 2020 22:04:28 -0500 Received: by smtp.corp.redhat.com (Postfix) id 5D37A2166B2F; Wed, 22 Jan 2020 03:04:28 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 56C392166B28 for ; Wed, 22 Jan 2020 03:04:26 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8CA21802096 for ; Wed, 22 Jan 2020 03:04:26 +0000 (UTC) Received: from m4a0072g.houston.softwaregrp.com (m4a0072g.houston.softwaregrp.com [15.124.2.130]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-149-4IDFE7fbNsK0Y3y1kYUSQg-1; Tue, 21 Jan 2020 22:04:24 -0500 Received: FROM m4a0072g.houston.softwaregrp.com (15.120.17.146) BY m4a0072g.houston.softwaregrp.com WITH ESMTP FOR libvir-list@redhat.com; Wed, 22 Jan 2020 03:03:03 +0000 Received: from M4W0334.microfocus.com (2002:f78:1192::f78:1192) by M4W0334.microfocus.com (2002:f78:1192::f78:1192) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1591.10; Wed, 22 Jan 2020 03:00:53 +0000 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (15.124.8.10) by M4W0334.microfocus.com (15.120.17.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1591.10 via Frontend Transport; Wed, 22 Jan 2020 03:00:53 +0000 Received: from BY5PR18MB3315.namprd18.prod.outlook.com (10.255.139.204) by BY5PR18MB3427.namprd18.prod.outlook.com (10.255.139.160) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.20; Wed, 22 Jan 2020 03:00:52 +0000 Received: from BY5PR18MB3315.namprd18.prod.outlook.com ([fe80::e837:42bb:9b5f:45c4]) by BY5PR18MB3315.namprd18.prod.outlook.com ([fe80::e837:42bb:9b5f:45c4%7]) with mapi id 15.20.2644.027; Wed, 22 Jan 2020 03:00:52 +0000 Received: from linux-tbji.provo.novell.com (75.169.4.203) by BYAPR07CA0021.namprd07.prod.outlook.com (2603:10b6:a02:bc::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2644.21 via Frontend Transport; Wed, 22 Jan 2020 03:00:51 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579662290; 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=RurOQKRn765f8gHb5FB4t/X9nOGW18aD18tgfZu+8cM=; b=hJ65qzSzI/koC4I+2YcfR/xvz1D99ah4GKyewwJc+ZvzYXFBAg7IvbRDGtQjcgasZJ/UGi aRljbF2GyV2lsLZoUAMk67NBBeeyDAr8nQQY8coc6wIoa1qvu10Z0UcBctUDznbgEGfEgF i9oxDgaSSR7l0m5B/d3n0s2hug3P3vU= From: Jim Fehlig To: "libvir-list@redhat.com" Subject: [PATCH] lib: Prohibit parallel connections with tunneled migration Thread-Topic: [PATCH] lib: Prohibit parallel connections with tunneled migration Thread-Index: AQHV0NAoX6j+0Fr21UC5hY6NrdtryQ== Date: Wed, 22 Jan 2020 03:00:52 +0000 Message-ID: <20200122030033.4290-1-jfehlig@suse.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: BYAPR07CA0021.namprd07.prod.outlook.com (2603:10b6:a02:bc::34) To BY5PR18MB3315.namprd18.prod.outlook.com (2603:10b6:a03:196::12) x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [75.169.4.203] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: e9eae7b9-29ac-4c3f-d089-08d79ee74a77 x-ms-traffictypediagnostic: BY5PR18MB3427: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:2331; x-forefront-prvs: 029097202E x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(4636009)(366004)(346002)(396003)(136003)(376002)(39860400002)(189003)(199004)(2616005)(8936002)(2906002)(107886003)(956004)(5660300002)(52116002)(6506007)(4326008)(6512007)(66946007)(81156014)(66476007)(66556008)(316002)(6916009)(478600001)(8676002)(71200400001)(81166006)(1076003)(66446008)(64756008)(186003)(36756003)(6486002)(16526019)(26005)(86362001)(966005); DIR:OUT; SFP:1102; SCL:1; SRVR:BY5PR18MB3427; H:BY5PR18MB3315.namprd18.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: +Rc6bAYWROr2JPLp0LSM5vxDp4Cj6GMGRksoFokf4vU2oCvd5OPxx3eTMfpqCXXWYvA5RhS1YyV8PWkgRFyAnQts8lmc99d007Nj0A4dF82x8OxIX2OqHmNmYYzTT2gwf539IRF/8Kqt+Byz+5susSU6DP2iaK4pPvKMhHyyCYf7q4B29oetDw0q2XLrG6djPulsI3l/luOiw9/fus3+I00cgO09tNbTgxqwnk/K6vgGMvOagg0nS5QUtapLu3Gm582IInJ0sSM/eOxk2yUrMdjF8Dc6/pJ3+TYed+nu5A+aSxG4vT201joxcMSU1IFPbYC95nhafnLne/gR87zlTGl1FmqKb9TXtGvOAVaERkJR4fFiKf8SP/2s+AYWnAKMMNwRXKAF6qo+lC1ytaET9IT6Xc6sxkKv9110xaD8y8cJIKyFPE26ykxZ7OYJZW+MAj+vZw3z3I+NrAEH9lLvl0MY3jtIp0GKlyFCW+HV/pU= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: e9eae7b9-29ac-4c3f-d089-08d79ee74a77 X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Jan 2020 03:00:52.3272 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 856b813c-16e5-49a5-85ec-6f081e13b527 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: UvM/95L/NIn+Og9l4MDtkgDEmnQ1KyBv47lkLdG9dQiI2wKXvV3wmyLz1lyJHjZZjWO+WkrwN66/rEs/eNzmQg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR18MB3427 X-OriginatorOrg: suse.com X-MC-Unique: 4IDFE7fbNsK0Y3y1kYUSQg-1 X-MC-Unique: 73t5s0ENMP6SgM9YDbHj5A-1 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 00M34SFx010285 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.79 on 10.5.11.15 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" As discussed on the developer list, parallel migration connections are not compatible with tunneled migration https://www.redhat.com/archives/libvir-list/2020-January/msg00463.html Prohibit the concurrent use of parallel and tunneled migration options. Signed-off-by: Jim Fehlig Reviewed-by: J=C3=A1n Tomko --- I added the check to all migration entry points except virDomainMigrate3, where the p2p and tunneled options are already prohibitied. src/libvirt-domain.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 4074397b30..b910ba6b4d 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -3546,6 +3546,10 @@ virDomainMigrate(virDomainPtr domain, VIR_MIGRATE_NON_SHARED_INC, error); =20 + VIR_EXCLUSIVE_FLAGS_GOTO(VIR_MIGRATE_TUNNELLED, + VIR_MIGRATE_PARALLEL, + error); + if (flags & VIR_MIGRATE_OFFLINE) { if (!VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn, VIR_DRV_FEATURE_MIGRATION_OFFLINE)) { @@ -3701,6 +3705,10 @@ virDomainMigrate2(virDomainPtr domain, VIR_MIGRATE_NON_SHARED_INC, error); =20 + VIR_EXCLUSIVE_FLAGS_GOTO(VIR_MIGRATE_TUNNELLED, + VIR_MIGRATE_PARALLEL, + error); + if (flags & VIR_MIGRATE_OFFLINE) { if (!VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn, VIR_DRV_FEATURE_MIGRATION_OFFLINE)) { @@ -4087,6 +4095,10 @@ virDomainMigrateToURI(virDomainPtr domain, virCheckReadOnlyGoto(domain->conn->flags, error); virCheckNonNullArgGoto(duri, error); =20 + VIR_EXCLUSIVE_FLAGS_GOTO(VIR_MIGRATE_TUNNELLED, + VIR_MIGRATE_PARALLEL, + error); + if (virDomainMigrateUnmanagedCheckCompat(domain, flags) < 0) goto error; =20 @@ -4159,6 +4171,10 @@ virDomainMigrateToURI2(virDomainPtr domain, virCheckDomainReturn(domain, -1); virCheckReadOnlyGoto(domain->conn->flags, error); =20 + VIR_EXCLUSIVE_FLAGS_GOTO(VIR_MIGRATE_TUNNELLED, + VIR_MIGRATE_PARALLEL, + error); + if (virDomainMigrateUnmanagedCheckCompat(domain, flags) < 0) goto error; =20 @@ -4232,6 +4248,10 @@ virDomainMigrateToURI3(virDomainPtr domain, virCheckDomainReturn(domain, -1); virCheckReadOnlyGoto(domain->conn->flags, error); =20 + VIR_EXCLUSIVE_FLAGS_GOTO(VIR_MIGRATE_TUNNELLED, + VIR_MIGRATE_PARALLEL, + error); + if (virDomainMigrateUnmanagedCheckCompat(domain, flags) < 0) goto error; =20 --=20 2.24.1