rpm/qemu
SHA256
1
0
Fork 0
forked from pool/qemu
Code Pull Requests Activity

Accepting request 666837 from home:bfrogers:branches:Virtualization

Browse Source 
Tweak Xen interface to be compatible with upcoming v4.12 Xen. Also add CVE ref to two patches which were missing it.

OBS-URL: https://build.opensuse.org/request/show/666837
OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=449
This commit is contained in:
Bruce Rogers 2019-01-17 22:15:55 +00:00 committed by Git OBS Bridge
parent 341ad4da29
commit cfef1a70be
9 changed files with 61 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
0047-pvrdma-release-device-resources-in-.patch
View File

@ -12,7 +12,7 @@ Message-Id: <20181212175817.815-1-ppandit@redhat.com>
Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com>
Signed-off-by: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
(cherry picked from commit cce648613bc802be1b894227f7fd94d88476ea07)
[BR: BSC#1119437]
[BR: BSC#1119437 CVE-2018-20123]
Signed-off-by: Bruce Rogers <brogers@suse.com>
---
hw/rdma/vmw/pvrdma_main.c | 3 ++-

3
0048-rdma-check-num_sge-does-not-exceed-.patch
View File

@ -12,7 +12,8 @@ Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com>
Signed-off-by: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
(cherry picked from commit 0e68373cc2b3a063ce067bc0cc3edaf370752890)
[BR: BSC#1119840, modified complete_work() calls to be comp_handler()]
[BR: BSC#1119840 CVE-2018-20124, modified complete_work() calls to be
comp_handler()]
Signed-off-by: Bruce Rogers <brogers@suse.com>
---
hw/rdma/rdma_backend.c | 8 ++++----

31
0055-xen-Add-xen-v4.12-based-xc_domain_c.patch Normal file
View File

@ -0,0 +1,31 @@
From: Bruce Rogers <brogers@suse.com>
Date: Thu, 17 Jan 2019 14:40:10 -0700
Subject: xen: Add xen v4.12 based xc_domain_create call
In xen v4.12, the xc_domain_create call parameters changed.
Signed-off-by: Bruce Rogers <brogers@suse.com>
---
include/hw/xen/xen_common.h | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h
index 93f631e5bf..42b088ae90 100644
--- a/include/hw/xen/xen_common.h
+++ b/include/hw/xen/xen_common.h
@@ -674,7 +674,15 @@ static inline int xen_domain_create(xc_interface *xc, uint32_t ssidref,
xen_domain_handle_t handle, uint32_t flags,
uint32_t *pdomid)
{
+#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 41200
return xc_domain_create(xc, ssidref, handle, flags, pdomid, NULL);
+#else
+ struct xen_domctl_createdomain create;
+ create.ssidref = ssidref;
+ memcpy(&(create.handle), handle, sizeof(xen_domain_handle_t));
+ create.flags = flags;
+ return xc_domain_create(xc, pdomid, &create);
+#endif
}
#endif
#endif

7
qemu-linux-user.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Jan 17 21:58:04 UTC 2019 - Bruce Rogers <brogers@suse.com>
- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-3.1
* Patches added:
0055-xen-Add-xen-v4.12-based-xc_domain_c.patch
-------------------------------------------------------------------
Tue Jan 15 13:58:26 UTC 2019 - Liang Yan <lyan@suse.com>

2
qemu-linux-user.spec
View File

@ -86,6 +86,7 @@ Patch0051: 0051-pvrdma-check-return-value-from-pvrd.patch
Patch0052: 0052-pvrdma-release-ring-object-in-case-.patch
Patch0053: 0053-block-Fix-hangs-in-synchronous-APIs.patch
Patch0054: 0054-linux-user-make-pwrite64-pread64-fd.patch
Patch0055: 0055-xen-Add-xen-v4.12-based-xc_domain_c.patch
# Please do not add QEMU patches manually here.
# Run update_git.sh to regenerate this queue.
ExcludeArch: s390
@ -171,6 +172,7 @@ syscall layer occurs on the native hardware and operating system.
%patch0052 -p1
%patch0053 -p1
%patch0054 -p1
%patch0055 -p1
%build
./configure \

7
qemu-testsuite.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Jan 17 21:58:02 UTC 2019 - Bruce Rogers <brogers@suse.com>
- Tweak Xen interface to be compatible with upcoming v4.12 Xen
0055-xen-Add-xen-v4.12-based-xc_domain_c.patch
- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-3.1
-------------------------------------------------------------------
Tue Jan 15 13:58:25 UTC 2019 - Liang Yan <lyan@suse.com>

2
qemu-testsuite.spec
View File

@ -191,6 +191,7 @@ Patch0051: 0051-pvrdma-check-return-value-from-pvrd.patch
Patch0052: 0052-pvrdma-release-ring-object-in-case-.patch
Patch0053: 0053-block-Fix-hangs-in-synchronous-APIs.patch
Patch0054: 0054-linux-user-make-pwrite64-pread64-fd.patch
Patch0055: 0055-xen-Add-xen-v4.12-based-xc_domain_c.patch
# Please do not add QEMU patches manually here.
# Run update_git.sh to regenerate this queue.
@ -973,6 +974,7 @@ This package provides a service file for starting and stopping KSM.
%patch0052 -p1
%patch0053 -p1
%patch0054 -p1
%patch0055 -p1
pushd roms/seabios
%patch1100 -p1

7
qemu.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Jan 17 21:58:02 UTC 2019 - Bruce Rogers <brogers@suse.com>
- Tweak Xen interface to be compatible with upcoming v4.12 Xen
0055-xen-Add-xen-v4.12-based-xc_domain_c.patch
- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-3.1
-------------------------------------------------------------------
Tue Jan 15 13:58:25 UTC 2019 - Liang Yan <lyan@suse.com>

2
qemu.spec
View File

@ -191,6 +191,7 @@ Patch0051: 0051-pvrdma-check-return-value-from-pvrd.patch
Patch0052: 0052-pvrdma-release-ring-object-in-case-.patch
Patch0053: 0053-block-Fix-hangs-in-synchronous-APIs.patch
Patch0054: 0054-linux-user-make-pwrite64-pread64-fd.patch
Patch0055: 0055-xen-Add-xen-v4.12-based-xc_domain_c.patch
# Please do not add QEMU patches manually here.
# Run update_git.sh to regenerate this queue.
@ -973,6 +974,7 @@ This package provides a service file for starting and stopping KSM.
%patch0052 -p1
%patch0053 -p1
%patch0054 -p1
%patch0055 -p1
pushd roms/seabios
%patch1100 -p1