[PATCH] ArmVirtPkg: do not enable iSCSI driver by default


Ard Biesheuvel
 

The iSCSI driver slows down the boot on a pristine variable store flash
image, as it creates a couple of large EFI non-volatile variables to
preserve state between boots.

Since iSCSI boot for VMs is kind of niche anyway, let's default to
disabled. If someone needs it in their build, they can use the -D build
command option to re-enable it on the fly.

Signed-off-by: Ard Biesheuvel <ardb@...>
---
ArmVirtPkg/ArmVirtQemu.dsc | 1 -
ArmVirtPkg/ArmVirtQemuKernel.dsc | 1 -
2 files changed, 2 deletions(-)

diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index 9369a88858fd..45c4a8fc84e0 100644
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -40,7 +40,6 @@ [Defines]
DEFINE NETWORK_SNP_ENABLE =3D FALSE=0D
DEFINE NETWORK_TLS_ENABLE =3D FALSE=0D
DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS =3D TRUE=0D
- DEFINE NETWORK_ISCSI_ENABLE =3D TRUE=0D
=0D
!if $(NETWORK_SNP_ENABLE) =3D=3D TRUE=0D
!error "NETWORK_SNP_ENABLE is IA32/X64/EBC only"=0D
diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKerne=
l.dsc
index 7f7d15d6eee3..66039f07f41b 100644
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -38,7 +38,6 @@ [Defines]
DEFINE NETWORK_SNP_ENABLE =3D FALSE=0D
DEFINE NETWORK_TLS_ENABLE =3D FALSE=0D
DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS =3D TRUE=0D
- DEFINE NETWORK_ISCSI_ENABLE =3D TRUE=0D
=0D
!if $(NETWORK_SNP_ENABLE) =3D=3D TRUE=0D
!error "NETWORK_SNP_ENABLE is IA32/X64/EBC only"=0D
--=20
2.35.1


Gerd Hoffmann
 

Hi,

--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -40,7 +40,6 @@ [Defines]
DEFINE NETWORK_SNP_ENABLE = FALSE
DEFINE NETWORK_TLS_ENABLE = FALSE
DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS = TRUE
- DEFINE NETWORK_ISCSI_ENABLE = TRUE
How about leaving the line there, but set it to FALSE?
Makes the option more discover-able.

Also what about OvmfPkg ? I think it makes sense to keep ovmf + armvirt
in sync here.

take care,
Gerd