diff --git a/0001-tests-Fixing-compiler-warning-in-cputest.patch b/0001-tests-Fixing-compiler-warning-in-cputest.patch
new file mode 100644
index 0000000000000000000000000000000000000000..77923d8fde73a11484cc0f02ea6bfbf4212a8b31
--- /dev/null
+++ b/0001-tests-Fixing-compiler-warning-in-cputest.patch
@@ -0,0 +1,41 @@
+From 67c77744d74fe99a6b0e4ddef6869b305e29d6aa Mon Sep 17 00:00:00 2001
+From: Boris Fiuczynski <fiuczy@linux.ibm.com>
+Date: Mon, 4 Apr 2022 20:22:37 +0200
+Subject: [PATCH] tests: Fixing compiler warning in cputest
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Found when building on Fedora 36 on s390x.
+
+ C compiler for the host machine: gcc (gcc 12.0.1 "gcc (GCC) 12.0.1 20220308 (Red Hat 12.0.1-0)")
+ C linker for the host machine: gcc ld.bfd 2.37-24
+
+ In function ‘cpuTestUpdateLiveCompare’,
+     inlined from ‘cpuTestUpdateLive’ at ../dist-unpack/libvirt-8.2.5/tests/cputest.c:784:12:
+ ../dist-unpack/libvirt-8.2.5/tests/cputest.c:696:21: warning: potential null pointer dereference [-Wnull-dereference]
+   696 |              featAct->policy == VIR_CPU_FEATURE_REQUIRE) ||
+       |              ~~~~~~~^~~~~~~~
+
+Signed-off-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ tests/cputest.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/cputest.c b/tests/cputest.c
+index 609b5df7c6..95fb37d15c 100644
+--- a/tests/cputest.c
++++ b/tests/cputest.c
+@@ -692,7 +692,7 @@ cpuTestUpdateLiveCompare(virArch arch,
+         if ((cmp == 0 &&
+              featAct->policy == VIR_CPU_FEATURE_REQUIRE &&
+              featExp->policy == VIR_CPU_FEATURE_DISABLE) ||
+-            (cmp < 0 &&
++            (cmp < 0 && featAct &&
+              featAct->policy == VIR_CPU_FEATURE_REQUIRE) ||
+             (cmp > 0 &&
+              featExp->policy == VIR_CPU_FEATURE_DISABLE)) {
+-- 
+2.40.1
+
diff --git a/libvirt.spec b/libvirt.spec
index 77e0a22480815bd15b5bb45885a23cb78c08ba00..e8b654530dcb39629357d3b8481af35ee09d9410 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -101,7 +101,7 @@
 Summary: Library providing a simple virtualization API
 Name: libvirt
 Version: 6.2.0
-Release: 59
+Release: 60
 License: LGPLv2+
 URL: https://libvirt.org/
 
@@ -489,6 +489,7 @@ Patch0376: selinux-adapt-to-libselinux.patch
 Patch0377: Revert-selinux-adapt-to-libselinux.patch
 Patch0378: selinux-Reflect-context_str-type-change.patch
 Patch0379: virnetsshsession-Adapt-to-change-libssh2-API.patch
+Patch0380: 0001-tests-Fixing-compiler-warning-in-cputest.patch
 
 Requires: libvirt-daemon = %{version}-%{release}
 Requires: libvirt-daemon-config-network = %{version}-%{release}
@@ -2225,6 +2226,9 @@ exit 0
 
 
 %changelog
+* Mon Sep 11 2023 laokz <zhangkai@iscas.ac.cn> - 6.2.0-60
+- disable -Werror for riscv64 to workaround gcc false positive
+
 * Wed Aug 9 2023 Jiabo Feng <fengjiabo1@huawei.com> - 6.2.0-59
 - virnetsshsession: Adapt to change libssh2 API
 - selinux: Reflect context_str() type change