stub out the SAN req's in int13

Include-If: %if 0%{?patch-possibly-applied-elsewhere}

We need to find some code or data to change so we can make the rom fit
into the legacy size requirements. Comment out SAN support, and
hopefully nobody will be impacted.

Signed-off-by: Bruce Rogers <brogers@suse.com>

diff --git a/roms/ipxe/src/arch/x86/interface/pcbios/int13.c b/roms/ipxe/src/arch/x86/interface/pcbios/int13.c
index ca789a0d154e1fe3c2508a3aefeade3c607bdf96..40c61419c0c134120d1ce7c81a1ec1cd2ae5b04d 100644 (file)
--- a/roms/ipxe/src/arch/x86/interface/pcbios/int13.c
+++ b/roms/ipxe/src/arch/x86/interface/pcbios/int13.c
@@ -23,6 +23,12 @@
 
 FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
+#define INCLUDE_SAN_HOOKS 0
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-function"
+#pragma GCC diagnostic ignored "-Wunused-variable"
+
 #include <stdint.h>
 #include <stdlib.h>
 #include <limits.h>
@@ -1243,6 +1249,7 @@ static void int13_unhook_vector ( void ) {
  */
 static int int13_hook ( unsigned int drive, struct uri **uris,
                        unsigned int count, unsigned int flags ) {
+#if INCLUDE_SAN_HOOKS
        struct san_device *sandev;
        struct int13_data *int13;
        unsigned int natural_drive;
@@ -1315,6 +1322,9 @@ static int int13_hook ( unsigned int drive, struct uri **uris,
        sandev_put ( sandev );
  err_alloc:
        return rc;
+#else
+       return -1;
+#endif
 }
 
 /**
@@ -1328,6 +1338,7 @@ static int int13_hook ( unsigned int drive, struct uri **uris,
  */
 static void int13_unhook ( unsigned int drive ) {
        struct san_device *sandev;
+#if INCLUDE_SAN_HOOKS
 
        /* Find drive */
        sandev = sandev_find ( drive );
@@ -1353,6 +1364,7 @@ static void int13_unhook ( unsigned int drive ) {
 
        /* Drop reference to drive */
        sandev_put ( sandev );
+#endif
 }
 
 /**
@@ -1514,6 +1526,7 @@ static int int13_load_eltorito ( unsigned int drive, struct segoff *address ) {
  * Note that this function can never return success, by definition.
  */
 static int int13_boot ( unsigned int drive, const char *filename __unused ) {
+#if INCLUDE_SAN_HOOKS
        struct memory_map memmap;
        struct segoff address;
        int rc;
@@ -1539,6 +1552,9 @@ static int int13_boot ( unsigned int drive, const char *filename __unused ) {
        }
 
        return -ECANCELED; /* -EIMPOSSIBLE */
+#else
+       return -1;
+#endif
 }
 
 /** Maximum size of boot firmware table(s) */
@@ -1605,6 +1621,7 @@ static int int13_install ( struct acpi_header *acpi ) {
  * @ret rc             Return status code
  */
 static int int13_describe ( void ) {
+#if INCLUDE_SAN_HOOKS
        int rc;
 
        /* Clear tables */
@@ -1619,9 +1636,13 @@ static int int13_describe ( void ) {
        }
 
        return 0;
+#else
+       return -1;
+#endif
 }
 
 PROVIDE_SANBOOT ( pcbios, san_hook, int13_hook );
 PROVIDE_SANBOOT ( pcbios, san_unhook, int13_unhook );
 PROVIDE_SANBOOT ( pcbios, san_boot, int13_boot );
 PROVIDE_SANBOOT ( pcbios, san_describe, int13_describe );
+#pragma GCC diagnostic pop