From patchwork Thu Jan 4 14:40:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 10144883 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5F3F7601A1 for ; Thu, 4 Jan 2018 14:45:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 511CB286DF for ; Thu, 4 Jan 2018 14:45:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 43699286E4; Thu, 4 Jan 2018 14:45:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E5C1C286DF for ; Thu, 4 Jan 2018 14:45:24 +0000 (UTC) Received: from localhost ([::1]:39645 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eX6lo-00054b-3I for patchwork-qemu-devel@patchwork.kernel.org; Thu, 04 Jan 2018 09:45:24 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52645) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eX6hj-0000gz-Ou for qemu-devel@nongnu.org; Thu, 04 Jan 2018 09:41:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eX6hd-0002vd-RR for qemu-devel@nongnu.org; Thu, 04 Jan 2018 09:41:11 -0500 Received: from mail-qk0-x244.google.com ([2607:f8b0:400d:c09::244]:35437) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eX6hd-0002uS-K6; Thu, 04 Jan 2018 09:41:05 -0500 Received: by mail-qk0-x244.google.com with SMTP id 143so2148893qki.2; Thu, 04 Jan 2018 06:41:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hvwfH9sq1jQvr58Q/oGbYfQYA6o+JX6tCyEjRLjlqCI=; b=rj7dvaEQr1wsxUBGnpJMqyKrN5cbhJA64NG9QWvXqwGtka1h7j3fe0HdopQ77xxJLc 4QeRsyhyWRqB0t+4jqJCq3W4ISvPIM1Ch0nThsvD0mDPEeKboLAh5wJqm9jfMFmMoQB0 HC3d4d6fM3PkUp6jRROo6iHP9zks5YKeGg038ifVP+DznLhEtPMR78/cbihm4Lb61HX9 Q+tlShCl6iIjPx1f45jRxDAqxzNK6KFISDmchtUiUdm2ULXP5DsKnr0oa1Qq8yefYXX2 eAY4yNl6F77wF/FQz35/GqQGRlI4/G7kamOX1GtmFk/3V82SyX9RYnIW39A8TA8+h+79 GvBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=hvwfH9sq1jQvr58Q/oGbYfQYA6o+JX6tCyEjRLjlqCI=; b=fpHfl5ELz5p1c7M1EeHzC6CvRgFyZkVB7jyrNJNSaC9O/GVfCKrwaZzKcjYXirJMqT P6jQbi6jyJuJFqBiOhY/Ju4bop4M9qoRJYOyTTt3atwFMvBPp2eIkvp/A+THb2Fq6hon mqwTddV4Oo0VMj1aH9Fp5OnOvP5ym4UmM07GexfpcVT094CuvrU/uNxb0ErhQPyXBINd TOMbhFPXyVJeUm/yTbXbmVkwS7uEIoZp1TbTuvHPLnTQ3lbTg6dIf2doGHwy7vGR4R4i hqTF1aECWmYEkrcsjIx81BWPJVBmIeMH2F1PT5lgh8bXBuycC9kcGc5jb9FE58aJIBpf 9U/Q== X-Gm-Message-State: AKGB3mJ7wACSt+jyDfJNaorMF84ikaVppCYQnZ2gRpAnGckYrlDHBYw7 yK3GfUweNgfUJLRJDr1bTU0JyVzsXqM= X-Google-Smtp-Source: ACJfBou0zI08jYejtSMNb1x6DMmQdj8ZCjKAhSOnNIvA87daG9lfskSJ919ZQTSCI0gCGwwCU5om2Q== X-Received: by 10.55.39.204 with SMTP id n195mr6073357qkn.68.1515076865030; Thu, 04 Jan 2018 06:41:05 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id l188sm2223304qkd.36.2018.01.04.06.41.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Jan 2018 06:41:04 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , "Edgar E . Iglesias" , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Igor Mammedov , Eduardo Habkost , Markus Armbruster , Sascha Silbe , Alexander Graf Date: Thu, 4 Jan 2018 11:40:42 -0300 Message-Id: <20180104144046.30793-3-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180104144046.30793-1-f4bug@amsat.org> References: <20180104144046.30793-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::244 Subject: [Qemu-devel] [RFC PATCH 2/6] hw/net/e1000: real device name is 'e1000-82540em', 'e1000' is an alias 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: Fam Zheng , Jason Wang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, qemu-arm@nongnu.org, Stefan Hajnoczi , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Philippe Mathieu-Daudé --- hw/net/e1000.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hw/net/e1000.c b/hw/net/e1000.c index 05a00cba31..2280f7fdf9 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -1648,6 +1648,7 @@ typedef struct E1000Info { uint16_t device_id; uint8_t revision; uint16_t phy_id2; + const char **aliases; } E1000Info; static void e1000_class_init(ObjectClass *klass, void *data) @@ -1695,10 +1696,11 @@ static const TypeInfo e1000_base_info = { static const E1000Info e1000_devices[] = { { - .name = "e1000", + .name = "e1000-82540em", .device_id = E1000_DEV_ID_82540EM, .revision = 0x03, .phy_id2 = E1000_PHY_ID2_8254xx_DEFAULT, + .aliases = (const char * []) {"e1000", NULL}, }, { .name = "e1000-82544gc", @@ -1725,6 +1727,7 @@ static void e1000_register_types(void) type_info.name = info->name; type_info.parent = TYPE_E1000_BASE; + type_info.aliases = info->aliases; type_info.class_data = (void *)info; type_info.class_init = e1000_class_init; type_info.instance_init = e1000_instance_init;