From f28cedfa311958bccaf0870b7ee567a9a2f4fc67 Mon Sep 17 00:00:00 2001
From: anonymix007 <48598263+anonymix007@users.noreply.github.com>
Date: Thu, 12 Dec 2024 20:31:02 +0300
Subject: [PATCH] boot: Add chid.c to libefitest

Also fix compilation for testing CHID matching in userspace
---
 src/boot/chid.c      |  4 ++++
 src/boot/meson.build |  1 +
 src/boot/util.h      | 15 +++++++++++++--
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/boot/chid.c b/src/boot/chid.c
index cd82958dcfe..dca2f364e08 100644
--- a/src/boot/chid.c
+++ b/src/boot/chid.c
@@ -104,7 +104,11 @@ EFI_STATUS chid_match(const void *hwid_buffer, size_t hwid_length, const Device
 
         status = populate_board_chids(chids);
         if (EFI_STATUS_IS_ERROR(status))
+#if SD_BOOT
                 return log_error_status(status, "Failed to populate board CHIDs: %m");
+#else
+                return status;
+#endif
 
         size_t n_devices = 0;
 
diff --git a/src/boot/meson.build b/src/boot/meson.build
index 29c5455dbd1..9c7483d6d1d 100644
--- a/src/boot/meson.build
+++ b/src/boot/meson.build
@@ -7,6 +7,7 @@ libefitest = static_library(
         'efitest',
         files(
                 'bcd.c',
+                'chid.c',
                 'efi-string.c',
         ),
         build_by_default : false,
diff --git a/src/boot/util.h b/src/boot/util.h
index af14a0e31e4..90da8ad69d8 100644
--- a/src/boot/util.h
+++ b/src/boot/util.h
@@ -3,11 +3,14 @@
 
 #include "efi.h"
 #include "efi-string.h"
-#include "log.h"
 #include "memory-util-fundamental.h"
-#include "proto/file-io.h"
 #include "string-util-fundamental.h"
 
+#if SD_BOOT
+
+#include "log.h"
+#include "proto/file-io.h"
+
 /* This is provided by the linker. */
 extern uint8_t __executable_start[];
 
@@ -236,3 +239,11 @@ char16_t *get_extra_dir(const EFI_DEVICE_PATH *file_path);
 
 #define bswap_16(x) __builtin_bswap16(x)
 #define bswap_32(x) __builtin_bswap32(x)
+
+#else
+
+#include "alloc-util.h"
+
+#define xnew0(type, n) ASSERT_PTR(new0(type, n))
+
+#endif
-- 
2.47.3