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.web08.2054.1632872229668257902 for ; Tue, 28 Sep 2021 16:37:18 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@hpe.com header.s=pps0720 header.b=mRXPQtqE; 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 (m0134425.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 18SMZuab027811; Tue, 28 Sep 2021 23:37:05 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=hh4ep3yJrg5Vp32q9Joy3P/mnXIRdNSnzDDxZrcxG3w=; b=mRXPQtqE5x+daMvW6rdJoHugfuFPJ3pv4LjoTbpY57z7cdrnXywI9GW9VMcnpvdQDWjL qB5WGcj310Bv6CJ2JktJWyniwcl7JGuIDlrtPRbcA+G0xAIduhYHNYDXK5mGV9IqR8Ni 3DrXulX17uec0fMV9WuYYyLe8h/bxud7OIT/D74eFoSI5nZdC9lEqw0Y2+ufTwhnEYdv Jzd/daPjXnmqNZAZMCq6ZKAXquu8gCkzuCIOh1VYC4QGiJDLFVbOxJ8ZqcUXYAELqw4+ 09WD1RaRa/RVXZljBKBQjibS4mY+GFWozQAst8o+xGoydRaSj9bSZjbJx6unbusI5Mhw dA== Received: from g2t2354.austin.hpe.com (g2t2354.austin.hpe.com [15.233.44.27]) by mx0b-002e3701.pphosted.com with ESMTP id 3bca0cs4qe-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 28 Sep 2021 23:37:05 +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 A6FD883; Tue, 28 Sep 2021 23:37:04 +0000 (UTC) Received: from G9W8677.americas.hpqcorp.net (16.220.49.24) by G1W8106.americas.hpqcorp.net (16.193.72.61) with Microsoft SMTP Server (TLS) id 15.0.1497.23; Tue, 28 Sep 2021 23:37:04 +0000 Received: from G1W8106.americas.hpqcorp.net (16.193.72.61) by G9W8677.americas.hpqcorp.net (16.220.49.24) with Microsoft SMTP Server (TLS) id 15.0.1497.23; Tue, 28 Sep 2021 23:37:04 +0000 Received: from NAM04-MW2-obe.outbound.protection.outlook.com (15.241.52.13) 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:37:04 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=T+OKEwrDwhEMrctWzBAc0h1MSnDMh63jTyy0erdvK20W1m75KIReV4WAAgsGhTn+ezQfeGKHevDLF68FcheIXGRdGKlwBJt+AjX/BEO+YteQyAvuVxZHVI2S7u1CfdRjBVsS5TwACM07rnMu8stoqs5lTpRcwT8VrtlIehrwg5jvUumqgOtbaNIc4Km/XENmgZV92QC/v3CuZt6qPngRS1/5t+MPF7Gka042XmJkKQUqFJa6bqSW+9uyx/Y3GddUbXHxCn3kAfittUUJ3+qpqEO0AjVx7gsm3aFsJ/CLie8gT73xHFcA378SrvAg+V+Zx/rzKvcnfXUtFplRVQf14A== 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=hh4ep3yJrg5Vp32q9Joy3P/mnXIRdNSnzDDxZrcxG3w=; b=dmF/3nRcB3AaWO2Em/Clt2NORFJv1yK/5tiZzmd7ZGlvxbxzHbU5aZlz1DWelx0HERPAX51KpJ6Ho3geCVuFBpLoQ4UmL+suYKin0KCU0wIFo4+2wGwdRXkrn+QbeVjH4+fo33+4kGX/wEGO7OXPpBo/2L1Zskb1M/xCX4CZuECXqB12XAgeYYMzILVAIBkibu4l82Wp+zyWM0MyPrn201DvrMEssJrgQF9AW5Hu3ciz4Kwd9bxo71F3V0wmWJRf7LJ+piY2Wa+LzRhKip7NK1zV8k4A4DxN5Fm9VdvpcLFnRyKrx/EVYUsywGEVR9M+cXyApn7/opWZTBLF1T/KFQ== 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:37:02 +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:37:02 +0000 Message-ID: <640dff11-fbe9-f670-9d36-9017825bcccb@hpe.com> Date: Wed, 29 Sep 2021 07:36:53 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.1.0 Subject: Re: [PATCH V2 9/9] ArmVirtPkg/VirtioFdtDxe: Relocate VirtioFdtDxe to OvmfPkg/Fdt 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-10-abner.chang@hpe.com> From: "Daniel Schaefer" In-Reply-To: <20210928083107.7418-10-abner.chang@hpe.com> X-ClientProxiedBy: HK2PR03CA0045.apcprd03.prod.outlook.com (2603:1096:202:17::15) 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 HK2PR03CA0045.apcprd03.prod.outlook.com (2603:1096:202:17::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.7 via Frontend Transport; Tue, 28 Sep 2021 23:36:59 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bcc1a254-3ad7-422f-1cb1-08d982d8df5c X-MS-TrafficTypeDiagnostic: DF4PR8401MB0842: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:91; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fWHCm3zmSmpsPTSKlEjGejitJp05Z4UNcjpS+h3WpHSHSrrNKHHWoVYupA8vh+LRfL/voP7+viK4XbxNvW98FpFvCWPhmVoFkvCqQZAmr8/l6rtLlBRPm9MyJ5ddHEHhb7lK057vzbixL6A2mulVIxyyUlxareVITnE/mT5taZsrVYl6vhER/pWPJNCZWmerABbxsLbc5812Q845PXoD3sOPEhdClFFPdSI4/WDCh7GlWKnwQW3WYXvbSNkKOLUbpBj7k4z9LPaOPNSirkdMdl7Awc6U5QB93ZNLlFPtTOLhlrEa+ZFsoBbB8uFi42BWNF/hQx2tSvJvjf7vP+Ss1TfYYkoJHDJ4aI1G4J/Aj2FdljyGhC1fIxWD/W8y9SZ5quwmxIXAtkHY45ZBtfab5DqRHjxnkZYdiGUB3CcWGN6iJH4bRD/fleKLHVvwpYJli3CIYm7ZRlLjx6K8df/Pe8eLoiQcyeD9GBywZonslgGHrMmwzxbU6h4OXkRSgNUyVeo37wEkSjVff+RJCfea8Fcq9o65Bl7Idem8cZ6FEprAwEj6jxp35dzcTApzhZPuXOPaLgf7vhJ082AceJI7TV21rSJD6O9s1faGBgvSNgss0+wIqho0+pZsQ/AjoupN8onNzrZS5x8lHh9N2vQsaVP6Bu10sMIpAaTe9r0/GgnrQ+Z0MI733j+QUEQB1HtycaOxka1SRj+usbYP7Q4siiAJhLmgreCs9jqS5IPkSLc= 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)(45980500001)(43740500002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?b1Jpc2xvcDUzbWtmdFZEc2Q5VG41SVU3cXNvRnArUm4rbEx0SUdMYUl6TGpQ?= =?utf-8?B?YUVzanRSQVFUekpqT01aek1SbjZ3R013WGY3UDY0L3c1NEtMSjZ2RHBIYjRv?= =?utf-8?B?cVVCL3NXOWIyVy8yaEkxTnc3eUpNNEJKTTBrd0ZzYmtwTlBkZDBkNWlYcmtw?= =?utf-8?B?YkpoNDluSi9pZEJrRVY3bWdaVi90aU54Qk5tMlhNWlV1dkozZ0V1RE41WFpo?= =?utf-8?B?cVFXREZabk1ycUxMYlJSMklLdUxyMDVDbVJRMTljYyt0WmIyTDZGTWgyVVRV?= =?utf-8?B?YnZMZndzRTBVVFFuZWdjNUsvNEhTNW9xN1lPNHhnaXNnYWxjQmZaZnNjaDJS?= =?utf-8?B?c0JHMDhCYUZnTm9WOUlUZThWQjdZQ0dZZytwUFcyRnRxbVQ1Vm9yYzVPdTJt?= =?utf-8?B?d1RyNUxYMmNvNnU4VkJISW1DRWUyVkxCUURJMllWNUtiTTZxM3hnUGJzV3FF?= =?utf-8?B?MEMxUm1uYndXdEMyRHFaaUs3L2dYMDJBMXRsY2g3R3l3OUI4emxuaXhrRTF0?= =?utf-8?B?bXpZOVhBMlJGRXBSNmtWNFpub0dlQThMVGdCTFJCclJFMEIrK0FMZFkzcllh?= =?utf-8?B?RFhvM2VuOXpTOUlSUmdQQ05mL0NvZDBnWXo1Ylo3aTVqcUlBMjd5VDBBQzBQ?= =?utf-8?B?RHBHbzZmaVMzdUtFTVFaejU3a1dJNnA4aWpaYU5WR1hndVAxeGU1YlhyN0ta?= =?utf-8?B?U25RdlZPaFZlUzN2R2pnWlF5RTN1UnA3SS9kU1RLaCtsamZNZS9VWjlvS3ZI?= =?utf-8?B?c2Q5MC9oeXBkL0UvRURtTGRmUDdsN0l0WlA3cnBIbnhFbGF1ZlVhSGtacVhH?= =?utf-8?B?aUpnMjFzVWVRL3JzU2ErNWltaDlNcmlvaU1pRHFUN3YzcWhzdWVKamNhRm1J?= =?utf-8?B?TzJkUno4MjJvMldVYkJRbk5RekdLK0NnUmNMS1Ywd1k3Yk9kL2RmUUk5dmVH?= =?utf-8?B?bUs4Mmw0OU1PVTlpcDd3SXNSUnkrV1M5b0tXRXpxUkttNHhKeDdLRlI1dVps?= =?utf-8?B?YWJNdjRiZnVyV2lWandnUllVLzZ1YVR1NWNyRTBQRUVLOVA1ZnREcHVKZkd3?= =?utf-8?B?UWZ4TnZVSEFkOGlCMUhuMGI4M0JLaVRaZGczY05Qejg3ZlBJajI0cnJHY2o4?= =?utf-8?B?SHlsWDBNN0xxc0tJTm9HOHZBaG5LUy9UWFVmMXVNL3BCNTNtT3VKenVzK3Zy?= =?utf-8?B?YndiK0xpd1VHaTZFWnNwNUJPWk1tUGx5dUFDenJLNVZWUVVjYTZXbmJnOHBl?= =?utf-8?B?eFhXREJjRWlJNnRTNnJjT0NpTmplcDh2Q2xvaCtkTlByK2dhQ1h3TWc1SVZC?= =?utf-8?B?c0x6bFRiSG9idmRSaHNBdlRzd1VkR1hXczJOTE5CNk5jNEtZU0ppSEZ5QWZx?= =?utf-8?B?aVhFYmZ1UlU3U1ErNzJjNGhJeFFRNHpoNGNxY0c3UlhVMDVYbjVGYmVldllu?= =?utf-8?B?VXloMzdpbGs4QVVlS2IyclIvenJuUW12NkxxN1dkTzkxTEdOUHVHSXBnOXQx?= =?utf-8?B?SzdTKzBaUm15R2t5K2lselFPY2VEWm5QRU5DUGMrenRXTVZ1MlRRQ01PMU1C?= =?utf-8?B?WUN6VlVsUHRyZ0RPMi9ONVA5NkNVUmlMWTR2SUx0cVpnRHFTc0Z0TmxmZFZ6?= =?utf-8?B?VzF6N0pXRFkxSUljS2htQmxzZTNzcmsxUlc5dEtlTE1CR3RGQ0ovTFNkVFUy?= =?utf-8?B?TzdUYTZ3VlUxbWx6L05weWJSZGk5cHNNaDNmdU1KQjFleGZ5WEg0dzNXYTJJ?= =?utf-8?Q?NgW4NXSO7p4vmHhL91Xu/Fb7EBlMHMgUMpAM2Y8?= X-MS-Exchange-CrossTenant-Network-Message-Id: bcc1a254-3ad7-422f-1cb1-08d982d8df5c 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:37:02.4797 (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: d9oi+tlaL+RJR5CSTHakRKCx5eqLtr/RUB5dt78iZmh7ago7M0aU2YE9fZ7LpXsXHvjerazSF/gidOoLpgqf0g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DF4PR8401MB0842 X-OriginatorOrg: hpe.com X-Proofpoint-ORIG-GUID: 4uNNhBYYq44-ID-fFd1LD-2VgcDvfmtL X-Proofpoint-GUID: 4uNNhBYYq44-ID-fFd1LD-2VgcDvfmtL 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 impostorscore=0 bulkscore=0 clxscore=1015 adultscore=0 priorityscore=1501 lowpriorityscore=0 mlxscore=0 malwarescore=0 phishscore=0 suspectscore=0 mlxlogscore=916 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 Reviewed-By: Daniel Schaefer On 9/28/21 16:31, Abner Chang wrote: > Relocate VirtioFdtDxe to OvmfPkg/Fdt, this driver 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}/VirtioFdtDxe/VirtioFdtDxe.inf | 1 - > {ArmVirtPkg => OvmfPkg/Fdt}/VirtioFdtDxe/VirtioFdtDxe.c | 0 > 9 files changed, 7 insertions(+), 8 deletions(-) > rename {ArmVirtPkg => OvmfPkg/Fdt}/VirtioFdtDxe/VirtioFdtDxe.inf (93%) > rename {ArmVirtPkg => OvmfPkg/Fdt}/VirtioFdtDxe/VirtioFdtDxe.c (100%) > > diff --git a/ArmVirtPkg/ArmVirtCloudHv.dsc b/ArmVirtPkg/ArmVirtCloudHv.dsc > index 0f26c10aab..9ad124522f 100644 > --- a/ArmVirtPkg/ArmVirtCloudHv.dsc > +++ b/ArmVirtPkg/ArmVirtCloudHv.dsc > @@ -292,7 +292,7 @@ > # > # Platform Driver > # > - ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf > + OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.inf > EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf > OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf > OvmfPkg/VirtioBlkDxe/VirtioBlk.inf > diff --git a/ArmVirtPkg/ArmVirtKvmTool.dsc b/ArmVirtPkg/ArmVirtKvmTool.dsc > index 0c5da4427e..9d23072d8f 100644 > --- a/ArmVirtPkg/ArmVirtKvmTool.dsc > +++ b/ArmVirtPkg/ArmVirtKvmTool.dsc > @@ -291,7 +291,7 @@ > # Platform Driver > # > ArmVirtPkg/KvmtoolPlatformDxe/KvmtoolPlatformDxe.inf > - ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf > + OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.inf > EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf > OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf > OvmfPkg/VirtioBlkDxe/VirtioBlk.inf > diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc > index 4624b6ec36..6d41c8ac55 100644 > --- a/ArmVirtPkg/ArmVirtQemu.dsc > +++ b/ArmVirtPkg/ArmVirtQemu.dsc > @@ -403,7 +403,7 @@ > # > # Platform Driver > # > - ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf > + OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.inf > EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf > OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf > OvmfPkg/VirtioBlkDxe/VirtioBlk.inf > diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc > index 426e0ff1fd..19544ea898 100644 > --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc > +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc > @@ -339,7 +339,7 @@ > # > # Platform Driver > # > - ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf > + OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.inf > EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf > OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf > OvmfPkg/VirtioBlkDxe/VirtioBlk.inf > diff --git a/ArmVirtPkg/ArmVirtCloudHv.fdf b/ArmVirtPkg/ArmVirtCloudHv.fdf > index 7ecf5ca88d..81c539590a 100644 > --- a/ArmVirtPkg/ArmVirtCloudHv.fdf > +++ b/ArmVirtPkg/ArmVirtCloudHv.fdf > @@ -105,7 +105,7 @@ READ_LOCK_STATUS = TRUE > > INF MdeModulePkg/Core/Dxe/DxeMain.inf > INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf > - INF ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf > + INF OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.inf > INF EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf > INF OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf > > diff --git a/ArmVirtPkg/ArmVirtKvmTool.fdf b/ArmVirtPkg/ArmVirtKvmTool.fdf > index 0535d36b7d..14a5fce43a 100644 > --- a/ArmVirtPkg/ArmVirtKvmTool.fdf > +++ b/ArmVirtPkg/ArmVirtKvmTool.fdf > @@ -119,7 +119,7 @@ READ_LOCK_STATUS = TRUE > > INF MdeModulePkg/Core/Dxe/DxeMain.inf > INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf > - INF ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf > + INF OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.inf > INF EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf > INF ArmVirtPkg/KvmtoolPlatformDxe/KvmtoolPlatformDxe.inf > INF OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf > diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc > index 279b905edd..f6a538df72 100644 > --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc > +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc > @@ -40,7 +40,7 @@ READ_LOCK_STATUS = TRUE > > INF MdeModulePkg/Core/Dxe/DxeMain.inf > INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf > - INF ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf > + INF OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.inf > INF EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf > INF OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf > > diff --git a/ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf b/OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.inf > similarity index 93% > rename from ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf > rename to OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.inf > index 9d5ae7b12f..dece5c806b 100644 > --- a/ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf > +++ b/OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.inf > @@ -20,7 +20,6 @@ > VirtioFdtDxe.c > > [Packages] > - ArmVirtPkg/ArmVirtPkg.dec > EmbeddedPkg/EmbeddedPkg.dec > MdePkg/MdePkg.dec > OvmfPkg/OvmfPkg.dec > diff --git a/ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.c b/OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.c > similarity index 100% > rename from ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.c > rename to OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.c >