Re: [PATCH V2 10/15] ArmVirtXen: Use merged variable driver for emulated NV mode

["Zeng, Star" <star.zeng@intel.com>]

On 2019/1/16 22:26, Julien Grall wrote:
> Hi Laszlo,
> 
> On 15/01/2019 09:37, Laszlo Ersek wrote:
>> On 01/14/19 16:19, Star Zeng wrote:
>>> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1323
>>> Merge EmuVariable and Real variable driver.
>>>
>>> The real variable driver has been updated to support emulated
>>> variable NV mode and the EmuVariableRuntimeDxe will be removed
>>> later, so use merged variable driver for emulated NV mode.
>>>
>>> Cc: Laszlo Ersek <lersek@redhat.com>
>>> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>>> Cc: Julien Grall <julien.grall@linaro.org>
>>> Contributed-under: TianoCore Contribution Agreement 1.1
>>> Signed-off-by: Star Zeng <star.zeng@intel.com>
>>> ---
>>>   ArmVirtPkg/ArmVirtXen.dsc | 9 +++++++--
>>>   ArmVirtPkg/ArmVirtXen.fdf | 4 ++--
>>>   2 files changed, 9 insertions(+), 4 deletions(-)
>>>
>>> diff --git a/ArmVirtPkg/ArmVirtXen.dsc b/ArmVirtPkg/ArmVirtXen.dsc
>>> index a29d8a4ae717..db85fb3402d0 100644
>>> --- a/ArmVirtPkg/ArmVirtXen.dsc
>>> +++ b/ArmVirtPkg/ArmVirtXen.dsc
>>> @@ -1,7 +1,7 @@
>>>   #
>>>   #  Copyright (c) 2011-2015, ARM Limited. All rights reserved.
>>>   #  Copyright (c) 2014, Linaro Limited. All rights reserved.
>>> -#  Copyright (c) 2015 - 2016, Intel Corporation. All rights 
>>> reserved.<BR>
>>> +#  Copyright (c) 2015 - 2019, Intel Corporation. All rights 
>>> reserved.<BR>
>>>   #
>>>   #  This program and the accompanying materials
>>>   #  are licensed and made available under the terms and conditions 
>>> of the BSD License
>>> @@ -101,6 +101,11 @@ [PcdsFixedAtBuild.common]
>>>     # Set terminal type to TtyTerm, the value encoded is 
>>> EFI_TTY_TERM_GUID
>>>     gArmVirtTokenSpaceGuid.PcdTerminalTypeGuidBuffer|{0x80, 0x6d, 
>>> 0x91, 0x7d, 0xb1, 0x5b, 0x8c, 0x45, 0xa4, 0x8f, 0xe2, 0x5f, 0xdd, 
>>> 0x51, 0xef, 0x94}
>>> +  #
>>> +  # Make VariableRuntimeDxe work at emulated non-volatile variable 
>>> mode.
>>> +  #
>>> +  gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvModeEnable|TRUE
>>> +
>>>   [PcdsPatchableInModule.common]
>>>     #
>>>     # This will be overridden in the code
>>> @@ -172,7 +177,7 @@ [Components.common]
>>>     MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
>>>     MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
>>> -  
>>> MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf
>>> +  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
>>>     
>>> MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf 
>>>
>>>     
>>> MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf
>>> diff --git a/ArmVirtPkg/ArmVirtXen.fdf b/ArmVirtPkg/ArmVirtXen.fdf
>>> index 50e670254d52..5655c0df2926 100644
>>> --- a/ArmVirtPkg/ArmVirtXen.fdf
>>> +++ b/ArmVirtPkg/ArmVirtXen.fdf
>>> @@ -1,7 +1,7 @@
>>>   #
>>>   #  Copyright (c) 2011-2015, ARM Limited. All rights reserved.
>>>   #  Copyright (c) 2014, Linaro Limited. All rights reserved.
>>> -#  Copyright (c) 2015 - 2017, Intel Corporation. All rights 
>>> reserved.<BR>
>>> +#  Copyright (c) 2015 - 2019, Intel Corporation. All rights 
>>> reserved.<BR>
>>>   #
>>>   #  This program and the accompanying materials
>>>   #  are licensed and made available under the terms and conditions 
>>> of the BSD License
>>> @@ -137,7 +137,7 @@ [FV.FvMain]
>>>     INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
>>>     INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
>>> -  INF 
>>> MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf
>>> +  INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
>>>     INF 
>>> MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf 
>>>
>>>     INF 
>>> MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf
>>>
>>
>> Reviewed-by: Laszlo Ersek <lersek@redhat.com>
>>
>> Julien, can you please regression test this series on Xen? The repo URL
>> and the branch name are in the blurb.
> 
> I will have a try and let you know the result.

Thank you, Julien.
I think you can try based on V3 series although there is no essential 
difference between V2 and V3. :)

Repo: git@github.com:lzeng14/edk2.git
Branch: MergedVariableDriver_EmuNvMode_V3

Thanks,
Star

> 
> Cheers,
>