- 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
This commit is contained in:
Charles Arnold 2015-09-17 17:45:05 +00:00 committed by Git OBS Bridge
parent 4a5ee0f11d
commit e932e0a863
3 changed files with 44 additions and 2 deletions

33
pci-attach-fix.patch Normal file
View File

@ -0,0 +1,33 @@
From 9bfb923a855388bb38f7f57b4881bc888a04f9b5 Mon Sep 17 00:00:00 2001
From: Chunyan Liu <cyliu@suse.com>
Date: Mon, 14 Sep 2015 14:45:37 +0800
Subject: [PATCH] pci-attach: fix assertation
run "xl pci-attach <domain> <pci_device>", 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 <cyliu@suse.com>
---
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

View File

@ -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 Tue Sep 15 14:48:27 MDT 2015 - jfehlig@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package xen # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -15,6 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
# needssslcertforbuild # needssslcertforbuild
Name: xen Name: xen
@ -158,7 +159,7 @@ BuildRequires: xorg-x11-util-devel
%endif %endif
%endif %endif
Version: 4.5.1_07 Version: 4.5.1_08
Release: 0 Release: 0
Summary: Xen Virtualization: Hypervisor (aka VMM aka Microkernel) Summary: Xen Virtualization: Hypervisor (aka VMM aka Microkernel)
License: GPL-2.0 License: GPL-2.0
@ -335,6 +336,7 @@ Patch470: qemu-xen-upstream-qdisk-cache-unsafe.patch
Patch471: qemu-xen-enable-spice-support.patch Patch471: qemu-xen-enable-spice-support.patch
Patch472: tigervnc-long-press.patch Patch472: tigervnc-long-press.patch
Patch473: xendomains-libvirtd-conflict.patch Patch473: xendomains-libvirtd-conflict.patch
Patch474: pci-attach-fix.patch
# Hypervisor and PV driver Patches # Hypervisor and PV driver Patches
Patch501: x86-ioapic-ack-default.patch Patch501: x86-ioapic-ack-default.patch
Patch502: x86-cpufreq-report.patch Patch502: x86-cpufreq-report.patch
@ -728,6 +730,7 @@ Authors:
%patch471 -p1 %patch471 -p1
%patch472 -p1 %patch472 -p1
%patch473 -p1 %patch473 -p1
%patch474 -p1
# Hypervisor and PV driver Patches # Hypervisor and PV driver Patches
%patch501 -p1 %patch501 -p1
%patch502 -p1 %patch502 -p1