From 06a964970299a00f216053f5bfd86a54e8e3950a Mon Sep 17 00:00:00 2001 From: Heyi Guo Date: Mon, 9 Dec 2019 14:37:19 +0800 Subject: [PATCH 1/5] hw/arm/acpi: enable SHPC native hot plug After the introduction of generic PCIe root port and PCIe-PCI bridge, we will also have SHPC controller on ARM, so just enable SHPC native hot plug. Also update tests/data/acpi/virt/DSDT* to pass "make check". Cc: Shannon Zhao Cc: Peter Maydell Cc: "Michael S. Tsirkin" Cc: Igor Mammedov Reviewed-by: Michael S. Tsirkin Reviewed-by: Igor Mammedov Signed-off-by: Heyi Guo Message-id: 20191209063719.23086-3-guoheyi@huawei.com Signed-off-by: Peter Maydell --- hw-arm-acpi-enable-SHPC-native-hot-plug.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw-arm-acpi-enable-SHPC-native-hot-plug.patch b/hw-arm-acpi-enable-SHPC-native-hot-plug.patch index 2b2e530..2be3a60 100644 --- a/hw-arm-acpi-enable-SHPC-native-hot-plug.patch +++ b/hw-arm-acpi-enable-SHPC-native-hot-plug.patch @@ -1,4 +1,4 @@ -From 1ad2e774f4fd3f720d5db07e86fe60df13f21a6d Mon Sep 17 00:00:00 2001 +From d2b638d86bc96057fbc3bb62af79c4a50695795e Mon Sep 17 00:00:00 2001 From: Heyi Guo Date: Mon, 9 Dec 2019 14:37:19 +0800 Subject: [PATCH] hw/arm/acpi: enable SHPC native hot plug -- Gitee From bc40a88a6a7bde5426b7e189fb710191d2069ff6 Mon Sep 17 00:00:00 2001 From: AlexChen Date: Tue, 15 Sep 2020 14:55:28 +0800 Subject: [PATCH 2/5] migration/socket: fix a compilation failure Signed-off-by: AlexChen --- ...ion-socket-fix-a-compilation-failure.patch | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 migration-socket-fix-a-compilation-failure.patch diff --git a/migration-socket-fix-a-compilation-failure.patch b/migration-socket-fix-a-compilation-failure.patch new file mode 100644 index 0000000..9aa4ed4 --- /dev/null +++ b/migration-socket-fix-a-compilation-failure.patch @@ -0,0 +1,25 @@ +From 3f7f2cd3b67a32b9f08b00798452c584702fb96d Mon Sep 17 00:00:00 2001 +From: AlexChen +Date: Tue, 15 Sep 2020 14:55:28 +0800 +Subject: [PATCH] migration/socket: fix a compilation failure + +Signed-off-by: AlexChen +--- + migration/socket.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/migration/socket.c b/migration/socket.c +index bc0960c639..093b956b80 100644 +--- a/migration/socket.c ++++ b/migration/socket.c +@@ -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" +-- +2.23.0 + -- Gitee From 0bb4c941c8bd20fcf3afc2708ebb7735e4818c1c Mon Sep 17 00:00:00 2001 From: Ying Fang Date: Thu, 6 Aug 2020 10:05:00 +0800 Subject: [PATCH 3/5] 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 --- tests-Disalbe-filemonitor-testcase.patch | 37 ++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 tests-Disalbe-filemonitor-testcase.patch diff --git a/tests-Disalbe-filemonitor-testcase.patch b/tests-Disalbe-filemonitor-testcase.patch new file mode 100644 index 0000000..040f3a5 --- /dev/null +++ b/tests-Disalbe-filemonitor-testcase.patch @@ -0,0 +1,37 @@ +From c0569e7ddfa4f6c6a5b143d85b2d535d9536622e 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 +--- + tests/Makefile.include | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/tests/Makefile.include b/tests/Makefile.include +index d8cf00c129..f3273ad382 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 cb411711860a69d348ae94583fee219f52fd0e9a Mon Sep 17 00:00:00 2001 From: Euler Robot Date: Thu, 24 Sep 2020 15:32:24 +0800 Subject: [PATCH 4/5] spec: Update patch and changelog with !15 hw/arm/acpi: enable SHPC native hot plug migration/socket: fix a compilation failure tests: Disalbe filemonitor testcase Signed-off-by: AlexChen Signed-off-by: Heyi Guo Signed-off-by: Peter Maydell --- qemu.spec | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/qemu.spec b/qemu.spec index ddf8110..87cc7e2 100644 --- a/qemu.spec +++ b/qemu.spec @@ -187,6 +187,11 @@ Patch0174: hw-usb-core-fix-buffer-overflow.patch Patch0175: slirp-drop-bogus-IPv6-messages.patch Patch0176: hw-sd-sdhci-Fix-DMA-Transfer-Block-Size-field.patch Patch0177: hw-xhci-check-return-value-of-usb_packet_map.patch +Patch0178: hw-arm-acpi-enable-SHPC-native-hot-plug.patch +Patch0179: hw-sd-sdhci-Fix-DMA-Transfer-Block-Size-field.patch +Patch0180: hw-xhci-check-return-value-of-usb_packet_map.patch +Patch0181: migration-socket-fix-a-compilation-failure.patch +Patch0182: tests-Disalbe-filemonitor-testcase.patch BuildRequires: flex BuildRequires: bison @@ -532,6 +537,13 @@ getent passwd qemu >/dev/null || \ %endif %changelog +* Thu Aug 6 2020 Ying Fang +- hw/arm/acpi: enable SHPC native hot plug +- hw/sd/sdhci: Fix DMA Transfer Block Size field +- hw: xhci: check return value of 'usb_packet_map' +- migration/socket: fix a compilation failure +- tests: Disalbe filemonitor testcase + * Thu Sep 24 2020 Huawei Technologies Co., Ltd - enrich commit info for some patches - rename some patches for slirp -- Gitee From 12ebf04f273e59716a0ced2a799121f14fd316fe Mon Sep 17 00:00:00 2001 From: Euler Robot Date: Thu, 24 Sep 2020 15:32:24 +0800 Subject: [PATCH 5/5] spec: Update release version with !15 increase release verison by one Signed-off-by: Euler Robot --- qemu.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qemu.spec b/qemu.spec index 87cc7e2..923e0a7 100644 --- a/qemu.spec +++ b/qemu.spec @@ -1,6 +1,6 @@ Name: qemu Version: 4.1.0 -Release: 21 +Release: 22 Epoch: 2 Summary: QEMU is a generic and open source machine emulator and virtualizer License: GPLv2 and BSD and MIT and CC-BY -- Gitee