Skip to content

[mono] efi: Fix printing ASCII output messages #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chp-io wants to merge 1 commit into
base: mono
Choose a base branch
from
+13 −12
Open

[mono] efi: Fix printing ASCII output messages #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions deps/hypervisor/bfdriver/src/platform/efi/entry.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,22 +260,22 @@ void parse_cmdline(EFI_HANDLE image)

for (i = 0; i < argc; i++) {
if (!StrnCmp(opt_enable_xue, argv[i], StrLen(opt_enable_xue))) {
Print(L"Enabling Xue USB Debugger\n");
BFINFO("Enabling Xue USB Debugger\n");
g_enable_xue = 1;
}

if (!StrnCmp(opt_enable_winpv, argv[i], StrLen(opt_enable_winpv))) {
Print(L"Enabling Windows PV\n");
BFINFO("Enabling Windows PV\n");
g_enable_winpv = 1;
}

if (!StrnCmp(opt_disable_winpv, argv[i], StrLen(opt_disable_winpv))) {
Print(L"Disabling Windows PV\n");
BFINFO("Disabling Windows PV\n");
g_enable_winpv = 0;
}

if (!StrnCmp(opt_disable_xen_pfd, argv[i], StrLen(opt_disable_xen_pfd))) {
Print(L"Disabling Xen Platform PCI device\n");
BFINFO("Disabling Xen Platform PCI device\n");
g_disable_xen_pfd = 1;
}

Expand All @@ -288,8 +288,8 @@ void parse_cmdline(EFI_HANDLE image)
UINTN bdf_len = StrLen(bdf_str);

if (bdf_len != 7) {
Print(L"Invalid BDF string size: %u\n", bdf_len);
Print(L" usage: --no-pci-pt BB:DD.F\n");
BFALERT("Invalid BDF string size: %u\n", bdf_len);
BFALERT(" usage: --no-pci-pt BB:DD.F\n");
continue;
}

Expand All @@ -310,7 +310,7 @@ void parse_cmdline(EFI_HANDLE image)
UINTN fun = xtoi((CHAR16 *)fun_str);

if (bus > 255 || dev > 31 || fun > 7) {
Print(L"BDF out of range: bus=%lx, dev=%lx, fun=%lx\n",
BFALERT("BDF out of range: bus=%lx, dev=%lx, fun=%lx\n",
bus, dev, fun);
continue;
}
Expand All @@ -319,7 +319,7 @@ void parse_cmdline(EFI_HANDLE image)
(bus << 16) | (dev << 11) | (fun << 8);
no_pci_pt_count++;

Print(L"Disabling passthrough for %02x:%02x.%02x\n", bus, dev, fun);
BFINFO("Disabling passthrough for %02x:%02x.%02x\n", bus, dev, fun);
}
}
}
Expand Down
9 changes: 5 additions & 4 deletions deps/hypervisor/bfsdk/include/bfdebug.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1244,10 +1244,11 @@ bfdebug_exception(const std::exception &e)
#if defined(KERNEL) && defined(EFI)
#include "efi.h"
#include "efilib.h"
#define BFINFO(...) Print(L__VA_ARGS__)
#define BFDEBUG(...) Print(L"[BAREFLANK DEBUG]: " __VA_ARGS__)
#define BFALERT(...) Print(L"[BAREFLANK ALERT]: " __VA_ARGS__)
#define BFERROR(...) Print(L"[BAREFLANK ERROR]: " __VA_ARGS__)

#define BFINFO(...) APrint((const CHAR8 *) __VA_ARGS__)
#define BFDEBUG(...) APrint((const CHAR8 *) "[BAREFLANK DEBUG]: " __VA_ARGS__)
#define BFALERT(...) APrint((const CHAR8 *) "[BAREFLANK ALERT]: " __VA_ARGS__)
#define BFERROR(...) APrint((const CHAR8 *) "[BAREFLANK ERROR]: " __VA_ARGS__)
#endif

/** @endcond */
Expand Down