File 5b348897-libxl-qemu_disk_scsi_drive_string-break-out-common.patch of Package xen.openSUSE_Leap_42.3_Update
# Commit 724e5aa31b58d1e430ad36b484cf0ec021497399
# Date 2018-06-28 09:04:55 +0200
# Author Ian Jackson <ian.jackson@eu.citrix.com>
# Committer Jan Beulich <jbeulich@suse.com>
libxl: qemu_disk_scsi_drive_string: Break out common parts of disk config
The generated configurations are identical apart from, in some cases,
reordering of the id=%s element. So, overall, no functional change.
This is part of XSA-266.
Reported-by: Andrew Reimers <andrew.reimers@orionvm.com>
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
--- a/tools/libxl/libxl_dm.c
+++ b/tools/libxl/libxl_dm.c
@@ -773,6 +773,7 @@ static char *qemu_disk_scsi_drive_string
int colo_mode)
{
char *drive = NULL;
+ char *common = GCSPRINTF("cache=writeback");
const char *exportname = disk->colo_export;
const char *active_disk = disk->active_disk;
const char *hidden_disk = disk->hidden_disk;
@@ -780,8 +781,8 @@ static char *qemu_disk_scsi_drive_string
switch (colo_mode) {
case LIBXL__COLO_NONE:
drive = libxl__sprintf
- (gc, "file=%s,if=scsi,bus=0,unit=%d,format=%s,cache=writeback",
- target_path, unit, format);
+ (gc, "%s,file=%s,if=scsi,bus=0,unit=%d,format=%s",
+ common, target_path, unit, format);
break;
case LIBXL__COLO_PRIMARY:
/*
@@ -794,13 +795,13 @@ static char *qemu_disk_scsi_drive_string
* vote-threshold=1
*/
drive = GCSPRINTF(
- "if=scsi,bus=0,unit=%d,cache=writeback,driver=quorum,"
+ "%s,if=scsi,bus=0,unit=%d,,driver=quorum,"
"id=%s,"
"children.0.file.filename=%s,"
"children.0.driver=%s,"
"read-pattern=fifo,"
"vote-threshold=1",
- unit, exportname, target_path, format);
+ common, unit, exportname, target_path, format);
break;
case LIBXL__COLO_SECONDARY:
/*
@@ -814,7 +815,7 @@ static char *qemu_disk_scsi_drive_string
* file.backing.backing=exportname,
*/
drive = GCSPRINTF(
- "if=scsi,id=top-colo,bus=0,unit=%d,cache=writeback,"
+ "%s,if=scsi,id=top-colo,bus=0,unit=%d,"
"driver=replication,"
"mode=secondary,"
"top-id=top-colo,"
@@ -823,7 +824,7 @@ static char *qemu_disk_scsi_drive_string
"file.backing.driver=qcow2,"
"file.backing.file.filename=%s,"
"file.backing.backing=%s",
- unit, active_disk, hidden_disk, exportname);
+ common, unit, active_disk, hidden_disk, exportname);
break;
default:
abort();