From nobody Sun May 19 03:12:53 2024 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=fail(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1568728133; cv=none; d=zoho.com; s=zohoarc; b=Mz6LlvR8hTJ+oeqQGVMHT9KOXNxniPscTrRvtGUSoOkXqJZGVlS0z5Nq7A22y/1HZ3hzJSjQPtvVC3CsQC6OvlwQ8QsAHA1IDtFOnmnaefnTYOgihkg25LVKFMoa4auvkGxwhx4VJQ6whxAHSuN1+OeIKCtGxR2Oc2tH1hzbVjQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568728133; 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=iCL0ZzsDA2hnuHJnfMk7TZ3izimM4JrwCReb1ooIzvY=; b=Mh2jZ5Mxg/6D8azN3KbYRb15zMVPVuqbLREuc43Q3INU7eXs3oXOX5A5aRPsBYK1DD5SG63EOQS6pOmVAV8KJ6NoFk3o3SMG+fQKNqjrA4TKm2d6cwGXKfOeV9pLNKga6kAEkZyjsTQmDFO20dp/2bc6sJ7bLh5F4r5MKprpWW0= 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=fail 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 1568728133662101.19514331955054; Tue, 17 Sep 2019 06:48:53 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id DF0C43175281; Tue, 17 Sep 2019 13:48:51 +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 B7AA560468; Tue, 17 Sep 2019 13:48:51 +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 6C0EE4EE6F; Tue, 17 Sep 2019 13:48:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x8HDmcGa002384 for ; Tue, 17 Sep 2019 09:48:38 -0400 Received: by smtp.corp.redhat.com (Postfix) id E5B18614C3; Tue, 17 Sep 2019 13:48:37 +0000 (UTC) Received: from mx1.redhat.com (ext-mx08.extmail.prod.ext.phx2.redhat.com [10.5.110.32]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 84112614CE for ; Tue, 17 Sep 2019 13:48:30 +0000 (UTC) Received: from relay.sw.ru (relay.sw.ru [185.231.240.75]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2E1C5C057F2E for ; Tue, 17 Sep 2019 13:48:28 +0000 (UTC) Received: from [172.16.24.106] (helo=shiny.sw.ru) by relay.sw.ru with esmtp (Exim 4.92.2) (envelope-from ) id 1iADqD-0001xB-Vy for libvir-list@redhat.com; Tue, 17 Sep 2019 16:48:26 +0300 From: Nikolay Shirokovskiy To: libvir-list@redhat.com Date: Tue, 17 Sep 2019 16:47:36 +0300 Message-Id: <20190917134747.13868-2-nshirokovskiy@virtuozzo.com> In-Reply-To: <20190917134747.13868-1-nshirokovskiy@virtuozzo.com> References: <20190917134747.13868-1-nshirokovskiy@virtuozzo.com> MIME-Version: 1.0 X-Greylist: Sender passed SPF test, ACL 264 matched, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Tue, 17 Sep 2019 13:48:28 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Tue, 17 Sep 2019 13:48:28 +0000 (UTC) for IP:'185.231.240.75' DOMAIN:'relay.sw.ru' HELO:'relay.sw.ru' FROM:'nshirokovskiy@virtuozzo.com' RCPT:'' X-RedHat-Spam-Score: 0 (SPF_HELO_NONE, SPF_PASS) 185.231.240.75 relay.sw.ru 185.231.240.75 relay.sw.ru X-Scanned-By: MIMEDefang 2.78 on 10.5.110.32 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v3 01/12] conf: add replug option for usb hostdev 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Tue, 17 Sep 2019 13:48:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" If usb device attached to a domain is unplugged from host and then plugged back then it will no longer be available in guest. We are going to support this case so that device will be detached from qemu on unplug and attached back on replug. As sometimes this behaviour is not desirable and for backcompat too let's add 'replug' option for usb hostdev. Signed-off-by: Nikolay Shirokovskiy --- docs/formatdomain.html.in | 10 ++++- docs/schemas/domaincommon.rng | 5 +++ src/conf/domain_conf.c | 30 ++++++++++++++ src/conf/domain_conf.h | 2 + tests/qemuxml2argvdata/hostdev-usb-replug.xml | 36 +++++++++++++++++ .../qemuxml2xmloutdata/hostdev-usb-replug.xml | 40 +++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 7 files changed, 122 insertions(+), 2 deletions(-) create mode 100644 tests/qemuxml2argvdata/hostdev-usb-replug.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-usb-replug.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 86a5261e47..5b0d41760b 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -4678,7 +4678,7 @@ 
 ...
 <devices>
-  <hostdev mode=3D'subsystem' type=3D'usb'>
+  <hostdev mode=3D'subsystem' type=3D'usb' replug=3D'yes'>
     <source startupPolicy=3D'optional'>
       <vendor id=3D'0x1234'/>
       <product id=3D'0xbeef'/>
@@ -4777,7 +4777,13 @@
           
usb

           
USB devices are detached from the host on guest startup
             and reattached after the guest exits or the device is
-            hot-unplugged.
+            hot-unplugged. If optional replug
+            (since 5.8.0) is "yes" then libvi=
rt
+            tracks USB device unplug/plug on host. On unplug the correspon=
dent
+            QEMU device will be be deleted but device stays in libvirt con=
fig.
+            On plug the device will be added back to QEMU. This applies on=
ly
+            for USB devices with product/vendor pair specified. Default va=
lue
+            is "no".
           

           
pci

           
For PCI devices, when managed is "yes" it is
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index cae3be639e..8afce21deb 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -4644,6 +4644,11 @@
     
       usb
     
+    
+      
+        
+      
+    
     
       
         
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 848c831330..db065f6a5b 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -7660,6 +7660,13 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node,
         goto out;
     }
=20
+    if (usbsrc->replug && (!got_vendor || !got_product)) {
+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                       _("replug is only possible if vendor/product "
+                         "pair is specified"));
+        goto out;
+    }
+
     ret =3D 0;
  out:
     return ret;
@@ -8113,12 +8120,14 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
     virDomainHostdevSubsysSCSIPtr scsisrc =3D &def->source.subsys.u.scsi;
     virDomainHostdevSubsysSCSIVHostPtr scsihostsrc =3D &def->source.subsys=
.u.scsi_host;
     virDomainHostdevSubsysMediatedDevPtr mdevsrc =3D &def->source.subsys.u=
.mdev;
+    virDomainHostdevSubsysUSBPtr usbsrc =3D &def->source.subsys.u.usb;
     VIR_AUTOFREE(char *) managed =3D NULL;
     VIR_AUTOFREE(char *) sgio =3D NULL;
     VIR_AUTOFREE(char *) rawio =3D NULL;
     VIR_AUTOFREE(char *) backendStr =3D NULL;
     VIR_AUTOFREE(char *) model =3D NULL;
     VIR_AUTOFREE(char *) display =3D NULL;
+    VIR_AUTOFREE(char *) replug =3D NULL;
=20
     /* @managed can be read from the xml document - it is always an
      * attribute of the toplevel element, no matter what type of
@@ -8134,6 +8143,7 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
     rawio =3D virXMLPropString(node, "rawio");
     model =3D virXMLPropString(node, "model");
     display =3D virXMLPropString(node, "display");
+    replug =3D virXMLPropString(node, "replug");
=20
     /* @type is passed in from the caller rather than read from the
      * xml document, because it is specified in different places for
@@ -8200,6 +8210,20 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
         }
     }
=20
+    if (replug) {
+        if (def->source.subsys.type !=3D VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_US=
B) {
+            virReportError(VIR_ERR_XML_ERROR, "%s",
+                           _("replug is only supported for usb host device=
"));
+            return -1;
+        }
+
+        if ((usbsrc->replug =3D virTristateBoolTypeFromString(replug)) <=
=3D 0) {
+            virReportError(VIR_ERR_XML_ERROR,
+                           _("unknown hostdev replug setting '%s'"), rawio=
);
+            return -1;
+        }
+    }
+
     if (def->source.subsys.type !=3D VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV &&
         def->source.subsys.type !=3D VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_H=
OST) {
         if (model) {
@@ -27139,6 +27163,7 @@ virDomainHostdevDefFormat(virBufferPtr buf,
     virDomainHostdevSubsysSCSIPtr scsisrc =3D &def->source.subsys.u.scsi;
     virDomainHostdevSubsysMediatedDevPtr mdevsrc =3D &def->source.subsys.u=
.mdev;
     virDomainHostdevSubsysSCSIVHostPtr scsihostsrc =3D &def->source.subsys=
.u.scsi_host;
+    virDomainHostdevSubsysUSBPtr usbsrc =3D &def->source.subsys.u.usb;
     const char *type;
=20
     if (!mode) {
@@ -27203,6 +27228,11 @@ virDomainHostdevDefFormat(virBufferPtr buf,
                                   virTristateSwitchTypeToString(mdevsrc->d=
isplay));
         }
=20
+        if (def->source.subsys.type =3D=3D VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_=
USB &&
+            usbsrc->replug) {
+            virBufferAsprintf(buf, " replug=3D'%s'",
+                              virTristateBoolTypeToString(usbsrc->replug));
+        }
     }
     virBufferAddLit(buf, ">\n");
     virBufferAdjustIndent(buf, 2);
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index b688ee2b83..44a339ab0c 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -230,6 +230,8 @@ struct _virDomainHostdevSubsysUSB {
=20
     unsigned vendor;
     unsigned product;
+
+    bool replug;
 };
=20
 struct _virDomainHostdevSubsysPCI {
diff --git a/tests/qemuxml2argvdata/hostdev-usb-replug.xml b/tests/qemuxml2=
argvdata/hostdev-usb-replug.xml
new file mode 100644
index 0000000000..9647385667
--- /dev/null
+++ b/tests/qemuxml2argvdata/hostdev-usb-replug.xml
@@ -0,0 +1,36 @@
+
+  QEMUGuest1
+  c7a5fdbd-edaf-9455-926a-d65c16db1809
+  219136
+  219136
+  1
+  
+    hvm
+    
+  
+  
+  destroy
+  restart
+  destroy
+  
+    /usr/bin/qemu-system-i686
+    
+      
+      
+      
+      

+    
+    
+    
+    
+    
+    
+    
+      
+        
+        
+      
+    
+    
+  
+
diff --git a/tests/qemuxml2xmloutdata/hostdev-usb-replug.xml b/tests/qemuxm=
l2xmloutdata/hostdev-usb-replug.xml
new file mode 100644
index 0000000000..5f4e39e2c4
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/hostdev-usb-replug.xml
@@ -0,0 +1,40 @@
+
+  QEMUGuest1
+  c7a5fdbd-edaf-9455-926a-d65c16db1809
+  219136
+  219136
+  1
+  
+    hvm
+    
+  
+  
+  destroy
+  restart
+  destroy
+  
+    /usr/bin/qemu-system-i686
+    
+      
+      
+      
+      

+    
+    
+      

+    
+    
+      

+    
+    
+    
+    
+    
+      
+        
+        
+      
+    
+    
+  
+
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index d5c66d8791..14b94321b0 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -439,6 +439,7 @@ mymain(void)
     DO_TEST("channel-unix-source-path", NONE);
=20
     DO_TEST("hostdev-usb-address", NONE);
+    DO_TEST("hostdev-usb-replug", NONE);
     DO_TEST("hostdev-pci-address", NONE);
     DO_TEST("hostdev-pci-multifunction", NONE);
     DO_TEST("hostdev-vfio", NONE);
--=20
2.23.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Sun May 19 03:12:53 2024
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=fail(p=none dis=none)  header.from=virtuozzo.com
ARC-Seal: i=1; a=rsa-sha256; t=1568728141; cv=none;
	d=zoho.com; s=zohoarc;
	b=ZUQWrZHzQi1vF+bJ56Qhpsk2QdJW+iv0TfRLzoAWumMfUYwvgfFDWJ2N6O1mNkHrx/zULaKtzx1NvipUlF58W2S3p2Fxq4jIUcBipt5cA+3KhaU222dHKuqvHGoEUDNqesxD9bkh+cmeywiYVXoKlCStPG6wE0uBrysx48wqRXs=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1568728141;
 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=FbP2/doXwG/Gyu9gqtdVzA39YXGmWnYfj40ViPEmaYc=;
	b=E6Y2Dexyd75ZXdbG9v3eCKh/ql8bzWjT6Arsh6vmVBWEOUuedqOFuQYTeXulVg4L66A7cMRu6Oju3BFSNGNqXZDrrK3cCVRqGNfojTyDnmIKcUzy6ZS14mOgfGjtutnXw8NUZY9mS3nyObd2qixpxwh11elhxjFFy5QJW38M+To=
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=fail 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 1568728141634625.4135930391793;
 Tue, 17 Sep 2019 06:49:01 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com
 [10.5.11.13])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id B8860315C03B;
	Tue, 17 Sep 2019 13:48:59 +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 82A4E60629;
	Tue, 17 Sep 2019 13:48:59 +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 37EBC4EE6F;
	Tue, 17 Sep 2019 13:48:59 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com
	[10.5.11.13])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x8HDmbWq002347 for ;
	Tue, 17 Sep 2019 09:48:37 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id CF5E56402F; Tue, 17 Sep 2019 13:48:36 +0000 (UTC)
Received: from mx1.redhat.com (ext-mx10.extmail.prod.ext.phx2.redhat.com
	[10.5.110.39])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 8BEDB5F7D7
	for ; Tue, 17 Sep 2019 13:48:29 +0000 (UTC)
Received: from relay.sw.ru (relay.sw.ru [185.231.240.75])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 2D2753CA1F
	for ; Tue, 17 Sep 2019 13:48:28 +0000 (UTC)
Received: from [172.16.24.106] (helo=shiny.sw.ru)
	by relay.sw.ru with esmtp (Exim 4.92.2)
	(envelope-from ) id 1iADqE-0001xB-4E
	for libvir-list@redhat.com; Tue, 17 Sep 2019 16:48:26 +0300
From: Nikolay Shirokovskiy 
To: libvir-list@redhat.com
Date: Tue, 17 Sep 2019 16:47:37 +0300
Message-Id: <20190917134747.13868-3-nshirokovskiy@virtuozzo.com>
In-Reply-To: <20190917134747.13868-1-nshirokovskiy@virtuozzo.com>
References: <20190917134747.13868-1-nshirokovskiy@virtuozzo.com>
MIME-Version: 1.0
X-Greylist: Sender passed SPF test, ACL 264 matched, not delayed by
	milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]);
	Tue, 17 Sep 2019 13:48:28 +0000 (UTC)
X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com
 [10.5.110.39]);
	Tue, 17 Sep 2019 13:48:28 +0000 (UTC) for IP:'185.231.240.75'
	DOMAIN:'relay.sw.ru' HELO:'relay.sw.ru'
	FROM:'nshirokovskiy@virtuozzo.com' RCPT:''
X-RedHat-Spam-Score: 0  (SPF_HELO_NONE,
	SPF_PASS) 185.231.240.75 relay.sw.ru 185.231.240.75
	relay.sw.ru 
X-Scanned-By: MIMEDefang 2.78 on 10.5.110.39
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH v3 02/12] qemu: track hostdev delete intention
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.13
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]);
 Tue, 17 Sep 2019 13:49:00 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

So we are going to support replug of usb device on host. We need to
delete device from qemu when the device is unplugged on host and to add
device when the device is plugged back. As to deleting let's use
same code as when we detach device from domain. But we need to keep
the usb hostdev etc in libvirt config when handle DEVICE_DELETED event
from qemu. For this purpose let's save delete intention in device config.

Signed-off-by: Nikolay Shirokovskiy 
---
 src/conf/domain_conf.h  | 14 ++++++++++++++
 src/qemu/qemu_driver.c  |  4 ++--
 src/qemu/qemu_hotplug.c | 23 ++++++++++++++++++++---
 src/qemu/qemu_hotplug.h |  3 ++-
 tests/qemuhotplugtest.c |  2 +-
 5 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 44a339ab0c..da005e5423 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -328,6 +328,19 @@ struct _virDomainHostdevCaps {
     } u;
 };
=20
+typedef enum {
+    VIR_DOMAIN_HOSTDEV_DELETE_ACTION_NONE =3D 0,
+    /* delete associated device from libvirt config
+     * as intended by client API call */
+    VIR_DOMAIN_HOSTDEV_DELETE_ACTION_DELETE,
+    /* keep associated device in libvirt config as
+     * qemu device is deleted as a result of unplugging
+     * device from host */
+    VIR_DOMAIN_HOSTDEV_DELETE_ACTION_UNPLUG,
+
+    VIR_DOMAIN_HOSTDEV_DELETE_ACTION_LAST
+} virDomainHostdevDeleteActionType;
+
=20
 /* basic device for direct passthrough */
 struct _virDomainHostdevDef {
@@ -345,6 +358,7 @@ struct _virDomainHostdevDef {
     bool missing;
     bool readonly;
     bool shareable;
+    virDomainHostdevDeleteActionType deleteAction;
     union {
         virDomainHostdevSubsys subsys;
         virDomainHostdevCaps caps;
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 1e041a8bac..c208591133 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -9144,7 +9144,7 @@ qemuDomainDetachDeviceLiveAndConfig(virQEMUDriverPtr =
driver,
     if (flags & VIR_DOMAIN_AFFECT_LIVE) {
         int rc;
=20
-        if ((rc =3D qemuDomainDetachDeviceLive(vm, dev_copy, driver, false=
)) < 0)
+        if ((rc =3D qemuDomainDetachDeviceLive(vm, dev_copy, driver, false=
, false)) < 0)
             goto cleanup;
=20
         if (rc =3D=3D 0 && qemuDomainUpdateDeviceList(driver, vm, QEMU_ASY=
NC_JOB_NONE) < 0)
@@ -9233,7 +9233,7 @@ qemuDomainDetachDeviceAliasLiveAndConfig(virQEMUDrive=
rPtr driver,
         if (virDomainDefFindDevice(def, alias, &dev, true) < 0)
             goto cleanup;
=20
-        if ((rc =3D qemuDomainDetachDeviceLive(vm, &dev, driver, true)) < =
0)
+        if ((rc =3D qemuDomainDetachDeviceLive(vm, &dev, driver, true, fal=
se)) < 0)
             goto cleanup;
=20
         if (rc =3D=3D 0 && qemuDomainUpdateDeviceList(driver, vm, QEMU_ASY=
NC_JOB_NONE) < 0)
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index cf0d46fee9..5b65963f86 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -5451,7 +5451,8 @@ qemuDomainDetachPrepController(virDomainObjPtr vm,
 static int
 qemuDomainDetachPrepHostdev(virDomainObjPtr vm,
                             virDomainHostdevDefPtr match,
-                            virDomainHostdevDefPtr *detach)
+                            virDomainHostdevDefPtr *detach,
+                            bool unplug)
 {
     virDomainHostdevSubsysPtr subsys =3D &match->source.subsys;
     virDomainHostdevSubsysUSBPtr usbsrc =3D &subsys->u.usb;
@@ -5523,6 +5524,20 @@ qemuDomainDetachPrepHostdev(virDomainObjPtr vm,
         return -1;
     }
=20
+    /*
+     * Why having additional check in second branch? Suppose client
+     * asks for device detaching and we delete device from qemu
+     * but don't get DEVICE_DELETED event yet. Next USB is unplugged
+     * from host and we have this function called again. If we reset
+     * delete action to 'unplug' then device will be left in
+     * libvirt config after handling DEVICE_DELETED event while
+     * it should not as client asked to detach the device before.
+     */
+    if (!unplug)
+        hostdev->deleteAction =3D VIR_DOMAIN_HOSTDEV_DELETE_ACTION_DELETE;
+    else if (hostdev->deleteAction !=3D VIR_DOMAIN_HOSTDEV_DELETE_ACTION_D=
ELETE)
+        hostdev->deleteAction =3D VIR_DOMAIN_HOSTDEV_DELETE_ACTION_UNPLUG;
+
     return 0;
 }
=20
@@ -5824,7 +5839,8 @@ int
 qemuDomainDetachDeviceLive(virDomainObjPtr vm,
                            virDomainDeviceDefPtr match,
                            virQEMUDriverPtr driver,
-                           bool async)
+                           bool async,
+                           bool unplug)
 {
     virDomainDeviceDef detach =3D { .type =3D match->type };
     virDomainDeviceInfoPtr info =3D NULL;
@@ -5869,7 +5885,8 @@ qemuDomainDetachDeviceLive(virDomainObjPtr vm,
         break;
     case VIR_DOMAIN_DEVICE_HOSTDEV:
         if (qemuDomainDetachPrepHostdev(vm, match->data.hostdev,
-                                        &detach.data.hostdev) < 0) {
+                                        &detach.data.hostdev,
+                                        unplug) < 0) {
             return -1;
         }
         break;
diff --git a/src/qemu/qemu_hotplug.h b/src/qemu/qemu_hotplug.h
index 6d2cd34dbc..647f617355 100644
--- a/src/qemu/qemu_hotplug.h
+++ b/src/qemu/qemu_hotplug.h
@@ -116,7 +116,8 @@ int qemuDomainAttachRNGDevice(virQEMUDriverPtr driver,
 int qemuDomainDetachDeviceLive(virDomainObjPtr vm,
                                virDomainDeviceDefPtr match,
                                virQEMUDriverPtr driver,
-                               bool async);
+                               bool async,
+                               bool unplug);
=20
 void qemuDomainRemoveVcpuAlias(virQEMUDriverPtr driver,
                                virDomainObjPtr vm,
diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c
index 3c177c6622..4e7851aa62 100644
--- a/tests/qemuhotplugtest.c
+++ b/tests/qemuhotplugtest.c
@@ -158,7 +158,7 @@ testQemuHotplugDetach(virDomainObjPtr vm,
     case VIR_DOMAIN_DEVICE_SHMEM:
     case VIR_DOMAIN_DEVICE_WATCHDOG:
     case VIR_DOMAIN_DEVICE_HOSTDEV:
-        ret =3D qemuDomainDetachDeviceLive(vm, dev, &driver, async);
+        ret =3D qemuDomainDetachDeviceLive(vm, dev, &driver, async, false);
         break;
     default:
         VIR_TEST_VERBOSE("device type '%s' cannot be detached",
--=20
2.23.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Sun May 19 03:12:53 2024
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=fail(p=none dis=none)  header.from=virtuozzo.com
ARC-Seal: i=1; a=rsa-sha256; t=1568728468; cv=none;
	d=zoho.com; s=zohoarc;
	b=gd3Gl9Nqn+2WFUHKEQuIBXxJcDMbkAMa82GVENKA+flzx6IIWZvkgvcs/LDo9cK+tiIqcw1fzMp2IS3L+8Cmv/uepfOoD8/B87eAWnmculzAJ+v49vNCYh8INYo6eotXD+HavF8CTFyAKvowk3UFeFN5ujG4fG1jZph6dNO90Uo=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1568728468;
 h=Content-Type:Content-Transfer-Encoding:Cc: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=VoGuTQE++CV2bl2D9W0E2YPRUOiaRWhFQoPP11lrQLs=;
	b=QmlYL1oOI03lMfzaLh9+qsO+4ESVV+RWyNuKKZIRn61UqSH0psedPm02/co0Ip7+pF9x67N0x82DtYJM+NC4kQOB2fz04eeuMTYyljLyOzZ5gRZi1PHOHgcK1B0wdLZ7ZT7pGT+cEB0ri0NTGa7mlU2+/m7m8opfGxa4pa+18fE=
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=fail 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 1568728468173187.52852874908228;
 Tue, 17 Sep 2019 06:54:28 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
 [10.5.11.16])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 04D973B71F;
	Tue, 17 Sep 2019 13:54:25 +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 B2B2E5C3FA;
	Tue, 17 Sep 2019 13:54:24 +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 A0AD64E58B;
	Tue, 17 Sep 2019 13:54:23 +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 x8HDmYVX002298 for ;
	Tue, 17 Sep 2019 09:48:34 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 1CE8A60C18; Tue, 17 Sep 2019 13:48:34 +0000 (UTC)
Received: from mx1.redhat.com (ext-mx04.extmail.prod.ext.phx2.redhat.com
	[10.5.110.28])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 0EA6F60C83
	for ; Tue, 17 Sep 2019 13:48:29 +0000 (UTC)
Received: from relay.sw.ru (relay.sw.ru [185.231.240.75])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 3D5F28553D
	for ; Tue, 17 Sep 2019 13:48:28 +0000 (UTC)
Received: from [172.16.24.106] (helo=shiny.sw.ru)
	by relay.sw.ru with esmtp (Exim 4.92.2)
	(envelope-from )
	id 1iADqE-0001xB-Bq; Tue, 17 Sep 2019 16:48:26 +0300
From: Nikolay Shirokovskiy 
To: libvir-list@redhat.com
Date: Tue, 17 Sep 2019 16:47:38 +0300
Message-Id: <20190917134747.13868-4-nshirokovskiy@virtuozzo.com>
In-Reply-To: <20190917134747.13868-1-nshirokovskiy@virtuozzo.com>
References: <20190917134747.13868-1-nshirokovskiy@virtuozzo.com>
MIME-Version: 1.0
X-Greylist: Sender passed SPF test, ACL 264 matched, not delayed by
	milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]);
	Tue, 17 Sep 2019 13:48:28 +0000 (UTC)
X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com
 [10.5.110.28]);
	Tue, 17 Sep 2019 13:48:28 +0000 (UTC) for IP:'185.231.240.75'
	DOMAIN:'relay.sw.ru' HELO:'relay.sw.ru'
	FROM:'nshirokovskiy@virtuozzo.com' RCPT:''
X-RedHat-Spam-Score: 0  (SPF_HELO_NONE,
	SPF_PASS) 185.231.240.75 relay.sw.ru 185.231.240.75
	relay.sw.ru 
X-Scanned-By: MIMEDefang 2.78 on 10.5.110.28
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12
X-loop: libvir-list@redhat.com
Cc: Daniel Henrique Barboza 
Subject: [libvirt] [PATCH v3 03/12] qemu: support host usb device unplug
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.16
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]);
 Tue, 17 Sep 2019 13:54:27 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

Handle host usb device unplug in DEVICE_DELETED handle execution
path.

Signed-off-by: Nikolay Shirokovskiy 
Reviewed-by: Daniel Henrique Barboza 
---
 src/qemu/qemu_hotplug.c | 38 +++++++++++++++++++++++++++++++-------
 1 file changed, 31 insertions(+), 7 deletions(-)

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 5b65963f86..121e4b2821 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -4465,7 +4465,8 @@ qemuDomainRemoveUSBHostDevice(virQEMUDriverPtr driver,
                               virDomainHostdevDefPtr hostdev)
 {
     qemuHostdevReAttachUSBDevices(driver, vm->def->name, &hostdev, 1);
-    qemuDomainReleaseDeviceAddress(vm, hostdev->info);
+    if (hostdev->deleteAction !=3D VIR_DOMAIN_HOSTDEV_DELETE_ACTION_UNPLUG)
+        qemuDomainReleaseDeviceAddress(vm, hostdev->info);
 }
=20
 static void
@@ -4507,6 +4508,7 @@ qemuDomainRemoveHostDevice(virQEMUDriverPtr driver,
     char *drivealias =3D NULL;
     char *objAlias =3D NULL;
     bool is_vfio =3D false;
+    bool unplug =3D hostdev->deleteAction =3D=3D VIR_DOMAIN_HOSTDEV_DELETE=
_ACTION_UNPLUG;
=20
     VIR_DEBUG("Removing host device %s from domain %p %s",
               hostdev->info->alias, vm, vm->def->name);
@@ -4554,16 +4556,24 @@ qemuDomainRemoveHostDevice(virQEMUDriverPtr driver,
         }
     }
=20
-    for (i =3D 0; i < vm->def->nhostdevs; i++) {
-        if (vm->def->hostdevs[i] =3D=3D hostdev) {
-            virDomainHostdevRemove(vm->def, i);
-            break;
+    if (!unplug) {
+        for (i =3D 0; i < vm->def->nhostdevs; i++) {
+            if (vm->def->hostdevs[i] =3D=3D hostdev) {
+                virDomainHostdevRemove(vm->def, i);
+                break;
+            }
         }
     }
=20
     virDomainAuditHostdev(vm, hostdev, "detach", true);
=20
-    if (!is_vfio &&
+    /*
+     * In case of unplug the attempt to restore label will fail. But we do=
n't
+     * need to restore the label! In case of separate mount namespace for =
the
+     * domain we remove device file later in this function. In case of glo=
bal
+     * mount namespace the device file is deleted or being deleted by syst=
emd.
+     */
+    if (!is_vfio && !unplug &&
         qemuSecurityRestoreHostdevLabel(driver, vm, hostdev) < 0)
         VIR_WARN("Failed to restore host device labelling");
=20
@@ -4597,7 +4607,13 @@ qemuDomainRemoveHostDevice(virQEMUDriverPtr driver,
         break;
     }
=20
-    virDomainHostdevDefFree(hostdev);
+    if (unplug) {
+        virDomainHostdevSubsysUSBPtr usbsrc =3D &hostdev->source.subsys.u.=
usb;
+        usbsrc->bus =3D 0;
+        usbsrc->device =3D 0;
+    } else {
+        virDomainHostdevDefFree(hostdev);
+    }
=20
     if (net) {
         if (net->type =3D=3D VIR_DOMAIN_NET_TYPE_NETWORK) {
@@ -4612,6 +4628,8 @@ qemuDomainRemoveHostDevice(virQEMUDriverPtr driver,
         virDomainNetDefFree(net);
     }
=20
+    hostdev->deleteAction =3D VIR_DOMAIN_HOSTDEV_DELETE_ACTION_NONE;
+
     ret =3D 0;
=20
  cleanup:
@@ -5084,6 +5102,7 @@ qemuDomainRemoveDevice(virQEMUDriverPtr driver,
     virDomainDeviceInfoPtr info;
     virObjectEventPtr event;
     VIR_AUTOFREE(char *) alias =3D NULL;
+    bool unplug;
=20
     /*
      * save the alias to use when sending a DEVICE_REMOVED event after
@@ -5124,8 +5143,13 @@ qemuDomainRemoveDevice(virQEMUDriverPtr driver,
             return -1;
         break;
     case VIR_DOMAIN_DEVICE_HOSTDEV:
+        unplug =3D dev->data.hostdev->deleteAction =3D=3D VIR_DOMAIN_HOSTD=
EV_DELETE_ACTION_UNPLUG;
+
         if (qemuDomainRemoveHostDevice(driver, vm, dev->data.hostdev) < 0)
             return -1;
+
+        if (unplug)
+            return 0;
         break;
     case VIR_DOMAIN_DEVICE_RNG:
         if (qemuDomainRemoveRNGDevice(driver, vm, dev->data.rng) < 0)
--=20
2.23.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Sun May 19 03:12:53 2024
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=fail(p=none dis=none)  header.from=virtuozzo.com
ARC-Seal: i=1; a=rsa-sha256; t=1568728120; cv=none;
	d=zoho.com; s=zohoarc;
	b=RfDV80LSkJ0BSBnCO9GKiJiTSgnXb9N74oUOZRvn06PkVIbox7Wnswn25+AIH6B6KGK8uASbNN6NM0/BexLYPViMD9WHPwmZtOynJ545pBWe+QcF6CdIHXnTRsl+U4Rftov5G3OKuyo4NL5+cHDiF0abuqsyQot2ljcGfweaCyM=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1568728120;
 h=Content-Type:Content-Transfer-Encoding:Cc: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=W9tqKK8WNIeQ76rebuf2kaRQrewZ8xwBZQEEUuhCifI=;
	b=Dk4/n6hGsmAzjcCUZ6pm19Pc0LopaypIL0+KCQZKsVO8EQ1CfGa58CS3YhkIOg6zd2bOlQAIPZMDmSpozZUpmJze+FG5xspNVCRnxL62pG/kv85k4R/QUmkqB2uZjglp61HXORi7FaSgwkD+6alCDDLh2pbVLmpXKzFyiohRkEY=
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=fail 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 1568728120441922.1591304755916;
 Tue, 17 Sep 2019 06:48:40 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com
 [10.5.11.13])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id B42D110DCC95;
	Tue, 17 Sep 2019 13:48:37 +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 E25E464050;
	Tue, 17 Sep 2019 13:48: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 3A8B14EE69;
	Tue, 17 Sep 2019 13:48:36 +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 x8HDmYsZ002299 for ;
	Tue, 17 Sep 2019 09:48:34 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 224B45D6A5; Tue, 17 Sep 2019 13:48:34 +0000 (UTC)
Received: from mx1.redhat.com (ext-mx29.extmail.prod.ext.phx2.redhat.com
	[10.5.110.70])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 1DD105D70D
	for ; Tue, 17 Sep 2019 13:48:29 +0000 (UTC)
Received: from relay.sw.ru (relay.sw.ru [185.231.240.75])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 77E9D191864D
	for ; Tue, 17 Sep 2019 13:48:28 +0000 (UTC)
Received: from [172.16.24.106] (helo=shiny.sw.ru)
	by relay.sw.ru with esmtp (Exim 4.92.2)
	(envelope-from )
	id 1iADqE-0001xB-JX; Tue, 17 Sep 2019 16:48:26 +0300
From: Nikolay Shirokovskiy 
To: libvir-list@redhat.com
Date: Tue, 17 Sep 2019 16:47:39 +0300
Message-Id: <20190917134747.13868-5-nshirokovskiy@virtuozzo.com>
In-Reply-To: <20190917134747.13868-1-nshirokovskiy@virtuozzo.com>
References: <20190917134747.13868-1-nshirokovskiy@virtuozzo.com>
MIME-Version: 1.0
X-Greylist: Sender passed SPF test, ACL 264 matched, not delayed by
	milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.70]);
	Tue, 17 Sep 2019 13:48:28 +0000 (UTC)
X-Greylist: inspected by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.70]);
	Tue, 17 Sep 2019 13:48:28 +0000 (UTC) for IP:'185.231.240.75'
	DOMAIN:'relay.sw.ru' HELO:'relay.sw.ru'
	FROM:'nshirokovskiy@virtuozzo.com' RCPT:''
X-RedHat-Spam-Score: 0  (SPF_HELO_NONE,
	SPF_PASS) 185.231.240.75 relay.sw.ru 185.231.240.75
	relay.sw.ru 
X-Scanned-By: MIMEDefang 2.84 on 10.5.110.70
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15
X-loop: libvir-list@redhat.com
Cc: Daniel Henrique Barboza 
Subject: [libvirt] [PATCH v3 04/12] qemu: support usb hostdev plugging back
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.13
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.64]);
 Tue, 17 Sep 2019 13:48:39 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

We are going to use qemuDomainAttachHostUSBDevice when
host usb device is plugged back to node.

Signed-off-by: Nikolay Shirokovskiy 
Reviewed-by: Daniel Henrique Barboza 
---
 src/qemu/qemu_hotplug.c | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 121e4b2821..780bfde002 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -2524,8 +2524,18 @@ qemuDomainAttachHostUSBDevice(virQEMUDriverPtr drive=
r,
     bool teardownlabel =3D false;
     bool teardowndevice =3D false;
     int ret =3D -1;
+    bool replug =3D false;
+    size_t i;
+
+    for (i =3D 0; i < vm->def->nhostdevs; i++) {
+        if (vm->def->hostdevs[i] =3D=3D hostdev) {
+            replug =3D true;
+            break;
+        }
+    }
=20
-    if (virDomainUSBAddressEnsure(priv->usbaddrs, hostdev->info) < 0)
+    if (!replug &&
+        virDomainUSBAddressEnsure(priv->usbaddrs, hostdev->info) < 0)
         return -1;
=20
     if (qemuHostdevPrepareUSBDevices(driver, vm->def->name, &hostdev, 1, 0=
) < 0)
@@ -2550,7 +2560,7 @@ qemuDomainAttachHostUSBDevice(virQEMUDriverPtr driver,
     if (!(devstr =3D qemuBuildUSBHostdevDevStr(vm->def, hostdev, priv->qem=
uCaps)))
         goto cleanup;
=20
-    if (VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs+1) < 0)
+    if (!replug && VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs+1) =
< 0)
         goto cleanup;
=20
     qemuDomainObjEnterMonitor(driver, vm);
@@ -2563,7 +2573,8 @@ qemuDomainAttachHostUSBDevice(virQEMUDriverPtr driver,
     if (ret < 0)
         goto cleanup;
=20
-    vm->def->hostdevs[vm->def->nhostdevs++] =3D hostdev;
+    if (!replug)
+        vm->def->hostdevs[vm->def->nhostdevs++] =3D hostdev;
=20
     ret =3D 0;
  cleanup:
@@ -2576,9 +2587,17 @@ qemuDomainAttachHostUSBDevice(virQEMUDriverPtr drive=
r,
         if (teardowndevice &&
             qemuDomainNamespaceTeardownHostdev(vm, hostdev) < 0)
             VIR_WARN("Unable to remove host device from /dev");
-        if (added)
+        if (added) {
             qemuHostdevReAttachUSBDevices(driver, vm->def->name, &hostdev,=
 1);
-        virDomainUSBAddressRelease(priv->usbaddrs, hostdev->info);
+
+            if (replug) {
+                virDomainHostdevSubsysUSBPtr usbsrc =3D &hostdev->source.s=
ubsys.u.usb;
+                usbsrc->bus =3D 0;
+                usbsrc->device =3D 0;
+            }
+        }
+        if (!replug)
+            virDomainUSBAddressRelease(priv->usbaddrs, hostdev->info);
     }
     VIR_FREE(devstr);
     return ret;
--=20
2.23.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Sun May 19 03:12:53 2024
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=fail(p=none dis=none)  header.from=virtuozzo.com
ARC-Seal: i=1; a=rsa-sha256; t=1568728485; cv=none;
	d=zoho.com; s=zohoarc;
	b=I24yS5vM3a/ORAUkPZ8VQzV9+ghIL1uaEloE0BLWnHmEUdmTNxFI+f2yoAVgfmNwmptF7GIXI1yYXnZYQBInwirKO2v2Jy6x15QARHRGlpOpE7A3pdRrDMmTpg0mVELZn88LqhJ7ab6MrpZwEo0AVqwPqY9MeUq0Ust8gphJZqI=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1568728485;
 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=91cZfiVclKhYpZNVb4eNEp0w+VEcf0kzsGKZMtdHuAg=;
	b=h3uzc8x+W54R++vDcuw/dVN7X9vzDTKr5H6ORmQj1L5LM4IqFaRzF9bdGPxVFyeAlpbb01r8YI2g7X2sjucSiKkJHftkHbUZW4bico+Y8LTajuBIUuthgTgqONuwXdlEIs0HjIIEDNzigiIcoK4IUK8OW5B3am/6vFm6I3Dh5hk=
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=fail 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 156872848535587.3347222971521;
 Tue, 17 Sep 2019 06:54:45 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com
 [10.5.11.13])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id D99963B558;
	Tue, 17 Sep 2019 13:54:42 +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 F1FAB60606;
	Tue, 17 Sep 2019 13:54:38 +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 00EC14E58C;
	Tue, 17 Sep 2019 13:54:37 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com
	[10.5.11.11])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x8HDmbw4002372 for ;
	Tue, 17 Sep 2019 09:48:37 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id AD48D60126; Tue, 17 Sep 2019 13:48:37 +0000 (UTC)
Received: from mx1.redhat.com (ext-mx04.extmail.prod.ext.phx2.redhat.com
	[10.5.110.28])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id A45E76017E
	for ; Tue, 17 Sep 2019 13:48:31 +0000 (UTC)
Received: from relay.sw.ru (relay.sw.ru [185.231.240.75])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 9F2148553B
	for ; Tue, 17 Sep 2019 13:48:28 +0000 (UTC)
Received: from [172.16.24.106] (helo=shiny.sw.ru)
	by relay.sw.ru with esmtp (Exim 4.92.2)
	(envelope-from ) id 1iADqF-0001xB-2e
	for libvir-list@redhat.com; Tue, 17 Sep 2019 16:48:27 +0300
From: Nikolay Shirokovskiy 
To: libvir-list@redhat.com
Date: Tue, 17 Sep 2019 16:47:40 +0300
Message-Id: <20190917134747.13868-6-nshirokovskiy@virtuozzo.com>
In-Reply-To: <20190917134747.13868-1-nshirokovskiy@virtuozzo.com>
References: <20190917134747.13868-1-nshirokovskiy@virtuozzo.com>
MIME-Version: 1.0
X-Greylist: Sender passed SPF test, ACL 264 matched, not delayed by
	milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]);
	Tue, 17 Sep 2019 13:48:29 +0000 (UTC)
X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com
 [10.5.110.28]);
	Tue, 17 Sep 2019 13:48:29 +0000 (UTC) for IP:'185.231.240.75'
	DOMAIN:'relay.sw.ru' HELO:'relay.sw.ru'
	FROM:'nshirokovskiy@virtuozzo.com' RCPT:''
X-RedHat-Spam-Score: 0  (SPF_HELO_NONE,
	SPF_PASS) 185.231.240.75 relay.sw.ru 185.231.240.75
	relay.sw.ru 
X-Scanned-By: MIMEDefang 2.78 on 10.5.110.28
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH v3 05/12] qemu: handle host usb device add/del
	udev events
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.13
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]);
 Tue, 17 Sep 2019 13:54:43 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

Now when code handling attaching/detaching usb hostdev is appropriately
changed use it to handle host usb device udev add/del events.

As device adding/deleting needs acquiring job condition it is done in
thread pool rather in event loop thread itself where udev events are
delivered. However implementation in this patch is a bit different from
other places as we instead of finding right domain in event loop thread
and creating a single thread pool job create job for every vm. Such
a strategy allows us to avoid taking domain lock in event loop thread so
we have little chances to block event loop thread because some API
handler grabs domain lock for a significant amount of time.

Signed-off-by: Nikolay Shirokovskiy 
---
 src/qemu/Makefile.inc.am |   2 +
 src/qemu/qemu_conf.h     |   3 +
 src/qemu/qemu_domain.c   |   2 +
 src/qemu/qemu_domain.h   |   2 +
 src/qemu/qemu_driver.c   | 324 ++++++++++++++++++++++++++++++++++++++-
 5 files changed, 332 insertions(+), 1 deletion(-)

diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am
index 48fd0332ec..26a686e56f 100644
--- a/src/qemu/Makefile.inc.am
+++ b/src/qemu/Makefile.inc.am
@@ -89,6 +89,7 @@ libvirt_driver_qemu_impl_la_CFLAGS =3D \
 	-I$(srcdir)/conf \
 	-I$(srcdir)/secret \
 	$(AM_CFLAGS) \
+	$(UDEV_CFLAGS) \
 	$(NULL)
 libvirt_driver_qemu_impl_la_LDFLAGS =3D $(AM_LDFLAGS)
 libvirt_driver_qemu_impl_la_LIBADD =3D \
@@ -97,6 +98,7 @@ libvirt_driver_qemu_impl_la_LIBADD =3D \
 	$(LIBNL_LIBS) \
 	$(SELINUX_LIBS) \
 	$(LIBXML_LIBS) \
+	$(UDEV_LIBS) \
 	$(NULL)
 libvirt_driver_qemu_impl_la_SOURCES =3D $(QEMU_DRIVER_SOURCES)
=20
diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
index 8473d6d4ca..f78ebcd829 100644
--- a/src/qemu/qemu_conf.h
+++ b/src/qemu/qemu_conf.h
@@ -296,6 +296,9 @@ struct _virQEMUDriver {
=20
     /* Immutable pointer, self-locking APIs */
     virHashAtomicPtr migrationErrors;
+
+    struct udev_monitor *udev_monitor;
+    int udev_watch;
 };
=20
 virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged);
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index ad4db7e881..711f562754 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -15401,6 +15401,8 @@ qemuProcessEventFree(struct qemuProcessEvent *event)
     case QEMU_PROCESS_EVENT_SERIAL_CHANGED:
     case QEMU_PROCESS_EVENT_BLOCK_JOB:
     case QEMU_PROCESS_EVENT_MONITOR_EOF:
+    case QEMU_PROCESS_EVENT_USB_REMOVED:
+    case QEMU_PROCESS_EVENT_USB_ADDED:
         VIR_FREE(event->data);
         break;
     case QEMU_PROCESS_EVENT_JOB_STATUS_CHANGE:
diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index f53ea146e1..abd717c025 100644
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -537,6 +537,8 @@ typedef enum {
     QEMU_PROCESS_EVENT_MONITOR_EOF,
     QEMU_PROCESS_EVENT_PR_DISCONNECT,
     QEMU_PROCESS_EVENT_RDMA_GID_STATUS_CHANGED,
+    QEMU_PROCESS_EVENT_USB_REMOVED,
+    QEMU_PROCESS_EVENT_USB_ADDED,
=20
     QEMU_PROCESS_EVENT_LAST
 } qemuProcessEventType;
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index c208591133..51f1d5d4a2 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -34,6 +34,7 @@
 #include 
 #include 
 #include 
+#include 
=20
=20
 #include "qemu_driver.h"
@@ -719,6 +720,221 @@ qemuDomainFindMaxID(virDomainObjPtr vm,
 }
=20
=20
+struct qemuUdevUSBRemoveData {
+    unsigned int bus;
+    unsigned int device;
+};
+
+struct qemuUdevUSBAddData {
+    unsigned int vendor;
+    unsigned int product;
+};
+
+struct qemuUdevUSBEventData {
+    union {
+        struct qemuUdevUSBRemoveData remove;
+        struct qemuUdevUSBAddData add;
+    } data;
+    bool remove;
+};
+
+static int
+qemuUdevUSBHandleEvent(virDomainObjPtr vm, void *opaque)
+{
+    struct qemuUdevUSBEventData *data =3D opaque;
+    struct qemuProcessEvent *event =3D NULL;
+
+    if (VIR_ALLOC(event) < 0)
+        return 0;
+
+    if (data->remove) {
+        struct qemuUdevUSBRemoveData *rm_data;
+
+
+        if (VIR_ALLOC(rm_data) < 0)
+            goto cleanup;
+
+        *rm_data =3D data->data.remove;
+        event->data =3D rm_data;
+        event->eventType =3D QEMU_PROCESS_EVENT_USB_REMOVED;
+    } else {
+        struct qemuUdevUSBAddData *add_data;
+
+        if (VIR_ALLOC(add_data) < 0)
+            goto cleanup;
+
+        *add_data =3D data->data.add;
+        event->data =3D add_data;
+        event->eventType =3D QEMU_PROCESS_EVENT_USB_ADDED;
+    }
+
+    event->vm =3D virObjectRef(vm);
+
+    if (virThreadPoolSendJob(qemu_driver->workerPool, 0, event) < 0) {
+        virObjectUnref(vm);
+        goto cleanup;
+    }
+
+    event =3D NULL;
+
+ cleanup:
+    qemuProcessEventFree(event);
+
+    return 0;
+}
+
+
+static void
+qemuUdevEventHandleCallback(int watch ATTRIBUTE_UNUSED,
+                            int fd ATTRIBUTE_UNUSED,
+                            int events ATTRIBUTE_UNUSED,
+                            void *data ATTRIBUTE_UNUSED)
+{
+    struct qemuUdevUSBEventData event_data;
+    struct udev_device *dev =3D NULL;
+    const char *action;
+    const char *devtype;
+    const char *tmp;
+
+    /* libvirtd daemon do not run event loop before full state drivers
+     * initialization. Also state drivers uninitialized only after
+     * full stop of event loop. In short driver initialization/uninitializ=
ation
+     * and handling events occurs in same main loop thread. Thus we
+     * don't need any locking here. */
+
+    if (!(dev =3D udev_monitor_receive_device(qemu_driver->udev_monitor)))=
 {
+        VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR
+        if (errno =3D=3D EAGAIN || errno =3D=3D EWOULDBLOCK) {
+        VIR_WARNINGS_RESET
+            return;
+        }
+
+        virReportSystemError(errno, "%s",
+                             _("failed to receive device from udev monitor=
"));
+        return;
+    }
+
+    devtype =3D udev_device_get_devtype(dev);
+
+    if (STRNEQ_NULLABLE(devtype, "usb_device"))
+        goto cleanup;
+
+    if (!(action =3D udev_device_get_action(dev))) {
+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                       _("failed to receive action from udev monitor"));
+        goto cleanup;
+    }
+
+    if (STREQ(action, "remove")) {
+        struct qemuUdevUSBRemoveData *rm_data =3D &event_data.data.remove;
+
+        if (!(tmp =3D udev_device_get_property_value(dev, "BUSNUM"))) {
+            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                           _("failed to receive busnum from udev monitor")=
);
+            goto cleanup;
+        }
+        if (virStrToLong_ui(tmp, NULL, 10, &rm_data->bus) < 0) {
+            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                           _("Failed to convert busnum to int"));
+            goto cleanup;
+        }
+
+        if (!(tmp =3D udev_device_get_property_value(dev, "DEVNUM"))) {
+            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                           _("failed to receive devnum from udev monitor")=
);
+            goto cleanup;
+        }
+        if (virStrToLong_ui(tmp, NULL, 10, &rm_data->device) < 0) {
+            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                           _("Failed to convert devnum to int"));
+            goto cleanup;
+        }
+        event_data.remove =3D true;
+    } else if (STREQ(action, "add")) {
+        struct qemuUdevUSBAddData *add_data =3D &event_data.data.add;
+
+        if (!(tmp =3D udev_device_get_property_value(dev, "ID_VENDOR_ID"))=
) {
+            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                           _("failed to receive vendor from udev monitor")=
);
+            goto cleanup;
+        }
+        if (virStrToLong_ui(tmp, NULL, 16, &add_data->vendor) < 0) {
+            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                           _("Failed to convert vendor to int"));
+            goto cleanup;
+        }
+
+        if (!(tmp =3D udev_device_get_property_value(dev, "ID_MODEL_ID")))=
 {
+            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                           _("failed to receive product from udev monitor"=
));
+            goto cleanup;
+        }
+        if (virStrToLong_ui(tmp, NULL, 16, &add_data->product) < 0) {
+            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                           _("Failed to convert product to int"));
+            goto cleanup;
+        }
+        event_data.remove =3D false;
+    } else {
+        goto cleanup;
+    }
+
+    virDomainObjListForEach(qemu_driver->domains, false, qemuUdevUSBHandle=
Event, &event_data);
+
+ cleanup:
+    udev_device_unref(dev);
+}
+
+
+static int
+qemuUdevInitialize(void)
+{
+    struct udev *udev;
+
+    if (!(udev =3D udev_new())) {
+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                       _("failed to create udev context"));
+        return -1;
+    }
+
+    if (!(qemu_driver->udev_monitor =3D udev_monitor_new_from_netlink(udev=
, "udev"))) {
+        udev_unref(udev);
+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                       _("udev_monitor_new_from_netlink returned NULL"));
+        return -1;
+    }
+
+    udev_monitor_enable_receiving(qemu_driver->udev_monitor);
+
+    qemu_driver->udev_watch =3D virEventAddHandle(udev_monitor_get_fd(qemu=
_driver->udev_monitor),
+                                                VIR_EVENT_HANDLE_READABLE,
+                                                qemuUdevEventHandleCallbac=
k, NULL, NULL);
+
+    if (qemu_driver->udev_watch < 0)
+        return -1;
+
+    return 0;
+}
+
+
+static void
+qemuUdevCleanup(void)
+{
+    if (qemu_driver->udev_monitor) {
+        struct udev *udev =3D udev_monitor_get_udev(qemu_driver->udev_moni=
tor);
+
+        udev_monitor_unref(qemu_driver->udev_monitor);
+        udev_unref(udev);
+        qemu_driver->udev_monitor =3D NULL;
+    }
+
+    if (qemu_driver->udev_watch > 0) {
+        virEventRemoveHandle(qemu_driver->udev_watch);
+        qemu_driver->udev_watch =3D 0;
+    }
+}
+
+
 /**
  * qemuStateInitialize:
  *
@@ -1042,6 +1258,9 @@ qemuStateInitialize(bool privileged,
     if (!(qemu_driver->closeCallbacks =3D virCloseCallbacksNew()))
         goto error;
=20
+    if (qemuUdevInitialize() < 0)
+        goto error;
+
     /* Get all the running persistent or transient configs first */
     if (virDomainObjListLoadAllConfigs(qemu_driver->domains,
                                        cfg->stateDir,
@@ -1256,6 +1475,8 @@ qemuStateCleanup(void)
=20
     virLockManagerPluginUnref(qemu_driver->lockManager);
=20
+    qemuUdevCleanup();
+
     virMutexDestroy(&qemu_driver->lock);
     VIR_FREE(qemu_driver);
=20
@@ -5028,7 +5249,102 @@ processRdmaGidStatusChangedEvent(virDomainObjPtr vm,
 }
=20
=20
-static void qemuProcessEventHandler(void *data, void *opaque)
+static void
+processUSBAddedEvent(virQEMUDriverPtr driver,
+                     virDomainObjPtr vm,
+                     struct qemuUdevUSBAddData *data)
+{
+    virDomainHostdevDefPtr hostdev;
+    virDomainHostdevSubsysUSBPtr usbsrc;
+    size_t i;
+
+    if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0)
+        return;
+
+    if (!virDomainObjIsActive(vm)) {
+        VIR_DEBUG("Domain is not running");
+        goto cleanup;
+    }
+
+    for (i =3D 0; i < vm->def->nhostdevs; i++) {
+        hostdev =3D vm->def->hostdevs[i];
+
+        if (hostdev->source.subsys.type !=3D VIR_DOMAIN_HOSTDEV_SUBSYS_TYP=
E_USB)
+            continue;
+
+        usbsrc =3D &hostdev->source.subsys.u.usb;
+
+        if (!usbsrc->replug)
+            continue;
+
+        if (usbsrc->vendor =3D=3D data->vendor && usbsrc->product =3D=3D d=
ata->product)
+            break;
+    }
+
+    if (i =3D=3D vm->def->nhostdevs)
+        goto cleanup;
+
+    if (qemuDomainAttachHostDevice(driver, vm, hostdev) < 0)
+        goto cleanup;
+
+ cleanup:
+    qemuDomainObjEndJob(driver, vm);
+}
+
+
+static void
+processUSBRemovedEvent(virQEMUDriverPtr driver,
+                       virDomainObjPtr vm,
+                       struct qemuUdevUSBRemoveData *data)
+{
+    size_t i;
+    virDomainHostdevDefPtr hostdev;
+    virDomainDeviceDef dev =3D { .type =3D VIR_DOMAIN_DEVICE_HOSTDEV };
+
+    if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0)
+        return;
+
+    if (!virDomainObjIsActive(vm)) {
+        VIR_DEBUG("Domain is not running");
+        goto cleanup;
+    }
+
+    for (i =3D 0; i < vm->def->nhostdevs; i++) {
+        virDomainHostdevSubsysUSBPtr usbsrc;
+
+        hostdev =3D vm->def->hostdevs[i];
+        if (hostdev->source.subsys.type !=3D VIR_DOMAIN_HOSTDEV_SUBSYS_TYP=
E_USB)
+            continue;
+
+        usbsrc =3D &hostdev->source.subsys.u.usb;
+
+        if (!usbsrc->replug)
+            continue;
+
+        /* don't mess with devices that don't use stable host addressing
+         * with respect to unplug/plug to host
+         */
+        if (!usbsrc->vendor || !usbsrc->product)
+            continue;
+
+        if (usbsrc->bus =3D=3D data->bus && usbsrc->device =3D=3D data->de=
vice)
+            break;
+    }
+
+    if (i =3D=3D vm->def->nhostdevs)
+        goto cleanup;
+
+    dev.data.hostdev =3D hostdev;
+    if (qemuDomainDetachDeviceLive(vm, &dev, driver, true, true) < 0)
+        goto cleanup;
+
+ cleanup:
+    qemuDomainObjEndJob(driver, vm);
+}
+
+
+static void
+qemuProcessEventHandler(void *data, void *opaque)
 {
     struct qemuProcessEvent *processEvent =3D data;
     virDomainObjPtr vm =3D processEvent->vm;
@@ -5074,6 +5390,12 @@ static void qemuProcessEventHandler(void *data, void=
 *opaque)
     case QEMU_PROCESS_EVENT_RDMA_GID_STATUS_CHANGED:
         processRdmaGidStatusChangedEvent(vm, processEvent->data);
         break;
+    case QEMU_PROCESS_EVENT_USB_REMOVED:
+        processUSBRemovedEvent(driver, vm, processEvent->data);
+        break;
+    case QEMU_PROCESS_EVENT_USB_ADDED:
+        processUSBAddedEvent(driver, vm, processEvent->data);
+        break;
     case QEMU_PROCESS_EVENT_LAST:
         break;
     }
--=20
2.23.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Sun May 19 03:12:53 2024
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=fail(p=none dis=none)  header.from=virtuozzo.com
ARC-Seal: i=1; a=rsa-sha256; t=1568728475; cv=none;
	d=zoho.com; s=zohoarc;
	b=mU/0Kcb3tUCS4uxhR61+JnyMsxlrUVnezUDLhju2Xvxk7jwRqglMrBkcw6aAa3rp9LPWMy5VRYZvVkCMFuEccWSN3hXqmr0KziWZddjeYZN9b9B7adIDaQGQYKI0ZStokWoxPv8ANudb8YlBujtIKU1brPg1/2TIpz/EcIKVjag=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1568728475;
 h=Content-Type:Content-Transfer-Encoding:Cc: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=G7i5Cx80++t//6aTJcAfkOaN3AbKIzuQIu+MPkJkOMw=;
	b=IWZaSFmbI0yx1QumqbLX/E4QHVE136qL1TxfRjvrpiDSPDjgpZCAGviH+XrueBDCo4QlYdLRII4VbBLt23qYGtBIpoBDKoXzZdProssr3Ohlj9TcMRIE7L84paePYDR5s0AKHvaPp2tFgLfTrunNi9e08Hsg73oG6aQosJzUk5k=
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=fail 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 1568728475661384.8254165464159;
 Tue, 17 Sep 2019 06:54:35 -0700 (PDT)
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 mx1.redhat.com (Postfix) with ESMTPS id CE3443162916;
	Tue, 17 Sep 2019 13:54:33 +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 BC4DF627DE;
	Tue, 17 Sep 2019 13:54:31 +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 475BD180B536;
	Tue, 17 Sep 2019 13:54:31 +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 x8HDmY3d002300 for ;
	Tue, 17 Sep 2019 09:48:34 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 22DC95B69A; Tue, 17 Sep 2019 13:48:34 +0000 (UTC)
Received: from mx1.redhat.com (ext-mx13.extmail.prod.ext.phx2.redhat.com
	[10.5.110.42])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 1D0A95D6D0
	for ; Tue, 17 Sep 2019 13:48:29 +0000 (UTC)
Received: from relay.sw.ru (relay.sw.ru [185.231.240.75])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id C7EC330615C3
	for ; Tue, 17 Sep 2019 13:48:28 +0000 (UTC)
Received: from [172.16.24.106] (helo=shiny.sw.ru)
	by relay.sw.ru with esmtp (Exim 4.92.2)
	(envelope-from )
	id 1iADqF-0001xB-7T; Tue, 17 Sep 2019 16:48:27 +0300
From: Nikolay Shirokovskiy 
To: libvir-list@redhat.com
Date: Tue, 17 Sep 2019 16:47:41 +0300
Message-Id: <20190917134747.13868-7-nshirokovskiy@virtuozzo.com>
In-Reply-To: <20190917134747.13868-1-nshirokovskiy@virtuozzo.com>
References: <20190917134747.13868-1-nshirokovskiy@virtuozzo.com>
MIME-Version: 1.0
X-Greylist: Sender passed SPF test, ACL 264 matched, not delayed by
	milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]);
	Tue, 17 Sep 2019 13:48:29 +0000 (UTC)
X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com
 [10.5.110.42]);
	Tue, 17 Sep 2019 13:48:29 +0000 (UTC) for IP:'185.231.240.75'
	DOMAIN:'relay.sw.ru' HELO:'relay.sw.ru'
	FROM:'nshirokovskiy@virtuozzo.com' RCPT:''
X-RedHat-Spam-Score: 0  (SPF_HELO_NONE,
	SPF_PASS) 185.231.240.75 relay.sw.ru 185.231.240.75
	relay.sw.ru 
X-Scanned-By: MIMEDefang 2.84 on 10.5.110.42
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15
X-loop: libvir-list@redhat.com
Cc: Daniel Henrique Barboza 
Subject: [libvirt] [PATCH v3 06/12] qemu: handle libvirtd restart after host
	usb device unplug
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.15
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]);
 Tue, 17 Sep 2019 13:54:34 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

It is possible for libvirtd to go down before DEVICE_DELETED event is
delivered upon usb hostdev unplug and to receive the event after the
libvirtd is up. In order to handle this case we need to save
usb hostdev deleteAction in status file.

Signed-off-by: Nikolay Shirokovskiy 
Reviewed-by: Daniel Henrique Barboza 
---
 src/conf/domain_conf.c | 26 ++++++++++++++++++++++++++
 src/conf/domain_conf.h |  1 +
 src/qemu/qemu_driver.c | 20 ++++++++++++++++++--
 3 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index db065f6a5b..c2d141fc74 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -1236,6 +1236,13 @@ VIR_ENUM_IMPL(virDomainShmemModel,
               "ivshmem-doorbell",
 );
=20
+VIR_ENUM_IMPL(virDomainHostdevDeleteAction,
+              VIR_DOMAIN_HOSTDEV_DELETE_ACTION_LAST,
+              "none",
+              "delete",
+              "unplug"
+);
+
 VIR_ENUM_IMPL(virDomainLaunchSecurity,
               VIR_DOMAIN_LAUNCH_SECURITY_LAST,
               "",
@@ -7546,6 +7553,7 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node,
     virDomainHostdevSubsysUSBPtr usbsrc =3D &def->source.subsys.u.usb;
     VIR_AUTOFREE(char *) startupPolicy =3D NULL;
     VIR_AUTOFREE(char *) autoAddress =3D NULL;
+    VIR_AUTOFREE(char *) deleteAction =3D NULL;
=20
     if ((startupPolicy =3D virXMLPropString(node, "startupPolicy"))) {
         def->startupPolicy =3D
@@ -7563,6 +7571,18 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node,
             usbsrc->autoAddress =3D true;
     }
=20
+    if ((deleteAction =3D virXMLPropString(node, "deleteAction"))) {
+        def->deleteAction =3D
+            virDomainHostdevDeleteActionTypeFromString(deleteAction);
+
+        if (def->deleteAction <=3D 0) {
+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                           _("Unknown deleteAction '%s'"),
+                           deleteAction);
+            goto out;
+        }
+    }
+
     /* Product can validly be 0, so we need some extra help to determine
      * if it is uninitialized*/
     got_product =3D false;
@@ -24979,6 +24999,12 @@ virDomainHostdevDefFormatSubsys(virBufferPtr buf,
=20
         if (def->missing && !(flags & VIR_DOMAIN_DEF_FORMAT_INACTIVE))
             virBufferAddLit(buf, " missing=3D'yes'");
+
+        if (def->deleteAction && (flags & VIR_DOMAIN_DEF_FORMAT_STATUS)) {
+            const char *deleteAction;
+            deleteAction =3D virDomainHostdevDeleteActionTypeToString(def-=
>deleteAction);
+            virBufferAsprintf(buf, " deleteAction=3D'%s'", deleteAction);
+        }
     }
=20
     if (def->source.subsys.type =3D=3D VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI=
 &&
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index da005e5423..d596551d3a 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -340,6 +340,7 @@ typedef enum {
=20
     VIR_DOMAIN_HOSTDEV_DELETE_ACTION_LAST
 } virDomainHostdevDeleteActionType;
+VIR_ENUM_DECL(virDomainHostdevDeleteAction);
=20
=20
 /* basic device for direct passthrough */
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 51f1d5d4a2..b12b39d61d 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -5256,10 +5256,13 @@ processUSBAddedEvent(virQEMUDriverPtr driver,
 {
     virDomainHostdevDefPtr hostdev;
     virDomainHostdevSubsysUSBPtr usbsrc;
+    virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver);
     size_t i;
=20
-    if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0)
+    if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) {
+        virObjectUnref(cfg);
         return;
+    }
=20
     if (!virDomainObjIsActive(vm)) {
         VIR_DEBUG("Domain is not running");
@@ -5287,8 +5290,13 @@ processUSBAddedEvent(virQEMUDriverPtr driver,
     if (qemuDomainAttachHostDevice(driver, vm, hostdev) < 0)
         goto cleanup;
=20
+    if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->cap=
s) < 0)
+        VIR_WARN("unable to save domain status after plugging device %s",
+                 hostdev->info->alias);
+
  cleanup:
     qemuDomainObjEndJob(driver, vm);
+    virObjectUnref(cfg);
 }
=20
=20
@@ -5300,9 +5308,12 @@ processUSBRemovedEvent(virQEMUDriverPtr driver,
     size_t i;
     virDomainHostdevDefPtr hostdev;
     virDomainDeviceDef dev =3D { .type =3D VIR_DOMAIN_DEVICE_HOSTDEV };
+    virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver);
=20
-    if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0)
+    if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) {
+        virObjectUnref(cfg);
         return;
+    }
=20
     if (!virDomainObjIsActive(vm)) {
         VIR_DEBUG("Domain is not running");
@@ -5338,8 +5349,13 @@ processUSBRemovedEvent(virQEMUDriverPtr driver,
     if (qemuDomainDetachDeviceLive(vm, &dev, driver, true, true) < 0)
         goto cleanup;
=20
+    if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->cap=
s) < 0)
+        VIR_WARN("unable to save domain status after unplugging device %s",
+                 hostdev->info->alias);
+
  cleanup:
     qemuDomainObjEndJob(driver, vm);
+    virObjectUnref(cfg);
 }
=20
=20
--=20
2.23.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Sun May 19 03:12:53 2024
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=fail(p=none dis=none)  header.from=virtuozzo.com
ARC-Seal: i=1; a=rsa-sha256; t=1568728129; cv=none;
	d=zoho.com; s=zohoarc;
	b=j8LODG70e4yc2Bi8t0fUe/N61j6u7fWsNSjFJjtyBhexNEiGL1+PP4R2pJA+iKf2sRwBhSirTC5ngNZ7KNKM+Z8M3Oe8Oeht4OjurVSueThog14XQ0dRSWNxbIDCGQ2Z1Y5nk5AJmV5dJW7A8cD61oP9CB8TidskYFan5AvQENE=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1568728129;
 h=Content-Type:Content-Transfer-Encoding:Cc: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=4Uls/jaVAv2p+RrQfOwsDv7fmBa1Ao6qcb4CKOG/k5s=;
	b=dwH0s8KAIxPuvy5zZxGHPrSx+R151aQ73CCaeZsHg5vQswlAgynKwsz41yIpKCMzhj9Ym0Z930mC5O7lrWOL70x9T6YxAhcdcw++UPO3YczXw+xgdhwG9imIFahDodJygdSZHboCJ3blFSwbyhB6kVoe8rarWAGm7aUsfL3tlSs=
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=fail 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 1568728129814827.0513480683288;
 Tue, 17 Sep 2019 06:48:49 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com
 [10.5.11.13])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 16746191864F;
	Tue, 17 Sep 2019 13:48:48 +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 CD76060625;
	Tue, 17 Sep 2019 13:48:47 +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 8C2174EE6F;
	Tue, 17 Sep 2019 13:48:47 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
	[10.5.11.16])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x8HDmaOX002332 for ;
	Tue, 17 Sep 2019 09:48:36 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 5C4FD5C57D; Tue, 17 Sep 2019 13:48:36 +0000 (UTC)
Received: from mx1.redhat.com (ext-mx26.extmail.prod.ext.phx2.redhat.com
	[10.5.110.67])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 5505B5C21E
	for ; Tue, 17 Sep 2019 13:48:29 +0000 (UTC)
Received: from relay.sw.ru (relay.sw.ru [185.231.240.75])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id E79F08980EF
	for ; Tue, 17 Sep 2019 13:48:28 +0000 (UTC)
Received: from [172.16.24.106] (helo=shiny.sw.ru)
	by relay.sw.ru with esmtp (Exim 4.92.2)
	(envelope-from )
	id 1iADqF-0001xB-Cz; Tue, 17 Sep 2019 16:48:27 +0300
From: Nikolay Shirokovskiy 
To: libvir-list@redhat.com
Date: Tue, 17 Sep 2019 16:47:42 +0300
Message-Id: <20190917134747.13868-8-nshirokovskiy@virtuozzo.com>
In-Reply-To: <20190917134747.13868-1-nshirokovskiy@virtuozzo.com>
References: <20190917134747.13868-1-nshirokovskiy@virtuozzo.com>
MIME-Version: 1.0
X-Greylist: Sender passed SPF test, ACL 264 matched, not delayed by
	milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.67]);
	Tue, 17 Sep 2019 13:48:29 +0000 (UTC)
X-Greylist: inspected by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.67]);
	Tue, 17 Sep 2019 13:48:29 +0000 (UTC) for IP:'185.231.240.75'
	DOMAIN:'relay.sw.ru' HELO:'relay.sw.ru'
	FROM:'nshirokovskiy@virtuozzo.com' RCPT:''
X-RedHat-Spam-Score: 0  (SPF_HELO_NONE,
	SPF_PASS) 185.231.240.75 relay.sw.ru 185.231.240.75
	relay.sw.ru 
X-Scanned-By: MIMEDefang 2.84 on 10.5.110.67
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-loop: libvir-list@redhat.com
Cc: Daniel Henrique Barboza 
Subject: [libvirt] [PATCH v3 07/12] qemu: handle race on device deletion and
	usb host device plugging
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.13
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.70]);
 Tue, 17 Sep 2019 13:48:48 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

Imagine host usb device is unplugged from host and as a result we send
command to qemu to delete appropriate device. Then before qemu device is
deleted host usb device is plugged back. Currently code supposes there is
no remnant device in qemu and will try to add new device and the attempt
will fail.

Instead let's check the device is not yet deleted and postpone adding
qemu device to device_deleted event handler.

Signed-off-by: Nikolay Shirokovskiy 
Reviewed-by: Daniel Henrique Barboza 
---
 src/qemu/qemu_driver.c | 49 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index b12b39d61d..e5594835c4 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -4655,6 +4655,44 @@ processGuestPanicEvent(virQEMUDriverPtr driver,
 }
=20
=20
+static int
+qemuCheckHostdevPlugged(virQEMUDriverPtr driver,
+                        virDomainObjPtr vm,
+                        const char *devAlias)
+{
+    virDomainHostdevDefPtr hostdev;
+    virDomainHostdevSubsysUSBPtr usbsrc;
+    virDomainDeviceDef dev;
+    int num;
+
+    if (virDomainDefFindDevice(vm->def, devAlias, &dev, false) < 0)
+        return 0;
+
+    if (dev.type !=3D VIR_DOMAIN_DEVICE_HOSTDEV)
+        return 0;
+
+    hostdev =3D dev.data.hostdev;
+    if (hostdev->source.subsys.type !=3D VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_US=
B)
+        return 0;
+
+    usbsrc =3D &hostdev->source.subsys.u.usb;
+    if (!usbsrc->vendor || !usbsrc->product)
+        return 0;
+
+    if ((num =3D virUSBDeviceFindByVendor(usbsrc->vendor, usbsrc->product,
+                                        NULL, false, NULL)) < 0)
+        return -1;
+
+    if (num =3D=3D 0)
+        return 0;
+
+    if (qemuDomainAttachHostDevice(driver, vm, hostdev) < 0)
+        return -1;
+
+    return 0;
+}
+
+
 static void
 processDeviceDeletedEvent(virQEMUDriverPtr driver,
                           virDomainObjPtr vm,
@@ -4682,6 +4720,11 @@ processDeviceDeletedEvent(virQEMUDriverPtr driver,
=20
         if (qemuDomainRemoveDevice(driver, vm, &dev) < 0)
             goto endjob;
+
+        /* Fall thru and save status file even on error condition because
+         * device is removed successfully and changed configuration need
+         * to be saved in status file. */
+        qemuCheckHostdevPlugged(driver, vm, devAlias);
     }
=20
     if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->cap=
s) < 0)
@@ -5287,6 +5330,12 @@ processUSBAddedEvent(virQEMUDriverPtr driver,
     if (i =3D=3D vm->def->nhostdevs)
         goto cleanup;
=20
+    /* if device is not yet even deleted from qemu then handle plugging la=
ter.
+     * Or we failed handling host usb device unplugging, then another atte=
mpt of
+     * unplug/plug could help. */
+    if (usbsrc->bus || usbsrc->device)
+        goto cleanup;
+
     if (qemuDomainAttachHostDevice(driver, vm, hostdev) < 0)
         goto cleanup;
=20
--=20
2.23.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Sun May 19 03:12:53 2024
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=fail(p=none dis=none)  header.from=virtuozzo.com
ARC-Seal: i=1; a=rsa-sha256; t=1568728130; cv=none;
	d=zoho.com; s=zohoarc;
	b=hZH1/6z1ClMdOwzyPK1TSfGJYzZ+l/xTBHlfA/fmulUeFrzX8PIs5L+x5lVP4PvMkrweEdxDjUZg0vr9v1iydHDdEZcdz3aV5am9bLgJZgrWx5ZQOvKh2dAIXRG47YLOTwpXw5fGeNpftCfS3uQfzqjUqjjsN+zf7ej9uf68PlM=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1568728130;
 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=/Hh1xZk+wn59gxqgjO3mCIHiPeDTDRYKZxgrF71m1Qw=;
	b=IrXI+I664XQE7vlHKQ+Smw/cUK3trndLu6ON731fUwoLTWIzbVDGcF/DkXcF5dZ5AVCAOLy7djD6Er1y0i7ynwfJRM5+OcNy57mxvskf5m3MfCGQ+/pFJnWmlwZABH+xp17WkdpSWN44UP2ReUQ+g7ViSQbEcYk8K/4yisUAPlM=
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=fail 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 1568728130069192.51929943239554;
 Tue, 17 Sep 2019 06:48:50 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com
 [10.5.11.13])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 1564B191864E;
	Tue, 17 Sep 2019 13:48:48 +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 D25A96062A;
	Tue, 17 Sep 2019 13:48:47 +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 8E1C8180B536;
	Tue, 17 Sep 2019 13:48:47 +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 x8HDmYEi002297 for ;
	Tue, 17 Sep 2019 09:48:34 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 1A7BF60BFB; Tue, 17 Sep 2019 13:48:34 +0000 (UTC)
Received: from mx1.redhat.com (ext-mx26.extmail.prod.ext.phx2.redhat.com
	[10.5.110.67])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 0DB7C60C5E
	for ; Tue, 17 Sep 2019 13:48:29 +0000 (UTC)
Received: from relay.sw.ru (relay.sw.ru [185.231.240.75])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 09D658980F0
	for ; Tue, 17 Sep 2019 13:48:29 +0000 (UTC)
Received: from [172.16.24.106] (helo=shiny.sw.ru)
	by relay.sw.ru with esmtp (Exim 4.92.2)
	(envelope-from ) id 1iADqF-0001xB-HF
	for libvir-list@redhat.com; Tue, 17 Sep 2019 16:48:27 +0300
From: Nikolay Shirokovskiy 
To: libvir-list@redhat.com
Date: Tue, 17 Sep 2019 16:47:43 +0300
Message-Id: <20190917134747.13868-9-nshirokovskiy@virtuozzo.com>
In-Reply-To: <20190917134747.13868-1-nshirokovskiy@virtuozzo.com>
References: <20190917134747.13868-1-nshirokovskiy@virtuozzo.com>
MIME-Version: 1.0
X-Greylist: Sender passed SPF test, ACL 264 matched, not delayed by
	milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.67]);
	Tue, 17 Sep 2019 13:48:29 +0000 (UTC)
X-Greylist: inspected by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.67]);
	Tue, 17 Sep 2019 13:48:29 +0000 (UTC) for IP:'185.231.240.75'
	DOMAIN:'relay.sw.ru' HELO:'relay.sw.ru'
	FROM:'nshirokovskiy@virtuozzo.com' RCPT:''
X-RedHat-Spam-Score: 0  (SPF_HELO_NONE,
	SPF_PASS) 185.231.240.75 relay.sw.ru 185.231.240.75
	relay.sw.ru 
X-Scanned-By: MIMEDefang 2.84 on 10.5.110.67
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH v3 08/12] qemu: hotplug: update device list on
	device deleted event
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.13
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.70]);
 Tue, 17 Sep 2019 13:48:48 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

I guess this is the missing piece for [1]. It did not hurt before (like
we didn't even see any errors/warns in logs) because in
qemuProcessUpdateDevices function virDomainDefFindDevice does not find
device deleted from libvirt config. But now in case of unpluggind usb
device from host we leave device in config and thus needlessly try to
call qemuDomainRemoveDevice second time.

[1] 0dfb8a1b9: qemu: Unplug devices that disappeared when libvirtd was down

Signed-off-by: Nikolay Shirokovskiy 
---
 src/qemu/qemu_driver.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index e5594835c4..cd913385f5 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -4715,6 +4715,9 @@ processDeviceDeletedEvent(virQEMUDriverPtr driver,
     if (STRPREFIX(devAlias, "vcpu")) {
         qemuDomainRemoveVcpuAlias(driver, vm, devAlias);
     } else {
+        if (qemuDomainUpdateDeviceList(driver, vm, QEMU_ASYNC_JOB_NONE) < =
0)
+            goto cleanup;
+
         if (virDomainDefFindDevice(vm->def, devAlias, &dev, true) < 0)
             goto endjob;
=20
--=20
2.23.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Sun May 19 03:12:53 2024
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=fail(p=none dis=none)  header.from=virtuozzo.com
ARC-Seal: i=1; a=rsa-sha256; t=1568728152; cv=none;
	d=zoho.com; s=zohoarc;
	b=dtMCpdEPo49S8lQrs9v9orfCKllm3iTtt6vkqvMJH7Tmt9sqKYzU6zLIkx1k9pLDo91I8+UeEseFbM/d9CShVpmO96+ATeTjLrk/0pJFkAzWUTjkUa0myUTZV8roXml8aOpveWMD6UysU8c/p2yOm1FUYUespqQcsFT09V5V4oY=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1568728152;
 h=Content-Type:Content-Transfer-Encoding:Cc: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=87dLob48aw6/qWfgsssk+qRl0/34AHBOlbB1coLTPQQ=;
	b=mgyLKDbRYRpSAe4kAq/aYG2w0Tqs2XhGSd5IpzgXD0TrSWveiS+9NW2li19WvJZqcguQvlckwVx3RqqAQTQ55pOMu8US254jORGcjKYXs3tuMt2eUGXigORmEu9PUpwJsCNhuar1PnMrNVyq3jFUKdY7zx5sSpkqsiBomKHKe64=
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=fail 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 156872815297466.37164478022976;
 Tue, 17 Sep 2019 06:49:12 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com
 [10.5.11.13])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 58F7518C428E;
	Tue, 17 Sep 2019 13:49:11 +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 286B46062D;
	Tue, 17 Sep 2019 13:49:11 +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 BBF31180085A;
	Tue, 17 Sep 2019 13:49:10 +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 x8HDmb4h002377 for ;
	Tue, 17 Sep 2019 09:48:37 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id EB5D55D6A5; Tue, 17 Sep 2019 13:48:37 +0000 (UTC)
Received: from mx1.redhat.com (ext-mx09.extmail.prod.ext.phx2.redhat.com
	[10.5.110.38])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id E4A0B5D6D0
	for ; Tue, 17 Sep 2019 13:48:29 +0000 (UTC)
Received: from relay.sw.ru (relay.sw.ru [185.231.240.75])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 3486E4E83C
	for ; Tue, 17 Sep 2019 13:48:29 +0000 (UTC)
Received: from [172.16.24.106] (helo=shiny.sw.ru)
	by relay.sw.ru with esmtp (Exim 4.92.2)
	(envelope-from )
	id 1iADqF-0001xB-Kh; Tue, 17 Sep 2019 16:48:27 +0300
From: Nikolay Shirokovskiy 
To: libvir-list@redhat.com
Date: Tue, 17 Sep 2019 16:47:44 +0300
Message-Id: <20190917134747.13868-10-nshirokovskiy@virtuozzo.com>
In-Reply-To: <20190917134747.13868-1-nshirokovskiy@virtuozzo.com>
References: <20190917134747.13868-1-nshirokovskiy@virtuozzo.com>
MIME-Version: 1.0
X-Greylist: Sender passed SPF test, ACL 264 matched, not delayed by
	milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]);
	Tue, 17 Sep 2019 13:48:29 +0000 (UTC)
X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com
 [10.5.110.38]);
	Tue, 17 Sep 2019 13:48:29 +0000 (UTC) for IP:'185.231.240.75'
	DOMAIN:'relay.sw.ru' HELO:'relay.sw.ru'
	FROM:'nshirokovskiy@virtuozzo.com' RCPT:''
X-RedHat-Spam-Score: 0  (SPF_HELO_NONE,
	SPF_PASS) 185.231.240.75 relay.sw.ru 185.231.240.75
	relay.sw.ru 
X-Scanned-By: MIMEDefang 2.78 on 10.5.110.38
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15
X-loop: libvir-list@redhat.com
Cc: Daniel Henrique Barboza 
Subject: [libvirt] [PATCH v3 09/12] qemu: handle host usb device plug/unplug
	when libvirtd is down
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.13
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.62]);
 Tue, 17 Sep 2019 13:49:11 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

Somebody can easily unplug usb device from host while libvirtd is being
stopped. Also usb device can be plugged or unplugged/plugged back and so
forth. Let's handle such cases.

Signed-off-by: Nikolay Shirokovskiy 
Reviewed-by: Daniel Henrique Barboza 
---
 src/qemu/qemu_process.c | 56 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 955ba4de4c..26113e598d 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -3749,6 +3749,59 @@ qemuProcessUpdateDevices(virQEMUDriverPtr driver,
     return ret;
 }
=20
+
+static int
+qemuProcessReattachUSBDevices(virQEMUDriverPtr driver,
+                              virDomainObjPtr vm)
+{
+    size_t i;
+
+    for (i =3D 0; i < vm->def->nhostdevs; i++) {
+        virDomainHostdevDefPtr hostdev =3D vm->def->hostdevs[i];
+        virDomainHostdevSubsysUSBPtr usbsrc =3D &hostdev->source.subsys.u.=
usb;
+
+        if (hostdev->source.subsys.type !=3D VIR_DOMAIN_HOSTDEV_SUBSYS_TYP=
E_USB ||
+            !usbsrc->replug)
+            continue;
+
+        /* don't mess with devices that don't use stable host addressing
+         * with respect to unplug/plug to host
+         */
+        if (!usbsrc->vendor || !usbsrc->product)
+            continue;
+
+        if (!usbsrc->bus && !usbsrc->device) {
+            int num;
+
+            if ((num =3D virUSBDeviceFindByVendor(usbsrc->vendor, usbsrc->=
product,
+                                                NULL, false, NULL)) < 0)
+                return -1;
+
+            if (num > 0 &&
+                qemuDomainAttachHostDevice(driver, vm, hostdev) < 0)
+                return -1;
+        } else {
+            virUSBDevicePtr usb;
+
+            if (virUSBDeviceFindByBus(usbsrc->bus, usbsrc->device,
+                                      NULL, false, &usb) < 0)
+                return -1;
+
+            if (!usb) {
+                virDomainDeviceDef dev =3D { .type =3D VIR_DOMAIN_DEVICE_H=
OSTDEV };
+
+                dev.data.hostdev =3D hostdev;
+                if (qemuDomainDetachDeviceLive(vm, &dev, driver, true, tru=
e) < 0)
+                    return -1;
+            }
+            virUSBDeviceFree(usb);
+        }
+    }
+
+    return 0;
+}
+
+
 static int
 qemuDomainPerfRestart(virDomainObjPtr vm)
 {
@@ -8217,6 +8270,9 @@ qemuProcessReconnect(void *opaque)
     if (qemuProcessUpdateDevices(driver, obj) < 0)
         goto error;
=20
+    if (qemuProcessReattachUSBDevices(driver, obj) < 0)
+        goto error;
+
     if (qemuRefreshPRManagerState(driver, obj) < 0)
         goto error;
=20
--=20
2.23.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Sun May 19 03:12:53 2024
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=fail(p=none dis=none)  header.from=virtuozzo.com
ARC-Seal: i=1; a=rsa-sha256; t=1568728139; cv=none;
	d=zoho.com; s=zohoarc;
	b=KKZeyKjNxvHZLfkj2K5vh6PfUoT5mxUuq1lyZ0IqZqdxRZyFOPG9fiTB3RykE28BHEfv4P8kVRgRDGIO2NzkrtogZbcmybV+7pRtUxeOX+lCzY8OrpbWZjXiWpBKwNssUSxpz72d7aF+bKsVPsb2GzQMK371aIdRzM7sDH7tlBE=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1568728139;
 h=Content-Type:Content-Transfer-Encoding:Cc: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=nlarw9TkDikuCJbSNftfjlgKXvdicKa7NhIVn3y1xjI=;
	b=OcIexcvQuhmxgxBEuhRdAlk5vZggZhGk225AFEHzcd3NNYrYbGL9uFZF9BtFE79P/qFxmzpEYSBFH9/HKHlgy/1/4BnlosW425W/tomXfcJIWbImQcnUnRA3R1NbALNaEX04CGh43lm+Enpxexbx9fbrq7Ash2GdEC4/o59AO78=
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=fail 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 1568728139247277.1091138400691;
 Tue, 17 Sep 2019 06:48:59 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com
 [10.5.11.13])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 6ADEA7BDB7;
	Tue, 17 Sep 2019 13:48:57 +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 4188460619;
	Tue, 17 Sep 2019 13:48:57 +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 B69AA180B536;
	Tue, 17 Sep 2019 13:48:55 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
	[10.5.11.16])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x8HDmaxT002331 for ;
	Tue, 17 Sep 2019 09:48:36 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 5AB1F5C557; Tue, 17 Sep 2019 13:48:36 +0000 (UTC)
Received: from mx1.redhat.com (ext-mx16.extmail.prod.ext.phx2.redhat.com
	[10.5.110.45])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 5563A5C298
	for ; Tue, 17 Sep 2019 13:48:30 +0000 (UTC)
Received: from relay.sw.ru (relay.sw.ru [185.231.240.75])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 519D2309BF1D
	for ; Tue, 17 Sep 2019 13:48:29 +0000 (UTC)
Received: from [172.16.24.106] (helo=shiny.sw.ru)
	by relay.sw.ru with esmtp (Exim 4.92.2)
	(envelope-from )
	id 1iADqF-0001xB-Q3; Tue, 17 Sep 2019 16:48:27 +0300
From: Nikolay Shirokovskiy 
To: libvir-list@redhat.com
Date: Tue, 17 Sep 2019 16:47:45 +0300
Message-Id: <20190917134747.13868-11-nshirokovskiy@virtuozzo.com>
In-Reply-To: <20190917134747.13868-1-nshirokovskiy@virtuozzo.com>
References: <20190917134747.13868-1-nshirokovskiy@virtuozzo.com>
MIME-Version: 1.0
X-Greylist: Sender passed SPF test, ACL 264 matched, not delayed by
	milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]);
	Tue, 17 Sep 2019 13:48:29 +0000 (UTC)
X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com
 [10.5.110.45]);
	Tue, 17 Sep 2019 13:48:29 +0000 (UTC) for IP:'185.231.240.75'
	DOMAIN:'relay.sw.ru' HELO:'relay.sw.ru'
	FROM:'nshirokovskiy@virtuozzo.com' RCPT:''
X-RedHat-Spam-Score: 0  (SPF_HELO_NONE,
	SPF_PASS) 185.231.240.75 relay.sw.ru 185.231.240.75
	relay.sw.ru 
X-Scanned-By: MIMEDefang 2.84 on 10.5.110.45
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-loop: libvir-list@redhat.com
Cc: Daniel Henrique Barboza 
Subject: [libvirt] [PATCH v3 10/12] qemu: don't mess with non mandatory
	hostdevs on reattaching
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.13
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]);
 Tue, 17 Sep 2019 13:48:57 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

First I don't want to add code to handle dummy device that is used when
host usb device is not present at the moment of starting/migrating etc.
Second supporting non mandatory policies would require to handle races
when host usb device is plugged to host and libvirtd starts adding
device but if in the meanwhile host usb device it unplugged back then
current code will use dummy device which is not desired in this case.

Signed-off-by: Nikolay Shirokovskiy 
Reviewed-by: Daniel Henrique Barboza 
---
 src/qemu/qemu_driver.c  | 8 ++++++++
 src/qemu/qemu_process.c | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index cd913385f5..70f5c70d65 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -5321,6 +5321,10 @@ processUSBAddedEvent(virQEMUDriverPtr driver,
         if (hostdev->source.subsys.type !=3D VIR_DOMAIN_HOSTDEV_SUBSYS_TYP=
E_USB)
             continue;
=20
+        if (hostdev->startupPolicy =3D=3D VIR_DOMAIN_STARTUP_POLICY_OPTION=
AL ||
+            hostdev->startupPolicy =3D=3D VIR_DOMAIN_STARTUP_POLICY_REQUIS=
ITE)
+            continue;
+
         usbsrc =3D &hostdev->source.subsys.u.usb;
=20
         if (!usbsrc->replug)
@@ -5379,6 +5383,10 @@ processUSBRemovedEvent(virQEMUDriverPtr driver,
         if (hostdev->source.subsys.type !=3D VIR_DOMAIN_HOSTDEV_SUBSYS_TYP=
E_USB)
             continue;
=20
+        if (hostdev->startupPolicy =3D=3D VIR_DOMAIN_STARTUP_POLICY_OPTION=
AL ||
+            hostdev->startupPolicy =3D=3D VIR_DOMAIN_STARTUP_POLICY_REQUIS=
ITE)
+            continue;
+
         usbsrc =3D &hostdev->source.subsys.u.usb;
=20
         if (!usbsrc->replug)
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 26113e598d..ab0d85de1f 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -3770,6 +3770,10 @@ qemuProcessReattachUSBDevices(virQEMUDriverPtr drive=
r,
         if (!usbsrc->vendor || !usbsrc->product)
             continue;
=20
+        if (hostdev->startupPolicy =3D=3D VIR_DOMAIN_STARTUP_POLICY_OPTION=
AL ||
+            hostdev->startupPolicy =3D=3D VIR_DOMAIN_STARTUP_POLICY_REQUIS=
ITE)
+            continue;
+
         if (!usbsrc->bus && !usbsrc->device) {
             int num;
=20
--=20
2.23.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Sun May 19 03:12:53 2024
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=fail(p=none dis=none)  header.from=virtuozzo.com
ARC-Seal: i=1; a=rsa-sha256; t=1568728149; cv=none;
	d=zoho.com; s=zohoarc;
	b=f4oa8Cldh18ZwvnwtJVM+ygaOxxHQawjjhzNBieCsaIT4IUXA/OnuCJy/AfkFmDqNfovzsi0w7Kz1R/iZLMDJSUuo9RP6HmAlRwd2mFAEXZ2Ek/ZwrPN6b/FaBkPZP+RdRX5339WkJPmiPA8nqIcs1GzgLgzTqVm1BMdpceBZaw=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1568728149;
 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=XUTZDLhS5LjtKhR95qWJtjTJnz7oGUkH6rIg9ll6a/I=;
	b=HgAlJHclVR/cIVcx+/7cOGH4RAYn7T4g7I4OsVpnEw4xThi04aQiwJLMO1xmCa7dTZRoB6KQhyi2yDJS9l0twnARXzOd+KG4/kkpsPp80D70SxixyGhBv+OxRyrmm1AHl3Hq33VmpSIQ+2emNKnXJF5Zy5QSCGjDM+wwpF4Ri7w=
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=fail 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 1568728149091137.81952250028303;
 Tue, 17 Sep 2019 06:49:09 -0700 (PDT)
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 mx1.redhat.com (Postfix) with ESMTPS id 6986930860CB;
	Tue, 17 Sep 2019 13:49:07 +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 3FDF961F21;
	Tue, 17 Sep 2019 13:49:07 +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 EBC204EE7E;
	Tue, 17 Sep 2019 13:49:06 +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 x8HDmbwX002351 for ;
	Tue, 17 Sep 2019 09:48:37 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 0B32460C5E; Tue, 17 Sep 2019 13:48:37 +0000 (UTC)
Received: from mx1.redhat.com (ext-mx03.extmail.prod.ext.phx2.redhat.com
	[10.5.110.27])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 0359B60BE1
	for ; Tue, 17 Sep 2019 13:48:30 +0000 (UTC)
Received: from relay.sw.ru (relay.sw.ru [185.231.240.75])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 6BBBD81F13
	for ; Tue, 17 Sep 2019 13:48:29 +0000 (UTC)
Received: from [172.16.24.106] (helo=shiny.sw.ru)
	by relay.sw.ru with esmtp (Exim 4.92.2)
	(envelope-from ) id 1iADqF-0001xB-Tw
	for libvir-list@redhat.com; Tue, 17 Sep 2019 16:48:27 +0300
From: Nikolay Shirokovskiy 
To: libvir-list@redhat.com
Date: Tue, 17 Sep 2019 16:47:46 +0300
Message-Id: <20190917134747.13868-12-nshirokovskiy@virtuozzo.com>
In-Reply-To: <20190917134747.13868-1-nshirokovskiy@virtuozzo.com>
References: <20190917134747.13868-1-nshirokovskiy@virtuozzo.com>
MIME-Version: 1.0
X-Greylist: Sender passed SPF test, ACL 264 matched, not delayed by
	milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]);
	Tue, 17 Sep 2019 13:48:29 +0000 (UTC)
X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com
 [10.5.110.27]);
	Tue, 17 Sep 2019 13:48:29 +0000 (UTC) for IP:'185.231.240.75'
	DOMAIN:'relay.sw.ru' HELO:'relay.sw.ru'
	FROM:'nshirokovskiy@virtuozzo.com' RCPT:''
X-RedHat-Spam-Score: 0  (SPF_HELO_NONE,
	SPF_PASS) 185.231.240.75 relay.sw.ru 185.231.240.75
	relay.sw.ru 
X-Scanned-By: MIMEDefang 2.78 on 10.5.110.27
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH v3 11/12] qemu: handle detaching of unplugged
	hostdev
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.15
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]);
 Tue, 17 Sep 2019 13:49:08 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

If hostdev is unplugged we don't need to delete it's correspondent device
from qemu etc. Just remove it from config immediately.

Signed-off-by: Nikolay Shirokovskiy 
---
 src/qemu/qemu_hotplug.c | 16 +++++++++++++++-
 src/util/virhostdev.c   |  2 ++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 780bfde002..32ab581755 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -4528,6 +4528,7 @@ qemuDomainRemoveHostDevice(virQEMUDriverPtr driver,
     char *objAlias =3D NULL;
     bool is_vfio =3D false;
     bool unplug =3D hostdev->deleteAction =3D=3D VIR_DOMAIN_HOSTDEV_DELETE=
_ACTION_UNPLUG;
+    bool unplugged =3D false;
=20
     VIR_DEBUG("Removing host device %s from domain %p %s",
               hostdev->info->alias, vm, vm->def->name);
@@ -4586,13 +4587,17 @@ qemuDomainRemoveHostDevice(virQEMUDriverPtr driver,
=20
     virDomainAuditHostdev(vm, hostdev, "detach", true);
=20
+    if (hostdev->source.subsys.type =3D=3D VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_=
USB) {
+        virDomainHostdevSubsysUSBPtr usbsrc =3D &hostdev->source.subsys.u.=
usb;
+        unplugged =3D !usbsrc->bus && !usbsrc->device;
+    }
     /*
      * In case of unplug the attempt to restore label will fail. But we do=
n't
      * need to restore the label! In case of separate mount namespace for =
the
      * domain we remove device file later in this function. In case of glo=
bal
      * mount namespace the device file is deleted or being deleted by syst=
emd.
      */
-    if (!is_vfio && !unplug &&
+    if (!is_vfio && !unplug && !unplugged &&
         qemuSecurityRestoreHostdevLabel(driver, vm, hostdev) < 0)
         VIR_WARN("Failed to restore host device labelling");
=20
@@ -5932,6 +5937,15 @@ qemuDomainDetachDeviceLive(virDomainObjPtr vm,
                                         unplug) < 0) {
             return -1;
         }
+        if (!unplug) {
+            virDomainHostdevDefPtr hostdev =3D detach.data.hostdev;
+            virDomainHostdevSubsysUSBPtr usbsrc =3D &hostdev->source.subsy=
s.u.usb;
+
+            if (hostdev->startupPolicy !=3D VIR_DOMAIN_STARTUP_POLICY_OPTI=
ONAL &&
+                hostdev->startupPolicy !=3D VIR_DOMAIN_STARTUP_POLICY_REQU=
ISITE &&
+                usbsrc->device =3D=3D 0 && usbsrc->bus =3D=3D 0)
+                return qemuDomainRemoveDevice(driver, vm, &detach);
+        }
         break;
     case VIR_DOMAIN_DEVICE_RNG:
         if (qemuDomainDetachPrepRNG(vm, match->data.rng,
diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c
index 41fcab7222..ed9bc09e14 100644
--- a/src/util/virhostdev.c
+++ b/src/util/virhostdev.c
@@ -1793,6 +1793,8 @@ virHostdevReAttachUSBDevices(virHostdevManagerPtr mgr,
             continue;
         if (hostdev->missing)
             continue;
+        if (!usbsrc->bus && !usbsrc->device)
+            continue;
=20
         if (!(usb =3D virUSBDeviceNew(usbsrc->bus, usbsrc->device, NULL)))=
 {
             VIR_WARN("Unable to reattach USB device %03d.%03d on domain %s=
",
--=20
2.23.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Sun May 19 03:12:53 2024
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=fail(p=none dis=none)  header.from=virtuozzo.com
ARC-Seal: i=1; a=rsa-sha256; t=1568728120; cv=none;
	d=zoho.com; s=zohoarc;
	b=kIaf1oP+ttPoF9+YQkH/bhmKxIpXmD+hIRm4FzmLfX9W2Rp3IQatHyyoGmyGdAh3O626CQl1N4UFC2poI0gXXMijjBCX4MVLm/oxrNhVbSulaFoTjm24FN0+SmSLxDJmZVbGFFMccmSPC/NeRezjg4+vmkEJxGkWWsmU6tTG6gM=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1568728120;
 h=Content-Type:Content-Transfer-Encoding:Cc: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=e7crFdDrc7y8m2QFcZYvU10UTYS+y+92O8YLFWXZu4o=;
	b=N7MbpWqcTJDVJGYTeLyNFpC7kvXYDCe3QCn7XscZSHc2rhO2RjEXBMHtZsgG7D60sld1gWAybmgVyBXa7zs1a6V0JC6azjzUy3nL//5vAT6q/h8WAKnMUWT3nrptKYij7nv0vS3s3XVDBJwYX788H/4l7yNQvHDH4Ui/APEYqwA=
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=fail 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 156872812023818.559195882717745;
 Tue, 17 Sep 2019 06:48:40 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com
 [10.5.11.13])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 6310B308FBAC;
	Tue, 17 Sep 2019 13:48:38 +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 B24B2643EE;
	Tue, 17 Sep 2019 13:48:37 +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 850B84EE68;
	Tue, 17 Sep 2019 13:48:35 +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 x8HDmYu1002296 for ;
	Tue, 17 Sep 2019 09:48:34 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 18F7360BE1; Tue, 17 Sep 2019 13:48:34 +0000 (UTC)
Received: from mx1.redhat.com (ext-mx19.extmail.prod.ext.phx2.redhat.com
	[10.5.110.48])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 0D22960BFB
	for ; Tue, 17 Sep 2019 13:48:30 +0000 (UTC)
Received: from relay.sw.ru (relay.sw.ru [185.231.240.75])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 836DF307D844
	for ; Tue, 17 Sep 2019 13:48:29 +0000 (UTC)
Received: from [172.16.24.106] (helo=shiny.sw.ru)
	by relay.sw.ru with esmtp (Exim 4.92.2)
	(envelope-from )
	id 1iADqG-0001xB-10; Tue, 17 Sep 2019 16:48:28 +0300
From: Nikolay Shirokovskiy 
To: libvir-list@redhat.com
Date: Tue, 17 Sep 2019 16:47:47 +0300
Message-Id: <20190917134747.13868-13-nshirokovskiy@virtuozzo.com>
In-Reply-To: <20190917134747.13868-1-nshirokovskiy@virtuozzo.com>
References: <20190917134747.13868-1-nshirokovskiy@virtuozzo.com>
MIME-Version: 1.0
X-Greylist: Sender passed SPF test, ACL 264 matched, not delayed by
	milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]);
	Tue, 17 Sep 2019 13:48:29 +0000 (UTC)
X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com
 [10.5.110.48]);
	Tue, 17 Sep 2019 13:48:29 +0000 (UTC) for IP:'185.231.240.75'
	DOMAIN:'relay.sw.ru' HELO:'relay.sw.ru'
	FROM:'nshirokovskiy@virtuozzo.com' RCPT:''
X-RedHat-Spam-Score: 0  (SPF_HELO_NONE,
	SPF_PASS) 185.231.240.75 relay.sw.ru 185.231.240.75
	relay.sw.ru 
X-Scanned-By: MIMEDefang 2.84 on 10.5.110.48
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12
X-loop: libvir-list@redhat.com
Cc: Daniel Henrique Barboza 
Subject: [libvirt] [PATCH v3 12/12] conf: parse hostdev missing flag
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.13
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]);
 Tue, 17 Sep 2019 13:48:39 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

We want to keep this flag across libvirtd restarts.

Signed-off-by: Nikolay Shirokovskiy 
Reviewed-by: Daniel Henrique Barboza 
---
 src/conf/domain_conf.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index c2d141fc74..0af19e63d1 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -7554,6 +7554,7 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node,
     VIR_AUTOFREE(char *) startupPolicy =3D NULL;
     VIR_AUTOFREE(char *) autoAddress =3D NULL;
     VIR_AUTOFREE(char *) deleteAction =3D NULL;
+    VIR_AUTOFREE(char *) missing =3D NULL;
=20
     if ((startupPolicy =3D virXMLPropString(node, "startupPolicy"))) {
         def->startupPolicy =3D
@@ -7583,6 +7584,11 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node,
         }
     }
=20
+    if ((missing =3D virXMLPropString(node, "missing"))) {
+        if (STREQ(missing, "yes"))
+            def->missing =3D true;
+    }
+
     /* Product can validly be 0, so we need some extra help to determine
      * if it is uninitialized*/
     got_product =3D false;
--=20
2.23.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list