!87 Automatically generate code patches with openeuler !38

From: @kuhnchen18
Reviewed-by: @imxcc
Signed-off-by: @imxcc

conf-domain_conf-pin-the-retry_interval-and-retry_ti.patch

@@ -0,0 +1,31 @@
+From 5d762303253a8cf15204839e93cc3f6e562d3708 Mon Sep 17 00:00:00 2001
+From: Mao Zhongyi <maozhongyi@cmss.chinamobile.com>
+Date: Sat, 18 Sep 2021 14:20:24 +0800
+Subject: [PATCH] conf/domain_conf: pin the retry_interval and retry_timeout
+ parameters to xml
+
+Signed-off-by: Mao Zhongyi <maozhongyi@cmss.chinamobile.com>
+---
+ 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 a4e9b3290c..4e3bcf479c 100644
+--- a/src/conf/domain_conf.c
++++ b/src/conf/domain_conf.c
+@@ -24977,6 +24977,12 @@ virDomainDiskDefFormatDriver(virBufferPtr buf,
+         virBufferAsprintf(&driverBuf, " rerror_policy='%s'",
+                           virDomainDiskErrorPolicyTypeToString(disk->rerror_policy));
+ 
++    if (disk->retry_interval)
++        virBufferAsprintf(&driverBuf, " retry_interval='%ld'", disk->retry_interval);
++
++    if (disk->retry_timeout)
++        virBufferAsprintf(&driverBuf, " retry_timeout='%ld'", disk->retry_timeout);
++
+     if (disk->iomode)
+         virBufferAsprintf(&driverBuf, " io='%s'",
+                           virDomainDiskIoTypeToString(disk->iomode));
+-- 
+2.27.0
+

libvirt.spec

@@ -105,7 +105,7 @@
 Summary: Library providing a simple virtualization API
 Name: libvirt
 Version: 6.2.0
-Release: 24
+Release: 25
 License: LGPLv2+
 URL: https://libvirt.org/
 
@@ -187,6 +187,7 @@ Patch0070: cpu_map-Distribute-x86_Cooperlake.xml.patch
 Patch0071: Don-t-cache-device-mapper-major.patch
 Patch0072: Handle-kernel-without-device-mapper-support.patch
 Patch0073: virDevMapperGetTargets-Don-t-ignore-EBADF.patch
+Patch0074: conf-domain_conf-pin-the-retry_interval-and-retry_ti.patch
 
 Requires: libvirt-daemon = %{version}-%{release}
 Requires: libvirt-daemon-config-network = %{version}-%{release}
@@ -1920,6 +1921,9 @@ exit 0
 
 
 %changelog
+* Fri Sep 24 2021 Euler Robot <euler.robot@huawei.com>
+- conf/domain_conf: pin the retry_interval and retry_timeout parameters to xml
+
 * Tue Sep 14 2021 imxcc <xingchaochao@huawei.com> - 6.2.0-24
 - virDevMapperGetTargets: Don't ignore EBADF