From patchwork Thu Apr 25 14:29:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yousong Zhou X-Patchwork-Id: 1090870 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=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="E+bdAM6c"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="uvVY2+U/"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44qfjF4DsHz9sDQ for ; Fri, 26 Apr 2019 00:30:09 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=VNpDe3peXH92QD0UcK77dBDiurHAMd4EL1IeeSiAE/I=; b=E+bdAM6cykUzEd pQpmf1H/5GC4L0WqMv/0UKDGp+tnzGkmH/JTgqckRt1iHWlWA3ek9S3ziIjzNTfHjnCWQ3jhqFANx YRa2ZVJeYkkVjI9hOoZw2i8qh7RYqYxsJ3An99QmZoXO9ppjhclXGiirIO1gY+Fp0qOBKlQ+CGsbQ RWoDN0dNSuu2hMQVnLbKlVcn8/0MMLVjpBFEcnO69GSiPBVu/VSMgVJhr6nmUI2PqhXWgzxX2pDeE Ao/awUaTPbTPcLgdgm7kPkPgEPVTAAlE4awMLP+nf5e4hgCmOYG0eBOuhrsWu6MQOszyp8LGmTnUv yYTJ95PmKuMML3tQ631A==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hJfNr-0005HB-6I; Thu, 25 Apr 2019 14:29:55 +0000 Received: from mail-pg1-x544.google.com ([2607:f8b0:4864:20::544]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hJfNe-00056L-MD for openwrt-devel@lists.openwrt.org; Thu, 25 Apr 2019 14:29:53 +0000 Received: by mail-pg1-x544.google.com with SMTP id z9so11282110pgu.10 for ; Thu, 25 Apr 2019 07:29:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0gYNa6cgiTzKEePqSe+o04vDmqO7XtMKYcMrVTND7Wo=; b=uvVY2+U/+g1k31cKJhIuDajSqkJi7Y5FzOIrzEDMJxh3ybLZkEn2JHQwKC/Sdvj1s8 tJOJvbobh/cgdaR5qLeIbPhyzGrgrc97Doe4ICSVTgxPhaTMXv/ewBfL53JcvQpeXCLl 8L4r37WpQa77AL1ltpjFNQ1XuUTp3REsRnYqEagAt6ld93P+A5Db/vnSRbY1sXlE7IwH wZy0jDR3BgEQij0YYr1BWLg0xxT5ApWDWj5o7JvQq9wXeFtDDgZhRxi8QWoVYkcIUrXr hfYatZw8zLaTcDGqtXW7Hm/RXcEleTBL3G6lHfnqfHeczceBxLpRL+yslVXkNpsssdXG LyoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0gYNa6cgiTzKEePqSe+o04vDmqO7XtMKYcMrVTND7Wo=; b=QU5urQ2SdKLGI3mjwJIsu2pMmDevozJENn/uTHdx3G+3Nv37EP91nTPnq0MBEAZ5yF /o62GP2q54nBZBDRy3AnXCmDovFq3E8d3j153pAh10irNv2Y4dHgfCPDsyK0wSJ2XM2S QtDrJlmTa6aDPs6VfLjYQ+Pys0kVtg2MsO2U6VORtR7P6maUwBrKb3rKJ34cX8ny3ueC F279LxMZ3jQpkpatpuN4EXfRf8QyEP+AOBpLqViK84sr6XJ3WLRRJMyV0Y4m0WhFZe+X fclq1NnxgPewkxlkOMTlG94//1Uop0E24b77hnXcwG0B9cLuNock43AJAXFPc7ndYCWH xOpw== X-Gm-Message-State: APjAAAUf9//J1YFp+QK5sYZgtSulndQKaN9ISp1HBicLQtv7KpB4RqY/ 1A36IzDiBMzJKJ8NnKw5TfA= X-Google-Smtp-Source: APXvYqz3z2+qeXeqAQy8MViYFWs91hrETTWZ2Hs+oJUagsF8wXiTxjIH7Vk2Vwc35s9CsT+w/Bt+wg== X-Received: by 2002:a63:fe0a:: with SMTP id p10mr36923957pgh.86.1556202582034; Thu, 25 Apr 2019 07:29:42 -0700 (PDT) Received: from titan.hq.cloud.yunionyun.com (165.116.92.34.bc.googleusercontent.com. [34.92.116.165]) by smtp.gmail.com with ESMTPSA id w190sm6856731pfb.101.2019.04.25.07.29.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Apr 2019 07:29:41 -0700 (PDT) From: Yousong Zhou To: ynezz@true.cz Date: Thu, 25 Apr 2019 14:29:06 +0000 Message-Id: <20190425142906.34641-2-yszhou4tech@gmail.com> In-Reply-To: <20190425142906.34641-1-yszhou4tech@gmail.com> References: <20190425142906.34641-1-yszhou4tech@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190425_072943_204031_F8A23EE1 X-CRM114-Status: UNSURE ( 9.20 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:544 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (yszhou4tech[at]gmail.com) -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain Subject: [OpenWrt-Devel] [PATCH 2/2] scripts/qemustart: fix network device emulation X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yousong Zhou , openwrt-devel@lists.openwrt.org Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org We only enabled pcnet driver for malta machine, and x86/legacy target was supposed to only support e1000 model Cc: Petr Štetiar Signed-off-by: Yousong Zhou --- scripts/qemustart | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/scripts/qemustart b/scripts/qemustart index f0ffc64734..64a6ebf17b 100755 --- a/scripts/qemustart +++ b/scripts/qemustart @@ -232,11 +232,9 @@ start_qemu_malta() { # one will be actually used as the wan, lan network interface inside the # guest machine [ -z "$o_network" ] || { - o_qemu_extra+=( \ - "-netdev" "bridge,id=wan,br=$BR_WAN,helper=$HELPER" "-device" \ - "virtio-net-pci,id=devwan,netdev=wan,mac=$MAC_WAN" \ - "-netdev" "bridge,id=lan,br=$BR_LAN,helper=$HELPER" \ - "-device" "virtio-net-pci,id=devlan,netdev=lan,mac=$MAC_LAN" \ + o_qemu_extra+=( + -netdev bridge,id=wan,br="$BR_WAN,helper=$HELPER" -device pcnet,netdev=wan,mac="$MAC_WAN" + -netdev bridge,id=lan,br="$BR_LAN,helper=$HELPER" -device pcnet,netdev=lan,mac="$MAC_LAN" ) } @@ -279,12 +277,20 @@ start_qemu_x86() { } [ -z "$o_network" ] || { - o_qemu_extra+=( \ - "-netdev" "bridge,id=lan,br=$BR_LAN,helper=$HELPER" \ - "-device" "virtio-net-pci,id=devlan,netdev=lan,mac=$MAC_LAN" \ - "-netdev" "bridge,id=wan,br=$BR_WAN,helper=$HELPER" "-device" \ - "virtio-net-pci,id=devwan,netdev=wan,mac=$MAC_WAN" \ - ) + case "${o_subtarget%-*}" in + legacy) + o_qemu_extra+=( + -netdev "bridge,id=lan,br=$BR_LAN,helper=$HELPER" -device "e1000,id=devlan,netdev=lan,mac=$MAC_LAN" + -netdev "bridge,id=wan,br=$BR_WAN,helper=$HELPER" -device "e1000,id=devwan,netdev=wan,mac=$MAC_WAN" + ) + ;; + generic|64) + o_qemu_extra+=( + -netdev "bridge,id=lan,br=$BR_LAN,helper=$HELPER" -device "virtio-net-pci,id=devlan,netdev=lan,mac=$MAC_LAN" + -netdev "bridge,id=wan,br=$BR_WAN,helper=$HELPER" -device "virtio-net-pci,id=devwan,netdev=wan,mac=$MAC_WAN" + ) + ;; + esac } case "${o_subtarget%-*}" in