!62 Enable werror for qemu and fix a building warning

Merge pull request !62 from FangYing/master

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");
 

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
@@ -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
@@ -302,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 \
@@ -521,6 +521,9 @@ getent passwd qemu >/dev/null || \
 %endif
 
 %changelog
+* Thu Aug 6 2020 Huawei Technologies Co., Ltd <fangying1@huawei.com>
+- tests: Disalbe filemonitor testcase
+
 * Sat Jun 20 2020 Huawei Technologies Co., Ltd <zhang.zhanghailiang@huawei.com>
 - target/arm: Fix PAuth sbox functions
 - fix two patches' format which can cause git am failed

tests-Disalbe-filemonitor-testcase.patch

@@ -0,0 +1,34 @@
+From 4f1eaa63065594276c11958e963377a09668d44b Mon Sep 17 00:00:00 2001
+From: Ying Fang <fangying1@huawei.com>
+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 <fangying1@huawei.com>
+
+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
+