mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-09-08 16:54:49 +00:00
qemu: command: make qemuBuildVirtioOptionsStr void
Now that qemuBuildVirtioOptionsStr can not fail anymore, remove its return value and make it void. Signed-off-by: Bjoern Walk <bwalk@linux.ibm.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
This commit is contained in:
parent
e058a72c77
commit
c1165f70c2
@ -586,12 +586,12 @@ qemuBuildVirtioDevStr(virBufferPtr buf,
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static void
|
||||||
qemuBuildVirtioOptionsStr(virBufferPtr buf,
|
qemuBuildVirtioOptionsStr(virBufferPtr buf,
|
||||||
virDomainVirtioOptionsPtr virtio)
|
virDomainVirtioOptionsPtr virtio)
|
||||||
{
|
{
|
||||||
if (!virtio)
|
if (!virtio)
|
||||||
return 0;
|
return;
|
||||||
|
|
||||||
if (virtio->iommu != VIR_TRISTATE_SWITCH_ABSENT) {
|
if (virtio->iommu != VIR_TRISTATE_SWITCH_ABSENT) {
|
||||||
virBufferAsprintf(buf, ",iommu_platform=%s",
|
virBufferAsprintf(buf, ",iommu_platform=%s",
|
||||||
@ -605,8 +605,6 @@ qemuBuildVirtioOptionsStr(virBufferPtr buf,
|
|||||||
virBufferAsprintf(buf, ",packed=%s",
|
virBufferAsprintf(buf, ",packed=%s",
|
||||||
virTristateSwitchTypeToString(virtio->packed));
|
virTristateSwitchTypeToString(virtio->packed));
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
@ -2139,8 +2137,7 @@ qemuBuildDiskDeviceStr(const virDomainDef *def,
|
|||||||
virBufferAsprintf(&opt, ",num-queues=%u", disk->queues);
|
virBufferAsprintf(&opt, ",num-queues=%u", disk->queues);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (qemuBuildVirtioOptionsStr(&opt, disk->virtio) < 0)
|
qemuBuildVirtioOptionsStr(&opt, disk->virtio);
|
||||||
return NULL;
|
|
||||||
|
|
||||||
if (qemuBuildDeviceAddressStr(&opt, def, &disk->info, qemuCaps) < 0)
|
if (qemuBuildDeviceAddressStr(&opt, def, &disk->info, qemuCaps) < 0)
|
||||||
return NULL;
|
return NULL;
|
||||||
@ -2604,8 +2601,7 @@ qemuBuildVHostUserFsCommandLine(virCommandPtr cmd,
|
|||||||
virBufferAsprintf(&opt, ",queue-size=%llu", fs->queue_size);
|
virBufferAsprintf(&opt, ",queue-size=%llu", fs->queue_size);
|
||||||
virBufferAddLit(&opt, ",tag=");
|
virBufferAddLit(&opt, ",tag=");
|
||||||
virQEMUBuildBufferEscapeComma(&opt, fs->dst);
|
virQEMUBuildBufferEscapeComma(&opt, fs->dst);
|
||||||
if (qemuBuildVirtioOptionsStr(&opt, fs->virtio) < 0)
|
qemuBuildVirtioOptionsStr(&opt, fs->virtio);
|
||||||
return -1;
|
|
||||||
|
|
||||||
if (qemuBuildDeviceAddressStr(&opt, def, &fs->info, priv->qemuCaps) < 0)
|
if (qemuBuildDeviceAddressStr(&opt, def, &fs->info, priv->qemuCaps) < 0)
|
||||||
return -1;
|
return -1;
|
||||||
@ -2674,8 +2670,7 @@ qemuBuildFSDevStr(const virDomainDef *def,
|
|||||||
virBufferAddLit(&opt, ",mount_tag=");
|
virBufferAddLit(&opt, ",mount_tag=");
|
||||||
virQEMUBuildBufferEscapeComma(&opt, fs->dst);
|
virQEMUBuildBufferEscapeComma(&opt, fs->dst);
|
||||||
|
|
||||||
if (qemuBuildVirtioOptionsStr(&opt, fs->virtio) < 0)
|
qemuBuildVirtioOptionsStr(&opt, fs->virtio);
|
||||||
return NULL;
|
|
||||||
|
|
||||||
if (qemuBuildDeviceAddressStr(&opt, def, &fs->info, qemuCaps) < 0)
|
if (qemuBuildDeviceAddressStr(&opt, def, &fs->info, qemuCaps) < 0)
|
||||||
return NULL;
|
return NULL;
|
||||||
@ -2906,8 +2901,7 @@ qemuBuildControllerDevStr(const virDomainDef *domainDef,
|
|||||||
def->iothread);
|
def->iothread);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (qemuBuildVirtioOptionsStr(&buf, def->virtio) < 0)
|
qemuBuildVirtioOptionsStr(&buf, def->virtio);
|
||||||
return -1;
|
|
||||||
break;
|
break;
|
||||||
case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOGIC:
|
case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOGIC:
|
||||||
virBufferAddLit(&buf, "lsi");
|
virBufferAddLit(&buf, "lsi");
|
||||||
@ -2953,8 +2947,7 @@ qemuBuildControllerDevStr(const virDomainDef *domainDef,
|
|||||||
virBufferAsprintf(&buf, ",vectors=%d",
|
virBufferAsprintf(&buf, ",vectors=%d",
|
||||||
def->opts.vioserial.vectors);
|
def->opts.vioserial.vectors);
|
||||||
}
|
}
|
||||||
if (qemuBuildVirtioOptionsStr(&buf, def->virtio) < 0)
|
qemuBuildVirtioOptionsStr(&buf, def->virtio);
|
||||||
return -1;
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case VIR_DOMAIN_CONTROLLER_TYPE_CCID:
|
case VIR_DOMAIN_CONTROLLER_TYPE_CCID:
|
||||||
@ -3904,9 +3897,8 @@ qemuBuildNicDevStr(virDomainDefPtr def,
|
|||||||
return NULL;
|
return NULL;
|
||||||
if (bootindex)
|
if (bootindex)
|
||||||
virBufferAsprintf(&buf, ",bootindex=%u", bootindex);
|
virBufferAsprintf(&buf, ",bootindex=%u", bootindex);
|
||||||
if (usingVirtio &&
|
if (usingVirtio)
|
||||||
qemuBuildVirtioOptionsStr(&buf, net->virtio) < 0)
|
qemuBuildVirtioOptionsStr(&buf, net->virtio);
|
||||||
return NULL;
|
|
||||||
|
|
||||||
return virBufferContentAndReset(&buf);
|
return virBufferContentAndReset(&buf);
|
||||||
}
|
}
|
||||||
@ -4147,8 +4139,7 @@ qemuBuildMemballoonCommandLine(virCommandPtr cmd,
|
|||||||
virTristateSwitchTypeToString(def->memballoon->autodeflate));
|
virTristateSwitchTypeToString(def->memballoon->autodeflate));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (qemuBuildVirtioOptionsStr(&buf, def->memballoon->virtio) < 0)
|
qemuBuildVirtioOptionsStr(&buf, def->memballoon->virtio);
|
||||||
return -1;
|
|
||||||
|
|
||||||
if (qemuCommandAddExtDevice(cmd, &def->memballoon->info) < 0)
|
if (qemuCommandAddExtDevice(cmd, &def->memballoon->info) < 0)
|
||||||
return -1;
|
return -1;
|
||||||
@ -4239,8 +4230,7 @@ qemuBuildVirtioInputDevStr(const virDomainDef *def,
|
|||||||
if (qemuBuildDeviceAddressStr(&buf, def, &dev->info, qemuCaps) < 0)
|
if (qemuBuildDeviceAddressStr(&buf, def, &dev->info, qemuCaps) < 0)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
if (qemuBuildVirtioOptionsStr(&buf, dev->virtio) < 0)
|
qemuBuildVirtioOptionsStr(&buf, dev->virtio);
|
||||||
return NULL;
|
|
||||||
|
|
||||||
return virBufferContentAndReset(&buf);
|
return virBufferContentAndReset(&buf);
|
||||||
}
|
}
|
||||||
@ -4550,8 +4540,7 @@ qemuBuildDeviceVideoStr(const virDomainDef *def,
|
|||||||
if (qemuBuildDeviceAddressStr(&buf, def, &video->info, qemuCaps) < 0)
|
if (qemuBuildDeviceAddressStr(&buf, def, &video->info, qemuCaps) < 0)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
if (qemuBuildVirtioOptionsStr(&buf, video->virtio) < 0)
|
qemuBuildVirtioOptionsStr(&buf, video->virtio);
|
||||||
return NULL;
|
|
||||||
|
|
||||||
return virBufferContentAndReset(&buf);
|
return virBufferContentAndReset(&buf);
|
||||||
}
|
}
|
||||||
@ -5766,8 +5755,7 @@ qemuBuildRNGDevStr(const virDomainDef *def,
|
|||||||
virBufferAddLit(&buf, ",period=1000");
|
virBufferAddLit(&buf, ",period=1000");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (qemuBuildVirtioOptionsStr(&buf, dev->virtio) < 0)
|
qemuBuildVirtioOptionsStr(&buf, dev->virtio);
|
||||||
return NULL;
|
|
||||||
|
|
||||||
if (qemuBuildDeviceAddressStr(&buf, def, &dev->info, qemuCaps) < 0)
|
if (qemuBuildDeviceAddressStr(&buf, def, &dev->info, qemuCaps) < 0)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
Loading…
Reference in New Issue
Block a user