SHA256
1
0
forked from pool/libvirt
libvirt/libxl-set-cach-mode.patch
James Fehlig 5f197ada50 Accepting request 531808 from home:jfehlig:branches:Virtualization
Updated libvirt package for Factory/TW/SLE15.

- spec: Add dependency to UEFI firmwares since paths are specified
  at build time

- Update to libvirt 3.8.0
  - Many incremental improvements and bug fixes, see
    http://libvirt.org/news.html
  - Dropped patches:
    92bd87a2-ryzen-test-data.patch,
    5c83b360-epyc-test-data.patch,
    a0b62843-epyc-cpu-model.patch,
    f305d8a1-apparmor-attach_disconnected.patch,
    b482925c-apparmor-ptrace-support.patch

- Enable firewalld support for openSUSE >= 42.2

OBS-URL: https://build.opensuse.org/request/show/531808
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=626
2017-10-05 15:49:54 +00:00

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-3.8.0/src/libxl/libxl_conf.c
===================================================================
--- libvirt-3.8.0.orig/src/libxl/libxl_conf.c
+++ libvirt-3.8.0/src/libxl/libxl_conf.c
@@ -646,6 +646,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,
@@ -894,6 +918,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;