From nobody Fri Apr 26 07:37:24 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of redhat.com designates
 205.139.110.61 as permitted sender) client-ip=205.139.110.61;
 envelope-from=libvir-list-bounces@redhat.com;
 helo=us-smtp-delivery-1.mimecast.com;
Authentication-Results: mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=fail(p=none dis=none)  header.from=126.com
ARC-Seal: i=1; a=rsa-sha256; t=1590069802; cv=none;
	d=zohomail.com; s=zohoarc;
	b=hkdJohEUOQ4Al95VQbztvVhucktARXLkBZBRgcmCORqBpfflpSBtMj3RwRkf7vMUuLoxQnvwfKfqfrsJ0avukrEX2bcuhU3ABgqdv0q0RjGg+XOUfRuEsMOdOj2RhMbb38G+u1/e2UR7uyro6SChTGEBOSLtvOw2mphbkXOkjfA=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1590069802;
 h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To;
	bh=VtwbmcPjiJ0xTvuqXeZtiPaL11kzGpFxQFrwhCfH6Ls=;
	b=Wgcl2UyBJtit2YSOTPGmB0IzW8KqFmga95EnHA8s4N7enKfm8VwUGn2wk01S73WUHsIuRYaMN4fUKOca+5h0hVc613mIv17YPJtnslJyCFNKrfXyirlfcf5MdXyqYW77BojgOZ62GGf47sM+A/1YkjttCG8qQefiQtlQ89U2Ln0=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=fail header.from=<chen_han_xiao@126.com> (p=none dis=none)
 header.from=<chen_han_xiao@126.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com
 [205.139.110.61]) by mx.zohomail.com
	with SMTPS id 159006980209991.33020714122995;
 Thu, 21 May 2020 07:03:22 -0700 (PDT)
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
 [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id
 us-mta-400-cklBY0Y8NxCfOkWkbQSwKQ-1; Thu, 21 May 2020 10:01:07 -0400
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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 94D538018A2;
	Thu, 21 May 2020 14:01:01 +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 6C62682E7E;
	Thu, 21 May 2020 14:01:01 +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 36EE954D02;
	Thu, 21 May 2020 14:01:01 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com
	[10.11.54.3])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id 04LE0Kth002384 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 21 May 2020 10:00:20 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 2DB7810D14E5; Thu, 21 May 2020 14:00:20 +0000 (UTC)
Received: from mimecast-mx02.redhat.com
	(mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id ED0EB1013256
	for <libvir-list@redhat.com>; Thu, 21 May 2020 14:00:17 +0000 (UTC)
Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits))
	(No client certificate requested)
	by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 91E80180122E
	for <libvir-list@redhat.com>; Thu, 21 May 2020 14:00:17 +0000 (UTC)
Received: from mail-m963.mail.126.com (mail-m963.mail.126.com
	[123.126.96.3]) (Using TLS) by relay.mimecast.com with ESMTP id
	us-mta-339--sBIs1vDM3aYCRPt2fGdWw-1; Thu, 21 May 2020 10:00:10 -0400
Received: from bogon.localdomain (unknown [112.80.215.163])
	by smtp8 (Coremail) with SMTP id NORpCgBXd0hXicZeL+4iFQ--.246S3;
	Thu, 21 May 2020 22:00:05 +0800 (CST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1590069672;
	h=from:from:sender:sender:reply-to:subject:subject:date:date:
	 message-id:message-id:to:to:cc:content-type:content-type:
	 in-reply-to:in-reply-to:references:references:list-id:list-help:
	 list-unsubscribe:list-subscribe:list-post;
	bh=VtwbmcPjiJ0xTvuqXeZtiPaL11kzGpFxQFrwhCfH6Ls=;
	b=MDCr8Zt/mP0jwJzilIABhnuDmvhcTDTjqsjSd9xbOtKPN1B+ZmcpOqX7UvawfFNTFbxfYj
	+jIBaDdSvG5cPcY1KzSz5fy093ufnN7NuwFaE8ZLCN/aVNmPNIHVx69jJ4R72+CHaId/AX
	KXqvRN2q1eZIvnO3C1IVKzURVb13m0k=
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1590069800;
	h=from:from:sender:sender:reply-to:subject:subject:date:date:
	 message-id:message-id:to:to:cc:content-type:content-type:
	 in-reply-to:in-reply-to:references:references:list-id:list-help:
	 list-unsubscribe:list-subscribe:list-post;
	bh=VtwbmcPjiJ0xTvuqXeZtiPaL11kzGpFxQFrwhCfH6Ls=;
	b=MmG0zP37TZCa8+fGQE93Qzr0IzY4pKVz0mm6lyR+OnPDq6r70ylhjUotzUQ7mg+ABC46OJ
	yQIBX8o8qd62QDGdXL7KFwkcim1RJueH4FTAE7RLW4Pwgq96bo4d3h6lCEMnrtjZKtY0vU
	AgveRLnvpjlRGYkUg89ZcBUwKfDoOSs=
X-MC-Unique: cklBY0Y8NxCfOkWkbQSwKQ-1
X-MC-Unique: -sBIs1vDM3aYCRPt2fGdWw-1
From: Chen Hanxiao <chen_han_xiao@126.com>
To: libvir-list@redhat.com
Subject: [PATCH 1/3] downscript: Support network interface downscript
Date: Thu, 21 May 2020 09:59:49 -0400
Message-Id: <1590069591-1946-2-git-send-email-chen_han_xiao@126.com>
In-Reply-To: <1590069591-1946-1-git-send-email-chen_han_xiao@126.com>
References: <1590069591-1946-1-git-send-email-chen_han_xiao@126.com>
X-CM-TRANSID: NORpCgBXd0hXicZeL+4iFQ--.246S3
X-Coremail-Antispam: 1Uf129KBjvJXoWxJw1xJr1xWw4UAw18tF4rAFb_yoW7Jw4xp3
	WkJ34jvw4xWr15WanruF48uFy5Ka95Wr13Ww4S9w40q345Jr4kXw1Iy3W5ur1UArs5AF43
	Ca9xZ3yUGF4jkFJanT9S1TB71UUUUUDqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2
	9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jWiifUUUUU=
X-Originating-IP: [112.80.215.163]
X-CM-SenderInfo: xfkh0spkdqs5xldrqiyswou0bp/1tbitAUrrlpEAtH3LQAAsj
X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3
X-loop: libvir-list@redhat.com
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
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-Mimecast-Spam-Score: 2
X-Mimecast-Originator: redhat.com
X-ZohoMail-DKIM: pass (identity @redhat.com) (identity @redhat.com)
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"

https://gitlab.com/libvirt/libvirt/-/issues/13

Add support for downscript:

<interface type=3D'ethernet'>
    <mac address=3D'00:11:22:33:44:55'/>
    <script path=3D'/etc/qemu-ifup'/>
    <downscript path=3D'/path/to/my/downscript'/>
</interface>

Signed-off-by: Chen Hanxiao <chen_han_xiao@126.com>
---
 docs/schemas/domaincommon.rng | 8 ++++++++
 src/conf/domain_conf.c        | 9 +++++++++
 src/conf/domain_conf.h        | 1 +
 src/qemu/qemu_extdevice.c     | 4 ++++
 src/qemu/qemu_hotplug.c       | 6 ++++++
 5 files changed, 28 insertions(+)

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 9d60b090f3..6727cd743b 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -3191,6 +3191,14 @@
           <empty/>
         </element>
       </optional>
+      <optional>
+        <element name=3D"downscript">
+          <attribute name=3D"path">
+            <ref name=3D"filePath"/>
+          </attribute>
+          <empty/>
+        </element>
+      </optional>
       <optional>
         <element name=3D"backenddomain">
           <attribute name=3D"name">
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index c201fc901d..1406cf079e 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -2520,6 +2520,7 @@ virDomainNetDefClear(virDomainNetDefPtr def)
     VIR_FREE(def->teaming.persistent);
     VIR_FREE(def->virtPortProfile);
     VIR_FREE(def->script);
+    VIR_FREE(def->downscript);
     VIR_FREE(def->domain_name);
     VIR_FREE(def->ifname);
     VIR_FREE(def->ifname_guest);
@@ -11977,6 +11978,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlop=
t,
     g_autofree char *ifname_guest =3D NULL;
     g_autofree char *ifname_guest_actual =3D NULL;
     g_autofree char *script =3D NULL;
+    g_autofree char *downscript =3D NULL;
     g_autofree char *address =3D NULL;
     g_autofree char *port =3D NULL;
     g_autofree char *localaddr =3D NULL;
@@ -12149,6 +12151,9 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlop=
t,
             } else if (!script &&
                        virXMLNodeNameEqual(cur, "script")) {
                 script =3D virXMLPropString(cur, "path");
+            } else if (!downscript &&
+                       virXMLNodeNameEqual(cur, "downscript")) {
+                downscript =3D virXMLPropString(cur, "path");
             } else if (!domain_name &&
                        virXMLNodeNameEqual(cur, "backenddomain")) {
                 domain_name =3D virXMLPropString(cur, "name");
@@ -12482,6 +12487,8 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlop=
t,
=20
     if (script !=3D NULL)
         def->script =3D g_steal_pointer(&script);
+    if (downscript !=3D NULL)
+        def->downscript =3D g_steal_pointer(&downscript);
     if (domain_name !=3D NULL)
         def->domain_name =3D g_steal_pointer(&domain_name);
     if (ifname !=3D NULL)
@@ -26567,6 +26574,8 @@ virDomainNetDefFormat(virBufferPtr buf,
=20
     virBufferEscapeString(buf, "<script path=3D'%s'/>\n",
                           def->script);
+    virBufferEscapeString(buf, "<downscript path=3D'%s'/>\n",
+                          def->downscript);
     virBufferEscapeString(buf, "<backenddomain name=3D'%s'/>\n", def->doma=
in_name);
=20
     if (def->ifname &&
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index ddc75d8de2..e152c599ca 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -1055,6 +1055,7 @@ struct _virDomainNetDef {
         unsigned long sndbuf;
     } tune;
     char *script;
+    char *downscript;
     char *domain_name; /* backend domain name */
     char *ifname; /* interface name on the host (<target dev=3D'x'/>) */
     int managed_tap; /* enum virTristateBool - ABSENT =3D=3D YES */
diff --git a/src/qemu/qemu_extdevice.c b/src/qemu/qemu_extdevice.c
index 2096272761..4962521de4 100644
--- a/src/qemu/qemu_extdevice.c
+++ b/src/qemu/qemu_extdevice.c
@@ -213,6 +213,7 @@ qemuExtDevicesStop(virQEMUDriverPtr driver,
                    virDomainObjPtr vm)
 {
     virDomainDefPtr def =3D vm->def;
+    virDomainNetType actualType;
     size_t i;
=20
     if (qemuExtDevicesInitPaths(driver, def) < 0)
@@ -230,10 +231,13 @@ qemuExtDevicesStop(virQEMUDriverPtr driver,
=20
     for (i =3D 0; i < def->nnets; i++) {
         virDomainNetDefPtr net =3D def->nets[i];
+        actualType =3D virDomainNetGetActualType(net);
         qemuSlirpPtr slirp =3D QEMU_DOMAIN_NETWORK_PRIVATE(net)->slirp;
=20
         if (slirp)
             qemuSlirpStop(slirp, vm, driver, net);
+        if (actualType =3D=3D VIR_DOMAIN_NET_TYPE_ETHERNET && net->downscr=
ipt)
+            virNetDevRunEthernetScript(net->ifname, net->downscript);
     }
=20
     for (i =3D 0; i < def->nfss; i++) {
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 5608566d69..97c6508a55 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -5942,6 +5942,12 @@ qemuDomainDetachDeviceLive(virDomainObjPtr vm,
             ret =3D qemuDomainRemoveDevice(driver, vm, &detach);
     }
=20
+    if ((virDomainDeviceType)match->type =3D=3D VIR_DOMAIN_DEVICE_NET) {
+        virDomainNetDefPtr net =3D detach.data.net;
+        if (net->script)
+            virNetDevRunEthernetScript(net->ifname, net->downscript);
+    }
+
  cleanup:
     if (!async)
         qemuDomainResetDeviceRemoval(vm);
--=20
2.23.0

From nobody Fri Apr 26 07:37:24 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of redhat.com designates
 205.139.110.61 as permitted sender) client-ip=205.139.110.61;
 envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com;
Authentication-Results: mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=fail(p=none dis=none)  header.from=126.com
ARC-Seal: i=1; a=rsa-sha256; t=1590069706; cv=none;
	d=zohomail.com; s=zohoarc;
	b=H45BuO6oF04lloG10bZjDGxAEkcQrhHzacrX4dvb77o2qL+sA1XG4+s2LZaI+eG6I0ThEyoXLbMxCkJ/n3sOQgkVlutN2toYDshK79l//xngTZ09yuTTuNK6FhZ3U726JsVAeNFVBfHFssC1W1FixHOam9Qv21U3UTvkUPIu5RY=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1590069706;
 h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To;
	bh=A4//dT6n3pz25IRnrBe0341I5sKCoFm6I2GZuk6eFgk=;
	b=nonWr6ErIe9PbGf3Kcxp/ltA68WA8SqVde21gCBqgKrXYv0a9YhxzHiK8TYnTw0LTx7JAg3wwn+T8MgxsncuJe7sz64pmBMYZBvEjo+5COo82RFn/qnq6Ildlm2tl6C+sKQmoCcfeX/ATfprO+d4Alm3MNYNmTPrfCN/cjfKTtE=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=fail header.from=<chen_han_xiao@126.com> (p=none dis=none)
 header.from=<chen_han_xiao@126.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com
 [205.139.110.61]) by mx.zohomail.com
	with SMTP id 15900697065201017.358773980182;
 Thu, 21 May 2020 07:01:46 -0700 (PDT)
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
 [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id
 us-mta-70-AVJwTeaeNpePZCcKdc9q5w-1; Thu, 21 May 2020 10:01:04 -0400
Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com
 [10.5.11.15])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E02F8A0BDC;
	Thu, 21 May 2020 14:00:58 +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 C11C26EA26;
	Thu, 21 May 2020 14:00:58 +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 9250A1809547;
	Thu, 21 May 2020 14:00:58 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com
	[10.11.54.6])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id 04LE0HRB002358 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 21 May 2020 10:00:17 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id F2D992156A53; Thu, 21 May 2020 14:00:16 +0000 (UTC)
Received: from mimecast-mx02.redhat.com
	(mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id B74EB2156A4E
	for <libvir-list@redhat.com>; Thu, 21 May 2020 14:00:16 +0000 (UTC)
Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com
	[207.211.31.120])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits))
	(No client certificate requested)
	by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 275F8180123F
	for <libvir-list@redhat.com>; Thu, 21 May 2020 14:00:16 +0000 (UTC)
Received: from mail-m963.mail.126.com (mail-m963.mail.126.com
	[123.126.96.3]) (Using TLS) by relay.mimecast.com with ESMTP id
	us-mta-153-GOizxeuOPzyqldOLm0Ofnw-1; Thu, 21 May 2020 10:00:13 -0400
Received: from bogon.localdomain (unknown [112.80.215.163])
	by smtp8 (Coremail) with SMTP id NORpCgBXd0hXicZeL+4iFQ--.246S4;
	Thu, 21 May 2020 22:00:05 +0800 (CST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1590069669;
	h=from:from:sender:sender:reply-to:subject:subject:date:date:
	 message-id:message-id:to:to:cc:content-type:content-type:
	 in-reply-to:in-reply-to:references:references:list-id:list-help:
	 list-unsubscribe:list-subscribe:list-post;
	bh=A4//dT6n3pz25IRnrBe0341I5sKCoFm6I2GZuk6eFgk=;
	b=VcKoiWkRo6Munro7rl8cuOXxJzGyjIZsKE/2RR6qQZ5PCj5uJ6DkIyyzyXgN0488lJAkFN
	Xuu/dyEIGThf7ji6nTJ819ShTkrz66FKKCpNnrZ//VgE/7O0zqSU1xtuyms6cejtOlmj4M
	RJO4Dt4wAZ3ErVW+QNJTBjZNpJe8Dbw=
X-MC-Unique: AVJwTeaeNpePZCcKdc9q5w-1
X-MC-Unique: GOizxeuOPzyqldOLm0Ofnw-1
From: Chen Hanxiao <chen_han_xiao@126.com>
To: libvir-list@redhat.com
Subject: [PATCH 2/3] downscript: add test case
Date: Thu, 21 May 2020 09:59:50 -0400
Message-Id: <1590069591-1946-3-git-send-email-chen_han_xiao@126.com>
In-Reply-To: <1590069591-1946-1-git-send-email-chen_han_xiao@126.com>
References: <1590069591-1946-1-git-send-email-chen_han_xiao@126.com>
X-CM-TRANSID: NORpCgBXd0hXicZeL+4iFQ--.246S4
X-Coremail-Antispam: 1Uf129KBjvJXoWxtF4UCFW3tFWktry5AF1rCrg_yoWxGF4rpa
	4DA3W5WF48tr47ZFnY9a1UXryfGrWvk3ZrXa1IvryYg3W2g3W8WF13Kry5KFyUArWrA34F
	va4kAw4YkwnrAaUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2
	9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jj2NtUUUUU=
X-Originating-IP: [112.80.215.163]
X-CM-SenderInfo: xfkh0spkdqs5xldrqiyswou0bp/1tbitAUrrlpEAtH3LQABsi
X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6
X-loop: libvir-list@redhat.com
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15
X-Mimecast-Spam-Score: 2
X-Mimecast-Originator: redhat.com
X-ZohoMail-DKIM: pass (identity @redhat.com)
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"

add a testcase for new element.

Signed-off-by: Chen Hanxiao <chen_han_xiao@126.com>
---
 tests/qemuxml2argvdata/downscript.xml   | 60 +++++++++++++++++++++++++
 tests/qemuxml2xmloutdata/downscript.xml | 60 +++++++++++++++++++++++++
 tests/qemuxml2xmltest.c                 |  1 +
 3 files changed, 121 insertions(+)
 create mode 100644 tests/qemuxml2argvdata/downscript.xml
 create mode 100644 tests/qemuxml2xmloutdata/downscript.xml

diff --git a/tests/qemuxml2argvdata/downscript.xml b/tests/qemuxml2argvdata=
/downscript.xml
new file mode 100644
index 0000000000..70c5f1d376
--- /dev/null
+++ b/tests/qemuxml2argvdata/downscript.xml
@@ -0,0 +1,60 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source file=3D'/var/lib/libvirt/images/img1'/>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x0a' f=
unction=3D'0x0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'virtio-serial' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x09' f=
unction=3D'0x0'/>
+    </controller>
+    <filesystem type=3D'mount' accessmode=3D'passthrough'>
+      <source dir=3D'/export/fs1'/>
+      <target dir=3D'fs1'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </filesystem>
+    <filesystem type=3D'mount' accessmode=3D'mapped'>
+      <driver type=3D'path'/>
+      <source dir=3D'/export/fs2'/>
+      <target dir=3D'fs2'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </filesystem>
+    <interface type=3D'ethernet'>
+      <mac address=3D'52:54:00:f6:66:88'/>
+      <script path=3D'/home/hehe.sh'/>
+      <downscript path=3D'/home/dada.sh'/>
+      <model type=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x0b' f=
unction=3D'0x0'/>
+    </interface>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x0c' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/downscript.xml b/tests/qemuxml2xmlout=
data/downscript.xml
new file mode 100644
index 0000000000..70c5f1d376
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/downscript.xml
@@ -0,0 +1,60 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
+    <model fallback=3D'forbid'>qemu64</model>
+  </cpu>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source file=3D'/var/lib/libvirt/images/img1'/>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x0a' f=
unction=3D'0x0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <controller type=3D'virtio-serial' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x09' f=
unction=3D'0x0'/>
+    </controller>
+    <filesystem type=3D'mount' accessmode=3D'passthrough'>
+      <source dir=3D'/export/fs1'/>
+      <target dir=3D'fs1'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </filesystem>
+    <filesystem type=3D'mount' accessmode=3D'mapped'>
+      <driver type=3D'path'/>
+      <source dir=3D'/export/fs2'/>
+      <target dir=3D'fs2'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </filesystem>
+    <interface type=3D'ethernet'>
+      <mac address=3D'52:54:00:f6:66:88'/>
+      <script path=3D'/home/hehe.sh'/>
+      <downscript path=3D'/home/dada.sh'/>
+      <model type=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x0b' f=
unction=3D'0x0'/>
+    </interface>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x0c' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 033f81013e..dcc7b29ded 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -1478,6 +1478,7 @@ mymain(void)
     DO_TEST_CAPS_ARCH_LATEST("x86_64-default-cpu-tcg-q35-4.2", "x86_64");
=20
     DO_TEST_CAPS_LATEST("virtio-9p-multidevs");
+    DO_TEST("downscript", NONE);
=20
     if (getenv("LIBVIRT_SKIP_CLEANUP") =3D=3D NULL)
         virFileDeleteTree(fakerootdir);
--=20
2.23.0

From nobody Fri Apr 26 07:37:24 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of redhat.com designates
 205.139.110.120 as permitted sender) client-ip=205.139.110.120;
 envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com;
Authentication-Results: mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=fail(p=none dis=none)  header.from=126.com
ARC-Seal: i=1; a=rsa-sha256; t=1590069637; cv=none;
	d=zohomail.com; s=zohoarc;
	b=Nrs3CfmKGplfFxhGLxfxVO7ueCKilYcUuFVceEeEGBlCFQBQSILAm1eERp92an8r3u2xL4soCYvwXjklHX5HFhkEm1ac7ihKQpQYTxCn+mJBmzA7hGQ0c1wvv5HdP7CDcM7hLyLqMeoOC5zPjcbSa++tgRY2+KMoFNd4QqbmrSw=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1590069637;
 h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To;
	bh=+8mJ6Ls15oL/WeMhRRV+9psPSplpo0287+N3VqjyT50=;
	b=Bs32NePGXUGwtvrjx6GbukD5lApxCpY38pqAcxtgI5QLjHJLV21ET8YIrMg/UO5nntu5qx+dFplPlE1HU5GD1cGhoNws9Riia/TcclVt2Q+Tk4drS47+w60Nkdtbo+dNrZzHfCc4kZ5vhZ2TGo/8F4IUOfo8T/lX/Je6fygOiCY=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=fail header.from=<chen_han_xiao@126.com> (p=none dis=none)
 header.from=<chen_han_xiao@126.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com
 [205.139.110.120]) by mx.zohomail.com
	with SMTPS id 1590069637275464.83566330930216;
 Thu, 21 May 2020 07:00:37 -0700 (PDT)
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
 [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id
 us-mta-344-WR7BLNEXNy2yxK449c066g-1; Thu, 21 May 2020 10:00:30 -0400
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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id B3536107ACCA;
	Thu, 21 May 2020 14:00:24 +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 825B170909;
	Thu, 21 May 2020 14:00:23 +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 C65CE1809543;
	Thu, 21 May 2020 14:00:18 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com
	[10.11.54.6])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id 04LE0HtD002359 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 21 May 2020 10:00:17 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id F2E452156A59; Thu, 21 May 2020 14:00:16 +0000 (UTC)
Received: from mimecast-mx02.redhat.com
	(mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id B75232156A4F
	for <libvir-list@redhat.com>; Thu, 21 May 2020 14:00:14 +0000 (UTC)
Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com
 [205.139.110.61])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits))
	(No client certificate requested)
	by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 133051801233
	for <libvir-list@redhat.com>; Thu, 21 May 2020 14:00:14 +0000 (UTC)
Received: from mail-m963.mail.126.com (mail-m963.mail.126.com
	[123.126.96.3]) (Using TLS) by relay.mimecast.com with ESMTP id
	us-mta-148-lqAUhFIkPhGzsElEYjbicw-1; Thu, 21 May 2020 10:00:10 -0400
Received: from bogon.localdomain (unknown [112.80.215.163])
	by smtp8 (Coremail) with SMTP id NORpCgBXd0hXicZeL+4iFQ--.246S5;
	Thu, 21 May 2020 22:00:06 +0800 (CST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1590069633;
	h=from:from:sender:sender:reply-to:subject:subject:date:date:
	 message-id:message-id:to:to:cc:content-type:content-type:
	 in-reply-to:in-reply-to:references:references:list-id:list-help:
	 list-unsubscribe:list-subscribe:list-post;
	bh=+8mJ6Ls15oL/WeMhRRV+9psPSplpo0287+N3VqjyT50=;
	b=S6WgfmJ+8buJJMKEvsU3wq89nYEmYdcWwGUOJXMuPm1s/2EZgSSNzhUDNRZ27y7hVsQR+T
	N71ibp0WXhyh49vphgfD1+7S/SIdXAl6KRTn+jzE+b25/YpiVDfAoAIPT7NsC2l3xjCqqr
	8CW2xzcybq5UW/17SwULQrTKBERGfME=
X-MC-Unique: WR7BLNEXNy2yxK449c066g-1
X-MC-Unique: lqAUhFIkPhGzsElEYjbicw-1
From: Chen Hanxiao <chen_han_xiao@126.com>
To: libvir-list@redhat.com
Subject: [PATCH 3/3] doc: downscript: updating the documentation
Date: Thu, 21 May 2020 09:59:51 -0400
Message-Id: <1590069591-1946-4-git-send-email-chen_han_xiao@126.com>
In-Reply-To: <1590069591-1946-1-git-send-email-chen_han_xiao@126.com>
References: <1590069591-1946-1-git-send-email-chen_han_xiao@126.com>
X-CM-TRANSID: NORpCgBXd0hXicZeL+4iFQ--.246S5
X-Coremail-Antispam: 1Uf129KBjvdXoW7Xw48GF18Wr4kXw1kJrW8Zwb_yoWkuFb_Gr
	Wqq3y0yw4UXFyfKayav3yYvrZ3W3yxZayxJFs5Kr1kt3s0vws8X3ZFga4kJr1fXrZIvryf
	tF1DXa45tw4vgjkaLaAFLSUrUUUUbb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT
	9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IU8fcTPUUUUU==
X-Originating-IP: [112.80.215.163]
X-CM-SenderInfo: xfkh0spkdqs5xldrqiyswou0bp/1tbiEwkrrlpD9c0kJgAAs8
X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6
X-loop: libvir-list@redhat.com
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
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-Mimecast-Spam-Score: 2
X-Mimecast-Originator: redhat.com
X-ZohoMail-DKIM: pass (identity @redhat.com)
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"

We can give a postscript for some netdev.

Signed-off-by: Chen Hanxiao <chen_han_xiao@126.com>
---
 docs/formatdomain.html.in | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 23eb029234..4e2320d537 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -5879,7 +5879,10 @@
     <p>
       After creating/opening the tap device, an optional shell script
       (given in the <code>path</code> attribute of
-      the <code>&lt;script&gt;</code> element) will be run; this can
+      the <code>&lt;script&gt;</code> element) will be run;
+      Also, after detaching/closing the tap device, an optional shell
+      script (given in the <code>path</code> attribute of
+      the <code>&lt;downscript&gt;</code> element) will be run; this can
       be used to do whatever extra host network integration is
       required.
     </p>
@@ -5889,6 +5892,7 @@
 &lt;devices&gt;
   &lt;interface type=3D'ethernet'&gt;
     &lt;script path=3D'/etc/qemu-ifup-mynet'/&gt;
+    &lt;downscript path=3D'/etc/qemu-ifdown-mynet'/&gt;
   &lt;/interface&gt;
   ...
   &lt;interface type=3D'ethernet'&gt;
--=20
2.23.0