[libvirt] [PATCH] qemu: Remove duplicated code in qemuBuildSerialChrDeviceStr()

Shivaprasad bhat shivaprasadbhat at gmail.com
Thu Jun 22 08:25:09 UTC 2017


Hi Andrea,


On Thu, Jun 22, 2017 at 11:50 AM, Andrea Bolognani <abologna at redhat.com>
wrote:

> The call to qemuBuildDeviceAddressStr() happens no matter
> what, so we can move it outside of the switch. We can also
> move the call to virBufferAsprintf() closer to it to avoid
> having formatting - error checking - more formatting.
>
> Signed-off-by: Andrea Bolognani <abologna at redhat.com>
> ---
>  src/qemu/qemu_command.c | 20 +++++++-------------
>  1 file changed, 7 insertions(+), 13 deletions(-)
>
> diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
> index c53ab97..9bb0163 100644
> --- a/src/qemu/qemu_command.c
> +++ b/src/qemu/qemu_command.c
> @@ -10296,10 +10296,6 @@ qemuBuildSerialChrDeviceStr(char **deviceStr,
>

We can remove the qemuBuildDeviceAddressStr() from this line too. Like,

https://paste.fedoraproject.org/paste/D2P1sQT~ElzQ6Ywe5DlIxA

Thanks,
Shivaprasad

                 goto error;

         }
>      } else {
> -        virBufferAsprintf(&cmd, "%s,chardev=char%s,id=%s",
> -                          virDomainChrSerialTargetTypeTo
> String(serial->targetType),
> -                          serial->info.alias, serial->info.alias);
> -
>          switch (serial->targetType) {
>          case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_USB:
>              if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_USB_SERIAL)) {
> @@ -10314,9 +10310,6 @@ qemuBuildSerialChrDeviceStr(char **deviceStr,
>                                 _("usb-serial requires address of usb
> type"));
>                  goto error;
>              }
> -
> -            if (qemuBuildDeviceAddressStr(&cmd, def, &serial->info,
> qemuCaps) < 0)
> -                goto error;
>              break;
>
>          case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_ISA:
> @@ -10326,9 +10319,6 @@ qemuBuildSerialChrDeviceStr(char **deviceStr,
>                                 _("isa-serial requires address of isa
> type"));
>                  goto error;
>              }
> -
> -            if (qemuBuildDeviceAddressStr(&cmd, def, &serial->info,
> qemuCaps) < 0)
> -                goto error;
>              break;
>
>          case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_PCI:
> @@ -10344,11 +10334,15 @@ qemuBuildSerialChrDeviceStr(char **deviceStr,
>                                 _("pci-serial requires address of pci
> type"));
>                  goto error;
>              }
> -
> -            if (qemuBuildDeviceAddressStr(&cmd, def, &serial->info,
> qemuCaps) < 0)
> -                goto error;
>              break;
>          }
> +
> +        virBufferAsprintf(&cmd, "%s,chardev=char%s,id=%s",
> +                          virDomainChrSerialTargetTypeTo
> String(serial->targetType),
> +                          serial->info.alias, serial->info.alias);
> +
> +        if (qemuBuildDeviceAddressStr(&cmd, def, &serial->info,
> qemuCaps) < 0)
> +            goto error;
>      }
>
>      if (virBufferCheckError(&cmd) < 0)
> --
> 2.7.5
>
> --
> libvir-list mailing list
> libvir-list at redhat.com
> https://www.redhat.com/mailman/listinfo/libvir-list
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20170622/3ee2210c/attachment-0001.htm>


More information about the libvir-list mailing list