qemu: runtime: build variable for disable_image_nvdimm=true

Allow users to build using DEFDISABLEIMAGENVDIMM=true if they
want to set disable_image_nvdimm=true in configuration-qemu*.toml.

disable_image_nvdimm=false is the default configuration value.

Note that the value of disable_image_nvdimm gets ignored for
platforms using "confidential_guest = true".

Signed-off-by: Dan Mihai <dmihai@microsoft.com>

src/runtime/Makefile

@@ -272,6 +272,8 @@ DEFSANDBOXCGROUPONLY ?= false
 DEFSTATICRESOURCEMGMT ?= false
 DEFSTATICRESOURCEMGMT_TEE = true
 
+DEFDISABLEIMAGENVDIMM ?= false
+
 DEFBINDMOUNTS := []
 
 # Create Container Timeout in seconds
@@ -759,6 +761,7 @@ USER_VARS += DEFFORCEGUESTPULL
 USER_VARS += DEFVFIOMODE
 USER_VARS += DEFVFIOMODE_SE
 USER_VARS += BUILDFLAGS
+USER_VARS += DEFDISABLEIMAGENVDIMM
 
 
 V              = @

src/runtime/config/configuration-qemu-coco-dev.toml.in

@@ -358,9 +358,7 @@ pflashes = []
 # Otherwise virtio-block device is used.
 #
 # nvdimm is not supported when `confidential_guest = true`.
-#
+disable_image_nvdimm = @DEFDISABLEIMAGENVDIMM@
-# Default is false
-#disable_image_nvdimm = true
 
 # Enable hot-plugging of VFIO devices to a bridge-port, 
 # root-port or switch-port. 

src/runtime/config/configuration-qemu-nvidia-gpu-snp.toml.in

@@ -352,9 +352,7 @@ pflashes = []
 # Otherwise virtio-block device is used.
 #
 # nvdimm is not supported when `confidential_guest = true`.
-#
+disable_image_nvdimm = @DEFDISABLEIMAGENVDIMM@
-# Default is false
-#disable_image_nvdimm = true
 
 # Before hot plugging a PCIe device, you need to add a pcie_root_port device.
 # Use this parameter when using some large PCI bar devices, such as Nvidia GPU

src/runtime/config/configuration-qemu-nvidia-gpu-tdx.toml.in

@@ -336,9 +336,7 @@ pflashes = []
 # Otherwise virtio-block device is used.
 #
 # nvdimm is not supported when `confidential_guest = true`.
-#
+disable_image_nvdimm = @DEFDISABLEIMAGENVDIMM@
-# Default is false
-#disable_image_nvdimm = true
 
 # Before hot plugging a PCIe device, you need to add a pcie_root_port device.
 # Use this parameter when using some large PCI bar devices, such as Nvidia GPU

src/runtime/config/configuration-qemu-nvidia-gpu.toml.in

@@ -356,9 +356,7 @@ pflashes = []
 # Otherwise virtio-block device is used.
 #
 # nvdimm is not supported when `confidential_guest = true`.
-#
+disable_image_nvdimm = @DEFDISABLEIMAGENVDIMM@
-# Default is false
-#disable_image_nvdimm = true
 
 # Enable hot-plugging of VFIO devices to a bridge-port, 
 # root-port or switch-port. 

src/runtime/config/configuration-qemu-se.toml.in

@@ -322,9 +322,7 @@ pflashes = []
 # Otherwise virtio-block device is used.
 #
 # nvdimm is not supported when `confidential_guest = true`.
-#
+disable_image_nvdimm = @DEFDISABLEIMAGENVDIMM@
-# Default is false
-#disable_image_nvdimm = true
 
 # Enable hot-plugging of VFIO devices to a bridge-port,
 # root-port or switch-port.

src/runtime/config/configuration-qemu-sev.toml.in

@@ -306,9 +306,7 @@ pflashes = []
 # Otherwise virtio-block device is used.
 #
 # nvdimm is not supported when `confidential_guest = true`.
-#
+disable_image_nvdimm = @DEFDISABLEIMAGENVDIMM@
-# Default is false
-#disable_image_nvdimm = true
 
 # Before hot plugging a PCIe device, you need to add a pcie_root_port device.
 # Use this parameter when using some large PCI bar devices, such as Nvidia GPU

src/runtime/config/configuration-qemu-snp.toml.in

@@ -352,9 +352,7 @@ disable_nesting_checks = true
 # Otherwise virtio-block device is used.
 #
 # nvdimm is not supported when `confidential_guest = true`.
-#
+disable_image_nvdimm = @DEFDISABLEIMAGENVDIMM@
-# Default is false
-#disable_image_nvdimm = true
 
 # Before hot plugging a PCIe device, you need to add a pcie_root_port device.
 # Use this parameter when using some large PCI bar devices, such as Nvidia GPU

src/runtime/config/configuration-qemu-tdx.toml.in

@@ -337,9 +337,7 @@ pflashes = []
 # Otherwise virtio-block device is used.
 #
 # nvdimm is not supported when `confidential_guest = true`.
-#
+disable_image_nvdimm = @DEFDISABLEIMAGENVDIMM@
-# Default is false
-#disable_image_nvdimm = true
 
 # Before hot plugging a PCIe device, you need to add a pcie_root_port device.
 # Use this parameter when using some large PCI bar devices, such as Nvidia GPU

src/runtime/config/configuration-qemu.toml.in

@@ -357,9 +357,7 @@ pflashes = []
 # Otherwise virtio-block device is used.
 #
 # nvdimm is not supported when `confidential_guest = true`.
-#
+disable_image_nvdimm = @DEFDISABLEIMAGENVDIMM@
-# Default is false
-#disable_image_nvdimm = true
 
 # Enable hot-plugging of VFIO devices to a bridge-port, 
 # root-port or switch-port.