OvmfPkg: Make ResetVector USER_DEFINED

os-d · mergify[bot] · commit fd9e9848ac8e · 2024-11-13T21:01:46.000Z
Following the change in UefiCpuPkg, this moves OvmfPkg's
ResetVectors to USER_DEFINED modules to prevent any
NULL libraries from being linked against them, allowing
for expected behavior from the ResetVector and for
simpler implementation of NULL libraries applied globally.

Signed-off-by: Oliver Smith-Denny &lt;osde@linux.microsoft.com&gt;
diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf
@@ -436,7 +436,7 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
     VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
   }
 
-[Rule.Common.SEC.RESET_VECTOR]
+[Rule.Common.USER_DEFINED.RESET_VECTOR]
   FILE RAW = $(NAMED_GUID) {
     RAW BIN   Align = 16   |.bin
   }
diff --git a/OvmfPkg/Bhyve/BhyveX64.fdf b/OvmfPkg/Bhyve/BhyveX64.fdf
@@ -454,7 +454,7 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
     RAW ASL                |.aml
   }
 
-[Rule.Common.SEC.RESET_VECTOR]
+[Rule.Common.USER_DEFINED.RESET_VECTOR]
   FILE RAW = $(NAMED_GUID) {
     RAW BIN   Align = 16   |.bin
   }
diff --git a/OvmfPkg/Bhyve/ResetVector/ResetVector.inf b/OvmfPkg/Bhyve/ResetVector/ResetVector.inf
@@ -12,7 +12,7 @@
   INF_VERSION                    = 1.29
   BASE_NAME                      = ResetVector
   FILE_GUID                      = 1BA0062E-C779-4582-8566-336AE8F78F09
-  MODULE_TYPE                    = SEC
+  MODULE_TYPE                    = USER_DEFINED
   VERSION_STRING                 = 1.1
 
 #
diff --git a/OvmfPkg/CloudHv/CloudHvX64.fdf b/OvmfPkg/CloudHv/CloudHvX64.fdf
@@ -461,7 +461,7 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
     VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
   }
 
-[Rule.Common.SEC.RESET_VECTOR]
+[Rule.Common.USER_DEFINED.RESET_VECTOR]
   FILE RAW = $(NAMED_GUID) {
     RAW BIN   Align = 16   |.bin
   }
diff --git a/OvmfPkg/IntelTdx/IntelTdxX64.fdf b/OvmfPkg/IntelTdx/IntelTdxX64.fdf
@@ -426,7 +426,7 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
     VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
   }
 
-[Rule.Common.SEC.RESET_VECTOR]
+[Rule.Common.USER_DEFINED.RESET_VECTOR]
   FILE RAW = $(NAMED_GUID) {
     RAW BIN   Align = 16   |.bin
   }
diff --git a/OvmfPkg/Microvm/MicrovmX64.fdf b/OvmfPkg/Microvm/MicrovmX64.fdf
@@ -414,7 +414,7 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
     VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
   }
 
-[Rule.Common.SEC.RESET_VECTOR]
+[Rule.Common.USER_DEFINED.RESET_VECTOR]
   FILE RAW = $(NAMED_GUID) {
     RAW BIN   Align = 16   |.bin
   }
diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
@@ -479,7 +479,7 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
     VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
   }
 
-[Rule.Common.SEC.RESET_VECTOR]
+[Rule.Common.USER_DEFINED.RESET_VECTOR]
   FILE RAW = $(NAMED_GUID) {
     RAW BIN   Align = 16   |.bin
   }
diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -482,7 +482,7 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
     VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
   }
 
-[Rule.Common.SEC.RESET_VECTOR]
+[Rule.Common.USER_DEFINED.RESET_VECTOR]
   FILE RAW = $(NAMED_GUID) {
     RAW BIN   Align = 16   |.bin
   }
diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
@@ -522,7 +522,7 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
     VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
   }
 
-[Rule.Common.SEC.RESET_VECTOR]
+[Rule.Common.USER_DEFINED.RESET_VECTOR]
   FILE RAW = $(NAMED_GUID) {
     RAW BIN   Align = 16   |.bin
   }
diff --git a/OvmfPkg/OvmfXen.fdf b/OvmfPkg/OvmfXen.fdf
@@ -469,7 +469,7 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
     VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
   }
 
-[Rule.Common.SEC.RESET_VECTOR]
+[Rule.Common.USER_DEFINED.RESET_VECTOR]
   FILE RAW = $(NAMED_GUID) {
     RAW BIN   Align = 16   |.bin
   }
diff --git a/OvmfPkg/ResetVector/ResetVector.inf b/OvmfPkg/ResetVector/ResetVector.inf
@@ -11,7 +11,7 @@
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = ResetVector
   FILE_GUID                      = 1BA0062E-C779-4582-8566-336AE8F78F09
-  MODULE_TYPE                    = SEC
+  MODULE_TYPE                    = USER_DEFINED
   VERSION_STRING                 = 1.1
 
 #
diff --git a/OvmfPkg/XenResetVector/XenResetVector.inf b/OvmfPkg/XenResetVector/XenResetVector.inf
@@ -12,7 +12,7 @@
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = XenResetVector
   FILE_GUID                      = 1BA0062E-C779-4582-8566-336AE8F78F09
-  MODULE_TYPE                    = SEC
+  MODULE_TYPE                    = USER_DEFINED
   VERSION_STRING                 = 1.1
 
 #

Original file line number	Diff line number	Diff line change
`@@ -436,7 +436,7 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {`
`436`	`436`	`VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)`
`437`	`437`	`}`
`438`	`438`
`439`		`-[Rule.Common.SEC.RESET_VECTOR]`
	`439`	`+[Rule.Common.USER_DEFINED.RESET_VECTOR]`
`440`	`440`	`FILE RAW = $(NAMED_GUID) {`
`441`	`441`	`RAW BIN Align = 16 \|.bin`
`442`	`442`	`}`
Original file line number	Diff line number	Diff line change
`@@ -454,7 +454,7 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {`
`454`	`454`	`RAW ASL \|.aml`
`455`	`455`	`}`
`456`	`456`
`457`		`-[Rule.Common.SEC.RESET_VECTOR]`
	`457`	`+[Rule.Common.USER_DEFINED.RESET_VECTOR]`
`458`	`458`	`FILE RAW = $(NAMED_GUID) {`
`459`	`459`	`RAW BIN Align = 16 \|.bin`
`460`	`460`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`INF_VERSION = 1.29`
`13`	`13`	`BASE_NAME = ResetVector`
`14`	`14`	`FILE_GUID = 1BA0062E-C779-4582-8566-336AE8F78F09`
`15`		`- MODULE_TYPE = SEC`
	`15`	`+ MODULE_TYPE = USER_DEFINED`
`16`	`16`	`VERSION_STRING = 1.1`
`17`	`17`
`18`	`18`	`#`
Original file line number	Diff line number	Diff line change
`@@ -461,7 +461,7 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {`
`461`	`461`	`VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)`
`462`	`462`	`}`
`463`	`463`
`464`		`-[Rule.Common.SEC.RESET_VECTOR]`
	`464`	`+[Rule.Common.USER_DEFINED.RESET_VECTOR]`
`465`	`465`	`FILE RAW = $(NAMED_GUID) {`
`466`	`466`	`RAW BIN Align = 16 \|.bin`
`467`	`467`	`}`
Original file line number	Diff line number	Diff line change
`@@ -426,7 +426,7 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {`
`426`	`426`	`VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)`
`427`	`427`	`}`
`428`	`428`
`429`		`-[Rule.Common.SEC.RESET_VECTOR]`
	`429`	`+[Rule.Common.USER_DEFINED.RESET_VECTOR]`
`430`	`430`	`FILE RAW = $(NAMED_GUID) {`
`431`	`431`	`RAW BIN Align = 16 \|.bin`
`432`	`432`	`}`
Original file line number	Diff line number	Diff line change
`@@ -414,7 +414,7 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {`
`414`	`414`	`VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)`
`415`	`415`	`}`
`416`	`416`
`417`		`-[Rule.Common.SEC.RESET_VECTOR]`
	`417`	`+[Rule.Common.USER_DEFINED.RESET_VECTOR]`
`418`	`418`	`FILE RAW = $(NAMED_GUID) {`
`419`	`419`	`RAW BIN Align = 16 \|.bin`
`420`	`420`	`}`
Original file line number	Diff line number	Diff line change
`@@ -479,7 +479,7 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {`
`479`	`479`	`VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)`
`480`	`480`	`}`
`481`	`481`
`482`		`-[Rule.Common.SEC.RESET_VECTOR]`
	`482`	`+[Rule.Common.USER_DEFINED.RESET_VECTOR]`
`483`	`483`	`FILE RAW = $(NAMED_GUID) {`
`484`	`484`	`RAW BIN Align = 16 \|.bin`
`485`	`485`	`}`
Original file line number	Diff line number	Diff line change
`@@ -482,7 +482,7 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {`
`482`	`482`	`VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)`
`483`	`483`	`}`
`484`	`484`
`485`		`-[Rule.Common.SEC.RESET_VECTOR]`
	`485`	`+[Rule.Common.USER_DEFINED.RESET_VECTOR]`
`486`	`486`	`FILE RAW = $(NAMED_GUID) {`
`487`	`487`	`RAW BIN Align = 16 \|.bin`
`488`	`488`	`}`
Original file line number	Diff line number	Diff line change
`@@ -522,7 +522,7 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {`
`522`	`522`	`VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)`
`523`	`523`	`}`
`524`	`524`
`525`		`-[Rule.Common.SEC.RESET_VECTOR]`
	`525`	`+[Rule.Common.USER_DEFINED.RESET_VECTOR]`
`526`	`526`	`FILE RAW = $(NAMED_GUID) {`
`527`	`527`	`RAW BIN Align = 16 \|.bin`
`528`	`528`	`}`
Original file line number	Diff line number	Diff line change
`@@ -469,7 +469,7 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {`
`469`	`469`	`VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)`
`470`	`470`	`}`
`471`	`471`
`472`		`-[Rule.Common.SEC.RESET_VECTOR]`
	`472`	`+[Rule.Common.USER_DEFINED.RESET_VECTOR]`
`473`	`473`	`FILE RAW = $(NAMED_GUID) {`
`474`	`474`	`RAW BIN Align = 16 \|.bin`
`475`	`475`	`}`