Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_command.c | 27 ---------------------------
1 file changed, 27 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 60404b6dd8..daaccff9b6 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -1042,13 +1042,6 @@ qemuBuildVirtioDevStr(virBuffer *buf,
return 0;
}
-static void
-qemuBuildVirtioOptionsStr(virBuffer *buf G_GNUC_UNUSED,
- virDomainVirtioOptions *virtio G_GNUC_UNUSED)
-{
- if (!virtio)
- return;
-}
static int
qemuBuildRomStr(virBuffer *buf,
@@ -2026,8 +2019,6 @@ qemuBuildDiskDeviceStr(const virDomainDef *def,
virBufferAsprintf(&opt, ",queue-size=%u",
disk->queue_size);
}
- qemuBuildVirtioOptionsStr(&opt, disk->virtio);
-
if (qemuBuildDeviceAddressStr(&opt, def, &disk->info) < 0)
return NULL;
break;
@@ -2455,7 +2446,6 @@ qemuBuildVHostUserFsDevStr(virDomainFSDef *fs,
virBufferAsprintf(&buf, ",queue-size=%llu", fs->queue_size);
virBufferAddLit(&buf, ",tag=");
virQEMUBuildBufferEscapeComma(&buf, fs->dst);
- qemuBuildVirtioOptionsStr(&buf, fs->virtio);
if (fs->info.bootIndex)
virBufferAsprintf(&buf, ",bootindex=%u", fs->info.bootIndex);
@@ -2560,8 +2550,6 @@ qemuBuildFSDevStr(const virDomainDef *def,
virBufferAddLit(&opt, ",mount_tag=");
virQEMUBuildBufferEscapeComma(&opt, fs->dst);
- qemuBuildVirtioOptionsStr(&opt, fs->virtio);
-
if (qemuBuildDeviceAddressStr(&opt, def, &fs->info) < 0)
return NULL;
@@ -2789,8 +2777,6 @@ qemuBuildControllerDevStr(const virDomainDef *domainDef,
virBufferAsprintf(&buf, ",iothread=iothread%u",
def->iothread);
}
-
- qemuBuildVirtioOptionsStr(&buf, def->virtio);
break;
case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOGIC:
virBufferAddLit(&buf, "lsi");
@@ -2844,7 +2830,6 @@ qemuBuildControllerDevStr(const virDomainDef *domainDef,
virBufferAsprintf(&buf, ",vectors=%d",
def->opts.vioserial.vectors);
}
- qemuBuildVirtioOptionsStr(&buf, def->virtio);
break;
case VIR_DOMAIN_CONTROLLER_TYPE_CCID:
@@ -3853,8 +3838,6 @@ qemuBuildNicDevStr(virDomainDef *def,
return NULL;
if (bootindex)
virBufferAsprintf(&buf, ",bootindex=%u", bootindex);
- if (usingVirtio)
- qemuBuildVirtioOptionsStr(&buf, net->virtio);
return virBufferContentAndReset(&buf);
}
@@ -4144,8 +4127,6 @@ qemuBuildMemballoonCommandLine(virCommand *cmd,
virTristateSwitchTypeToString(def->memballoon->free_page_reporting));
}
- qemuBuildVirtioOptionsStr(&buf, def->memballoon->virtio);
-
if (qemuCommandAddExtDevice(cmd, &def->memballoon->info) < 0)
return -1;
@@ -4220,8 +4201,6 @@ qemuBuildVirtioInputDevStr(const virDomainDef *def,
if (qemuBuildDeviceAddressStr(&buf, def, &dev->info) < 0)
return NULL;
- qemuBuildVirtioOptionsStr(&buf, dev->virtio);
-
return virBufferContentAndReset(&buf);
}
@@ -4571,8 +4550,6 @@ qemuBuildDeviceVideoStr(const virDomainDef *def,
if (qemuBuildDeviceAddressStr(&buf, def, &video->info) < 0)
return NULL;
- qemuBuildVirtioOptionsStr(&buf, video->virtio);
-
return virBufferContentAndReset(&buf);
}
@@ -5755,8 +5732,6 @@ qemuBuildRNGDevStr(const virDomainDef *def,
virBufferAddLit(&buf, ",period=1000");
}
- qemuBuildVirtioOptionsStr(&buf, dev->virtio);
-
if (qemuBuildDeviceAddressStr(&buf, def, &dev->info) < 0)
return NULL;
@@ -10432,8 +10407,6 @@ qemuBuildVsockDevStr(virDomainDef *def,
virBufferAsprintf(&buf, ",guest-cid=%u", vsock->guest_cid);
virBufferAsprintf(&buf, ",vhostfd=%s%u", fdprefix, priv->vhostfd);
- qemuBuildVirtioOptionsStr(&buf, vsock->virtio);
-
if (qemuBuildDeviceAddressStr(&buf, def, &vsock->info) < 0)
return NULL;
--
2.31.1