From: Alexander Graf <graf@amazon.com>
In follow-up patches we need some EIF file definitions that are
currently in the eif.c file, but want to access them from a separate
device. Move them into the header instead.
Signed-off-by: Alexander Graf <graf@amazon.com>
Reviewed-by: Dorjoy Chowdhury <dorjoychy111@gmail.com>
Link: https://lore.kernel.org/r/20260225220807.33092-10-graf@amazon.com
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/core/eif.h | 38 ++++++++++++++++++++++++++++++++++++++
hw/core/eif.c | 38 --------------------------------------
2 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/hw/core/eif.h b/hw/core/eif.h
index fed3cb55140..a3412377a90 100644
--- a/hw/core/eif.h
+++ b/hw/core/eif.h
@@ -11,6 +11,44 @@
#ifndef HW_CORE_EIF_H
#define HW_CORE_EIF_H
+#define MAX_SECTIONS 32
+
+/* members are ordered according to field order in .eif file */
+typedef struct EifHeader {
+ uint8_t magic[4]; /* must be .eif in ascii i.e., [46, 101, 105, 102] */
+ uint16_t version;
+ uint16_t flags;
+ uint64_t default_memory;
+ uint64_t default_cpus;
+ uint16_t reserved;
+ uint16_t section_cnt;
+ uint64_t section_offsets[MAX_SECTIONS];
+ uint64_t section_sizes[MAX_SECTIONS];
+ uint32_t unused;
+ uint32_t eif_crc32;
+} QEMU_PACKED EifHeader;
+
+/* members are ordered according to field order in .eif file */
+typedef struct EifSectionHeader {
+ /*
+ * 0 = invalid, 1 = kernel, 2 = cmdline, 3 = ramdisk, 4 = signature,
+ * 5 = metadata
+ */
+ uint16_t section_type;
+ uint16_t flags;
+ uint64_t section_size;
+} QEMU_PACKED EifSectionHeader;
+
+enum EifSectionTypes {
+ EIF_SECTION_INVALID = 0,
+ EIF_SECTION_KERNEL = 1,
+ EIF_SECTION_CMDLINE = 2,
+ EIF_SECTION_RAMDISK = 3,
+ EIF_SECTION_SIGNATURE = 4,
+ EIF_SECTION_METADATA = 5,
+ EIF_SECTION_MAX = 6,
+};
+
bool read_eif_file(const char *eif_path, const char *machine_initrd,
char **kernel_path, char **initrd_path,
char **kernel_cmdline, uint8_t *image_sha384,
diff --git a/hw/core/eif.c b/hw/core/eif.c
index 513caec6b49..96f1d765785 100644
--- a/hw/core/eif.c
+++ b/hw/core/eif.c
@@ -18,44 +18,6 @@
#include "hw/core/eif.h"
-#define MAX_SECTIONS 32
-
-/* members are ordered according to field order in .eif file */
-typedef struct EifHeader {
- uint8_t magic[4]; /* must be .eif in ascii i.e., [46, 101, 105, 102] */
- uint16_t version;
- uint16_t flags;
- uint64_t default_memory;
- uint64_t default_cpus;
- uint16_t reserved;
- uint16_t section_cnt;
- uint64_t section_offsets[MAX_SECTIONS];
- uint64_t section_sizes[MAX_SECTIONS];
- uint32_t unused;
- uint32_t eif_crc32;
-} QEMU_PACKED EifHeader;
-
-/* members are ordered according to field order in .eif file */
-typedef struct EifSectionHeader {
- /*
- * 0 = invalid, 1 = kernel, 2 = cmdline, 3 = ramdisk, 4 = signature,
- * 5 = metadata
- */
- uint16_t section_type;
- uint16_t flags;
- uint64_t section_size;
-} QEMU_PACKED EifSectionHeader;
-
-enum EifSectionTypes {
- EIF_SECTION_INVALID = 0,
- EIF_SECTION_KERNEL = 1,
- EIF_SECTION_CMDLINE = 2,
- EIF_SECTION_RAMDISK = 3,
- EIF_SECTION_SIGNATURE = 4,
- EIF_SECTION_METADATA = 5,
- EIF_SECTION_MAX = 6,
-};
-
static const char *section_type_to_string(uint16_t type)
{
const char *str;
--
2.53.0