From nobody Sat Apr 20 03:32:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1539010503011287.3245995068478; Mon, 8 Oct 2018 07:55:03 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 500A3308212C; Mon, 8 Oct 2018 14:54:57 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C1C5A5C554; Mon, 8 Oct 2018 14:54:55 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id CAD7D4BB79; Mon, 8 Oct 2018 14:54:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w98EsnFo000921 for ; Mon, 8 Oct 2018 10:54:49 -0400 Received: by smtp.corp.redhat.com (Postfix) id 080EB6B472; Mon, 8 Oct 2018 14:54:49 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 530C46B47B; Mon, 8 Oct 2018 14:54:44 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Mon, 8 Oct 2018 16:54:42 +0200 Message-Id: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Cc: thuth@redhat.com Subject: [libvirt] [PATCH] qemu: use "id" instead of deprecated "name" for -net X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Mon, 08 Oct 2018 14:55:00 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 -net name=3D will be deprecated in QEMU 3.1: commit 101625a4d4ac7e96227a156bc5f6d21a9cc383cd net: Deprecate the "name" parameter of -net git describe: v3.0.0-791-g101625a4d4 Use the id option instead, supported since QEMU 1.2: commit 6687b79d636cd60ed9adb1177d0d946b58fa7717 convert net_client_init() to OptsVisitor git describe: v1.0-3564-g6687b79d63 contains: v1.2.0-rc0~142^2~8 Thankfully, libvirt only uses -net for non-PCI, non-virtio NICs on ARM. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Laine Stump Reviewed-by: Thomas Huth --- src/qemu/qemu_command.c | 2 +- tests/qemuxml2argvdata/arm-vexpressa9-basic.args | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index d77cf8c2d6..269276f2f9 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3516,7 +3516,7 @@ qemuBuildLegacyNicStr(virDomainNetDefPtr net) net->info.alias, (net->model ? ",model=3D" : ""), (net->model ? net->model : ""), - (net->info.alias ? ",name=3D" : ""), + (net->info.alias ? ",id=3D" : ""), (net->info.alias ? net->info.alias : ""))); return str; } diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-basic.args b/tests/qemux= ml2argvdata/arm-vexpressa9-basic.args index 90661d8b55..b925baa0e0 100644 --- a/tests/qemuxml2argvdata/arm-vexpressa9-basic.args +++ b/tests/qemuxml2argvdata/arm-vexpressa9-basic.args @@ -27,6 +27,6 @@ server,nowait \ -usb \ -drive file=3D/arm.raw,format=3Draw,if=3Dsd,index=3D0 \ -netdev user,id=3Dhostnet0 \ --net nic,macaddr=3D52:54:00:09:a4:37,netdev=3Dhostnet0,model=3Dlan9118,nam= e=3Dnet0 \ +-net nic,macaddr=3D52:54:00:09:a4:37,netdev=3Dhostnet0,model=3Dlan9118,id= =3Dnet0 \ -chardev pty,id=3Dcharserial0 \ -serial chardev:charserial0 --=20 2.16.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list