From patchwork Thu Sep 7 15:57:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 811083 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=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=xilinx.onmicrosoft.com header.i=@xilinx.onmicrosoft.com header.b="xphjSeLK"; dkim-atps=neutral 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 3xp4zJ64hRz9s78 for ; Fri, 8 Sep 2017 02:05:00 +1000 (AEST) Received: from localhost ([::1]:41163 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpzIZ-0006mk-0S for incoming@patchwork.ozlabs.org; Thu, 07 Sep 2017 12:04:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39596) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpzEb-0003rq-Eg for qemu-devel@nongnu.org; Thu, 07 Sep 2017 12:01:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dpzEW-0003YB-Jx for qemu-devel@nongnu.org; Thu, 07 Sep 2017 12:00:53 -0400 Received: from mail-sn1nam01on0075.outbound.protection.outlook.com ([104.47.32.75]:8421 helo=NAM01-SN1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dpzEW-0003XS-Cc; Thu, 07 Sep 2017 12:00:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector1-xilinx-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=jN+rFe3RGpVDVz9bnIo7t/7jAD/krMrGu5rMRk4yPnM=; b=xphjSeLKU4WI/BxoC3cBt6Qj2NjB2rRV+W1vaGqeB69cHga8ILSm6GL7zUbcZZGKPBXabStKsSkN3ygKxPsF+HvU0y/ekOIO6vnyHu/6CpBTtiJ0HuHrs7152Q1VKkDwtts9WiMCwfeUmmJSpby2tOaDxW7eJZETdoHY7gEhL74= Received: from SN4PR0201CA0020.namprd02.prod.outlook.com (10.161.238.158) by BY2PR0201MB1926.namprd02.prod.outlook.com (10.163.75.156) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.13.10; Thu, 7 Sep 2017 16:00:46 +0000 Received: from BL2NAM02FT032.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::202) by SN4PR0201CA0020.outlook.office365.com (2603:10b6:803:2b::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.35.12 via Frontend Transport; Thu, 7 Sep 2017 16:00:45 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.100) smtp.mailfrom=xilinx.com; nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=bestguesspass action=none header.from=xilinx.com; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.60.100 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.100; helo=xsj-pvapsmtpgw02; Received: from xsj-pvapsmtpgw02 (149.199.60.100) by BL2NAM02FT032.mail.protection.outlook.com (10.152.77.169) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1385.11 via Frontend Transport; Thu, 7 Sep 2017 16:00:44 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:39694 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1dpzER-0002Zi-3N; Thu, 07 Sep 2017 09:00:43 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1dpzEQ-0002gc-VB; Thu, 07 Sep 2017 09:00:43 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1dpzEJ-0002eC-LR; Thu, 07 Sep 2017 09:00:35 -0700 From: Alistair Francis To: , , Date: Thu, 7 Sep 2017 08:57:00 -0700 Message-ID: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.1.0.1062-23310.003 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.100; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(39860400002)(2980300002)(438002)(189002)(199003)(47776003)(33646002)(305945005)(48376002)(54906002)(50466002)(50986999)(76176999)(4326008)(5003940100001)(36756003)(118296001)(626005)(50226002)(2950100002)(478600001)(8936002)(189998001)(63266004)(77096006)(36386004)(8676002)(2906002)(106466001)(2201001)(81166006)(5660300001)(107886003)(81156014)(9786002)(6666003)(356003)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR0201MB1926; H:xsj-pvapsmtpgw02; FPR:; SPF:Pass; PTR:xapps1.xilinx.com,unknown-60-100.xilinx.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2NAM02FT032; 1:1HR5ia1tAb7Kt12wnDOTGr3HuOWSwGutk/RyRGJWZHXCFVggC98eA/nF7jMUDgG+Agw5oa6orKFuJBohR66jI+TyseFpeUbTSw2sTE15oEDBFf43o6AXCsp5Y95GIqg3 MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8a35f7e1-4de6-45c7-6a01-08d4f6099967 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(300000502095)(300135100095)(22001)(2017030254152)(8251501002)(300000503095)(300135400095)(2017052603199)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:BY2PR0201MB1926; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0201MB1926; 3:xz+3fVGHE/fU/vVXiqXotnAy3MUDEtWABpKL4GTXgsc2eIk4ODIYpYruihaNFP69XMnTjKzJu3O8mxrPPC1oY+Jo/GkqwnyAWd65RIb804CIXVggKimrPEn/7wNxq0uGoIgn3Ut6v+tbESnkeewyEPsT7hRcifZsvjSibNdJjvvjjz0WnMBL08EbFpy0C7GFn4VBNVJu2gHX9XgpgUDtE/80e+ue8N8VeiV5b+nzXDSjZED+8h/feRRRFj9cPp4y9UmYB7d8WLTzh37eJQZkVVaNLY2lRlc4ZOt6SEYA4enDdcx3KrN75X5nW7rVPDRItv+eVxavyTaA4NTxwlIerIoqsg3ImiIwUwNXYARTJFA=; 25:GDCK1H4Ugxs/9zApa3njBgBI5y5LwPMZHMZ2L5grlQdweIyUNIUOpd8S6FiPWbYqr8n3FpOnxNS5VJAB7qE5vmmlxarhFTli2SAqrctYj1oZzcAg706XeaVmWkKd62CCo0OvnTHV+m2CT1JiKt/PefLSeU5jzpmZHK5ygmhSPia8Likxonms8TjAE/9ySTV5QysNAN2NO0NdQufM3gyRmlJGXQ304wCYXzn0FUGK3ybVC6aV1rMpKSCKvYijF6NpPi2iC1/6OWiX5se4jBLMX40kwXri5FOJJgphkynW2MxBCO0eSp64p0rZMmps5CARTO8NwE5gxKeVMJUzITgjHg== X-MS-TrafficTypeDiagnostic: BY2PR0201MB1926: X-Microsoft-Exchange-Diagnostics: 1; BY2PR0201MB1926; 31:hdwUxU3ewbAz9q6zn/iz8+6hmiR4zfWMiQBevfrdJOAtJvx7ZC7jpnkoadC3GrEqTERCZ30xlh7kxScr0/wxFCVQds8JUxE1ZmUxX3iAAEi145HVJqLZmJWSZEkAKVsBFoIpSEKC7NkqHo9QoAHwgSLtb+sh2iMNmZ13FOVw+hlqXuLjYfb/8MyMkn4DDbO0Lw3nErJKK+S/TUdlxd8JCeQLEFqAKpqly6Z1OrHtLzU=; 20:upSwUm1CphLjEVlZ03KhFx6D46S+Z2AKL7jjFHen8qyDReQNjntXKkLp/syepIIw8cVH/Mb7CRwra5DBtCpwrCJfyrl/9pdbQhkstlrd6DtIIvUoFf5MXwisNuVbiFFCXCATwocx7Fn5wO9sg/Sth8HTIsCTT9hYuMn2z4OGiQzLQzPnWrRufitCwwpTue9X09t/Cj3Nkj6G2wxTI437+O/RjWG2cdNZYriqM9qvGW61K/bJtEfxqZDAJ8HgqRwuuiBzyiTpKrSgMJCBetxg8qYIAwXPmaal4++LfocJE3H4CXbx9RX5oxb1hurYEtCooxKNjyjs/Osc5/fJj42/GCT0IyLLoc3Rnv+MxA5cep1NIt5da4bB0H9pgkEJHpShdav7iOP/m3nWgg9qbTj+0it2aczbnx9c8Wx5l9i2lz5/KZ1qg1PQ/PRd+j4ifp/6UVee724pNi06CEtGgeHlHpKD2r8jnjPI5RQZ9IU+UDBHTCMyGuReWS1nT1hSElon X-Exchange-Antispam-Report-Test: UriScan:(192813158149592); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(93006095)(93004095)(10201501046)(3002001)(100000703101)(100105400095)(6055026)(6041248)(20161123560025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123558100)(20161123555025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BY2PR0201MB1926; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BY2PR0201MB1926; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0201MB1926; 4:cZT6UPIncAPw4xAggqUPeh75bY0NCJNsBFAEPcXARS74BjFdLU8RyFaPVvOkbYGrGMGGywr/GuK5Jx3B6YWJYamlM+MnHOADpi1b2Pl9aPMYkINS02rjQ1JsCNDObMQJlBB6+FAbcrbaZbdq4uf5l0fTLGd4DTUnquNqWn+m6rFsoYb3X19sn06RWt/kucaH2D2hfIYEF524GnkNiWImo+8qW28t1GVQMezHkzHYkiVq7SQeoRE28BJiG6R4DCcKAUbwF0EPWF09vxSM/CkOujPmoJ9I77iRwnE5kKaIjq8= X-Forefront-PRVS: 04238CD941 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR0201MB1926; 23:ls/6FRjDCnZXOr8+hscm0ieIPIlt9ornfpxAsJ1?= 8i2osRzzfzLYTZupZMtho70OJAHl6oXjGKz24r+0ctDjQGSJRKQej+umD7yFS/oFu/pXcfKtOlR99wGWGN+tsT5KbkghIhuFfOqRNNyDTHJQY5RT2yq44gY4tcuaWr/PAcTAFcH6ugjIXUdF25mV4zRpcGSEakDgefg2HxJqoARte8U2hzBO9S93DkoMykRot3B5xlG5R+u4loBFYAv9JfV0o7yzAdS9JIS1VbpAo2Vnx5S+XvNoOMffn1rhQl+3O4EOVreaJWIl0TA3iSsk08OSYg+yraGsz3hVhm5+tf6fWH2h+q5ZuLaYv/WjGD/TomVbQK2McAGC6bdLj4yRP866Se+5C5UOydak7HukHTsolM0rKElwGmA8U8XJL5r+9mccjU2k+rXHhB5qeRw2WBHEQcrZcssIMgEDWzC+tQny/CnUpBj6c0cGp8evPKxRA+bX2Dnudy7+f3jM8CtT03nNSnfyOiNWFtU7JrFZqqpkXsnsKskzl/uqzNeGnKEWAWgoRGcbAAGzVMIf7NtZvGkuR5rB//1QgCeVe8h+sY6DNXkmoQG9rMCxG3fR0qexJ1gPVTsjqHBpCEB5BIsBpcYv/MAk2yBYP6HP1aTIELbleKFGIcYUYwfInQgX4Q8dMVysS6UZ9kbAMSnv9J16OXRzDw3e9q9J+2lv0PXm6tpEzTfYsw1cdTTVe9vsanZbjPEw8/Bz8AeuEh94MunqI80hFBrhlvEp4EZzr1aG4CBbVXJCxnY0sDmeHJ/3b1nN1oFFkZmMRrIArXbf1cHciuVOzpkjhJAp2qaPz2Luv3iBxvq/ScGDdaov73BaThF7JBdjB9HenIBd+Gz+baoqLZk8Tn1Sg6S9T5D0xigohfE80jXG717rid+W1/g9eTlOuzeValXhnOzKgNQkvoUW8ugRHr671lbvvtvrQ3RjbN/1Nw/+YRoPW1mN1zA9kbgJwzCE= X-Microsoft-Exchange-Diagnostics: 1; BY2PR0201MB1926; 6:e/0k4k5stFf4LsdDgi2Eznd2/6T55wl6xJ99nBA7fXWMxlpCzHkSrh8aF/9xWRC5NQU5VT6GriPa3nrRz3B4db8AyZ9n6TnXL+89XjlcYsML1vLIh7UZ4XyqEvWk/ocpmqWFTQdrwIFS5egrzDQI4Ni1qno8usT+PIq1DdZR2UJId7OEgwkxZ4tPFBn9XR6C1YwyMRyGKopyENfHvPJ10WXK4cNaJlcDtGC4dgIwdLIrpGGVh8aBScSBR5X0ywuz5hQv3uDm6eF/Qb7h2TnwM7rzS9xJR/N6DBPQeodXntKq+bLYoe6pCtDktKfjfq8DIdNfHqe6Te9tHVTWMZ5qKw==; 5:jQ53Dpg5QeNi3oaOL5hc+2sssh9+hT0mea3lTtVFgnsfvWx+WzJLkF6TlwlSLSIVY8FxmiRR3wuFs8xGATTUtpjBNjZWlGFkksWmedmEk6AZCCZkO8UZQA2Y26jtWrFJg4rRBvQXkw2G636WAiMfPQ==; 24:5GrcA4TNhvNNUeWtW1niijKyO9ySwxS67Tik3muMPbF/Az+1TO2g6Ga+fSMoP3Y5fvc4hPTUZbZl6seJOfeRQ62u5/Sv85nwb1lY5fyYUKo=; 7:s9qFTWGfZ+qFBczR6G6vablaPrzAfWsjsmQsfuk46AgYTxEaPNWS1Oy4UjMYeb2AtTZmX/IQ0QYwyrZOEN2y0OkQ80WdVSUeZerDBG7AEtPtJRyXGZ/3OnVjd5pNNnoXf2OXfX0esHmogtSiEkarmBlnXlMa6EJ3Hjkr4+OBEywZWzeQIMSvG0oRz4tZWJT+NGFfWKZefrtfT9Fbd6K7zLAuI6tL4HjvAQac+i2U8L0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Sep 2017 16:00:44.2099 (UTC) X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.100]; Helo=[xsj-pvapsmtpgw02] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR0201MB1926 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.32.75 Subject: [Qemu-devel] [PATCH Resend v2 2/5] xlnx-zcu102: Manually create the machines 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: edgar.iglesias@xilinx.com, alistair23@gmail.com, edgar.iglesias@gmail.com, alistair.francis@xilinx.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" In preperation for future work let's manually create the Xilnx machines. This will allow us to set properties for the machines in the future. Signed-off-by: Alistair Francis --- V2: - Remove stray newline hw/arm/xlnx-zcu102.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 67 insertions(+), 7 deletions(-) diff --git a/hw/arm/xlnx-zcu102.c b/hw/arm/xlnx-zcu102.c index 133a6a31a8..03dcd67bd8 100644 --- a/hw/arm/xlnx-zcu102.c +++ b/hw/arm/xlnx-zcu102.c @@ -26,15 +26,24 @@ #include "qemu/log.h" typedef struct XlnxZCU102 { + MachineState parent_obj; + XlnxZynqMPState soc; MemoryRegion ddr_ram; } XlnxZCU102; +#define TYPE_ZCU102_MACHINE MACHINE_TYPE_NAME("xlnx-zcu102") +#define ZCU102_MACHINE(obj) \ + OBJECT_CHECK(XlnxZCU102, (obj), TYPE_ZCU102_MACHINE) + +#define TYPE_EP108_MACHINE MACHINE_TYPE_NAME("xlnx-ep108") +#define EP108_MACHINE(obj) \ + OBJECT_CHECK(XlnxZCU102, (obj), TYPE_EP108_MACHINE) + static struct arm_boot_info xlnx_zcu102_binfo; -static void xlnx_zcu102_init(MachineState *machine) +static void xlnx_zynqmp_init(XlnxZCU102 *s, MachineState *machine) { - XlnxZCU102 *s = g_new0(XlnxZCU102, 1); int i; uint64_t ram_size = machine->ram_size; @@ -116,22 +125,73 @@ static void xlnx_zcu102_init(MachineState *machine) arm_load_kernel(s->soc.boot_cpu_ptr, &xlnx_zcu102_binfo); } -static void xlnx_ep108_machine_init(MachineClass *mc) +static void xlnx_ep108_init(MachineState *machine) +{ + XlnxZCU102 *s = EP108_MACHINE(machine); + + xlnx_zynqmp_init(s, machine); +} + +static void xlnx_ep108_machine_instance_init(Object *obj) { +} + +static void xlnx_ep108_machine_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc = MACHINE_CLASS(oc); + mc->desc = "Xilinx ZynqMP EP108 board"; - mc->init = xlnx_zcu102_init; + mc->init = xlnx_ep108_init; mc->block_default_type = IF_IDE; mc->units_per_default_bus = 1; } -DEFINE_MACHINE("xlnx-ep108", xlnx_ep108_machine_init) +static const TypeInfo xlnx_ep108_machine_init_typeinfo = { + .name = MACHINE_TYPE_NAME("xlnx-ep108"), + .parent = TYPE_MACHINE, + .class_init = xlnx_ep108_machine_class_init, + .instance_init = xlnx_ep108_machine_instance_init, + .instance_size = sizeof(XlnxZCU102), +}; -static void xlnx_zcu102_machine_init(MachineClass *mc) +static void xlnx_ep108_machine_init_register_types(void) { + type_register_static(&xlnx_ep108_machine_init_typeinfo); +} + +static void xlnx_zcu102_init(MachineState *machine) +{ + XlnxZCU102 *s = ZCU102_MACHINE(machine); + + xlnx_zynqmp_init(s, machine); +} + +static void xlnx_zcu102_machine_instance_init(Object *obj) +{ +} + +static void xlnx_zcu102_machine_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc = MACHINE_CLASS(oc); + mc->desc = "Xilinx ZynqMP ZCU102 board"; mc->init = xlnx_zcu102_init; mc->block_default_type = IF_IDE; mc->units_per_default_bus = 1; } -DEFINE_MACHINE("xlnx-zcu102", xlnx_zcu102_machine_init) +static const TypeInfo xlnx_zcu102_machine_init_typeinfo = { + .name = MACHINE_TYPE_NAME("xlnx-zcu102"), + .parent = TYPE_MACHINE, + .class_init = xlnx_zcu102_machine_class_init, + .instance_init = xlnx_zcu102_machine_instance_init, + .instance_size = sizeof(XlnxZCU102), +}; + +static void xlnx_zcu102_machine_init_register_types(void) +{ + type_register_static(&xlnx_zcu102_machine_init_typeinfo); +} + +type_init(xlnx_zcu102_machine_init_register_types) +type_init(xlnx_ep108_machine_init_register_types) From patchwork Thu Aug 31 23:34:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 808470 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=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=xilinx.onmicrosoft.com header.i=@xilinx.onmicrosoft.com header.b="4w7URs+K"; dkim-atps=neutral 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 3xjzQm18hGz9s7p for ; Fri, 1 Sep 2017 09:41:04 +1000 (AEST) Received: from localhost ([::1]:33106 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dnZ54-00059h-8s for incoming@patchwork.ozlabs.org; Thu, 31 Aug 2017 19:41:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46069) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dnZ2O-0003Mv-RM for qemu-devel@nongnu.org; Thu, 31 Aug 2017 19:38:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dnZ2N-0003j0-K6 for qemu-devel@nongnu.org; Thu, 31 Aug 2017 19:38:16 -0400 Received: from mail-dm3nam03on0042.outbound.protection.outlook.com ([104.47.41.42]:55824 helo=NAM03-DM3-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dnZ2F-0003gA-EJ; Thu, 31 Aug 2017 19:38:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector1-xilinx-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=x7YkyGnBxvpc+7eLi5n8j/348oMlMlaEbKAO5sgr804=; b=4w7URs+KdQ3YxGyYZJAApnKieO1gG9Bp1/zG+qDPwYZpbbdIHQhO522JR19tDBRqhvDVlQy89JBB9xvQVlDlNPHEOwBb2ZiMyWm//NZt7uPOzx3UADpgSSTgkhjZQLmoO/MRrQODn+dClpqO73I/w+Ja5vge2EV1m572FnGmz1k= Received: from CY4PR02CA0016.namprd02.prod.outlook.com (10.169.188.26) by BLUPR0201MB1921.namprd02.prod.outlook.com (10.162.239.155) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.13.10; Thu, 31 Aug 2017 23:38:04 +0000 Received: from BL2NAM02FT027.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::201) by CY4PR02CA0016.outlook.office365.com (2603:10b6:903:18::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1385.9 via Frontend Transport; Thu, 31 Aug 2017 23:38:04 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.100) smtp.mailfrom=xilinx.com; gmail.com; dkim=none (message not signed) header.d=none;gmail.com; dmarc=bestguesspass action=none header.from=xilinx.com; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.60.100 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.100; helo=xsj-pvapsmtpgw02; Received: from xsj-pvapsmtpgw02 (149.199.60.100) by BL2NAM02FT027.mail.protection.outlook.com (10.152.77.160) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1385.11 via Frontend Transport; Thu, 31 Aug 2017 23:38:03 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:47854 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1dnZ2A-0000CR-WB; Thu, 31 Aug 2017 16:38:03 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1dnZ2A-0006sY-Sm; Thu, 31 Aug 2017 16:38:02 -0700 Received: from xsj-pvapsmtp01 (xsj-smtp1.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id v7VNbxuk028339; Thu, 31 Aug 2017 16:37:59 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1dnZ27-0006rr-DC; Thu, 31 Aug 2017 16:37:59 -0700 From: Alistair Francis To: , , Date: Thu, 31 Aug 2017 16:34:25 -0700 Message-ID: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.1.0.1062-23292.005 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.100; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(39860400002)(2980300002)(438002)(199003)(189002)(4326008)(305945005)(106466001)(33646002)(118296001)(2201001)(626005)(356003)(9786002)(8936002)(5660300001)(77096006)(2950100002)(36386004)(6666003)(81166006)(81156014)(8676002)(39060400002)(50226002)(54906002)(5003940100001)(47776003)(50466002)(478600001)(50986999)(48376002)(76176999)(63266004)(36756003)(189998001)(2906002)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR0201MB1921; H:xsj-pvapsmtpgw02; FPR:; SPF:Pass; PTR:xapps1.xilinx.com,unknown-60-100.xilinx.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2NAM02FT027; 1:lEyCEDQU6wjvhGZqP2eoAjxb3LtS+a3hvnlpl31Ks0Nf/y7/4ZdZ5UDq/Siu/PQ/fhPXikqH5dX4QGI6bTCnr02PDmGnDuwAEca6IcfyqCm9iYz1btipn+9wY7g2YQWX MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9a84dcc0-7c4a-44a8-8fca-08d4f0c95322 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(8251501002)(300000503095)(300135400095)(2017052603199)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:BLUPR0201MB1921; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0201MB1921; 3:kocvn2MAx7ZG9TMARN0dpCaBFGc8peSvGHvI84V6MFcZiVJGOTCivVd3G51W/iNejbUBacKojkHc+75u4RSwLF3uNKWAIF1QvCg4FPwja7KJGz1wgF3TV6pLkflK3uuzcSV8aSlRACJr/Gee768d51cGM9XMKvZ2RxleDicih41ZYPx65CnRhGZTnwfrHqITHYsQQwSyvjga5Al6en2Fsa+Lr3+/+HhFGSfmUrJXLgAgdaTPBvFcJ6B5CdU6BOh/AiT+IoQyZr0Fmm/Ih73IeII0Oor/hqziiSw4nz5rVMzO+Ktpkr6ty3TRqC5YFOlDldjB9XdZZ85zbayrLDcKa4w4h/2D4ke/MMAISebpWiA=; 25:lKVZtbo7JC25IiMnKDX6CxAIzy/sUkTzMezgEp/pLPDN9vvJjIRwSq4besJYE8U8w6/0pSStqVJNJr4jQ528HGeG5JIahe7k762NHxXvcPSVLE9fVfvCdVpWCHp8x40of6en/UFrLuyQLdhWc+0kC+7nibFdjwqWmdxtbbEZaD7wOF3EL+Ao47CoyjE+FzS27daPsjOVGRYGeGAVP9jJuC16b2AAU1NvtiOx+na+Y7qHviOKSKnxFHnQqxJW6+K0AdiYO0B9RH16lonxcq2+f5RYuoyDjoADB3BdKpq0AlODsetBt9jp5Q89BXl0bGoi0hw1I+hWAjtOdACSrDtbZg== X-MS-TrafficTypeDiagnostic: BLUPR0201MB1921: X-Microsoft-Exchange-Diagnostics: 1; BLUPR0201MB1921; 31:rqkWmrJIwWg0eXYOsqgakeH4gBRb3bwbZewi14RFl0xRTPzAHJ8i1Qz2iI6/yC1dTg2vxcozM2ipewkZaDADzDTcLNd32q80xR57Tf1RC2BC+F8I2A2MgMLzQ9ybxUqB2BWpf2U7nmuECKFv/iYc76aD/yEWALIyC1K9M0G3eAoMKZG/OQDPqhRsw7ZX36uGkYao05ig61DrvAltG4ln9z33BLB0eqzvEjMXidd1/4U=; 20:ivIDbZQ/EyLAr1OC7vsy9zmx7Az2PSaFbESrWdYrdjUFMF0BJYhsH2dAAbN8uqsm10KttQdYH9xB+DMUYF59FYXtmA4LfJSdDDr/Eq2cw4FwuXJtiBKRpwrhVdwoJBIFxFf6sMed9M9LzAXpnEd+HgE+Bc8CTeD4+8nO7nEAJ05AhkvSWEyRMlaFbVu0kOi+/7nLwEexKRog3bLIZpjDquwMNSvwCc0P8wfyGGV4CsasWa7cXRnRoQQBSDveMhAYEvvHe6/ImG1w04lJZW6JLp758e0pkimvkjw0RCjV8NpJNahpGJgY3avaKVc/a8lKMUEDQh3M/QhzEhEwoz6hL3NDkJKN6lKWwqHNBIRcX88zRRKA/81xeDaySemR63KZYenLZWy+uSxd9NzsIQYTcpmAUiN/dWuQ+Y1iAu0mt17wBzGJuorwCDlHUr5KPIklhSf1kW5BUVGRw8oR7Xmd0itp1X6536iAQZsXTnV5x/6VNOZA4SI4PutElTBS9pZ8 X-Exchange-Antispam-Report-Test: UriScan:(192374486261705)(192813158149592); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(8121501046)(5005006)(13016025)(13018025)(3002001)(10201501046)(93006095)(93004095)(100000703101)(100105400095)(6055026)(6041248)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123555025)(20161123558100)(20161123562025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BLUPR0201MB1921; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BLUPR0201MB1921; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0201MB1921; 4:QIXIusVO3FCKRky7D61sJ7/bfWwRfue2a89/s+alcShPsCePH/+9s4i4xx7RGqSl/CstZE5eDG1XGHCqbDb8aFCpNNO0BYvmDuuqq9/UImsaPaLdHISNBiPvVzVUANSoeRgwHdNPrKMab5fZvvZRbmOWzLb7yZPgzRallJryRVilHKvHB0ifRXObNjgQnvbdIjZs3Gik3Ikg6gnr8/dcSaojV1U8O1VSdDeVcWgclowLV1GciH8AtFdqBlIVRcot9XeE/8bRFipMzI95PGHP89So51HwLcbA7KhPh6Ds8Rqop8Nf490hiPU2FJjgzQTTVWhV15JJ7eatiJh4jvOVYw== X-Forefront-PRVS: 04163EF38A X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR0201MB1921; 23:cDjBHJgalGWFP0DzZ0YgXzs82L/mK9OV2uubAMO?= 7tmYHPx0M2iaV0LqhG5GpKKciaGkLUCVoi33bJyoEVZpTkuQ7huoGf7IN2VsxIIn4g6BS//GaXECUTebSnwHX/Hy5rZKdvfOIq6QeVJU9nt4rrx7smYz/0INMWDRMSm9XPiFNlCv/VPARkgm6Tl7gdDf+n+OhuTt00fa0oYpyMa/ermRPiZCwLMmyGIrZUkQ93nbNBzdE7JzA0Eb6/6rHxhJcrG3HZxiwLSW9D0h66boYAKmF07bQSUoLjve6++W2Uer2+cyPuliZF3n1yE4tPMgvbdFgQHInS5sJmySMvWQmXLcTLR2G7YMf/k4MBTQnTqBEQZ8aeB9KRgG7TgtjxsWJxf0fzGF2lkz+MTCSTxKDlmBOkJvoO+E+4sXiMqhdFIdusl+TLL10IwksyQqRSF3Bl2XVoJxbjfd724+MSTFvNxJqjnvoSaCc8GpX9JnnXQv8ik9rACNWrgWNfbHrzUAcbXo33JLaQJbEicM94ju2zzLP/UhuR4a9v24fdnnBK5tlQd6pPXeOc8EnGVkoVBMVohiu9CcrcCb3lWISM76iIeTVldA/bojdZ0MtSLFKhYASCOwgphtjJ5qguuPWiKsyzDCWF8jP/pitsjq1zHPWWa2JvIjbQbLul3TatUXSFDnat539wSqx2/5TSqMzM755ssu+PqEVkRPzHxEgxSuXQnytoQW7Qgz1inOn1Of50tLhbXkim8M2YE/rx0J1jhaCsQfPVhvtJf7ZjG6NJ1CYHP1LPmAhvn2h45zMDfgLhz0zVPKY9lvFm9NvLmGqSxTl4k7hyuCXG7OI2qsAPWciSQ81oWVfbmCKBL6c4FqwY9PfgWfDvq+hhNddkJ8Tgs4tfTIQqfKNWbWRRAnya2yQcJCBoVEzC8WGVJ1tGgM9uQCh9PLMuptHDGnBiciDLbyD0sgo73ewtmJN8nNPlP3SRkYurMfIVJXuSDp2KbbU2Es= X-Microsoft-Exchange-Diagnostics: 1; BLUPR0201MB1921; 6:+itiXlmnZ5EFgegC9cJd2/mXH/tmRmpJpMhPjunDIjCBZpy1ra/U/KGAQSXHVpfmRdtJ6tLr8RzvFeNOOZnbrPbJ3w47tczpaOXmi83oihdF2WwkrrlVgH9j2AUZkahUhJ/h77aANvK2zFR7J2AxGgLpmVO0tZQaX9UcbGf7ZlSN/imOX8+dcWXrX/AVCm9Rj5oMFAee39dNAAs6H9L2c/re/k0yjekietpSOB9tA1wpK850KLygHy6S2uromkb5GJXTGoV0w/5+WecYbNQ8sZdbbPnFZDYAl28G3rjJDLQzHQZzlahFDkB41NUOhRHq8BIaXp1JBsi7R1t+5+o3gQ==; 5:OIVkushOhUnoIPSBCrBf1nTeVlxT7RxjrvNwZiyOTgZ0f/Jk3VcVCLHrZhj5Z/R4colDObeQend/uX2DmBwtUuF/6uehda9/knVXPrFICMSevG6Krk5HbNaVnWPBuDrKYaOy5rxd93g6A3Iax8+zJw==; 24:4STeb2zowpFykElc91r7qm/cQCzfhlb7iAI+0miCCjrGKoRNADldSDbt7L06/p5+5v2HJ7WG01mZmAwYd4B/ByRxnJPpRVQhRJMSjHkxgDA=; 7:/EhcYJGI5AYruZv4b1VUDG2dVsScfIslC51y8GXBSxe/C5lULdqmnq46GmUoffjUDZmEOKa1AkyXFmbGXymjgqJqx+kyV6YEkmqC8gzlgzOSfpKIGgEx75zZEJrD8qyJrlSv0lFD7gQ1LNLMU6u3dWGPaVrus9qhE2IiDc2EBdBp339DD9TN6a2P08LdpdIc2N9EGykLbwMMPaPLKGhmY8StYnVev4hfUnWGXyNOUAY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2017 23:38:03.5730 (UTC) X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.100]; Helo=[xsj-pvapsmtpgw02] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR0201MB1921 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.41.42 Subject: [Qemu-devel] [PATCH v2 4/5] xlnx-zcu102: Add a machine level virtualization property 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: edgar.iglesias@xilinx.com, alistair23@gmail.com, edgar.iglesias@gmail.com, alistair.francis@xilinx.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Add a machine level virtualization property. This defaults to false and can be set to true using this machine command line argument: -machine xlnx-zcu102,virtualization=on This follows what the ARM virt machine does. This property only applies to the ZCU102 machine. The EP108 machine does not have this property. Signed-off-by: Alistair Francis --- hw/arm/xlnx-zcu102.c | 30 +++++++++++++++++++++++++++++- hw/arm/xlnx-zynqmp.c | 3 ++- include/hw/arm/xlnx-zynqmp.h | 2 ++ 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/hw/arm/xlnx-zcu102.c b/hw/arm/xlnx-zcu102.c index 080507831a..40c1f5bbf6 100644 --- a/hw/arm/xlnx-zcu102.c +++ b/hw/arm/xlnx-zcu102.c @@ -32,6 +32,7 @@ typedef struct XlnxZCU102 { MemoryRegion ddr_ram; bool secure; + bool virt; } XlnxZCU102; #define TYPE_ZCU102_MACHINE MACHINE_TYPE_NAME("xlnx-zcu102") @@ -58,6 +59,20 @@ static void zcu102_set_secure(Object *obj, bool value, Error **errp) s->secure = value; } +static bool zcu102_get_virt(Object *obj, Error **errp) +{ + XlnxZCU102 *s = ZCU102_MACHINE(obj); + + return s->virt; +} + +static void zcu102_set_virt(Object *obj, bool value, Error **errp) +{ + XlnxZCU102 *s = ZCU102_MACHINE(obj); + + s->virt = value; +} + static void xlnx_zynqmp_init(XlnxZCU102 *s, MachineState *machine) { int i; @@ -87,6 +102,8 @@ static void xlnx_zynqmp_init(XlnxZCU102 *s, MachineState *machine) "ddr-ram", &error_abort); object_property_set_bool(OBJECT(&s->soc), s->secure, "secure", &error_fatal); + object_property_set_bool(OBJECT(&s->soc), s->virt, "virtualization", + &error_fatal); object_property_set_bool(OBJECT(&s->soc), true, "realized", &error_fatal); @@ -154,8 +171,9 @@ static void xlnx_ep108_machine_instance_init(Object *obj) { XlnxZCU102 *s = EP108_MACHINE(obj); - /* EP108, we don't support setting secure */ + /* EP108, we don't support setting secure or virt */ s->secure = false; + s->virt = false; } static void xlnx_ep108_machine_class_init(ObjectClass *oc, void *data) @@ -200,6 +218,16 @@ static void xlnx_zcu102_machine_instance_init(Object *obj) "Set on/off to enable/disable the ARM " "Security Extensions (TrustZone)", NULL); + + /* Default to virt (EL2) being disabled */ + s->virt = false; + object_property_add_bool(obj, "virtualization", zcu102_get_virt, + zcu102_set_virt, NULL); + object_property_set_description(obj, "virtualization", + "Set on/off to enable/disable emulating a " + "guest CPU which implements the ARM " + "Virtualization Extensions", + NULL); } static void xlnx_zcu102_machine_class_init(ObjectClass *oc, void *data) diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c index 9eceadbdc8..37a8bf2ccd 100644 --- a/hw/arm/xlnx-zynqmp.c +++ b/hw/arm/xlnx-zynqmp.c @@ -260,7 +260,7 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) object_property_set_bool(OBJECT(&s->apu_cpu[i]), s->secure, "has_el3", NULL); object_property_set_bool(OBJECT(&s->apu_cpu[i]), - false, "has_el2", NULL); + s->virt, "has_el2", NULL); object_property_set_int(OBJECT(&s->apu_cpu[i]), GIC_BASE_ADDR, "reset-cbar", &error_abort); object_property_set_bool(OBJECT(&s->apu_cpu[i]), true, "realized", @@ -432,6 +432,7 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) static Property xlnx_zynqmp_props[] = { DEFINE_PROP_STRING("boot-cpu", XlnxZynqMPState, boot_cpu), DEFINE_PROP_BOOL("secure", XlnxZynqMPState, secure, false), + DEFINE_PROP_BOOL("virtualization", XlnxZynqMPState, virt, false), DEFINE_PROP_BOOL("has_rpu", XlnxZynqMPState, has_rpu, false), DEFINE_PROP_END_OF_LIST() }; diff --git a/include/hw/arm/xlnx-zynqmp.h b/include/hw/arm/xlnx-zynqmp.h index c2931bf39c..6eff81a995 100644 --- a/include/hw/arm/xlnx-zynqmp.h +++ b/include/hw/arm/xlnx-zynqmp.h @@ -91,6 +91,8 @@ typedef struct XlnxZynqMPState { /* Has the ARM Security extensions? */ bool secure; + /* Has the ARM Virtualization extensions? */ + bool virt; /* Has the RPU subsystem? */ bool has_rpu; } XlnxZynqMPState; From patchwork Thu Aug 31 23:34:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 808466 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=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=xilinx.onmicrosoft.com header.i=@xilinx.onmicrosoft.com header.b="xD+DEMIk"; dkim-atps=neutral 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 3xjzNT4RDnz9s7p for ; Fri, 1 Sep 2017 09:39:05 +1000 (AEST) Received: from localhost ([::1]:33026 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dnZ39-0003a0-OF for incoming@patchwork.ozlabs.org; Thu, 31 Aug 2017 19:39:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46160) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dnZ2Z-0003W4-QD for qemu-devel@nongnu.org; Thu, 31 Aug 2017 19:38:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dnZ2Y-0003nn-Ut for qemu-devel@nongnu.org; Thu, 31 Aug 2017 19:38:27 -0400 Received: from mail-bl2nam02on0043.outbound.protection.outlook.com ([104.47.38.43]:58304 helo=NAM02-BL2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dnZ2P-0003jg-Eu; Thu, 31 Aug 2017 19:38:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector1-xilinx-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=n8NelC3thRcu1yuOVnppxDwLKqXKGykAN/mNLA0joFE=; b=xD+DEMIkg52TEBo4ENSl/zy3Z80SfS3UwgrLSarhsSbyqmCaIX4WYZ115GQ9yeXpsF0DGmi8YnGJTYaT4h8I/1tx0eJZpY/dXHJ1qKbO0SdN3pNrvK9cX4hsw3ejYhW/gDVeU/GZ6WaUZFbKdCrWpTM1XEkF4jWrt8lIEWveMsI= Received: from SN4PR0201CA0065.namprd02.prod.outlook.com (10.171.31.155) by CY1PR02MB1136.namprd02.prod.outlook.com (10.163.15.150) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.13.10; Thu, 31 Aug 2017 23:38:15 +0000 Received: from BL2NAM02FT009.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::208) by SN4PR0201CA0065.outlook.office365.com (2603:10b6:803:20::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.13.10 via Frontend Transport; Thu, 31 Aug 2017 23:38:14 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.100) smtp.mailfrom=xilinx.com; gmail.com; dkim=none (message not signed) header.d=none;gmail.com; dmarc=bestguesspass action=none header.from=xilinx.com; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.60.100 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.100; helo=xsj-pvapsmtpgw02; Received: from xsj-pvapsmtpgw02 (149.199.60.100) by BL2NAM02FT009.mail.protection.outlook.com (10.152.77.68) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1385.11 via Frontend Transport; Thu, 31 Aug 2017 23:38:14 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:47986 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1dnZ2L-0000CY-9l; Thu, 31 Aug 2017 16:38:13 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1dnZ2L-0006uY-6Y; Thu, 31 Aug 2017 16:38:13 -0700 Received: from xsj-pvapsmtp01 (mailhost.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id v7VNc2UG028347; Thu, 31 Aug 2017 16:38:02 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1dnZ2A-0006sQ-8k; Thu, 31 Aug 2017 16:38:02 -0700 From: Alistair Francis To: , , Date: Thu, 31 Aug 2017 16:34:28 -0700 Message-ID: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.1.0.1062-23292.005 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.100; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(39860400002)(2980300002)(438002)(199003)(189002)(36386004)(2906002)(106466001)(33646002)(305945005)(50226002)(63266004)(8936002)(39060400002)(118296001)(5660300001)(81156014)(81166006)(478600001)(356003)(8676002)(48376002)(4326008)(6666003)(9786002)(2950100002)(47776003)(626005)(36756003)(5003940100001)(50466002)(77096006)(54906002)(76176999)(2201001)(50986999)(189998001)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR02MB1136; H:xsj-pvapsmtpgw02; FPR:; SPF:Pass; PTR:unknown-60-100.xilinx.com,xapps1.xilinx.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2NAM02FT009; 1:bb5ttgKzE22Gcm9BiV3cD8pbqAiFCAi1GVVMWe+byA+zP1BdbNZ10SPbzUi5k+RQ8IG8UbN/i/pOfDLjZIy4oybiXfMRt+izDRGs6W7NcaRlwM/FUOqhxrpiKhfRaOvR MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9fe83387-de9a-4d0e-81a8-08d4f0c9597d X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(300000502095)(300135100095)(22001)(2017030254152)(8251501002)(300000503095)(300135400095)(2017052603199)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:CY1PR02MB1136; X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1136; 3:d9BjP74i3xFFuQQdNJ/cISmeAKbZOFxgV2yUPxKYI2dhL0lDEpTaWT3SpZUxUHEJ4W3DAloFj4/xPTlN1jfb4oH9fN4ocyZUBIxu69T6jU3aXm7YqzmY5jsc4uXg2F7FnNb2CEDaqutBynKEiBMBYRqh99ap4CZQOKjzshSV0JQZ/mr++2bJQK5TiVh0B9oHXH+4j2fD1jEMcHMFa056URDb/oXN+Vq7PrxZrVysJy62ewPMWhhPpwui1TDVSE7+x/9JCHpfp274oa96xau91bOoaYpHhn/r5hoMa53grqMsE4QI3/rHUApUOGnXgHkKnmZJ8C63KaBxotEJ0h1yta59oCCBjarZuDofTnvShMw=; 25:PELEPV9HXWfxpnqqY+3Y9E/u38skPMgwiyHg+qsZlLgoZ5C7USqZNa9OIQWs2A7fBRaYPdtQ9+ASJF+ogSJ+doMOWHSnn10ODH3kkZ0rVUo+lbsozh3X29N2GuOLvRs3EdRwY3YiAkYO2UwGczAEj3P1zs0G6siCD/PwH8jRLJayHmm3BPD+ClMFgt54vWLWAzzdG1vHIiDtBgBtx4XxgWt5X6wLUTmvylX5WV/be5AfcWNskCLwBHyHKZfHc3iqadnnuNL3mgaWqTN4c+1pmZmXHgApQGwD62zFeGhyKRJhTGy1i2OxXw8Ljyd/LZDGiKe/Xj7yaCqf2NYZtdB91A== X-MS-TrafficTypeDiagnostic: CY1PR02MB1136: X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1136; 31:rbHz9jKrUmmHk2Fn6qcuQ8ayWWUBwCPeWdFhbcX3E+6BXXuAHi3l8f5+4sEippYyIlMXkdjLNJ7Sw6jnPj78zA8RGGhLlS3V6L16FLwks7Gq/LjYZW5kOgKou9ZjLgyYyAtGyP7fUrYfAc6R7skUQ91ANGvcQf+2kFxPh+mukBjXkWxFYNSHP/mavw8XC38OoYPobHxJ+27hSogtT+4Q3rBbRsRWbmn7wk5h2A8WVT0=; 20:kyGv32Re0W71OO+04y3JtpIvA1leZoZjZEV+l67C1zSc06FZeHHAGsVm4dcYvEAVrq8w72lUOwuMpRnwmkitybiIfqwUle0C3qwLe33XOuLVbVRi1xcgrj//nSuuG2gWqnWrmDxQgyoYMtshA//JIMZCDS63Y3lsU3U3CtGXPyMtuPikaka3pn7JTIWzDiqVz74FrnKME1kmYK934/TfTSXUZtiOuDrm68fE1RVZMMZ+nhUqdZDOs6lva/+rXMMtMZVPMUVGLH5u+wJAMcKLIuhIm5ATRZ2wvn19zStycQUY8SQR5wdx8+j1kv79nXn8oudlKF+eFKLnAUHlhT/pw+hvkXrOxTZMLt5iRCH9jNVKfd7n00aAFe0ud5pm68wppLt+c3qP9EW3sv0FP+r+b0r9oJHfHeml4KEVZM+qoFH1gzFaYyvLbouJbtINNjxow4FZ2wYRhSTQT6YJeyyJcOCGf1/3TUKb6SCAG5Z8tLZ8GIN0ytYk9AJLmNLSEpvm X-Exchange-Antispam-Report-Test: UriScan:(192813158149592); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(5005006)(13016025)(13018025)(8121501046)(100000703101)(100105400095)(93006095)(93004095)(3002001)(10201501046)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123562025)(20161123555025)(20161123560025)(20161123558100)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY1PR02MB1136; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY1PR02MB1136; X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1136; 4:rp7hOAtiKWSssWEK3b9LebMTHZTXhimJnaPAdZaMhmLNtiJRy1/fGYizgSJErviZHxY64DfQO8hEIbp+Ba4PJHF1SrFgOOlgXsDC1JI89RLG6qgrqte1q+y2l98LJzh8zwrZOVVoDJ7n0/bdiOtphmYM/kvC2sSIUe1ULEX9Xcd2KN0TucNAJPYTWmyQAt/qci2pOOB26J9xbAPf0s6KdSfePykPXC1z7sQEQo35TIuhVZj/yoT/OjtRBCKWgFfoIG5xyP/u5hvAGOg4TB8q7dPG7nzuoc+3wecxlZa9Y9A= X-Forefront-PRVS: 04163EF38A X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR02MB1136; 23:fcoIOsbGGkCVLwMoyVc7DbV9+3OHdVjcaocV+tmAz?= kOTPoGjG4rENAMHvCa+Tu5rGagexAx7Om9ymTpxxfHMAbThwp9JcR0BEBu9Y06soAzSORUyhHO+kFblrVR3jhKBpZNTn98z9hDEg+OeSdDIZmVlACqzKL2F+HAFc6esCgUr0lBmg9BmsdUCwY+LO0cvZ+TF3evzAF3d6ms/TmbrXIA1HVmZeAxRKwCD915yXGmlNETOU+UtHLcrIsfjNdyqg5zcQOISk1dIvurAh86/l90mxJLLVGNlvj7KZcBb3v8tw1vWbtSb1XRr4p29KKCndoKchBq5R6sWFZBkCiqGSZnK+p7SBfYKlq3HPVRZN6TuYUdRm0I32hunQXbyUHr/pSH+9ObJP0ohyFAnzY3rYxVC1CdY1pJo7+uEa5huGIFe6BJqZBYBk04o0FKWl++IPNFVGrbzTP33MI8zb1/LiHEGQa5B+EA5lyLcJ+44j3igzU49/X44gnpsfKLN34o/5wR1mXwY3MxkZFpAV076KCRaO7GS4wvfk02eX4VA59sJKhJxtjPpQ7W2lBU16Q1WzEux2NoIRWdYVh8mUTqsZh8sKM/i/nWXmuWgschEJGUu7SD+xHn08UCQrltn/wByb9HdsCWsjqtxHYU1f8Xch2uBeUvp1YdQpYYIV4O3P80lEnVUBLm5GzsInopaNVo8YsTJCfppYYFmLllb9zHaeFlpuCetfRRPEbO+soAu8NL+zHXh8MqdLvc5Jwe9lYHLQjDLep5efkQopiQMxqqok7wKCpBg+hTPl7TJKydt/ewNjqhAsth5tdaTRvEuvyBJgkkCKdmjmzak3VAeg3z7I94cKMmH+IKx6FNTrPyP7u4G08BYyXrcwI34BMxBaw+fi4GQS+s4B+PNysT4MCXNLTieBuOKjxlwwrMBZ3iborglPpVpE8E+p31sTRDzDrQUqSv84KkzrRCuINeowqzkjp5Kkte4JcWXADF/YgsqL8Q= X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1136; 6:MmheTlUoLSHRFWg4fARws4Cd8gZNZgGVaekQE5/ooiOmzredV1RqyqxSuMB3oaZt6THlR2S6BTv+VV5a3LzaRJyfkk24vcFoy834vWjK9Xc20c7HqEqxzJouH2fgrDmPWoRp7yZDdrcLWQKTH33Oes+NemfLgysA9yR3w6OBlNoKlF3hv7eKaDSp6TmwGsaJNyKvutwLIew5n47JrnIeSkcEclJGP5K7W5uh/tBW6N3aM7Hzr3EIUSUvwB1a/8Qb+laVAmYVDx9dZgELY+dQrXYjL0gZyeyt5BcVS1qYlFybKWT64RcSwMR5W12CTS2PmVY2N/xvR3EsrynPh89uwg==; 5:qjfS77sJgvMXsUSrM2pmyAROzzG/au0YraertWUteP+wiX2C4GGacyHtzgus329XyBMwejqTw7N4LMQXzabxwuhmz/oGiH5Myqiv9rYxDs/5eDL3PWLHVf7KpydTBBStNDZ9bEdtx1XTsz3I2LUx3w==; 24:nfL8slvoDeDmnYZnhDg+En3LsW1KiTiHBzxv0CpbL1bFpJz1h7aV76eo97Yh6S2vVT57dODbwaLkd4M//vi3Luvie+g4WHMnsxg0dzNgbSU=; 7:DpjDyOAXKLMDh3KeksJlwJOMej0h8/0cUiXpx5rcNHQm2kH1VMmQUB8pIggJnrzcb3qVNkEN9p/IxQC8evOC0kco2BP608D2REYIlWfD5txP3lcHzaWgD+iMivzrvmJsEO8ohab3hLf8gYELuqVHtSY9Z9GtLSCSLoqS9GpVvjGtAJ+e1YpnMob4r0ZMVDAiQ5xWyusRtR7waqGlZQWOH6HxuRsIw3q4cRhNhoxlpPA= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2017 23:38:14.4228 (UTC) X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.100]; Helo=[xsj-pvapsmtpgw02] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR02MB1136 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.38.43 Subject: [Qemu-devel] [PATCH v2 5/5] xlnx-zcu102: Mark the EP108 machine as deprecated 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: edgar.iglesias@xilinx.com, alistair23@gmail.com, edgar.iglesias@gmail.com, alistair.francis@xilinx.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The EP108 is the same as the ZCU102, mark it as deprecated as we don't need two machines. Signed-off-by: Alistair Francis --- hw/arm/xlnx-zcu102.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/arm/xlnx-zcu102.c b/hw/arm/xlnx-zcu102.c index 40c1f5bbf6..d3694f67db 100644 --- a/hw/arm/xlnx-zcu102.c +++ b/hw/arm/xlnx-zcu102.c @@ -180,7 +180,7 @@ static void xlnx_ep108_machine_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); - mc->desc = "Xilinx ZynqMP EP108 board"; + mc->desc = "Xilinx ZynqMP EP108 board (Deprecated, please use xlnx-zcu102)"; mc->init = xlnx_ep108_init; mc->block_default_type = IF_IDE; mc->units_per_default_bus = 1;