[libvirt] [PATCH 13/20] qemu: Move common checks outside qemuBuildShmemDevLegacyStr
Some checks will need to be performed for newer device types as well, so
let's not duplicate them.
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
src/qemu/qemu_command.c | 54 +++++++++++++++++++++++++------------------------
1 file changed, 28 insertions(+), 26 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 8f9ad1963207..2a652d2747e8 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -8557,29 +8557,12 @@ qemuBuildShmemDevLegacyStr(virDomainDefPtr def,
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("ivshmem device is not supported "
"with this QEMU binary"));
- goto error;
+ return NULL;
}
virBufferAddLit(&buf, "ivshmem");
- if (shmem->size) {
- /*
- * Thanks to our parsing code, we have a guarantee that the
- * size is power of two and is at least a mebibyte in size.
- * But because it may change in the future, the checks are
- * doubled in here.
- */
- if (shmem->size & (shmem->size - 1)) {
- virReportError(VIR_ERR_XML_ERROR, "%s",
- _("shmem size must be a power of two"));
- goto error;
- }
- if (shmem->size < 1024 * 1024) {
- virReportError(VIR_ERR_XML_ERROR, "%s",
- _("shmem size must be at least 1 MiB (1024 KiB)"));
- goto error;
- }
+ if (shmem->size)
virBufferAsprintf(&buf, ",size=%llum", shmem->size >>
20);
- }
if (!shmem->server.enabled) {
virBufferAsprintf(&buf, ",shm=%s,id=%s", shmem->name,
shmem->info.alias);
@@ -8599,13 +8582,6 @@ qemuBuildShmemDevLegacyStr(virDomainDefPtr def,
}
}
- if (shmem->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("only 'pci' addresses are supported for the "
- "shared memory device"));
- goto error;
- }
-
if (qemuBuildDeviceAddressStr(&buf, def, &shmem->info, qemuCaps) < 0)
goto error;
@@ -8652,6 +8628,32 @@ qemuBuildShmemCommandLine(virLogManagerPtr logManager,
{
char *devstr = NULL;
+ if (shmem->size) {
+ /*
+ * Thanks to our parsing code, we have a guarantee that the
+ * size is power of two and is at least a mebibyte in size.
+ * But because it may change in the future, the checks are
+ * doubled in here.
+ */
+ if (shmem->size & (shmem->size - 1)) {
+ virReportError(VIR_ERR_XML_ERROR, "%s",
+ _("shmem size must be a power of two"));
+ return -1;
+ }
+ if (shmem->size < 1024 * 1024) {
+ virReportError(VIR_ERR_XML_ERROR, "%s",
+ _("shmem size must be at least 1 MiB (1024 KiB)"));
+ return -1;
+ }
+ }
+
+ if (shmem->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+ _("only 'pci' addresses are supported for the "
+ "shared memory device"));
+ return -1;
+ }
+
switch ((virDomainShmemModel)shmem->model) {
case VIR_DOMAIN_SHMEM_MODEL_IVSHMEM:
if (!(devstr = qemuBuildShmemDevLegacyStr(def, shmem, qemuCaps)))
--
2.10.0