From: Thomas Huth <thuth@redhat.com>
Date: Mon, 18 May 2020 07:43:52 +0000 (+0200)
Subject: net: Do not include a newline in the id of -nic devices
X-Git-Tag: v5.1.0-rc0~82^2~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0561dfac082becdd9e89110249a27b309b62aa9f;p=thirdparty%2Fqemu.git

net: Do not include a newline in the id of -nic devices

The '\n' sneaked in by accident here, an "id" string should really
not contain a newline character at the end.

Fixes: 78cd6f7bf6b ('net: Add a new convenience option "--nic" ...')
Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200518074352.23125-1-thuth@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---

diff --git a/net/net.c b/net/net.c
index 38778e831da..cbeeeadff8f 100644
--- a/net/net.c
+++ b/net/net.c
@@ -1506,7 +1506,7 @@ static int net_param_nic(void *dummy, QemuOpts *opts, Error **errp)
     /* Create an ID if the user did not specify one */
     nd_id = g_strdup(qemu_opts_id(opts));
     if (!nd_id) {
-        nd_id = g_strdup_printf("__org.qemu.nic%i\n", idx);
+        nd_id = g_strdup_printf("__org.qemu.nic%i", idx);
         qemu_opts_set_id(opts, nd_id);
     }