Let qemu work with latest bochsbios, by Bernhard Kauer.

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3154 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/hw/pc.c b/hw/pc.c
index 495f6c033384d7c00ea9fc099711d71e42eceb01..7d86f32d53b172e68ce799d1dfecb0e82dd89440 100644 (file)
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -197,6 +197,9 @@ static void cmos_init(int ram_size, int boot_device, BlockDriverState **hd_table
     case 'd':
         rtc_set_memory(s, 0x3d, 0x03); /* CD-ROM boot */
         break;
+    case 'n':
+        rtc_set_memory(s, 0x3d, 0x04); /* Network boot */
+        break; 
     }
 
     /* floppy type */

diff --git a/vl.c b/vl.c
index 53b46259abab32629199939039ec1b2156effe50..3074d93c2e0804c5862d0c676b017c8b9faa43dd 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -8203,7 +8203,6 @@ int main(int argc, char **argv)
            fprintf(stderr, "No valid PXE rom found for network device\n");
            exit(1);
        }
-       boot_device = 'c'; /* to prevent confusion by the BIOS */
     }
 #endif