From patchwork Thu Apr 30 11:51:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 185913 Delivered-To: patch@linaro.org Received: by 2002:a92:3d9a:0:0:0:0:0 with SMTP id k26csp2009084ilf; Thu, 30 Apr 2020 05:05:55 -0700 (PDT) X-Google-Smtp-Source: APiQypIiNcN2W1pWYZuQiTxVLxrdkRQTXR93EZvZ5DCwGm/nz2WMFp7JwyEL2dX9hgdDsm1eEHvC X-Received: by 2002:aed:2e83:: with SMTP id k3mr3367348qtd.2.1588248355088; Thu, 30 Apr 2020 05:05:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588248355; cv=none; d=google.com; s=arc-20160816; b=0u3QIRcvO6ROX3xdeak+7qKV+mvVhJIWwVtdFQUP83x8hdmcdVgNBvU0Rx0rNXwp8G ceaYJ1wShFTSzRRuUK1E5CdS9u02ZC4g58Bzg6tB8alcKR0mY6ivVQdI2hZq7uXx5ZN1 vpGQFxhtVBjIJ+Y/wGiy4Kz5sRaej0G1rgWqOeZgkpMDOUhtjC3BSEIqaKVYv926O8Rs lB8wI8c6gqjG1XUvSnaFo0AOG3alUMfCPfGjXiKacmkvKIrwYw0q6fTQFoKsVvDZyXDV bbs/YP2L3Nz38FtQmr2k5Dsb/iVGonUWAWgRoT4yJiqT9zIWyKBJeAzeIpVV8VFiMjYj UT4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=5MreYDGc0zzBU/D/41w93auz/a1cW5LbSgeXIHJsmWA=; b=yrVjaXaBrOyBGdmASU3m0UkzwYUdnv5zqJrljAz2mBlpckitvHWOt3z4rQNjxjgnTa ffshJd7yZPfEs+3MMcdgJBbs+PVYn/nh19r2xosxyOLQkljfqfIFAKWLywbILCYnnQrz VJkYbEUgyHbhXh0hWYeR4ylVWR3iF1ZsC2bo3rropQdg7A2eKKSXq7mctyvKH97dEUGP vXyiQOQePdKLYab32VRj0hmcRdV2RCD3Dmr7fHUuVvr6lah6HYWn2wjzoE9HkPIWWbE9 hpowgYZy31ywO+SygquV6gdKnepRcmimsUEEjOYk7y8ArRqD5qPG6sm1XVmEqBsuDXtq njng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=F5N4U4tC; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:470:142::17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:470:142::17]) by mx.google.com with ESMTPS id o67si1350563qkd.214.2020.04.30.05.05.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 30 Apr 2020 05:05:55 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:470:142::17 as permitted sender) client-ip=2001:470:142::17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=F5N4U4tC; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:470:142::17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:58524 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jU7ww-00035q-Ga for patch@linaro.org; Thu, 30 Apr 2020 08:05:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33958) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jU7jp-0003bo-TP for qemu-devel@nongnu.org; Thu, 30 Apr 2020 07:52:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jU7jn-0000Tm-Lx for qemu-devel@nongnu.org; Thu, 30 Apr 2020 07:52:21 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:36604) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jU7jn-0000TP-8l for qemu-devel@nongnu.org; Thu, 30 Apr 2020 07:52:19 -0400 Received: by mail-wr1-x432.google.com with SMTP id d15so6537699wrx.3 for ; Thu, 30 Apr 2020 04:52:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=5MreYDGc0zzBU/D/41w93auz/a1cW5LbSgeXIHJsmWA=; b=F5N4U4tCRmGgV9G9Eka+Fuc2AdkBON+Wc+9U1z1aalUdaCuXxakBV9FzhNPzgsMk2j +ijSQ+6oB/q4v4IQxx1jZlfy+FOLLEOzCFLOJV30kGb34w0YilrysIxkjKWZ14h26iNN a2oHLGCltQ2fDcd9P/2ffQ0Ocn/B/s2MB4AjHBcfmV5E6b8gcgi4ZGhqaGHK2Q7tDCg6 f2xNXXmXUrd6K00Rh4Ei7BmtrnV4oyzGIDiXv6P3/ga62ZnqeTgHL9m0+WISFBC9s+7M 0eOjq6+dQ8avUjbhq//Y9tcE3VUuU5kHl0vwOC8mnmlhkiHBNSIsygHZfNDpuMj6DW0A hq/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5MreYDGc0zzBU/D/41w93auz/a1cW5LbSgeXIHJsmWA=; b=K+2thIfXJ/CSMbBrcuJtR56yr+ZzITNKbMgX+tx5lvMjUiFOWgznzfdW996TRZ/Oey O8LMOQ5wgwM9fiFJFYxF49o08Ef57yzqHQio1D0/97AAQr2IeCzm9vOw6lkUa+8kuNX7 EfTc6Cm1exj575+OnmiF5Y+i4oftSy5pOtU50hJc1p+kh04yKFopT3BsDoL9j4R74Eso D3WumtM/ItCyxpCNAG6MfsAft83Sy2Rgw0dG/Ry8adraZAY5w0RrPzZaNblp8Ya1lhGV ThFjjkfpB3wmV8OzPwKtyUUgiRazTphZf2pF5LuzJRbZkzQozK6CNG/Execxpu3tm35J e9nA== X-Gm-Message-State: AGi0PubPeGFo6ZWFStHZ86tvXjfKHkjwzOIjrlK15I+gHptp1MhVWV/S IgHR6wWifofmjegG8kRMxksg0VdQYI4hqw== X-Received: by 2002:a5d:4109:: with SMTP id l9mr3514446wrp.300.1588247537651; Thu, 30 Apr 2020 04:52:17 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id j22sm491518wre.84.2020.04.30.04.52.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Apr 2020 04:52:17 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 30/31] hw/arm: xlnx-zcu102: Move arm_boot_info into XlnxZCU102 Date: Thu, 30 Apr 2020 12:51:41 +0100 Message-Id: <20200430115142.13430-31-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200430115142.13430-1-peter.maydell@linaro.org> References: <20200430115142.13430-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x432.google.com X-detected-operating-system: by eggs.gnu.org: Error: [-] PROGRAM ABORT : Malformed IPv6 address (bad octet value). Location : parse_addr6(), p0f-client.c:67 X-Received-From: 2a00:1450:4864:20::432 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: "Edgar E. Iglesias" Move arm_boot_info into XlnxZCU102. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Edgar E. Iglesias Message-id: 20200423121114.4274-4-edgar.iglesias@gmail.com Signed-off-by: Peter Maydell --- hw/arm/xlnx-zcu102.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) -- 2.20.1 diff --git a/hw/arm/xlnx-zcu102.c b/hw/arm/xlnx-zcu102.c index bd645ad8187..4eb117c755a 100644 --- a/hw/arm/xlnx-zcu102.c +++ b/hw/arm/xlnx-zcu102.c @@ -31,13 +31,14 @@ typedef struct XlnxZCU102 { bool secure; bool virt; + + struct arm_boot_info binfo; } XlnxZCU102; #define TYPE_ZCU102_MACHINE MACHINE_TYPE_NAME("xlnx-zcu102") #define ZCU102_MACHINE(obj) \ OBJECT_CHECK(XlnxZCU102, (obj), TYPE_ZCU102_MACHINE) -static struct arm_boot_info xlnx_zcu102_binfo; static bool zcu102_get_secure(Object *obj, Error **errp) { @@ -166,9 +167,9 @@ static void xlnx_zcu102_init(MachineState *machine) /* TODO create and connect IDE devices for ide_drive_get() */ - xlnx_zcu102_binfo.ram_size = ram_size; - xlnx_zcu102_binfo.loader_start = 0; - arm_load_kernel(s->soc.boot_cpu_ptr, machine, &xlnx_zcu102_binfo); + s->binfo.ram_size = ram_size; + s->binfo.loader_start = 0; + arm_load_kernel(s->soc.boot_cpu_ptr, machine, &s->binfo); } static void xlnx_zcu102_machine_instance_init(Object *obj)