pool/libvirt
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 393490 from home:jfehlig:branches:Virtualization

Browse Source 
- Update to libvirt 1.3.4
  - Add support for migration data compression in QEMU driver
  - Drop libvirtd.socket
  - Many incremental improvements and bug fixes, see
    http://libvirt.org/news.html
  - Dropped patches: 216650f1-libxl-build-fix.patch,
    6d8b6d28-mark-implicit-video-primary.patch,
    03e8d5fb-qemu-perf-memory-corruption.patch,
    libvirtd-systemd-socket.patch

OBS-URL: https://build.opensuse.org/request/show/393490
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=526
This commit is contained in:
James Fehlig 2016-05-03 21:55:59 +00:00 committed by Git OBS Bridge
parent 2c3c6d1983
commit 36595c9b4c
30 changed files with 142 additions and 1155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
03e8d5fb-qemu-perf-memory-corruption.patch
View File

@ -1,33 +0,0 @@
commit 03e8d5fb54c7c897225ed9ea56d83b894930f144
Author: Peter Krempa <pkrempa@redhat.com>
Date: Thu Apr 7 12:50:15 2016 +0200
qemu: perf: Fix crash/memory corruption on failed VM start
The new perf code didn't bother to clear a pointer in 'priv' causing a
double free or other memory corruption goodness if a VM failed to start.
Clear the pointer after freeing the memory.
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1324757
Index: libvirt-1.3.3/src/qemu/qemu_process.c
===================================================================
--- libvirt-1.3.3.orig/src/qemu/qemu_process.c
+++ libvirt-1.3.3/src/qemu/qemu_process.c
@@ -3444,6 +3444,7 @@ qemuDomainPerfRestart(virDomainObjPtr vm
cleanup:
virPerfFree(priv->perf);
+ priv->perf = NULL;
return -1;
}
@@ -5959,6 +5960,7 @@ void qemuProcessStop(virQEMUDriverPtr dr
virCgroupFree(&priv->cgroup);
virPerfFree(priv->perf);
+ priv->perf = NULL;
qemuProcessRemoveDomainStatus(driver, vm);

34
216650f1-libxl-build-fix.patch
View File

@ -1,34 +0,0 @@
commit 216650f14b35ad11a45505405347f8027bc294d7
Author: Wei Liu <wei.liu2@citrix.com>
Date: Tue Apr 5 15:20:12 2016 +0100
libxl: libxl_domain_create_restore has an extra argument
In the latest libxenlight code, libxl_domain_create_restore accepts a
new argument. Update libvirt's libxl driver for that. Use the macro
provided by libxenlight to detect which version should be used.
The new parameter (send_back_fd) is set to -1 because libvirt provides
no such fd.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Message-id: 1459866012-27081-1-git-send-email-wei.liu2@citrix.com
Index: libvirt-1.3.3/src/libxl/libxl_domain.c
===================================================================
--- libvirt-1.3.3.orig/src/libxl/libxl_domain.c
+++ libvirt-1.3.3/src/libxl/libxl_domain.c
@@ -1070,7 +1070,12 @@ libxlDomainStart(libxlDriverPrivatePtr d
ret = libxl_domain_create_new(cfg->ctx, &d_config,
&domid, NULL, &aop_console_how);
} else {
-#ifdef LIBXL_HAVE_DOMAIN_CREATE_RESTORE_PARAMS
+#if defined(LIBXL_HAVE_DOMAIN_CREATE_RESTORE_SEND_BACK_FD)
+ params.checkpointed_stream = 0;
+ ret = libxl_domain_create_restore(cfg->ctx, &d_config, &domid,
+ restore_fd, -1, &params, NULL,
+ &aop_console_how);
+#elif defined(LIBXL_HAVE_DOMAIN_CREATE_RESTORE_PARAMS)
params.checkpointed_stream = 0;
ret = libxl_domain_create_restore(cfg->ctx, &d_config, &domid,
restore_fd, &params, NULL,

914
6d8b6d28-mark-implicit-video-primary.patch
View File

@ -1,914 +0,0 @@
commit 6d8b6d2847f31a3d7a234536c12b8feca751a02f
Author: Ján Tomko <jtomko@redhat.com>
Date: Mon Apr 11 14:26:06 2016 +0200
conf: also mark the implicit video as primary
Commit 119cd06 started setting the primary bool for the first
user-specified video even if user omitted the 'primary' attribute.
However this was done before the addition of the implicit device.
This broke startup of transient qemu domains with no <video>:
https://bugzilla.redhat.com/show_bug.cgi?id=1325757
Move this default to virDomainDefPostParseInternal,
after the addition of the implicit video device, to catch the implicit
video as well.
Index: libvirt-1.3.3/src/conf/domain_conf.c
===================================================================
--- libvirt-1.3.3.orig/src/conf/domain_conf.c
+++ libvirt-1.3.3/src/conf/domain_conf.c
@@ -3926,6 +3926,11 @@ virDomainDefPostParseInternal(virDomainD
if (virDomainDefAddImplicitDevices(def) < 0)
return -1;
+ /* Mark the first video as primary. If the user specified primary="yes",
+ * the parser already inserted the device at def->videos[0] */
+ if (def->nvideos != 0)
+ def->videos[0]->primary = true;
+
/* clean up possibly duplicated metadata entries */
virDomainDefMetadataSanitize(def);
@@ -16368,9 +16373,6 @@ virDomainDefParseXML(xmlDocPtr xml,
goto error;
}
}
- /* if not specified by user mark the first video as primary */
- if (n && !primaryVideo)
- def->videos[0]->primary = true;
VIR_FREE(nodes);
Index: libvirt-1.3.3/tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl-fullscreen.xml
===================================================================
--- libvirt-1.3.3.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl-fullscreen.xml
+++ libvirt-1.3.3/tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl-fullscreen.xml
@@ -27,7 +27,7 @@
<input type='keyboard' bus='ps2'/>
<graphics type='sdl' display=':0.1' xauth='/root/.Xauthority' fullscreen='yes'/>
<video>
- <model type='cirrus' vram='16384' heads='1'/>
+ <model type='cirrus' vram='16384' heads='1' primary='yes'/>
</video>
<memballoon model='none'/>
</devices>
Index: libvirt-1.3.3/tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl.xml
===================================================================
--- libvirt-1.3.3.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl.xml
+++ libvirt-1.3.3/tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl.xml
@@ -27,7 +27,7 @@
<input type='keyboard' bus='ps2'/>
<graphics type='sdl' display=':0.1' xauth='/root/.Xauthority'/>
<video>
- <model type='vga' vram='16384' heads='1'/>
+ <model type='vga' vram='16384' heads='1' primary='yes'/>
</video>
<memballoon model='none'/>
</devices>
Index: libvirt-1.3.3/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-policy.xml
===================================================================
--- libvirt-1.3.3.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-policy.xml
+++ libvirt-1.3.3/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-policy.xml
@@ -29,7 +29,7 @@
<listen type='address' address='::'/>
</graphics>
<video>
- <model type='cirrus' vram='16384' heads='1'/>
+ <model type='cirrus' vram='16384' heads='1' primary='yes'/>
</video>
<memballoon model='none'/>
</devices>
Index: libvirt-1.3.3/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.xml
===================================================================
--- libvirt-1.3.3.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.xml
+++ libvirt-1.3.3/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.xml
@@ -29,7 +29,7 @@
<listen type='address' address='127.0.0.1'/>
</graphics>
<video>
- <model type='cirrus' vram='16384' heads='1'/>
+ <model type='cirrus' vram='16384' heads='1' primary='yes'/>
</video>
<memballoon model='none'/>
</devices>
Index: libvirt-1.3.3/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-socket.xml
===================================================================
--- libvirt-1.3.3.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-socket.xml
+++ libvirt-1.3.3/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-socket.xml
@@ -27,7 +27,7 @@
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' socket='/tmp/foo.socket'/>
<video>
- <model type='cirrus' vram='16384' heads='1'/>
+ <model type='cirrus' vram='16384' heads='1' primary='yes'/>
</video>
<memballoon model='none'/>
</devices>
Index: libvirt-1.3.3/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.xml
===================================================================
--- libvirt-1.3.3.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.xml
+++ libvirt-1.3.3/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.xml
@@ -29,7 +29,7 @@
<listen type='address' address='127.0.0.1'/>
</graphics>
<video>
- <model type='cirrus' vram='16384' heads='1'/>
+ <model type='cirrus' vram='16384' heads='1' primary='yes'/>
</video>
<memballoon model='none'/>
</devices>
Index: libvirt-1.3.3/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-websocket.xml
===================================================================
--- libvirt-1.3.3.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-websocket.xml
+++ libvirt-1.3.3/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-websocket.xml
@@ -22,7 +22,7 @@
<listen type='address' address='127.0.0.1'/>
</graphics>
<video>
- <model type='cirrus' vram='16384' heads='1'/>
+ <model type='cirrus' vram='16384' heads='1' primary='yes'/>
</video>
<memballoon model='none'/>
</devices>
Index: libvirt-1.3.3/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc.xml
===================================================================
--- libvirt-1.3.3.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc.xml
+++ libvirt-1.3.3/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc.xml
@@ -29,7 +29,7 @@
<listen type='address' address='2001:1:2:3:4:5:1234:1234'/>
</graphics>
<video>
- <model type='cirrus' vram='16384' heads='1'/>
+ <model type='cirrus' vram='16384' heads='1' primary='yes'/>
</video>
<memballoon model='none'/>
</devices>
Index: libvirt-1.3.3/tests/qemuargv2xmldata/qemuargv2xml-pseries-disk.xml
===================================================================
--- libvirt-1.3.3.orig/tests/qemuargv2xmldata/qemuargv2xml-pseries-disk.xml
+++ libvirt-1.3.3/tests/qemuargv2xmldata/qemuargv2xml-pseries-disk.xml
@@ -34,7 +34,7 @@
<input type='mouse' bus='usb'/>
<graphics type='sdl'/>
<video>
- <model type='cirrus' vram='16384' heads='1'/>
+ <model type='cirrus' vram='16384' heads='1' primary='yes'/>
</video>
<memballoon model='none'/>
<panic model='pseries'/>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-annotation.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-annotation.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-annotation.xml
@@ -13,7 +13,7 @@
<on_crash>destroy</on_crash>
<devices>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-case-insensitive-1.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-case-insensitive-1.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-case-insensitive-1.xml
@@ -26,7 +26,7 @@
<source bridge='VM NETWORK'/>
</interface>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-case-insensitive-2.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-case-insensitive-2.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-case-insensitive-2.xml
@@ -26,7 +26,7 @@
<source bridge='vm network'/>
</interface>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-cdrom-ide-device.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-cdrom-ide-device.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-cdrom-ide-device.xml
@@ -18,7 +18,7 @@
</disk>
<controller type='ide' index='0'/>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-cdrom-ide-empty.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-cdrom-ide-empty.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-cdrom-ide-empty.xml
@@ -17,7 +17,7 @@
</disk>
<controller type='ide' index='0'/>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-cdrom-ide-file.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-cdrom-ide-file.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-cdrom-ide-file.xml
@@ -18,7 +18,7 @@
</disk>
<controller type='ide' index='0'/>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-auto-detect.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-auto-detect.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-auto-detect.xml
@@ -18,7 +18,7 @@
</disk>
<controller type='ide' index='0'/>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.xml
@@ -18,7 +18,7 @@
</disk>
<controller type='ide' index='0'/>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.xml
@@ -18,7 +18,7 @@
</disk>
<controller type='scsi' index='0'/>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-cdrom-scsi-empty.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-cdrom-scsi-empty.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-cdrom-scsi-empty.xml
@@ -17,7 +17,7 @@
</disk>
<controller type='scsi' index='0'/>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.xml
@@ -18,7 +18,7 @@
</disk>
<controller type='scsi' index='0'/>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-cdrom-scsi-passthru.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-cdrom-scsi-passthru.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-cdrom-scsi-passthru.xml
@@ -18,7 +18,7 @@
</disk>
<controller type='scsi' index='0'/>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-auto-detect.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-auto-detect.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-auto-detect.xml
@@ -18,7 +18,7 @@
</disk>
<controller type='scsi' index='0'/>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-device.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-device.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-device.xml
@@ -18,7 +18,7 @@
</disk>
<controller type='scsi' index='0'/>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-datacenterpath.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-datacenterpath.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-datacenterpath.xml
@@ -12,7 +12,7 @@
<on_crash>destroy</on_crash>
<devices>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
<vmware:datacenterpath>folder1/folder2/datacenter1</vmware:datacenterpath>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.xml
@@ -26,7 +26,7 @@
<source bridge='VM Network'/>
</interface>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-2.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-2.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-2.xml
@@ -53,7 +53,7 @@
<model type='vlance'/>
</interface>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-3.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-3.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-3.xml
@@ -35,7 +35,7 @@
<source bridge='VM Network'/>
</interface>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-4.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-4.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-4.xml
@@ -42,7 +42,7 @@
<target type='serial' port='0'/>
</console>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml
@@ -37,7 +37,7 @@
<model type='e1000'/>
</interface>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-6.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-6.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-6.xml
@@ -30,7 +30,7 @@
<model type='vmxnet3'/>
</interface>
<video>
- <model type='vmvga' vram='8192'/>
+ <model type='vmvga' vram='8192' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-7.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-7.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-7.xml
@@ -29,7 +29,7 @@
<model type='vmxnet3'/>
</interface>
<video>
- <model type='vmvga' vram='8192'/>
+ <model type='vmvga' vram='8192' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-ethernet-bridged.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-ethernet-bridged.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-ethernet-bridged.xml
@@ -16,7 +16,7 @@
<source bridge='VM Network'/>
</interface>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-ethernet-custom.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-ethernet-custom.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-ethernet-custom.xml
@@ -17,7 +17,7 @@
<target dev='vmnet7'/>
</interface>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-ethernet-e1000.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-ethernet-e1000.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-ethernet-e1000.xml
@@ -17,7 +17,7 @@
<model type='e1000'/>
</interface>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-ethernet-generated.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-ethernet-generated.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-ethernet-generated.xml
@@ -16,7 +16,7 @@
<source bridge='VM Network'/>
</interface>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-ethernet-nat.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-ethernet-nat.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-ethernet-nat.xml
@@ -15,7 +15,7 @@
<mac address='00:50:56:11:22:33'/>
</interface>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-ethernet-other.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-ethernet-other.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-ethernet-other.xml
@@ -16,7 +16,7 @@
<source bridge='VM Network'/>
</interface>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-ethernet-static.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-ethernet-static.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-ethernet-static.xml
@@ -16,7 +16,7 @@
<source bridge='VM Network'/>
</interface>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.xml
@@ -17,7 +17,7 @@
<model type='vmxnet2'/>
</interface>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-ethernet-vpx.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-ethernet-vpx.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-ethernet-vpx.xml
@@ -16,7 +16,7 @@
<source bridge='VM Network'/>
</interface>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-floppy-device.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-floppy-device.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-floppy-device.xml
@@ -18,7 +18,7 @@
</disk>
<controller type='fdc' index='0'/>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-floppy-file.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-floppy-file.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-floppy-file.xml
@@ -23,7 +23,7 @@
</disk>
<controller type='fdc' index='0'/>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.xml
@@ -33,7 +33,7 @@
<source bridge=''/>
</interface>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-graphics-vnc.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-graphics-vnc.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-graphics-vnc.xml
@@ -13,7 +13,7 @@
<devices>
<graphics type='vnc' port='5903' autoport='no' keymap='de' passwd='password'/>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-1.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-1.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-1.xml
@@ -24,7 +24,7 @@
<target dev='/dev/vmnet1'/>
</interface>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-2.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-2.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-2.xml
@@ -24,7 +24,7 @@
<target dev='/dev/vmnet1'/>
</interface>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-3.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-3.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-3.xml
@@ -29,7 +29,7 @@
<target dev='/dev/vmnet2'/>
</interface>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-4.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-4.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-4.xml
@@ -24,7 +24,7 @@
<target dev='/dev/vmnet2'/>
</interface>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-harddisk-ide-file.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-harddisk-ide-file.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-harddisk-ide-file.xml
@@ -18,7 +18,7 @@
</disk>
<controller type='ide' index='0'/>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-harddisk-scsi-file.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-harddisk-scsi-file.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-harddisk-scsi-file.xml
@@ -18,7 +18,7 @@
</disk>
<controller type='scsi' index='0'/>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-harddisk-transient.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-harddisk-transient.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-harddisk-transient.xml
@@ -19,7 +19,7 @@
</disk>
<controller type='ide' index='0'/>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-minimal-64bit.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-minimal-64bit.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-minimal-64bit.xml
@@ -12,7 +12,7 @@
<on_crash>destroy</on_crash>
<devices>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-minimal.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-minimal.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-minimal.xml
@@ -12,7 +12,7 @@
<on_crash>destroy</on_crash>
<devices>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-parallel-device.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-parallel-device.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-parallel-device.xml
@@ -16,7 +16,7 @@
<target port='0'/>
</parallel>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-parallel-file.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-parallel-file.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-parallel-file.xml
@@ -16,7 +16,7 @@
<target port='0'/>
</parallel>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-scsi-driver.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-scsi-driver.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-scsi-driver.xml
@@ -36,7 +36,7 @@
<controller type='scsi' index='2' model='lsisas1068'/>
<controller type='scsi' index='3' model='vmpvscsi'/>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-scsi-writethrough.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-scsi-writethrough.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-scsi-writethrough.xml
@@ -19,7 +19,7 @@
</disk>
<controller type='scsi' index='0' model='buslogic'/>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-serial-device.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-serial-device.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-serial-device.xml
@@ -24,7 +24,7 @@
<target type='serial' port='0'/>
</console>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-serial-file.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-serial-file.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-serial-file.xml
@@ -20,7 +20,7 @@
<target type='serial' port='0'/>
</console>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-serial-network-client.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-serial-network-client.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-serial-network-client.xml
@@ -22,7 +22,7 @@
<target type='serial' port='0'/>
</console>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-serial-network-server.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-serial-network-server.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-serial-network-server.xml
@@ -22,7 +22,7 @@
<target type='serial' port='0'/>
</console>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-serial-pipe.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-serial-pipe.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-serial-pipe.xml
@@ -20,7 +20,7 @@
<target type='serial' port='0'/>
</console>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-sharedfolder.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-sharedfolder.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-sharedfolder.xml
@@ -16,7 +16,7 @@
<target dir='shared'/>
</filesystem>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-smbios.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-smbios.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-smbios.xml
@@ -13,7 +13,7 @@
<on_crash>destroy</on_crash>
<devices>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-svga.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-svga.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-svga.xml
@@ -12,7 +12,7 @@
<on_crash>destroy</on_crash>
<devices>
<video>
- <model type='vmvga' vram='8192'/>
+ <model type='vmvga' vram='8192' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-1.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-1.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-1.xml
@@ -29,7 +29,7 @@
<model type='e1000'/>
</interface>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>
Index: libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-2.xml
===================================================================
--- libvirt-1.3.3.orig/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-2.xml
+++ libvirt-1.3.3/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-2.xml
@@ -30,7 +30,7 @@
<model type='e1000'/>
</interface>
<video>
- <model type='vmvga' vram='4096'/>
+ <model type='vmvga' vram='4096' primary='yes'/>
</video>
</devices>
</domain>

6
apparmor-fixes.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.3.3/examples/apparmor/libvirt-qemu Index: libvirt-1.3.4/examples/apparmor/libvirt-qemu
=================================================================== ===================================================================
--- libvirt-1.3.3.orig/examples/apparmor/libvirt-qemu --- libvirt-1.3.4.orig/examples/apparmor/libvirt-qemu
+++ libvirt-1.3.3/examples/apparmor/libvirt-qemu +++ libvirt-1.3.4/examples/apparmor/libvirt-qemu
@@ -143,6 +143,9 @@ @@ -143,6 +143,9 @@
# for restore # for restore
/bin/bash rmix, /bin/bash rmix,

6
apparmor-no-mount.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.3.3/examples/apparmor/libvirt-lxc Index: libvirt-1.3.4/examples/apparmor/libvirt-lxc
=================================================================== ===================================================================
--- libvirt-1.3.3.orig/examples/apparmor/libvirt-lxc --- libvirt-1.3.4.orig/examples/apparmor/libvirt-lxc
+++ libvirt-1.3.3/examples/apparmor/libvirt-lxc +++ libvirt-1.3.4/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.3.3/src/qemu/qemu_driver.c Index: libvirt-1.3.4/src/qemu/qemu_driver.c
=================================================================== ===================================================================
--- libvirt-1.3.3.orig/src/qemu/qemu_driver.c --- libvirt-1.3.4.orig/src/qemu/qemu_driver.c
+++ libvirt-1.3.3/src/qemu/qemu_driver.c +++ libvirt-1.3.4/src/qemu/qemu_driver.c
@@ -16763,6 +16763,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt @@ -16796,6 +16796,15 @@ qemuDomainBlockCopyCommon(virDomainObjPt
_("non-file destination not supported yet")); _("non-file destination not supported yet"));
goto endjob; goto endjob;
} }

3
libvirt-1.3.3.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:99603b8dba574bc592673fdf5c77e96cf5221e21104ab0477efeb8aba133858f
size 30272467

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

@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iEYEABECAAYFAlcEuZkACgkQRga4pd6VvB95LwCffa1in0su2UqPvFg/WeuNA/6W
STQAn2v+qsxw4VEbOVFgZo6zDf49RYYO
=z+cN
-----END PGP SIGNATURE-----

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

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

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

@ -0,0 +1,7 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iEYEABECAAYFAlclYEcACgkQRga4pd6VvB/HJQCgizqtyrYwlDuQFmBEEl6eKeeN
TBIAoIEqYhNYMPdI+JVwL7bVphzi3yFE
=deea
-----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.3.3/tools/libvirt-guests.init.in Index: libvirt-1.3.4/tools/libvirt-guests.init.in
=================================================================== ===================================================================
--- libvirt-1.3.3.orig/tools/libvirt-guests.init.in --- libvirt-1.3.4.orig/tools/libvirt-guests.init.in
+++ libvirt-1.3.3/tools/libvirt-guests.init.in +++ libvirt-1.3.4/tools/libvirt-guests.init.in
@@ -4,27 +4,27 @@ @@ -4,27 +4,27 @@
# http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/initscrcomconv.html # http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/initscrcomconv.html
# #
@ -45,10 +45,10 @@ Index: libvirt-1.3.3/tools/libvirt-guests.init.in
# #
exec @libexecdir@/libvirt-guests.sh "$@" exec @libexecdir@/libvirt-guests.sh "$@"
Index: libvirt-1.3.3/tools/libvirt-guests.sh.in Index: libvirt-1.3.4/tools/libvirt-guests.sh.in
=================================================================== ===================================================================
--- libvirt-1.3.3.orig/tools/libvirt-guests.sh.in --- libvirt-1.3.4.orig/tools/libvirt-guests.sh.in
+++ libvirt-1.3.3/tools/libvirt-guests.sh.in +++ libvirt-1.3.4/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/>.
@ -208,10 +208,10 @@ Index: libvirt-1.3.3/tools/libvirt-guests.sh.in
esac esac
-exit $RETVAL -exit $RETVAL
+rc_exit +rc_exit
Index: libvirt-1.3.3/tools/libvirt-guests.sysconf Index: libvirt-1.3.4/tools/libvirt-guests.sysconf
=================================================================== ===================================================================
--- libvirt-1.3.3.orig/tools/libvirt-guests.sysconf --- libvirt-1.3.4.orig/tools/libvirt-guests.sysconf
+++ libvirt-1.3.3/tools/libvirt-guests.sysconf +++ libvirt-1.3.4/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.3.3/src/cpu/cpu_map.xml Index: libvirt-1.3.4/src/cpu/cpu_map.xml
=================================================================== ===================================================================
--- libvirt-1.3.3.orig/src/cpu/cpu_map.xml --- libvirt-1.3.4.orig/src/cpu/cpu_map.xml
+++ libvirt-1.3.3/src/cpu/cpu_map.xml +++ libvirt-1.3.4/src/cpu/cpu_map.xml
@@ -1424,6 +1424,16 @@ @@ -1424,6 +1424,16 @@
<pvr value='0x004d0000' mask='0xffff0000'/> <pvr value='0x004d0000' mask='0xffff0000'/>
</model> </model>

46
libvirt-suse-netcontrol.patch
View File

@ -1,8 +1,8 @@
Index: libvirt-1.3.3/configure.ac Index: libvirt-1.3.4/configure.ac
=================================================================== ===================================================================
--- libvirt-1.3.3.orig/configure.ac --- libvirt-1.3.4.orig/configure.ac
+++ libvirt-1.3.3/configure.ac +++ libvirt-1.3.4/configure.ac
@@ -246,6 +246,7 @@ LIBVIRT_CHECK_FUSE @@ -248,6 +248,7 @@ LIBVIRT_CHECK_FUSE
LIBVIRT_CHECK_GLUSTER LIBVIRT_CHECK_GLUSTER
LIBVIRT_CHECK_HAL LIBVIRT_CHECK_HAL
LIBVIRT_CHECK_NETCF LIBVIRT_CHECK_NETCF
@ -10,7 +10,7 @@ Index: libvirt-1.3.3/configure.ac
LIBVIRT_CHECK_NUMACTL LIBVIRT_CHECK_NUMACTL
LIBVIRT_CHECK_OPENWSMAN LIBVIRT_CHECK_OPENWSMAN
LIBVIRT_CHECK_PCIACCESS LIBVIRT_CHECK_PCIACCESS
@@ -2450,11 +2451,12 @@ if test "$with_libvirtd" = "no" ; then @@ -2470,11 +2471,12 @@ if test "$with_libvirtd" = "no" ; then
with_interface=no with_interface=no
fi fi
@ -26,7 +26,7 @@ Index: libvirt-1.3.3/configure.ac
esac esac
if test "$with_interface" = "yes" ; then if test "$with_interface" = "yes" ; then
@@ -2833,6 +2835,7 @@ LIBVIRT_RESULT_FUSE @@ -2853,6 +2855,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.3.3/configure.ac
LIBVIRT_RESULT_NUMACTL LIBVIRT_RESULT_NUMACTL
LIBVIRT_RESULT_OPENWSMAN LIBVIRT_RESULT_OPENWSMAN
LIBVIRT_RESULT_PCIACCESS LIBVIRT_RESULT_PCIACCESS
Index: libvirt-1.3.3/src/Makefile.am Index: libvirt-1.3.4/src/Makefile.am
=================================================================== ===================================================================
--- libvirt-1.3.3.orig/src/Makefile.am --- libvirt-1.3.4.orig/src/Makefile.am
+++ libvirt-1.3.3/src/Makefile.am +++ libvirt-1.3.4/src/Makefile.am
@@ -930,6 +930,10 @@ if WITH_NETCF @@ -932,6 +932,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.3.3/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
@@ -1555,6 +1559,10 @@ if WITH_NETCF @@ -1579,6 +1583,10 @@ 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)
endif WITH_NETCF endif WITH_NETCF
@ -60,11 +60,11 @@ Index: libvirt-1.3.3/src/Makefile.am
if WITH_UDEV if WITH_UDEV
libvirt_driver_interface_la_CFLAGS += $(UDEV_CFLAGS) libvirt_driver_interface_la_CFLAGS += $(UDEV_CFLAGS)
libvirt_driver_interface_la_LIBADD += $(UDEV_LIBS) libvirt_driver_interface_la_LIBADD += $(UDEV_LIBS)
Index: libvirt-1.3.3/tools/virsh.c Index: libvirt-1.3.4/tools/virsh.c
=================================================================== ===================================================================
--- libvirt-1.3.3.orig/tools/virsh.c --- libvirt-1.3.4.orig/tools/virsh.c
+++ libvirt-1.3.3/tools/virsh.c +++ libvirt-1.3.4/tools/virsh.c
@@ -620,6 +620,8 @@ virshShowVersion(vshControl *ctl ATTRIBU @@ -623,6 +623,8 @@ virshShowVersion(vshControl *ctl ATTRIBU
vshPrint(ctl, " Interface"); vshPrint(ctl, " Interface");
# if defined(WITH_NETCF) # if defined(WITH_NETCF)
vshPrint(ctl, " netcf"); vshPrint(ctl, " netcf");
@ -73,10 +73,10 @@ Index: libvirt-1.3.3/tools/virsh.c
# elif defined(WITH_UDEV) # elif defined(WITH_UDEV)
vshPrint(ctl, " udev"); vshPrint(ctl, " udev");
# endif # endif
Index: libvirt-1.3.3/src/interface/interface_backend_netcf.c Index: libvirt-1.3.4/src/interface/interface_backend_netcf.c
=================================================================== ===================================================================
--- libvirt-1.3.3.orig/src/interface/interface_backend_netcf.c --- libvirt-1.3.4.orig/src/interface/interface_backend_netcf.c
+++ libvirt-1.3.3/src/interface/interface_backend_netcf.c +++ libvirt-1.3.4/src/interface/interface_backend_netcf.c
@@ -23,7 +23,12 @@ @@ -23,7 +23,12 @@
#include <config.h> #include <config.h>
@ -160,10 +160,10 @@ Index: libvirt-1.3.3/src/interface/interface_backend_netcf.c
if (virSetSharedInterfaceDriver(&interfaceDriver) < 0) if (virSetSharedInterfaceDriver(&interfaceDriver) < 0)
return -1; return -1;
if (virRegisterStateDriver(&interfaceStateDriver) < 0) if (virRegisterStateDriver(&interfaceStateDriver) < 0)
Index: libvirt-1.3.3/src/interface/interface_driver.c Index: libvirt-1.3.4/src/interface/interface_driver.c
=================================================================== ===================================================================
--- libvirt-1.3.3.orig/src/interface/interface_driver.c --- libvirt-1.3.4.orig/src/interface/interface_driver.c
+++ libvirt-1.3.3/src/interface/interface_driver.c +++ libvirt-1.3.4/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;
@ -181,10 +181,10 @@ Index: libvirt-1.3.3/src/interface/interface_driver.c
if (udevIfaceRegister() == 0) if (udevIfaceRegister() == 0)
return 0; return 0;
#endif /* WITH_UDEV */ #endif /* WITH_UDEV */
Index: libvirt-1.3.3/m4/virt-netcontrol.m4 Index: libvirt-1.3.4/m4/virt-netcontrol.m4
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ libvirt-1.3.3/m4/virt-netcontrol.m4 +++ libvirt-1.3.4/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 @@
-------------------------------------------------------------------
Tue May 3 02:26:32 UTC 2016 - jfehlig@suse.com
- Update to libvirt 1.3.4
- Add support for migration data compression in QEMU driver
- Drop libvirtd.socket
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches: 216650f1-libxl-build-fix.patch,
6d8b6d28-mark-implicit-video-primary.patch,
03e8d5fb-qemu-perf-memory-corruption.patch,
libvirtd-systemd-socket.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Apr 18 21:32:37 UTC 2016 - jfehlig@suse.com Mon Apr 18 21:32:37 UTC 2016 - jfehlig@suse.com

25
libvirt.spec
View File

@ -246,7 +246,7 @@
Name: libvirt Name: libvirt
Url: http://libvirt.org/ Url: http://libvirt.org/
Version: 1.3.3 Version: 1.3.4
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+
@ -450,8 +450,6 @@ BuildRequires: qemu-tools
%endif %endif
%endif %endif
%global systemd_version %(pkg-config --modversion systemd)
Source0: %{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz
Source1: %{name}-%{version}.tar.gz.asc Source1: %{name}-%{version}.tar.gz.asc
Source2: %{name}.keyring Source2: %{name}.keyring
@ -460,9 +458,6 @@ Source4: libvirtd-relocation-server.fw
Source99: baselibs.conf Source99: baselibs.conf
Source100: %{name}-rpmlintrc Source100: %{name}-rpmlintrc
# Upstream patches # Upstream patches
Patch0: 216650f1-libxl-build-fix.patch
Patch1: 6d8b6d28-mark-implicit-video-primary.patch
Patch2: 03e8d5fb-qemu-perf-memory-corruption.patch
# Patches pending upstream review # Patches pending upstream review
# Need to go upstream # Need to go upstream
Patch150: xen-pv-cdrom.patch Patch150: xen-pv-cdrom.patch
@ -486,11 +481,6 @@ Patch211: qemu-apparmor-screenshot.patch
Patch212: libvirt-suse-netcontrol.patch Patch212: libvirt-suse-netcontrol.patch
Patch213: lxc-wait-after-eth-del.patch Patch213: lxc-wait-after-eth-del.patch
Patch214: libxl-qemu-emulator-caps.patch Patch214: libxl-qemu-emulator-caps.patch
# SocketUser and SocketGroup settings were added to systemd.socket in
# version 214. Patch the setting away in earlier systemd
%if 0%{systemd_version} < 214
Patch300: libvirtd-systemd-socket.patch
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
@ -991,9 +981,6 @@ libvirt plugin for NSS for translating domain names into IP addresses.
%prep %prep
%setup -q %setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch150 -p1 %patch150 -p1
%patch151 -p1 %patch151 -p1
%patch152 -p1 %patch152 -p1
@ -1014,9 +1001,6 @@ libvirt plugin for NSS for translating domain names into IP addresses.
%patch212 -p1 %patch212 -p1
%patch213 -p1 %patch213 -p1
%patch214 -p1 %patch214 -p1
%if 0%{systemd_version} < 214
%patch300 -p1
%endif
%build %build
%if ! %{with_xen} %if ! %{with_xen}
@ -1423,7 +1407,7 @@ fi
%pre daemon %pre daemon
%if %{with_systemd} %if %{with_systemd}
%service_add_pre libvirtd.service libvirtd.socket %service_add_pre libvirtd.service
%service_add_pre virtlockd.service virtlockd.socket %service_add_pre virtlockd.service virtlockd.socket
%service_add_pre virtlogd.service virtlogd.socket %service_add_pre virtlogd.service virtlogd.socket
%endif %endif
@ -1433,7 +1417,7 @@ fi
%post daemon %post daemon
/sbin/ldconfig /sbin/ldconfig
%if %{with_systemd} %if %{with_systemd}
%service_add_post libvirtd.service libvirtd.socket %service_add_post libvirtd.service
%service_add_post virtlockd.service virtlockd.socket %service_add_post virtlockd.service virtlockd.socket
%service_add_post virtlogd.service virtlogd.socket %service_add_post virtlogd.service virtlogd.socket
%endif %endif
@ -1443,7 +1427,7 @@ fi
%preun daemon %preun daemon
%if %{with_systemd} %if %{with_systemd}
%service_del_preun libvirtd.service libvirtd.socket %service_del_preun libvirtd.service
%service_del_preun virtlockd.service virtlockd.socket %service_del_preun virtlockd.service virtlockd.socket
%service_del_preun virtlogd.service virtlogd.socket %service_del_preun virtlogd.service virtlogd.socket
%else %else
@ -1568,7 +1552,6 @@ fi
%{_localstatedir}/adm/fillup-templates/sysconfig.virtlockd %{_localstatedir}/adm/fillup-templates/sysconfig.virtlockd
%if %{with_systemd} %if %{with_systemd}
%{_unitdir}/libvirtd.service %{_unitdir}/libvirtd.service
%{_unitdir}/libvirtd.socket
%{_unitdir}/virtlogd.service %{_unitdir}/virtlogd.service
%{_unitdir}/virtlogd.socket %{_unitdir}/virtlogd.socket
%{_unitdir}/virtlockd.service %{_unitdir}/virtlockd.service

18
libvirtd-defaults.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.3.3/daemon/libvirtd.conf Index: libvirt-1.3.4/daemon/libvirtd.conf
=================================================================== ===================================================================
--- libvirt-1.3.3.orig/daemon/libvirtd.conf --- libvirt-1.3.4.orig/daemon/libvirtd.conf
+++ libvirt-1.3.3/daemon/libvirtd.conf +++ libvirt-1.3.4/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.3.3/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.3.3/daemon/libvirtd-config.c Index: libvirt-1.3.4/daemon/libvirtd-config.c
=================================================================== ===================================================================
--- libvirt-1.3.3.orig/daemon/libvirtd-config.c --- libvirt-1.3.4.orig/daemon/libvirtd-config.c
+++ libvirt-1.3.3/daemon/libvirtd-config.c +++ libvirt-1.3.4/daemon/libvirtd-config.c
@@ -242,7 +242,7 @@ daemonConfigNew(bool privileged ATTRIBUT @@ -242,7 +242,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.3.3/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.3.3/daemon/test_libvirtd.aug.in Index: libvirt-1.3.4/daemon/test_libvirtd.aug.in
=================================================================== ===================================================================
--- libvirt-1.3.3.orig/daemon/test_libvirtd.aug.in --- libvirt-1.3.4.orig/daemon/test_libvirtd.aug.in
+++ libvirt-1.3.3/daemon/test_libvirtd.aug.in +++ libvirt-1.3.4/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.3.3/daemon/libvirtd.sysconf Index: libvirt-1.3.4/daemon/libvirtd.sysconf
=================================================================== ===================================================================
--- libvirt-1.3.3.orig/daemon/libvirtd.sysconf --- libvirt-1.3.4.orig/daemon/libvirtd.sysconf
+++ libvirt-1.3.3/daemon/libvirtd.sysconf +++ libvirt-1.3.4/daemon/libvirtd.sysconf
@@ -1,16 +1,25 @@ @@ -1,16 +1,25 @@
+## Path: System/Virtualization/libvirt +## Path: System/Virtualization/libvirt
+ +

28
libvirtd-systemd-socket.patch
View File

@ -1,28 +0,0 @@
Remove unsupported systemd.socket settings
The libvirtd.socket unit file contains SocketUser and SocketGroup
settings that were introduced in systemd version 214. Remove the
setting to prevent unnecessary and confusing journal entries such
as
Unknown lvalue 'SocketGroup' in section 'Socket'
See bsc#933043
Index: libvirt-1.3.3/daemon/libvirtd.socket.in
===================================================================
--- libvirt-1.3.3.orig/daemon/libvirtd.socket.in
+++ libvirt-1.3.3/daemon/libvirtd.socket.in
@@ -2,10 +2,8 @@
ListenStream=@runstatedir@/libvirt/libvirt-sock
ListenStream=@runstatedir@/libvirt/libvirt-sock-ro
-; The following settings must match libvirtd.conf file in order to
-; work as expected because libvirtd can't change them later.
+; The following setting must match libvirtd.conf file in order to
+; work as expected because libvirtd can't change it later.
; SocketMode=0777 is safe only if authentication on the socket is set
; up. For further information, please see the libvirtd.conf file.
SocketMode=0777
-SocketUser=root
-SocketGroup=root

6
libxl-qemu-emulator-caps.patch
View File

@ -8,10 +8,10 @@ as the default <emulator>, instead of the qemu-xen one.
See FATE#320638 for details. See FATE#320638 for details.
Index: libvirt-1.3.3/src/libxl/libxl_conf.c Index: libvirt-1.3.4/src/libxl/libxl_conf.c
=================================================================== ===================================================================
--- libvirt-1.3.3.orig/src/libxl/libxl_conf.c --- libvirt-1.3.4.orig/src/libxl/libxl_conf.c
+++ libvirt-1.3.3/src/libxl/libxl_conf.c +++ libvirt-1.3.4/src/libxl/libxl_conf.c
@@ -439,7 +439,7 @@ libxlCapsInitGuests(libxl_ctx *ctx, virC @@ -439,7 +439,7 @@ libxlCapsInitGuests(libxl_ctx *ctx, virC
if ((guest = virCapabilitiesAddGuest(caps, if ((guest = virCapabilitiesAddGuest(caps,
guest_archs[i].hvm ? VIR_DOMAIN_OSTYPE_HVM : VIR_DOMAIN_OSTYPE_XEN, guest_archs[i].hvm ? VIR_DOMAIN_OSTYPE_HVM : VIR_DOMAIN_OSTYPE_XEN,

12
libxl-support-block-script.patch
View File

@ -7,10 +7,10 @@ and npiv.
For more details, see bsc#954872 and FATE#319810 For more details, see bsc#954872 and FATE#319810
Index: libvirt-1.3.3/src/libxl/libxl_conf.c Index: libvirt-1.3.4/src/libxl/libxl_conf.c
=================================================================== ===================================================================
--- libvirt-1.3.3.orig/src/libxl/libxl_conf.c --- libvirt-1.3.4.orig/src/libxl/libxl_conf.c
+++ libvirt-1.3.3/src/libxl/libxl_conf.c +++ libvirt-1.3.4/src/libxl/libxl_conf.c
@@ -905,6 +905,25 @@ libxlDiskSetDiscard(libxl_device_disk *x @@ -905,6 +905,25 @@ libxlDiskSetDiscard(libxl_device_disk *x
} }
@ -37,7 +37,7 @@ Index: libvirt-1.3.3/src/libxl/libxl_conf.c
#define LIBXL_QEMU_DM_STR "Options specific to the Xen version:" #define LIBXL_QEMU_DM_STR "Options specific to the Xen version:"
int int
@@ -1122,6 +1141,7 @@ libxlMakeNetworkDiskSrc(virStorageSource @@ -1052,6 +1071,7 @@ libxlMakeNetworkDiskSrc(virStorageSource
int int
libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk) libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk)
{ {
@ -45,7 +45,7 @@ Index: libvirt-1.3.3/src/libxl/libxl_conf.c
const char *driver; const char *driver;
int format; int format;
int actual_type = virStorageSourceGetActualType(l_disk->src); int actual_type = virStorageSourceGetActualType(l_disk->src);
@@ -1132,7 +1152,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk @@ -1062,7 +1082,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
if (libxlMakeNetworkDiskSrc(l_disk->src, &x_disk->pdev_path) < 0) if (libxlMakeNetworkDiskSrc(l_disk->src, &x_disk->pdev_path) < 0)
return -1; return -1;
} else { } else {
@ -54,7 +54,7 @@ Index: libvirt-1.3.3/src/libxl/libxl_conf.c
return -1; return -1;
} }
@@ -1241,6 +1261,9 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk @@ -1171,6 +1191,9 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
x_disk->is_cdrom = l_disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM ? 1 : 0; x_disk->is_cdrom = l_disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM ? 1 : 0;
if (libxlDiskSetDiscard(x_disk, l_disk->discard) < 0) if (libxlDiskSetDiscard(x_disk, l_disk->discard) < 0)
return -1; return -1;

24
lxc-wait-after-eth-del.patch
View File

@ -13,11 +13,11 @@ device with the same name that is being created.
src/lxc/lxc_process.c | 1 + src/lxc/lxc_process.c | 1 +
3 files changed, 4 insertions(+) 3 files changed, 4 insertions(+)
Index: libvirt-1.3.3/src/lxc/lxc_controller.c Index: libvirt-1.3.4/src/lxc/lxc_controller.c
=================================================================== ===================================================================
--- libvirt-1.3.3.orig/src/lxc/lxc_controller.c --- libvirt-1.3.4.orig/src/lxc/lxc_controller.c
+++ libvirt-1.3.3/src/lxc/lxc_controller.c +++ libvirt-1.3.4/src/lxc/lxc_controller.c
@@ -2002,6 +2002,7 @@ static int virLXCControllerDeleteInterfa @@ -2009,6 +2009,7 @@ static int virLXCControllerDeleteInterfa
if (virNetDevVethDelete(ctrl->veths[i]) < 0) if (virNetDevVethDelete(ctrl->veths[i]) < 0)
ret = -1; ret = -1;
} }
@ -25,11 +25,11 @@ Index: libvirt-1.3.3/src/lxc/lxc_controller.c
return ret; return ret;
} }
Index: libvirt-1.3.3/src/lxc/lxc_driver.c Index: libvirt-1.3.4/src/lxc/lxc_driver.c
=================================================================== ===================================================================
--- libvirt-1.3.3.orig/src/lxc/lxc_driver.c --- libvirt-1.3.4.orig/src/lxc/lxc_driver.c
+++ libvirt-1.3.3/src/lxc/lxc_driver.c +++ libvirt-1.3.4/src/lxc/lxc_driver.c
@@ -4261,6 +4261,7 @@ lxcDomainAttachDeviceNetLive(virConnectP @@ -4268,6 +4268,7 @@ lxcDomainAttachDeviceNetLive(virConnectP
case VIR_DOMAIN_NET_TYPE_BRIDGE: case VIR_DOMAIN_NET_TYPE_BRIDGE:
case VIR_DOMAIN_NET_TYPE_NETWORK: case VIR_DOMAIN_NET_TYPE_NETWORK:
ignore_value(virNetDevVethDelete(veth)); ignore_value(virNetDevVethDelete(veth));
@ -37,7 +37,7 @@ Index: libvirt-1.3.3/src/lxc/lxc_driver.c
break; break;
case VIR_DOMAIN_NET_TYPE_DIRECT: case VIR_DOMAIN_NET_TYPE_DIRECT:
@@ -4689,6 +4690,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb @@ -4696,6 +4697,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb
virDomainAuditNet(vm, detach, NULL, "detach", false); virDomainAuditNet(vm, detach, NULL, "detach", false);
goto cleanup; goto cleanup;
} }
@ -45,10 +45,10 @@ Index: libvirt-1.3.3/src/lxc/lxc_driver.c
break; break;
/* It'd be nice to support this, but with macvlan /* It'd be nice to support this, but with macvlan
Index: libvirt-1.3.3/src/lxc/lxc_process.c Index: libvirt-1.3.4/src/lxc/lxc_process.c
=================================================================== ===================================================================
--- libvirt-1.3.3.orig/src/lxc/lxc_process.c --- libvirt-1.3.4.orig/src/lxc/lxc_process.c
+++ libvirt-1.3.3/src/lxc/lxc_process.c +++ libvirt-1.3.4/src/lxc/lxc_process.c
@@ -221,6 +221,7 @@ static void virLXCProcessCleanup(virLXCD @@ -221,6 +221,7 @@ static void virLXCProcessCleanup(virLXCD
} }
networkReleaseActualDevice(vm->def, iface); networkReleaseActualDevice(vm->def, iface);

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.3.3/src/util/virarch.c Index: libvirt-1.3.4/src/util/virarch.c
=================================================================== ===================================================================
--- libvirt-1.3.3.orig/src/util/virarch.c --- libvirt-1.3.4.orig/src/util/virarch.c
+++ libvirt-1.3.3/src/util/virarch.c +++ libvirt-1.3.4/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")) {

6
qemu-apparmor-screenshot.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.3.3/examples/apparmor/libvirt-qemu Index: libvirt-1.3.4/examples/apparmor/libvirt-qemu
=================================================================== ===================================================================
--- libvirt-1.3.3.orig/examples/apparmor/libvirt-qemu --- libvirt-1.3.4.orig/examples/apparmor/libvirt-qemu
+++ libvirt-1.3.3/examples/apparmor/libvirt-qemu +++ libvirt-1.3.4/examples/apparmor/libvirt-qemu
@@ -152,6 +152,9 @@ @@ -152,6 +152,9 @@
/sys/bus/ r, /sys/bus/ r,
/sys/class/ r, /sys/class/ r,

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.3.3/src/xenconfig/xen_common.c Index: libvirt-1.3.4/src/xenconfig/xen_common.c
=================================================================== ===================================================================
--- libvirt-1.3.3.orig/src/xenconfig/xen_common.c --- libvirt-1.3.4.orig/src/xenconfig/xen_common.c
+++ libvirt-1.3.3/src/xenconfig/xen_common.c +++ libvirt-1.3.4/src/xenconfig/xen_common.c
@@ -394,6 +394,8 @@ xenParsePCI(virConfPtr conf, virDomainDe @@ -394,6 +394,8 @@ xenParsePCI(virConfPtr conf, virDomainDe
{ {
virConfValuePtr list = virConfGetValue(conf, "pci"); virConfValuePtr list = virConfGetValue(conf, "pci");
@ -66,10 +66,10 @@ Index: libvirt-1.3.3/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.3.3/src/xenconfig/xen_sxpr.c Index: libvirt-1.3.4/src/xenconfig/xen_sxpr.c
=================================================================== ===================================================================
--- libvirt-1.3.3.orig/src/xenconfig/xen_sxpr.c --- libvirt-1.3.4.orig/src/xenconfig/xen_sxpr.c
+++ libvirt-1.3.3/src/xenconfig/xen_sxpr.c +++ libvirt-1.3.4/src/xenconfig/xen_sxpr.c
@@ -1062,6 +1062,7 @@ xenParseSxprPCI(virDomainDefPtr def, @@ -1062,6 +1062,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.3.3/src/qemu/qemu.conf Index: libvirt-1.3.4/src/qemu/qemu.conf
=================================================================== ===================================================================
--- libvirt-1.3.3.orig/src/qemu/qemu.conf --- libvirt-1.3.4.orig/src/qemu/qemu.conf
+++ libvirt-1.3.3/src/qemu/qemu.conf +++ libvirt-1.3.4/src/qemu/qemu.conf
@@ -201,11 +201,20 @@ @@ -201,11 +201,20 @@
# isolation, but it cannot appear in a list of drivers. # isolation, but it cannot appear in a list of drivers.
# #

8
systemd-service-xen.patch
View File

@ -1,8 +1,8 @@
Index: libvirt-1.3.3/daemon/libvirtd.service.in Index: libvirt-1.3.4/daemon/libvirtd.service.in
=================================================================== ===================================================================
--- libvirt-1.3.3.orig/daemon/libvirtd.service.in --- libvirt-1.3.4.orig/daemon/libvirtd.service.in
+++ libvirt-1.3.3/daemon/libvirtd.service.in +++ libvirt-1.3.4/daemon/libvirtd.service.in
@@ -7,6 +7,7 @@ After=iscsid.service @@ -12,6 +12,7 @@ After=iscsid.service
After=apparmor.service After=apparmor.service
After=local-fs.target After=local-fs.target
After=remote-fs.target After=remote-fs.target

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.3.3/src/locking/virtlockd.sysconf Index: libvirt-1.3.4/src/locking/virtlockd.sysconf
=================================================================== ===================================================================
--- libvirt-1.3.3.orig/src/locking/virtlockd.sysconf --- libvirt-1.3.4.orig/src/locking/virtlockd.sysconf
+++ libvirt-1.3.3/src/locking/virtlockd.sysconf +++ libvirt-1.3.4/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.3.3/src/locking/virtlockd.sysconf
# #
# Pass extra arguments to virtlockd # Pass extra arguments to virtlockd
#VIRTLOCKD_ARGS= #VIRTLOCKD_ARGS=
Index: libvirt-1.3.3/src/locking/virtlockd.init.in Index: libvirt-1.3.4/src/locking/virtlockd.init.in
=================================================================== ===================================================================
--- libvirt-1.3.3.orig/src/locking/virtlockd.init.in --- libvirt-1.3.4.orig/src/locking/virtlockd.init.in
+++ libvirt-1.3.3/src/locking/virtlockd.init.in +++ libvirt-1.3.4/src/locking/virtlockd.init.in
@@ -4,59 +4,57 @@ @@ -4,59 +4,57 @@
# http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/initscrcomconv.html # http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/initscrcomconv.html
# #

12
virtlogd-init-script.patch
View File

@ -1,9 +1,9 @@
Adjust virtlogd init files to conform to SUSE standards Adjust virtlogd init files to conform to SUSE standards
Index: libvirt-1.3.3/src/logging/virtlogd.init.in Index: libvirt-1.3.4/src/logging/virtlogd.init.in
=================================================================== ===================================================================
--- libvirt-1.3.3.orig/src/logging/virtlogd.init.in --- libvirt-1.3.4.orig/src/logging/virtlogd.init.in
+++ libvirt-1.3.3/src/logging/virtlogd.init.in +++ libvirt-1.3.4/src/logging/virtlogd.init.in
@@ -4,59 +4,56 @@ @@ -4,59 +4,56 @@
# http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/initscrcomconv.html # http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/initscrcomconv.html
# #
@ -126,10 +126,10 @@ Index: libvirt-1.3.3/src/logging/virtlogd.init.in
esac esac
-exit $RETVAL -exit $RETVAL
+rc_exit +rc_exit
Index: libvirt-1.3.3/src/logging/virtlogd.sysconf Index: libvirt-1.3.4/src/logging/virtlogd.sysconf
=================================================================== ===================================================================
--- libvirt-1.3.3.orig/src/logging/virtlogd.sysconf --- libvirt-1.3.4.orig/src/logging/virtlogd.sysconf
+++ libvirt-1.3.3/src/logging/virtlogd.sysconf +++ libvirt-1.3.4/src/logging/virtlogd.sysconf
@@ -1,3 +1,7 @@ @@ -1,3 +1,7 @@
+## Path: System/Virtualization/virtlogd +## Path: System/Virtualization/virtlogd
+ +

6
xen-pv-cdrom.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-1.3.3/src/xenconfig/xen_sxpr.c Index: libvirt-1.3.4/src/xenconfig/xen_sxpr.c
=================================================================== ===================================================================
--- libvirt-1.3.3.orig/src/xenconfig/xen_sxpr.c --- libvirt-1.3.4.orig/src/xenconfig/xen_sxpr.c
+++ libvirt-1.3.3/src/xenconfig/xen_sxpr.c +++ libvirt-1.3.4/src/xenconfig/xen_sxpr.c
@@ -392,7 +392,7 @@ xenParseSxprVifRate(const char *rate, un @@ -392,7 +392,7 @@ xenParseSxprVifRate(const char *rate, un
static int static int
xenParseSxprDisks(virDomainDefPtr def, xenParseSxprDisks(virDomainDefPtr def,

6
xen-sxpr-disk-type.patch
View File

@ -6,10 +6,10 @@ and 'file'. This was implicitly done prior to commit 9673418c.
https://bugzilla.suse.com/show_bug.cgi?id=938228 https://bugzilla.suse.com/show_bug.cgi?id=938228
Index: libvirt-1.3.3/src/xenconfig/xen_sxpr.c Index: libvirt-1.3.4/src/xenconfig/xen_sxpr.c
=================================================================== ===================================================================
--- libvirt-1.3.3.orig/src/xenconfig/xen_sxpr.c --- libvirt-1.3.4.orig/src/xenconfig/xen_sxpr.c
+++ libvirt-1.3.3/src/xenconfig/xen_sxpr.c +++ libvirt-1.3.4/src/xenconfig/xen_sxpr.c
@@ -506,10 +506,11 @@ xenParseSxprDisks(virDomainDefPtr def, @@ -506,10 +506,11 @@ xenParseSxprDisks(virDomainDefPtr def,
omnipotent, we can revisit this, perhaps stat()'ing omnipotent, we can revisit this, perhaps stat()'ing
the src file in question */ the src file in question */