From patchwork Mon Jan 29 08:17:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Wang X-Patchwork-Id: 867036 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zVMsm3Q96z9s75 for ; Mon, 29 Jan 2018 19:21:16 +1100 (AEDT) Received: from localhost ([::1]:48207 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eg4gk-00055z-IA for incoming@patchwork.ozlabs.org; Mon, 29 Jan 2018 03:21:14 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48776) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eg4d2-0002iE-JX for qemu-devel@nongnu.org; Mon, 29 Jan 2018 03:17:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eg4d1-0003lC-Oy for qemu-devel@nongnu.org; Mon, 29 Jan 2018 03:17:24 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56536) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eg4d1-0003jn-IA for qemu-devel@nongnu.org; Mon, 29 Jan 2018 03:17:23 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E1E5B780D7; Mon, 29 Jan 2018 08:17:22 +0000 (UTC) Received: from jason-ThinkPad-T450s.redhat.com (ovpn-12-100.pek2.redhat.com [10.72.12.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0BF1F62675; Mon, 29 Jan 2018 08:17:20 +0000 (UTC) From: Jason Wang To: peter.maydell@linaro.org Date: Mon, 29 Jan 2018 16:17:04 +0800 Message-Id: <1517213825-24085-6-git-send-email-jasowang@redhat.com> In-Reply-To: <1517213825-24085-1-git-send-email-jasowang@redhat.com> References: <1517213825-24085-1-git-send-email-jasowang@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 29 Jan 2018 08:17:22 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 5/6] qemu-doc: Get rid of "vlan=X" example in the documentation X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jason Wang , Thomas Huth , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth The vlan concept is marked as deprecated, so we should not use this for examples in the documentation anymore. Signed-off-by: Thomas Huth Signed-off-by: Jason Wang --- qemu-options.hx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index 56b9a86..8ce427d 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2242,8 +2242,8 @@ qemu-system-i386 linux.img -net nic -net tap #launch a QEMU instance with two NICs, each one connected #to a TAP device qemu-system-i386 linux.img \ - -net nic,vlan=0 -net tap,vlan=0,ifname=tap0 \ - -net nic,vlan=1 -net tap,vlan=1,ifname=tap1 + -netdev tap,id=nd0,ifname=tap0 -device e1000,netdev=nd0 \ + -netdev tap,id=nd1,ifname=tap1 -device rtl8139,netdev=nd1 @end example @example