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

2 files changed, 3 insertions, 1 deletions

diff --git a/hw/pc.c b/hw/pc.c
index 495f6c033..7d86f32d5 100644
--- 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 53b46259a..3074d93c2 100644
--- 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