From 8fb36533449c3d4cf0289704b2adb7cc385c5321 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..8a54fc5 --- /dev/null +++ b/conf-domain_conf-pin-the-retry_interval-and-retry_ti.patch @@ -0,0 +1,31 @@ +From 3cf7494eb723926f1ae5a47c38b3868903e21fb3 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 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 + -- Gitee From a73d15a05e96f072ebc287dc4dfb9316bec16362 Mon Sep 17 00:00:00 2001 From: Chen Qun Date: Wed, 22 Sep 2021 21:28:57 +0800 Subject: [PATCH 2/3] spec: Update patch and changelog with !36 conf/domain_conf: pin the retry_interval and retry_timeout parameters to xml !36 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 18f0029..432de59 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -180,6 +180,7 @@ Patch0063: libvirt-Add-retry-support-for-error-policy.patch Patch0064: qemu-Support-retry-BLOCK_IO_ERROR-event.patch Patch0065: add-phytium-2000plus-and-s2500-support-on-arm-archit.patch Patch0066: libvirt-conf-Set-default-values-of-retry-fileds.patch +Patch0067: conf-domain_conf-pin-the-retry_interval-and-retry_ti.patch Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon-config-network = %{version}-%{release} @@ -1914,6 +1915,9 @@ exit 0 %changelog +* Wed Sep 22 2021 Euler Robot +- conf/domain_conf: pin the retry_interval and retry_timeout parameters to xml + * Fri Mar 19 2021 Jiajie Li - libvirt.spec: remove dtrace for aarch64 OS -- Gitee From 370bcfe80d1bae0724e1105c140128fb56197531 Mon Sep 17 00:00:00 2001 From: Chen Qun Date: Wed, 22 Sep 2021 21:28:57 +0800 Subject: [PATCH 3/3] spec: Update release version with !36 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 432de59..5429fcb 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -105,7 +105,7 @@ Summary: Library providing a simple virtualization API Name: libvirt Version: 6.2.0 -Release: 18 +Release: 19 License: LGPLv2+ URL: https://libvirt.org/ -- Gitee