提交 8fc7cf6a 编写于 作者: C Cole Robinson

qemu: command: Drop some QEMU_CAPS_CHARDEV checks

AFAIK there aren't any cases where we should fail these checks with
supported qemu versions, so just drop them.
Reviewed-by: NAndrea Bolognani <abologna@redhat.com>
Signed-off-by: NCole Robinson <crobinso@redhat.com>
上级 ca5c5b99
...@@ -8880,8 +8880,7 @@ qemuBuildSmartcardCommandLine(virLogManagerPtr logManager, ...@@ -8880,8 +8880,7 @@ qemuBuildSmartcardCommandLine(virLogManagerPtr logManager,
switch (smartcard->type) { switch (smartcard->type) {
case VIR_DOMAIN_SMARTCARD_TYPE_HOST: case VIR_DOMAIN_SMARTCARD_TYPE_HOST:
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV) || if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CCID_EMULATED)) {
!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CCID_EMULATED)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("this QEMU binary lacks smartcard host " _("this QEMU binary lacks smartcard host "
"mode support")); "mode support"));
...@@ -8892,8 +8891,7 @@ qemuBuildSmartcardCommandLine(virLogManagerPtr logManager, ...@@ -8892,8 +8891,7 @@ qemuBuildSmartcardCommandLine(virLogManagerPtr logManager,
break; break;
case VIR_DOMAIN_SMARTCARD_TYPE_HOST_CERTIFICATES: case VIR_DOMAIN_SMARTCARD_TYPE_HOST_CERTIFICATES:
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV) || if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CCID_EMULATED)) {
!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CCID_EMULATED)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("this QEMU binary lacks smartcard host " _("this QEMU binary lacks smartcard host "
"mode support")); "mode support"));
...@@ -8928,8 +8926,7 @@ qemuBuildSmartcardCommandLine(virLogManagerPtr logManager, ...@@ -8928,8 +8926,7 @@ qemuBuildSmartcardCommandLine(virLogManagerPtr logManager,
break; break;
case VIR_DOMAIN_SMARTCARD_TYPE_PASSTHROUGH: case VIR_DOMAIN_SMARTCARD_TYPE_PASSTHROUGH:
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV) || if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CCID_PASSTHRU)) {
!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CCID_PASSTHRU)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("this QEMU binary lacks smartcard " _("this QEMU binary lacks smartcard "
"passthrough mode support")); "passthrough mode support"));
...@@ -9319,12 +9316,6 @@ qemuBuildChannelsCommandLine(virLogManagerPtr logManager, ...@@ -9319,12 +9316,6 @@ qemuBuildChannelsCommandLine(virLogManagerPtr logManager,
switch (channel->targetType) { switch (channel->targetType) {
case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_GUESTFWD: case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_GUESTFWD:
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
"%s", _("guestfwd requires QEMU to support -chardev & -device"));
return -1;
}
if (!(devstr = qemuBuildChrChardevStr(logManager, cmd, cfg, def, if (!(devstr = qemuBuildChrChardevStr(logManager, cmd, cfg, def,
channel->source, channel->source,
channel->info.alias, channel->info.alias,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册