Skip to content

Commit 9519916

Browse files
rustylynchjren1
authored andcommitted
Fix compiler warnings when building for UEFI
Signed-off-by: Rusty Lynch <rusty.lynch@intel.com>
1 parent 170c48a commit 9519916

File tree

4 files changed

+10
-3
lines changed

4 files changed

+10
-3
lines changed

hypervisor/bsp/uefi/efi/boot.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ load_sos_image(EFI_HANDLE image, CHAR16 *name, CHAR16 *cmdline)
244244
struct multiboot_mmap *mmap;
245245
struct multiboot_info *mbi;
246246

247-
struct acpi_table_rsdp *rsdp;
247+
struct acpi_table_rsdp *rsdp = NULL;
248248
int i, j;
249249

250250

hypervisor/bsp/uefi/uefi.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,8 @@ int uefi_sw_loader(struct vm *vm, struct vcpu *vcpu)
136136
vlapic_restore(vcpu->arch_vcpu.vlapic, &uefi_lapic_regs);
137137

138138
vcpu->entry_addr = efi_ctx->entry;
139-
cur_context->guest_cpu_regs.regs.rcx = efi_ctx->handle;
140-
cur_context->guest_cpu_regs.regs.rdx = efi_ctx->table;
139+
cur_context->guest_cpu_regs.regs.rcx = (uint64_t) efi_ctx->handle;
140+
cur_context->guest_cpu_regs.regs.rdx = (uint64_t) efi_ctx->table;
141141

142142
/* defer irq enabling till vlapic is ready */
143143
CPU_IRQ_ENABLE();

hypervisor/include/arch/x86/apicreg.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -521,4 +521,9 @@ struct ioapic {
521521

522522
#define IOAPIC_RTE_INTVEC 0x000000ff /*R/W: INT vector field*/
523523

524+
#ifdef CONFIG_EFI_STUB
525+
int sipi_from_efi_boot_service_exit(uint32_t dest, uint32_t mode, uint32_t vec);
526+
void efi_deferred_wakeup_pcpu(int cpu_id);
527+
#endif
528+
524529
#endif /* _APICREG_H_ */

hypervisor/include/arch/x86/cpu.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,8 @@
147147

148148
#ifndef ASSEMBLER
149149

150+
int cpu_find_logical_id(uint32_t lapic_id);
151+
150152
/**********************************/
151153
/* EXTERNAL VARIABLES */
152154
/**********************************/

0 commit comments

Comments
 (0)