forked from pool/libvirt
b495b9f65b
- spec: Enable the same hypervisor drivers for openSUSE and SLE
jsc#SLE-11772
- spec: Enable the same storage drivers for openSUSE and SLE
jsc#SLE-11877
- qemu: Reprobe capabilities if the qemu modules directory changes
2ad009ea-qemu-check-modules-dir.patch
boo#1175320
- Update to libvirt 6.7.0
- jsc#SLE-14253, jsc#SLE-15159
- CVE-2020-14339
- Many incremental improvements and bug fixes, see
https://libvirt.org/news.html
- Dropped patches:
2edd63a0-fix-virFileSetCOW-logic.patch,
82bb167f-dont-cache-devmapper-major.patch,
feb8564a-handle-no-devmapper.patch,
53d9af1e-ignore-devmapper-open-errors.patch,
support-managed-pci-xen-driver.patch,
disable-multipath-pr-tests.patch
OBS-URL: https://build.opensuse.org/request/show/831542
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=840
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-6.7.0/src/libxl/libxl_conf.c
|
|
===================================================================
|
|
--- libvirt-6.7.0.orig/src/libxl/libxl_conf.c
|
|
+++ libvirt-6.7.0/src/libxl/libxl_conf.c
|
|
@@ -912,6 +912,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,
|
|
@@ -1149,6 +1173,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;
|