Extboot support for Xen

79 lines not on this page · raw message

diff -r 533a8e6cebd0 tools/firmware/hvmloader/config.h
@@ -21,6 +21,9 @@
 #define HYPERCALL_PHYSICAL_ADDRESS    0x00080000
 #define VGABIOS_PHYSICAL_ADDRESS      0x000C0000
 #define ETHERBOOT_PHYSICAL_ADDRESS    0x000C8000
+/* extboot only needs 1.5k but option roms must be on a 2k boundary */
+/* FIXME: I think etherboot takes up this full space */
+#define EXTBOOT_PHYSICAL_ADDRESS      0x000CF800
 #define VMXASSIST_PHYSICAL_ADDRESS    0x000D0000
 #define SMBIOS_PHYSICAL_ADDRESS       0x000E9000
 #define SMBIOS_MAXIMUM_SIZE           0x00001000

diff -r 533a8e6cebd0 tools/firmware/hvmloader/hvmloader.c
@@ -316,6 +316,11 @@ static int must_load_nic(void)
     return ((boot_order & 0xf0) == 0x40);
 }
 
+static int must_load_extboot(void)
+{
+    return (inb(0x404) == 1);
+}
+
 /* Replace possibly erroneous memory-size CMOS fields with correct values. */
 static void cmos_write_memory_size(void)
 {

@@ -354,6 +359,7 @@ int main(void)
 int main(void)
 {
     int acpi_sz = 0, vgabios_sz = 0, etherboot_sz = 0, rombios_sz, smbios_sz;
+    int extboot_sz = 0;
 
     printf("HVM Loader\n");
 

@@ -396,6 +402,14 @@ int main(void)
         memcpy((void *)ETHERBOOT_PHYSICAL_ADDRESS,
                etherboot, sizeof(etherboot));
         etherboot_sz = sizeof(etherboot);
+    }
+
+    if ( must_load_extboot() )
+    {
+        printf("Loading EXTBOOT ...\n");
+        memcpy((void *)EXTBOOT_PHYSICAL_ADDRESS,
+               extboot, sizeof(extboot));
+        extboot_sz = sizeof(extboot);
     }
 
     if ( get_acpi_enabled() )

@@ -416,6 +430,10 @@ int main(void)
         printf(" %05x-%05x: Etherboot ROM\n",
                ETHERBOOT_PHYSICAL_ADDRESS,
                ETHERBOOT_PHYSICAL_ADDRESS + etherboot_sz - 1);
+    if ( extboot_sz )
+        printf(" %05x-%05x: Extboot ROM\n",
+               EXTBOOT_PHYSICAL_ADDRESS,
+               EXTBOOT_PHYSICAL_ADDRESS + extboot_sz - 1);
     if ( use_vmxassist() )
         printf(" %05x-%05x: VMXAssist\n",
                VMXASSIST_PHYSICAL_ADDRESS,

125 lines not on this page · raw message

diff -r 533a8e6cebd0 tools/ioemu/vl.h
@@ -971,6 +971,9 @@ int pmac_ide_init (BlockDriverState **hd
 int pmac_ide_init (BlockDriverState **hd_table,
                    SetIRQFunc *set_irq, void *irq_opaque, int irq);
 
+/* extboot.c */
+void extboot_init(BlockDriverState *bs, int cmd);
+
 /* cdrom.c */
 int cdrom_read_toc(int nb_sectors, uint8_t *buf, int msf, int start_track);
 int cdrom_read_toc_raw(int nb_sectors, uint8_t *buf, int msf, int session_num);

79 lines not on this page · raw message

128 lines not on this page · raw message

Index: qemu/hw/pc.h
===================================================================
@@ -151,4 +151,8 @@
 void *virtio_blk_init(PCIBus *bus, uint16_t vendor, uint16_t device,
 		      BlockDriverState *bs);
 
+/* extboot.c */
+
+void extboot_init(BlockDriverState *bs, int cmd);
+
 #endif

103 lines not on this page · raw message

Index: qemu/sysemu.h
===================================================================
@@ -133,6 +133,7 @@
 
 int nb_drives;
 DriveInfo drives_table[MAX_DRIVES+1];
+int extboot_drive;
 
 extern int drive_get_index(BlockInterfaceType interface, int bus, int unit);
 extern int drive_get_max_bus(BlockInterfaceType interface);

Index: qemu/vl.c
===================================================================
@@ -167,6 +167,7 @@
    to store the VM snapshots */
 DriveInfo drives_table[MAX_DRIVES+1];
 int nb_drives;
+int extboot_drive = -1;
 /* point to the block driver where the snapshots are managed */
 BlockDriverState *bs_snapshots;
 int vga_ram_size;

@@ -4852,7 +4853,8 @@
     int max_devs;
     int index;
     char *params[] = { "bus", "unit", "if", "index", "cyls", "heads",
-                       "secs", "trans", "media", "snapshot", "file", NULL };
+                       "secs", "trans", "media", "snapshot", "file", "boot",
+		       NULL };
 
     if (check_params(buf, sizeof(buf), params, str) < 0) {
          fprintf(stderr, "qemu: unknowm parameter '%s' in '%s'\n",

@@ -5008,6 +5010,19 @@
 	}
     }
 
+    if (get_param_value(buf, sizeof(buf), "boot", str)) {
+	if (!strcmp(buf, "on")) {
+	    if (extboot_drive != -1) {
+		fprintf(stderr, "qemu: two bootable drives specified\n");
+		return -1;
+	    }
+	    extboot_drive = nb_drives;
+	} else if (strcmp(buf, "off")) {
+	    fprintf(stderr, "qemu: '%s' invalid boot option\n", str);
+	    return -1;
+	}
+    }
+
     get_param_value(file, sizeof(file), "file", str);
 
     /* compute bus and unit according index */

@@ -7443,7 +7458,8 @@
            "-hdc/-hdd file  use 'file' as IDE hard disk 2/3 image\n"
            "-cdrom file     use 'file' as IDE cdrom image (cdrom is ide1 master)\n"
 	   "-drive [file=file][,if=type][,bus=n][,unit=m][,media=d][index=i]\n"
-           "       [,cyls=c,heads=h,secs=s[,trans=t]][snapshot=on|off]\n"
+           "       [,cyls=c,heads=h,secs=s[,trans=t]][,snapshot=on|off]\n"
+	   "       [,boot=on|off]\n"
 	   "                use 'file' as a drive image\n"
            "-mtdblock file  use 'file' as on-board Flash memory image\n"
            "-sd file        use 'file' as SecureDigital card image\n"