Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1jaaRO-0006sP-PT for mharc-qemu-trivial@gnu.org; Mon, 18 May 2020 03:44:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41632) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jaaRM-0006rE-SL for qemu-trivial@nongnu.org; Mon, 18 May 2020 03:44:00 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:36081 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jaaRM-0001nx-4k for qemu-trivial@nongnu.org; Mon, 18 May 2020 03:44:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589787838; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type; bh=UElHim+FDsfadnKXsfBdfHKm+vRH2ogsYCXWhw1L3H4=; b=Nh+UPrA3/tHnjTFS4vyj3NFS4UWz3IEM+DVL86EKXnlbFXwvTq5mnULJqHp/pL9oUl8BxW DpbhAVeQBkhzhHvgcvvLfBTUgBBU8Hsu7C5Z9j5kKNTdFnQVh9GUTg9UoAKJ0QrreMkgtW J6fqm0G/PVijzPAEGnQ2ReTmxsrSdfA= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-499-b6W_CpdSMfuHAT1HMKgL1w-1; Mon, 18 May 2020 03:43:56 -0400 X-MC-Unique: b6W_CpdSMfuHAT1HMKgL1w-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8D007107ACCA; Mon, 18 May 2020 07:43:55 +0000 (UTC) Received: from thuth.com (ovpn-112-182.ams2.redhat.com [10.36.112.182]) by smtp.corp.redhat.com (Postfix) with ESMTP id 51BC65C1B2; Mon, 18 May 2020 07:43:54 +0000 (UTC) From: Thomas Huth To: Jason Wang , qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, qemu-stable@nongnu.org Subject: [PATCH] net: Do not include a newline in the id of -nic devices Date: Mon, 18 May 2020 09:43:52 +0200 Message-Id: <20200518074352.23125-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Received-SPF: pass client-ip=207.211.31.81; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/17 22:52:27 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-trivial@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 May 2020 07:44:01 -0000 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 --- net/net.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/net.c b/net/net.c index 38778e831d..cbeeeadff8 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); } -- 2.18.1