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

- Fix build on i586

Browse Source 
revert-d8978c90.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=213
This commit is contained in:
James Fehlig 2012-06-20 16:50:17 +00:00 committed by Git OBS Bridge
parent 8d8243b548
commit f04e151e5b
3 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libvirt.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jun 20 10:48:35 MDT 2012 - jfehlig@suse.com
- Fix build on i586
revert-d8978c90.patch
-------------------------------------------------------------------
Tue Jun 19 17:48:26 MDT 2012 - jfehlig@suse.com

3
libvirt.spec
View File

@ -410,6 +410,8 @@ Source1: libvirtd.init
Source2: libvirtd-relocation-server.fw
Source99: baselibs.conf
# Upstream patches
# Revert v0.9.11-maint branch commit d8978c90
Patch0: revert-d8978c90.patch
# Need to go upstream
Patch100: xen-name-for-devid.patch
Patch101: clone.patch
@ -545,6 +547,7 @@ Authors:
%prep
%setup -q
%patch0 -p1
%patch100 -p1
%patch101
%patch102 -p1

20
revert-d8978c90.patch Normal file
View File

@ -0,0 +1,20 @@
Revert commit d8978c90
Commit d8978c90 (master commit 5c650b98) should not have been backported
to 0.9.11 branch without master commit 97010eb1 as well.
Index: libvirt-0.9.11.4/src/qemu/qemu_process.c
===================================================================
--- libvirt-0.9.11.4.orig/src/qemu/qemu_process.c
+++ libvirt-0.9.11.4/src/qemu/qemu_process.c
@@ -1735,8 +1735,7 @@ cleanup:
}
#else
static int
-qemuProcessInitNumaMemoryPolicy(virDomainObjPtr vm,
- const char *nodemask ATTRIBUTE_UNUSED)
+qemuProcessInitNumaMemoryPolicy(virDomainObjPtr vm)
{
if (vm->def->numatune.memory.nodemask) {
qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s",