forked from pool/libvirt
c5e448dfb3
- Update to libvirt 4.1.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
72adaf2f-revert-qemu-monitor-error-report.patch,
71d56a39-nodedev-fix-parse-PCI-address.patch,
68eed56b-conf-smbios-oem-strings.patch,
76977061-qemu-smbios-oem-strings.patch,
0c710a37-libxl-resume-lock-on-mig-failure.patch,
759b4d1b-virlog-determine-the-hostname-on-startup-CVE-2018-67.patch,
c2dc6698-fix-deadlock-obtaining-hostname.patch,
c391e07e-libxl-clock-settings.patch,
ef71caea-libxl-memalign.patch,
suse-apparmor-signal.patch
OBS-URL: https://build.opensuse.org/request/show/583090
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=674
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.1.0/src/libxl/libxl_conf.c
|
|
===================================================================
|
|
--- libvirt-4.1.0.orig/src/libxl/libxl_conf.c
|
|
+++ libvirt-4.1.0/src/libxl/libxl_conf.c
|
|
@@ -769,6 +769,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,
|
|
@@ -1017,6 +1041,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;
|