mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-05 22:05:47 +00:00
qemu: command: Inline qemuBuildDiskFrontendAttributeErrorPolicy
Commit dc481f11a6
which converted the function generating properties
for disk '-device' argument to JSON removed the only other use of
qemuBuildDiskFrontendAttributeErrorPolicy, so we can now inline it into
qemuBuildDriveStr.
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
parent
f923620031
commit
a572a285ab
@ -2002,22 +2002,6 @@ qemuBuildDiskGetErrorPolicy(virDomainDiskDef *disk,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void
|
|
||||||
qemuBuildDiskFrontendAttributeErrorPolicy(virDomainDiskDef *disk,
|
|
||||||
virBuffer *buf)
|
|
||||||
{
|
|
||||||
const char *wpolicy = NULL;
|
|
||||||
const char *rpolicy = NULL;
|
|
||||||
|
|
||||||
qemuBuildDiskGetErrorPolicy(disk, &wpolicy, &rpolicy);
|
|
||||||
|
|
||||||
if (wpolicy)
|
|
||||||
virBufferAsprintf(buf, ",werror=%s", wpolicy);
|
|
||||||
if (rpolicy)
|
|
||||||
virBufferAsprintf(buf, ",rerror=%s", rpolicy);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
static char *
|
static char *
|
||||||
qemuBuildDriveStr(virDomainDiskDef *disk,
|
qemuBuildDriveStr(virDomainDiskDef *disk,
|
||||||
virQEMUCaps *qemuCaps)
|
virQEMUCaps *qemuCaps)
|
||||||
@ -2043,8 +2027,17 @@ qemuBuildDriveStr(virDomainDiskDef *disk,
|
|||||||
|
|
||||||
/* werror/rerror are really frontend attributes, but older
|
/* werror/rerror are really frontend attributes, but older
|
||||||
* qemu requires them on -drive instead of -device */
|
* qemu requires them on -drive instead of -device */
|
||||||
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_STORAGE_WERROR))
|
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_STORAGE_WERROR)) {
|
||||||
qemuBuildDiskFrontendAttributeErrorPolicy(disk, &opt);
|
const char *wpolicy = NULL;
|
||||||
|
const char *rpolicy = NULL;
|
||||||
|
|
||||||
|
qemuBuildDiskGetErrorPolicy(disk, &wpolicy, &rpolicy);
|
||||||
|
|
||||||
|
if (wpolicy)
|
||||||
|
virBufferAsprintf(&opt, ",werror=%s", wpolicy);
|
||||||
|
if (rpolicy)
|
||||||
|
virBufferAsprintf(&opt, ",rerror=%s", rpolicy);
|
||||||
|
}
|
||||||
|
|
||||||
if (disk->src->readonly)
|
if (disk->src->readonly)
|
||||||
virBufferAddLit(&opt, ",readonly=on");
|
virBufferAddLit(&opt, ",readonly=on");
|
||||||
|
Loading…
Reference in New Issue
Block a user