[Qemu-devel] [PATCH v2 0/5] add the BiosTablesTest UEFI app, build it with the new roms/edk2 submodule

[Qemu-devel] [PATCH v2 0/5] add the BiosTablesTest UEFI app, build it with the new roms/edk2 submodule

[Laszlo Ersek]

Previous version (v1):
http://mid.mail-archive.com/20190118223400.24311-1-lersek@redhat.com

Updates in v2 have been noted on each patch in the series.

Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Cc: Shannon Zhao <shannon.zhaosl@gmail.com>

Thanks
Laszlo

Laszlo Ersek (5):
  roms: add the edk2 project as a git submodule
  roms: build the EfiRom utility from the roms/edk2 submodule
  tests: introduce "uefi-test-tools" with the BiosTablesTest UEFI app
  tests/uefi-test-tools: add build scripts
  tests/data: introduce "uefi-boot-images" with the "bios-tables-test"
    ISOs

 .gitmodules                                                              |   3 +
 Makefile                                                                 |   6 +-
 roms/Makefile                                                            |  13 +-
 roms/edk2                                                                |   1 +
 tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2           | Bin 0 -> 11776 bytes
 tests/data/uefi-boot-images/bios-tables-test.arm.iso.qcow2               | Bin 0 -> 11776 bytes
 tests/data/uefi-boot-images/bios-tables-test.i386.iso.qcow2              | Bin 0 -> 12800 bytes
 tests/data/uefi-boot-images/bios-tables-test.x86_64.iso.qcow2            | Bin 0 -> 13312 bytes
 tests/uefi-test-tools/.gitignore                                         |   3 +
 tests/uefi-test-tools/LICENSE                                            |  25 ++++
 tests/uefi-test-tools/Makefile                                           |  97 +++++++++++++
 tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.c   | 130 ++++++++++++++++++
 tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.inf |  41 ++++++
 tests/uefi-test-tools/UefiTestToolsPkg/Include/Guid/BiosTablesTest.h     |  67 +++++++++
 tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dec              |  27 ++++
 tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dsc              |  69 ++++++++++
 tests/uefi-test-tools/build.sh                                           | 145 ++++++++++++++++++++
 17 files changed, 619 insertions(+), 8 deletions(-)
 create mode 160000 roms/edk2
 create mode 100644 tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2
 create mode 100644 tests/data/uefi-boot-images/bios-tables-test.arm.iso.qcow2
 create mode 100644 tests/data/uefi-boot-images/bios-tables-test.i386.iso.qcow2
 create mode 100644 tests/data/uefi-boot-images/bios-tables-test.x86_64.iso.qcow2
 create mode 100644 tests/uefi-test-tools/.gitignore
 create mode 100644 tests/uefi-test-tools/LICENSE
 create mode 100644 tests/uefi-test-tools/Makefile
 create mode 100644 tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.c
 create mode 100644 tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.inf
 create mode 100644 tests/uefi-test-tools/UefiTestToolsPkg/Include/Guid/BiosTablesTest.h
 create mode 100644 tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dec
 create mode 100644 tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dsc
 create mode 100755 tests/uefi-test-tools/build.sh

-- 
2.19.1.3.g30247aa5d201

[Qemu-devel] [PATCH v2 1/5] roms: add the edk2 project as a git submodule

[Laszlo Ersek]

The roms/edk2 submodule can help with three goals:
- build the OVMF and ArmVirtQemu virtual UEFI firmware platforms (to be
  implemented later),
- build the EfiRom tool on the fly, which is used in roms/Makefile, for
  building the "efirom" target,
- build UEFI test applications (to be run in guests), for qtest support.

Edk2 commit 85588389222a3636baf0f9ed8227f2434af4c3f9 stands for the latest
"stable tag", namely "edk2-stable201811".

The edk2 repository tracks some binary files that should not be removed by
QEMU's top-level "make clean"; exempt the full pathnames from the "find"
command.

Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Cc: Shannon Zhao <shannon.zhaosl@gmail.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
---

Notes:
    v2:
    - pick up R-b [Gerd]

 Makefile    | 6 +++++-
 .gitmodules | 3 +++
 roms/edk2   | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index de898eab6234..b0a70b2929ad 100644
--- a/Makefile
+++ b/Makefile
@@ -604,7 +604,11 @@ clean:
 	rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h
 	rm -f qemu-options.def
 	rm -f *.msi
-	find . \( -name '*.so' -o -name '*.dll' -o -name '*.mo' -o -name '*.[oda]' \) -type f -exec rm {} +
+	find . \( -name '*.so' -o -name '*.dll' -o -name '*.mo' -o -name '*.[oda]' \) -type f \
+		! -path ./roms/edk2/ArmPkg/Library/GccLto/liblto-aarch64.a \
+		! -path ./roms/edk2/ArmPkg/Library/GccLto/liblto-arm.a \
+		! -path ./roms/edk2/BaseTools/Source/Python/UPT/Dll/sqlite3.dll \
+		-exec rm {} +
 	rm -f $(filter-out %.tlb,$(TOOLS)) $(HELPERS-y) qemu-ga TAGS cscope.* *.pod *~ */*~
 	rm -f fsdev/*.pod scsi/*.pod
 	rm -f qemu-img-cmds.h
diff --git a/.gitmodules b/.gitmodules
index 6b91176098c8..ceafb0ee29a0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -49,3 +49,6 @@
 [submodule "tests/fp/berkeley-softfloat-3"]
 	path = tests/fp/berkeley-softfloat-3
 	url = https://github.com/cota/berkeley-softfloat-3
+[submodule "roms/edk2"]
+	path = roms/edk2
+	url = https://github.com/tianocore/edk2.git
diff --git a/roms/edk2 b/roms/edk2
new file mode 160000
index 000000000000..85588389222a
--- /dev/null
+++ b/roms/edk2
@@ -0,0 +1 @@
+Subproject commit 85588389222a3636baf0f9ed8227f2434af4c3f9
-- 
2.19.1.3.g30247aa5d201

[Qemu-devel] [PATCH v2 2/5] roms: build the EfiRom utility from the roms/edk2 submodule

[Laszlo Ersek]

Building the EfiRom utility from "roms/edk2/BaseTools" should make
"roms/Makefile" more self-contained. Otherwise, we'd call the system-wide
EfiRom for building the combined iPXE option ROMs, but call the sibling
utilities from "roms/edk2/BaseTools" for building "roms/edk2" content.

Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Cc: Shannon Zhao <shannon.zhaosl@gmail.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---

Notes:
    v2:
    - pick up R-b / T-b [Gerd, Phil]

 roms/Makefile | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/roms/Makefile b/roms/Makefile
index a6043eff37e9..78d5dd18c301 100644
--- a/roms/Makefile
+++ b/roms/Makefile
@@ -47,10 +47,7 @@ SEABIOS_EXTRAVERSION="-prebuilt.qemu.org"
 # We need that to combine multiple images (legacy bios,
 # efi ia32, efi x64) into a single rom binary.
 #
-# We try to find it in the path.  You can also pass the location on
-# the command line, i.e. "make EFIROM=/path/to/EfiRom efirom"
-#
-EFIROM ?= $(shell which EfiRom 2>/dev/null)
+EFIROM = edk2/BaseTools/Source/C/bin/EfiRom
 
 default:
 	@echo "nothing is build by default"
@@ -59,8 +56,7 @@ default:
 	@echo "  vgabios        -- update vgabios binaries (seabios)"
 	@echo "  sgabios        -- update sgabios binaries"
 	@echo "  pxerom         -- update nic roms (bios only)"
-	@echo "  efirom         -- update nic roms (bios+efi, this needs"
-	@echo "                    the EfiRom utility from edk2 / tianocore)"
+	@echo "  efirom         -- update nic roms (bios+efi)"
 	@echo "  slof           -- update slof.bin"
 	@echo "  skiboot        -- update skiboot.lid"
 	@echo "  u-boot.e500    -- update u-boot.e500"
@@ -106,7 +102,7 @@ pxe-rom-%: build-pxe-roms
 
 efirom: $(patsubst %,efi-rom-%,$(pxerom_variants))
 
-efi-rom-%: build-pxe-roms build-efi-roms
+efi-rom-%: build-pxe-roms build-efi-roms $(EFIROM)
 	$(EFIROM) -f "0x$(VID)" -i "0x$(DID)" -l 0x02 \
 		-b ipxe/src/bin/$(VID)$(DID).rom \
 		-ec ipxe/src/bin-i386-efi/$(VID)$(DID).efidrv \
@@ -124,6 +120,8 @@ build-efi-roms: build-pxe-roms
 		$(patsubst %,bin-i386-efi/%.efidrv,$(pxerom_targets)) \
 		$(patsubst %,bin-x86_64-efi/%.efidrv,$(pxerom_targets))
 
+$(EFIROM):
+	$(MAKE) -C edk2/BaseTools
 
 slof:
 	$(MAKE) -C SLOF CROSS=$(powerpc64_cross_prefix) qemu
@@ -150,6 +148,7 @@ clean:
 	$(MAKE) -C sgabios clean
 	rm -f sgabios/.depend
 	$(MAKE) -C ipxe/src veryclean
+	$(MAKE) -C edk2/BaseTools clean
 	$(MAKE) -C SLOF clean
 	rm -rf u-boot/build.e500
 	$(MAKE) -C u-boot-sam460ex distclean
-- 
2.19.1.3.g30247aa5d201

[Qemu-devel] [PATCH v2 3/5] tests: introduce "uefi-test-tools" with the BiosTablesTest UEFI app

[Laszlo Ersek]

The "bios-tables-test" program in QEMU's test suite locates the RSD PTR
ACPI table in guest RAM, and (chasing pointers to other ACPI tables)
performs various sanity checks on the QEMU-generated and
firmware-installed tables.

Currently this set of test cases doesn't work with UEFI guests. The ACPI
spec defines distinct methods for OSPM to locate the RSD PTR on
traditional BIOS vs. UEFI platforms, and the UEFI method is more difficult
to implement from the hypervisor side with just raw guest memory access.

Add a UEFI application (to be booted in the UEFI guest) that populates a
small, MB-aligned structure in guest RAM. The structure begins with a
signature GUID. The hypervisor should loop over all MB-aligned pages in
guest RAM until one matches the signature GUID at offset 0, at which point
the hypervisor can fetch the RSDP address field(s) from the structure.

QEMU's test logic currently spins on a pre-determined guest address, until
that address assumes a magic value. The method described in this patch is
conceptually the same ("busy loop until match is found"), except there is
no hard-coded address. This plays a lot more nicely with UEFI guest
firmware (we'll be able to use the normal page allocation UEFI service).
Given the size of EFI_GUID (16 bytes -- 128 bits), mismatches should be
astronomically unlikely. In addition, given the typical guest RAM size for
such tests (128 MB), there are 128 locations to check in one iteration of
the "outer" loop, which shouldn't introduce an intolerable delay after the
guest stores the RSDP address(es), and then the GUID.

The GUID that the hypervisor should search for is

  AB87A6B1-2034-BDA0-71BD-375007757785

Expressed as a byte array:

 {
   0xb1, 0xa6, 0x87, 0xab,
   0x34, 0x20,
   0xa0, 0xbd,
   0x71, 0xbd, 0x37, 0x50, 0x07, 0x75, 0x77, 0x85
 }

Note that in the patch, we define "gBiosTablesTestGuid" with all bits
inverted. This is a simple method to prevent the UEFI binary, which
incorporates "gBiosTablesTestGuid", from matching the actual GUID in guest
RAM.

The UEFI application is written against the edk2 framework, which was
introduced earlier as a git submodule. The next patch will provide build
scripts for maintainers.

The source code follows the edk2 coding style, and is licensed under the
2-clause BSDL (in case someone would like to include UefiTestToolsPkg
content in a different edk2 platform).

The "UefiTestToolsPkg.dsc" platform description file resolves the used
edk2 library classes to instances (= library implementations) such that
the UEFI binaries inherit no platform dependencies. They are expected to
run on any system that conforms to the UEFI-2.3.1 spec (which was released
in 2012). The arch-specific build options are carried over from edk2's
ArmVirtPkg and OvmfPkg platforms.

Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Cc: Shannon Zhao <shannon.zhaosl@gmail.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---

Notes:
    v2:
    - no change
    
    v1:
    - If that's necessary, I'd be glad to be designated as Maintainer or
      Reviewer in "MAINTAINERS" for "tests/uefi-test-tools/", I just
      couldn't figure out under what subsystem I should add the magic lines.
      "MAINTAINERS" needs a Table of Contents! :)

 tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dec              |  27 ++++
 tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dsc              |  69 +++++++++++
 tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.inf |  41 ++++++
 tests/uefi-test-tools/UefiTestToolsPkg/Include/Guid/BiosTablesTest.h     |  67 ++++++++++
 tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.c   | 130 ++++++++++++++++++++
 tests/uefi-test-tools/LICENSE                                            |  25 ++++
 6 files changed, 359 insertions(+)

diff --git a/tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dec b/tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dec
new file mode 100644
index 000000000000..ed3a2fe11084
--- /dev/null
+++ b/tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dec
@@ -0,0 +1,27 @@
+## @file
+# edk2 package declaration for the test helper UEFI applications that run in
+# guests.
+#
+# Copyright (C) 2019, Red Hat, Inc.
+#
+# This program and the accompanying materials are licensed and made available
+# under the terms and conditions of the BSD License that accompanies this
+# distribution. The full text of the license may be found at
+# <http://opensource.org/licenses/bsd-license.php>.
+#
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
+# WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+##
+
+[Defines]
+  DEC_SPECIFICATION = 1.27
+  PACKAGE_NAME      = UefiTestToolsPkg
+  PACKAGE_GUID      = 7b3f1794-0c85-4b27-a536-44dbf0b0669c
+  PACKAGE_VERSION   = 0.1
+
+[Includes]
+  Include
+
+[Guids]
+  gBiosTablesTestGuid = {0x5478594e, 0xdfcb, 0x425f, {0x8e, 0x42, 0xc8, 0xaf, 0xf8, 0x8a, 0x88, 0x7a}}
+
diff --git a/tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dsc b/tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dsc
new file mode 100644
index 000000000000..c8511cd732bc
--- /dev/null
+++ b/tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dsc
@@ -0,0 +1,69 @@
+## @file
+# edk2 platform description for the test helper UEFI applications that run in
+# guests.
+#
+# Copyright (C) 2019, Red Hat, Inc.
+#
+# This program and the accompanying materials are licensed and made available
+# under the terms and conditions of the BSD License that accompanies this
+# distribution. The full text of the license may be found at
+# <http://opensource.org/licenses/bsd-license.php>.
+#
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
+# WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+##
+
+[Defines]
+  DSC_SPECIFICATION       = 1.28
+  PLATFORM_GUID           = 6750ccc1-8365-49f0-8437-948e516a9f55
+  PLATFORM_VERSION        = 0.1
+  PLATFORM_NAME           = UefiTestTools
+  SKUID_IDENTIFIER        = DEFAULT
+  SUPPORTED_ARCHITECTURES = ARM|AARCH64|IA32|X64
+  BUILD_TARGETS           = DEBUG
+
+[BuildOptions.IA32]
+  GCC:*_*_IA32_CC_FLAGS = -mno-mmx -mno-sse
+
+[BuildOptions.X64]
+  GCC:*_*_X64_CC_FLAGS = -mno-mmx -mno-sse
+
+[BuildOptions.ARM.EDKII.UEFI_APPLICATION]
+  GCC:*_*_ARM_DLINK_FLAGS = -z common-page-size=0x1000
+
+[BuildOptions.AARCH64.EDKII.UEFI_APPLICATION]
+  GCC:*_*_AARCH64_DLINK_FLAGS = -z common-page-size=0x1000
+
+[BuildOptions]
+  GCC:*_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES
+
+[SkuIds]
+  0|DEFAULT
+
+[LibraryClasses]
+  BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
+  DebugLib|MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf
+  DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf
+  DevicePathLib|MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.inf
+  MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
+  PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
+  PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
+  UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf
+  UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
+  UefiLib|MdePkg/Library/UefiLib/UefiLib.inf
+  UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
+
+[LibraryClasses.ARM, LibraryClasses.AARCH64]
+  BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
+  NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
+  NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
+
+[LibraryClasses.IA32, LibraryClasses.X64]
+  BaseMemoryLib|MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf
+
+[PcdsFixedAtBuild]
+  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8040004F
+  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2F
+
+[Components]
+  UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.inf
diff --git a/tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.inf b/tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.inf
new file mode 100644
index 000000000000..924d8a80d00b
--- /dev/null
+++ b/tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.inf
@@ -0,0 +1,41 @@
+## @file
+# Populate the BIOS_TABLES_TEST structure.
+#
+# Copyright (C) 2019, Red Hat, Inc.
+#
+# This program and the accompanying materials are licensed and made available
+# under the terms and conditions of the BSD License that accompanies this
+# distribution. The full text of the license may be found at
+# <http://opensource.org/licenses/bsd-license.php>.
+#
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
+# WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+##
+
+[Defines]
+  INF_VERSION                = 1.27
+  BASE_NAME                  = BiosTablesTest
+  UEFI_SPECIFICATION_VERSION = 2.31
+  FILE_GUID                  = 87f00433-3b7c-45c3-ae78-a56495bd4e62
+  MODULE_TYPE                = UEFI_APPLICATION
+  ENTRY_POINT                = BiosTablesTestMain
+
+[Sources]
+  BiosTablesTest.c
+
+[LibraryClasses]
+  BaseLib
+  BaseMemoryLib
+  MemoryAllocationLib
+  UefiApplicationEntryPoint
+  UefiBootServicesTableLib
+  UefiLib
+
+[Guids]
+  gBiosTablesTestGuid
+  gEfiAcpi10TableGuid
+  gEfiAcpi20TableGuid
+
+[Packages]
+  MdePkg/MdePkg.dec
+  UefiTestToolsPkg/UefiTestToolsPkg.dec
diff --git a/tests/uefi-test-tools/UefiTestToolsPkg/Include/Guid/BiosTablesTest.h b/tests/uefi-test-tools/UefiTestToolsPkg/Include/Guid/BiosTablesTest.h
new file mode 100644
index 000000000000..0b72c61254af
--- /dev/null
+++ b/tests/uefi-test-tools/UefiTestToolsPkg/Include/Guid/BiosTablesTest.h
@@ -0,0 +1,67 @@
+/** @file
+  Expose the address(es) of the ACPI RSD PTR table(s) in a MB-aligned structure
+  to the hypervisor.
+
+  The hypervisor locates the MB-aligned structure based on the signature GUID
+  that is at offset 0 in the structure. Once the RSD PTR address(es) are
+  retrieved, the hypervisor may perform various ACPI checks.
+
+  This feature is a development aid, for supporting ACPI table unit tests in
+  hypervisors. Do not enable in production builds.
+
+  Copyright (C) 2019, Red Hat, Inc.
+
+  This program and the accompanying materials are licensed and made available
+  under the terms and conditions of the BSD License that accompanies this
+  distribution. The full text of the license may be found at
+  <http://opensource.org/licenses/bsd-license.php>.
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
+  WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+**/
+
+#ifndef __BIOS_TABLES_TEST_H__
+#define __BIOS_TABLES_TEST_H__
+
+#include <Uefi/UefiBaseType.h>
+
+#define BIOS_TABLES_TEST_GUID                          \
+  {                                                    \
+    0x5478594e,                                        \
+    0xdfcb,                                            \
+    0x425f,                                            \
+    { 0x8e, 0x42, 0xc8, 0xaf, 0xf8, 0x8a, 0x88, 0x7a } \
+  }
+
+extern EFI_GUID gBiosTablesTestGuid;
+
+//
+// The following structure must be allocated in Boot Services Data type memory,
+// aligned at a 1MB boundary.
+//
+#pragma pack (1)
+typedef struct {
+  //
+  // The signature GUID is written to the MB-aligned structure from
+  // gBiosTablesTestGuid, but with all bits inverted. That's the actual GUID
+  // value that the hypervisor should look for at each MB boundary, looping
+  // over all guest RAM pages with that alignment, until a match is found. The
+  // bit-flipping occurs in order not to store the actual GUID in any UEFI
+  // executable, which might confuse guest memory analysis. Note that EFI_GUID
+  // has little endian representation.
+  //
+  EFI_GUID             InverseSignatureGuid;
+  //
+  // The Rsdp10 and Rsdp20 fields may be read when the signature GUID matches.
+  // Rsdp10 is the guest-physical address of the ACPI 1.0 specification RSD PTR
+  // table, in 8-byte little endian representation. Rsdp20 is the same, for the
+  // ACPI 2.0 or later specification RSD PTR table. Each of these fields may be
+  // zero (independently of the other) if the UEFI System Table does not
+  // provide the corresponding UEFI Configuration Table.
+  //
+  EFI_PHYSICAL_ADDRESS Rsdp10;
+  EFI_PHYSICAL_ADDRESS Rsdp20;
+} BIOS_TABLES_TEST;
+#pragma pack ()
+
+#endif // __BIOS_TABLES_TEST_H__
diff --git a/tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.c b/tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.c
new file mode 100644
index 000000000000..b208e17fb00f
--- /dev/null
+++ b/tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.c
@@ -0,0 +1,130 @@
+/** @file
+  Populate the BIOS_TABLES_TEST structure.
+
+  Copyright (C) 2019, Red Hat, Inc.
+
+  This program and the accompanying materials are licensed and made available
+  under the terms and conditions of the BSD License that accompanies this
+  distribution. The full text of the license may be found at
+  <http://opensource.org/licenses/bsd-license.php>.
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
+  WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+**/
+
+#include <Guid/Acpi.h>
+#include <Guid/BiosTablesTest.h>
+#include <Library/BaseLib.h>
+#include <Library/BaseMemoryLib.h>
+#include <Library/MemoryAllocationLib.h>
+#include <Library/UefiBootServicesTableLib.h>
+#include <Library/UefiLib.h>
+
+/**
+  Wait for a keypress with a message that the application is about to exit.
+**/
+STATIC
+VOID
+WaitForExitKeyPress (
+  VOID
+  )
+{
+  EFI_STATUS    Status;
+  UINTN         Idx;
+  EFI_INPUT_KEY Key;
+
+  if (gST->ConIn == NULL) {
+    return;
+  }
+  AsciiPrint ("%a: press any key to exit\n", gEfiCallerBaseName);
+  Status = gBS->WaitForEvent (1, &gST->ConIn->WaitForKey, &Idx);
+  if (EFI_ERROR (Status)) {
+    return;
+  }
+  gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);
+}
+
+EFI_STATUS
+EFIAPI
+BiosTablesTestMain (
+  IN EFI_HANDLE       ImageHandle,
+  IN EFI_SYSTEM_TABLE *SystemTable
+  )
+{
+  VOID                          *Pages;
+  volatile BIOS_TABLES_TEST     *BiosTablesTest;
+  CONST VOID                    *Rsdp10;
+  CONST VOID                    *Rsdp20;
+  CONST EFI_CONFIGURATION_TABLE *ConfigTable;
+  CONST EFI_CONFIGURATION_TABLE *ConfigTablesEnd;
+  volatile EFI_GUID             *InverseSignature;
+  UINTN                         Idx;
+
+  Pages = AllocateAlignedPages (EFI_SIZE_TO_PAGES (sizeof *BiosTablesTest),
+            SIZE_1MB);
+  if (Pages == NULL) {
+    AsciiErrorPrint ("%a: AllocateAlignedPages() failed\n",
+      gEfiCallerBaseName);
+    //
+    // Assuming the application was launched by the boot manager as a boot
+    // loader, exiting with error will cause the boot manager to proceed with
+    // the remaining boot options. If there are no other boot options, the boot
+    // manager menu will be pulled up. Give the user a chance to read the error
+    // message.
+    //
+    WaitForExitKeyPress ();
+    return EFI_OUT_OF_RESOURCES;
+  }
+
+  //
+  // Locate both gEfiAcpi10TableGuid and gEfiAcpi20TableGuid config tables in
+  // one go.
+  //
+  Rsdp10 = NULL;
+  Rsdp20 = NULL;
+  ConfigTable = gST->ConfigurationTable;
+  ConfigTablesEnd = gST->ConfigurationTable + gST->NumberOfTableEntries;
+  while ((Rsdp10 == NULL || Rsdp20 == NULL) && ConfigTable < ConfigTablesEnd) {
+    if (CompareGuid (&ConfigTable->VendorGuid, &gEfiAcpi10TableGuid)) {
+      Rsdp10 = ConfigTable->VendorTable;
+    } else if (CompareGuid (&ConfigTable->VendorGuid, &gEfiAcpi20TableGuid)) {
+      Rsdp20 = ConfigTable->VendorTable;
+    }
+    ++ConfigTable;
+  }
+
+  AsciiPrint ("%a: BiosTablesTest=%p Rsdp10=%p Rsdp20=%p\n",
+    gEfiCallerBaseName, Pages, Rsdp10, Rsdp20);
+
+  //
+  // Store the RSD PTR address(es) first, then the signature second.
+  //
+  BiosTablesTest = Pages;
+  BiosTablesTest->Rsdp10 = (UINTN)Rsdp10;
+  BiosTablesTest->Rsdp20 = (UINTN)Rsdp20;
+
+  MemoryFence();
+
+  InverseSignature = &BiosTablesTest->InverseSignatureGuid;
+  InverseSignature->Data1  = gBiosTablesTestGuid.Data1;
+  InverseSignature->Data1 ^= MAX_UINT32;
+  InverseSignature->Data2  = gBiosTablesTestGuid.Data2;
+  InverseSignature->Data2 ^= MAX_UINT16;
+  InverseSignature->Data3  = gBiosTablesTestGuid.Data3;
+  InverseSignature->Data3 ^= MAX_UINT16;
+  for (Idx = 0; Idx < sizeof InverseSignature->Data4; ++Idx) {
+    InverseSignature->Data4[Idx]  = gBiosTablesTestGuid.Data4[Idx];
+    InverseSignature->Data4[Idx] ^= MAX_UINT8;
+  }
+
+  //
+  // The wait below has dual purpose. First, it blocks the application without
+  // wasting VCPU cycles while the hypervisor is scanning guest RAM. Second,
+  // assuming the application was launched by the boot manager as a boot
+  // loader, exiting the app with success causes the boot manager to pull up
+  // the boot manager menu at once (regardless of other boot options); the wait
+  // gives the user a chance to read the info printed above.
+  //
+  WaitForExitKeyPress ();
+  return EFI_SUCCESS;
+}
diff --git a/tests/uefi-test-tools/LICENSE b/tests/uefi-test-tools/LICENSE
new file mode 100644
index 000000000000..38b78aecdb0e
--- /dev/null
+++ b/tests/uefi-test-tools/LICENSE
@@ -0,0 +1,25 @@
+All the files in this directory and subdirectories are released under the
+2-Clause BSD License (see header in each file).
+
+Copyright (C) 2019, Red Hat, Inc.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-- 
2.19.1.3.g30247aa5d201

[Qemu-devel] [PATCH v2 4/5] tests/uefi-test-tools: add build scripts

[Laszlo Ersek]

Introduce the following build scripts under "tests/uefi-test-tools":

* "build.sh" builds a single module (a UEFI application) from
  UefiTestToolsPkg, for a single QEMU emulation target.

  "build.sh" relies on cross-compilers when the emulation target and the
  build host architecture don't match. The cross-compiler prefix is
  computed according to a fixed, Linux-specific pattern. No attempt is
  made to copy or reimplement the GNU Make magic from "qemu/roms/Makefile"
  for cross-compiler prefix determination. The reason is that the build
  host OSes that are officially supported by edk2, and those that are
  supported by QEMU, intersect only in Linux. (Note that the UNIXGCC
  toolchain is being removed from edk2,
  <https://bugzilla.tianocore.org/show_bug.cgi?id=1377>.)

* "Makefile" currently builds the "UefiTestToolsPkg/BiosTablesTest"
  application, for arm, aarch64, i386, and x86_64, with the help of
  "build.sh".

  "Makefile" turns each resultant UEFI executable into a UEFI-bootable,
  qcow2-compressed ISO image. The ISO images are output as
  "tests/data/uefi-boot-images/bios-tables-test.<TARGET>.iso.qcow2".

  Each ISO image should be passed to QEMU as follows:

    -drive id=boot-cd,if=none,readonly,format=qcow2,file=$ISO \
    -device virtio-scsi-pci,id=scsi0 \
    -device scsi-cd,drive=boot-cd,bus=scsi0.0,bootindex=0 \

  "Makefile" assumes that "mkdosfs", "mtools", and "genisoimage" are
  present.

Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Cc: Shannon Zhao <shannon.zhaosl@gmail.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---

Notes:
    v2:
    - add the .NOTPARALLEL target [Phil, help-make, edk2-devel]

 tests/uefi-test-tools/Makefile   |  97 +++++++++++++
 tests/uefi-test-tools/.gitignore |   3 +
 tests/uefi-test-tools/build.sh   | 145 ++++++++++++++++++++
 3 files changed, 245 insertions(+)

diff --git a/tests/uefi-test-tools/Makefile b/tests/uefi-test-tools/Makefile
new file mode 100644
index 000000000000..61d263861e01
--- /dev/null
+++ b/tests/uefi-test-tools/Makefile
@@ -0,0 +1,97 @@
+# Makefile for the test helper UEFI applications that run in guests.
+#
+# Copyright (C) 2019, Red Hat, Inc.
+#
+# This program and the accompanying materials are licensed and made available
+# under the terms and conditions of the BSD License that accompanies this
+# distribution. The full text of the license may be found at
+# <http://opensource.org/licenses/bsd-license.php>.
+#
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
+# WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+edk2_dir              := ../../roms/edk2
+images_dir            := ../data/uefi-boot-images
+emulation_targets     := arm aarch64 i386 x86_64
+uefi_binaries         := bios-tables-test
+intermediate_suffixes := .efi .fat .iso.raw
+
+images: $(foreach binary,$(uefi_binaries), \
+		$(foreach target,$(emulation_targets), \
+			$(images_dir)/$(binary).$(target).iso.qcow2))
+
+# Preserve all intermediate targets if the build succeeds.
+# - Intermediate targets help with development & debugging.
+# - Preserving intermediate targets also keeps spurious changes out of the
+#   final build products, in case the user re-runs "make" without any changes
+#   to the UEFI source code. Normally, the intermediate files would have been
+#   removed by the last "make" invocation, hence the re-run would rebuild them
+#   from the unchanged UEFI sources. Unfortunately, the "mkdosfs" and
+#   "genisoimage" utilities embed timestamp-based information in their outputs,
+#   which causes git to report differences for the tracked qcow2 ISO images.
+.SECONDARY: $(foreach binary,$(uefi_binaries), \
+		$(foreach target,$(emulation_targets), \
+			$(foreach suffix,$(intermediate_suffixes), \
+				Build/$(binary).$(target)$(suffix))))
+
+# In the pattern rules below, the stem (%, $*) stands for
+# "$(binary).$(target)".
+
+# Convert the raw ISO image to a qcow2 one, enabling compression, and using a
+# small cluster size. This allows for small binary files under git control,
+# hence for small binary patches.
+$(images_dir)/%.iso.qcow2: Build/%.iso.raw
+	mkdir -p -- $(images_dir)
+	$${QTEST_QEMU_IMG:-qemu-img} convert -f raw -O qcow2 -c \
+		-o cluster_size=512 -- $< $@
+
+# Embed the "UEFI system partition" into an ISO9660 file system as an ElTorito
+# boot image.
+Build/%.iso.raw: Build/%.fat
+	genisoimage -input-charset ASCII -efi-boot $(notdir $<) -no-emul-boot \
+		-quiet -o $@ -- $<
+
+# Define chained macros in order to map QEMU system emulation targets to
+# *short* UEFI architecture identifiers. Periods are allowed in, and ultimately
+# stripped from, the argument.
+map_arm_to_uefi     = $(subst arm,ARM,$(1))
+map_aarch64_to_uefi = $(subst aarch64,AA64,$(call map_arm_to_uefi,$(1)))
+map_i386_to_uefi    = $(subst i386,IA32,$(call map_aarch64_to_uefi,$(1)))
+map_x86_64_to_uefi  = $(subst x86_64,X64,$(call map_i386_to_uefi,$(1)))
+map_to_uefi         = $(subst .,,$(call map_x86_64_to_uefi,$(1)))
+
+# Format a "UEFI system partition", using the UEFI binary as the default boot
+# loader. Add 10% size for filesystem metadata, round up to the next KB, and
+# make sure the size is large enough for a FAT filesystem. Name the filesystem
+# after the UEFI binary. (Excess characters are automatically dropped from the
+# filesystem label.)
+Build/%.fat: Build/%.efi
+	rm -f -- $@
+	uefi_bin_b=$$(stat --format=%s -- $<) && \
+		uefi_fat_kb=$$(( (uefi_bin_b * 11 / 10 + 1023) / 1024 )) && \
+		uefi_fat_kb=$$(( uefi_fat_kb >= 64 ? uefi_fat_kb : 64 )) && \
+		mkdosfs -C $@ -n $(basename $(@F)) -- $$uefi_fat_kb
+	MTOOLS_SKIP_CHECK=1 mmd -i $@ ::EFI
+	MTOOLS_SKIP_CHECK=1 mmd -i $@ ::EFI/BOOT
+	MTOOLS_SKIP_CHECK=1 mcopy -i $@ -- $< \
+		::EFI/BOOT/BOOT$(call map_to_uefi,$(suffix $*)).EFI
+
+# In the pattern rules below, the stem (%, $*) stands for "$(target)" only. The
+# association between the UEFI binary (such as "bios-tables-test") and the
+# component name from the edk2 platform DSC file (such as "BiosTablesTest") is
+# explicit in each rule.
+
+# "build.sh" invokes the "build" utility of edk2 BaseTools. In any given edk2
+# workspace, at most one "build" instance may be operating at a time. Therefore
+# we must serialize the rebuilding of targets in this Makefile.
+.NOTPARALLEL:
+
+Build/bios-tables-test.%.efi: build-edk2-tools
+	./build.sh $(edk2_dir) BiosTablesTest $* $@
+
+build-edk2-tools:
+	$(MAKE) -C $(edk2_dir)/BaseTools
+
+clean:
+	rm -rf Build Conf log
+	$(MAKE) -C $(edk2_dir)/BaseTools clean
diff --git a/tests/uefi-test-tools/.gitignore b/tests/uefi-test-tools/.gitignore
new file mode 100644
index 000000000000..9f246701dea1
--- /dev/null
+++ b/tests/uefi-test-tools/.gitignore
@@ -0,0 +1,3 @@
+Build
+Conf
+log
diff --git a/tests/uefi-test-tools/build.sh b/tests/uefi-test-tools/build.sh
new file mode 100755
index 000000000000..155cb75c4ddb
--- /dev/null
+++ b/tests/uefi-test-tools/build.sh
@@ -0,0 +1,145 @@
+#!/bin/bash
+
+# Build script that determines the edk2 toolchain to use, invokes the edk2
+# "build" utility, and copies the built UEFI binary to the requested location.
+#
+# Copyright (C) 2019, Red Hat, Inc.
+#
+# This program and the accompanying materials are licensed and made available
+# under the terms and conditions of the BSD License that accompanies this
+# distribution. The full text of the license may be found at
+# <http://opensource.org/licenses/bsd-license.php>.
+#
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
+# WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+set -e -u -C
+
+# Save the command line arguments. We need to reset $# to 0 before sourcing
+# "edksetup.sh", as it will inherit $@.
+program_name=$(basename -- "$0")
+edk2_dir=$1
+dsc_component=$2
+emulation_target=$3
+uefi_binary=$4
+shift 4
+
+# Set up the environment for edk2 building.
+export PACKAGES_PATH=$(realpath -- "$edk2_dir")
+export WORKSPACE=$PWD
+mkdir -p Conf
+
+# Source "edksetup.sh" carefully.
+set +e +u +C
+source "$PACKAGES_PATH/edksetup.sh"
+ret=$?
+set -e -u -C
+if [ $ret -ne 0 ]; then
+  exit $ret
+fi
+
+# Map the QEMU system emulation target to the following types of architecture
+# identifiers:
+# - edk2,
+# - gcc cross-compilation.
+# Cover only those targets that are supported by the UEFI spec and edk2.
+case "$emulation_target" in
+  (arm)
+    edk2_arch=ARM
+    gcc_arch=arm
+    ;;
+  (aarch64)
+    edk2_arch=AARCH64
+    gcc_arch=aarch64
+    ;;
+  (i386)
+    edk2_arch=IA32
+    gcc_arch=i686
+    ;;
+  (x86_64)
+    edk2_arch=X64
+    gcc_arch=x86_64
+    ;;
+  (*)
+    printf '%s: unknown/unsupported QEMU system emulation target "%s"\n' \
+      "$program_name" "$emulation_target" >&2
+    exit 1
+    ;;
+esac
+
+# Check if cross-compilation is needed.
+host_arch=$(uname -m)
+if [ "$gcc_arch" == "$host_arch" ] ||
+   ( [ "$gcc_arch" == i686 ] && [ "$host_arch" == x86_64 ] ); then
+  cross_prefix=
+else
+  cross_prefix=${gcc_arch}-linux-gnu-
+fi
+
+# Expose cross_prefix (which is possibly empty) to the edk2 tools. While at it,
+# determine the suitable edk2 toolchain as well.
+# - For ARM and AARCH64, edk2 only offers the GCC5 toolchain tag, which covers
+#   the gcc-5+ releases.
+# - For IA32 and X64, edk2 offers the GCC44 through GCC49 toolchain tags, in
+#   addition to GCC5. Unfortunately, the mapping between the toolchain tags and
+#   the actual gcc releases isn't entirely trivial. Run "git-blame" on
+#   "OvmfPkg/build.sh" in edk2 for more information.
+# And, because the above is too simple, we have to assign cross_prefix to an
+# edk2 build variable that is specific to both the toolchain tag and the target
+# architecture.
+case "$edk2_arch" in
+  (ARM)
+    edk2_toolchain=GCC5
+    export GCC5_ARM_PREFIX=$cross_prefix
+    ;;
+  (AARCH64)
+    edk2_toolchain=GCC5
+    export GCC5_AARCH64_PREFIX=$cross_prefix
+    ;;
+  (IA32|X64)
+    gcc_version=$("${cross_prefix}gcc" -v 2>&1 | tail -1 | awk '{print $3}')
+    case "$gcc_version" in
+      ([1-3].*|4.[0-3].*)
+        printf '%s: unsupported gcc version "%s"\n' \
+          "$program_name" "$gcc_version" >&2
+        exit 1
+        ;;
+      (4.4.*)
+        edk2_toolchain=GCC44
+        ;;
+      (4.5.*)
+        edk2_toolchain=GCC45
+        ;;
+      (4.6.*)
+        edk2_toolchain=GCC46
+        ;;
+      (4.7.*)
+        edk2_toolchain=GCC47
+        ;;
+      (4.8.*)
+        edk2_toolchain=GCC48
+        ;;
+      (4.9.*|6.[0-2].*)
+        edk2_toolchain=GCC49
+        ;;
+      (*)
+        edk2_toolchain=GCC5
+        ;;
+    esac
+    eval "export ${edk2_toolchain}_BIN=\$cross_prefix"
+    ;;
+esac
+
+# Build the UEFI binary
+mkdir -p log
+build \
+  --arch="$edk2_arch" \
+  --buildtarget=DEBUG \
+  --platform=UefiTestToolsPkg/UefiTestToolsPkg.dsc \
+  --tagname="$edk2_toolchain" \
+  --module="UefiTestToolsPkg/$dsc_component/$dsc_component.inf" \
+  --log="log/$dsc_component.$edk2_arch.log" \
+  --report-file="log/$dsc_component.$edk2_arch.report"
+cp -a -- \
+  "Build/UefiTestTools/DEBUG_${edk2_toolchain}/$edk2_arch/$dsc_component.efi" \
+  "$uefi_binary"
-- 
2.19.1.3.g30247aa5d201

[Qemu-devel] [PATCH v2 5/5] tests/data: introduce "uefi-boot-images" with the "bios-tables-test" ISOs

[Laszlo Ersek]

Add UEFI-bootable qcow2-compressed ISO images built from:

  tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest

Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Cc: Shannon Zhao <shannon.zhaosl@gmail.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---

Notes:
    v2:
    - refresh the images (should only differ in internal timestamps etc)
    
    v1:
    - Again, if needed, I'd be happy to be designated as Maintainer for the
      files being added in this patch; please let me know the right spot in
      "MAINTAINERS".

 tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2 | Bin 0 -> 11776 bytes
 tests/data/uefi-boot-images/bios-tables-test.arm.iso.qcow2     | Bin 0 -> 11776 bytes
 tests/data/uefi-boot-images/bios-tables-test.i386.iso.qcow2    | Bin 0 -> 12800 bytes
 tests/data/uefi-boot-images/bios-tables-test.x86_64.iso.qcow2  | Bin 0 -> 13312 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2 b/tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2
new file mode 100644
index 0000000000000000000000000000000000000000..8d7f8e67e85aa2156adb3423322018f6a6ea890c
GIT binary patch
literal 11776
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

literal 0
HcmV?d00001

diff --git a/tests/data/uefi-boot-images/bios-tables-test.arm.iso.qcow2 b/tests/data/uefi-boot-images/bios-tables-test.arm.iso.qcow2
new file mode 100644
index 0000000000000000000000000000000000000000..373947a2f3a6b08934009035e7151ad845985ab2
GIT binary patch
literal 11776
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
ZIw1cxO@)iUIAr+0*E{*Yz54w{{}-})Lwf)K

literal 0
HcmV?d00001

diff --git a/tests/data/uefi-boot-images/bios-tables-test.i386.iso.qcow2 b/tests/data/uefi-boot-images/bios-tables-test.i386.iso.qcow2
new file mode 100644
index 0000000000000000000000000000000000000000..7c846195e552b948fd0b50ae3f4a39e9df65f7c6
GIT binary patch
literal 12800
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
Aod5s;

literal 0
HcmV?d00001

diff --git a/tests/data/uefi-boot-images/bios-tables-test.x86_64.iso.qcow2 b/tests/data/uefi-boot-images/bios-tables-test.x86_64.iso.qcow2
new file mode 100644
index 0000000000000000000000000000000000000000..9d9b391e88145cf0f729ff50d8383096bb3a8b06
GIT binary patch
literal 13312
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
J&i~ib{|mGmiBtdp

literal 0
HcmV?d00001

-- 
2.19.1.3.g30247aa5d201

Re: [Qemu-devel] [PATCH v2 0/5] add the BiosTablesTest UEFI app, build it with the new roms/edk2 submodule

[Laszlo Ersek]

On 01/24/19 21:39, Laszlo Ersek wrote:
> Previous version (v1):
> http://mid.mail-archive.com/20190118223400.24311-1-lersek@redhat.com
> 
> Updates in v2 have been noted on each patch in the series.

ping

> 
> Cc: "Michael S. Tsirkin" <mst@redhat.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Cc: Igor Mammedov <imammedo@redhat.com>
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> Cc: Shannon Zhao <shannon.zhaosl@gmail.com>
> 
> Thanks
> Laszlo
> 
> Laszlo Ersek (5):
>   roms: add the edk2 project as a git submodule
>   roms: build the EfiRom utility from the roms/edk2 submodule
>   tests: introduce "uefi-test-tools" with the BiosTablesTest UEFI app
>   tests/uefi-test-tools: add build scripts
>   tests/data: introduce "uefi-boot-images" with the "bios-tables-test"
>     ISOs
> 
>  .gitmodules                                                              |   3 +
>  Makefile                                                                 |   6 +-
>  roms/Makefile                                                            |  13 +-
>  roms/edk2                                                                |   1 +
>  tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2           | Bin 0 -> 11776 bytes
>  tests/data/uefi-boot-images/bios-tables-test.arm.iso.qcow2               | Bin 0 -> 11776 bytes
>  tests/data/uefi-boot-images/bios-tables-test.i386.iso.qcow2              | Bin 0 -> 12800 bytes
>  tests/data/uefi-boot-images/bios-tables-test.x86_64.iso.qcow2            | Bin 0 -> 13312 bytes
>  tests/uefi-test-tools/.gitignore                                         |   3 +
>  tests/uefi-test-tools/LICENSE                                            |  25 ++++
>  tests/uefi-test-tools/Makefile                                           |  97 +++++++++++++
>  tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.c   | 130 ++++++++++++++++++
>  tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.inf |  41 ++++++
>  tests/uefi-test-tools/UefiTestToolsPkg/Include/Guid/BiosTablesTest.h     |  67 +++++++++
>  tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dec              |  27 ++++
>  tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dsc              |  69 ++++++++++
>  tests/uefi-test-tools/build.sh                                           | 145 ++++++++++++++++++++
>  17 files changed, 619 insertions(+), 8 deletions(-)
>  create mode 160000 roms/edk2
>  create mode 100644 tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2
>  create mode 100644 tests/data/uefi-boot-images/bios-tables-test.arm.iso.qcow2
>  create mode 100644 tests/data/uefi-boot-images/bios-tables-test.i386.iso.qcow2
>  create mode 100644 tests/data/uefi-boot-images/bios-tables-test.x86_64.iso.qcow2
>  create mode 100644 tests/uefi-test-tools/.gitignore
>  create mode 100644 tests/uefi-test-tools/LICENSE
>  create mode 100644 tests/uefi-test-tools/Makefile
>  create mode 100644 tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.c
>  create mode 100644 tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.inf
>  create mode 100644 tests/uefi-test-tools/UefiTestToolsPkg/Include/Guid/BiosTablesTest.h
>  create mode 100644 tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dec
>  create mode 100644 tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dsc
>  create mode 100755 tests/uefi-test-tools/build.sh
> 

Re: [Qemu-devel] [PATCH v2 0/5] add the BiosTablesTest UEFI app, build it with the new roms/edk2 submodule

[Michael S. Tsirkin]

On Thu, Jan 31, 2019 at 03:23:50PM +0100, Laszlo Ersek wrote:
> On 01/24/19 21:39, Laszlo Ersek wrote:
> > Previous version (v1):
> > http://mid.mail-archive.com/20190118223400.24311-1-lersek@redhat.com
> > 
> > Updates in v2 have been noted on each patch in the series.
> 
> ping

I'll queue this, thanks!

> > 
> > Cc: "Michael S. Tsirkin" <mst@redhat.com>
> > Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > Cc: Gerd Hoffmann <kraxel@redhat.com>
> > Cc: Igor Mammedov <imammedo@redhat.com>
> > Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> > Cc: Shannon Zhao <shannon.zhaosl@gmail.com>
> > 
> > Thanks
> > Laszlo
> > 
> > Laszlo Ersek (5):
> >   roms: add the edk2 project as a git submodule
> >   roms: build the EfiRom utility from the roms/edk2 submodule
> >   tests: introduce "uefi-test-tools" with the BiosTablesTest UEFI app
> >   tests/uefi-test-tools: add build scripts
> >   tests/data: introduce "uefi-boot-images" with the "bios-tables-test"
> >     ISOs
> > 
> >  .gitmodules                                                              |   3 +
> >  Makefile                                                                 |   6 +-
> >  roms/Makefile                                                            |  13 +-
> >  roms/edk2                                                                |   1 +
> >  tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2           | Bin 0 -> 11776 bytes
> >  tests/data/uefi-boot-images/bios-tables-test.arm.iso.qcow2               | Bin 0 -> 11776 bytes
> >  tests/data/uefi-boot-images/bios-tables-test.i386.iso.qcow2              | Bin 0 -> 12800 bytes
> >  tests/data/uefi-boot-images/bios-tables-test.x86_64.iso.qcow2            | Bin 0 -> 13312 bytes
> >  tests/uefi-test-tools/.gitignore                                         |   3 +
> >  tests/uefi-test-tools/LICENSE                                            |  25 ++++
> >  tests/uefi-test-tools/Makefile                                           |  97 +++++++++++++
> >  tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.c   | 130 ++++++++++++++++++
> >  tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.inf |  41 ++++++
> >  tests/uefi-test-tools/UefiTestToolsPkg/Include/Guid/BiosTablesTest.h     |  67 +++++++++
> >  tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dec              |  27 ++++
> >  tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dsc              |  69 ++++++++++
> >  tests/uefi-test-tools/build.sh                                           | 145 ++++++++++++++++++++
> >  17 files changed, 619 insertions(+), 8 deletions(-)
> >  create mode 160000 roms/edk2
> >  create mode 100644 tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2
> >  create mode 100644 tests/data/uefi-boot-images/bios-tables-test.arm.iso.qcow2
> >  create mode 100644 tests/data/uefi-boot-images/bios-tables-test.i386.iso.qcow2
> >  create mode 100644 tests/data/uefi-boot-images/bios-tables-test.x86_64.iso.qcow2
> >  create mode 100644 tests/uefi-test-tools/.gitignore
> >  create mode 100644 tests/uefi-test-tools/LICENSE
> >  create mode 100644 tests/uefi-test-tools/Makefile
> >  create mode 100644 tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.c
> >  create mode 100644 tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.inf
> >  create mode 100644 tests/uefi-test-tools/UefiTestToolsPkg/Include/Guid/BiosTablesTest.h
> >  create mode 100644 tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dec
> >  create mode 100644 tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dsc
> >  create mode 100755 tests/uefi-test-tools/build.sh
> > 

Re: [Qemu-devel] [PATCH v2 1/5] roms: add the edk2 project as a git submodule

[Philippe Mathieu-Daudé]

On 1/24/19 9:39 PM, Laszlo Ersek wrote:
> The roms/edk2 submodule can help with three goals:
> - build the OVMF and ArmVirtQemu virtual UEFI firmware platforms (to be
>   implemented later),
> - build the EfiRom tool on the fly, which is used in roms/Makefile, for
>   building the "efirom" target,
> - build UEFI test applications (to be run in guests), for qtest support.
> 
> Edk2 commit 85588389222a3636baf0f9ed8227f2434af4c3f9 stands for the latest
> "stable tag", namely "edk2-stable201811".
> 
> The edk2 repository tracks some binary files that should not be removed by
> QEMU's top-level "make clean"; exempt the full pathnames from the "find"
> command.
> 
> Cc: "Michael S. Tsirkin" <mst@redhat.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Cc: Igor Mammedov <imammedo@redhat.com>
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> Cc: Shannon Zhao <shannon.zhaosl@gmail.com>
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>

> ---
> 
> Notes:
>     v2:
>     - pick up R-b [Gerd]
> 
>  Makefile    | 6 +++++-
>  .gitmodules | 3 +++
>  roms/edk2   | 1 +
>  3 files changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git a/Makefile b/Makefile
> index de898eab6234..b0a70b2929ad 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -604,7 +604,11 @@ clean:
>  	rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h
>  	rm -f qemu-options.def
>  	rm -f *.msi
> -	find . \( -name '*.so' -o -name '*.dll' -o -name '*.mo' -o -name '*.[oda]' \) -type f -exec rm {} +
> +	find . \( -name '*.so' -o -name '*.dll' -o -name '*.mo' -o -name '*.[oda]' \) -type f \
> +		! -path ./roms/edk2/ArmPkg/Library/GccLto/liblto-aarch64.a \
> +		! -path ./roms/edk2/ArmPkg/Library/GccLto/liblto-arm.a \
> +		! -path ./roms/edk2/BaseTools/Source/Python/UPT/Dll/sqlite3.dll \
> +		-exec rm {} +
>  	rm -f $(filter-out %.tlb,$(TOOLS)) $(HELPERS-y) qemu-ga TAGS cscope.* *.pod *~ */*~
>  	rm -f fsdev/*.pod scsi/*.pod
>  	rm -f qemu-img-cmds.h
> diff --git a/.gitmodules b/.gitmodules
> index 6b91176098c8..ceafb0ee29a0 100644
> --- a/.gitmodules
> +++ b/.gitmodules
> @@ -49,3 +49,6 @@
>  [submodule "tests/fp/berkeley-softfloat-3"]
>  	path = tests/fp/berkeley-softfloat-3
>  	url = https://github.com/cota/berkeley-softfloat-3
> +[submodule "roms/edk2"]
> +	path = roms/edk2
> +	url = https://github.com/tianocore/edk2.git
> diff --git a/roms/edk2 b/roms/edk2
> new file mode 160000
> index 000000000000..85588389222a
> --- /dev/null
> +++ b/roms/edk2
> @@ -0,0 +1 @@
> +Subproject commit 85588389222a3636baf0f9ed8227f2434af4c3f9
> 

Re: [Qemu-devel] [PATCH v2 4/5] tests/uefi-test-tools: add build scripts

[Philippe Mathieu-Daudé]

Hi Laszlo,

On 1/24/19 9:39 PM, Laszlo Ersek wrote:
> Introduce the following build scripts under "tests/uefi-test-tools":
> 
> * "build.sh" builds a single module (a UEFI application) from
>   UefiTestToolsPkg, for a single QEMU emulation target.
> 
>   "build.sh" relies on cross-compilers when the emulation target and the
>   build host architecture don't match. The cross-compiler prefix is
>   computed according to a fixed, Linux-specific pattern. No attempt is
>   made to copy or reimplement the GNU Make magic from "qemu/roms/Makefile"
>   for cross-compiler prefix determination. The reason is that the build
>   host OSes that are officially supported by edk2, and those that are
>   supported by QEMU, intersect only in Linux. (Note that the UNIXGCC
>   toolchain is being removed from edk2,
>   <https://bugzilla.tianocore.org/show_bug.cgi?id=1377>.)
> 
> * "Makefile" currently builds the "UefiTestToolsPkg/BiosTablesTest"
>   application, for arm, aarch64, i386, and x86_64, with the help of
>   "build.sh".
> 
>   "Makefile" turns each resultant UEFI executable into a UEFI-bootable,
>   qcow2-compressed ISO image. The ISO images are output as
>   "tests/data/uefi-boot-images/bios-tables-test.<TARGET>.iso.qcow2".
> 
>   Each ISO image should be passed to QEMU as follows:
> 
>     -drive id=boot-cd,if=none,readonly,format=qcow2,file=$ISO \
>     -device virtio-scsi-pci,id=scsi0 \
>     -device scsi-cd,drive=boot-cd,bus=scsi0.0,bootindex=0 \
> 
>   "Makefile" assumes that "mkdosfs", "mtools", and "genisoimage" are
>   present.
> 
> Cc: "Michael S. Tsirkin" <mst@redhat.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Cc: Igor Mammedov <imammedo@redhat.com>
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> Cc: Shannon Zhao <shannon.zhaosl@gmail.com>
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> ---
> 
> Notes:
>     v2:
>     - add the .NOTPARALLEL target [Phil, help-make, edk2-devel]
> 
>  tests/uefi-test-tools/Makefile   |  97 +++++++++++++
>  tests/uefi-test-tools/.gitignore |   3 +
>  tests/uefi-test-tools/build.sh   | 145 ++++++++++++++++++++
>  3 files changed, 245 insertions(+)
> 
> diff --git a/tests/uefi-test-tools/Makefile b/tests/uefi-test-tools/Makefile
> new file mode 100644
> index 000000000000..61d263861e01
> --- /dev/null
> +++ b/tests/uefi-test-tools/Makefile
> @@ -0,0 +1,97 @@
> +# Makefile for the test helper UEFI applications that run in guests.
> +#
> +# Copyright (C) 2019, Red Hat, Inc.
> +#
> +# This program and the accompanying materials are licensed and made available
> +# under the terms and conditions of the BSD License that accompanies this
> +# distribution. The full text of the license may be found at
> +# <http://opensource.org/licenses/bsd-license.php>.
> +#
> +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
> +# WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +
> +edk2_dir              := ../../roms/edk2
> +images_dir            := ../data/uefi-boot-images
> +emulation_targets     := arm aarch64 i386 x86_64
> +uefi_binaries         := bios-tables-test
> +intermediate_suffixes := .efi .fat .iso.raw
> +
> +images: $(foreach binary,$(uefi_binaries), \
> +		$(foreach target,$(emulation_targets), \
> +			$(images_dir)/$(binary).$(target).iso.qcow2))
> +
> +# Preserve all intermediate targets if the build succeeds.
> +# - Intermediate targets help with development & debugging.
> +# - Preserving intermediate targets also keeps spurious changes out of the
> +#   final build products, in case the user re-runs "make" without any changes
> +#   to the UEFI source code. Normally, the intermediate files would have been
> +#   removed by the last "make" invocation, hence the re-run would rebuild them
> +#   from the unchanged UEFI sources. Unfortunately, the "mkdosfs" and
> +#   "genisoimage" utilities embed timestamp-based information in their outputs,
> +#   which causes git to report differences for the tracked qcow2 ISO images.
> +.SECONDARY: $(foreach binary,$(uefi_binaries), \
> +		$(foreach target,$(emulation_targets), \
> +			$(foreach suffix,$(intermediate_suffixes), \
> +				Build/$(binary).$(target)$(suffix))))
> +
> +# In the pattern rules below, the stem (%, $*) stands for
> +# "$(binary).$(target)".
> +
> +# Convert the raw ISO image to a qcow2 one, enabling compression, and using a
> +# small cluster size. This allows for small binary files under git control,
> +# hence for small binary patches.
> +$(images_dir)/%.iso.qcow2: Build/%.iso.raw
> +	mkdir -p -- $(images_dir)
> +	$${QTEST_QEMU_IMG:-qemu-img} convert -f raw -O qcow2 -c \
> +		-o cluster_size=512 -- $< $@
> +
> +# Embed the "UEFI system partition" into an ISO9660 file system as an ElTorito
> +# boot image.
> +Build/%.iso.raw: Build/%.fat
> +	genisoimage -input-charset ASCII -efi-boot $(notdir $<) -no-emul-boot \
> +		-quiet -o $@ -- $<
> +
> +# Define chained macros in order to map QEMU system emulation targets to
> +# *short* UEFI architecture identifiers. Periods are allowed in, and ultimately
> +# stripped from, the argument.
> +map_arm_to_uefi     = $(subst arm,ARM,$(1))
> +map_aarch64_to_uefi = $(subst aarch64,AA64,$(call map_arm_to_uefi,$(1)))
> +map_i386_to_uefi    = $(subst i386,IA32,$(call map_aarch64_to_uefi,$(1)))
> +map_x86_64_to_uefi  = $(subst x86_64,X64,$(call map_i386_to_uefi,$(1)))
> +map_to_uefi         = $(subst .,,$(call map_x86_64_to_uefi,$(1)))
> +
> +# Format a "UEFI system partition", using the UEFI binary as the default boot
> +# loader. Add 10% size for filesystem metadata, round up to the next KB, and
> +# make sure the size is large enough for a FAT filesystem. Name the filesystem
> +# after the UEFI binary. (Excess characters are automatically dropped from the
> +# filesystem label.)
> +Build/%.fat: Build/%.efi
> +	rm -f -- $@
> +	uefi_bin_b=$$(stat --format=%s -- $<) && \
> +		uefi_fat_kb=$$(( (uefi_bin_b * 11 / 10 + 1023) / 1024 )) && \
> +		uefi_fat_kb=$$(( uefi_fat_kb >= 64 ? uefi_fat_kb : 64 )) && \
> +		mkdosfs -C $@ -n $(basename $(@F)) -- $$uefi_fat_kb
> +	MTOOLS_SKIP_CHECK=1 mmd -i $@ ::EFI
> +	MTOOLS_SKIP_CHECK=1 mmd -i $@ ::EFI/BOOT
> +	MTOOLS_SKIP_CHECK=1 mcopy -i $@ -- $< \
> +		::EFI/BOOT/BOOT$(call map_to_uefi,$(suffix $*)).EFI
> +
> +# In the pattern rules below, the stem (%, $*) stands for "$(target)" only. The
> +# association between the UEFI binary (such as "bios-tables-test") and the
> +# component name from the edk2 platform DSC file (such as "BiosTablesTest") is
> +# explicit in each rule.
> +
> +# "build.sh" invokes the "build" utility of edk2 BaseTools. In any given edk2
> +# workspace, at most one "build" instance may be operating at a time. Therefore
> +# we must serialize the rebuilding of targets in this Makefile.
> +.NOTPARALLEL:

Well this doesn't seem to improve my case :|

You can test with:

$ alias make='make -j8 -l7.5'

So you get:

$ make print-MAKEFLAGS
MAKEFLAGS=rR -j8 -l7.5 --jobserver-auth=3,4

and this command fails:

$ make -C tests/uefi-test-tools Build/bios-tables-test.x86_64.efi

Now, using -j1 we have:

$ make print-MAKEFLAGS -j1
MAKEFLAGS=rR -j1 -l7.5

And the builds work:

$ make -j1 -C tests/uefi-test-tools Build/bios-tables-test.x86_64.efi

Reading 'info make' section "5.7.3 Communicating Options to a
Sub-'make'" I figured we can overwrite MAKEFLAGS, and this snippet works
like charm:

-- >8 --
@@ -84,8 +84,7 @@ Build/%.fat: Build/%.efi
 # "build.sh" invokes the "build" utility of edk2 BaseTools. In any
given edk2
 # workspace, at most one "build" instance may be operating at a time.
Therefore
 # we must serialize the rebuilding of targets in this Makefile.
-.NOTPARALLEL:
-
+Build/bios-tables-test.%.efi: MAKEFLAGS=
 Build/bios-tables-test.%.efi: build-edk2-tools
        ./build.sh $(edk2_dir) BiosTablesTest $* $@

---

I tested with:

$ rm -rf tests/uefi-test-tools/Build
$ make -C tests/uefi-test-tools \
  Build/bios-tables-test.{arm,aarch64,i386,x86_64}.efi images -j42

What do you think about using this snippet? I don't know if this is the
best way to solve this, but it works...
If you test/agree, Michael could eventually apply the snippet directly.

> +
> +Build/bios-tables-test.%.efi: build-edk2-tools
> +	./build.sh $(edk2_dir) BiosTablesTest $* $@
> +
> +build-edk2-tools:
> +	$(MAKE) -C $(edk2_dir)/BaseTools
> +
> +clean:
> +	rm -rf Build Conf log
> +	$(MAKE) -C $(edk2_dir)/BaseTools clean
> diff --git a/tests/uefi-test-tools/.gitignore b/tests/uefi-test-tools/.gitignore
> new file mode 100644
> index 000000000000..9f246701dea1
> --- /dev/null
> +++ b/tests/uefi-test-tools/.gitignore
> @@ -0,0 +1,3 @@
> +Build
> +Conf
> +log
> diff --git a/tests/uefi-test-tools/build.sh b/tests/uefi-test-tools/build.sh
> new file mode 100755
> index 000000000000..155cb75c4ddb
> --- /dev/null
> +++ b/tests/uefi-test-tools/build.sh
> @@ -0,0 +1,145 @@
> +#!/bin/bash
> +
> +# Build script that determines the edk2 toolchain to use, invokes the edk2
> +# "build" utility, and copies the built UEFI binary to the requested location.
> +#
> +# Copyright (C) 2019, Red Hat, Inc.
> +#
> +# This program and the accompanying materials are licensed and made available
> +# under the terms and conditions of the BSD License that accompanies this
> +# distribution. The full text of the license may be found at
> +# <http://opensource.org/licenses/bsd-license.php>.
> +#
> +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
> +# WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +
> +set -e -u -C
> +
> +# Save the command line arguments. We need to reset $# to 0 before sourcing
> +# "edksetup.sh", as it will inherit $@.
> +program_name=$(basename -- "$0")
> +edk2_dir=$1
> +dsc_component=$2
> +emulation_target=$3
> +uefi_binary=$4
> +shift 4
> +
> +# Set up the environment for edk2 building.
> +export PACKAGES_PATH=$(realpath -- "$edk2_dir")
> +export WORKSPACE=$PWD
> +mkdir -p Conf
> +
> +# Source "edksetup.sh" carefully.
> +set +e +u +C
> +source "$PACKAGES_PATH/edksetup.sh"
> +ret=$?
> +set -e -u -C
> +if [ $ret -ne 0 ]; then
> +  exit $ret
> +fi
> +
> +# Map the QEMU system emulation target to the following types of architecture
> +# identifiers:
> +# - edk2,
> +# - gcc cross-compilation.
> +# Cover only those targets that are supported by the UEFI spec and edk2.
> +case "$emulation_target" in
> +  (arm)
> +    edk2_arch=ARM
> +    gcc_arch=arm
> +    ;;
> +  (aarch64)
> +    edk2_arch=AARCH64
> +    gcc_arch=aarch64
> +    ;;
> +  (i386)
> +    edk2_arch=IA32
> +    gcc_arch=i686
> +    ;;
> +  (x86_64)
> +    edk2_arch=X64
> +    gcc_arch=x86_64
> +    ;;
> +  (*)
> +    printf '%s: unknown/unsupported QEMU system emulation target "%s"\n' \
> +      "$program_name" "$emulation_target" >&2
> +    exit 1
> +    ;;
> +esac
> +
> +# Check if cross-compilation is needed.
> +host_arch=$(uname -m)
> +if [ "$gcc_arch" == "$host_arch" ] ||
> +   ( [ "$gcc_arch" == i686 ] && [ "$host_arch" == x86_64 ] ); then
> +  cross_prefix=
> +else
> +  cross_prefix=${gcc_arch}-linux-gnu-
> +fi
> +
> +# Expose cross_prefix (which is possibly empty) to the edk2 tools. While at it,
> +# determine the suitable edk2 toolchain as well.
> +# - For ARM and AARCH64, edk2 only offers the GCC5 toolchain tag, which covers
> +#   the gcc-5+ releases.
> +# - For IA32 and X64, edk2 offers the GCC44 through GCC49 toolchain tags, in
> +#   addition to GCC5. Unfortunately, the mapping between the toolchain tags and
> +#   the actual gcc releases isn't entirely trivial. Run "git-blame" on
> +#   "OvmfPkg/build.sh" in edk2 for more information.
> +# And, because the above is too simple, we have to assign cross_prefix to an
> +# edk2 build variable that is specific to both the toolchain tag and the target
> +# architecture.
> +case "$edk2_arch" in
> +  (ARM)
> +    edk2_toolchain=GCC5
> +    export GCC5_ARM_PREFIX=$cross_prefix
> +    ;;
> +  (AARCH64)
> +    edk2_toolchain=GCC5
> +    export GCC5_AARCH64_PREFIX=$cross_prefix
> +    ;;
> +  (IA32|X64)
> +    gcc_version=$("${cross_prefix}gcc" -v 2>&1 | tail -1 | awk '{print $3}')
> +    case "$gcc_version" in
> +      ([1-3].*|4.[0-3].*)
> +        printf '%s: unsupported gcc version "%s"\n' \
> +          "$program_name" "$gcc_version" >&2
> +        exit 1
> +        ;;
> +      (4.4.*)
> +        edk2_toolchain=GCC44
> +        ;;
> +      (4.5.*)
> +        edk2_toolchain=GCC45
> +        ;;
> +      (4.6.*)
> +        edk2_toolchain=GCC46
> +        ;;
> +      (4.7.*)
> +        edk2_toolchain=GCC47
> +        ;;
> +      (4.8.*)
> +        edk2_toolchain=GCC48
> +        ;;
> +      (4.9.*|6.[0-2].*)
> +        edk2_toolchain=GCC49
> +        ;;
> +      (*)
> +        edk2_toolchain=GCC5
> +        ;;
> +    esac
> +    eval "export ${edk2_toolchain}_BIN=\$cross_prefix"
> +    ;;
> +esac
> +
> +# Build the UEFI binary
> +mkdir -p log
> +build \
> +  --arch="$edk2_arch" \
> +  --buildtarget=DEBUG \
> +  --platform=UefiTestToolsPkg/UefiTestToolsPkg.dsc \
> +  --tagname="$edk2_toolchain" \
> +  --module="UefiTestToolsPkg/$dsc_component/$dsc_component.inf" \
> +  --log="log/$dsc_component.$edk2_arch.log" \
> +  --report-file="log/$dsc_component.$edk2_arch.report"
> +cp -a -- \
> +  "Build/UefiTestTools/DEBUG_${edk2_toolchain}/$edk2_arch/$dsc_component.efi" \
> +  "$uefi_binary"
> 

Re: [Qemu-devel] [PATCH v2 3/5] tests: introduce "uefi-test-tools" with the BiosTablesTest UEFI app

[Philippe Mathieu-Daudé]

On 1/24/19 9:39 PM, Laszlo Ersek wrote:
> The "bios-tables-test" program in QEMU's test suite locates the RSD PTR
> ACPI table in guest RAM, and (chasing pointers to other ACPI tables)
> performs various sanity checks on the QEMU-generated and
> firmware-installed tables.
> 
> Currently this set of test cases doesn't work with UEFI guests. The ACPI
> spec defines distinct methods for OSPM to locate the RSD PTR on
> traditional BIOS vs. UEFI platforms, and the UEFI method is more difficult
> to implement from the hypervisor side with just raw guest memory access.
> 
> Add a UEFI application (to be booted in the UEFI guest) that populates a
> small, MB-aligned structure in guest RAM. The structure begins with a
> signature GUID. The hypervisor should loop over all MB-aligned pages in
> guest RAM until one matches the signature GUID at offset 0, at which point
> the hypervisor can fetch the RSDP address field(s) from the structure.
> 
> QEMU's test logic currently spins on a pre-determined guest address, until
> that address assumes a magic value. The method described in this patch is
> conceptually the same ("busy loop until match is found"), except there is
> no hard-coded address. This plays a lot more nicely with UEFI guest
> firmware (we'll be able to use the normal page allocation UEFI service).
> Given the size of EFI_GUID (16 bytes -- 128 bits), mismatches should be
> astronomically unlikely. In addition, given the typical guest RAM size for
> such tests (128 MB), there are 128 locations to check in one iteration of
> the "outer" loop, which shouldn't introduce an intolerable delay after the
> guest stores the RSDP address(es), and then the GUID.
> 
> The GUID that the hypervisor should search for is
> 
>   AB87A6B1-2034-BDA0-71BD-375007757785
> 
> Expressed as a byte array:
> 
>  {
>    0xb1, 0xa6, 0x87, 0xab,
>    0x34, 0x20,
>    0xa0, 0xbd,
>    0x71, 0xbd, 0x37, 0x50, 0x07, 0x75, 0x77, 0x85
>  }
> 
> Note that in the patch, we define "gBiosTablesTestGuid" with all bits
> inverted. This is a simple method to prevent the UEFI binary, which
> incorporates "gBiosTablesTestGuid", from matching the actual GUID in guest
> RAM.
> 
> The UEFI application is written against the edk2 framework, which was
> introduced earlier as a git submodule. The next patch will provide build
> scripts for maintainers.
> 
> The source code follows the edk2 coding style, and is licensed under the
> 2-clause BSDL (in case someone would like to include UefiTestToolsPkg
> content in a different edk2 platform).
> 
> The "UefiTestToolsPkg.dsc" platform description file resolves the used
> edk2 library classes to instances (= library implementations) such that
> the UEFI binaries inherit no platform dependencies. They are expected to
> run on any system that conforms to the UEFI-2.3.1 spec (which was released
> in 2012). The arch-specific build options are carried over from edk2's
> ArmVirtPkg and OvmfPkg platforms.
> 
> Cc: "Michael S. Tsirkin" <mst@redhat.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Cc: Igor Mammedov <imammedo@redhat.com>
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> Cc: Shannon Zhao <shannon.zhaosl@gmail.com>
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

> ---
> 
> Notes:
>     v2:
>     - no change
>     
>     v1:
>     - If that's necessary, I'd be glad to be designated as Maintainer or
>       Reviewer in "MAINTAINERS" for "tests/uefi-test-tools/", I just
>       couldn't figure out under what subsystem I should add the magic lines.
>       "MAINTAINERS" needs a Table of Contents! :)
> 
>  tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dec              |  27 ++++
>  tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dsc              |  69 +++++++++++
>  tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.inf |  41 ++++++
>  tests/uefi-test-tools/UefiTestToolsPkg/Include/Guid/BiosTablesTest.h     |  67 ++++++++++
>  tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.c   | 130 ++++++++++++++++++++
>  tests/uefi-test-tools/LICENSE                                            |  25 ++++
>  6 files changed, 359 insertions(+)
> 
> diff --git a/tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dec b/tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dec
> new file mode 100644
> index 000000000000..ed3a2fe11084
> --- /dev/null
> +++ b/tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dec
> @@ -0,0 +1,27 @@
> +## @file
> +# edk2 package declaration for the test helper UEFI applications that run in
> +# guests.
> +#
> +# Copyright (C) 2019, Red Hat, Inc.
> +#
> +# This program and the accompanying materials are licensed and made available
> +# under the terms and conditions of the BSD License that accompanies this
> +# distribution. The full text of the license may be found at
> +# <http://opensource.org/licenses/bsd-license.php>.
> +#
> +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
> +# WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +##
> +
> +[Defines]
> +  DEC_SPECIFICATION = 1.27
> +  PACKAGE_NAME      = UefiTestToolsPkg
> +  PACKAGE_GUID      = 7b3f1794-0c85-4b27-a536-44dbf0b0669c
> +  PACKAGE_VERSION   = 0.1
> +
> +[Includes]
> +  Include
> +
> +[Guids]
> +  gBiosTablesTestGuid = {0x5478594e, 0xdfcb, 0x425f, {0x8e, 0x42, 0xc8, 0xaf, 0xf8, 0x8a, 0x88, 0x7a}}
> +
> diff --git a/tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dsc b/tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dsc
> new file mode 100644
> index 000000000000..c8511cd732bc
> --- /dev/null
> +++ b/tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dsc
> @@ -0,0 +1,69 @@
> +## @file
> +# edk2 platform description for the test helper UEFI applications that run in
> +# guests.
> +#
> +# Copyright (C) 2019, Red Hat, Inc.
> +#
> +# This program and the accompanying materials are licensed and made available
> +# under the terms and conditions of the BSD License that accompanies this
> +# distribution. The full text of the license may be found at
> +# <http://opensource.org/licenses/bsd-license.php>.
> +#
> +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
> +# WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +##
> +
> +[Defines]
> +  DSC_SPECIFICATION       = 1.28
> +  PLATFORM_GUID           = 6750ccc1-8365-49f0-8437-948e516a9f55
> +  PLATFORM_VERSION        = 0.1
> +  PLATFORM_NAME           = UefiTestTools
> +  SKUID_IDENTIFIER        = DEFAULT
> +  SUPPORTED_ARCHITECTURES = ARM|AARCH64|IA32|X64
> +  BUILD_TARGETS           = DEBUG
> +
> +[BuildOptions.IA32]
> +  GCC:*_*_IA32_CC_FLAGS = -mno-mmx -mno-sse
> +
> +[BuildOptions.X64]
> +  GCC:*_*_X64_CC_FLAGS = -mno-mmx -mno-sse
> +
> +[BuildOptions.ARM.EDKII.UEFI_APPLICATION]
> +  GCC:*_*_ARM_DLINK_FLAGS = -z common-page-size=0x1000
> +
> +[BuildOptions.AARCH64.EDKII.UEFI_APPLICATION]
> +  GCC:*_*_AARCH64_DLINK_FLAGS = -z common-page-size=0x1000
> +
> +[BuildOptions]
> +  GCC:*_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES
> +
> +[SkuIds]
> +  0|DEFAULT
> +
> +[LibraryClasses]
> +  BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
> +  DebugLib|MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf
> +  DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf
> +  DevicePathLib|MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.inf
> +  MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
> +  PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
> +  PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
> +  UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf
> +  UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
> +  UefiLib|MdePkg/Library/UefiLib/UefiLib.inf
> +  UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
> +
> +[LibraryClasses.ARM, LibraryClasses.AARCH64]
> +  BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
> +  NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
> +  NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
> +
> +[LibraryClasses.IA32, LibraryClasses.X64]
> +  BaseMemoryLib|MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf
> +
> +[PcdsFixedAtBuild]
> +  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8040004F
> +  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2F
> +
> +[Components]
> +  UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.inf
> diff --git a/tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.inf b/tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.inf
> new file mode 100644
> index 000000000000..924d8a80d00b
> --- /dev/null
> +++ b/tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.inf
> @@ -0,0 +1,41 @@
> +## @file
> +# Populate the BIOS_TABLES_TEST structure.
> +#
> +# Copyright (C) 2019, Red Hat, Inc.
> +#
> +# This program and the accompanying materials are licensed and made available
> +# under the terms and conditions of the BSD License that accompanies this
> +# distribution. The full text of the license may be found at
> +# <http://opensource.org/licenses/bsd-license.php>.
> +#
> +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
> +# WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +##
> +
> +[Defines]
> +  INF_VERSION                = 1.27
> +  BASE_NAME                  = BiosTablesTest
> +  UEFI_SPECIFICATION_VERSION = 2.31
> +  FILE_GUID                  = 87f00433-3b7c-45c3-ae78-a56495bd4e62
> +  MODULE_TYPE                = UEFI_APPLICATION
> +  ENTRY_POINT                = BiosTablesTestMain
> +
> +[Sources]
> +  BiosTablesTest.c
> +
> +[LibraryClasses]
> +  BaseLib
> +  BaseMemoryLib
> +  MemoryAllocationLib
> +  UefiApplicationEntryPoint
> +  UefiBootServicesTableLib
> +  UefiLib
> +
> +[Guids]
> +  gBiosTablesTestGuid
> +  gEfiAcpi10TableGuid
> +  gEfiAcpi20TableGuid
> +
> +[Packages]
> +  MdePkg/MdePkg.dec
> +  UefiTestToolsPkg/UefiTestToolsPkg.dec
> diff --git a/tests/uefi-test-tools/UefiTestToolsPkg/Include/Guid/BiosTablesTest.h b/tests/uefi-test-tools/UefiTestToolsPkg/Include/Guid/BiosTablesTest.h
> new file mode 100644
> index 000000000000..0b72c61254af
> --- /dev/null
> +++ b/tests/uefi-test-tools/UefiTestToolsPkg/Include/Guid/BiosTablesTest.h
> @@ -0,0 +1,67 @@
> +/** @file
> +  Expose the address(es) of the ACPI RSD PTR table(s) in a MB-aligned structure
> +  to the hypervisor.
> +
> +  The hypervisor locates the MB-aligned structure based on the signature GUID
> +  that is at offset 0 in the structure. Once the RSD PTR address(es) are
> +  retrieved, the hypervisor may perform various ACPI checks.
> +
> +  This feature is a development aid, for supporting ACPI table unit tests in
> +  hypervisors. Do not enable in production builds.
> +
> +  Copyright (C) 2019, Red Hat, Inc.
> +
> +  This program and the accompanying materials are licensed and made available
> +  under the terms and conditions of the BSD License that accompanies this
> +  distribution. The full text of the license may be found at
> +  <http://opensource.org/licenses/bsd-license.php>.
> +
> +  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
> +  WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +**/
> +
> +#ifndef __BIOS_TABLES_TEST_H__
> +#define __BIOS_TABLES_TEST_H__
> +
> +#include <Uefi/UefiBaseType.h>
> +
> +#define BIOS_TABLES_TEST_GUID                          \
> +  {                                                    \
> +    0x5478594e,                                        \
> +    0xdfcb,                                            \
> +    0x425f,                                            \
> +    { 0x8e, 0x42, 0xc8, 0xaf, 0xf8, 0x8a, 0x88, 0x7a } \
> +  }
> +
> +extern EFI_GUID gBiosTablesTestGuid;
> +
> +//
> +// The following structure must be allocated in Boot Services Data type memory,
> +// aligned at a 1MB boundary.
> +//
> +#pragma pack (1)
> +typedef struct {
> +  //
> +  // The signature GUID is written to the MB-aligned structure from
> +  // gBiosTablesTestGuid, but with all bits inverted. That's the actual GUID
> +  // value that the hypervisor should look for at each MB boundary, looping
> +  // over all guest RAM pages with that alignment, until a match is found. The
> +  // bit-flipping occurs in order not to store the actual GUID in any UEFI
> +  // executable, which might confuse guest memory analysis. Note that EFI_GUID
> +  // has little endian representation.
> +  //
> +  EFI_GUID             InverseSignatureGuid;
> +  //
> +  // The Rsdp10 and Rsdp20 fields may be read when the signature GUID matches.
> +  // Rsdp10 is the guest-physical address of the ACPI 1.0 specification RSD PTR
> +  // table, in 8-byte little endian representation. Rsdp20 is the same, for the
> +  // ACPI 2.0 or later specification RSD PTR table. Each of these fields may be
> +  // zero (independently of the other) if the UEFI System Table does not
> +  // provide the corresponding UEFI Configuration Table.
> +  //
> +  EFI_PHYSICAL_ADDRESS Rsdp10;
> +  EFI_PHYSICAL_ADDRESS Rsdp20;
> +} BIOS_TABLES_TEST;
> +#pragma pack ()
> +
> +#endif // __BIOS_TABLES_TEST_H__
> diff --git a/tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.c b/tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.c
> new file mode 100644
> index 000000000000..b208e17fb00f
> --- /dev/null
> +++ b/tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.c
> @@ -0,0 +1,130 @@
> +/** @file
> +  Populate the BIOS_TABLES_TEST structure.
> +
> +  Copyright (C) 2019, Red Hat, Inc.
> +
> +  This program and the accompanying materials are licensed and made available
> +  under the terms and conditions of the BSD License that accompanies this
> +  distribution. The full text of the license may be found at
> +  <http://opensource.org/licenses/bsd-license.php>.
> +
> +  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
> +  WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +**/
> +
> +#include <Guid/Acpi.h>
> +#include <Guid/BiosTablesTest.h>
> +#include <Library/BaseLib.h>
> +#include <Library/BaseMemoryLib.h>
> +#include <Library/MemoryAllocationLib.h>
> +#include <Library/UefiBootServicesTableLib.h>
> +#include <Library/UefiLib.h>
> +
> +/**
> +  Wait for a keypress with a message that the application is about to exit.
> +**/
> +STATIC
> +VOID
> +WaitForExitKeyPress (
> +  VOID
> +  )
> +{
> +  EFI_STATUS    Status;
> +  UINTN         Idx;
> +  EFI_INPUT_KEY Key;
> +
> +  if (gST->ConIn == NULL) {
> +    return;
> +  }
> +  AsciiPrint ("%a: press any key to exit\n", gEfiCallerBaseName);
> +  Status = gBS->WaitForEvent (1, &gST->ConIn->WaitForKey, &Idx);
> +  if (EFI_ERROR (Status)) {
> +    return;
> +  }
> +  gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);
> +}
> +
> +EFI_STATUS
> +EFIAPI
> +BiosTablesTestMain (
> +  IN EFI_HANDLE       ImageHandle,
> +  IN EFI_SYSTEM_TABLE *SystemTable
> +  )
> +{
> +  VOID                          *Pages;
> +  volatile BIOS_TABLES_TEST     *BiosTablesTest;
> +  CONST VOID                    *Rsdp10;
> +  CONST VOID                    *Rsdp20;
> +  CONST EFI_CONFIGURATION_TABLE *ConfigTable;
> +  CONST EFI_CONFIGURATION_TABLE *ConfigTablesEnd;
> +  volatile EFI_GUID             *InverseSignature;
> +  UINTN                         Idx;
> +
> +  Pages = AllocateAlignedPages (EFI_SIZE_TO_PAGES (sizeof *BiosTablesTest),
> +            SIZE_1MB);
> +  if (Pages == NULL) {
> +    AsciiErrorPrint ("%a: AllocateAlignedPages() failed\n",
> +      gEfiCallerBaseName);
> +    //
> +    // Assuming the application was launched by the boot manager as a boot
> +    // loader, exiting with error will cause the boot manager to proceed with
> +    // the remaining boot options. If there are no other boot options, the boot
> +    // manager menu will be pulled up. Give the user a chance to read the error
> +    // message.
> +    //
> +    WaitForExitKeyPress ();
> +    return EFI_OUT_OF_RESOURCES;
> +  }
> +
> +  //
> +  // Locate both gEfiAcpi10TableGuid and gEfiAcpi20TableGuid config tables in
> +  // one go.
> +  //
> +  Rsdp10 = NULL;
> +  Rsdp20 = NULL;
> +  ConfigTable = gST->ConfigurationTable;
> +  ConfigTablesEnd = gST->ConfigurationTable + gST->NumberOfTableEntries;
> +  while ((Rsdp10 == NULL || Rsdp20 == NULL) && ConfigTable < ConfigTablesEnd) {
> +    if (CompareGuid (&ConfigTable->VendorGuid, &gEfiAcpi10TableGuid)) {
> +      Rsdp10 = ConfigTable->VendorTable;
> +    } else if (CompareGuid (&ConfigTable->VendorGuid, &gEfiAcpi20TableGuid)) {
> +      Rsdp20 = ConfigTable->VendorTable;
> +    }
> +    ++ConfigTable;
> +  }
> +
> +  AsciiPrint ("%a: BiosTablesTest=%p Rsdp10=%p Rsdp20=%p\n",
> +    gEfiCallerBaseName, Pages, Rsdp10, Rsdp20);
> +
> +  //
> +  // Store the RSD PTR address(es) first, then the signature second.
> +  //
> +  BiosTablesTest = Pages;
> +  BiosTablesTest->Rsdp10 = (UINTN)Rsdp10;
> +  BiosTablesTest->Rsdp20 = (UINTN)Rsdp20;
> +
> +  MemoryFence();
> +
> +  InverseSignature = &BiosTablesTest->InverseSignatureGuid;
> +  InverseSignature->Data1  = gBiosTablesTestGuid.Data1;
> +  InverseSignature->Data1 ^= MAX_UINT32;
> +  InverseSignature->Data2  = gBiosTablesTestGuid.Data2;
> +  InverseSignature->Data2 ^= MAX_UINT16;
> +  InverseSignature->Data3  = gBiosTablesTestGuid.Data3;
> +  InverseSignature->Data3 ^= MAX_UINT16;
> +  for (Idx = 0; Idx < sizeof InverseSignature->Data4; ++Idx) {
> +    InverseSignature->Data4[Idx]  = gBiosTablesTestGuid.Data4[Idx];
> +    InverseSignature->Data4[Idx] ^= MAX_UINT8;
> +  }
> +
> +  //
> +  // The wait below has dual purpose. First, it blocks the application without
> +  // wasting VCPU cycles while the hypervisor is scanning guest RAM. Second,
> +  // assuming the application was launched by the boot manager as a boot
> +  // loader, exiting the app with success causes the boot manager to pull up
> +  // the boot manager menu at once (regardless of other boot options); the wait
> +  // gives the user a chance to read the info printed above.
> +  //
> +  WaitForExitKeyPress ();
> +  return EFI_SUCCESS;
> +}
> diff --git a/tests/uefi-test-tools/LICENSE b/tests/uefi-test-tools/LICENSE
> new file mode 100644
> index 000000000000..38b78aecdb0e
> --- /dev/null
> +++ b/tests/uefi-test-tools/LICENSE
> @@ -0,0 +1,25 @@
> +All the files in this directory and subdirectories are released under the
> +2-Clause BSD License (see header in each file).
> +
> +Copyright (C) 2019, Red Hat, Inc.
> +
> +Redistribution and use in source and binary forms, with or without
> +modification, are permitted provided that the following conditions are met:
> +
> +1. Redistributions of source code must retain the above copyright notice, this
> +   list of conditions and the following disclaimer.
> +
> +2. Redistributions in binary form must reproduce the above copyright notice,
> +   this list of conditions and the following disclaimer in the documentation
> +   and/or other materials provided with the distribution.
> +
> +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
> +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
> +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
> +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
> +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
> +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
> +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
> +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
> +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> 

Re: [Qemu-devel] [PATCH v2 4/5] tests/uefi-test-tools: add build scripts

[Laszlo Ersek]

On 01/31/19 18:07, Philippe Mathieu-Daudé wrote:
> Hi Laszlo,
> 
> On 1/24/19 9:39 PM, Laszlo Ersek wrote:
>> Introduce the following build scripts under "tests/uefi-test-tools":
>>
>> * "build.sh" builds a single module (a UEFI application) from
>>   UefiTestToolsPkg, for a single QEMU emulation target.
>>
>>   "build.sh" relies on cross-compilers when the emulation target and the
>>   build host architecture don't match. The cross-compiler prefix is
>>   computed according to a fixed, Linux-specific pattern. No attempt is
>>   made to copy or reimplement the GNU Make magic from "qemu/roms/Makefile"
>>   for cross-compiler prefix determination. The reason is that the build
>>   host OSes that are officially supported by edk2, and those that are
>>   supported by QEMU, intersect only in Linux. (Note that the UNIXGCC
>>   toolchain is being removed from edk2,
>>   <https://bugzilla.tianocore.org/show_bug.cgi?id=1377>.)
>>
>> * "Makefile" currently builds the "UefiTestToolsPkg/BiosTablesTest"
>>   application, for arm, aarch64, i386, and x86_64, with the help of
>>   "build.sh".
>>
>>   "Makefile" turns each resultant UEFI executable into a UEFI-bootable,
>>   qcow2-compressed ISO image. The ISO images are output as
>>   "tests/data/uefi-boot-images/bios-tables-test.<TARGET>.iso.qcow2".
>>
>>   Each ISO image should be passed to QEMU as follows:
>>
>>     -drive id=boot-cd,if=none,readonly,format=qcow2,file=$ISO \
>>     -device virtio-scsi-pci,id=scsi0 \
>>     -device scsi-cd,drive=boot-cd,bus=scsi0.0,bootindex=0 \
>>
>>   "Makefile" assumes that "mkdosfs", "mtools", and "genisoimage" are
>>   present.
>>
>> Cc: "Michael S. Tsirkin" <mst@redhat.com>
>> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>> Cc: Gerd Hoffmann <kraxel@redhat.com>
>> Cc: Igor Mammedov <imammedo@redhat.com>
>> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
>> Cc: Shannon Zhao <shannon.zhaosl@gmail.com>
>> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
>> ---
>>
>> Notes:
>>     v2:
>>     - add the .NOTPARALLEL target [Phil, help-make, edk2-devel]
>>
>>  tests/uefi-test-tools/Makefile   |  97 +++++++++++++
>>  tests/uefi-test-tools/.gitignore |   3 +
>>  tests/uefi-test-tools/build.sh   | 145 ++++++++++++++++++++
>>  3 files changed, 245 insertions(+)
>>
>> diff --git a/tests/uefi-test-tools/Makefile b/tests/uefi-test-tools/Makefile
>> new file mode 100644
>> index 000000000000..61d263861e01
>> --- /dev/null
>> +++ b/tests/uefi-test-tools/Makefile
>> @@ -0,0 +1,97 @@
>> +# Makefile for the test helper UEFI applications that run in guests.
>> +#
>> +# Copyright (C) 2019, Red Hat, Inc.
>> +#
>> +# This program and the accompanying materials are licensed and made available
>> +# under the terms and conditions of the BSD License that accompanies this
>> +# distribution. The full text of the license may be found at
>> +# <http://opensource.org/licenses/bsd-license.php>.
>> +#
>> +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
>> +# WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +
>> +edk2_dir              := ../../roms/edk2
>> +images_dir            := ../data/uefi-boot-images
>> +emulation_targets     := arm aarch64 i386 x86_64
>> +uefi_binaries         := bios-tables-test
>> +intermediate_suffixes := .efi .fat .iso.raw
>> +
>> +images: $(foreach binary,$(uefi_binaries), \
>> +		$(foreach target,$(emulation_targets), \
>> +			$(images_dir)/$(binary).$(target).iso.qcow2))
>> +
>> +# Preserve all intermediate targets if the build succeeds.
>> +# - Intermediate targets help with development & debugging.
>> +# - Preserving intermediate targets also keeps spurious changes out of the
>> +#   final build products, in case the user re-runs "make" without any changes
>> +#   to the UEFI source code. Normally, the intermediate files would have been
>> +#   removed by the last "make" invocation, hence the re-run would rebuild them
>> +#   from the unchanged UEFI sources. Unfortunately, the "mkdosfs" and
>> +#   "genisoimage" utilities embed timestamp-based information in their outputs,
>> +#   which causes git to report differences for the tracked qcow2 ISO images.
>> +.SECONDARY: $(foreach binary,$(uefi_binaries), \
>> +		$(foreach target,$(emulation_targets), \
>> +			$(foreach suffix,$(intermediate_suffixes), \
>> +				Build/$(binary).$(target)$(suffix))))
>> +
>> +# In the pattern rules below, the stem (%, $*) stands for
>> +# "$(binary).$(target)".
>> +
>> +# Convert the raw ISO image to a qcow2 one, enabling compression, and using a
>> +# small cluster size. This allows for small binary files under git control,
>> +# hence for small binary patches.
>> +$(images_dir)/%.iso.qcow2: Build/%.iso.raw
>> +	mkdir -p -- $(images_dir)
>> +	$${QTEST_QEMU_IMG:-qemu-img} convert -f raw -O qcow2 -c \
>> +		-o cluster_size=512 -- $< $@
>> +
>> +# Embed the "UEFI system partition" into an ISO9660 file system as an ElTorito
>> +# boot image.
>> +Build/%.iso.raw: Build/%.fat
>> +	genisoimage -input-charset ASCII -efi-boot $(notdir $<) -no-emul-boot \
>> +		-quiet -o $@ -- $<
>> +
>> +# Define chained macros in order to map QEMU system emulation targets to
>> +# *short* UEFI architecture identifiers. Periods are allowed in, and ultimately
>> +# stripped from, the argument.
>> +map_arm_to_uefi     = $(subst arm,ARM,$(1))
>> +map_aarch64_to_uefi = $(subst aarch64,AA64,$(call map_arm_to_uefi,$(1)))
>> +map_i386_to_uefi    = $(subst i386,IA32,$(call map_aarch64_to_uefi,$(1)))
>> +map_x86_64_to_uefi  = $(subst x86_64,X64,$(call map_i386_to_uefi,$(1)))
>> +map_to_uefi         = $(subst .,,$(call map_x86_64_to_uefi,$(1)))
>> +
>> +# Format a "UEFI system partition", using the UEFI binary as the default boot
>> +# loader. Add 10% size for filesystem metadata, round up to the next KB, and
>> +# make sure the size is large enough for a FAT filesystem. Name the filesystem
>> +# after the UEFI binary. (Excess characters are automatically dropped from the
>> +# filesystem label.)
>> +Build/%.fat: Build/%.efi
>> +	rm -f -- $@
>> +	uefi_bin_b=$$(stat --format=%s -- $<) && \
>> +		uefi_fat_kb=$$(( (uefi_bin_b * 11 / 10 + 1023) / 1024 )) && \
>> +		uefi_fat_kb=$$(( uefi_fat_kb >= 64 ? uefi_fat_kb : 64 )) && \
>> +		mkdosfs -C $@ -n $(basename $(@F)) -- $$uefi_fat_kb
>> +	MTOOLS_SKIP_CHECK=1 mmd -i $@ ::EFI
>> +	MTOOLS_SKIP_CHECK=1 mmd -i $@ ::EFI/BOOT
>> +	MTOOLS_SKIP_CHECK=1 mcopy -i $@ -- $< \
>> +		::EFI/BOOT/BOOT$(call map_to_uefi,$(suffix $*)).EFI
>> +
>> +# In the pattern rules below, the stem (%, $*) stands for "$(target)" only. The
>> +# association between the UEFI binary (such as "bios-tables-test") and the
>> +# component name from the edk2 platform DSC file (such as "BiosTablesTest") is
>> +# explicit in each rule.
>> +
>> +# "build.sh" invokes the "build" utility of edk2 BaseTools. In any given edk2
>> +# workspace, at most one "build" instance may be operating at a time. Therefore
>> +# we must serialize the rebuilding of targets in this Makefile.
>> +.NOTPARALLEL:
> 
> Well this doesn't seem to improve my case :|
> 
> You can test with:
> 
> $ alias make='make -j8 -l7.5'
> 
> So you get:
> 
> $ make print-MAKEFLAGS
> MAKEFLAGS=rR -j8 -l7.5 --jobserver-auth=3,4

I get something different (with make-3.82-23.el7.x86_64):

MAKEFLAGS=Rrl 7.5 - --jobserver-fds=3,4 -j

Notably, the argument 8 of "-j" is dropped.

Anyway, I think this is a side topic.


> and this command fails:
> 
> $ make -C tests/uefi-test-tools Build/bios-tables-test.x86_64.efi

(1) How *exactly* does it fail for you?

(2) What operating system and "make" are you using?

Because, the command completes perfectly fine for me. (Just for this
test, I rebased the v2 branch on top of current master, i.e. commit
aefcd2836620, and re-tested there.)

(3) Also, did you update all submodules first? (git submodule update
--init --force)

(4) IMPORTANT: did you make sure you didn't have an earlier *mis-built*
BaseTools directory in the submodule? For that, run "make clean" in the
QEMU project root. Note that "git clean -ffdx" will *not* clean
submodules, when issued from the QEMU project root.


> Now, using -j1 we have:
> 
> $ make print-MAKEFLAGS -j1
> MAKEFLAGS=rR -j1 -l7.5
> 
> And the builds work:
> 
> $ make -j1 -C tests/uefi-test-tools Build/bios-tables-test.x86_64.efi
> 
> Reading 'info make' section "5.7.3 Communicating Options to a
> Sub-'make'" I figured we can overwrite MAKEFLAGS, and this snippet works
> like charm:
> 
> -- >8 --
> @@ -84,8 +84,7 @@ Build/%.fat: Build/%.efi
>  # "build.sh" invokes the "build" utility of edk2 BaseTools. In any
> given edk2
>  # workspace, at most one "build" instance may be operating at a time.
> Therefore
>  # we must serialize the rebuilding of targets in this Makefile.
> -.NOTPARALLEL:
> -
> +Build/bios-tables-test.%.efi: MAKEFLAGS=
>  Build/bios-tables-test.%.efi: build-edk2-tools
>         ./build.sh $(edk2_dir) BiosTablesTest $* $@
> 
> ---

No, this is wrong. First, it removes other make flags that are not
related to parallelized building. Second, I was advised on the help-make
mailing list that if we really want to manipulate make options (as
opposed to setting .NOTPARALLEL), then we should explicitly append a
"-j1" to the invocation of the inner make. Please see this thread:
<http://lists.gnu.org/archive/html/help-make/2019-01/msg00004.html>.

That would mean modifying edk2 build code (because that's where the
inner make is invoked from), and I started researching that, but it
wasn't necessary in the end.


> I tested with:
> 
> $ rm -rf tests/uefi-test-tools/Build
> $ make -C tests/uefi-test-tools \
>   Build/bios-tables-test.{arm,aarch64,i386,x86_64}.efi images -j42

This command works for me flawlessly already, with my tree as-is.


> What do you think about using this snippet? I don't know if this is the
> best way to solve this, but it works...
> If you test/agree, Michael could eventually apply the snippet directly.

Again, I disagree with wiping MAKEFLAGS (or messing with it in any way);
*if* we need to modify the inner make's command line, that should be
done differently. However, my main point is that we need not modify the
inner make's invocation.

Can you please answer questions (1) through (4)? If it still fails for
you afterwards, I could attempt reproducing the issue in an environment
that's similar to yours.

Thanks,
Laszlo

> 
>> +
>> +Build/bios-tables-test.%.efi: build-edk2-tools
>> +	./build.sh $(edk2_dir) BiosTablesTest $* $@
>> +
>> +build-edk2-tools:
>> +	$(MAKE) -C $(edk2_dir)/BaseTools
>> +
>> +clean:
>> +	rm -rf Build Conf log
>> +	$(MAKE) -C $(edk2_dir)/BaseTools clean
>> diff --git a/tests/uefi-test-tools/.gitignore b/tests/uefi-test-tools/.gitignore
>> new file mode 100644
>> index 000000000000..9f246701dea1
>> --- /dev/null
>> +++ b/tests/uefi-test-tools/.gitignore
>> @@ -0,0 +1,3 @@
>> +Build
>> +Conf
>> +log
>> diff --git a/tests/uefi-test-tools/build.sh b/tests/uefi-test-tools/build.sh
>> new file mode 100755
>> index 000000000000..155cb75c4ddb
>> --- /dev/null
>> +++ b/tests/uefi-test-tools/build.sh
>> @@ -0,0 +1,145 @@
>> +#!/bin/bash
>> +
>> +# Build script that determines the edk2 toolchain to use, invokes the edk2
>> +# "build" utility, and copies the built UEFI binary to the requested location.
>> +#
>> +# Copyright (C) 2019, Red Hat, Inc.
>> +#
>> +# This program and the accompanying materials are licensed and made available
>> +# under the terms and conditions of the BSD License that accompanies this
>> +# distribution. The full text of the license may be found at
>> +# <http://opensource.org/licenses/bsd-license.php>.
>> +#
>> +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
>> +# WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> +
>> +set -e -u -C
>> +
>> +# Save the command line arguments. We need to reset $# to 0 before sourcing
>> +# "edksetup.sh", as it will inherit $@.
>> +program_name=$(basename -- "$0")
>> +edk2_dir=$1
>> +dsc_component=$2
>> +emulation_target=$3
>> +uefi_binary=$4
>> +shift 4
>> +
>> +# Set up the environment for edk2 building.
>> +export PACKAGES_PATH=$(realpath -- "$edk2_dir")
>> +export WORKSPACE=$PWD
>> +mkdir -p Conf
>> +
>> +# Source "edksetup.sh" carefully.
>> +set +e +u +C
>> +source "$PACKAGES_PATH/edksetup.sh"
>> +ret=$?
>> +set -e -u -C
>> +if [ $ret -ne 0 ]; then
>> +  exit $ret
>> +fi
>> +
>> +# Map the QEMU system emulation target to the following types of architecture
>> +# identifiers:
>> +# - edk2,
>> +# - gcc cross-compilation.
>> +# Cover only those targets that are supported by the UEFI spec and edk2.
>> +case "$emulation_target" in
>> +  (arm)
>> +    edk2_arch=ARM
>> +    gcc_arch=arm
>> +    ;;
>> +  (aarch64)
>> +    edk2_arch=AARCH64
>> +    gcc_arch=aarch64
>> +    ;;
>> +  (i386)
>> +    edk2_arch=IA32
>> +    gcc_arch=i686
>> +    ;;
>> +  (x86_64)
>> +    edk2_arch=X64
>> +    gcc_arch=x86_64
>> +    ;;
>> +  (*)
>> +    printf '%s: unknown/unsupported QEMU system emulation target "%s"\n' \
>> +      "$program_name" "$emulation_target" >&2
>> +    exit 1
>> +    ;;
>> +esac
>> +
>> +# Check if cross-compilation is needed.
>> +host_arch=$(uname -m)
>> +if [ "$gcc_arch" == "$host_arch" ] ||
>> +   ( [ "$gcc_arch" == i686 ] && [ "$host_arch" == x86_64 ] ); then
>> +  cross_prefix=
>> +else
>> +  cross_prefix=${gcc_arch}-linux-gnu-
>> +fi
>> +
>> +# Expose cross_prefix (which is possibly empty) to the edk2 tools. While at it,
>> +# determine the suitable edk2 toolchain as well.
>> +# - For ARM and AARCH64, edk2 only offers the GCC5 toolchain tag, which covers
>> +#   the gcc-5+ releases.
>> +# - For IA32 and X64, edk2 offers the GCC44 through GCC49 toolchain tags, in
>> +#   addition to GCC5. Unfortunately, the mapping between the toolchain tags and
>> +#   the actual gcc releases isn't entirely trivial. Run "git-blame" on
>> +#   "OvmfPkg/build.sh" in edk2 for more information.
>> +# And, because the above is too simple, we have to assign cross_prefix to an
>> +# edk2 build variable that is specific to both the toolchain tag and the target
>> +# architecture.
>> +case "$edk2_arch" in
>> +  (ARM)
>> +    edk2_toolchain=GCC5
>> +    export GCC5_ARM_PREFIX=$cross_prefix
>> +    ;;
>> +  (AARCH64)
>> +    edk2_toolchain=GCC5
>> +    export GCC5_AARCH64_PREFIX=$cross_prefix
>> +    ;;
>> +  (IA32|X64)
>> +    gcc_version=$("${cross_prefix}gcc" -v 2>&1 | tail -1 | awk '{print $3}')
>> +    case "$gcc_version" in
>> +      ([1-3].*|4.[0-3].*)
>> +        printf '%s: unsupported gcc version "%s"\n' \
>> +          "$program_name" "$gcc_version" >&2
>> +        exit 1
>> +        ;;
>> +      (4.4.*)
>> +        edk2_toolchain=GCC44
>> +        ;;
>> +      (4.5.*)
>> +        edk2_toolchain=GCC45
>> +        ;;
>> +      (4.6.*)
>> +        edk2_toolchain=GCC46
>> +        ;;
>> +      (4.7.*)
>> +        edk2_toolchain=GCC47
>> +        ;;
>> +      (4.8.*)
>> +        edk2_toolchain=GCC48
>> +        ;;
>> +      (4.9.*|6.[0-2].*)
>> +        edk2_toolchain=GCC49
>> +        ;;
>> +      (*)
>> +        edk2_toolchain=GCC5
>> +        ;;
>> +    esac
>> +    eval "export ${edk2_toolchain}_BIN=\$cross_prefix"
>> +    ;;
>> +esac
>> +
>> +# Build the UEFI binary
>> +mkdir -p log
>> +build \
>> +  --arch="$edk2_arch" \
>> +  --buildtarget=DEBUG \
>> +  --platform=UefiTestToolsPkg/UefiTestToolsPkg.dsc \
>> +  --tagname="$edk2_toolchain" \
>> +  --module="UefiTestToolsPkg/$dsc_component/$dsc_component.inf" \
>> +  --log="log/$dsc_component.$edk2_arch.log" \
>> +  --report-file="log/$dsc_component.$edk2_arch.report"
>> +cp -a -- \
>> +  "Build/UefiTestTools/DEBUG_${edk2_toolchain}/$edk2_arch/$dsc_component.efi" \
>> +  "$uefi_binary"
>>

Re: [Qemu-devel] [PATCH v2 4/5] tests/uefi-test-tools: add build scripts

[Laszlo Ersek]

On 01/31/19 19:55, Laszlo Ersek wrote:

> (4) IMPORTANT: did you make sure you didn't have an earlier *mis-built*
> BaseTools directory in the submodule? For that, run "make clean" in the
> QEMU project root.

Sorry, thinko above; the command to run is

  make -C tests/uefi-test-tools clean

> Note that "git clean -ffdx" will *not* clean
> submodules, when issued from the QEMU project root.

Thanks
Laszlo

Re: [Qemu-devel] [PATCH v2 0/5] add the BiosTablesTest UEFI app, build it with the new roms/edk2 submodule

[Michael S. Tsirkin]

On Thu, Jan 31, 2019 at 03:23:50PM +0100, Laszlo Ersek wrote:
> On 01/24/19 21:39, Laszlo Ersek wrote:
> > Previous version (v1):
> > http://mid.mail-archive.com/20190118223400.24311-1-lersek@redhat.com
> > 
> > Updates in v2 have been noted on each patch in the series.
> 
> ping

Oh sorry I noticed Philippe reported some failures with this patchset.
Can you guys pls get to the bottom of it? I don't want
everyone to suffer.

> > 
> > Cc: "Michael S. Tsirkin" <mst@redhat.com>
> > Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > Cc: Gerd Hoffmann <kraxel@redhat.com>
> > Cc: Igor Mammedov <imammedo@redhat.com>
> > Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> > Cc: Shannon Zhao <shannon.zhaosl@gmail.com>
> > 
> > Thanks
> > Laszlo
> > 
> > Laszlo Ersek (5):
> >   roms: add the edk2 project as a git submodule
> >   roms: build the EfiRom utility from the roms/edk2 submodule
> >   tests: introduce "uefi-test-tools" with the BiosTablesTest UEFI app
> >   tests/uefi-test-tools: add build scripts
> >   tests/data: introduce "uefi-boot-images" with the "bios-tables-test"
> >     ISOs
> > 
> >  .gitmodules                                                              |   3 +
> >  Makefile                                                                 |   6 +-
> >  roms/Makefile                                                            |  13 +-
> >  roms/edk2                                                                |   1 +
> >  tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2           | Bin 0 -> 11776 bytes
> >  tests/data/uefi-boot-images/bios-tables-test.arm.iso.qcow2               | Bin 0 -> 11776 bytes
> >  tests/data/uefi-boot-images/bios-tables-test.i386.iso.qcow2              | Bin 0 -> 12800 bytes
> >  tests/data/uefi-boot-images/bios-tables-test.x86_64.iso.qcow2            | Bin 0 -> 13312 bytes
> >  tests/uefi-test-tools/.gitignore                                         |   3 +
> >  tests/uefi-test-tools/LICENSE                                            |  25 ++++
> >  tests/uefi-test-tools/Makefile                                           |  97 +++++++++++++
> >  tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.c   | 130 ++++++++++++++++++
> >  tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.inf |  41 ++++++
> >  tests/uefi-test-tools/UefiTestToolsPkg/Include/Guid/BiosTablesTest.h     |  67 +++++++++
> >  tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dec              |  27 ++++
> >  tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dsc              |  69 ++++++++++
> >  tests/uefi-test-tools/build.sh                                           | 145 ++++++++++++++++++++
> >  17 files changed, 619 insertions(+), 8 deletions(-)
> >  create mode 160000 roms/edk2
> >  create mode 100644 tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2
> >  create mode 100644 tests/data/uefi-boot-images/bios-tables-test.arm.iso.qcow2
> >  create mode 100644 tests/data/uefi-boot-images/bios-tables-test.i386.iso.qcow2
> >  create mode 100644 tests/data/uefi-boot-images/bios-tables-test.x86_64.iso.qcow2
> >  create mode 100644 tests/uefi-test-tools/.gitignore
> >  create mode 100644 tests/uefi-test-tools/LICENSE
> >  create mode 100644 tests/uefi-test-tools/Makefile
> >  create mode 100644 tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.c
> >  create mode 100644 tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.inf
> >  create mode 100644 tests/uefi-test-tools/UefiTestToolsPkg/Include/Guid/BiosTablesTest.h
> >  create mode 100644 tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dec
> >  create mode 100644 tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dsc
> >  create mode 100755 tests/uefi-test-tools/build.sh
> > 

Re: [Qemu-devel] [PATCH v2 4/5] tests/uefi-test-tools: add build scripts

[Laszlo Ersek]

On 01/31/19 19:55, Laszlo Ersek wrote:
> On 01/31/19 18:07, Philippe Mathieu-Daudé wrote:
>> On 1/24/19 9:39 PM, Laszlo Ersek wrote:

>>> +# "build.sh" invokes the "build" utility of edk2 BaseTools. In any given edk2
>>> +# workspace, at most one "build" instance may be operating at a time. Therefore
>>> +# we must serialize the rebuilding of targets in this Makefile.
>>> +.NOTPARALLEL:
>>
>> Well this doesn't seem to improve my case :|
>>
>> You can test with:
>>
>> $ alias make='make -j8 -l7.5'
>>
>> So you get:
>>
>> $ make print-MAKEFLAGS
>> MAKEFLAGS=rR -j8 -l7.5 --jobserver-auth=3,4
>
> I get something different (with make-3.82-23.el7.x86_64):
>
> MAKEFLAGS=Rrl 7.5 - --jobserver-fds=3,4 -j
>
> Notably, the argument 8 of "-j" is dropped.
>
> Anyway, I think this is a side topic.
>
>
>> and this command fails:
>>
>> $ make -C tests/uefi-test-tools Build/bios-tables-test.x86_64.efi
>
> (1) How *exactly* does it fail for you?
>
> (2) What operating system and "make" are you using?
>
> Because, the command completes perfectly fine for me. (Just for this
> test, I rebased the v2 branch on top of current master, i.e. commit
> aefcd2836620, and re-tested there.)
>
> (3) Also, did you update all submodules first? (git submodule update
> --init --force)
>
> (4) IMPORTANT: did you make sure you didn't have an earlier
> *mis-built* BaseTools directory in the submodule? For that, run "make
> clean" in the QEMU project root. Note that "git clean -ffdx" will
> *not* clean submodules, when issued from the QEMU project root.

I've found the issue myself, through using an up to date Fedora 29 guest
for the build.

(a) On RHEL7, I got "make-3.82-23.el7.x86_64". On Fedora 29, it's
"make-4.2.1-10.fc29.x86_64". Note in particular "4.2", on Fedora.

(b) In the earlier discussion on help-make
<http://lists.gnu.org/archive/html/help-make/2019-01/msg00004.html>,
Paul Smith responded to me,

On 01/23/19 14:45, Paul Smith wrote:
> On Wed, 2019-01-23 at 11:24 +0100, Laszlo Ersek wrote:
>> In particular, "--jobserver-fds" is not documented in end-user
>> documentation, apparently, so I get a feeling this option could
>> change at any time, as an implementation detail of distributing jobs.
>
> In fact it DID change, in GNU make 4.2, to be --jobserver-auth.  At
> the same time this new option was published in the documentation and
> made an official part of the GNU make interface.

(c) That is, the version bump from RHEL7's make to Fedora29's make
triggered, in our testing, this change. This explains why

  make print-MAKEFLAGS

printed

  MAKEFLAGS=rR -j8 -l7.5 --jobserver-auth=3,4

for you, and returned

  MAKEFLAGS=Rrl 7.5 - --jobserver-fds=3,4 -j

for me.

(d) The build *indeed* fails on Fedora29, with the following obscure
error:

> make[1]: *** read jobs pipe: Bad file descriptor.  Stop.
> make[1]: *** Waiting for unfinished jobs....

(e) The documentation that Paul referenced, after I found it, provided
the critical hint.

https://www.gnu.org/software/make/manual/html_node/POSIX-Jobserver.html

> If your tool determines that the --jobserver-auth option is available
> in MAKEFLAGS but that the file descriptors specified are closed, this
> means that the calling make process did not think that your tool was a
> recursive make invocation (e.g., the command line was not prefixed
> with a + character). [...]

This means that the inner (= edk2's) make process inherits the
"--jobserver-auth=3,4" option from the outer (= qemu's) make process,
through the MAKEFLAGS variable. However, it does not inherit the file
descriptors themselves! And the reason is that the outer make does not
believe that the recipe that invokes "build.sh" is in fact an (indirect)
recursive make invocation. Therefore the outer make never bothers
passing down the file descriptors for the jobserver pipe.

The documentation writes,

> [...] only command lines that make understands to be recursive
> invocations of make [...] will have access to the jobserver. When
> writing makefiles you must be sure to mark the command as recursive
> (most commonly by prefixing the command line with the + indicator
> [...]

(Also:

> Using the MAKE variable has the same effect as using a '+' character
> at the beginning of the recipe line.

This is why an explicit "+" is needed only infrequently; most recursive
invocations are performed via $(MAKE), and the outer make recognizes
that automatically).

(f) So, the solution is to prefix the "./build.sh" recipe with a "+"
sign, to mark it as "recursive":

> diff --git a/tests/uefi-test-tools/Makefile b/tests/uefi-test-tools/Makefile
> index 61d263861e..449b81d8ba 100644
> --- a/tests/uefi-test-tools/Makefile
> +++ b/tests/uefi-test-tools/Makefile
> @@ -87,7 +87,7 @@ Build/%.fat: Build/%.efi
>  .NOTPARALLEL:
>
>  Build/bios-tables-test.%.efi: build-edk2-tools
> -	./build.sh $(edk2_dir) BiosTablesTest $* $@
> +	+./build.sh $(edk2_dir) BiosTablesTest $* $@
>
>  build-edk2-tools:
>  	$(MAKE) -C $(edk2_dir)/BaseTools

This fixes the issue for me on Fedora 29, without breaking the behavior
on RHEL7.

I'll submit v3 later. Thank you for catching this error.

Laszlo

Re: [Qemu-devel] [PATCH v2 4/5] tests/uefi-test-tools: add build scripts

[Philippe Mathieu-Daudé]

On 2/1/19 11:35 PM, Laszlo Ersek wrote:
> On 01/31/19 19:55, Laszlo Ersek wrote:
>> On 01/31/19 18:07, Philippe Mathieu-Daudé wrote:
>>> On 1/24/19 9:39 PM, Laszlo Ersek wrote:
> 
>>>> +# "build.sh" invokes the "build" utility of edk2 BaseTools. In any given edk2
>>>> +# workspace, at most one "build" instance may be operating at a time. Therefore
>>>> +# we must serialize the rebuilding of targets in this Makefile.
>>>> +.NOTPARALLEL:
>>>
>>> Well this doesn't seem to improve my case :|
>>>
>>> You can test with:
>>>
>>> $ alias make='make -j8 -l7.5'
>>>
>>> So you get:
>>>
>>> $ make print-MAKEFLAGS
>>> MAKEFLAGS=rR -j8 -l7.5 --jobserver-auth=3,4
>>
>> I get something different (with make-3.82-23.el7.x86_64):
>>
>> MAKEFLAGS=Rrl 7.5 - --jobserver-fds=3,4 -j
>>
>> Notably, the argument 8 of "-j" is dropped.
>>
>> Anyway, I think this is a side topic.
>>
>>
>>> and this command fails:
>>>
>>> $ make -C tests/uefi-test-tools Build/bios-tables-test.x86_64.efi
>>
>> (1) How *exactly* does it fail for you?

In my mailbox the mail appears with Message-ID:
cf693646-58c8-8810-58a1-a6e503636d39@redhat.com in response to
https://lists.gnu.org/archive/html/qemu-devel/2019-01/msg06393.html but
I can't see the mail on the public archives :/

>>
>> (2) What operating system and "make" are you using?
>>
>> Because, the command completes perfectly fine for me. (Just for this
>> test, I rebased the v2 branch on top of current master, i.e. commit
>> aefcd2836620, and re-tested there.)
>>
>> (3) Also, did you update all submodules first? (git submodule update
>> --init --force)
>>
>> (4) IMPORTANT: did you make sure you didn't have an earlier
>> *mis-built* BaseTools directory in the submodule? For that, run "make
>> clean" in the QEMU project root. Note that "git clean -ffdx" will
>> *not* clean submodules, when issued from the QEMU project root.
> 
> I've found the issue myself, through using an up to date Fedora 29 guest
> for the build.
> 
> (a) On RHEL7, I got "make-3.82-23.el7.x86_64". On Fedora 29, it's
> "make-4.2.1-10.fc29.x86_64". Note in particular "4.2", on Fedora.
> 
> (b) In the earlier discussion on help-make
> <http://lists.gnu.org/archive/html/help-make/2019-01/msg00004.html>,
> Paul Smith responded to me,
> 
> On 01/23/19 14:45, Paul Smith wrote:
>> On Wed, 2019-01-23 at 11:24 +0100, Laszlo Ersek wrote:
>>> In particular, "--jobserver-fds" is not documented in end-user
>>> documentation, apparently, so I get a feeling this option could
>>> change at any time, as an implementation detail of distributing jobs.
>>
>> In fact it DID change, in GNU make 4.2, to be --jobserver-auth.  At
>> the same time this new option was published in the documentation and
>> made an official part of the GNU make interface.
> 
> (c) That is, the version bump from RHEL7's make to Fedora29's make
> triggered, in our testing, this change. This explains why
> 
>   make print-MAKEFLAGS
> 
> printed
> 
>   MAKEFLAGS=rR -j8 -l7.5 --jobserver-auth=3,4
> 
> for you, and returned
> 
>   MAKEFLAGS=Rrl 7.5 - --jobserver-fds=3,4 -j
> 
> for me.
> 
> (d) The build *indeed* fails on Fedora29, with the following obscure
> error:
> 
>> make[1]: *** read jobs pipe: Bad file descriptor.  Stop.
>> make[1]: *** Waiting for unfinished jobs....

Yes, this is the problem.

> 
> (e) The documentation that Paul referenced, after I found it, provided
> the critical hint.
> 
> https://www.gnu.org/software/make/manual/html_node/POSIX-Jobserver.html
> 
>> If your tool determines that the --jobserver-auth option is available
>> in MAKEFLAGS but that the file descriptors specified are closed, this
>> means that the calling make process did not think that your tool was a
>> recursive make invocation (e.g., the command line was not prefixed
>> with a + character). [...]

o_O
Cc'ing Paolo and Eric who seems to like that kind of makefile black magic.

> This means that the inner (= edk2's) make process inherits the
> "--jobserver-auth=3,4" option from the outer (= qemu's) make process,
> through the MAKEFLAGS variable. However, it does not inherit the file
> descriptors themselves! And the reason is that the outer make does not
> believe that the recipe that invokes "build.sh" is in fact an (indirect)
> recursive make invocation. Therefore the outer make never bothers
> passing down the file descriptors for the jobserver pipe.

Yes!

> 
> The documentation writes,
> 
>> [...] only command lines that make understands to be recursive
>> invocations of make [...] will have access to the jobserver. When
>> writing makefiles you must be sure to mark the command as recursive
>> (most commonly by prefixing the command line with the + indicator
>> [...]
> 
> (Also:
> 
>> Using the MAKE variable has the same effect as using a '+' character
>> at the beginning of the recipe line.
> 
> This is why an explicit "+" is needed only infrequently; most recursive
> invocations are performed via $(MAKE), and the outer make recognizes
> that automatically).
> 
> (f) So, the solution is to prefix the "./build.sh" recipe with a "+"
> sign, to mark it as "recursive":
> 
>> diff --git a/tests/uefi-test-tools/Makefile b/tests/uefi-test-tools/Makefile
>> index 61d263861e..449b81d8ba 100644
>> --- a/tests/uefi-test-tools/Makefile
>> +++ b/tests/uefi-test-tools/Makefile
>> @@ -87,7 +87,7 @@ Build/%.fat: Build/%.efi
>>  .NOTPARALLEL:
>>
>>  Build/bios-tables-test.%.efi: build-edk2-tools
>> -	./build.sh $(edk2_dir) BiosTablesTest $* $@
>> +	+./build.sh $(edk2_dir) BiosTablesTest $* $@

Yes :) This fixed it!

>>
>>  build-edk2-tools:
>>  	$(MAKE) -C $(edk2_dir)/BaseTools
> 
> This fixes the issue for me on Fedora 29, without breaking the behavior
> on RHEL7.

Excellent! I triggered Travis builds (Ubuntu/Debian).

> 
> I'll submit v3 later. Thank you for catching this error.

Now that we are happy, maybe Michael can do this change when applying,
but I guess you'd prefer first to write a line about this '+' in the
commit message or the Makefile.

With the +:
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Thanks a lot for figuring this out alone and fixing it!

Phil.

Re: [Qemu-devel] [PATCH v2 4/5] tests/uefi-test-tools: add build scripts

[Laszlo Ersek]

On 02/02/19 00:03, Philippe Mathieu-Daudé wrote:
> On 2/1/19 11:35 PM, Laszlo Ersek wrote:
>> On 01/31/19 19:55, Laszlo Ersek wrote:

>>> (1) How *exactly* does it fail for you?
> 
> In my mailbox the mail appears with Message-ID:
> cf693646-58c8-8810-58a1-a6e503636d39@redhat.com in response to
> https://lists.gnu.org/archive/html/qemu-devel/2019-01/msg06393.html but
> I can't see the mail on the public archives :/

Ouch. I've now searched my mailbox for the Message-ID above, and there's
no match. Too bad your email got lost.

>> (f) So, the solution is to prefix the "./build.sh" recipe with a "+"
>> sign, to mark it as "recursive":
>>
>>> diff --git a/tests/uefi-test-tools/Makefile b/tests/uefi-test-tools/Makefile
>>> index 61d263861e..449b81d8ba 100644
>>> --- a/tests/uefi-test-tools/Makefile
>>> +++ b/tests/uefi-test-tools/Makefile
>>> @@ -87,7 +87,7 @@ Build/%.fat: Build/%.efi
>>>  .NOTPARALLEL:
>>>
>>>  Build/bios-tables-test.%.efi: build-edk2-tools
>>> -	./build.sh $(edk2_dir) BiosTablesTest $* $@
>>> +	+./build.sh $(edk2_dir) BiosTablesTest $* $@
> 
> Yes :) This fixed it!
> 
>>>
>>>  build-edk2-tools:
>>>  	$(MAKE) -C $(edk2_dir)/BaseTools
>>
>> This fixes the issue for me on Fedora 29, without breaking the behavior
>> on RHEL7.
> 
> Excellent! I triggered Travis builds (Ubuntu/Debian).
> 
>>
>> I'll submit v3 later. Thank you for catching this error.
> 
> Now that we are happy, maybe Michael can do this change when applying,
> but I guess you'd prefer first to write a line about this '+' in the
> commit message or the Makefile.

That's right, I'd like to extend the comment that we already have in the
Makefile about .NOTPARALLEL, with a note on the "+" indicator.

> 
> With the +:
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Awesome, thank you! :)

> 
> Thanks a lot for figuring this out alone and fixing it!

It definitely helped that you mentioned your use of Fedora 29 earlier :)

Also, we're very lucky that GNU Make's documentation is so nice.

Thanks,
Laszlo

Re: [Qemu-devel] [PATCH v2 0/5] add the BiosTablesTest UEFI app, build it with the new roms/edk2 submodule

[Laszlo Ersek]

On 02/01/19 23:24, Michael S. Tsirkin wrote:
> On Thu, Jan 31, 2019 at 03:23:50PM +0100, Laszlo Ersek wrote:
>> On 01/24/19 21:39, Laszlo Ersek wrote:
>>> Previous version (v1):
>>> http://mid.mail-archive.com/20190118223400.24311-1-lersek@redhat.com
>>>
>>> Updates in v2 have been noted on each patch in the series.
>>
>> ping
> 
> Oh sorry I noticed Philippe reported some failures with this patchset.
> Can you guys pls get to the bottom of it?

Right, we've now got all the info that's needed for me to submit v3.
What's still necessary is a good amount of sleep. :)

> I don't want everyone to suffer.

Thankfully, this Makefile could only cause a handful of maintainers to
suffer, and only if they decided to rebuild the ACPI-test-helper
UEFI-bootable ISO images :) The normal QEMU build (including the test
suite run) doesn't go near this stuff. The usage pattern is the same as
when Gerd manually rebuilds the iPXE oproms.

Thanks,
Laszlo

Re: [Qemu-devel] [PATCH v2 4/5] tests/uefi-test-tools: add build scripts

[Philippe Mathieu-Daudé]

On 2/2/19 12:27 AM, Laszlo Ersek wrote:
> On 02/02/19 00:03, Philippe Mathieu-Daudé wrote:
>> On 2/1/19 11:35 PM, Laszlo Ersek wrote:
>>> On 01/31/19 19:55, Laszlo Ersek wrote:
[...]
>>> (f) So, the solution is to prefix the "./build.sh" recipe with a "+"
>>> sign, to mark it as "recursive":
>>>
>>>> diff --git a/tests/uefi-test-tools/Makefile b/tests/uefi-test-tools/Makefile
>>>> index 61d263861e..449b81d8ba 100644
>>>> --- a/tests/uefi-test-tools/Makefile
>>>> +++ b/tests/uefi-test-tools/Makefile
>>>> @@ -87,7 +87,7 @@ Build/%.fat: Build/%.efi
>>>>  .NOTPARALLEL:
>>>>
>>>>  Build/bios-tables-test.%.efi: build-edk2-tools
>>>> -	./build.sh $(edk2_dir) BiosTablesTest $* $@
>>>> +	+./build.sh $(edk2_dir) BiosTablesTest $* $@
>>
>> Yes :) This fixed it!
>>
>>>>
>>>>  build-edk2-tools:
>>>>  	$(MAKE) -C $(edk2_dir)/BaseTools
>>>
>>> This fixes the issue for me on Fedora 29, without breaking the behavior
>>> on RHEL7.
>>
>> Excellent! I triggered Travis builds (Ubuntu/Debian).

FYI, everthing build fine there.

>>>
>>> I'll submit v3 later. Thank you for catching this error.
[...]