From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-002e3701.pphosted.com (mx0b-002e3701.pphosted.com [148.163.143.35]) by mx.groups.io with SMTP id smtpd.web11.2075.1632872104024244779 for ; Tue, 28 Sep 2021 16:35:12 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@hpe.com header.s=pps0720 header.b=TyYXXW6i; spf=temperror, err=temporary DNS error (domain: hpe.com, ip: 148.163.143.35, mailfrom: prvs=090543438a=daniel.schaefer@hpe.com) Received: from pps.filterd (m0134423.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 18SKsdwL018838; Tue, 28 Sep 2021 23:35:00 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hpe.com; h=message-id : date : subject : to : cc : references : from : in-reply-to : content-type : content-transfer-encoding : mime-version; s=pps0720; bh=NzL3Cn4D6o+bt9kE9jMg5vupJ06Y691JLYiUomXkmoU=; b=TyYXXW6iu9e5fZA+XrZo08rk9g1KmrnBQlAow14Ctg6tpgLj1uTDPfynhxO4OKtYx1dc jwyNSWoLiUZRF/yAOjLWDYQJ/XEu+fsjwAMeC9qWa2Rd70huj1dD3essVSJP6D1zMVJ1 Ur/GbkITIqjn/zHP9h02FtTejkt9a4ZfJ2e4ikhhtBWqOQ3bWIksE161x7iiQqafkRDO bpYPRsUlrztnRXKz3mR70mD4FaOCzA8NJhH3k5vwVWuq4YgeStesQyVtUHvCoFghfpBC JefrwgXavb2ATrTbIWUtLVatnyWuFA898dAy4Sy9pGjartGzX/vrrrLIkGDAjm8b3ojw Jg== Received: from g2t2354.austin.hpe.com (g2t2354.austin.hpe.com [15.233.44.27]) by mx0b-002e3701.pphosted.com with ESMTP id 3bcagj8wvh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 28 Sep 2021 23:35:00 +0000 Received: from G1W8106.americas.hpqcorp.net (g1w8106.austin.hp.com [16.193.72.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by g2t2354.austin.hpe.com (Postfix) with ESMTPS id 6F0D781; Tue, 28 Sep 2021 23:34:59 +0000 (UTC) Received: from G4W9331.americas.hpqcorp.net (16.208.32.117) by G1W8106.americas.hpqcorp.net (16.193.72.61) with Microsoft SMTP Server (TLS) id 15.0.1497.23; Tue, 28 Sep 2021 23:34:38 +0000 Received: from G1W8106.americas.hpqcorp.net (16.193.72.61) by G4W9331.americas.hpqcorp.net (16.208.32.117) with Microsoft SMTP Server (TLS) id 15.0.1497.23; Tue, 28 Sep 2021 23:34:37 +0000 Received: from NAM04-MW2-obe.outbound.protection.outlook.com (15.241.52.10) by G1W8106.americas.hpqcorp.net (16.193.72.61) with Microsoft SMTP Server (TLS) id 15.0.1497.23 via Frontend Transport; Tue, 28 Sep 2021 23:34:37 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JXEuSURUwf+NQ+5EwgFbCC3BZU6SenbGBO/3aC+gnyXLlIBW1f81twmIExZDe6AcQqD5QAmTY7H85EcGihAFBoi+kQpY8+cnQga17QtbAI4mUdc+lzszTdejzRoD2FcEdxajgLphDWglhuvdZT4yWzjaWBX9JdVW40TY1gQWklJTBPJyrxcyu1Kz2+wmS3X9BFQVP5AUY45cEuEIQIBH2RNCeHGGSwwUdSCHLWKAJARSAOsnkML0G+nGTQiCEk/+iGgL8drmWEmMz2KXmMJgmXVUf6JvgiwH7QitF2vRnuDYlf/hZMckBhSGoTMsLwdvIarEndhIOTa7O2R3Xwlqkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=NzL3Cn4D6o+bt9kE9jMg5vupJ06Y691JLYiUomXkmoU=; b=Af6CT2BIwdhLrzl5zrYOFRmEXf+pbwrpNtFxbOmEfldEu64pjnUauvaNOgMO1SNL4jYK+DRkGcqdspkstHKRsdoV/iuGzRjkoHpa2xReut8VeMcHhYVy/XKqWIHsoo7arUWFwchkyQ5rSqzNH4ZCYjcholeNyfjbkwdZ0nSG3IgHg8Zts4LW7o3v4/d8619c6gVB0tm9ZTNBv+ItU140eD/KadLYn2zSmPeBUsSXBa6EN0b3eQATnvTjpJoIx4VAZFdZ32CRe2m1XSYzIKPgEk4781dlfkr83G3dHO7DJNd2L73YXKRr3SUEaK5Oa0lott6JkBYD5XSmoRQZf4w1lQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=hpe.com; dmarc=pass action=none header.from=hpe.com; dkim=pass header.d=hpe.com; arc=none Authentication-Results: hpe.com; dkim=none (message not signed) header.d=none;hpe.com; dmarc=none action=none header.from=hpe.com; Received: from DF4PR8401MB0923.NAMPRD84.PROD.OUTLOOK.COM (2a01:111:e400:760f::13) by DF4PR8401MB0842.NAMPRD84.PROD.OUTLOOK.COM (2a01:111:e400:760c::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.14; Tue, 28 Sep 2021 23:34:36 +0000 Received: from DF4PR8401MB0923.NAMPRD84.PROD.OUTLOOK.COM ([fe80::597f:4786:f1d6:8469]) by DF4PR8401MB0923.NAMPRD84.PROD.OUTLOOK.COM ([fe80::597f:4786:f1d6:8469%3]) with mapi id 15.20.4544.021; Tue, 28 Sep 2021 23:34:36 +0000 Message-ID: <97801e44-7b6f-f0fe-0141-ade45e2a0200@hpe.com> Date: Wed, 29 Sep 2021 07:34:24 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.1.0 Subject: Re: [PATCH V2 5/9] ArmVirtPkg/HighMemDxe: Relocate HighMemDxe to OvmfPkg To: Abner Chang , CC: Ard Biesheuvel , Leif Lindholm , Sami Mujawar , Jiewen Yao , Jordan Justen , "Gerd Hoffmann" , Sunil V L References: <20210928083107.7418-1-abner.chang@hpe.com> <20210928083107.7418-6-abner.chang@hpe.com> From: "Daniel Schaefer" In-Reply-To: <20210928083107.7418-6-abner.chang@hpe.com> X-ClientProxiedBy: HK0PR03CA0118.apcprd03.prod.outlook.com (2603:1096:203:b0::34) To DF4PR8401MB0923.NAMPRD84.PROD.OUTLOOK.COM (2a01:111:e400:760f::13) MIME-Version: 1.0 Received: from [192.168.100.176] (123.193.59.220) by HK0PR03CA0118.apcprd03.prod.outlook.com (2603:1096:203:b0::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.13 via Frontend Transport; Tue, 28 Sep 2021 23:34:32 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8ffd62b3-7649-41a4-086d-08d982d88814 X-MS-TrafficTypeDiagnostic: DF4PR8401MB0842: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TfMJHlkyfIh0edISQD8UxsmKeJQmCK8s4gyujQYUlxrkzft7p+/WODChph78G3/994gAd+Tk9x/tbxSq9Ybt0hK4CZ1pOZ844W02qZkEBBFRp27C5tBYp49Sj84Knfe/bkC1Bxxo3+1o65fABZu851TU0gHA8ZyTU2un47Uz9jywmv0qCf2rYO1XKjgrwL9GsdBoPd7M/tO2UZRH7KA+/NdN/zoZ4hvyMof4/74TcBpk+DeyO/O5OMCThR4P0SryrfOiicHSQQwZf+ON4JajVeCd1xAc+uJovbnTGfgSLIDRsYjmnB8np5zZutRYbAPFHRINoFZt2kMGp9AbOc3E2xNG5p094yST0Cw7j4ZXhxEtqCuf57rz4pARI4qY+omRc3vJh+1FR7y0baAALbPxrzBs+t6QkN8OlLlwcMa/ud675DIk2KDP4i6TlkDZqHtUF0L9+x8KeKlEEHAIOd5MatNb7TyNLQjULZZeigqD1K07McrWnJmgbjIa2owyMvdtWkz8Otv43NZrk86LIGMA3XGRqN/Oqst6vWUXcg5SXdHX/54S0AcDYjs4QrheYNMe4yayw+e+dC21WDsb/QGT7Fou8bwVSSAQhAQLWO+eXfIn71kNiYaoVa/oBLjQov+8w2YyPzNyuuIxOg4qzKPH0IprdVCo7r/KvgDN9ROz0E7ehMzpVDrgkAqROBS/yHKApmQJC+qtHBu65+6e16bfTkfgb8+rsG7iCt1di34gXACyZLb2pr5yVdlUP93s9k6CV/8iLxilUn4UywDeL0DnmA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DF4PR8401MB0923.NAMPRD84.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(366004)(54906003)(186003)(5660300002)(66476007)(53546011)(38100700002)(8676002)(44832011)(956004)(508600001)(26005)(2906002)(316002)(16576012)(66556008)(2616005)(6666004)(31686004)(31696002)(36756003)(83380400001)(66946007)(8936002)(6486002)(4326008)(86362001)(156123004)(45980500001)(43740500002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?eksvdmx3THF5di9EUGJyNmZlVHJXSUV5c0FWcktKZHM1aFlRNG4zN1Rab0VW?= =?utf-8?B?RWMxTlBzVVdzSHl2cmpNZDFqZUZZQnZpUVZYWDdOd1VEMXZXOUlseGpQYTJX?= =?utf-8?B?Z1hVbjV1Mi8yRDJLbFhvVnJFbC9LZTlDN3pZSlZ4RnBGbWRsU3pVQ243Wm1K?= =?utf-8?B?QXhHUURqeDNBTTFuOXEzZTY2MFZKN0NxWjduYVd4YmtUMDV4YlV1Yk9JYVVK?= =?utf-8?B?N0ZaaTFHM0QrNmF4THJWUWhZd0RyQXB2ekdUNjJ6d3hkYkhMWHArVW9XdmF3?= =?utf-8?B?TmJaZmkwMVRPcWtVQzN5S0hqdk15YWxUTjNvdVMrcnZpN3BVV3NPYXJJWFYx?= =?utf-8?B?Q2ladHMvRjVkc0RHa2lYTHhMTnByNTRFZVRqakt6TmtGT1NoczhuLy9YSUVG?= =?utf-8?B?NHFQMXY5MnlpZ2hlTVFJemE1L3cwZWtMSTJveW1LK3ZhdXlubjF5T2JVUUFu?= =?utf-8?B?bkZ0NjU2SW91OENqWHA3NXU0NGx1MlRxckFqTWwxRW9rS2QrMXlybmxnL1h4?= =?utf-8?B?cTZlM0syNEM5Y2JiUGhzTHl6SjZTeWc4MzdRdXZhdExteVlZSFFsZzNpS29q?= =?utf-8?B?MWRIamp5UXVUWkx5YWVSaVN4OUlxWUZJUy9uc0pLbE1Zb01yblA2R0JSYXlM?= =?utf-8?B?NSsrUkF5SDNiZm9HUjIyWUZnc1dnY3QzMVBWUkpxTjVPZDcyeHZtSEh0RlM4?= =?utf-8?B?L0VhSXJzNTU1T1d4RU1QY0pUVUd0d2xxVElCZDA3M3BLaWZjbk9pTkRpbGRl?= =?utf-8?B?WlZoT3JHUHdFUHd0SjRrWTFzTHZCZ1o4bGd1bjAwVitpSE1yN0hxZHVzQVFM?= =?utf-8?B?TGIwQ2FLMWp0c3dlOE1UU2Fua0Y5dkw5M3g2VDMyaFBIb1dwMi91ZnI0MUov?= =?utf-8?B?NDMwOGxicURmbDhPSDlBNGJZL3JVM1B1dHdEcWNBN0tWQndEWUl0bU5HQTQ4?= =?utf-8?B?RHNadXpubXIvMGNIZWsxdkh1ZytsV0doOUprWG00bzRuR3p3NzZsd2NRN0xk?= =?utf-8?B?UUdNYk96bWp3SHlvNENoVnNUM0hjTGM3anJVbE02cHpWUjd2amlHSGZGRnVX?= =?utf-8?B?T0ZSMnAxNDNLVVV0NWhxU3orVGRucDRaYUJUOUttaVRBaHRna0VaKzZ2NWxP?= =?utf-8?B?N0dvRzFZTis0eTlIVUZSUFdzaHc3dHhyV2VxeXdTbVM4em1KaXJtU3JldEY5?= =?utf-8?B?N0JyQUcrL3VXTU15VGZIWUt1TytmKzhmUEpjY3prU2tqWGRxYVhOam9xWUkv?= =?utf-8?B?eUh3L3dzbDdtdjlPcUxwS25NeXowU1lLMUlWN2J0eW9jbGRZTzE3dmtLME9v?= =?utf-8?B?QUNsdE9UT3h3TGNVNCt1aVNvekgwSFdHSDROS0dRcnZyY3VuWjBPRlhUd2Zp?= =?utf-8?B?dVNvUGdrYWtGanpNcGlUbm9SM0ZBcTFLWEtSYkFHVyt4OWtkaDNsb0wxRzJR?= =?utf-8?B?Sy9uN2IwaW8vWFYxaFdUL0orSGRFS2Q3Z3VVbm9GQ1EwTmhoUmtYZ01jdmxp?= =?utf-8?B?M2NPUWt5TDRPYi9Zc1krY0taaDBHSXVkVDVobytlc2FRSlgwSytlRTdETEdC?= =?utf-8?B?QjgxQWxqK1M0MjAveTA1SGxyRDFUbzNRNi9zVS9YZTZ4QzV2RFBVVHJSVk1R?= =?utf-8?B?RW95d2prcldESHd5dmNBRnVRTVp1RzZ0Z2xWK1lmdVZYNjVTMUVzWlp3dXQ2?= =?utf-8?B?UVF4NlkrQ09GSlB3eTZibUVFY3hjM2x2cXl4U1l4cHhGK0NOWEVDUGs1QVd3?= =?utf-8?Q?T4I3anOsxUfEDrNvxxAt1rJk9xDvXUaTRS1pC+P?= X-MS-Exchange-CrossTenant-Network-Message-Id: 8ffd62b3-7649-41a4-086d-08d982d88814 X-MS-Exchange-CrossTenant-AuthSource: DF4PR8401MB0923.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2021 23:34:36.2474 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 105b2061-b669-4b31-92ac-24d304d195dc X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: G9bbFqRY9K6xZ2ot4Uk0m57S0SFQwJsYBRHIR2j1t1EO87UMDBFwEWKZlxAWF08NGUD+5cJjsLCkI6qCJfptSQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DF4PR8401MB0842 X-OriginatorOrg: hpe.com X-Proofpoint-GUID: hQ2rwJbh5teDOJ95PslWB5Er5fq0I5fw X-Proofpoint-ORIG-GUID: hQ2rwJbh5teDOJ95PslWB5Er5fq0I5fw X-HPE-SCL: -1 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.182.1,Aquarius:18.0.790,Hydra:6.0.391,FMLib:17.0.607.475 definitions=2021-09-28_11,2021-09-28_01,2020-04-07_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 mlxscore=0 malwarescore=0 suspectscore=0 lowpriorityscore=0 bulkscore=0 phishscore=0 clxscore=1015 priorityscore=1501 mlxlogscore=825 impostorscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2109230001 definitions=main-2109280137 Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit The comments at the top of the files in HighMemDxe.{c,inf} say it's for ARM VMs. We should add RISC-V there, too. On 9/28/21 16:31, Abner Chang wrote: > Relocate HighMemDxe to OvmfPkg/Fdt, this library is leverage by > both ARM and RISC-V archs. > > Signed-off-by: Abner Chang > Cc: Ard Biesheuvel > Cc: Leif Lindholm > Cc: Sami Mujawar > Cc: Jiewen Yao > Cc: Jordan Justen > Cc: Gerd Hoffmann > Cc: Daniel Schaefer > Cc: Sunil V L > --- > ArmVirtPkg/ArmVirtCloudHv.dsc | 2 +- > ArmVirtPkg/ArmVirtKvmTool.dsc | 2 +- > ArmVirtPkg/ArmVirtQemu.dsc | 2 +- > ArmVirtPkg/ArmVirtQemuKernel.dsc | 2 +- > ArmVirtPkg/ArmVirtCloudHv.fdf | 2 +- > ArmVirtPkg/ArmVirtKvmTool.fdf | 2 +- > ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 2 +- > {ArmVirtPkg => OvmfPkg/Fdt}/HighMemDxe/HighMemDxe.inf | 3 +-- > {ArmVirtPkg => OvmfPkg/Fdt}/HighMemDxe/HighMemDxe.c | 0 > 9 files changed, 8 insertions(+), 9 deletions(-) > rename {ArmVirtPkg => OvmfPkg/Fdt}/HighMemDxe/HighMemDxe.inf (91%) > rename {ArmVirtPkg => OvmfPkg/Fdt}/HighMemDxe/HighMemDxe.c (100%) > > diff --git a/ArmVirtPkg/ArmVirtCloudHv.dsc b/ArmVirtPkg/ArmVirtCloudHv.dsc > index 2928b9adb5..4470fa3b14 100644 > --- a/ArmVirtPkg/ArmVirtCloudHv.dsc > +++ b/ArmVirtPkg/ArmVirtCloudHv.dsc > @@ -294,7 +294,7 @@ > # > ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf > EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf > - ArmVirtPkg/HighMemDxe/HighMemDxe.inf > + OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf > OvmfPkg/VirtioBlkDxe/VirtioBlk.inf > OvmfPkg/VirtioScsiDxe/VirtioScsi.inf > OvmfPkg/VirtioNetDxe/VirtioNet.inf > diff --git a/ArmVirtPkg/ArmVirtKvmTool.dsc b/ArmVirtPkg/ArmVirtKvmTool.dsc > index 3cc182545c..97fc98d778 100644 > --- a/ArmVirtPkg/ArmVirtKvmTool.dsc > +++ b/ArmVirtPkg/ArmVirtKvmTool.dsc > @@ -293,7 +293,7 @@ > ArmVirtPkg/KvmtoolPlatformDxe/KvmtoolPlatformDxe.inf > ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf > EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf > - ArmVirtPkg/HighMemDxe/HighMemDxe.inf > + OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf > OvmfPkg/VirtioBlkDxe/VirtioBlk.inf > OvmfPkg/VirtioScsiDxe/VirtioScsi.inf > OvmfPkg/VirtioNetDxe/VirtioNet.inf > diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc > index 85fcf5f310..07f9699c79 100644 > --- a/ArmVirtPkg/ArmVirtQemu.dsc > +++ b/ArmVirtPkg/ArmVirtQemu.dsc > @@ -405,7 +405,7 @@ > # > ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf > EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf > - ArmVirtPkg/HighMemDxe/HighMemDxe.inf > + OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf > OvmfPkg/VirtioBlkDxe/VirtioBlk.inf > OvmfPkg/VirtioScsiDxe/VirtioScsi.inf > OvmfPkg/VirtioNetDxe/VirtioNet.inf > diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc > index 909968d13a..cf7a2b4463 100644 > --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc > +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc > @@ -341,7 +341,7 @@ > # > ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf > EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf > - ArmVirtPkg/HighMemDxe/HighMemDxe.inf > + OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf > OvmfPkg/VirtioBlkDxe/VirtioBlk.inf > OvmfPkg/VirtioScsiDxe/VirtioScsi.inf > OvmfPkg/VirtioNetDxe/VirtioNet.inf > diff --git a/ArmVirtPkg/ArmVirtCloudHv.fdf b/ArmVirtPkg/ArmVirtCloudHv.fdf > index 1bb452ebb8..7ecf5ca88d 100644 > --- a/ArmVirtPkg/ArmVirtCloudHv.fdf > +++ b/ArmVirtPkg/ArmVirtCloudHv.fdf > @@ -107,7 +107,7 @@ READ_LOCK_STATUS = TRUE > INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf > INF ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf > INF EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf > - INF ArmVirtPkg/HighMemDxe/HighMemDxe.inf > + INF OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf > > # > # PI DXE Drivers producing Architectural Protocols (EFI Services) > diff --git a/ArmVirtPkg/ArmVirtKvmTool.fdf b/ArmVirtPkg/ArmVirtKvmTool.fdf > index 1dac8b7880..0535d36b7d 100644 > --- a/ArmVirtPkg/ArmVirtKvmTool.fdf > +++ b/ArmVirtPkg/ArmVirtKvmTool.fdf > @@ -122,7 +122,7 @@ READ_LOCK_STATUS = TRUE > INF ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf > INF EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf > INF ArmVirtPkg/KvmtoolPlatformDxe/KvmtoolPlatformDxe.inf > - INF ArmVirtPkg/HighMemDxe/HighMemDxe.inf > + INF OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf > > # > # PI DXE Drivers producing Architectural Protocols (EFI Services) > diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc > index e9518dd273..279b905edd 100644 > --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc > +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc > @@ -42,7 +42,7 @@ READ_LOCK_STATUS = TRUE > INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf > INF ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf > INF EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf > - INF ArmVirtPkg/HighMemDxe/HighMemDxe.inf > + INF OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf > > # > # PI DXE Drivers producing Architectural Protocols (EFI Services) > diff --git a/ArmVirtPkg/HighMemDxe/HighMemDxe.inf b/OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf > similarity index 91% > rename from ArmVirtPkg/HighMemDxe/HighMemDxe.inf > rename to OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf > index 168fc90d2a..45779a2d59 100644 > --- a/ArmVirtPkg/HighMemDxe/HighMemDxe.inf > +++ b/OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf > @@ -23,8 +23,7 @@ > EmbeddedPkg/EmbeddedPkg.dec > MdePkg/MdePkg.dec > MdeModulePkg/MdeModulePkg.dec > - ArmPkg/ArmPkg.dec > - ArmVirtPkg/ArmVirtPkg.dec > + OvmfPkg/OvmfPkg.dec > > [LibraryClasses] > BaseLib > diff --git a/ArmVirtPkg/HighMemDxe/HighMemDxe.c b/OvmfPkg/Fdt/HighMemDxe/HighMemDxe.c > similarity index 100% > rename from ArmVirtPkg/HighMemDxe/HighMemDxe.c > rename to OvmfPkg/Fdt/HighMemDxe/HighMemDxe.c >