From nobody Tue Oct 28 01:56:30 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1515076995403877.1968580150749; Thu, 4 Jan 2018 06:43:15 -0800 (PST) Received: from localhost ([::1]:39434 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eX6ji-00021F-Li for importer@patchew.org; Thu, 04 Jan 2018 09:43:14 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52380) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eX6hd-0000bn-Co for qemu-devel@nongnu.org; Thu, 04 Jan 2018 09:41:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eX6hZ-0002nD-HM for qemu-devel@nongnu.org; Thu, 04 Jan 2018 09:41:05 -0500 Received: from mail-qk0-x244.google.com ([2607:f8b0:400d:c09::244]:45318) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eX6hZ-0002mK-7w; Thu, 04 Jan 2018 09:41:01 -0500 Received: by mail-qk0-x244.google.com with SMTP id o126so2135327qke.12; Thu, 04 Jan 2018 06:41:01 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id l188sm2223304qkd.36.2018.01.04.06.40.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Jan 2018 06:40:59 -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=VckVE1NrM2CKq5LqdQMK+DG/tuT4iBPdy4x7DeuqZoY=; b=rnUJ2ykXMJtLHiX2tiAFHeLx5zwf8QBJssL+4Zp4aDwF4pD4hwY47LXlVW38dpKC+x 8tkQmXh4enqS7nJHAMHdxaMnWnhK1k0WJXj2yfsU+We8HFFRFS627IxmjBZNvIML5V7R z4g+Z+rAgeF61iMnNOx0pe7pdC04ZoHBxQRWfcKSKf/LA9XTzhvvZKcnb8IDgfeQc1Vw SZ7KJjW3M0blWsuUiXxQJl4nnNQ8VwPB/xtAbY023sj8CbGEfCsBzT0XuqUVBeHLUunX ZwTmwEqKCSXxJG59f6W8e9uZlQsFeW7d9e9dM7/WlgOijQjZf77o0HhrDDgs0E9l34Et b9eg== 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=VckVE1NrM2CKq5LqdQMK+DG/tuT4iBPdy4x7DeuqZoY=; b=l4kCT1f8KAOrTb02i7naF0MmIv6z48ZcvqkfUZnE4n6hIulA0JVuK+MB/SdX8mKTt4 sM22SzHoFiT8E/xruBRPcUw9X6rgPobKA1yciBFaL+QGrVzvvz6U5SiLEj7rY85j+twU utRo/LJ1LuDyBaWOtVQclAPDugFw7e3UiequuaOAgqxiazMBsKqnnyTvpCTXwIv5g/2G /c0TD1MubyvAw4kMMH2JvfZC+A1AmOooI5DiX+bUEkZndEQhX7ZEn+hb5OX243GgdzsE KpOYGIj0/7TMOsIlq2Xsk/yLas73cV+3Us/NypQ334hiyPXWmVxPD8/njTr8VBnHyyAE 7Q5g== X-Gm-Message-State: AKGB3mKrXetFyP8XfpTz1R6WX+HMXOdl/vpKl3zghK+k5oN02+nL/Ia6 Vmm+Y5qPNG5qhw5NfOrcVH8= X-Google-Smtp-Source: ACJfBov6OV2AKz9lZ9pqw118dnsAf8p2v5SXNVec2mR17Aaj5c3VqWWRhlM4c5EDxWOJYkvsPaEP1Q== X-Received: by 10.55.128.196 with SMTP id b187mr6344263qkd.87.1515076860597; Thu, 04 Jan 2018 06:41:00 -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 , Peter Crosthwaite Date: Thu, 4 Jan 2018 11:40:41 -0300 Message-Id: <20180104144046.30793-2-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 1/6] qom: introduce TypeInfo name aliases 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 , =?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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/qom/object.h | 3 +++ qom/object.c | 18 ++++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/include/qom/object.h b/include/qom/object.h index dc73d59660..5d6e8795d4 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -428,6 +428,8 @@ struct Object * TypeInfo: * @name: The name of the type. * @parent: The name of the parent type. + * @aliases: A list of alias names for the type. This should point to a st= atic + * array that's terminated with a zero filled element. * @instance_size: The size of the object (derivative of #Object). If * @instance_size is 0, then the size of the object will be the size of = the * parent object. @@ -468,6 +470,7 @@ struct TypeInfo { const char *name; const char *parent; + const char **aliases; =20 size_t instance_size; void (*instance_init)(Object *obj); diff --git a/qom/object.c b/qom/object.c index c58c52d518..c532a8aa65 100644 --- a/qom/object.c +++ b/qom/object.c @@ -83,10 +83,15 @@ static GHashTable *type_table_get(void) =20 static bool enumerating_types; =20 -static void type_table_add(TypeImpl *ti) +static void type_table_add_with_key(TypeImpl *ti, const char *key_name) { assert(!enumerating_types); - g_hash_table_insert(type_table_get(), (void *)ti->name, ti); + g_hash_table_insert(type_table_get(), (void *)key_name, ti); +} + +static void type_table_add(TypeImpl *ti) +{ + type_table_add_with_key(ti, ti->name); } =20 static TypeImpl *type_table_lookup(const char *name) @@ -137,6 +142,15 @@ static TypeImpl *type_register_internal(const TypeInfo= *info) ti =3D type_new(info); =20 type_table_add(ti); + + if (info->aliases) { + int i; + + for (i =3D 0; info->aliases[i]; i++) { + type_table_add_with_key(ti, info->aliases[i]); + } + } + return ti; } =20 --=20 2.15.1 From nobody Tue Oct 28 01:56:30 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1515077148033777.9782136773578; Thu, 4 Jan 2018 06:45:48 -0800 (PST) Received: from localhost ([::1]:39645 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eX6mB-00054b-Ad for importer@patchew.org; Thu, 04 Jan 2018 09:45:47 -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) 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) 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) 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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; =20 static void e1000_class_init(ObjectClass *klass, void *data) @@ -1695,10 +1696,11 @@ static const TypeInfo e1000_base_info =3D { =20 static const E1000Info e1000_devices[] =3D { { - .name =3D "e1000", + .name =3D "e1000-82540em", .device_id =3D E1000_DEV_ID_82540EM, .revision =3D 0x03, .phy_id2 =3D E1000_PHY_ID2_8254xx_DEFAULT, + .aliases =3D (const char * []) {"e1000", NULL}, }, { .name =3D "e1000-82544gc", @@ -1725,6 +1727,7 @@ static void e1000_register_types(void) =20 type_info.name =3D info->name; type_info.parent =3D TYPE_E1000_BASE; + type_info.aliases =3D info->aliases; type_info.class_data =3D (void *)info; type_info.class_init =3D e1000_class_init; type_info.instance_init =3D e1000_instance_init; --=20 2.15.1 From nobody Tue Oct 28 01:56:30 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1515077152085861.7333321479784; Thu, 4 Jan 2018 06:45:52 -0800 (PST) Received: from localhost ([::1]:39639 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eX6m4-0004uP-UJ for importer@patchew.org; Thu, 04 Jan 2018 09:45:40 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52714) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eX6hl-0000iI-IS for qemu-devel@nongnu.org; Thu, 04 Jan 2018 09:41:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eX6hi-00030g-1D for qemu-devel@nongnu.org; Thu, 04 Jan 2018 09:41:13 -0500 Received: from mail-qk0-x242.google.com ([2607:f8b0:400d:c09::242]:33211) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eX6hh-0002zs-P5; Thu, 04 Jan 2018 09:41:09 -0500 Received: by mail-qk0-x242.google.com with SMTP id x7so2150720qkb.0; Thu, 04 Jan 2018 06:41:09 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id l188sm2223304qkd.36.2018.01.04.06.41.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Jan 2018 06:41:08 -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=JRH7w+A9KQ+7j2RUYLYMc2679FKqvTKsJ/8GcIPoh7w=; b=JQaCHa3z84DXXNvHve4+aLeE5r25ZCYGOjq2h3oNQva3zgK5d8xSjYmjWaim/xnQMn tckzuCaNaxarxEMJVPcgjTC1Zx0jofyImWHuKggFKs/3pk5OUKGsNgy7kehR60tTmyED WZhC59SplWRdE//YHVOMhnnHgCrkkg+ImRVCGHvLym5JC774ZrVzpaAM0ZsLEjDL2Nga 0TomZLFx64+QrJSJyw46Tby3MNqrAEN9g3mLFJJ0rYHHuUxKv6KUqfctzNXoeIwUngUA Gt4djLGK7pWA2Q0SiMOZIvux9sQXC+oT/VDCc+LY6yEN/OJ7NStgWnkOCZXMGr/mki8r eejA== 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=JRH7w+A9KQ+7j2RUYLYMc2679FKqvTKsJ/8GcIPoh7w=; b=NzRrF3GLZ7ErxGx1p1V3KwI5lWshorw3TrvzPAZsBcbk1cRMokYIpwrDTD8ZEgtnZk SuYzeKqqrNj+tRwkY7H3pnlReXPkEujgowRBrexTP+XkqQQpOL+8n38xix6LE0XfydE0 r4KJpRed2LiVMJRWdz3nRlj+J+DJ08N/mrDQNTeSXNbIXDKZWzk6PuNztuRmjsGSRJUd XYngoKWCU7a5qOVEG9xsVEjzZn5CAkj+mEZSLLcw5FybKGiaGIoyckJrvxKsQm9Mn0GH zJcxNW0bEaSLW+fuJiNyVZ2R+ewwD5fyYv4gPY6ZzQ+Z+fFVVSXKdFsZkagTMND9Njkw /Pww== X-Gm-Message-State: AKGB3mIwZSeFy2KBNdMKwvtiif6Moe1dSAKhKAiYA0+0sbDaFXiEoqpY zCBmN8QSBeXIkawPoid/uCw= X-Google-Smtp-Source: ACJfBotS5pX1soXis3QVscHteqkQtEys+YyzouD8xxH6z8o7st+5YkRR9J0IgH+NOJt1t7nTv62GuA== X-Received: by 10.55.214.198 with SMTP id p67mr6335823qkl.250.1515076869182; Thu, 04 Jan 2018 06:41:09 -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 , Alexander Graf , Peter Crosthwaite Date: Thu, 4 Jan 2018 11:40:43 -0300 Message-Id: <20180104144046.30793-4-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::242 Subject: [Qemu-devel] [RFC PATCH 3/6] hw/char/cadence_uart: add FDT aliases 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 , "Edgar E. Iglesias" , =?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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- hw/char/cadence_uart.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hw/char/cadence_uart.c b/hw/char/cadence_uart.c index 6143494060..6880827947 100644 --- a/hw/char/cadence_uart.c +++ b/hw/char/cadence_uart.c @@ -552,6 +552,13 @@ static void cadence_uart_class_init(ObjectClass *klass= , void *data) =20 static const TypeInfo cadence_uart_info =3D { .name =3D TYPE_CADENCE_UART, + .aliases =3D (const char * []) { + "cdns,uart-r1p8", + "xlnx,xuartps", /* Zynq-7xxx SoC */ + "cdns,uart-r1p12", + "xlnx,zynqmp-uart", /* Zynq Ultrascale+ MPSoC */ + NULL + }, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(CadenceUARTState), .instance_init =3D cadence_uart_init, --=20 2.15.1 From nobody Tue Oct 28 01:56:30 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1515077264824356.7781160691933; Thu, 4 Jan 2018 06:47:44 -0800 (PST) Received: from localhost ([::1]:39859 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eX6o4-0006dg-2N for importer@patchew.org; Thu, 04 Jan 2018 09:47:44 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52882) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eX6hq-0000lL-1H for qemu-devel@nongnu.org; Thu, 04 Jan 2018 09:41:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eX6hm-000397-68 for qemu-devel@nongnu.org; Thu, 04 Jan 2018 09:41:17 -0500 Received: from mail-qk0-x242.google.com ([2607:f8b0:400d:c09::242]:37218) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eX6hl-000380-UP; Thu, 04 Jan 2018 09:41:14 -0500 Received: by mail-qk0-x242.google.com with SMTP id p13so2144453qke.4; Thu, 04 Jan 2018 06:41:13 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id l188sm2223304qkd.36.2018.01.04.06.41.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Jan 2018 06:41:12 -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=rdDW/K+V2S1TJmsCE2B1sG6m5yq9IskzODbwzPOi1SI=; b=D62nis4iz0dwH7+xfYZCgqgOm9Hey68kHKnzqV8jbfBq1WJ1iC9EcJec7bLM/HS3cO dPcpTmWG6XgQM8Gz0rFCijp90U3CUdVejl70HM2RllltFSM7ENPL8BLmYB3v/kqhoaif ZDJocTdwV+CBzltYLyqol30g1Ud4qGw/pg309C5iYxVc1ny4bvF7yCdQ9rfovE0Juz5e EOFBQKRut4wl+lI4vyVFqtiKAe0u4klQqnhNxox5TArygyElzeGuqZ2hPMt5g9cdhJLn Vk1EtCBgfp3zMsOctUuehlFcHIxsMMNS8gV0mWQyEnAn39+epWqS1G+8g6FZuypcQYjF lMpQ== 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=rdDW/K+V2S1TJmsCE2B1sG6m5yq9IskzODbwzPOi1SI=; b=NZGjF/XsPHM0feX5B5zUQTTnMRHTdeftWrs0RmZZDvQUNlcb0cUP7JfIYz6aZ5Bi41 kfiVUWF3IeCijGxUbrdbf9vBk8IJ1Z3GI8PCBRTFcdYX7e30mwWwgxnlovALlFm5he+n OW3dRWfK5tK5IYfmXtNkxLFccVsME4uGyqhCpm8l+Woxpsst2fcHvpiU63ckyuOdXowZ rUoJ60YY+NnYKyDw+LJePWbOHHP40KfPmEixQcFf5cIriHgmTKaFj+Pb0Cc0rU70yhxM SpnJqek2glAx8fbXb+o8nzX0Hbx4H5qRUMj9MYbP0Hv1U6s/x2gQMvVhSOuZOJTkzn69 YZ0Q== X-Gm-Message-State: AKGB3mIpTSZVmFm80gkeNXr/KsDHouq+h+Cnx8Xgy+JBiPg2KSZdZAW0 lOKHcvUKrxU5DmIFTog4z4E= X-Google-Smtp-Source: ACJfBovnWsIevpoo/K100a2USxA0pT2WVvgV30WzeHcECtddyFjZTsJaY6UDaGy0LArtUppI7JRTOA== X-Received: by 10.233.237.14 with SMTP id c14mr6377856qkg.323.1515076873418; Thu, 04 Jan 2018 06:41:13 -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 Date: Thu, 4 Jan 2018 11:40:44 -0300 Message-Id: <20180104144046.30793-5-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::242 Subject: [Qemu-devel] [RFC PATCH 4/6] arm/xlnx-zynq: use FDT names for the Cadence UART 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: Peter Maydell , Fam Zheng , "Edgar E. Iglesias" , =?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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- hw/arm/xilinx_zynq.c | 1 + hw/arm/xlnx-zynqmp.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index 1836a4ed45..c45c364583 100644 --- a/hw/arm/xilinx_zynq.c +++ b/hw/arm/xilinx_zynq.c @@ -236,6 +236,7 @@ static void zynq_init(MachineState *machine) sysbus_create_simple("xlnx,ps7-usb", 0xE0002000, pic[53-IRQ_OFFSET]); sysbus_create_simple("xlnx,ps7-usb", 0xE0003000, pic[76-IRQ_OFFSET]); =20 + /* "xlnx,xuartps" */ cadence_uart_create(0xE0000000, pic[59 - IRQ_OFFSET], serial_hds[0]); cadence_uart_create(0xE0001000, pic[82 - IRQ_OFFSET], serial_hds[1]); =20 diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c index 325642058b..38f038786c 100644 --- a/hw/arm/xlnx-zynqmp.c +++ b/hw/arm/xlnx-zynqmp.c @@ -155,7 +155,7 @@ static void xlnx_zynqmp_init(Object *obj) } =20 for (i =3D 0; i < XLNX_ZYNQMP_NUM_UARTS; i++) { - object_initialize(&s->uart[i], sizeof(s->uart[i]), TYPE_CADENCE_UA= RT); + object_initialize(&s->uart[i], sizeof(s->uart[i]), "xlnx,zynqmp-ua= rt"); qdev_set_parent_bus(DEVICE(&s->uart[i]), sysbus_get_default()); } =20 --=20 2.15.1 From nobody Tue Oct 28 01:56:30 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1515077028723207.89383702479495; Thu, 4 Jan 2018 06:43:48 -0800 (PST) Received: from localhost ([::1]:39436 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eX6kF-0002eV-UF for importer@patchew.org; Thu, 04 Jan 2018 09:43:48 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52991) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eX6ht-0000oc-5X for qemu-devel@nongnu.org; Thu, 04 Jan 2018 09:41:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eX6hq-0003Hy-SR for qemu-devel@nongnu.org; Thu, 04 Jan 2018 09:41:21 -0500 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:44283) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eX6hq-0003HF-Lp; Thu, 04 Jan 2018 09:41:18 -0500 Received: by mail-qt0-x242.google.com with SMTP id m59so2074963qte.11; Thu, 04 Jan 2018 06:41:18 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id l188sm2223304qkd.36.2018.01.04.06.41.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Jan 2018 06:41:17 -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=GO/cA/dWsZ+eWRJei/R5K07vX1gp6KKxn66RqRucfl0=; b=fWIQNtQN3PeSeHR/sx7SJIjwSzS1JiXBsmUsgtC97AhBRhzvcOW8iFbytZlCEkY+a1 mt2ow/p+sTt8hMjK22c/EKUrt0gvRupH2aDkoPMefYtYf0ZtRYC50fQ8qE0E1aaRjliz 60je2Vul5gpzRVu2BN88afLg6EWmkOLfkLcZ+eIUug2xnFQelGWZFja1y4MN0W7ApzcS BLmlf7XiMMTzgNRJsBbc8F/aV7CykzGO/pgfXBneHTR3PrPO6bx+m4DJ7mu+qan8ZFc+ JMkuDU+kYhF76oYwc8JymDOV4WvYv1DgDzWge70MWOR0Km1GNwK703C1rJxwsTSkXW2R adSw== 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=GO/cA/dWsZ+eWRJei/R5K07vX1gp6KKxn66RqRucfl0=; b=B81i+MQRee6OQLApNcCUSPbFsETgKhgSyDMApH8bwH4T0/j3I0Q6QDRa7y/llabzqb M98CZo+eUofokKwshRL+jcKg6JgjYYAHxppx8I15RSQPLa00KOLtrGw+zyrMJwSDsxnW P0BJg/o3v8KQXXCI6qC0cbce8t+gFhQhwfG8Gm/qlQIoA1Ar+oiZn5o3yJPKsocIXc38 jyI2l3BKXFdAYozjXgm5Ul+17m9BDEhfMmj3fxiMD9F85A6tUJ6RIdZEF8T+U/7axMTh BoYn9EZwhcGxqWuwYXdEvUOiatzyB3e9ZbLeQ2NIhZIgpycmp5OUT5uF8GBUgP3VAQ3l 2OmA== X-Gm-Message-State: AKGB3mJDWXb1TU7WIDr+KWnOhKjjOSlv7tv1/Rk7geTa7+s3HRF7PZ65 v8G2oveHRKT/qnzwcLZz+Ss= X-Google-Smtp-Source: ACJfBouBSaXFiIW7Rdm1iFi3/T/Axo4/zJLRkyhn8KqDfyM9Ty5AMeZw+24Q1xnfhyBE6AeE+Fq0Cg== X-Received: by 10.237.63.121 with SMTP id q54mr6606885qtf.337.1515076878107; Thu, 04 Jan 2018 06:41:18 -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 , Alexander Graf , Peter Crosthwaite Date: Thu, 4 Jan 2018 11:40:45 -0300 Message-Id: <20180104144046.30793-6-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::242 Subject: [Qemu-devel] [RFC PATCH 5/6] hw/net/cadence_gem: add FDT names as 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 , "Edgar E. Iglesias" , =?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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- hw/net/cadence_gem.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c index 3943187572..b7b4540d91 100644 --- a/hw/net/cadence_gem.c +++ b/hw/net/cadence_gem.c @@ -1544,6 +1544,12 @@ static void gem_class_init(ObjectClass *klass, void = *data) =20 static const TypeInfo gem_info =3D { .name =3D TYPE_CADENCE_GEM, + .aliases =3D (const char * []) { + "cdns,gem", + "cdns,zynq-gem", /* Zynq-7xxx SoC */ + "cdns,zynqmp-gem", /* Zynq Ultrascale+ MPSoC */ + NULL + }, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(CadenceGEMState), .instance_init =3D gem_init, --=20 2.15.1 From nobody Tue Oct 28 01:56:30 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1515077020156548.4866139179666; Thu, 4 Jan 2018 06:43:40 -0800 (PST) Received: from localhost ([::1]:39435 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eX6k7-0002Wk-C0 for importer@patchew.org; Thu, 04 Jan 2018 09:43:39 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53065) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eX6hw-0000rx-01 for qemu-devel@nongnu.org; Thu, 04 Jan 2018 09:41:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eX6hv-0003OL-7U for qemu-devel@nongnu.org; Thu, 04 Jan 2018 09:41:24 -0500 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:40718) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eX6hv-0003Nc-3J; Thu, 04 Jan 2018 09:41:23 -0500 Received: by mail-qk0-x241.google.com with SMTP id q14so2149752qke.7; Thu, 04 Jan 2018 06:41:22 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id l188sm2223304qkd.36.2018.01.04.06.41.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Jan 2018 06:41:21 -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=cAoG7VphkUEFTzHsvOl83OAUEf6MFYJLtCKyEuj5PZw=; b=CfX0sD5GLS5xAAmYiXXcjeeEfRHMSgcxaxMa83e8Ri0Xye0ULR5sxKualSz9Kqk1Ga GUFKFhfbHKIzQnUQje/e5BYVh5q4io2Y3awUKlWxUDQrvAXQl83RSVAcMT2V0c7raZUq HyUceh255KupWNVwUcJCRR7OsW73Q02umJj5FTiDBpooOyXDRBdaPiAolDGwcsE61frb 0+TXHtYYWJoNm4doIWA6gLSnx3pshoHiGOgEmipU6fi9XfXeFfxDxhg5wQL0ADkde/PG kSI0oHmwjWVHRPzJkHkGbQXr3luAx1M2YQQW58HjQSJYlbFk95UrbNdRnrO0FNrR7Yt4 lnHw== 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=cAoG7VphkUEFTzHsvOl83OAUEf6MFYJLtCKyEuj5PZw=; b=AUXw8Ms9xs7p0bAapdeTZVi65dLp2qilov9jVBWQEzvFNm0sPHd8/zcP0bUJcRZC3q h5Y3oYEbBsEbe+47kdApfMOQjmsjW8nY540ob76nv2nICgXalZ752QUPaqwLDYV93Efz Cs9tDyckR9GxwkKne/2PC6wAjCIWoRiRVU0UrjRgeR2W1rMdqb6HJqjL5vkWdzys4Bt/ E1NLhNxtaDuYiqy8SQmt0g2VBOdG77jSqYuOJs+c7XSJm/Fz+qTLKh613gUZkGcaEvdh jTx+V0ySmCX/5grkvXHNMsK2RAAitD6DFmI1oBrM1X4sILWqRM1mEWw3Y5tuHHKzmFBC zEEQ== X-Gm-Message-State: AKGB3mIwnZCr8Mkvb0V98nCmp2bvZe1paZQnB50JouvaL4cFoI+l/J11 Ra7l6g7K7RW57xTtPgLpbkg= X-Google-Smtp-Source: ACJfBotm+qbteF29jzO+EbbE7Ir7ng3T13JSEx5oK1I3II/4fLM9CVU/etqC73ytnBE3RNZ0RN/xuA== X-Received: by 10.55.200.8 with SMTP id c8mr6519308qkj.3.1515076882448; Thu, 04 Jan 2018 06:41:22 -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 Date: Thu, 4 Jan 2018 11:40:46 -0300 Message-Id: <20180104144046.30793-7-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::241 Subject: [Qemu-devel] [RFC PATCH 6/6] hw/arm/xlnx-zynq: use FDT names for the Cadence GEM 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: Peter Maydell , Fam Zheng , "Edgar E. Iglesias" , =?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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- hw/arm/xilinx_zynq.c | 1 + hw/arm/xlnx-zynqmp.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index c45c364583..5ae18921c1 100644 --- a/hw/arm/xilinx_zynq.c +++ b/hw/arm/xilinx_zynq.c @@ -245,6 +245,7 @@ static void zynq_init(MachineState *machine) sysbus_create_varargs("cadence_ttc", 0xF8002000, pic[69-IRQ_OFFSET], pic[70-IRQ_OFFSET], pic[71-IRQ_OFFSET], NU= LL); =20 + /* cdns,gem */ gem_init(&nd_table[0], 0xE000B000, pic[54-IRQ_OFFSET]); gem_init(&nd_table[1], 0xE000C000, pic[77-IRQ_OFFSET]); =20 diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c index 38f038786c..1aed89707c 100644 --- a/hw/arm/xlnx-zynqmp.c +++ b/hw/arm/xlnx-zynqmp.c @@ -150,7 +150,7 @@ static void xlnx_zynqmp_init(Object *obj) qdev_set_parent_bus(DEVICE(&s->gic), sysbus_get_default()); =20 for (i =3D 0; i < XLNX_ZYNQMP_NUM_GEMS; i++) { - object_initialize(&s->gem[i], sizeof(s->gem[i]), TYPE_CADENCE_GEM); + object_initialize(&s->gem[i], sizeof(s->gem[i]), "cdns,zynqmp-gem"= ); qdev_set_parent_bus(DEVICE(&s->gem[i]), sysbus_get_default()); } =20 --=20 2.15.1