From f04e151e5b94b8e1a7585d39cb73fa246346010cf86775e89c6a669e1834a66d Mon Sep 17 00:00:00 2001 From: James Fehlig Date: Wed, 20 Jun 2012 16:50:17 +0000 Subject: [PATCH] - Fix build on i586 revert-d8978c90.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=213 --- libvirt.changes | 6 ++++++ libvirt.spec | 3 +++ revert-d8978c90.patch | 20 ++++++++++++++++++++ 3 files changed, 29 insertions(+) create mode 100644 revert-d8978c90.patch diff --git a/libvirt.changes b/libvirt.changes index e47408a..b48b211 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -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 diff --git a/libvirt.spec b/libvirt.spec index 7b8e358..c52f73c 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -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 diff --git a/revert-d8978c90.patch b/revert-d8978c90.patch new file mode 100644 index 0000000..e5bcb49 --- /dev/null +++ b/revert-d8978c90.patch @@ -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",