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

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

[Laszlo Ersek]

Igor's series

  [Qemu-devel] [PATCH 00/14] tests: acpi: add UEFI (ARM) testing support
  http://mid.mail-archive.com/1547566866-129386-1-git-send-email-imammedo@redhat.com

worked with my edk2 (guest firmware) series

  [edk2] [PATCH 0/4] OvmfPkg, ArmVirtPkg: add ACPI Test Support
  http://mid.mail-archive.com/20181125100152.25675-1-lersek@redhat.com

as long as the guest firmware was built with the necessary extra build
flag.

However, in the discussion under Igor's series, we seemed to reconsider
a standalone UEFI application for the QEMU tree to carry. This series
seeks to implement that option.

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                                           |  92 +++++++++++++
 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, 614 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 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>
---
 Makefile    | 6 +++++-
 .gitmodules | 3 +++
 roms/edk2   | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index dccba1dca27f..1f768e2bcf8f 100644
--- a/Makefile
+++ b/Makefile
@@ -602,7 +602,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 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>
---
 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 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:
    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 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>
---
 tests/uefi-test-tools/Makefile   |  92 +++++++++++++
 tests/uefi-test-tools/.gitignore |   3 +
 tests/uefi-test-tools/build.sh   | 145 ++++++++++++++++++++
 3 files changed, 240 insertions(+)

diff --git a/tests/uefi-test-tools/Makefile b/tests/uefi-test-tools/Makefile
new file mode 100644
index 000000000000..7b6dd227e433
--- /dev/null
+++ b/tests/uefi-test-tools/Makefile
@@ -0,0 +1,92 @@
+# 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/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 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:
    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..fa2cf9291215c2fce59e526e1147be950cdce818
GIT binary patch
literal 11776
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
YB7nmK%e*8`^`$z5|HrM>|1a?00M!mU9smFU

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..c83358f2367630e6a6b499ac26c1628dab2b0aff
GIT binary patch
literal 11776
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%0AyhUK)*N
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
S2p;@zKYsqp)75`|`hNhrT|}P%

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..2d897a221010607a5e48de4f2d8cc84024c5eae3
GIT binary patch
literal 12800
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

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..e38ec57e7f391814ab924fdc27e6917d341f652d
GIT binary patch
literal 13312
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
LPjddh-u{09w(Wq>

literal 0
HcmV?d00001

-- 
2.19.1.3.g30247aa5d201

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

[Gerd Hoffmann]

On Fri, Jan 18, 2019 at 11:33:56PM +0100, 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.

Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>

> 
> 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>
> ---
>  Makefile    | 6 +++++-
>  .gitmodules | 3 +++
>  roms/edk2   | 1 +
>  3 files changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git a/Makefile b/Makefile
> index dccba1dca27f..1f768e2bcf8f 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -602,7 +602,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
> 
> 

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

[Gerd Hoffmann]

On Fri, Jan 18, 2019 at 11:33:57PM +0100, Laszlo Ersek wrote:
> 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>

> ---
>  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
> 
> 

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

[Philippe Mathieu-Daudé]

Cc'ing Daniel & Alex.

On 1/18/19 11:33 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>
> ---
>  Makefile    | 6 +++++-
>  .gitmodules | 3 +++
>  roms/edk2   | 1 +
>  3 files changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git a/Makefile b/Makefile
> index dccba1dca27f..1f768e2bcf8f 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -602,7 +602,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 \

Hmm I never try in-tree builds and thought this rule was for the
archived release out of git, so this wouldn't matter.

> +		-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

Indeed this is enough to build EfiRom.
However if you want to build firmwares (your patch 4/5), the submodule
is incomplete, until you manually run "submodule update --init --recursive".

I suggest the following change, Daniel/Alex what do you think?

-- >8 --
diff --git a/scripts/git-submodule.sh b/scripts/git-submodule.sh
index 98ca0f2737..5441fe3385 100755
--- a/scripts/git-submodule.sh
+++ b/scripts/git-submodule.sh
@@ -71,7 +71,7 @@ update)
         exit 0
     fi

-    $GIT submodule update --init $modules 1>/dev/null
+    $GIT submodule update --init --recursive $modules 1>/dev/null
     test $? -ne 0 && error "failed to update modules"

     $GIT submodule status $modules > "${substat}"
---

> 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 2/5] roms: build the EfiRom utility from the roms/edk2 submodule

[Philippe Mathieu-Daudé]

Hi Laszlo,

On 1/18/19 11:33 PM, Laszlo Ersek wrote:
> 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>
> ---
>  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

Since this is a single tool/file, can we simply use:

        $(MAKE) -C edk2/BaseTools/Source/C/EfiRom

>  
>  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

Ditto.

>  	$(MAKE) -C SLOF clean
>  	rm -rf u-boot/build.e500
>  	$(MAKE) -C u-boot-sam460ex distclean
> 

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

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

[Philippe Mathieu-Daudé]

On 1/21/19 12:27 PM, Philippe Mathieu-Daudé wrote:
> Hi Laszlo,
> 
> On 1/18/19 11:33 PM, Laszlo Ersek wrote:
>> 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>
>> ---
>>  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
> 
> Since this is a single tool/file, can we simply use:
> 
>         $(MAKE) -C edk2/BaseTools/Source/C/EfiRom

Also, note that this doesn't work for out-of-tree builds, but this
problem is pre-existent to your series.

> 
>>  
>>  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
> 
> Ditto.
> 
>>  	$(MAKE) -C SLOF clean
>>  	rm -rf u-boot/build.e500
>>  	$(MAKE) -C u-boot-sam460ex distclean
>>
> 
> Whichever path used:
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> 

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

[Philippe Mathieu-Daudé]

Hi Laszlo,

On 1/18/19 11:33 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>
> ---
>  tests/uefi-test-tools/Makefile   |  92 +++++++++++++
>  tests/uefi-test-tools/.gitignore |   3 +
>  tests/uefi-test-tools/build.sh   | 145 ++++++++++++++++++++
>  3 files changed, 240 insertions(+)
> 
> diff --git a/tests/uefi-test-tools/Makefile b/tests/uefi-test-tools/Makefile
> new file mode 100644
> index 000000000000..7b6dd227e433
> --- /dev/null
> +++ b/tests/uefi-test-tools/Makefile
> @@ -0,0 +1,92 @@
> +# 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/bios-tables-test.%.efi: build-edk2-tools
> +	./build.sh $(edk2_dir) BiosTablesTest $* $@
> +
> +build-edk2-tools:
> +	$(MAKE) -C $(edk2_dir)/BaseTools
> +
[...]

I got errors [1] and [2] I couldn't figure out while running 'make -j4'.

The following patch didn't help, any idea?

-- >8 --
diff --git a/tests/uefi-test-tools/Makefile b/tests/uefi-test-tools/Makefile
index 7b6dd227e4..798c55c823 100644
--- a/tests/uefi-test-tools/Makefile
+++ b/tests/uefi-test-tools/Makefile
@@ -81,6 +81,8 @@ Build/%.fat: Build/%.efi
 # component name from the edk2 platform DSC file (such as
"BiosTablesTest") is
 # explicit in each rule.

+.NOTPARALLEL: $(foreach
target,$(emulation_targets),Build/bios-tables-test.$(target).efi)
+
 Build/bios-tables-test.%.efi: build-edk2-tools
        ./build.sh $(edk2_dir) BiosTablesTest $* $@

diff --git a/tests/uefi-test-tools/build.sh b/tests/uefi-test-tools/build.sh
index 155cb75c4d..13891a7385 100755
--- a/tests/uefi-test-tools/build.sh
+++ b/tests/uefi-test-tools/build.sh
@@ -133,6 +133,7 @@ esac
 # Build the UEFI binary
 mkdir -p log
 build \
+  -n 1 \
   --arch="$edk2_arch" \
   --buildtarget=DEBUG \
   --platform=UefiTestToolsPkg/UefiTestToolsPkg.dsc \
---

Anyway building using "make -j1" works.

[1]:

    Building ...
qemu/roms/edk2/ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
[ARM]
    make[1]: Entering directory
'qemu/tests/uefi-test-tools/Build/UefiTestTools/DEBUG_GCC5/ARM/ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib'
    "arm-linux-gnu-gcc" -mthumb -march=armv7-a -E -x assembler-with-cpp
-include
qemu/tests/uefi-test-tools/Build/UefiTestTools/DEBUG_GCC5/ARM/ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib/DEBUG/AutoGen.h
-Iqemu/roms/edk2/ArmPkg/Library/CompilerIntrinsicsLib/Arm
-Iqemu/roms/edk2/ArmPkg/Library/CompilerIntrinsicsLib
-Iqemu/tests/uefi-test-tools/Build/UefiTestTools/DEBUG_GCC5/ARM/ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib/DEBUG
-Iqemu/roms/edk2/MdePkg -Iqemu/roms/edk2/MdePkg/Include
-Iqemu/roms/edk2/MdePkg/Include/Arm -Iqemu/roms/edk2/ArmPkg
-Iqemu/roms/edk2/ArmPkg/Include
qemu/roms/edk2/ArmPkg/Library/CompilerIntrinsicsLib/Arm/divsi3.S >
qemu/tests/uefi-test-tools/Build/UefiTestTools/DEBUG_GCC5/ARM/ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib/OUTPUT/Arm/divsi3.i
    make[1]: *** read jobs pipe: Bad file descriptor.  Stop.
    make[1]: *** Waiting for unfinished jobs....
    build.py...
     : error 7000: Failed to execute command
        make tbuild
[qemu/tests/uefi-test-tools/Build/UefiTestTools/DEBUG_GCC5/ARM/ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib]


    build.py...
     : error F002: Failed to build module

qemu/roms/edk2/ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
[ARM, GCC5, DEBUG]

    - Failed -
    Build end time: 13:08:01, Jan.21 2019
    Build total time: 00:00:02

[2]:

    Active Platform          =
qemu/tests/uefi-test-tools/UefiTestToolsPkg/UefiTestToolsPkg.dsc
    Active Module            =
qemu/tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.inf

    Processing meta-data .

    build.py...
     : error C0DE: Unknown fatal error when processing
[qemu/roms/edk2/MdePkg/MdePkg.dec]

    (Please send email to edk2-devel@lists.01.org for help, attaching
following call stack trace!)

    (Python 2.7.15 on linux2) Traceback (most recent call last):
      File
"qemu/roms/edk2/BaseTools/BinWrappers/PosixLike/../../Source/Python/build/build.py",
line 2494, in Main
        MyBuild.Launch()
      File
"qemu/roms/edk2/BaseTools/BinWrappers/PosixLike/../../Source/Python/build/build.py",
line 2231, in Launch
        self._BuildModule()
      File
"qemu/roms/edk2/BaseTools/BinWrappers/PosixLike/../../Source/Python/build/build.py",
line 1837, in _BuildModule
        self.ModuleFile
      File "qemu/roms/edk2/BaseTools/Source/Python/AutoGen/AutoGen.py",
line 241, in __init__
        self._InitWorker(Workspace, MetaFile, Target, Toolchain, Arch,
*args, **kwargs)
      File "qemu/roms/edk2/BaseTools/Source/Python/AutoGen/AutoGen.py",
line 405, in _InitWorker
        PlatformPcds = Platform.Pcds
      File
"qemu/roms/edk2/BaseTools/Source/Python/Workspace/DscBuildData.py", line
1176, in Pcds
        self._Pcds.update(self._GetPcd(MODEL_PCD_FIXED_AT_BUILD))
      File
"qemu/roms/edk2/BaseTools/Source/Python/Workspace/DscBuildData.py", line
1601, in _GetPcd
        PcdValue, DatumType, MaxDatumSize = self._ValidatePcd(PcdCName,
TokenSpaceGuid, Setting, Type, Dummy4)
      File
"qemu/roms/edk2/BaseTools/Source/Python/Workspace/DscBuildData.py", line
897, in _ValidatePcd
        self._DecPcds, self._GuidDict = GetDeclaredPcd(self, self._Bdb,
self._Arch, self._Target, self._Toolchain, PkgSet)
      File
"qemu/roms/edk2/BaseTools/Source/Python/Workspace/WorkspaceCommon.py",
line 68, in GetDeclaredPcd
        Guids = Pkg.Guids
      File
"qemu/roms/edk2/BaseTools/Source/Python/Workspace/DecBuildData.py", line
262, in Guids
        RecordList = self._RawData[MODEL_EFI_GUID, self._Arch]
      File
"qemu/roms/edk2/BaseTools/Source/Python/Workspace/MetaFileParser.py",
line 249, in __getitem__
        self.Start()
      File
"qemu/roms/edk2/BaseTools/Source/Python/Workspace/MetaFileParser.py",
line 1788, in Start
        0
      File
"qemu/roms/edk2/BaseTools/Source/Python/Workspace/MetaFileParser.py",
line 195, in _Store
        return self._Table.Insert(*Args)
      File
"qemu/roms/edk2/BaseTools/Source/Python/Workspace/MetaFileTable.py",
line 211, in Insert
        Enabled
      File
"qemu/roms/edk2/BaseTools/Source/Python/Workspace/MetaDataTable.py",
line 79, in Insert
        self.Cur.execute(SqlCommand)
    IntegrityError: UNIQUE constraint failed: _1012_3.ID

    - Failed -
    Build end time: 12:44:27, Jan.21 2019
    Build total time: 00:00:02

    make: *** [Makefile:85: Build/bios-tables-test.x86_64.efi] Error 1
    make: *** Waiting for unfinished jobs....

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

[Laszlo Ersek]

On 01/21/19 12:27, Philippe Mathieu-Daudé wrote:
> Hi Laszlo,
> 
> On 1/18/19 11:33 PM, Laszlo Ersek wrote:
>> 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>
>> ---
>>  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
> 
> Since this is a single tool/file, can we simply use:
> 
>         $(MAKE) -C edk2/BaseTools/Source/C/EfiRom

Unfortunately, the BaseTools makefile(s) aren't granular enough for this. They don't track dependencies well enough, at the individual tool level. The above command would fail:

-------
make: Entering directory `/home/lacos/src/upstream/edk2/BaseTools/Source/C/EfiRom'
mkdir ../bin
gcc  -c  -I .. -I ../Include/Common -I ../Include/ -I ../Include/IndustryStandard -I ../Common/ -I .. -I . -I ../Include/X64/  -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-restrict -Wno-unused-result -nostdlib -g -O2  EfiRom.c -o EfiRom.o
gcc -o ../bin/EfiRom   EfiRom.o -L../libs -lCommon
/usr/bin/ld: cannot find -lCommon
collect2: error: ld returned 1 exit status
-------

> 
>>  
>>  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
> 
> Ditto.
> 
>>  	$(MAKE) -C SLOF clean
>>  	rm -rf u-boot/build.e500
>>  	$(MAKE) -C u-boot-sam460ex distclean
>>
> 
> Whichever path used:
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> 

thanks!
Laszlo

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

[Laszlo Ersek]

On 01/21/19 12:37, Philippe Mathieu-Daudé wrote:
> On 1/21/19 12:27 PM, Philippe Mathieu-Daudé wrote:
>> Hi Laszlo,
>>
>> On 1/18/19 11:33 PM, Laszlo Ersek wrote:
>>> 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>
>>> ---
>>>  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
>>
>> Since this is a single tool/file, can we simply use:
>>
>>         $(MAKE) -C edk2/BaseTools/Source/C/EfiRom
> 
> Also, note that this doesn't work for out-of-tree builds, but this
> problem is pre-existent to your series.

Right, "roms/Makefile" is unrelated to building QEMU itself (which is
supposed to work outside of the source tree); it is for maintainers when
they intend to refresh the bundled fw stuff.

Thanks
Laszlo

> 
>>
>>>  
>>>  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
>>
>> Ditto.
>>
>>>  	$(MAKE) -C SLOF clean
>>>  	rm -rf u-boot/build.e500
>>>  	$(MAKE) -C u-boot-sam460ex distclean
>>>
>>
>> Whichever path used:
>> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>>

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

[Laszlo Ersek]

On 01/21/19 12:25, Philippe Mathieu-Daudé wrote:
> Cc'ing Daniel & Alex.
> 
> On 1/18/19 11:33 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>
>> ---
>>  Makefile    | 6 +++++-
>>  .gitmodules | 3 +++
>>  roms/edk2   | 1 +
>>  3 files changed, 9 insertions(+), 1 deletion(-)
>>
>> diff --git a/Makefile b/Makefile
>> index dccba1dca27f..1f768e2bcf8f 100644
>> --- a/Makefile
>> +++ b/Makefile
>> @@ -602,7 +602,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 \
> 
> Hmm I never try in-tree builds and thought this rule was for the
> archived release out of git, so this wouldn't matter.

That's not correct; before I posted the series, I downloaded the
then-latest tarball release, and I saw that the roms/ submoule trees
were flattened into it. Try:

wget -O - -q https://download.qemu.org/qemu-3.1.0.tar.xz \
| tar -t --xz \
| grep roms/

> 
>> +		-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
> 
> Indeed this is enough to build EfiRom.
> However if you want to build firmwares (your patch 4/5), the submodule
> is incomplete, until you manually run "submodule update --init --recursive".

That applies equally to the other submodules (firmware or otherwise)
that we have under roms/. Edk2 is not being added as a nested submodule,
it is a sibling; so whatever tooling covers e.g. roms/seabios and
roms/ipxe, the same tooling should cover roms/edk2 too.

> 
> I suggest the following change, Daniel/Alex what do you think?
> 
> -- >8 --
> diff --git a/scripts/git-submodule.sh b/scripts/git-submodule.sh
> index 98ca0f2737..5441fe3385 100755
> --- a/scripts/git-submodule.sh
> +++ b/scripts/git-submodule.sh
> @@ -71,7 +71,7 @@ update)
>          exit 0
>      fi
> 
> -    $GIT submodule update --init $modules 1>/dev/null
> +    $GIT submodule update --init --recursive $modules 1>/dev/null
>      test $? -ne 0 && error "failed to update modules"
> 
>      $GIT submodule status $modules > "${substat}"
> ---

This shouldn't make a difference, as edk2 is not a nested submodule of
another submodule; it is a submodule directly under the main
superproject, i.e. QEMU.

Thanks,
Laszlo

> 
>> 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 4/5] tests/uefi-test-tools: add build scripts

[Laszlo Ersek]

On 01/21/19 13:17, Philippe Mathieu-Daudé wrote:
> Hi Laszlo,
> 
> On 1/18/19 11:33 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>
>> ---
>>  tests/uefi-test-tools/Makefile   |  92 +++++++++++++
>>  tests/uefi-test-tools/.gitignore |   3 +
>>  tests/uefi-test-tools/build.sh   | 145 ++++++++++++++++++++
>>  3 files changed, 240 insertions(+)
>>
>> diff --git a/tests/uefi-test-tools/Makefile b/tests/uefi-test-tools/Makefile
>> new file mode 100644
>> index 000000000000..7b6dd227e433
>> --- /dev/null
>> +++ b/tests/uefi-test-tools/Makefile
>> @@ -0,0 +1,92 @@
>> +# 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/bios-tables-test.%.efi: build-edk2-tools
>> +	./build.sh $(edk2_dir) BiosTablesTest $* $@
>> +
>> +build-edk2-tools:
>> +	$(MAKE) -C $(edk2_dir)/BaseTools
>> +
> [...]
> 
> I got errors [1] and [2] I couldn't figure out while running 'make -j4'.
> 
> The following patch didn't help, any idea?
> 
> -- >8 --
> diff --git a/tests/uefi-test-tools/Makefile b/tests/uefi-test-tools/Makefile
> index 7b6dd227e4..798c55c823 100644
> --- a/tests/uefi-test-tools/Makefile
> +++ b/tests/uefi-test-tools/Makefile
> @@ -81,6 +81,8 @@ Build/%.fat: Build/%.efi
>  # component name from the edk2 platform DSC file (such as
> "BiosTablesTest") is
>  # explicit in each rule.
> 
> +.NOTPARALLEL: $(foreach
> target,$(emulation_targets),Build/bios-tables-test.$(target).efi)
> +
>  Build/bios-tables-test.%.efi: build-edk2-tools
>         ./build.sh $(edk2_dir) BiosTablesTest $* $@
> 
> diff --git a/tests/uefi-test-tools/build.sh b/tests/uefi-test-tools/build.sh
> index 155cb75c4d..13891a7385 100755
> --- a/tests/uefi-test-tools/build.sh
> +++ b/tests/uefi-test-tools/build.sh
> @@ -133,6 +133,7 @@ esac
>  # Build the UEFI binary
>  mkdir -p log
>  build \
> +  -n 1 \
>    --arch="$edk2_arch" \
>    --buildtarget=DEBUG \
>    --platform=UefiTestToolsPkg/UefiTestToolsPkg.dsc \
> ---

It wasn't clear to me whether and how multi-threaded builds were
supposed to be used by maintainers, whenever they'd update
"tests/data/uefi-boot-images/*".

I saw that "make" was invoked everywhere as $(MAKE), but that didn't
clarify any intent around "-j". So I didn't test "-j" at all, and in
fact I wouldn't have expected it to work:

- At any point in time, there shouldn't be more than one instance of the
"build" base tool working.

- the "build" base tool itself contains some level of support (although
not complete) for parallelizing edk2 module builds: it does not
parallelize the compilation of source files between each other *within*
a single edk2 module (= INF file). It parallelizes modules (INF files)
between each other.

- This means if you build only one module at a time, passing the "-m"
switch (plus an INF file) to the "build" base tool, then there's nothing
to parallelize.

- "build.sh" does pass the "-m" switch to the "build" tool, because I
wanted the build output to be granular. That is, it should be possible
for someone to build just a given uefi-test-tools image for just a given
architecture, if they specify the corresponding pathname (as target)
when they invoke "make". This usage requires the "-m" flag, which in
turn precludes the parallelism built into the "build" base tool itself.
And, invoking multiple "build" instances in parallel is not supposed to
work.


Regarding why ".NOTPARALLEL" doesn't work -- the GNU Make documentation
writes:

  [...]  Any recursively invoked make command will still run recipes in
  parallel (unless its makefile also contains this target). [...]

The "build" base tool in edk2 implements part of the job with generated
makefiles and invoking "make" itself, thus, despite .NOTPARALLEL, it
likely inherits the outermost -j<N> setting -- and it doesn't expect such.

So the best I can offer here is to check $MAKEFLAGS in "build.sh", and
exit with an early, explicit error if $MAKEFLAGS contains "-j", "-l", or
their long variants (--jobs, --load-average).

I realize this would not be acceptable for building QEMU itself, but
"tests/uefi-test-tools/Makefile" should be run by some subsystem
maintainers only, interactively (or in their on custom scripts).

Thanks
Laszlo

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

[Peter Maydell]

On Mon, 21 Jan 2019 at 19:09, Laszlo Ersek <lersek@redhat.com> wrote:
> It wasn't clear to me whether and how multi-threaded builds were
> supposed to be used by maintainers, whenever they'd update
> "tests/data/uefi-boot-images/*".
>
> I saw that "make" was invoked everywhere as $(MAKE), but that didn't
> clarify any intent around "-j". So I didn't test "-j" at all, and in
> fact I wouldn't have expected it to work:

The usual assumption with make is that "-jN" should work
and at least (if the thing being built can't actually
be parallelized usefully) be no worse than if you'd not
specified a -j option. We have occasionally had problems
with -jN in 'make check' (usually because several test cases
were trying to use the same temp filename or similar) but
we've treated them as bugs and squashed them.

> The "build" base tool in edk2 implements part of the job with generated
> makefiles and invoking "make" itself, thus, despite .NOTPARALLEL, it
> likely inherits the outermost -j<N> setting -- and it doesn't expect such.
>
> So the best I can offer here is to check $MAKEFLAGS in "build.sh", and
> exit with an early, explicit error if $MAKEFLAGS contains "-j", "-l", or
> their long variants (--jobs, --load-average).

Could you sanitize MAKEFLAGS in build.sh instead to remove the
parallelization options?

thanks
-- PMM

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

[Philippe Mathieu-Daudé]

On 1/21/19 7:41 PM, Laszlo Ersek wrote:
> On 01/21/19 12:25, Philippe Mathieu-Daudé wrote:
>> Cc'ing Daniel & Alex.
>>
>> On 1/18/19 11:33 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>
>>> ---
>>>  Makefile    | 6 +++++-
>>>  .gitmodules | 3 +++
>>>  roms/edk2   | 1 +
>>>  3 files changed, 9 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/Makefile b/Makefile
>>> index dccba1dca27f..1f768e2bcf8f 100644
>>> --- a/Makefile
>>> +++ b/Makefile
>>> @@ -602,7 +602,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 \
>>
>> Hmm I never try in-tree builds and thought this rule was for the
>> archived release out of git, so this wouldn't matter.
> 
> That's not correct; before I posted the series, I downloaded the
> then-latest tarball release, and I saw that the roms/ submoule trees
> were flattened into it. Try:

My previous sentence is probably incorrect in english, let me reword as:
"I thought (incorrectly) this rule wouldn't matter for in-tree builds".
So I see it does matter, and your change do make sens.

> 
> wget -O - -q https://download.qemu.org/qemu-3.1.0.tar.xz \
> | tar -t --xz \
> | grep roms/
> 
>>
>>> +		-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
>>
>> Indeed this is enough to build EfiRom.
>> However if you want to build firmwares (your patch 4/5), the submodule
>> is incomplete, until you manually run "submodule update --init --recursive".
> 
> That applies equally to the other submodules (firmware or otherwise)
> that we have under roms/. Edk2 is not being added as a nested submodule,
> it is a sibling; so whatever tooling covers e.g. roms/seabios and
> roms/ipxe, the same tooling should cover roms/edk2 too.

OK.

>>
>> I suggest the following change, Daniel/Alex what do you think?
>>
>> -- >8 --
>> diff --git a/scripts/git-submodule.sh b/scripts/git-submodule.sh
>> index 98ca0f2737..5441fe3385 100755
>> --- a/scripts/git-submodule.sh
>> +++ b/scripts/git-submodule.sh
>> @@ -71,7 +71,7 @@ update)
>>          exit 0
>>      fi
>>
>> -    $GIT submodule update --init $modules 1>/dev/null
>> +    $GIT submodule update --init --recursive $modules 1>/dev/null
>>      test $? -ne 0 && error "failed to update modules"
>>
>>      $GIT submodule status $modules > "${substat}"
>> ---
> 
> This shouldn't make a difference, as edk2 is not a nested submodule of
> another submodule; it is a submodule directly under the main
> superproject, i.e. QEMU.

OK (as long as we don't want to build OVMF within QEMU to run QEMU tests).

> 
> Thanks,
> Laszlo
> 
>>
>>> 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 1/5] roms: add the edk2 project as a git submodule

[Laszlo Ersek]

On 01/21/19 20:45, Philippe Mathieu-Daudé wrote:
> On 1/21/19 7:41 PM, Laszlo Ersek wrote:
>> On 01/21/19 12:25, Philippe Mathieu-Daudé wrote:

>>> I suggest the following change, Daniel/Alex what do you think?
>>>
>>> -- >8 --
>>> diff --git a/scripts/git-submodule.sh b/scripts/git-submodule.sh
>>> index 98ca0f2737..5441fe3385 100755
>>> --- a/scripts/git-submodule.sh
>>> +++ b/scripts/git-submodule.sh
>>> @@ -71,7 +71,7 @@ update)
>>>          exit 0
>>>      fi
>>>
>>> -    $GIT submodule update --init $modules 1>/dev/null
>>> +    $GIT submodule update --init --recursive $modules 1>/dev/null
>>>      test $? -ne 0 && error "failed to update modules"
>>>
>>>      $GIT submodule status $modules > "${substat}"
>>> ---
>>
>> This shouldn't make a difference, as edk2 is not a nested submodule of
>> another submodule; it is a submodule directly under the main
>> superproject, i.e. QEMU.
> 
> OK (as long as we don't want to build OVMF within QEMU to run QEMU tests).

I think if / whenever we bundle OVMF binaries with QEMU, there'll be a
two step process (like with other roms); maintainers will (re)build the
binaries and commit/merge them, and tests will use the bundled binaries
as they are.

Thanks
Laszlo

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

[Laszlo Ersek]

On 01/21/19 20:30, Peter Maydell wrote:
> On Mon, 21 Jan 2019 at 19:09, Laszlo Ersek <lersek@redhat.com> wrote:
>> It wasn't clear to me whether and how multi-threaded builds were
>> supposed to be used by maintainers, whenever they'd update
>> "tests/data/uefi-boot-images/*".
>>
>> I saw that "make" was invoked everywhere as $(MAKE), but that didn't
>> clarify any intent around "-j". So I didn't test "-j" at all, and in
>> fact I wouldn't have expected it to work:
> 
> The usual assumption with make is that "-jN" should work
> and at least (if the thing being built can't actually
> be parallelized usefully) be no worse than if you'd not
> specified a -j option. We have occasionally had problems
> with -jN in 'make check' (usually because several test cases
> were trying to use the same temp filename or similar) but
> we've treated them as bugs and squashed them.
> 
>> The "build" base tool in edk2 implements part of the job with generated
>> makefiles and invoking "make" itself, thus, despite .NOTPARALLEL, it
>> likely inherits the outermost -j<N> setting -- and it doesn't expect such.
>>
>> So the best I can offer here is to check $MAKEFLAGS in "build.sh", and
>> exit with an early, explicit error if $MAKEFLAGS contains "-j", "-l", or
>> their long variants (--jobs, --load-average).
> 
> Could you sanitize MAKEFLAGS in build.sh instead to remove the
> parallelization options?

I've looked into MAKEFLAGS in a bit more depth now; both the
documentation and some debug prints. Manipulating MAKEFLAGS looks
somewhat brittle.

So, I was about to suggest that I use the .NOTPARALLEL special target
recommended by Phil, for the .efi binaries (which would ensure that no
two instances of the "build" base tool run at the same time), *plus*
that I submit a patch to edk2 so that the makefiles generated by the
"build" tool also contain .NOTPARALLEL.

(Because, to quote the make docs again, "If .NOTPARALLEL is mentioned as
a target, then this invocation of make will be run serially, even if the
‘-j’ option is given. Any recursively invoked make command will still
run recipes in parallel (unless its makefile also contains this target).")

However: when I wanted to see the actual error from using .NOTPARALLEL
*only* in "tests/uefi-test-tools/Makefile", and not in the
build-generated makefiles, I failed to get any error. All the output
images were built just fine.

Phil: when you wrote that "The following patch didn't help" -- referring
to .NOTPARALLEL, added only to "tests/uefi-test-tools/Makefile"-- , did
you clean your tree first (with "make clean" or "git clean -ffdx")?

Because now I'm thinking that the *individual* makefiles generated by
edk2's "build" base tool might actually compatible with "-j", and your
testing of .NOTPARALLEL failed only because your build tree (for example
the Conf/ subdir -- list it with "-A") was in a messy state from your
previous -j4 attempt (where you didn't use .NOTPARALLEL at all).

Thanks
Laszlo

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

[Laszlo Ersek]

On 01/22/19 13:02, Laszlo Ersek wrote:
> On 01/21/19 20:30, Peter Maydell wrote:
>> On Mon, 21 Jan 2019 at 19:09, Laszlo Ersek <lersek@redhat.com> wrote:
>>> It wasn't clear to me whether and how multi-threaded builds were
>>> supposed to be used by maintainers, whenever they'd update
>>> "tests/data/uefi-boot-images/*".
>>>
>>> I saw that "make" was invoked everywhere as $(MAKE), but that didn't
>>> clarify any intent around "-j". So I didn't test "-j" at all, and in
>>> fact I wouldn't have expected it to work:
>>
>> The usual assumption with make is that "-jN" should work
>> and at least (if the thing being built can't actually
>> be parallelized usefully) be no worse than if you'd not
>> specified a -j option. We have occasionally had problems
>> with -jN in 'make check' (usually because several test cases
>> were trying to use the same temp filename or similar) but
>> we've treated them as bugs and squashed them.
>>
>>> The "build" base tool in edk2 implements part of the job with generated
>>> makefiles and invoking "make" itself, thus, despite .NOTPARALLEL, it
>>> likely inherits the outermost -j<N> setting -- and it doesn't expect such.
>>>
>>> So the best I can offer here is to check $MAKEFLAGS in "build.sh", and
>>> exit with an early, explicit error if $MAKEFLAGS contains "-j", "-l", or
>>> their long variants (--jobs, --load-average).
>>
>> Could you sanitize MAKEFLAGS in build.sh instead to remove the
>> parallelization options?
> 
> I've looked into MAKEFLAGS in a bit more depth now; both the
> documentation and some debug prints. Manipulating MAKEFLAGS looks
> somewhat brittle.
> 
> So, I was about to suggest that I use the .NOTPARALLEL special target
> recommended by Phil, for the .efi binaries (which would ensure that no
> two instances of the "build" base tool run at the same time), *plus*
> that I submit a patch to edk2 so that the makefiles generated by the
> "build" tool also contain .NOTPARALLEL.
> 
> (Because, to quote the make docs again, "If .NOTPARALLEL is mentioned as
> a target, then this invocation of make will be run serially, even if the
> ‘-j’ option is given. Any recursively invoked make command will still
> run recipes in parallel (unless its makefile also contains this target).")
> 
> However: when I wanted to see the actual error from using .NOTPARALLEL
> *only* in "tests/uefi-test-tools/Makefile", and not in the
> build-generated makefiles, I failed to get any error. All the output
> images were built just fine.
> 
> Phil: when you wrote that "The following patch didn't help" -- referring
> to .NOTPARALLEL, added only to "tests/uefi-test-tools/Makefile"-- , did
> you clean your tree first (with "make clean" or "git clean -ffdx")?
> 
> Because now I'm thinking that the *individual* makefiles generated by
> edk2's "build" base tool might actually compatible with "-j", and your
> testing of .NOTPARALLEL failed only because your build tree (for example
> the Conf/ subdir -- list it with "-A") was in a messy state from your
> previous -j4 attempt (where you didn't use .NOTPARALLEL at all).

FWIW, I've asked

- both on edk2-devel, about adding .NOTPARALLEL to the generated inner
makefiles:

  "parallelism in the module-level, generated GNUmakefile's"
  https://lists.01.org/pipermail/edk2-devel/2019-January/035463.html

- and on help-make, about safely filtering the job-related options from
MAKEFLAGS, between the outer and inner "make" processes:

  "filtering job options from MAKEFLAGS, manually"
  http://lists.gnu.org/archive/html/help-make/2019-01/msg00003.html

Thanks
Laszlo

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

[Laszlo Ersek]

On 01/23/19 17:13, Laszlo Ersek wrote:

> FWIW, I've asked
> 
> - both on edk2-devel, about adding .NOTPARALLEL to the generated inner
> makefiles:
> 
>   "parallelism in the module-level, generated GNUmakefile's"
>   https://lists.01.org/pipermail/edk2-devel/2019-January/035463.html
> 
> - and on help-make, about safely filtering the job-related options from
> MAKEFLAGS, between the outer and inner "make" processes:
> 
>   "filtering job options from MAKEFLAGS, manually"
>   http://lists.gnu.org/archive/html/help-make/2019-01/msg00003.html

Results:

- The "build" utility in BaseTools generates such GNUMakefiles that
dependencies between targets are fully described. This is an explicit
goal and if we notice any missing deps, that's a bug to be reported and
fixed. As a consequence, we can expect the recipes in those GNUMakefiles
to be fully parallelizable. Therefore we need not add .NOTPARALLEL to
them (in the edk2 project), or filter MAKEFLAGS, or append "-j1" to
MAKEFLAGS.

- The .NOTPARALLEL target ignores any pre-requisites it gets;
.NOTPARALLEL applies to the entire current invocation of make. Therefore
we just need to stick a bare .NOTPARALLEL into
"tests/uefi-test-tools/Makefile", to keep "build" itself isolated.

I'm going to post v2 with this one addition (i.e., .NOTPARALLEL).

Thanks,
Laszlo