[libvirt] [PATCHv2 1/2] qemu: output error when try to hotplug unsupport console

[John Ferlan]

Looks like this one may have been "lost" in the holidays...

On 12/09/2014 01:48 AM, Luyao Huang wrote:
> https://bugzilla.redhat.com/show_bug.cgi?id=1164627
> 
> When try to use attach-device to hotplug a qemu
> unsupport sonsole, command will return success,
> and add a console in vm's xml.But this doesn't work
> in qemu, qemu doesn't support these console.Add
> a error output when try to hotplug a unsupport console
> in qemuBuildConsoleChrDeviceStr.

Needs some grammar fixups...

When using 'virsh attach-device' to hotplug an unsupported console type
into a qemu guest, the attachment will erroneously allows the
attachment. This patch will check to ensure that only the support target
types are used for a running guest. NB, Although a guest can be defined
with an improper target, startup will cause failure.

> 
> Signed-off-by: Luyao Huang <lhuang at redhat.com>
> ---
>  src/qemu/qemu_command.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
> index 1399ce4..7dced5f 100644
> --- a/src/qemu/qemu_command.c
> +++ b/src/qemu/qemu_command.c
> @@ -10069,13 +10069,17 @@ qemuBuildConsoleChrDeviceStr(char **deviceStr,
>          break;
>  
>      case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL:
> +        break;
>      case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_NONE:
>      case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_XEN:
>      case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_UML:
>      case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_LXC:
>      case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_OPENVZ:
>      case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_LAST:
> -        break;
> +        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
> +                       _("unsupported console target type %s"),
> +                       NULLSTR(virDomainChrConsoleTargetTypeToString(chr->targetType)));
> +        return ret;

This should be a goto cleanup;

I can clean this up; however, will it be necessary given patch 2/2?


John

>      }
>  
>      ret = 0;
>