Hi,
OK for the -option-rom option. Later it would be better to handle it at
the NIC level, but it is more complicated (some BIOS patches would be
needed to remap the PCI ROM at the right address for example).
I think the -boot n option should be merged in QEMU too. Some people
need it to make tests.
Regarding VMI, I began some work in this area with kqemu but I did not
manage to find time to finish it (VMI in QEMU would enable to run Linux
VMs with performance levels close to Xen at the expense of a patched
kernel).
Regards,
Fabrice.
Anthony Liguori wrote:
Howdy,
The following patch adds an -option-rom option to allow loading of PCI
option ROMs. This is useful for loading things like etherboot or VMI.
For instance, using an etherboot ROM[1] from http://rom-o-matic.net/,
one can use the following command line to PXE boot QEMU:
qemu -hda ~/mydisk.img -option-rom ~/eb-5.4.2-winbond940.zrom
This is also useful for loading a VMI option ROM for experimenting with
paravirtualization. Not terribly useful ATM of course.
BTW, I have another patch that would add the etherboot ROMs to the QEMU
distribution for all the NICs and then plumb up -boot n to allow PXE
booting. Is there any interest in a patch like this? This would
increase the QEMU distribution size by 96k.
[1]
http://rom-o-matic.net/5.4.2/build.php?version=5.4.2F=arch=i386nic=ns830:winbond940%20--%20[0x1050,0x0940]ofmt=Binary%20ROM%20Image(.zrom)A=Get%20ROM
Regards,
Anthony Liguori
diff -r 0a200f17f93e hw/pc.c
--- a/hw/pc.c Sat Dec 23 16:28:52 2006 -0600
+++ b/hw/pc.c Sat Dec 23 16:28:54 2006 -0600
@@ -451,7 +451,7 @@ static void pc_init1(int ram_size, int v
{
char buf[1024];
int ret, linux_boot, initrd_size, i;
-unsigned long bios_offset, vga_bios_offset;
+unsigned long bios_offset, vga_bios_offset, option_rom_offset;
int bios_size, isa_bios_size;
PCIBus *pci_bus;
int piix3_devfn = -1;
@@ -518,6 +518,23 @@ static void pc_init1(int ram_size, int v
cpu_register_physical_memory(0x10 - isa_bios_size,
isa_bios_size,
(bios_offset + bios_size - isa_bios_size) | IO_MEM_ROM);
+
+option_rom_offset = 0;
+for (i = 0; i nb_option_roms; i++) {
+ int offset = bios_offset + bios_size + option_rom_offset;
+ int size;
+
+ size = load_image(option_rom[i], phys_ram_base + offset);
+ if ((size + option_rom_offset) 0x1) {
+ fprintf(stderr, Too many option ROMS\n);
+ exit(1);
+ }
+ cpu_register_physical_memory(0xd + option_rom_offset,
+size, offset | IO_MEM_ROM);
+ option_rom_offset += size + 2047;
+ option_rom_offset -= (option_rom_offset % 2048);
+}
+
/* map all the bios at the top of memory */
cpu_register_physical_memory((uint32_t)(-bios_size),
bios_size, bios_offset | IO_MEM_ROM);
diff -r 0a200f17f93e qemu-doc.texi
--- a/qemu-doc.texi Sat Dec 23 16:28:52 2006 -0600
+++ b/qemu-doc.texi Sat Dec 23 16:28:54 2006 -0600
@@ -325,6 +325,10 @@ Use it when installing Windows 2000 to a
Use it when installing Windows 2000 to avoid a disk full bug. After
Windows 2000 is installed, you no longer need this option (this option
slows down the IDE transfers).
+
[EMAIL PROTECTED] -option-rom file
+Load the contents of file as an option ROM. This option is useful to load
+things like EtherBoot.
@end table
diff -r 0a200f17f93e vl.c
--- a/vl.c Sat Dec 23 16:28:52 2006 -0600
+++ b/vl.c Sat Dec 23 16:29:15 2006 -0600
@@ -169,6 +169,8 @@ int fd_bootchk = 1;
int fd_bootchk = 1;
int no_reboot = 0;
int daemonize = 0;
+const char *option_rom[MAX_OPTION_ROMS];
+int nb_option_roms;
/***/
/* x86 ISA bus support */
@@ -6213,6 +6215,7 @@ void help(void)
#ifndef _WIN32
-daemonize daemonize QEMU after initializing\n
#endif
+ -option-rom rom load a file, rom, into the option ROM space\n
\n
During emulation, the following keys are useful:\n
ctrl-alt-f toggle full screen\n
@@ -6295,6 +6298,7 @@ enum {
QEMU_OPTION_no_reboot,
QEMU_OPTION_daemonize,
QEMU_OPTION_disk,
+QEMU_OPTION_option_rom,
};
typedef struct QEMUOption {
@@ -6377,6 +6381,7 @@ const QEMUOption qemu_options[] = {
{ no-acpi, 0, QEMU_OPTION_no_acpi },
{ no-reboot, 0, QEMU_OPTION_no_reboot },
{ daemonize, 0, QEMU_OPTION_daemonize },
+{ option-rom, HAS_ARG, QEMU_OPTION_option_rom },
{ NULL },
};
@@ -7130,6 +7135,14 @@ int main(int argc, char **argv)
case QEMU_OPTION_daemonize:
daemonize = 1;
break;
+ case QEMU_OPTION_option_rom:
+ if (nb_option_roms = MAX_OPTION_ROMS) {
+
