01e9700e70
Update to v2.10.0. Also includes some prep work for SLE15. OBS-URL: https://build.opensuse.org/request/show/519796 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=359
96 lines
2.4 KiB
Diff
96 lines
2.4 KiB
Diff
From 239e992583e342b3cca14e809c5ab9469d578072 Mon Sep 17 00:00:00 2001
|
|
From: Bruce Rogers <brogers@suse.com>
|
|
Date: Mon, 24 Jul 2017 10:44:24 -0600
|
|
Subject: [PATCH] stub out the SAN req's in int13
|
|
|
|
---
|
|
src/arch/x86/interface/pcbios/int13.c | 16 ++++++++++++++++
|
|
1 file changed, 16 insertions(+)
|
|
|
|
diff --git a/src/arch/x86/interface/pcbios/int13.c b/src/arch/x86/interface/pcbios/int13.c
|
|
index ca789a0d..bfbe4150 100644
|
|
--- a/src/arch/x86/interface/pcbios/int13.c
|
|
+++ b/src/arch/x86/interface/pcbios/int13.c
|
|
@@ -23,6 +23,8 @@
|
|
|
|
FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
|
|
|
|
+#define INCLUDE_SAN_HOOKS 0
|
|
+
|
|
#include <stdint.h>
|
|
#include <stdlib.h>
|
|
#include <limits.h>
|
|
@@ -1243,6 +1245,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 +1318,9 @@ static int int13_hook ( unsigned int drive, struct uri **uris,
|
|
sandev_put ( sandev );
|
|
err_alloc:
|
|
return rc;
|
|
+#else
|
|
+ return -1;
|
|
+#endif
|
|
}
|
|
|
|
/**
|
|
@@ -1328,6 +1334,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 +1360,7 @@ static void int13_unhook ( unsigned int drive ) {
|
|
|
|
/* Drop reference to drive */
|
|
sandev_put ( sandev );
|
|
+#endif
|
|
}
|
|
|
|
/**
|
|
@@ -1514,6 +1522,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 +1548,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 +1617,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,6 +1632,9 @@ static int int13_describe ( void ) {
|
|
}
|
|
|
|
return 0;
|
|
+#else
|
|
+ return -1;
|
|
+#endif
|
|
}
|
|
|
|
PROVIDE_SANBOOT ( pcbios, san_hook, int13_hook );
|
|
--
|
|
2.13.2
|
|
|