aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2009-12-14 16:35:14 +0200
committerAvi Kivity <avi@redhat.com>2009-12-14 16:35:14 +0200
commit5882ecd9d1de466752f4092ec5e9eddcd5dc8441 (patch)
tree801375c221d4dbbf44f3cc48be2775aeaac9b79c
parentfc592970ec1b11bab003fc58d839c1bea7ab80a5 (diff)
Revert "Temporarily avoid loading pxe option roms"
This reverts commit b496fe34317ead61cf5ae019506fadc8f9ad6556. Seabios fixes/workarounds now allow gpxe to work. Signed-off-by: Avi Kivity <avi@redhat.com>
-rw-r--r--hw/loader.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/hw/loader.c b/hw/loader.c
index b1827a737..2d7a2c495 100644
--- a/hw/loader.c
+++ b/hw/loader.c
@@ -628,10 +628,6 @@ int rom_add_vga(const char *file)
int rom_add_option(const char *file)
{
- /* temporarily avoid pxe roms */
- if (strncmp(file, "pxe", 3) == 0)
- return 0;
-
if (!rom_enable_driver_roms)
return 0;
return rom_add_file(file, PC_ROM_MIN_OPTION, PC_ROM_MAX, PC_ROM_ALIGN);