Re: [edk2] [PATCH 00/13] ArmVirtPkg: move to MdeModulePkg BDS

2016-05-05 Thread Ard Biesheuvel
On 5 May 2016 at 21:22, Laszlo Ersek wrote: > Based on Ray's recent patches for OvmfPkg, and what I learned from them. > > Fixes: . > > Public branch: > . > > I'm CC'ing Ray on the entire

Re: [edk2] [Patch] SecurityPkg: Cleanup unused structure definition

2016-05-05 Thread Fu, Siyuan
Reviewed-by: Fu Siyuan > -Original Message- > From: Wu, Jiaxin > Sent: Friday, May 6, 2016 2:20 PM > To: edk2-devel@lists.01.org > Cc: Zhang, Chao B ; Ye, Ting ; > Fu, Siyuan > Subject: [Patch] SecurityPkg: Cleanup unused structure definition > > This patch is used to cleanup unused st

Re: [edk2] [Patch] SecurityPkg: Cleanup unused structure definition

2016-05-05 Thread Zhang, Chao B
Reviewed-by: Chao Zhang Thanks & Best regards Chao Zhang -Original Message- From: Wu, Jiaxin Sent: Friday, May 06, 2016 2:20 PM To: edk2-devel@lists.01.org Cc: Zhang, Chao B; Ye, Ting; Fu, Siyuan Subject: [Patch] SecurityPkg: Cleanup unused structure definition This patch is used

[edk2] [Patch] SecurityPkg: Cleanup unused structure definition

2016-05-05 Thread Jiaxin Wu
This patch is used to cleanup unused structure definition. Cc: Zhang Chao B Cc: Ye Ting Cc: Fu Siyuan Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jiaxin Wu --- .../SecureBootConfigDxe/SecureBootConfigImpl.h | 37 -- 1 file changed, 37 deletio

Re: [edk2] [PATCH v2] ShellPkg: Add argument to set block size for tftp command.

2016-05-05 Thread Qiu, Shumin
Reviewed-by: Qiu Shumin -Original Message- From: Fu, Siyuan Sent: Friday, May 06, 2016 1:16 PM To: edk2-devel@lists.01.org Cc: Carsey, Jaben; Qiu, Shumin Subject: [PATCH v2] ShellPkg: Add argument to set block size for tftp command. V2 update: Define macros for the max and min block siz

[edk2] [PATCH v2] ShellPkg: Add argument to set block size for tftp command.

2016-05-05 Thread Fu Siyuan
V2 update: Define macros for the max and min block size value. TFTP block size has a big impact on the transmit performance, this patch is to add new argument [-s ] for shell "tftp" command to configure the block size for file download. Cc: Jaben Carsey Cc: Shumin Qiu Contributed-under: TianoCo

Re: [edk2] [Patch 0/2] 0001-NetworkPkg-Ignore-BootFileName-if-it-is-overloaded

2016-05-05 Thread Ye, Ting
Looks good to me. Series reviewed-by: Ye Ting Thanks, Ting -Original Message- From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Fu Siyuan Sent: Tuesday, May 03, 2016 1:36 PM To: edk2-devel@lists.01.org Subject: [edk2] [Patch 0/2] 0001-NetworkPkg-Ignore-BootFileName-

Re: [edk2] [Patch] NetworkPkg: Fix a memory leak in HTTP boot driver.

2016-05-05 Thread Ye, Ting
Reviewed-by: Ye Ting -Original Message- From: Fu, Siyuan Sent: Thursday, May 05, 2016 10:16 AM To: edk2-devel@lists.01.org Cc: Ye, Ting ; Wu, Jiaxin Subject: [Patch] NetworkPkg: Fix a memory leak in HTTP boot driver. We always need to call EfiBootManagerFreeLoadOption because the memo

Re: [edk2] BaseTools question about FDF FILE syntax

2016-05-05 Thread Andrew Fish
> On May 5, 2016, at 7:24 PM, Gao, Liming wrote: > > Andrew: > NAME GUID is module INF file GUID. It is used in Rule section in FDF file > like below. This is your usage case? > > [Rule.Common.DXE_CORE] > FILE DXE_CORE = $(NAMED_GUID) { >COMPRESS PI_STD { > PE32 PE32 $(INF_

Re: [edk2] BaseTools question about FDF FILE syntax

2016-05-05 Thread Gao, Liming
Andrew: NAME GUID is module INF file GUID. It is used in Rule section in FDF file like below. This is your usage case? [Rule.Common.DXE_CORE] FILE DXE_CORE = $(NAMED_GUID) { COMPRESS PI_STD { PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi UI STRING="$(MODULE_NAME)"

[edk2] [Patch] ShellPkg: Add argument to set block size for tftp command.

2016-05-05 Thread Fu Siyuan
TFTP block size has a big impact on the transmit performance, this patch is to add new argument [-s ] for shell "tftp" command to configure the block size for file download. Cc: Jaben Carsey Cc: Shumin Qiu Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Fu Siyuan --- She

Re: [edk2] [PATCH 17/19] IntelFspWrapperPkg/FspInit: Split FspInitPei to FspmWrapperPeim and FspsWrapperPeim.

2016-05-05 Thread Kinney, Michael D
Tim, I agree multiple repos in a WORKSPACE can potentially be confusing. Especially if the same package dir exists in more than of the repos. To alleviate this issue, a repo can be pruned and the .gitignore feature can be used for git to ignore the packages that have been pruned. The reason

Re: [edk2] [Patch] NetworkPkg: Fix a memory leak in HTTP boot driver.

2016-05-05 Thread Wang, Sunny (HPS SW)
Looks good to me. Thanks for addressing my comemnt. (Sorry for late to review this. I was not aware of that you send the other review for my comment) Reviewed-by: Sunny Wang -Original Message- From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Fu Siyuan Sent: Thursday

[edk2] BaseTools question about FDF FILE syntax

2016-05-05 Thread Andrew Fish
I was trying to use a GUID CNAME with the FILE command and I got a failure. Looking at the specification it defines the GUID as the well known macro $(NAMED_GUID) . I'm not sure what the definition of $(NAMED_GUID) is when there is no INF file involved? The spec defines the FILE, and SECTION sy

Re: [edk2] [PATCH 17/19] IntelFspWrapperPkg/FspInit: Split FspInitPei to FspmWrapperPeim and FspsWrapperPeim.

2016-05-05 Thread Tim Lewis
Mike -- At this time, no. Our internal tools do not recognize it, and would fail during tree analysis. Likewise, our policy does not allow it because we find our customers are confused by multiple roots. It makes it hard for the engineers looking at a downstream file to predict where the final

Re: [edk2] [review]Please review changes to UNI file format document

2016-05-05 Thread Qiu, Shumin
Reviewed-by: Qiu Shumin From: Carsey, Jaben Sent: Saturday, April 30, 2016 1:53 AM To: edk2-devel@lists.01.org; Bjorge, Erik C; Qiu, Shumin Cc: Carsey, Jaben Subject: [review]Please review changes to UNI file format document Updated UNI spec to remove info specific to some consumers, not format.

Re: [edk2] [PATCH 17/19] IntelFspWrapperPkg/FspInit: Split FspInitPei to FspmWrapperPeim and FspsWrapperPeim.

2016-05-05 Thread Kinney, Michael D
Hi Tim, I wanted to follow up on the general concern on the use of the PACKAGES_PATH feature. The EDK II BaseTools still use a single WORKSPACE and can use PACKAGES_PATH for additional search paths for packages. PACKAGES_PATH can point to directories Below WORKSPACE or outside WORKSPACE, so it

Re: [edk2] [Patch] NetworkPkg: Fix a memory leak in HTTP boot driver.

2016-05-05 Thread Wu, Jiaxin
The patch is good to me. Reviewed-By: Wu Jiaxin > -Original Message- > From: Fu, Siyuan > Sent: Thursday, May 5, 2016 10:16 AM > To: edk2-devel@lists.01.org > Cc: Ye, Ting ; Wu, Jiaxin > Subject: [Patch] NetworkPkg: Fix a memory leak in HTTP boot driver. > > We always need to call Efi

[edk2] [PATCH v2 0/3] Marvell Yukon driver

2016-05-05 Thread Daniil Egranov
The UEFI driver for Marvell Yukon chipset On the Juno platform, this driver requires another platform-specific patch initializing the Marvell network adapter with correct MAC address. Without the patch, the PcdYukonMacAddressvariable has to be set. Changes since v1: Added declaration of PcdYuk

[edk2] [PATCH v2 2/3] OpenPlatformPkg/MarvellYukonDxe : Marvell Yukon driver 2/3

2016-05-05 Thread Daniil Egranov
The UEFI driver for Marvell Yukon chipset, part 2 Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Daniil Egranov --- Drivers/Net/MarvellYukonDxe/ComponentName.c | 313 + Drivers/Net/MarvellYukonDxe/DriverBinding.c | 431 +++ Drivers/Net/MarvellYukonDxe/Ma

[edk2] [PATCH v2 1/3] OpenPlatformPkg/MarvellYukonDxe : Marvell Yukon driver 1/3

2016-05-05 Thread Daniil Egranov
The UEFI driver for Marvell Yukon chipset, part 1 Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Daniil Egranov --- Platforms/ARM/Juno/ArmJuno.dsc | 4 Platforms/ARM/Juno/ArmJuno.fdf | 1 + 2 files changed, 5 insertions(+) diff --git a/Platforms/ARM/Juno/ArmJuno.dsc

[edk2] [PATCH 08/13] ArmVirtPkg/PlatformBootManagerLib: remove empty PlatformBdsLib hooks

2016-05-05 Thread Laszlo Ersek
Namely, - PlatformBdsBootSuccess, - PlatformBdsBootFail, - PlatformBdsLockNonUpdatableFlash. This patch parallels OvmfPkg commit 7f89929f7fb2. Cc: Ard Biesheuvel Cc: Ruiyu Ni Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Laszlo Ersek --- ArmVirtPkg/Library/PlatformBoo

[edk2] [PATCH 12/13] ArmVirtPkg/ArmVirtQemu: use MdeModulePkg/BDS

2016-05-05 Thread Laszlo Ersek
Based on OvmfPkg commit 79c098b6d25d. Unlike in OVMF, no USE_OLD_BDS fallback is introduced; I think that ArmVirtPkg is less widely used by non-developers than OvmfPkg. ArmVirtXen is not modified, as it uses PlatformIntelBdsLib from ArmPlatformPkg. About this patch: - DxeServicesLib and SortLib

[edk2] [PATCH 11/13] ArmVirtPkg/PlatformBootManagerLib: add EnableQuietBoot & DisableQuietBoot

2016-05-05 Thread Laszlo Ersek
UefiBootManagerLib does not provide these functions, we have to implement them. (EnableQuietBoot() puts up the nice TianoCore logo.) OvmfPkg commits 817fb3ac2a78 and 8e8fd3037788 have extracted these functions already, - from "IntelFrameworkModulePkg/Library/GenericBdsLib/BdsConsole.c" - to "OvmfP

[edk2] [PATCH 10/13] ArmVirtPkg/PlatformBootManagerLib: rebase boot order manipulation

2016-05-05 Thread Laszlo Ersek
QemuBootOrderLib can only filter out and reorder boot options; it cannot create boot options. It relies on Platform BDS to auto-generate all possible boot options first (for example, for new virtual devices that have been configured since the last run of the virtual machine). Then it will decide, c

[edk2] [PATCH 13/13] ArmVirtPkg: retire PlatformIntelBdsLib

2016-05-05 Thread Laszlo Ersek
This library instance is no longer referenced. Cc: Ard Biesheuvel Cc: Ruiyu Ni Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Laszlo Ersek --- ArmVirtPkg/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf | 81 -- ArmVirtPkg/Library/PlatformIntelBdsLib/IntelBdsPlatfo

[edk2] [PATCH 07/13] ArmVirtPkg/PlatformBootManagerLib: register boot options and hot keys

2016-05-05 Thread Laszlo Ersek
Register the Enter key as the continue key (hot key to skip the boot timeout). Map the F2 and ESC keys to the UI. Register the memory-mapped Shell boot option. The patch parallels OvmfPkg commit 07dd96e82032. The PlatformRegisterFvBootOption() and PlatformRegisterOptionsAndKeys() functions are cop

[edk2] [PATCH 09/13] ArmVirtPkg/PlatformBootManagerLib: use UefiBootManagerLib ConnectAll() API

2016-05-05 Thread Laszlo Ersek
This patch parallels OvmfPkg commit fed691a6f913. Cc: Ard Biesheuvel Cc: Ruiyu Ni Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Laszlo Ersek --- ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/A

[edk2] [PATCH 05/13] ArmVirtPkg/PlatformBootManagerLib: init console vars in BeforeConsole()

2016-05-05 Thread Laszlo Ersek
With IntelFrameworkModulePkg BDS, the platform code is responsible for updating console variables (e.g., with BdsLibUpdateConsoleVariable()), and then connecting them (e.g., with BdsLibConnectAllDefaultConsoles()). This is usually (although not necessarily) done in PlatformBdsPolicyBehavior(). Wit

[edk2] [PATCH 04/13] ArmVirtPkg/PlatformBootManagerLib: link against UefiBootManagerLib

2016-05-05 Thread Laszlo Ersek
The general BDS helper functions are now provided by MdeModulePkg's UefiBootManagerLib, and no longer by IntelFrameworkModulePkg's GenericBdsLib. This patch parallels OvmfPkg commit 2b23b8d45b62. Cc: Ard Biesheuvel Cc: Ruiyu Ni Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-

[edk2] [PATCH 06/13] ArmVirtPkg/PlatformBootManagerLib: don't launch the Boot Manager Menu

2016-05-05 Thread Laszlo Ersek
MdeModulePkg/BDS doesn't launch the UI (Boot Manager Menu) from the platform side. The platform is expected to store the boot timeout only, in PcdPlatformBootTimeOut. This is usually done in PlatformBootManagerBeforeConsole(). (ArmVirtXen is not modified, as it uses PlatformIntelBdsLib from ArmPla

[edk2] [PATCH 01/13] ArmVirtPkg: duplicate PlatformIntelBdsLib to PlatformBootManagerLib

2016-05-05 Thread Laszlo Ersek
Create a copy of PlatformIntelBdsLib under the name PlatformBootManagerLib, with the following initial changes: - replace PlatformBdsLib references with PlatformBootManagerLib in comments, - replace "IntelBdsPlatform" with "PlatformBm" in file names and their references, - generate a new FILE_G

[edk2] [PATCH 03/13] ArmVirtPkg/PlatformBootManagerLib: use EfiBootManagerUpdateConsoleVariable

2016-05-05 Thread Laszlo Ersek
In this rather mechanical patch, we replace the calls to GenericBdsLib's BdsLibUpdateConsoleVariable() with calls to UefiBootManagerLib's EfiBootManagerUpdateConsoleVariable(), which has the same purpose. The latter uses CONSOLE_TYPE enum constants from "MdeModulePkg/Include/Library/UefiBootManage

[edk2] [PATCH 00/13] ArmVirtPkg: move to MdeModulePkg BDS

2016-05-05 Thread Laszlo Ersek
Based on Ray's recent patches for OvmfPkg, and what I learned from them. Fixes: . Public branch: . I'm CC'ing Ray on the entire series -- I'm not asking for a in-depth code validation (a

[edk2] [PATCH 02/13] ArmVirtPkg/PlatformBootManagerLib: follow PlatformBootManagerLib interfaces

2016-05-05 Thread Laszlo Ersek
"IntelFrameworkModulePkg/Include/Library/PlatformBdsLib.h" declares the following interfaces: - PlatformBdsInit - PlatformBdsPolicyBehavior - PlatformBdsBootFail - PlatformBdsBootSuccess - PlatformBdsLockNonUpdatableFlash - LockKeyboards >From these, we've been using PlatformBdsInit() and Platfor

Re: [edk2] [PATCH 17/19] IntelFspWrapperPkg/FspInit: Split FspInitPei to FspmWrapperPeim and FspsWrapperPeim.

2016-05-05 Thread Tim Lewis
That works well, thank you Tim Sent from my Windows 10 phone From: Mudusuru, Giri P Sent: Thursday, May 5, 2016 12:07 PM To: Tim Lewis; Yao, Jiewen; edk2-devel@lists.01.org

Re: [edk2] [PATCH] ShellPkg: Remove debug message in release binaries.

2016-05-05 Thread Carsey, Jaben
Reviewed-by: Jaben Carsey > -Original Message- > From: Qiu, Shumin > Sent: Wednesday, May 04, 2016 11:05 PM > To: edk2-devel@lists.01.org > Cc: Qiu, Shumin ; Carsey, Jaben > > Subject: [PATCH] ShellPkg: Remove debug message in release binaries. > Importance: High > > Use BaseDebugLibNul

Re: [edk2] OVMF broken under Xen (in PCI initialisation)

2016-05-05 Thread Gary Lin
On Thu, May 05, 2016 at 08:03:05AM +, Ni, Ruiyu wrote: > Gary, > Can you kindly teach me how to run OVMF under Xen? > > I worked out a draft fix and need to verify whether > everything is fine. > Hi Ray, 1. Install the Xen host. I use openSUSE Leap 42.1 as the host system and it's availab

Re: [edk2] [Patch 0/2] Do not use hard coded TTL/ToS in PXE driver.

2016-05-05 Thread Ye, Ting
Looks good to me. Series reviewed-by: Ye Ting -Original Message- From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Fu Siyuan Sent: Tuesday, May 03, 2016 10:26 AM To: edk2-devel@lists.01.org Subject: [edk2] [Patch 0/2] Do not use hard coded TTL/ToS in PXE driver. EFI

Re: [edk2] [PATCH v2] MdeModulePkg: Refine SNP driver's media status check logic.

2016-05-05 Thread Ye, Ting
Reviewed-by: Ye Ting -Original Message- From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Fu Siyuan Sent: Wednesday, May 04, 2016 4:48 PM To: edk2-devel@lists.01.org Cc: Ye, Ting ; Wu, Jiaxin Subject: [edk2] [PATCH v2] MdeModulePkg: Refine SNP driver's media status

Re: [edk2] [PATCH] NetworkPkg: Discard TCP segment when no TCB found

2016-05-05 Thread Michael Chang
On Thu, May 05, 2016 at 07:42:33AM +, Fu, Siyuan wrote: > Hi, Michael > > So you want to have 2 network stack above the MNP protocol, the grub2 native > stack and the edk2 stack, right? Yes, that's the idea basically. > Then do you need the 2 network stack work simultaneously? Not really

Re: [edk2] [PATCH v2] MdeModulePkg: Refine SNP driver's media status check logic.

2016-05-05 Thread Wu, Jiaxin
Reviewed-By: Wu Jiaxin > -Original Message- > From: Fu, Siyuan > Sent: Wednesday, May 4, 2016 4:48 PM > To: edk2-devel@lists.01.org > Cc: Ye, Ting ; Wu, Jiaxin > Subject: [PATCH v2] MdeModulePkg: Refine SNP driver's media status check > logic. > > V2 Update: > Refine variable and functi

Re: [edk2] [patch 0/2] MdeModulePkg/SetupBrowser: Fix two issues in submit form/formset

2016-05-05 Thread Gao, Liming
Reviewed-by: Liming Gao > -Original Message- > From: Bi, Dandan > Sent: Wednesday, April 27, 2016 9:25 AM > To: edk2-devel@lists.01.org > Cc: Gao, Liming ; Dong, Eric > Subject: [patch 0/2] MdeModulePkg/SetupBrowser: Fix two issues in submit > form/formset > > Patch 1 is to restore the

Re: [edk2] [patch] MdeModulePkg/FileExplore: Make LibraryClass & Depex module type consistent

2016-05-05 Thread Gao, Liming
Reviewed-by: Liming Gao > -Original Message- > From: Bi, Dandan > Sent: Thursday, May 05, 2016 11:04 AM > To: edk2-devel@lists.01.org > Cc: Gao, Liming ; Dong, Eric > Subject: [patch] MdeModulePkg/FileExplore: Make LibraryClass & Depex > module type consistent > > Cc: Liming Gao > Cc:

Re: [edk2] [PATCH v2 2/3] IntelFrameworkModulePkg/BdsDxe: Fix for the BDS boot timeout

2016-05-05 Thread Laszlo Ersek
On 05/05/16 10:08, Laszlo Ersek wrote: > On 05/05/16 07:08, Ni, Ruiyu wrote: >>> -Original Message- >>> From: Daniil Egranov [mailto:daniil.egra...@arm.com] >>> Sent: Thursday, May 5, 2016 7:57 AM >>> To: Ni, Ruiyu ; edk2-devel@lists.01.org >>> Cc: Fan, Jeff >>> Subject: Re: [edk2] [PATCH

Re: [edk2] [PATCH v2 2/3] IntelFrameworkModulePkg/BdsDxe: Fix for the BDS boot timeout

2016-05-05 Thread Laszlo Ersek
On 05/05/16 07:08, Ni, Ruiyu wrote: > > > Regards, > Ray > >> -Original Message- >> From: Daniil Egranov [mailto:daniil.egra...@arm.com] >> Sent: Thursday, May 5, 2016 7:57 AM >> To: Ni, Ruiyu ; edk2-devel@lists.01.org >> Cc: Fan, Jeff >> Subject: Re: [edk2] [PATCH v2 2/3] IntelFramewor

Re: [edk2] OVMF broken under Xen (in PCI initialisation)

2016-05-05 Thread Ni, Ruiyu
Gary, Can you kindly teach me how to run OVMF under Xen? I worked out a draft fix and need to verify whether everything is fine. Regards, Ray >-Original Message- >From: Laszlo Ersek [mailto:ler...@redhat.com] >Sent: Thursday, April 28, 2016 6:36 PM >To: Ni, Ruiyu ; Gary Lin >Cc: edk2-de

Re: [edk2] [PATCH] NetworkPkg: Discard TCP segment when no TCB found

2016-05-05 Thread Fu, Siyuan
Hi, Michael So you want to have 2 network stack above the MNP protocol, the grub2 native stack and the edk2 stack, right? Then do you need the 2 network stack work simultaneously? If your requirement is the two network stack above MNP need to work at same time, for example one stack is downloa

Re: [edk2] [PATCH] MdeModulePkg: ScsiDiskDxe: cope with broken "Supported VPD Pages" VPD page

2016-05-05 Thread Laszlo Ersek
On 05/05/16 09:07, Tian, Feng wrote: > Laszlo, > > Thanks for your details. It looks make sense. > > Reviewed-by: Feng Tian Many thanks! Commit ce1647fc608e. Cheers! Laszlo > > Thanks > Feng > > -Original Message- > From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf

Re: [edk2] [PATCH] MdeModulePkg: ScsiDiskDxe: cope with broken "Supported VPD Pages" VPD page

2016-05-05 Thread Tian, Feng
Laszlo, Thanks for your details. It looks make sense. Reviewed-by: Feng Tian Thanks Feng -Original Message- From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Laszlo Ersek Sent: Thursday, May 5, 2016 12:47 AM To: Tian, Feng ; edk2-devel-01 Cc: Ni, Ruiyu ; Paolo Bo

Re: [edk2] [PATCH v1 1/1] NetworkPkg:HttpDxe: Code changes to support HTTP PUT/POST operations

2016-05-05 Thread Fu, Siyuan
Hi, Nagaraj For below code change +if (!NetMapIsEmpty (&HttpInstance->TxTokens)) { + NetMapRemoveHead (&HttpInstance->TxTokens, (VOID**) &ValueInItem); + if (ValueInItem == NULL) { +goto Error; + } The original code treat an empty HttpInstance->TxTokens net map as an er