<div dir="ltr"><div dir="ltr"><br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Mon, Jan 6, 2020 at 5:58 PM Peter Krempa <<a href="mailto:pkrempa@redhat.com">pkrempa@redhat.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">On Wed, Jan 01, 2020 at 13:06:32 +0800, Han Han wrote:<br>
> From: Han Han <<a href="mailto:hanhanzhiyeqianke@gmail.com" target="_blank">hanhanzhiyeqianke@gmail.com</a>><br>
> <br>
> For qemu object like rng-builtin, there are no properties after id<br>
> property. We should always set comma after object id. Otherwise it will<br>
> cause trailing comma on object:<br>
>     -object rng-builtin,id=ID,<br>
> <br>
> Signed-off-by: Han Han <<a href="mailto:hhan@redhat.com" target="_blank">hhan@redhat.com</a>><br>
> ---<br>
>  src/util/virqemu.c | 13 +++++++------<br>
>  1 file changed, 7 insertions(+), 6 deletions(-)<br>
> <br>
> diff --git a/src/util/virqemu.c b/src/util/virqemu.c<br>
> index f3a233af..72151e43 100644<br>
> --- a/src/util/virqemu.c<br>
> +++ b/src/util/virqemu.c<br>
> @@ -239,12 +239,13 @@ virQEMUBuildObjectCommandlineFromJSONInternal(virBufferPtr buf,<br>
>          return -1;<br>
>      }<br>
>  <br>
> -    virBufferAsprintf(buf, "%s,id=%s,", type, alias);<br>
> -<br>
> -    if (props &&<br>
> -        virQEMUBuildCommandLineJSON(props, buf,<br>
> -                                    virQEMUBuildCommandLineJSONArrayBitmap) < 0)<br>
> -        return -1;<br>
> +    virBufferAsprintf(buf, "%s,id=%s", type, alias);<br>
<br>
Keep the newline here.<br>
<br>
> +    if (props) {<br>
> +        virBufferAsprintf(buf, ",");<br>
<br>
Use vir BufferAddLit instead.<br></blockquote><div>virBufferAsprintf is for format strings and virBufferAddLit is for const strings, right? <br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<br>
> +        if (virQEMUBuildCommandLineJSON(props, buf,<br>
> +                                virQEMUBuildCommandLineJSONArrayBitmap) < 0)<br>
> +            return -1;<br>
> +    }<br>
>  <br>
>      return 0;<br>
>  }<br>
> -- <br>
> 2.23.0<br>
> <br>
> --<br>
> libvir-list mailing list<br>
> <a href="mailto:libvir-list@redhat.com" target="_blank">libvir-list@redhat.com</a><br>
> <a href="https://www.redhat.com/mailman/listinfo/libvir-list" rel="noreferrer" target="_blank">https://www.redhat.com/mailman/listinfo/libvir-list</a><br>
<br>
</blockquote></div><br clear="all"><br>-- <br><div dir="ltr" class="gmail_signature"><div dir="ltr"><div><div dir="ltr"><div><div dir="ltr">Best regards,</div><div dir="ltr">-----------------------------------<br></div><div dir="ltr">Han Han<br>Quality Engineer<br>Redhat.<br><br>Email: <a href="mailto:hhan@redhat.com" target="_blank">hhan@redhat.com</a><br>Phone: +861065339333<br></div></div></div></div></div></div></div>