forked from pool/libvirt
f39448844a
- Update to libvirt 3.2.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
67dcb797-virTimeBackOffWait-sleepcap.patch,
85af0b80-qemu-adaptive-montimeout.patch,
d68cb4f55-extract-the-request-sending-code-from-virNetlin.patch,
754515b7d-add-virNetlinkDumpCommand.patch,
3ee35d7d6-more-uses-of-SYSCTL_PATH.patch,
5dd607059-add-virNetDevGetName.patch,
00d28a78b-check-accept_ra-before-enabling-ipv6-forward.patch
- Add Conflicts=xendomains.service to libvirtd service
suse-libvirtd-service.patch
bsc#1015348
OBS-URL: https://build.opensuse.org/request/show/484775
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=595
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-3.2.0/src/libxl/libxl_conf.c
|
|
===================================================================
|
|
--- libvirt-3.2.0.orig/src/libxl/libxl_conf.c
|
|
+++ libvirt-3.2.0/src/libxl/libxl_conf.c
|
|
@@ -609,6 +609,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,
|
|
@@ -856,6 +880,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;
|