From d5b31b6bcb32da407fd22836995317c26e834c6c Mon Sep 17 00:00:00 2001 From: Ying Fang Date: Thu, 6 Aug 2020 10:16:15 +0800 Subject: [PATCH 1/4] tests: Disalbe filemonitor testcase Since filemonitor testcase requires that host kernel being a LTS version, we cannot guarantee that on OBS system. Let's disable it by default. Signed-off-by: Ying Fang --- qemu.spec | 4 +++ tests-Disalbe-filemonitor-testcase.patch | 34 ++++++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 tests-Disalbe-filemonitor-testcase.patch diff --git a/qemu.spec b/qemu.spec index 9c483963..2cdbf05f 100644 --- a/qemu.spec +++ b/qemu.spec @@ -175,6 +175,7 @@ Patch0162: migration-Compat-virtual-timer-adjust-for-v4.0.1-and.patch Patch0163: vtimer-Drop-vtimer-virtual-timer-adjust.patch Patch0164: target-arm-Add-the-kvm_adjvtime-vcpu-property-for-Co.patch Patch0165: target-arm-Fix-PAuth-sbox-functions.patch +Patch0166: tests-Disalbe-filemonitor-testcase.patch BuildRequires: flex BuildRequires: bison @@ -521,6 +522,9 @@ getent passwd qemu >/dev/null || \ %endif %changelog +* Thu Aug 6 2020 Huawei Technologies Co., Ltd +- tests: Disalbe filemonitor testcase + * Sat Jun 20 2020 Huawei Technologies Co., Ltd - target/arm: Fix PAuth sbox functions - fix two patches' format which can cause git am failed diff --git a/tests-Disalbe-filemonitor-testcase.patch b/tests-Disalbe-filemonitor-testcase.patch new file mode 100644 index 00000000..b389299e --- /dev/null +++ b/tests-Disalbe-filemonitor-testcase.patch @@ -0,0 +1,34 @@ +From 4f1eaa63065594276c11958e963377a09668d44b Mon Sep 17 00:00:00 2001 +From: Ying Fang +Date: Thu, 6 Aug 2020 10:05:00 +0800 +Subject: [PATCH] tests: Disalbe filemonitor testcase + +Since filemonitor testcase requires that host kernel being a LTS version, +we cannot guarantee that on OBS system. Let's disable it by default. + +Signed-of-by: Ying Fang + +diff --git a/tests/Makefile.include b/tests/Makefile.include +index d8cf00c1..f3273ad3 100644 +--- a/tests/Makefile.include ++++ b/tests/Makefile.include +@@ -117,7 +117,6 @@ ifneq (,$(findstring qemu-ga,$(TOOLS))) + check-unit-$(call land,$(CONFIG_LINUX),$(CONFIG_VIRTIO_SERIAL)) += tests/test-qga$(EXESUF) + endif + check-unit-y += tests/test-timed-average$(EXESUF) +-check-unit-$(CONFIG_INOTIFY1) += tests/test-util-filemonitor$(EXESUF) + check-unit-y += tests/test-util-sockets$(EXESUF) + check-unit-$(CONFIG_BLOCK) += tests/test-authz-simple$(EXESUF) + check-unit-$(CONFIG_BLOCK) += tests/test-authz-list$(EXESUF) +@@ -654,8 +653,6 @@ tests/test-crypto-tlssession$(EXESUF): tests/test-crypto-tlssession.o \ + tests/crypto-tls-x509-helpers.o tests/pkix_asn1_tab.o \ + tests/crypto-tls-psk-helpers.o \ + $(test-crypto-obj-y) +-tests/test-util-filemonitor$(EXESUF): tests/test-util-filemonitor.o \ +- $(test-util-obj-y) + tests/test-util-sockets$(EXESUF): tests/test-util-sockets.o \ + tests/socket-helpers.o $(test-util-obj-y) + tests/test-authz-simple$(EXESUF): tests/test-authz-simple.o $(test-authz-obj-y) +-- +2.23.0 + -- Gitee From dc93470dc06efca1a10d6dee385fb9825caa8d05 Mon Sep 17 00:00:00 2001 From: Ying Fang Date: Tue, 4 Aug 2020 15:12:22 +0800 Subject: [PATCH 2/4] migration: add missing ram.h for migration/socket.c ram.h is missing for migration/socket.c, let's add it. Later we will enable werror for qemu.spec Signed-off-by: Ying Fang --- ...-multifd-fix-potential-wrong-acception-orde.patch | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/migration-multifd-fix-potential-wrong-acception-orde.patch b/migration-multifd-fix-potential-wrong-acception-orde.patch index c5502038..6b8f18ce 100644 --- a/migration-multifd-fix-potential-wrong-acception-orde.patch +++ b/migration-multifd-fix-potential-wrong-acception-orde.patch @@ -274,10 +274,18 @@ index bd0eee79..a788ff0e 100644 uint64_t ram_pagesize_summary(void); int ram_save_queue_pages(const char *rbname, ram_addr_t start, ram_addr_t len); diff --git a/migration/socket.c b/migration/socket.c -index 98efdc02..bc0960c6 100644 +index 98efdc02..093b956b 100644 --- a/migration/socket.c +++ b/migration/socket.c -@@ -181,6 +181,12 @@ static void socket_start_incoming_migration(SocketAddress *saddr, +@@ -22,6 +22,7 @@ + #include "channel.h" + #include "socket.h" + #include "migration.h" ++#include "ram.h" + #include "qemu-file.h" + #include "io/channel-socket.h" + #include "io/net-listener.h" +@@ -181,6 +182,12 @@ static void socket_start_incoming_migration(SocketAddress *saddr, qio_net_listener_set_name(listener, "migration-socket-listener"); -- Gitee From a138fa6057f32e7d97801b737a60fc249c1b6cac Mon Sep 17 00:00:00 2001 From: Ying Fang Date: Tue, 4 Aug 2020 15:35:01 +0800 Subject: [PATCH 3/4] spec: enable Werror by default enable Werror by default so that we can check compilation warnnings Signed-off-by: Ying Fang --- qemu.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/qemu.spec b/qemu.spec index 2cdbf05f..235d9a1d 100644 --- a/qemu.spec +++ b/qemu.spec @@ -303,7 +303,6 @@ buildldflags="VL_LDFLAGS=-Wl,--build-id" --with-pkgversion=%{name}-%{version}-%{release} \ --python=/usr/bin/python3 \ --disable-strip \ - --disable-werror \ --disable-slirp \ --enable-gtk \ --enable-docs \ -- Gitee From 88bcb3346d05784e879def2c9b49729ed45179c5 Mon Sep 17 00:00:00 2001 From: Ying Fang Date: Thu, 6 Aug 2020 10:17:27 +0800 Subject: [PATCH 4/4] spec: Update release version increase release version by one Signed-off-by: Ying Fang --- qemu.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qemu.spec b/qemu.spec index 235d9a1d..dd550507 100644 --- a/qemu.spec +++ b/qemu.spec @@ -1,6 +1,6 @@ Name: qemu Version: 4.1.0 -Release: 14 +Release: 15 Epoch: 2 Summary: QEMU is a generic and open source machine emulator and virtualizer License: GPLv2 and BSD and MIT and CC-BY -- Gitee