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

A few tweaks before Factory submission

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=889
This commit is contained in:
James Fehlig 2021-05-18 15:43:00 +00:00 committed by Git OBS Bridge
parent aeb9054b98
commit b90a82406e
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libxl-add-mocking.patch → ee890f25-libxl-mock-funcs.patch
View File

@ -1,4 +1,4 @@
commit 898598bfc8605a889a1389535597eca22943390f
commit ee890f25c703a07e69f6e19f08b2a8d06ed2fc5f
Author: Jim Fehlig <jfehlig@suse.com>
Date: Mon May 17 11:52:25 2021 -0600
@ -14,11 +14,12 @@ Date: Mon May 17 11:52:25 2021 -0600
https://github.com/xen-project/xen/commit/90c9f9f4ddd55e11be0506bff10c6237507c6e0d
Signed-off-by: Jim Fehlig <jfehlig@suse.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Index: libvirt-7.3.0/tests/libxlmock.c
===================================================================
--- libvirt-7.3.0.orig/tests/libxlmock.c
+++ libvirt-7.3.0/tests/libxlmock.c
diff --git a/tests/libxlmock.c b/tests/libxlmock.c
index 604dc4bfbe..a52d4bc2ed 100644
--- a/tests/libxlmock.c
+++ b/tests/libxlmock.c
@@ -39,6 +39,14 @@ VIR_MOCK_IMPL_RET_VOID(xs_daemon_open,
return (void*)0x1;
}
@ -34,7 +35,7 @@ Index: libvirt-7.3.0/tests/libxlmock.c
VIR_MOCK_IMPL_RET_ARGS(xc_interface_open,
xc_interface *,
xentoollog_logger *, logger,
@@ -94,6 +102,9 @@ VIR_MOCK_STUB_RET_ARGS(xc_sharing_used_f
@@ -94,6 +102,9 @@ VIR_MOCK_STUB_RET_ARGS(xc_sharing_used_frames,
VIR_MOCK_STUB_VOID_ARGS(xs_daemon_close,
struct xs_handle *, handle)

2
libvirt.changes
View File

@ -10,7 +10,7 @@ Mon May 3 22:14:22 UTC 2021 - James Fehlig <jfehlig@suse.com>
- Dropped patches:
suse-bump-xen-version.patch
- Added patches:
libxl-add-mocking.patch
ee890f25-libxl-mock-funcs.patch
-------------------------------------------------------------------
Thu Apr 1 23:42:46 UTC 2021 - James Fehlig <jfehlig@suse.com>

4
libvirt.spec
View File

@ -290,10 +290,10 @@ Source6: libvirtd-relocation-server.xml
Source99: baselibs.conf
Source100: %{name}-rpmlintrc
# Upstream patches
Patch0: ee890f25-libxl-mock-funcs.patch
# Patches pending upstream review
Patch100: libxl-dom-reset.patch
Patch101: network-don-t-use-dhcp-authoritative-on-static-netwo.patch
Patch102: libxl-add-mocking.patch
# Need to go upstream
Patch150: libvirt-power8-models.patch
Patch151: ppc64le-canonical-name.patch
@ -384,7 +384,7 @@ Requires: apparmor-abstractions
# Ensure smooth upgrades
Obsoletes: libvirt-admin < 7.3.0
Provides: libvirt-admin
Provides: libvirt-admin = %{version}
Obsoletes: libvirt-bash-completion < 7.3.0
%description daemon