From nobody Sat May 18 23:23:42 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1614120165; cv=none; d=zohomail.com; s=zohoarc; b=ihQONZ3d2lAnKQ2bDGLoYCr+yVu4xBzSsrJ/QoOuzzvcix3DRAHcGQqr4KXoFKx8dBJR/RRRCPxyo5VnvO8KxjjP4ryqm0pKV8P7JGa3ulG4vqC9H4cb+JDBKHxw7pQyyEEmJnQOdsDIjB90DQdAXhIJCEuCkosBEIJAxQ2v6tc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614120165; 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=rhRMvZoT00LYr6GrIzujMbjEx0fzj1CirKJTnC/uUGg=; b=RnxTgbIt5CqpbwbZnC9pUCqx3XipXwjN7eWNGdwZC6Vs+IR6Zj91ACO0JWneHxtofK4C7+a7PjPbAmaHhMnPiUy5v7F80Dy2r7DizinakQitVIJeckTift2wh2/ux4oNGpvkt4jwIXebxZi8ibR8CpvwGX/zY9X8t90coQdlBG4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.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 [63.128.21.124]) by mx.zohomail.com with SMTPS id 1614120164730258.70976683395645; Tue, 23 Feb 2021 14:42:44 -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-550-X2BrBYGQOVG1fEaGXs_IJg-1; Tue, 23 Feb 2021 17:42:38 -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 2D100801978; Tue, 23 Feb 2021 22:42:33 +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 DB2805D6BA; Tue, 23 Feb 2021 22:42:32 +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 231424EA30; Tue, 23 Feb 2021 22:42:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 11NMgPKH013722 for ; Tue, 23 Feb 2021 17:42:25 -0500 Received: by smtp.corp.redhat.com (Postfix) id D31115D6A1; Tue, 23 Feb 2021 22:42:25 +0000 (UTC) Received: from vhost2.router.laine.org (ovpn-112-184.phx2.redhat.com [10.3.112.184]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9C9135D6BA for ; Tue, 23 Feb 2021 22:42:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614120163; 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=rhRMvZoT00LYr6GrIzujMbjEx0fzj1CirKJTnC/uUGg=; b=LGivzyNVEa7Oh8FKJD2aNUSJkR/5daEkkOsTxigUr2v5OhmmoVraRZXDWJ1QArCqkdLoRR qE5bEhtEhjcClqogRWb05dHkbHyVlFV7D7aLmzlKI0Ib1dU18F0PCNO5SVjjkguQNw76mc fxhhTg3V7d5dSVGf4BB4uncEiqOKuvQ= X-MC-Unique: X2BrBYGQOVG1fEaGXs_IJg-1 From: Laine Stump To: libvir-list@redhat.com Subject: [libvirt PATCH 1/2] qemu: allow migration of generic with Date: Tue, 23 Feb 2021 17:42:20 -0500 Message-Id: <20210223224221.683479-2-laine@redhat.com> In-Reply-To: <20210223224221.683479-1-laine@redhat.com> References: <20210223224221.683479-1-laine@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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 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" Commit 010ed0856b and commit db64acfbda introduced the ability to use the element in a generic (previously it could only be used with ). However, the patch omitted one crucial detail - along with parsing the element in , and adding the necessary info to the qemu commandline, we also need to modify qemuMigrationSrcIsAllowedHostdev() to allow migration when the generic has a element. https://bugzilla.redhat.com/1927984 Fixes: 010ed0856bb06f439e6fdf44e4f529f53441c398 Reported-by: Yalan Zhang Signed-off-by: Laine Stump Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_migration.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 08f60c6db3..d7231f68ae 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1247,13 +1247,17 @@ qemuMigrationSrcIsAllowedHostdev(const virDomainDef= *def) =20 case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: /* - * if this is a network interface with , migration *is* allowed because - * the device will be auto-unplugged by QEMU during - * migration. + * if the device has a + * element, then migration *is* allowed because the + * device will be auto-unplugged by QEMU during + * migration. Generic and have their teaming configuration + * stored in different places. */ - if (hostdev->parentnet && hostdev->parentnet->teaming && - hostdev->parentnet->teaming->type =3D=3D VIR_DOMAIN_NE= T_TEAMING_TYPE_TRANSIENT) { + if ((hostdev->teaming && + hostdev->teaming->type =3D=3D VIR_DOMAIN_NET_TEAMING_= TYPE_TRANSIENT) || + (hostdev->parentnet && hostdev->parentnet->teaming && + hostdev->parentnet->teaming->type =3D=3D VIR_DOMAIN_N= ET_TEAMING_TYPE_TRANSIENT)) { continue; } =20 --=20 2.29.2 From nobody Sat May 18 23:23:42 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=1614120182; cv=none; d=zohomail.com; s=zohoarc; b=BwK3p9ReLrgz3J+Miab+vCWzQB8FKNzKimqrag5BUhg6cyLUGx0LC2q7PJhCzv04C2JTMUnDA/TKRUhtROfZ2AI/iYPw9GCdn1EusUSY/fFU8kyxy/Dj8MGOksTLgQGMNwmkmbPba3RdZUHYmsXN47UcFslGTOdEsrqJYC/sTds= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614120182; 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=MDHQD/b0qdPhh0gGRtSMcuNHx6oc3+0CT94KiGvK2Wc=; b=nwAquLKUF++JFVVgfgOzVpGAvSMglWViblJjFTNGpyU2pdzdlElkfdbI4FhVHZ+vzgjKVq/h93D2Ipf1U9Zu2gScGW4uKUO7Moz8qUwsh6xxhL/ZSkOj/79WUUMsztvhXiS1yYpxIAEtFLs7XjVt8u4+B+sDWThHArBl76h5Zcg= 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 1614120182361572.7478371812666; Tue, 23 Feb 2021 14:43:02 -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-429-CRBFjxMcMYqZ4iRyb6JfGA-1; Tue, 23 Feb 2021 17:42:59 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 93B14107ACF3; Tue, 23 Feb 2021 22:42:53 +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 34CDD19C95; Tue, 23 Feb 2021 22:42:53 +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 F0E3818095CB; Tue, 23 Feb 2021 22:42:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 11NMgQV5013728 for ; Tue, 23 Feb 2021 17:42:26 -0500 Received: by smtp.corp.redhat.com (Postfix) id 38E705D6BA; Tue, 23 Feb 2021 22:42:26 +0000 (UTC) Received: from vhost2.router.laine.org (ovpn-112-184.phx2.redhat.com [10.3.112.184]) by smtp.corp.redhat.com (Postfix) with ESMTP id 01B915D6A1 for ; Tue, 23 Feb 2021 22:42:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614120181; 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=MDHQD/b0qdPhh0gGRtSMcuNHx6oc3+0CT94KiGvK2Wc=; b=WldKHNk0YfNN4UTRB2OCxzsmC9QTle9/QdpI7NfhCTHrQYjFKWeNz27aacZta7NikZ1CeY HMK1uVadlDI+qeXOwvU7NV/P/F0G5YmleCYuNJjmCMWSsltSHXGVo4w4/rmQobEsJZ/gW1 z+gbXVQppOvXNx+P3AzGRL+svk8tLC0= X-MC-Unique: CRBFjxMcMYqZ4iRyb6JfGA-1 From: Laine Stump To: libvir-list@redhat.com Subject: [libvirt PATCH 2/2] docs: fix bad cut/paste in example Date: Tue, 23 Feb 2021 17:42:21 -0500 Message-Id: <20210223224221.683479-3-laine@redhat.com> In-Reply-To: <20210223224221.683479-1-laine@redhat.com> References: <20210223224221.683479-1-laine@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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.11 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" When the parser and docs were enhanced to support a element in a generic , the example XML for formatdomain.rst was cut/pasted from the example for . In my haste I= neglected to remove the element (which is unused/i= gnored for generic and change the closing tag from t= o https://bugzilla.redhat.com/1927984 Fixes: db64acfbda59ad22b671580fda13968c60bb8c1a Reported-by: Yalan Zhang Signed-off-by: Laine Stump Reviewed-by: J=C3=A1n Tomko --- docs/formatdomain.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index e23bcc3e5a..937b0da012 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -4884,9 +4884,8 @@ plain ```` device.
- - + ... =20 This device must be a network device, but not necessarily an SRIOV --=20 2.29.2