|
 |
e76f14 |
From 0e2785dda84709d9be80be85e4d551b1d8a26616 Mon Sep 17 00:00:00 2001
|
|
|
e76f14 |
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
|
e76f14 |
Date: Thu, 18 Aug 2016 16:13:12 +0100
|
|
|
e76f14 |
Subject: [PATCH] aarch64: uefi: Fix the build on aarch64.
|
|
|
e76f14 |
|
|
|
e76f14 |
Fixes commit 0c396650b0018dc3fcd7ca809202ad46ae2c327d.
|
|
|
e76f14 |
|
|
|
e76f14 |
(cherry picked from commit c711b517094375d4c321af4800e747b955643133)
|
|
|
e76f14 |
---
|
|
|
e76f14 |
src/appliance.c | 11 ++++++-----
|
|
|
e76f14 |
src/guestfs-internal-frontend.h | 6 +++---
|
|
|
e76f14 |
2 files changed, 9 insertions(+), 8 deletions(-)
|
|
|
e76f14 |
|
|
|
e76f14 |
diff --git a/src/appliance.c b/src/appliance.c
|
|
|
e76f14 |
index a3af164..19a697b 100644
|
|
|
e76f14 |
--- a/src/appliance.c
|
|
|
e76f14 |
+++ b/src/appliance.c
|
|
|
e76f14 |
@@ -435,10 +435,11 @@ guestfs_int_get_uefi (guestfs_h *g, char **code, char **vars, int *flags)
|
|
|
e76f14 |
#ifdef __aarch64__
|
|
|
e76f14 |
size_t i;
|
|
|
e76f14 |
|
|
|
e76f14 |
- for (i = 0; guestfs_int_aavmf_firmware[i].code != NULL; ++i) {
|
|
|
e76f14 |
- const char *codefile = guestfs_int_aavmf_firmware[i].code;
|
|
|
e76f14 |
- const char *code_debug_file = guestfs_int_aavmf_firmware[i].code_debug;
|
|
|
e76f14 |
- const char *varsfile = guestfs_int_aavmf_firmware[i].vars;
|
|
|
e76f14 |
+ for (i = 0; guestfs_int_uefi_aarch64_firmware[i].code != NULL; ++i) {
|
|
|
e76f14 |
+ const char *codefile = guestfs_int_uefi_aarch64_firmware[i].code;
|
|
|
e76f14 |
+ const char *code_debug_file =
|
|
|
e76f14 |
+ guestfs_int_uefi_aarch64_firmware[i].code_debug;
|
|
|
e76f14 |
+ const char *varsfile = guestfs_int_uefi_aarch64_firmware[i].vars;
|
|
|
e76f14 |
|
|
|
e76f14 |
if (access (codefile, R_OK) == 0 && access (varsfile, R_OK) == 0) {
|
|
|
e76f14 |
CLEANUP_CMD_CLOSE struct command *copycmd = guestfs_int_new_command (g);
|
|
|
e76f14 |
@@ -468,7 +469,7 @@ guestfs_int_get_uefi (guestfs_h *g, char **code, char **vars, int *flags)
|
|
|
e76f14 |
/* Caller frees. */
|
|
|
e76f14 |
*code = safe_strdup (g, codefile);
|
|
|
e76f14 |
*vars = varst;
|
|
|
e76f14 |
- *flags = guestfs_int_aavmf_firmware[i].flags;
|
|
|
e76f14 |
+ *flags = guestfs_int_uefi_aarch64_firmware[i].flags;
|
|
|
e76f14 |
return 0;
|
|
|
e76f14 |
}
|
|
|
e76f14 |
}
|
|
|
e76f14 |
diff --git a/src/guestfs-internal-frontend.h b/src/guestfs-internal-frontend.h
|
|
|
e76f14 |
index ebf8063..868122d 100644
|
|
|
e76f14 |
--- a/src/guestfs-internal-frontend.h
|
|
|
e76f14 |
+++ b/src/guestfs-internal-frontend.h
|
|
|
e76f14 |
@@ -126,9 +126,9 @@ struct uefi_firmware {
|
|
|
e76f14 |
int flags; /* various flags, see below */
|
|
|
e76f14 |
#define UEFI_FLAG_SECURE_BOOT_REQUIRED 1 /* secure boot (see RHBZ#1367615) */
|
|
|
e76f14 |
};
|
|
|
e76f14 |
-extern struct uefi_firmware guestfs_int_ovmf_i386_firmware[];
|
|
|
e76f14 |
-extern struct uefi_firmware guestfs_int_ovmf_x86_64_firmware[];
|
|
|
e76f14 |
-extern struct uefi_firmware guestfs_int_aavmf_firmware[];
|
|
|
e76f14 |
+extern struct uefi_firmware guestfs_int_uefi_i386_firmware[];
|
|
|
e76f14 |
+extern struct uefi_firmware guestfs_int_uefi_x86_64_firmware[];
|
|
|
e76f14 |
+extern struct uefi_firmware guestfs_int_uefi_aarch64_firmware[];
|
|
|
e76f14 |
|
|
|
e76f14 |
/* These functions are used internally by the CLEANUP_* macros.
|
|
|
e76f14 |
* Don't call them directly.
|
|
|
e76f14 |
--
|
|
|
aa0300 |
2.7.4
|
|
|
e76f14 |
|