From b2fcb9adc1f1da0745d33014e39f4b574dd9bbd3 Mon Sep 17 00:00:00 2001 From: Euler Robot Date: Sat, 18 Sep 2021 14:20:24 +0800 Subject: [PATCH 1/3] conf/domain_conf: pin the retry_interval and retry_timeout parameters to xml Signed-off-by: Mao Zhongyi --- ...-pin-the-retry_interval-and-retry_ti.patch | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 conf-domain_conf-pin-the-retry_interval-and-retry_ti.patch diff --git a/conf-domain_conf-pin-the-retry_interval-and-retry_ti.patch b/conf-domain_conf-pin-the-retry_interval-and-retry_ti.patch new file mode 100644 index 0000000..0cc4e05 --- /dev/null +++ b/conf-domain_conf-pin-the-retry_interval-and-retry_ti.patch @@ -0,0 +1,31 @@ +From 0f4c30a060c60ecccd15033a46063acc00f2251f Mon Sep 17 00:00:00 2001 +From: Mao Zhongyi +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 +--- + 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 2b7eee17f0..fa33335c94 100644 +--- a/src/conf/domain_conf.c ++++ b/src/conf/domain_conf.c +@@ -24976,6 +24976,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 + -- Gitee From 1c57fc1e90e808bc7d9a4ccd9ddbcbe16565e513 Mon Sep 17 00:00:00 2001 From: Chen Qun Date: Fri, 24 Sep 2021 11:28:33 +0800 Subject: [PATCH 2/3] spec: Update patch and changelog with !37 conf/domain_conf: pin the retry_interval and retry_timeout parameters to xml !37 conf/domain_conf: pin the retry_interval and retry_timeout parameters to xml Signed-off-by: Mao Zhongyi --- libvirt.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libvirt.spec b/libvirt.spec index 9fabba8..fcfdbf9 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -143,6 +143,7 @@ Patch0032: libvirt-conf-Set-default-values-of-retry-fileds.patch Patch0033: cpu_map-Add-Cooperlake-x86-CPU-model.patch Patch0034: cpu_map-Add-pschange-mc-no-bit-in-IA32_ARCH_CAPABILI.patch Patch0035: cpu_map-Distribute-x86_Cooperlake.xml.patch +Patch0036: conf-domain_conf-pin-the-retry_interval-and-retry_ti.patch Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon-config-network = %{version}-%{release} @@ -1875,6 +1876,9 @@ exit 0 %changelog +* Fri Sep 24 2021 Euler Robot +- conf/domain_conf: pin the retry_interval and retry_timeout parameters to xml + * Tue Jul 27 2021 Jingyi Wang - add new CPU model Cooperlake -- Gitee From 4af07d39084ebcda6ff79b3ae8bd1a8e85558d3c Mon Sep 17 00:00:00 2001 From: Chen Qun Date: Fri, 24 Sep 2021 11:28:38 +0800 Subject: [PATCH 3/3] spec: Update release version with !37 increase release verison by one Signed-off-by: Chen Qun --- libvirt.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt.spec b/libvirt.spec index fcfdbf9..094d258 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -99,7 +99,7 @@ Summary: Library providing a simple virtualization API Name: libvirt Version: 6.2.0 -Release: 12 +Release: 13 License: LGPLv2+ URL: https://libvirt.org/ -- Gitee