forked from pool/libvirt
803f542a4b
- Update to libvirt 4.0.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
2d07f1f0-fix-storage-crash.patch,
69ed99c7-dom0-persistent.patch,
8599aedd-libvirt-guests-dom0-filter.patch,
0f33025a-virt-aa-helper-handle-more-disk-images.patch,
b475a91b-add-virStringFilterChars-string-utility.patch,
faec1958-lxc-set-hostname-based-on-container-name.patch,
2089ab21-netserver-close-clients-before-stopping-all-drivers.patch,
fix-virt-aa-helper-profile.patch,
suse-apparmor-signal.patch
- Patches added to fix upstream bugs:
72adaf2f-revert-qemu-monitor-error-report.patch,
71d56a39-nodedev-fix-parse-PCI-address.patch
- CVE-2018-5748, CVE-2017-5715, bsc#1071651
OBS-URL: https://build.opensuse.org/request/show/567780
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=661
49 lines
1.7 KiB
Diff
49 lines
1.7 KiB
Diff
https://bugzilla.novell.com/show_bug.cgi?id=879425
|
|
---
|
|
src/libxl/libxl_conf.c | 25 +++++++++++++++++++++++++
|
|
1 file changed, 25 insertions(+)
|
|
|
|
Index: libvirt-4.0.0/src/libxl/libxl_conf.c
|
|
===================================================================
|
|
--- libvirt-4.0.0.orig/src/libxl/libxl_conf.c
|
|
+++ libvirt-4.0.0/src/libxl/libxl_conf.c
|
|
@@ -736,6 +736,30 @@ libxlDiskSetDiscard(libxl_device_disk *x
|
|
#endif
|
|
}
|
|
|
|
+static void
|
|
+libxlDiskSetCacheMode(libxl_device_disk *x_disk, int cachemode)
|
|
+{
|
|
+ switch (cachemode) {
|
|
+#if defined(LIBXL_HAVE_LIBXL_DEVICE_DISK_DISABLE_FLUSH_MAGIC)
|
|
+ case VIR_DOMAIN_DISK_CACHE_UNSAFE:
|
|
+ if (x_disk->readwrite)
|
|
+ x_disk->readwrite = (x_disk->readwrite & LIBXL_HAVE_LIBXL_DEVICE_DISK_DISABLE_FLUSH_MASK) | LIBXL_HAVE_LIBXL_DEVICE_DISK_DISABLE_FLUSH_MAGIC;
|
|
+ break;
|
|
+#endif
|
|
+#if defined(LIBXL_HAVE_DEVICE_DISK_DIRECT_IO_SAFE)
|
|
+ case VIR_DOMAIN_DISK_CACHE_DIRECTSYNC:
|
|
+ x_disk->direct_io_safe = true;
|
|
+ break;
|
|
+#endif
|
|
+ case VIR_DOMAIN_DISK_CACHE_DEFAULT:
|
|
+ case VIR_DOMAIN_DISK_CACHE_DISABLE:
|
|
+ case VIR_DOMAIN_DISK_CACHE_WRITETHRU:
|
|
+ case VIR_DOMAIN_DISK_CACHE_WRITEBACK:
|
|
+ default:
|
|
+ break;
|
|
+ }
|
|
+}
|
|
+
|
|
static char *
|
|
libxlMakeNetworkDiskSrcStr(virStorageSourcePtr src,
|
|
const char *username,
|
|
@@ -984,6 +1008,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
|
|
x_disk->is_cdrom = l_disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM ? 1 : 0;
|
|
if (libxlDiskSetDiscard(x_disk, l_disk->discard) < 0)
|
|
return -1;
|
|
+ libxlDiskSetCacheMode(x_disk, l_disk->cachemode);
|
|
/* An empty CDROM must have the empty format, otherwise libxl fails. */
|
|
if (x_disk->is_cdrom && !x_disk->pdev_path)
|
|
x_disk->format = LIBXL_DISK_FORMAT_EMPTY;
|