From 67e963f7d78a168d74b672688d9ff0d85af73de38dec91f702858998d555ce59 Mon Sep 17 00:00:00 2001 From: Bruce Rogers Date: Tue, 24 Mar 2020 13:45:55 +0000 Subject: [PATCH] Accepting request 787812 from home:bfrogers:branches:Virtualization - Note The previous set of s390x patches also includes the fix for: bsc#1167445 OBS-URL: https://build.opensuse.org/request/show/787812 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=539 --- bundles.tar.xz | 4 ++-- qemu.changes | 6 ++++++ s390x-protvirt-Support-unpack-facility.patch | 4 ++-- vhost-correctly-turn-on-VIRTIO_F_IOMMU_P.patch | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/bundles.tar.xz b/bundles.tar.xz index e0bd16e..27dfa69 100644 --- a/bundles.tar.xz +++ b/bundles.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8f2312cc7d4811cb10363273c211a6fcf58361e401b7b0c9824c9ed22c4ce898 -size 121876 +oid sha256:d7bed3704998a1c71915ce16de258559a687e4ec8d8c2deb4c934899cc3708a5 +size 121832 diff --git a/qemu.changes b/qemu.changes index b2c3609..69ef495 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 24 13:22:36 UTC 2020 - Bruce Rogers + +- Note The previous set of s390x patches also includes the fix for: + bsc#1167445 + ------------------------------------------------------------------- Fri Mar 20 17:27:29 UTC 2020 - Bruce Rogers diff --git a/s390x-protvirt-Support-unpack-facility.patch b/s390x-protvirt-Support-unpack-facility.patch index 7e33141..28ef6d3 100644 --- a/s390x-protvirt-Support-unpack-facility.patch +++ b/s390x-protvirt-Support-unpack-facility.patch @@ -69,7 +69,7 @@ index e02ed80b6829a511362abc3525ec..a46a1c7894e0f612a2d74cec74f6 100644 obj-y += ap-device.o obj-y += ap-bridge.o diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c -index ca544d64c5e04782fb49d12521d5..73e5210b4d4e7ad912cfe5475ac4 100644 +index ca544d64c5e04782fb49d12521d5..c343cfb0bed4272cecf31207dae8 100644 --- a/hw/s390x/ipl.c +++ b/hw/s390x/ipl.c @@ -1,10 +1,11 @@ @@ -139,7 +139,7 @@ index ca544d64c5e04782fb49d12521d5..73e5210b4d4e7ad912cfe5475ac4 100644 + + cpu_physical_memory_read(ipib_pv->pv_header_addr, hdr, + ipib_pv->pv_header_len); -+ rc = s390_pv_set_sec_parms((uint64_t)(uintptr_t)hdr, ++ rc = s390_pv_set_sec_parms((uintptr_t)hdr, + ipib_pv->pv_header_len); + g_free(hdr); + return rc; diff --git a/vhost-correctly-turn-on-VIRTIO_F_IOMMU_P.patch b/vhost-correctly-turn-on-VIRTIO_F_IOMMU_P.patch index d4a810c..07f3ac5 100644 --- a/vhost-correctly-turn-on-VIRTIO_F_IOMMU_P.patch +++ b/vhost-correctly-turn-on-VIRTIO_F_IOMMU_P.patch @@ -2,7 +2,7 @@ From: Jason Wang Date: Mon, 2 Mar 2020 12:24:54 +0800 Subject: vhost: correctly turn on VIRTIO_F_IOMMU_PLATFORM -References: bsc#1167075 +References: bsc#1167075, bsc#1167445 We turn on device IOTLB via VIRTIO_F_IOMMU_PLATFORM unconditionally on platform without IOMMU support. This can lead unnecessary IOTLB