openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

libxl: remove conditionals from discard configuration 

LIBXL_HAVE_LIBXL_DEVICE_DISK_DISCARD_ENABLE exists since Xen 4.5.0

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Reviewed-by: Jim Fehlig <jfehlig@suse.com>
This commit is contained in:
Olaf Hering 2021-08-13 16:03:11 +02:00 committed by Jim Fehlig
parent 69e810945e
commit 42158b8936
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/libxl/libxl_conf.c
View File

@ -923,13 +923,12 @@ libxlMakeVnumaList(virDomainDef *def,
return ret; return ret;
} }
static int static void
libxlDiskSetDiscard(libxl_device_disk *x_disk, int discard) libxlDiskSetDiscard(libxl_device_disk *x_disk, virDomainDiskDiscard discard)
{ {
if (!x_disk->readwrite) if (!x_disk->readwrite)
return 0; return;
#if defined(LIBXL_HAVE_LIBXL_DEVICE_DISK_DISCARD_ENABLE) switch (discard) {
switch ((virDomainDiskDiscard)discard) {
case VIR_DOMAIN_DISK_DISCARD_DEFAULT: case VIR_DOMAIN_DISK_DISCARD_DEFAULT:
case VIR_DOMAIN_DISK_DISCARD_LAST: case VIR_DOMAIN_DISK_DISCARD_LAST:
break; break;
@ -940,15 +939,6 @@ libxlDiskSetDiscard(libxl_device_disk *x_disk, int discard)
libxl_defbool_set(&x_disk->discard_enable, false); libxl_defbool_set(&x_disk->discard_enable, false);
break; break;
} }
return 0;
#else
if (discard == VIR_DOMAIN_DISK_DISCARD_DEFAULT)
return 0;
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("This version of libxenlight does not support "
"disk 'discard' option passing"));
return -1;
#endif
} }
static char * static char *
@ -1189,8 +1179,7 @@ libxlMakeDisk(virDomainDiskDef *l_disk, libxl_device_disk *x_disk)
x_disk->removable = 1; x_disk->removable = 1;
x_disk->readwrite = !l_disk->src->readonly; x_disk->readwrite = !l_disk->src->readonly;
x_disk->is_cdrom = l_disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM ? 1 : 0; x_disk->is_cdrom = l_disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM ? 1 : 0;
if (libxlDiskSetDiscard(x_disk, l_disk->discard) < 0) libxlDiskSetDiscard(x_disk, l_disk->discard);
return -1;
/* An empty CDROM must have the empty format, otherwise libxl fails. */ /* An empty CDROM must have the empty format, otherwise libxl fails. */
if (x_disk->is_cdrom && !x_disk->pdev_path) if (x_disk->is_cdrom && !x_disk->pdev_path)
x_disk->format = LIBXL_DISK_FORMAT_EMPTY; x_disk->format = LIBXL_DISK_FORMAT_EMPTY;