From e932e0a8636122d6b5bf0965904044cc14f6e123160d0930eb94417937808e6e Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Thu, 17 Sep 2015 17:45:05 +0000 Subject: [PATCH] - bsc#945165 - Xl pci-attach show error with kernel of SLES 12 sp1 pci-attach-fix.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=376 --- pci-attach-fix.patch | 33 +++++++++++++++++++++++++++++++++ xen.changes | 6 ++++++ xen.spec | 7 +++++-- 3 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 pci-attach-fix.patch diff --git a/pci-attach-fix.patch b/pci-attach-fix.patch new file mode 100644 index 0000000..f42d3ff --- /dev/null +++ b/pci-attach-fix.patch @@ -0,0 +1,33 @@ +From 9bfb923a855388bb38f7f57b4881bc888a04f9b5 Mon Sep 17 00:00:00 2001 +From: Chunyan Liu +Date: Mon, 14 Sep 2015 14:45:37 +0800 +Subject: [PATCH] pci-attach: fix assertation + +run "xl pci-attach ", the 2nd time fails: +xl: libxl_xshelp.c:209: libxl__xs_transaction_start: Assertion `!*t' failed. +Aborted + +To fix that, initialize xs_transaction to avoid libxl__xs_transaction_start +assertion error. + +Signed-off-by: Chunyan Liu +--- + tools/libxl/libxl_pci.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c +index 1ebdce7..19c597e 100644 +--- a/tools/libxl/libxl_pci.c ++++ b/tools/libxl/libxl_pci.c +@@ -123,7 +123,7 @@ static int libxl__device_pci_add_xenstore(libxl__gc *gc, uint32_t domid, libxl_d + flexarray_t *back; + char *num_devs, *be_path; + int num = 0; +- xs_transaction_t t; ++ xs_transaction_t t = XBT_NULL; + libxl__device *device; + int rc; + libxl_domain_config d_config; +-- +2.1.4 + diff --git a/xen.changes b/xen.changes index 712b4d3..3441c68 100644 --- a/xen.changes +++ b/xen.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Sep 16 07:17:00 UTC 2015 - cyliu@suse.com + +- bsc#945165 - Xl pci-attach show error with kernel of SLES 12 sp1 + pci-attach-fix.patch + ------------------------------------------------------------------- Tue Sep 15 14:48:27 MDT 2015 - jfehlig@suse.com diff --git a/xen.spec b/xen.spec index 2dffc1b..87052b9 100644 --- a/xen.spec +++ b/xen.spec @@ -1,7 +1,7 @@ # # spec file for package xen # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + # needssslcertforbuild Name: xen @@ -158,7 +159,7 @@ BuildRequires: xorg-x11-util-devel %endif %endif -Version: 4.5.1_07 +Version: 4.5.1_08 Release: 0 Summary: Xen Virtualization: Hypervisor (aka VMM aka Microkernel) License: GPL-2.0 @@ -335,6 +336,7 @@ Patch470: qemu-xen-upstream-qdisk-cache-unsafe.patch Patch471: qemu-xen-enable-spice-support.patch Patch472: tigervnc-long-press.patch Patch473: xendomains-libvirtd-conflict.patch +Patch474: pci-attach-fix.patch # Hypervisor and PV driver Patches Patch501: x86-ioapic-ack-default.patch Patch502: x86-cpufreq-report.patch @@ -728,6 +730,7 @@ Authors: %patch471 -p1 %patch472 -p1 %patch473 -p1 +%patch474 -p1 # Hypervisor and PV driver Patches %patch501 -p1 %patch502 -p1