Commit 44486a89f0103ac9b39bfe8160adf83757d97450
1 parent
bea6030d
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
Showing
2 changed files
with
3 additions
and
1 deletions
hw/pc.c
| @@ -197,6 +197,9 @@ static void cmos_init(int ram_size, int boot_device, BlockDriverState **hd_table | @@ -197,6 +197,9 @@ static void cmos_init(int ram_size, int boot_device, BlockDriverState **hd_table | ||
| 197 | case 'd': | 197 | case 'd': |
| 198 | rtc_set_memory(s, 0x3d, 0x03); /* CD-ROM boot */ | 198 | rtc_set_memory(s, 0x3d, 0x03); /* CD-ROM boot */ |
| 199 | break; | 199 | break; |
| 200 | + case 'n': | ||
| 201 | + rtc_set_memory(s, 0x3d, 0x04); /* Network boot */ | ||
| 202 | + break; | ||
| 200 | } | 203 | } |
| 201 | 204 | ||
| 202 | /* floppy type */ | 205 | /* floppy type */ |
vl.c
| @@ -8203,7 +8203,6 @@ int main(int argc, char **argv) | @@ -8203,7 +8203,6 @@ int main(int argc, char **argv) | ||
| 8203 | fprintf(stderr, "No valid PXE rom found for network device\n"); | 8203 | fprintf(stderr, "No valid PXE rom found for network device\n"); |
| 8204 | exit(1); | 8204 | exit(1); |
| 8205 | } | 8205 | } |
| 8206 | - boot_device = 'c'; /* to prevent confusion by the BIOS */ | ||
| 8207 | } | 8206 | } |
| 8208 | #endif | 8207 | #endif |
| 8209 | 8208 |