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

Accepting request 259574 from Virtualization

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/259574
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libvirt?expand=0&rev=161
This commit is contained in:
Stephan Kulow 2014-11-04 16:30:10 +00:00 committed by Git OBS Bridge
commit 16e83b55ee
24 changed files with 172 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apparmor-no-mount.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.2.9/examples/apparmor/libvirt-lxc Index: libvirt-1.2.10/examples/apparmor/libvirt-lxc
=================================================================== ===================================================================
--- libvirt-1.2.9.orig/examples/apparmor/libvirt-lxc --- libvirt-1.2.10.orig/examples/apparmor/libvirt-lxc
+++ libvirt-1.2.9/examples/apparmor/libvirt-lxc +++ libvirt-1.2.10/examples/apparmor/libvirt-lxc
@@ -2,39 +2,15 @@ @@ -2,39 +2,15 @@
#include <abstractions/base> #include <abstractions/base>

8
blockcopy-check-dst-identical-device.patch
View File

@ -11,11 +11,11 @@ Signed-off-by: Chunyan Liu <cyliu@suse.com>
src/qemu/qemu_driver.c | 7 +++++++ src/qemu/qemu_driver.c | 7 +++++++
1 file changed, 7 insertions(+) 1 file changed, 7 insertions(+)
Index: libvirt-1.2.9/src/qemu/qemu_driver.c Index: libvirt-1.2.10/src/qemu/qemu_driver.c
=================================================================== ===================================================================
--- libvirt-1.2.9.orig/src/qemu/qemu_driver.c --- libvirt-1.2.10.orig/src/qemu/qemu_driver.c
+++ libvirt-1.2.9/src/qemu/qemu_driver.c +++ libvirt-1.2.10/src/qemu/qemu_driver.c
@@ -15589,6 +15589,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt @@ -15936,6 +15936,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt
virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s",
_("non-file destination not supported yet")); _("non-file destination not supported yet"));
} }

6
disable-virCgroupGetPercpuStats-test.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.2.9/tests/vircgrouptest.c Index: libvirt-1.2.10/tests/vircgrouptest.c
=================================================================== ===================================================================
--- libvirt-1.2.9.orig/tests/vircgrouptest.c --- libvirt-1.2.10.orig/tests/vircgrouptest.c
+++ libvirt-1.2.9/tests/vircgrouptest.c +++ libvirt-1.2.10/tests/vircgrouptest.c
@@ -33,7 +33,6 @@ @@ -33,7 +33,6 @@
# include "virlog.h" # include "virlog.h"
# include "virfile.h" # include "virfile.h"

6
fix-pci-attach-xen-driver.patch
View File

@ -8,10 +8,10 @@ uses the 'device_configure' RPC.
This patch changes the xend driver to always call 'device_configure' for This patch changes the xend driver to always call 'device_configure' for
PCI devices to be consistent with the usage in the xen tools. PCI devices to be consistent with the usage in the xen tools.
Index: libvirt-1.2.9/src/xen/xend_internal.c Index: libvirt-1.2.10/src/xen/xend_internal.c
=================================================================== ===================================================================
--- libvirt-1.2.9.orig/src/xen/xend_internal.c --- libvirt-1.2.10.orig/src/xen/xend_internal.c
+++ libvirt-1.2.9/src/xen/xend_internal.c +++ libvirt-1.2.10/src/xen/xend_internal.c
@@ -2221,6 +2221,7 @@ xenDaemonAttachDeviceFlags(virConnectPtr @@ -2221,6 +2221,7 @@ xenDaemonAttachDeviceFlags(virConnectPtr
virBuffer buf = VIR_BUFFER_INITIALIZER; virBuffer buf = VIR_BUFFER_INITIALIZER;
char class[8], ref[80]; char class[8], ref[80];

22
install-apparmor-profiles.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.2.9/examples/apparmor/Makefile.am Index: libvirt-1.2.10/examples/apparmor/Makefile.am
=================================================================== ===================================================================
--- libvirt-1.2.9.orig/examples/apparmor/Makefile.am --- libvirt-1.2.10.orig/examples/apparmor/Makefile.am
+++ libvirt-1.2.9/examples/apparmor/Makefile.am +++ libvirt-1.2.10/examples/apparmor/Makefile.am
@@ -19,10 +19,22 @@ EXTRA_DIST= \ @@ -19,10 +19,22 @@ EXTRA_DIST= \
TEMPLATE.lxc \ TEMPLATE.lxc \
libvirt-qemu \ libvirt-qemu \
@ -27,10 +27,10 @@ Index: libvirt-1.2.9/examples/apparmor/Makefile.am
apparmordir = $(sysconfdir)/apparmor.d/ apparmordir = $(sysconfdir)/apparmor.d/
apparmor_DATA = \ apparmor_DATA = \
usr.lib.libvirt.virt-aa-helper \ usr.lib.libvirt.virt-aa-helper \
Index: libvirt-1.2.9/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in Index: libvirt-1.2.10/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ libvirt-1.2.9/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in +++ libvirt-1.2.10/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
@@ -0,0 +1,48 @@ @@ -0,0 +1,48 @@
+# Last Modified: Mon Apr 5 15:10:27 2010 +# Last Modified: Mon Apr 5 15:10:27 2010
+#include <tunables/global> +#include <tunables/global>
@ -80,10 +80,10 @@ Index: libvirt-1.2.9/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
+ /**.[iI][sS][oO] r, + /**.[iI][sS][oO] r,
+ /**/disk{,.*} r, + /**/disk{,.*} r,
+} +}
Index: libvirt-1.2.9/examples/apparmor/usr.sbin.libvirtd.in Index: libvirt-1.2.10/examples/apparmor/usr.sbin.libvirtd.in
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ libvirt-1.2.9/examples/apparmor/usr.sbin.libvirtd.in +++ libvirt-1.2.10/examples/apparmor/usr.sbin.libvirtd.in
@@ -0,0 +1,68 @@ @@ -0,0 +1,68 @@
+# Last Modified: Mon Apr 5 15:03:58 2010 +# Last Modified: Mon Apr 5 15:03:58 2010
+#include <tunables/global> +#include <tunables/global>
@ -153,9 +153,9 @@ Index: libvirt-1.2.9/examples/apparmor/usr.sbin.libvirtd.in
+ change_profile -> @{LIBVIRT}-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*, + change_profile -> @{LIBVIRT}-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*,
+ +
+} +}
Index: libvirt-1.2.9/examples/apparmor/usr.lib.libvirt.virt-aa-helper Index: libvirt-1.2.10/examples/apparmor/usr.lib.libvirt.virt-aa-helper
=================================================================== ===================================================================
--- libvirt-1.2.9.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper --- libvirt-1.2.10.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper
+++ /dev/null +++ /dev/null
@@ -1,48 +0,0 @@ @@ -1,48 +0,0 @@
-# Last Modified: Mon Apr 5 15:10:27 2010 -# Last Modified: Mon Apr 5 15:10:27 2010
@ -206,9 +206,9 @@ Index: libvirt-1.2.9/examples/apparmor/usr.lib.libvirt.virt-aa-helper
- /**.[iI][sS][oO] r, - /**.[iI][sS][oO] r,
- /**/disk{,.*} r, - /**/disk{,.*} r,
-} -}
Index: libvirt-1.2.9/examples/apparmor/usr.sbin.libvirtd Index: libvirt-1.2.10/examples/apparmor/usr.sbin.libvirtd
=================================================================== ===================================================================
--- libvirt-1.2.9.orig/examples/apparmor/usr.sbin.libvirtd --- libvirt-1.2.10.orig/examples/apparmor/usr.sbin.libvirtd
+++ /dev/null +++ /dev/null
@@ -1,63 +0,0 @@ @@ -1,63 +0,0 @@
-# Last Modified: Mon Apr 5 15:03:58 2010 -# Last Modified: Mon Apr 5 15:03:58 2010

3
libvirt-1.2.10.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5050f4cea3dd59d3eca25c3d3f16085e10d624ecc18bd35820cd3dac6f46c08e
size 30029503

7
libvirt-1.2.10.tar.gz.asc Normal file
View File

@ -0,0 +1,7 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iEYEABECAAYFAlRXIOgACgkQRga4pd6VvB+obgCcCzOsG4rjI5PZs5Br9SXZuh41
vUkAoIaaoJv304OoiEdsCr1x4gAwaFpU
=FzVc
-----END PGP SIGNATURE-----

3
libvirt-1.2.9.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:95931a5a52f451b9ab73d6a5ae11a5740e1ba69a66520c2a0cffc6068a7e8fc4
size 30154430

7
libvirt-1.2.9.tar.gz.asc
View File

@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iEYEABECAAYFAlQrvjoACgkQRga4pd6VvB/bJwCfasEmR26TtY5jQNlVG6ChqYHU
bhwAnRMdkTBkoQsPLMuKQYpeLtpFKfkX
=VHOB
-----END PGP SIGNATURE-----

18
libvirt-guests-init-script.patch
View File

@ -1,9 +1,9 @@
Adjust libvirt-guests init files to conform to SUSE standards Adjust libvirt-guests init files to conform to SUSE standards
Index: libvirt-1.2.9/tools/libvirt-guests.init.in Index: libvirt-1.2.10/tools/libvirt-guests.init.in
=================================================================== ===================================================================
--- libvirt-1.2.9.orig/tools/libvirt-guests.init.in --- libvirt-1.2.10.orig/tools/libvirt-guests.init.in
+++ libvirt-1.2.9/tools/libvirt-guests.init.in +++ libvirt-1.2.10/tools/libvirt-guests.init.in
@@ -3,15 +3,15 @@ @@ -3,15 +3,15 @@
# the following is the LSB init header # the following is the LSB init header
# #
@ -28,10 +28,10 @@ Index: libvirt-1.2.9/tools/libvirt-guests.init.in
### END INIT INFO ### END INIT INFO
# the following is chkconfig init header # the following is chkconfig init header
Index: libvirt-1.2.9/tools/libvirt-guests.sh.in Index: libvirt-1.2.10/tools/libvirt-guests.sh.in
=================================================================== ===================================================================
--- libvirt-1.2.9.orig/tools/libvirt-guests.sh.in --- libvirt-1.2.10.orig/tools/libvirt-guests.sh.in
+++ libvirt-1.2.9/tools/libvirt-guests.sh.in +++ libvirt-1.2.10/tools/libvirt-guests.sh.in
@@ -16,14 +16,13 @@ @@ -16,14 +16,13 @@
# License along with this library. If not, see # License along with this library. If not, see
# <http://www.gnu.org/licenses/>. # <http://www.gnu.org/licenses/>.
@ -189,10 +189,10 @@ Index: libvirt-1.2.9/tools/libvirt-guests.sh.in
esac esac
-exit $RETVAL -exit $RETVAL
+rc_exit +rc_exit
Index: libvirt-1.2.9/tools/libvirt-guests.sysconf Index: libvirt-1.2.10/tools/libvirt-guests.sysconf
=================================================================== ===================================================================
--- libvirt-1.2.9.orig/tools/libvirt-guests.sysconf --- libvirt-1.2.10.orig/tools/libvirt-guests.sysconf
+++ libvirt-1.2.9/tools/libvirt-guests.sysconf +++ libvirt-1.2.10/tools/libvirt-guests.sysconf
@@ -1,19 +1,29 @@ @@ -1,19 +1,29 @@
+## Path: System/Virtualization/libvirt-guests +## Path: System/Virtualization/libvirt-guests
+ +

6
libvirt-power8-models.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.2.9/src/cpu/cpu_map.xml Index: libvirt-1.2.10/src/cpu/cpu_map.xml
=================================================================== ===================================================================
--- libvirt-1.2.9.orig/src/cpu/cpu_map.xml --- libvirt-1.2.10.orig/src/cpu/cpu_map.xml
+++ libvirt-1.2.9/src/cpu/cpu_map.xml +++ libvirt-1.2.10/src/cpu/cpu_map.xml
@@ -627,5 +627,15 @@ @@ -627,5 +627,15 @@
<pvr value='0x004b0100'/> <pvr value='0x004b0100'/>
</model> </model>

58
libvirt-ppc64le-support.patch
View File

@ -1,8 +1,8 @@
Index: libvirt-1.2.9/src/conf/domain_conf.c Index: libvirt-1.2.10/src/conf/domain_conf.c
=================================================================== ===================================================================
--- libvirt-1.2.9.orig/src/conf/domain_conf.c --- libvirt-1.2.10.orig/src/conf/domain_conf.c
+++ libvirt-1.2.9/src/conf/domain_conf.c +++ libvirt-1.2.10/src/conf/domain_conf.c
@@ -9863,7 +9863,8 @@ virDomainVideoDefaultType(const virDomai @@ -10043,7 +10043,8 @@ virDomainVideoDefaultType(const virDomai
(STREQ(def->os.type, "xen") || (STREQ(def->os.type, "xen") ||
STREQ(def->os.type, "linux"))) STREQ(def->os.type, "linux")))
return VIR_DOMAIN_VIDEO_TYPE_XEN; return VIR_DOMAIN_VIDEO_TYPE_XEN;
@ -12,10 +12,10 @@ Index: libvirt-1.2.9/src/conf/domain_conf.c
return VIR_DOMAIN_VIDEO_TYPE_VGA; return VIR_DOMAIN_VIDEO_TYPE_VGA;
else else
return VIR_DOMAIN_VIDEO_TYPE_CIRRUS; return VIR_DOMAIN_VIDEO_TYPE_CIRRUS;
Index: libvirt-1.2.9/src/cpu/cpu_powerpc.c Index: libvirt-1.2.10/src/cpu/cpu_powerpc.c
=================================================================== ===================================================================
--- libvirt-1.2.9.orig/src/cpu/cpu_powerpc.c --- libvirt-1.2.10.orig/src/cpu/cpu_powerpc.c
+++ libvirt-1.2.9/src/cpu/cpu_powerpc.c +++ libvirt-1.2.10/src/cpu/cpu_powerpc.c
@@ -38,7 +38,7 @@ @@ -38,7 +38,7 @@
VIR_LOG_INIT("cpu.cpu_powerpc"); VIR_LOG_INIT("cpu.cpu_powerpc");
@ -25,11 +25,11 @@ Index: libvirt-1.2.9/src/cpu/cpu_powerpc.c
struct ppc_vendor { struct ppc_vendor {
char *name; char *name;
Index: libvirt-1.2.9/src/qemu/qemu_capabilities.c Index: libvirt-1.2.10/src/qemu/qemu_capabilities.c
=================================================================== ===================================================================
--- libvirt-1.2.9.orig/src/qemu/qemu_capabilities.c --- libvirt-1.2.10.orig/src/qemu/qemu_capabilities.c
+++ libvirt-1.2.9/src/qemu/qemu_capabilities.c +++ libvirt-1.2.10/src/qemu/qemu_capabilities.c
@@ -632,7 +632,8 @@ virQEMUCapsProbeCPUModels(virQEMUCapsPtr @@ -633,7 +633,8 @@ virQEMUCapsProbeCPUModels(virQEMUCapsPtr
if (qemuCaps->arch == VIR_ARCH_I686 || if (qemuCaps->arch == VIR_ARCH_I686 ||
qemuCaps->arch == VIR_ARCH_X86_64) { qemuCaps->arch == VIR_ARCH_X86_64) {
parse = virQEMUCapsParseX86Models; parse = virQEMUCapsParseX86Models;
@ -39,7 +39,7 @@ Index: libvirt-1.2.9/src/qemu/qemu_capabilities.c
parse = virQEMUCapsParsePPCModels; parse = virQEMUCapsParsePPCModels;
} else { } else {
VIR_DEBUG("don't know how to parse %s CPU models", VIR_DEBUG("don't know how to parse %s CPU models",
@@ -2001,7 +2002,8 @@ bool virQEMUCapsHasPCIMultiBus(virQEMUCa @@ -2003,7 +2004,8 @@ bool virQEMUCapsHasPCIMultiBus(virQEMUCa
return true; return true;
if (def->os.arch == VIR_ARCH_PPC || if (def->os.arch == VIR_ARCH_PPC ||
@ -49,7 +49,7 @@ Index: libvirt-1.2.9/src/qemu/qemu_capabilities.c
/* /*
* Usage of pci.0 naming: * Usage of pci.0 naming:
* *
@@ -3571,7 +3573,9 @@ virQEMUCapsSupportsChardev(virDomainDefP @@ -3573,7 +3575,9 @@ virQEMUCapsSupportsChardev(virDomainDefP
!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE))
return false; return false;
@ -60,10 +60,10 @@ Index: libvirt-1.2.9/src/qemu/qemu_capabilities.c
/* only pseries need -device spapr-vty with -chardev */ /* only pseries need -device spapr-vty with -chardev */
return (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL && return (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL &&
chr->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO); chr->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO);
Index: libvirt-1.2.9/src/qemu/qemu_command.c Index: libvirt-1.2.10/src/qemu/qemu_command.c
=================================================================== ===================================================================
--- libvirt-1.2.9.orig/src/qemu/qemu_command.c --- libvirt-1.2.10.orig/src/qemu/qemu_command.c
+++ libvirt-1.2.9/src/qemu/qemu_command.c +++ libvirt-1.2.10/src/qemu/qemu_command.c
@@ -713,7 +713,8 @@ qemuSetSCSIControllerModel(virDomainDefP @@ -713,7 +713,8 @@ qemuSetSCSIControllerModel(virDomainDefP
return -1; return -1;
} }
@ -74,7 +74,7 @@ Index: libvirt-1.2.9/src/qemu/qemu_command.c
STRPREFIX(def->os.machine, "pseries")) { STRPREFIX(def->os.machine, "pseries")) {
*model = VIR_DOMAIN_CONTROLLER_MODEL_SCSI_IBMVSCSI; *model = VIR_DOMAIN_CONTROLLER_MODEL_SCSI_IBMVSCSI;
} else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SCSI_LSI)) { } else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SCSI_LSI)) {
@@ -1260,7 +1261,8 @@ int qemuDomainAssignSpaprVIOAddresses(vi @@ -1264,7 +1265,8 @@ int qemuDomainAssignSpaprVIOAddresses(vi
for (i = 0; i < def->nserials; i++) { for (i = 0; i < def->nserials; i++) {
if (def->serials[i]->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL && if (def->serials[i]->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL &&
@ -84,7 +84,7 @@ Index: libvirt-1.2.9/src/qemu/qemu_command.c
STRPREFIX(def->os.machine, "pseries")) STRPREFIX(def->os.machine, "pseries"))
def->serials[i]->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO; def->serials[i]->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO;
if (qemuAssignSpaprVIOAddress(def, &def->serials[i]->info, if (qemuAssignSpaprVIOAddress(def, &def->serials[i]->info,
@@ -1269,7 +1271,8 @@ int qemuDomainAssignSpaprVIOAddresses(vi @@ -1273,7 +1275,8 @@ int qemuDomainAssignSpaprVIOAddresses(vi
} }
if (def->nvram) { if (def->nvram) {
@ -94,7 +94,7 @@ Index: libvirt-1.2.9/src/qemu/qemu_command.c
STRPREFIX(def->os.machine, "pseries")) STRPREFIX(def->os.machine, "pseries"))
def->nvram->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO; def->nvram->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO;
if (qemuAssignSpaprVIOAddress(def, &def->nvram->info, if (qemuAssignSpaprVIOAddress(def, &def->nvram->info,
@@ -4191,7 +4194,8 @@ qemuBuildUSBControllerDevStr(virDomainDe @@ -4195,7 +4198,8 @@ qemuBuildUSBControllerDevStr(virDomainDe
model = def->model; model = def->model;
if (model == -1) { if (model == -1) {
@ -104,7 +104,7 @@ Index: libvirt-1.2.9/src/qemu/qemu_command.c
model = VIR_DOMAIN_CONTROLLER_MODEL_USB_PCI_OHCI; model = VIR_DOMAIN_CONTROLLER_MODEL_USB_PCI_OHCI;
else else
model = VIR_DOMAIN_CONTROLLER_MODEL_USB_PIIX3_UHCI; model = VIR_DOMAIN_CONTROLLER_MODEL_USB_PIIX3_UHCI;
@@ -8421,7 +8425,8 @@ qemuBuildCommandLine(virConnectPtr conn, @@ -8573,7 +8577,8 @@ qemuBuildCommandLine(virConnectPtr conn,
!qemuDomainMachineIsQ35(def) && !qemuDomainMachineIsQ35(def) &&
(!virQEMUCapsGet(qemuCaps, QEMU_CAPS_PIIX3_USB_UHCI) || (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_PIIX3_USB_UHCI) ||
(!virQEMUCapsGet(qemuCaps, QEMU_CAPS_PCI_OHCI) && (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_PCI_OHCI) &&
@ -114,7 +114,7 @@ Index: libvirt-1.2.9/src/qemu/qemu_command.c
if (usblegacy) { if (usblegacy) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Multiple legacy USB controllers are " _("Multiple legacy USB controllers are "
@@ -9619,7 +9624,8 @@ qemuBuildCommandLine(virConnectPtr conn, @@ -9771,7 +9776,8 @@ qemuBuildCommandLine(virConnectPtr conn,
} }
if (def->nvram) { if (def->nvram) {
@ -124,7 +124,7 @@ Index: libvirt-1.2.9/src/qemu/qemu_command.c
STRPREFIX(def->os.machine, "pseries")) { STRPREFIX(def->os.machine, "pseries")) {
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_NVRAM)) { if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_NVRAM)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
@@ -9737,7 +9743,8 @@ qemuBuildSerialChrDeviceStr(char **devic @@ -9894,7 +9900,8 @@ qemuBuildSerialChrDeviceStr(char **devic
{ {
virBuffer cmd = VIR_BUFFER_INITIALIZER; virBuffer cmd = VIR_BUFFER_INITIALIZER;
@ -134,7 +134,7 @@ Index: libvirt-1.2.9/src/qemu/qemu_command.c
if (serial->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL && if (serial->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL &&
serial->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO) { serial->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO) {
virBufferAsprintf(&cmd, "spapr-vty,chardev=char%s", virBufferAsprintf(&cmd, "spapr-vty,chardev=char%s",
@@ -10159,8 +10166,9 @@ qemuParseCommandLineDisk(virDomainXMLOpt @@ -10316,8 +10323,9 @@ qemuParseCommandLineDisk(virDomainXMLOpt
if (VIR_ALLOC(def->src) < 0) if (VIR_ALLOC(def->src) < 0)
goto error; goto error;
@ -146,7 +146,7 @@ Index: libvirt-1.2.9/src/qemu/qemu_command.c
def->bus = VIR_DOMAIN_DISK_BUS_SCSI; def->bus = VIR_DOMAIN_DISK_BUS_SCSI;
else else
def->bus = VIR_DOMAIN_DISK_BUS_IDE; def->bus = VIR_DOMAIN_DISK_BUS_IDE;
@@ -10252,7 +10260,8 @@ qemuParseCommandLineDisk(virDomainXMLOpt @@ -10409,7 +10417,8 @@ qemuParseCommandLineDisk(virDomainXMLOpt
} else if (STREQ(keywords[i], "if")) { } else if (STREQ(keywords[i], "if")) {
if (STREQ(values[i], "ide")) { if (STREQ(values[i], "ide")) {
def->bus = VIR_DOMAIN_DISK_BUS_IDE; def->bus = VIR_DOMAIN_DISK_BUS_IDE;
@ -156,7 +156,7 @@ Index: libvirt-1.2.9/src/qemu/qemu_command.c
dom->os.machine && STRPREFIX(dom->os.machine, "pseries"))) { dom->os.machine && STRPREFIX(dom->os.machine, "pseries"))) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("pseries systems do not support ide devices '%s'"), val); _("pseries systems do not support ide devices '%s'"), val);
@@ -11497,8 +11506,9 @@ qemuParseCommandLine(virCapsPtr qemuCaps @@ -11654,8 +11663,9 @@ qemuParseCommandLine(virCapsPtr qemuCaps
} }
if (STREQ(arg, "-cdrom")) { if (STREQ(arg, "-cdrom")) {
disk->device = VIR_DOMAIN_DISK_DEVICE_CDROM; disk->device = VIR_DOMAIN_DISK_DEVICE_CDROM;
@ -168,7 +168,7 @@ Index: libvirt-1.2.9/src/qemu/qemu_command.c
disk->bus = VIR_DOMAIN_DISK_BUS_SCSI; disk->bus = VIR_DOMAIN_DISK_BUS_SCSI;
if (VIR_STRDUP(disk->dst, "hdc") < 0) if (VIR_STRDUP(disk->dst, "hdc") < 0)
goto error; goto error;
@@ -11513,9 +11523,10 @@ qemuParseCommandLine(virCapsPtr qemuCaps @@ -11670,9 +11680,10 @@ qemuParseCommandLine(virCapsPtr qemuCaps
disk->bus = VIR_DOMAIN_DISK_BUS_IDE; disk->bus = VIR_DOMAIN_DISK_BUS_IDE;
else else
disk->bus = VIR_DOMAIN_DISK_BUS_SCSI; disk->bus = VIR_DOMAIN_DISK_BUS_SCSI;
@ -182,10 +182,10 @@ Index: libvirt-1.2.9/src/qemu/qemu_command.c
} }
if (VIR_STRDUP(disk->dst, arg + 1) < 0) if (VIR_STRDUP(disk->dst, arg + 1) < 0)
goto error; goto error;
Index: libvirt-1.2.9/src/qemu/qemu_domain.c Index: libvirt-1.2.10/src/qemu/qemu_domain.c
=================================================================== ===================================================================
--- libvirt-1.2.9.orig/src/qemu/qemu_domain.c --- libvirt-1.2.10.orig/src/qemu/qemu_domain.c
+++ libvirt-1.2.9/src/qemu/qemu_domain.c +++ libvirt-1.2.10/src/qemu/qemu_domain.c
@@ -980,6 +980,7 @@ qemuDomainDefPostParse(virDomainDefPtr d @@ -980,6 +980,7 @@ qemuDomainDefPostParse(virDomainDefPtr d
break; break;

42
libvirt-suse-netcontrol.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.2.9/configure.ac Index: libvirt-1.2.10/configure.ac
=================================================================== ===================================================================
--- libvirt-1.2.9.orig/configure.ac --- libvirt-1.2.10.orig/configure.ac
+++ libvirt-1.2.9/configure.ac +++ libvirt-1.2.10/configure.ac
@@ -237,6 +237,7 @@ LIBVIRT_CHECK_FUSE @@ -237,6 +237,7 @@ LIBVIRT_CHECK_FUSE
LIBVIRT_CHECK_GLUSTER LIBVIRT_CHECK_GLUSTER
LIBVIRT_CHECK_HAL LIBVIRT_CHECK_HAL
@ -26,7 +26,7 @@ Index: libvirt-1.2.9/configure.ac
esac esac
if test "$with_interface" = "yes" ; then if test "$with_interface" = "yes" ; then
@@ -2882,6 +2884,7 @@ LIBVIRT_RESULT_FUSE @@ -2895,6 +2897,7 @@ LIBVIRT_RESULT_FUSE
LIBVIRT_RESULT_GLUSTER LIBVIRT_RESULT_GLUSTER
LIBVIRT_RESULT_HAL LIBVIRT_RESULT_HAL
LIBVIRT_RESULT_NETCF LIBVIRT_RESULT_NETCF
@ -34,11 +34,11 @@ Index: libvirt-1.2.9/configure.ac
LIBVIRT_RESULT_NUMACTL LIBVIRT_RESULT_NUMACTL
LIBVIRT_RESULT_OPENWSMAN LIBVIRT_RESULT_OPENWSMAN
LIBVIRT_RESULT_PCIACCESS LIBVIRT_RESULT_PCIACCESS
Index: libvirt-1.2.9/src/Makefile.am Index: libvirt-1.2.10/src/Makefile.am
=================================================================== ===================================================================
--- libvirt-1.2.9.orig/src/Makefile.am --- libvirt-1.2.10.orig/src/Makefile.am
+++ libvirt-1.2.9/src/Makefile.am +++ libvirt-1.2.10/src/Makefile.am
@@ -826,6 +826,10 @@ if WITH_NETCF @@ -856,6 +856,10 @@ if WITH_NETCF
INTERFACE_DRIVER_SOURCES += \ INTERFACE_DRIVER_SOURCES += \
interface/interface_backend_netcf.c interface/interface_backend_netcf.c
endif WITH_NETCF endif WITH_NETCF
@ -49,7 +49,7 @@ Index: libvirt-1.2.9/src/Makefile.am
if WITH_UDEV if WITH_UDEV
INTERFACE_DRIVER_SOURCES += \ INTERFACE_DRIVER_SOURCES += \
interface/interface_backend_udev.c interface/interface_backend_udev.c
@@ -1465,10 +1469,15 @@ if WITH_NETCF @@ -1499,10 +1503,15 @@ if WITH_NETCF
libvirt_driver_interface_la_CFLAGS += $(NETCF_CFLAGS) libvirt_driver_interface_la_CFLAGS += $(NETCF_CFLAGS)
libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS) libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS)
else ! WITH_NETCF else ! WITH_NETCF
@ -65,10 +65,10 @@ Index: libvirt-1.2.9/src/Makefile.am
endif ! WITH_NETCF endif ! WITH_NETCF
if WITH_DRIVER_MODULES if WITH_DRIVER_MODULES
libvirt_driver_interface_la_LIBADD += ../gnulib/lib/libgnu.la libvirt_driver_interface_la_LIBADD += ../gnulib/lib/libgnu.la
Index: libvirt-1.2.9/tools/virsh.c Index: libvirt-1.2.10/tools/virsh.c
=================================================================== ===================================================================
--- libvirt-1.2.9.orig/tools/virsh.c --- libvirt-1.2.10.orig/tools/virsh.c
+++ libvirt-1.2.9/tools/virsh.c +++ libvirt-1.2.10/tools/virsh.c
@@ -3340,6 +3340,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE @@ -3340,6 +3340,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE
vshPrint(ctl, " Interface"); vshPrint(ctl, " Interface");
# if defined(WITH_NETCF) # if defined(WITH_NETCF)
@ -78,10 +78,10 @@ Index: libvirt-1.2.9/tools/virsh.c
# elif defined(WITH_UDEV) # elif defined(WITH_UDEV)
vshPrint(ctl, " udev"); vshPrint(ctl, " udev");
# endif # endif
Index: libvirt-1.2.9/src/interface/interface_backend_netcf.c Index: libvirt-1.2.10/src/interface/interface_backend_netcf.c
=================================================================== ===================================================================
--- libvirt-1.2.9.orig/src/interface/interface_backend_netcf.c --- libvirt-1.2.10.orig/src/interface/interface_backend_netcf.c
+++ libvirt-1.2.9/src/interface/interface_backend_netcf.c +++ libvirt-1.2.10/src/interface/interface_backend_netcf.c
@@ -23,7 +23,12 @@ @@ -23,7 +23,12 @@
#include <config.h> #include <config.h>
@ -98,7 +98,7 @@ Index: libvirt-1.2.9/src/interface/interface_backend_netcf.c
#include "datatypes.h" #include "datatypes.h"
@@ -65,6 +70,37 @@ VIR_ONCE_GLOBAL_INIT(virNetcfDriverState @@ -65,6 +70,37 @@ VIR_ONCE_GLOBAL_INIT(virNetcfDriverState
static virNetcfDriverStatePtr driverState = NULL; static virNetcfDriverStatePtr driverState;
+#ifdef WITH_NETCONTROL +#ifdef WITH_NETCONTROL
+static void +static void
@ -165,10 +165,10 @@ Index: libvirt-1.2.9/src/interface/interface_backend_netcf.c
return 0; return 0;
} }
Index: libvirt-1.2.9/src/interface/interface_driver.c Index: libvirt-1.2.10/src/interface/interface_driver.c
=================================================================== ===================================================================
--- libvirt-1.2.9.orig/src/interface/interface_driver.c --- libvirt-1.2.10.orig/src/interface/interface_driver.c
+++ libvirt-1.2.9/src/interface/interface_driver.c +++ libvirt-1.2.10/src/interface/interface_driver.c
@@ -30,8 +30,15 @@ interfaceRegister(void) @@ -30,8 +30,15 @@ interfaceRegister(void)
if (netcfIfaceRegister() == 0) if (netcfIfaceRegister() == 0)
return 0; return 0;
@ -186,10 +186,10 @@ Index: libvirt-1.2.9/src/interface/interface_driver.c
if (udevIfaceRegister() == 0) if (udevIfaceRegister() == 0)
return 0; return 0;
#endif /* WITH_UDEV */ #endif /* WITH_UDEV */
Index: libvirt-1.2.9/m4/virt-netcontrol.m4 Index: libvirt-1.2.10/m4/virt-netcontrol.m4
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ libvirt-1.2.9/m4/virt-netcontrol.m4 +++ libvirt-1.2.10/m4/virt-netcontrol.m4
@@ -0,0 +1,35 @@ @@ -0,0 +1,35 @@
+dnl The libnetcontrol library +dnl The libnetcontrol library
+dnl +dnl

13
libvirt.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Mon Nov 3 11:08:49 MST 2014 - jfehlig@suse.com
- Update to libvirt 1.2.10
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
-------------------------------------------------------------------
Mon Oct 27 21:20:08 UTC 2014 - cbosdonnat@suse.com
- Added package wireshark-plugin-libvirt to provide the wireshark
dissector for the libvirt RPC protocol
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 2 15:28:40 MDT 2014 - jfehlig@suse.com Thu Oct 2 15:28:40 MDT 2014 - jfehlig@suse.com

25
libvirt.spec
View File

@ -235,7 +235,7 @@
Name: libvirt Name: libvirt
Url: http://libvirt.org/ Url: http://libvirt.org/
Version: 1.2.9 Version: 1.2.10
Release: 0 Release: 0
Summary: Library providing a simple virtualization API Summary: Library providing a simple virtualization API
License: LGPL-2.1+ License: LGPL-2.1+
@ -423,6 +423,9 @@ BuildRequires: systemtap-sdt-devel
%if %{with_numad} %if %{with_numad}
BuildRequires: numad BuildRequires: numad
%endif %endif
%if 0%{?suse_version} >= 1210
BuildRequires: wireshark-devel
%endif
Source0: %{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz
Source1: %{name}-%{version}.tar.gz.asc Source1: %{name}-%{version}.tar.gz.asc
@ -949,6 +952,17 @@ connect a user to an LXC container when they login, by switching
namespaces. namespaces.
%endif %endif
# Older version contain too old wireshark
%if 0%{?suse_version} >= 1210
%package -n wireshark-plugin-libvirt
Summary: Wireshark plugin for Libvirt RPC protocol
Group: Productivity/Networking/Diagnostic
Requires: wireshark
%description -n wireshark-plugin-libvirt
Provides a dissector for the libvirt RPC protocol to help debugging it.
%endif
%prep %prep
%setup -q %setup -q
%patch150 -p1 %patch150 -p1
@ -1190,6 +1204,9 @@ do
done done
cp examples/lxcconvert/virt-lxc-convert $RPM_BUILD_ROOT%{_bindir} cp examples/lxcconvert/virt-lxc-convert $RPM_BUILD_ROOT%{_bindir}
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%if 0%{?suse_version} >= 1210
rm -f $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/libvirt.la
%endif
rm -f $RPM_BUILD_ROOT%{_libdir}/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lock-driver/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lock-driver/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lock-driver/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lock-driver/*.a
@ -1849,4 +1866,10 @@ fi
%{_bindir}/virt-login-shell %{_bindir}/virt-login-shell
%endif %endif
%if 0%{?suse_version} >= 1210
%files -n wireshark-plugin-libvirt
%defattr(-, root, root)
%{_libdir}/wireshark/plugins/*/libvirt.so
%endif
%changelog %changelog

18
libvirtd-defaults.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.2.9/daemon/libvirtd.conf Index: libvirt-1.2.10/daemon/libvirtd.conf
=================================================================== ===================================================================
--- libvirt-1.2.9.orig/daemon/libvirtd.conf --- libvirt-1.2.10.orig/daemon/libvirtd.conf
+++ libvirt-1.2.9/daemon/libvirtd.conf +++ libvirt-1.2.10/daemon/libvirtd.conf
@@ -18,8 +18,8 @@ @@ -18,8 +18,8 @@
# It is necessary to setup a CA and issue server certificates before # It is necessary to setup a CA and issue server certificates before
# using this capability. # using this capability.
@ -13,10 +13,10 @@ Index: libvirt-1.2.9/daemon/libvirtd.conf
# Listen for unencrypted TCP connections on the public TCP/IP port. # Listen for unencrypted TCP connections on the public TCP/IP port.
# NB, must pass the --listen flag to the libvirtd process for this to # NB, must pass the --listen flag to the libvirtd process for this to
Index: libvirt-1.2.9/daemon/libvirtd-config.c Index: libvirt-1.2.10/daemon/libvirtd-config.c
=================================================================== ===================================================================
--- libvirt-1.2.9.orig/daemon/libvirtd-config.c --- libvirt-1.2.10.orig/daemon/libvirtd-config.c
+++ libvirt-1.2.9/daemon/libvirtd-config.c +++ libvirt-1.2.10/daemon/libvirtd-config.c
@@ -229,7 +229,7 @@ daemonConfigNew(bool privileged ATTRIBUT @@ -229,7 +229,7 @@ daemonConfigNew(bool privileged ATTRIBUT
if (VIR_ALLOC(data) < 0) if (VIR_ALLOC(data) < 0)
return NULL; return NULL;
@ -26,10 +26,10 @@ Index: libvirt-1.2.9/daemon/libvirtd-config.c
data->listen_tcp = 0; data->listen_tcp = 0;
if (VIR_STRDUP(data->tls_port, LIBVIRTD_TLS_PORT) < 0 || if (VIR_STRDUP(data->tls_port, LIBVIRTD_TLS_PORT) < 0 ||
Index: libvirt-1.2.9/daemon/test_libvirtd.aug.in Index: libvirt-1.2.10/daemon/test_libvirtd.aug.in
=================================================================== ===================================================================
--- libvirt-1.2.9.orig/daemon/test_libvirtd.aug.in --- libvirt-1.2.10.orig/daemon/test_libvirtd.aug.in
+++ libvirt-1.2.9/daemon/test_libvirtd.aug.in +++ libvirt-1.2.10/daemon/test_libvirtd.aug.in
@@ -2,7 +2,7 @@ module Test_libvirtd = @@ -2,7 +2,7 @@ module Test_libvirtd =
::CONFIG:: ::CONFIG::

6
libvirtd-init-script.patch
View File

@ -1,9 +1,9 @@
Adjust libvirtd sysconfig file to conform to SUSE standards Adjust libvirtd sysconfig file to conform to SUSE standards
Index: libvirt-1.2.9/daemon/libvirtd.sysconf Index: libvirt-1.2.10/daemon/libvirtd.sysconf
=================================================================== ===================================================================
--- libvirt-1.2.9.orig/daemon/libvirtd.sysconf --- libvirt-1.2.10.orig/daemon/libvirtd.sysconf
+++ libvirt-1.2.9/daemon/libvirtd.sysconf +++ libvirt-1.2.10/daemon/libvirtd.sysconf
@@ -1,16 +1,25 @@ @@ -1,16 +1,25 @@
+## Path: System/Virtualization/libvirt +## Path: System/Virtualization/libvirt
+ +

6
ppc64le-canonical-name.patch
View File

@ -2,10 +2,10 @@ Canonicalize hostarch name ppc64le to ppc64
See bnc#894956 See bnc#894956
Index: libvirt-1.2.9/src/util/virarch.c Index: libvirt-1.2.10/src/util/virarch.c
=================================================================== ===================================================================
--- libvirt-1.2.9.orig/src/util/virarch.c --- libvirt-1.2.10.orig/src/util/virarch.c
+++ libvirt-1.2.9/src/util/virarch.c +++ libvirt-1.2.10/src/util/virarch.c
@@ -169,6 +169,8 @@ virArch virArchFromHost(void) @@ -169,6 +169,8 @@ virArch virArchFromHost(void)
arch = VIR_ARCH_I686; arch = VIR_ARCH_I686;
} else if (STREQ(ut.machine, "amd64")) { } else if (STREQ(ut.machine, "amd64")) {

12
support-managed-pci-xen-driver.patch
View File

@ -8,10 +8,10 @@ Subject: [PATCH] support managed pci devices in xen driver
src/xenxs/xen_xm.c | 28 +++++++++++++++++++++++++++- src/xenxs/xen_xm.c | 28 +++++++++++++++++++++++++++-
2 files changed, 35 insertions(+), 15 deletions(-) 2 files changed, 35 insertions(+), 15 deletions(-)
Index: libvirt-1.2.9/src/xenconfig/xen_common.c Index: libvirt-1.2.10/src/xenconfig/xen_common.c
=================================================================== ===================================================================
--- libvirt-1.2.9.orig/src/xenconfig/xen_common.c --- libvirt-1.2.10.orig/src/xenconfig/xen_common.c
+++ libvirt-1.2.9/src/xenconfig/xen_common.c +++ libvirt-1.2.10/src/xenconfig/xen_common.c
@@ -401,6 +401,8 @@ xenParsePCI(virConfPtr conf, virDomainDe @@ -401,6 +401,8 @@ xenParsePCI(virConfPtr conf, virDomainDe
{ {
virConfValuePtr list = virConfGetValue(conf, "pci"); virConfValuePtr list = virConfGetValue(conf, "pci");
@ -66,10 +66,10 @@ Index: libvirt-1.2.9/src/xenconfig/xen_common.c
hostdev->source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI; hostdev->source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI;
hostdev->source.subsys.u.pci.addr.domain = domainID; hostdev->source.subsys.u.pci.addr.domain = domainID;
hostdev->source.subsys.u.pci.addr.bus = busID; hostdev->source.subsys.u.pci.addr.bus = busID;
Index: libvirt-1.2.9/src/xenconfig/xen_sxpr.c Index: libvirt-1.2.10/src/xenconfig/xen_sxpr.c
=================================================================== ===================================================================
--- libvirt-1.2.9.orig/src/xenconfig/xen_sxpr.c --- libvirt-1.2.10.orig/src/xenconfig/xen_sxpr.c
+++ libvirt-1.2.9/src/xenconfig/xen_sxpr.c +++ libvirt-1.2.10/src/xenconfig/xen_sxpr.c
@@ -999,6 +999,7 @@ xenParseSxprPCI(virDomainDefPtr def, @@ -999,6 +999,7 @@ xenParseSxprPCI(virDomainDefPtr def,
int busID; int busID;
int slotID; int slotID;

6
suse-qemu-conf.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.2.9/src/qemu/qemu.conf Index: libvirt-1.2.10/src/qemu/qemu.conf
=================================================================== ===================================================================
--- libvirt-1.2.9.orig/src/qemu/qemu.conf --- libvirt-1.2.10.orig/src/qemu/qemu.conf
+++ libvirt-1.2.9/src/qemu/qemu.conf +++ libvirt-1.2.10/src/qemu/qemu.conf
@@ -200,7 +200,16 @@ @@ -200,7 +200,16 @@
# a special value; security_driver can be set to that value in # a special value; security_driver can be set to that value in
# isolation, but it cannot appear in a list of drivers. # isolation, but it cannot appear in a list of drivers.

6
systemd-service-xen.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.2.9/daemon/libvirtd.service.in Index: libvirt-1.2.10/daemon/libvirtd.service.in
=================================================================== ===================================================================
--- libvirt-1.2.9.orig/daemon/libvirtd.service.in --- libvirt-1.2.10.orig/daemon/libvirtd.service.in
+++ libvirt-1.2.9/daemon/libvirtd.service.in +++ libvirt-1.2.10/daemon/libvirtd.service.in
@@ -5,6 +5,8 @@ After=network.target @@ -5,6 +5,8 @@ After=network.target
After=dbus.service After=dbus.service
After=iscsid.service After=iscsid.service

12
virtlockd-init-script.patch
View File

@ -1,9 +1,9 @@
Adjust virtlockd init files to conform to SUSE standards Adjust virtlockd init files to conform to SUSE standards
Index: libvirt-1.2.9/src/locking/virtlockd.sysconf Index: libvirt-1.2.10/src/locking/virtlockd.sysconf
=================================================================== ===================================================================
--- libvirt-1.2.9.orig/src/locking/virtlockd.sysconf --- libvirt-1.2.10.orig/src/locking/virtlockd.sysconf
+++ libvirt-1.2.9/src/locking/virtlockd.sysconf +++ libvirt-1.2.10/src/locking/virtlockd.sysconf
@@ -1,3 +1,7 @@ @@ -1,3 +1,7 @@
+## Path: System/Virtualization/virtlockd +## Path: System/Virtualization/virtlockd
+ +
@ -12,10 +12,10 @@ Index: libvirt-1.2.9/src/locking/virtlockd.sysconf
# #
# Pass extra arguments to virtlockd # Pass extra arguments to virtlockd
#VIRTLOCKD_ARGS= #VIRTLOCKD_ARGS=
Index: libvirt-1.2.9/src/locking/virtlockd.init.in Index: libvirt-1.2.10/src/locking/virtlockd.init.in
=================================================================== ===================================================================
--- libvirt-1.2.9.orig/src/locking/virtlockd.init.in --- libvirt-1.2.10.orig/src/locking/virtlockd.init.in
+++ libvirt-1.2.9/src/locking/virtlockd.init.in +++ libvirt-1.2.10/src/locking/virtlockd.init.in
@@ -4,12 +4,14 @@ @@ -4,12 +4,14 @@
# http://www.linux-foundation.org/spec//booksets/LSB-Core-generic/LSB-Core-generic.html#INITSCRCOMCONV # http://www.linux-foundation.org/spec//booksets/LSB-Core-generic/LSB-Core-generic.html#INITSCRCOMCONV
# #

6
xen-name-for-devid.patch
View File

@ -14,10 +14,10 @@
is inactive. We obviously can't search xenstore when the domain is is inactive. We obviously can't search xenstore when the domain is
inactive. inactive.
Index: libvirt-1.2.9/src/xen/xend_internal.c Index: libvirt-1.2.10/src/xen/xend_internal.c
=================================================================== ===================================================================
--- libvirt-1.2.9.orig/src/xen/xend_internal.c --- libvirt-1.2.10.orig/src/xen/xend_internal.c
+++ libvirt-1.2.9/src/xen/xend_internal.c +++ libvirt-1.2.10/src/xen/xend_internal.c
@@ -72,7 +72,7 @@ VIR_LOG_INIT("xen.xend_internal"); @@ -72,7 +72,7 @@ VIR_LOG_INIT("xen.xend_internal");
#define XEND_RCV_BUF_MAX_LEN (256 * 1024) #define XEND_RCV_BUF_MAX_LEN (256 * 1024)

6
xen-pv-cdrom.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.2.9/src/xenconfig/xen_sxpr.c Index: libvirt-1.2.10/src/xenconfig/xen_sxpr.c
=================================================================== ===================================================================
--- libvirt-1.2.9.orig/src/xenconfig/xen_sxpr.c --- libvirt-1.2.10.orig/src/xenconfig/xen_sxpr.c
+++ libvirt-1.2.9/src/xenconfig/xen_sxpr.c +++ libvirt-1.2.10/src/xenconfig/xen_sxpr.c
@@ -334,7 +334,7 @@ xenParseSxprChar(const char *value, @@ -334,7 +334,7 @@ xenParseSxprChar(const char *value,
static int static int
xenParseSxprDisks(virDomainDefPtr def, xenParseSxprDisks(virDomainDefPtr def,