more hack for CMOS interruption (enable linux /dev/rtc not to hang) - auto boot on cdrom if only device present

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

1 files changed, 5 insertions, 1 deletions

diff --git a/vl.c b/vl.c
index a4f3403985..550443f885 100644
--- a/vl.c
+++ b/vl.c
@@ -2830,7 +2830,7 @@ int main_loop(void *opaque)
             pic_set_irq(0, 0);
             timer_irq_pending = 0;
             /* XXX: RTC test */
-            if (cmos_data[RTC_REG_B] & 0x40) {
+            if (cmos_data[RTC_REG_B] & 0x50) {
                 pic_set_irq(8, 1);
             }
         }
@@ -3058,6 +3058,10 @@ int main(int argc, char **argv)
         
     if (!linux_boot && hd_filename[0] == '\0' && hd_filename[2] == '\0')
         help();
+    
+    /* boot to cd by default if no hard disk */
+    if (hd_filename[0] == '\0' && boot_device == 'c')
+        boot_device = 'd';
 
     /* init debug */
     setvbuf(stdout, NULL, _IOLBF, 0);