added verr, verw, arpl - more precise segment rights checks
[qemu] / vl.c
diff --git a/vl.c b/vl.c
index 944e759..ff7ff89 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -61,9 +61,6 @@
 /* output Bochs bios info messages */
 //#define DEBUG_BIOS
 
-/* debug IDE devices */
-//#define DEBUG_IDE
-
 /* debug PIC */
 //#define DEBUG_PIC
 
@@ -85,8 +82,6 @@
 
 #define GUI_REFRESH_INTERVAL 30 
 
-#define MAX_DISKS 2
-
 /* from plex86 (BSD license) */
 struct  __attribute__ ((packed)) linux_params {
   // For 0x00..0x3f, see 'struct screen_info' in linux/include/linux/tty.h.
@@ -216,6 +211,7 @@ static DisplayState display_state;
 int nographic;
 int term_inited;
 int64_t ticks_per_sec;
+int boot_device = 'c';
 
 /***********************************************************/
 /* x86 io ports */
@@ -533,8 +529,19 @@ void cmos_init(void)
     cmos_data[0x34] = val;
     cmos_data[0x35] = val >> 8;
     
-    cmos_data[0x3d] = 0x02; /* hard drive boot */
-    
+    switch(boot_device) {
+    case 'a':
+        cmos_data[0x3d] = 0x01; /* floppy boot */
+        break;
+    default:
+    case 'c':
+        cmos_data[0x3d] = 0x02; /* hard drive boot */
+        break;
+    case 'd':
+        cmos_data[0x3d] = 0x03; /* CD-ROM boot */
+        break;
+    }
+
     register_ioport_write(0x70, 2, cmos_ioport_write, 1);
     register_ioport_read(0x70, 2, cmos_ioport_read, 1);
 }
@@ -1045,7 +1052,7 @@ static inline void pit_load_count(PITChannelState *s, int val)
     s->count = val;
     if (s == &pit_channels[0] && val <= pit_min_timer_count) {
         fprintf(stderr, 
-                "\nWARNING: vl: on your system, accurate timer emulation is impossible if its frequency is more than %d Hz. If using a 2.5.xx Linux kernel, you must patch asm/param.h to change HZ from 1000 to 100.\n\n", 
+                "\nWARNING: qemu: on your system, accurate timer emulation is impossible if its frequency is more than %d Hz. If using a 2.5.xx Linux kernel, you must patch asm/param.h to change HZ from 1000 to 100.\n\n", 
                 PIT_FREQ / pit_min_timer_count);
     }
 }
@@ -1852,728 +1859,6 @@ void ne2000_init(void)
 }
 
 /***********************************************************/
-/* ide emulation */
-
-/* Bits of HD_STATUS */
-#define ERR_STAT               0x01
-#define INDEX_STAT             0x02
-#define ECC_STAT               0x04    /* Corrected error */
-#define DRQ_STAT               0x08
-#define SEEK_STAT              0x10
-#define SRV_STAT               0x10
-#define WRERR_STAT             0x20
-#define READY_STAT             0x40
-#define BUSY_STAT              0x80
-
-/* Bits for HD_ERROR */
-#define MARK_ERR               0x01    /* Bad address mark */
-#define TRK0_ERR               0x02    /* couldn't find track 0 */
-#define ABRT_ERR               0x04    /* Command aborted */
-#define MCR_ERR                        0x08    /* media change request */
-#define ID_ERR                 0x10    /* ID field not found */
-#define MC_ERR                 0x20    /* media changed */
-#define ECC_ERR                        0x40    /* Uncorrectable ECC error */
-#define BBD_ERR                        0x80    /* pre-EIDE meaning:  block marked bad */
-#define ICRC_ERR               0x80    /* new meaning:  CRC error during transfer */
-
-/* Bits of HD_NSECTOR */
-#define CD                     0x01
-#define IO                     0x02
-#define REL                    0x04
-#define TAG_MASK               0xf8
-
-#define IDE_CMD_RESET           0x04
-#define IDE_CMD_DISABLE_IRQ     0x02
-
-/* ATA/ATAPI Commands pre T13 Spec */
-#define WIN_NOP                                0x00
-/*
- *     0x01->0x02 Reserved
- */
-#define CFA_REQ_EXT_ERROR_CODE         0x03 /* CFA Request Extended Error Code */
-/*
- *     0x04->0x07 Reserved
- */
-#define WIN_SRST                       0x08 /* ATAPI soft reset command */
-#define WIN_DEVICE_RESET               0x08
-/*
- *     0x09->0x0F Reserved
- */
-#define WIN_RECAL                      0x10
-#define WIN_RESTORE                    WIN_RECAL
-/*
- *     0x10->0x1F Reserved
- */
-#define WIN_READ                       0x20 /* 28-Bit */
-#define WIN_READ_ONCE                  0x21 /* 28-Bit without retries */
-#define WIN_READ_LONG                  0x22 /* 28-Bit */
-#define WIN_READ_LONG_ONCE             0x23 /* 28-Bit without retries */
-#define WIN_READ_EXT                   0x24 /* 48-Bit */
-#define WIN_READDMA_EXT                        0x25 /* 48-Bit */
-#define WIN_READDMA_QUEUED_EXT         0x26 /* 48-Bit */
-#define WIN_READ_NATIVE_MAX_EXT                0x27 /* 48-Bit */
-/*
- *     0x28
- */
-#define WIN_MULTREAD_EXT               0x29 /* 48-Bit */
-/*
- *     0x2A->0x2F Reserved
- */
-#define WIN_WRITE                      0x30 /* 28-Bit */
-#define WIN_WRITE_ONCE                 0x31 /* 28-Bit without retries */
-#define WIN_WRITE_LONG                 0x32 /* 28-Bit */
-#define WIN_WRITE_LONG_ONCE            0x33 /* 28-Bit without retries */
-#define WIN_WRITE_EXT                  0x34 /* 48-Bit */
-#define WIN_WRITEDMA_EXT               0x35 /* 48-Bit */
-#define WIN_WRITEDMA_QUEUED_EXT                0x36 /* 48-Bit */
-#define WIN_SET_MAX_EXT                        0x37 /* 48-Bit */
-#define CFA_WRITE_SECT_WO_ERASE                0x38 /* CFA Write Sectors without erase */
-#define WIN_MULTWRITE_EXT              0x39 /* 48-Bit */
-/*
- *     0x3A->0x3B Reserved
- */
-#define WIN_WRITE_VERIFY               0x3C /* 28-Bit */
-/*
- *     0x3D->0x3F Reserved
- */
-#define WIN_VERIFY                     0x40 /* 28-Bit - Read Verify Sectors */
-#define WIN_VERIFY_ONCE                        0x41 /* 28-Bit - without retries */
-#define WIN_VERIFY_EXT                 0x42 /* 48-Bit */
-/*
- *     0x43->0x4F Reserved
- */
-#define WIN_FORMAT                     0x50
-/*
- *     0x51->0x5F Reserved
- */
-#define WIN_INIT                       0x60
-/*
- *     0x61->0x5F Reserved
- */
-#define WIN_SEEK                       0x70 /* 0x70-0x7F Reserved */
-#define CFA_TRANSLATE_SECTOR           0x87 /* CFA Translate Sector */
-#define WIN_DIAGNOSE                   0x90
-#define WIN_SPECIFY                    0x91 /* set drive geometry translation */
-#define WIN_DOWNLOAD_MICROCODE         0x92
-#define WIN_STANDBYNOW2                        0x94
-#define WIN_STANDBY2                   0x96
-#define WIN_SETIDLE2                   0x97
-#define WIN_CHECKPOWERMODE2            0x98
-#define WIN_SLEEPNOW2                  0x99
-/*
- *     0x9A VENDOR
- */
-#define WIN_PACKETCMD                  0xA0 /* Send a packet command. */
-#define WIN_PIDENTIFY                  0xA1 /* identify ATAPI device   */
-#define WIN_QUEUED_SERVICE             0xA2
-#define WIN_SMART                      0xB0 /* self-monitoring and reporting */
-#define CFA_ERASE_SECTORS              0xC0
-#define WIN_MULTREAD                   0xC4 /* read sectors using multiple mode*/
-#define WIN_MULTWRITE                  0xC5 /* write sectors using multiple mode */
-#define WIN_SETMULT                    0xC6 /* enable/disable multiple mode */
-#define WIN_READDMA_QUEUED             0xC7 /* read sectors using Queued DMA transfers */
-#define WIN_READDMA                    0xC8 /* read sectors using DMA transfers */
-#define WIN_READDMA_ONCE               0xC9 /* 28-Bit - without retries */
-#define WIN_WRITEDMA                   0xCA /* write sectors using DMA transfers */
-#define WIN_WRITEDMA_ONCE              0xCB /* 28-Bit - without retries */
-#define WIN_WRITEDMA_QUEUED            0xCC /* write sectors using Queued DMA transfers */
-#define CFA_WRITE_MULTI_WO_ERASE       0xCD /* CFA Write multiple without erase */
-#define WIN_GETMEDIASTATUS             0xDA    
-#define WIN_ACKMEDIACHANGE             0xDB /* ATA-1, ATA-2 vendor */
-#define WIN_POSTBOOT                   0xDC
-#define WIN_PREBOOT                    0xDD
-#define WIN_DOORLOCK                   0xDE /* lock door on removable drives */
-#define WIN_DOORUNLOCK                 0xDF /* unlock door on removable drives */
-#define WIN_STANDBYNOW1                        0xE0
-#define WIN_IDLEIMMEDIATE              0xE1 /* force drive to become "ready" */
-#define WIN_STANDBY                    0xE2 /* Set device in Standby Mode */
-#define WIN_SETIDLE1                   0xE3
-#define WIN_READ_BUFFER                        0xE4 /* force read only 1 sector */
-#define WIN_CHECKPOWERMODE1            0xE5
-#define WIN_SLEEPNOW1                  0xE6
-#define WIN_FLUSH_CACHE                        0xE7
-#define WIN_WRITE_BUFFER               0xE8 /* force write only 1 sector */
-#define WIN_WRITE_SAME                 0xE9 /* read ata-2 to use */
-       /* SET_FEATURES 0x22 or 0xDD */
-#define WIN_FLUSH_CACHE_EXT            0xEA /* 48-Bit */
-#define WIN_IDENTIFY                   0xEC /* ask drive to identify itself    */
-#define WIN_MEDIAEJECT                 0xED
-#define WIN_IDENTIFY_DMA               0xEE /* same as WIN_IDENTIFY, but DMA */
-#define WIN_SETFEATURES                        0xEF /* set special drive features */
-#define EXABYTE_ENABLE_NEST            0xF0
-#define WIN_SECURITY_SET_PASS          0xF1
-#define WIN_SECURITY_UNLOCK            0xF2
-#define WIN_SECURITY_ERASE_PREPARE     0xF3
-#define WIN_SECURITY_ERASE_UNIT                0xF4
-#define WIN_SECURITY_FREEZE_LOCK       0xF5
-#define WIN_SECURITY_DISABLE           0xF6
-#define WIN_READ_NATIVE_MAX            0xF8 /* return the native maximum address */
-#define WIN_SET_MAX                    0xF9
-#define DISABLE_SEAGATE                        0xFB
-
-/* set to 1 set disable mult support */
-#define MAX_MULT_SECTORS 8
-
-struct IDEState;
-
-typedef void EndTransferFunc(struct IDEState *);
-
-typedef struct IDEState {
-    /* ide config */
-    int cylinders, heads, sectors;
-    int64_t nb_sectors;
-    int mult_sectors;
-    int irq;
-    /* ide regs */
-    uint8_t feature;
-    uint8_t error;
-    uint16_t nsector; /* 0 is 256 to ease computations */
-    uint8_t sector;
-    uint8_t lcyl;
-    uint8_t hcyl;
-    uint8_t select;
-    uint8_t status;
-    /* 0x3f6 command, only meaningful for drive 0 */
-    uint8_t cmd;
-    /* depends on bit 4 in select, only meaningful for drive 0 */
-    struct IDEState *cur_drive; 
-    BlockDriverState *bs;
-    int req_nb_sectors; /* number of sectors per interrupt */
-    EndTransferFunc *end_transfer_func;
-    uint8_t *data_ptr;
-    uint8_t *data_end;
-    uint8_t io_buffer[MAX_MULT_SECTORS*512 + 4];
-} IDEState;
-
-IDEState ide_state[MAX_DISKS];
-
-static void padstr(char *str, const char *src, int len)
-{
-    int i, v;
-    for(i = 0; i < len; i++) {
-        if (*src)
-            v = *src++;
-        else
-            v = ' ';
-        *(char *)((long)str ^ 1) = v;
-        str++;
-    }
-}
-
-static void ide_identify(IDEState *s)
-{
-    uint16_t *p;
-    unsigned int oldsize;
-
-    memset(s->io_buffer, 0, 512);
-    p = (uint16_t *)s->io_buffer;
-    stw_raw(p + 0, 0x0040);
-    stw_raw(p + 1, s->cylinders); 
-    stw_raw(p + 3, s->heads);
-    stw_raw(p + 4, 512 * s->sectors); /* sectors */
-    stw_raw(p + 5, 512); /* sector size */
-    stw_raw(p + 6, s->sectors); 
-    stw_raw(p + 20, 3); /* buffer type */
-    stw_raw(p + 21, 512); /* cache size in sectors */
-    stw_raw(p + 22, 4); /* ecc bytes */
-    padstr((uint8_t *)(p + 27), "QEMU HARDDISK", 40);
-#if MAX_MULT_SECTORS > 1    
-    stw_raw(p + 47, MAX_MULT_SECTORS);
-#endif
-    stw_raw(p + 48, 1); /* dword I/O */
-    stw_raw(p + 49, 1 << 9); /* LBA supported, no DMA */
-    stw_raw(p + 51, 0x200); /* PIO transfer cycle */
-    stw_raw(p + 52, 0x200); /* DMA transfer cycle */
-    stw_raw(p + 54, s->cylinders);
-    stw_raw(p + 55, s->heads);
-    stw_raw(p + 56, s->sectors);
-    oldsize = s->cylinders * s->heads * s->sectors;
-    stw_raw(p + 57, oldsize);
-    stw_raw(p + 58, oldsize >> 16);
-    if (s->mult_sectors)
-        stw_raw(p + 59, 0x100 | s->mult_sectors);
-    stw_raw(p + 60, s->nb_sectors);
-    stw_raw(p + 61, s->nb_sectors >> 16);
-    stw_raw(p + 80, (1 << 1) | (1 << 2));
-    stw_raw(p + 82, (1 << 14));
-    stw_raw(p + 83, (1 << 14));
-    stw_raw(p + 84, (1 << 14));
-    stw_raw(p + 85, (1 << 14));
-    stw_raw(p + 86, 0);
-    stw_raw(p + 87, (1 << 14));
-}
-
-static inline void ide_abort_command(IDEState *s)
-{
-    s->status = READY_STAT | ERR_STAT;
-    s->error = ABRT_ERR;
-}
-
-static inline void ide_set_irq(IDEState *s)
-{
-    if (!(ide_state[0].cmd & IDE_CMD_DISABLE_IRQ)) {
-        pic_set_irq(s->irq, 1);
-    }
-}
-
-/* prepare data transfer and tell what to do after */
-static void ide_transfer_start(IDEState *s, int size, 
-                               EndTransferFunc *end_transfer_func)
-{
-    s->end_transfer_func = end_transfer_func;
-    s->data_ptr = s->io_buffer;
-    s->data_end = s->io_buffer + size;
-    s->status |= DRQ_STAT;
-}
-
-static void ide_transfer_stop(IDEState *s)
-{
-    s->end_transfer_func = ide_transfer_stop;
-    s->data_ptr = s->io_buffer;
-    s->data_end = s->io_buffer;
-    s->status &= ~DRQ_STAT;
-}
-
-static int64_t ide_get_sector(IDEState *s)
-{
-    int64_t sector_num;
-    if (s->select & 0x40) {
-        /* lba */
-        sector_num = ((s->select & 0x0f) << 24) | (s->hcyl << 16) | 
-            (s->lcyl << 8) | s->sector;
-    } else {
-        sector_num = ((s->hcyl << 8) | s->lcyl) * s->heads * s->sectors +
-            (s->select & 0x0f) * s->sectors + 
-            (s->sector - 1);
-    }
-    return sector_num;
-}
-
-static void ide_set_sector(IDEState *s, int64_t sector_num)
-{
-    unsigned int cyl, r;
-    if (s->select & 0x40) {
-        s->select = (s->select & 0xf0) | (sector_num >> 24);
-        s->hcyl = (sector_num >> 16);
-        s->lcyl = (sector_num >> 8);
-        s->sector = (sector_num);
-    } else {
-        cyl = sector_num / (s->heads * s->sectors);
-        r = sector_num % (s->heads * s->sectors);
-        s->hcyl = cyl >> 8;
-        s->lcyl = cyl;
-        s->select = (s->select & 0xf0) | (r / s->sectors);
-        s->sector = (r % s->sectors) + 1;
-    }
-}
-
-static void ide_sector_read(IDEState *s)
-{
-    int64_t sector_num;
-    int ret, n;
-
-    s->status = READY_STAT | SEEK_STAT;
-    sector_num = ide_get_sector(s);
-    n = s->nsector;
-    if (n == 0) {
-        /* no more sector to read from disk */
-        ide_transfer_stop(s);
-    } else {
-#if defined(DEBUG_IDE)
-        printf("read sector=%Ld\n", sector_num);
-#endif
-        if (n > s->req_nb_sectors)
-            n = s->req_nb_sectors;
-        ret = bdrv_read(s->bs, sector_num, s->io_buffer, n);
-        ide_transfer_start(s, 512 * n, ide_sector_read);
-        ide_set_irq(s);
-        ide_set_sector(s, sector_num + n);
-        s->nsector -= n;
-    }
-}
-
-static void ide_sector_write(IDEState *s)
-{
-    int64_t sector_num;
-    int ret, n, n1;
-
-    s->status = READY_STAT | SEEK_STAT;
-    sector_num = ide_get_sector(s);
-#if defined(DEBUG_IDE)
-    printf("write sector=%Ld\n", sector_num);
-#endif
-    n = s->nsector;
-    if (n > s->req_nb_sectors)
-        n = s->req_nb_sectors;
-    ret = bdrv_write(s->bs, sector_num, s->io_buffer, n);
-    s->nsector -= n;
-    if (s->nsector == 0) {
-        /* no more sector to write */
-        ide_transfer_stop(s);
-    } else {
-        n1 = s->nsector;
-        if (n1 > s->req_nb_sectors)
-            n1 = s->req_nb_sectors;
-        ide_transfer_start(s, 512 * n1, ide_sector_write);
-    }
-    ide_set_sector(s, sector_num + n);
-    ide_set_irq(s);
-}
-
-void ide_ioport_write(CPUX86State *env, uint32_t addr, uint32_t val)
-{
-    IDEState *s = ide_state[0].cur_drive;
-    int unit, n;
-
-    addr &= 7;
-#ifdef DEBUG_IDE
-    printf("IDE: write addr=0x%x val=0x%02x\n", addr, val);
-#endif
-    switch(addr) {
-    case 0:
-        break;
-    case 1:
-        s->feature = val;
-        break;
-    case 2:
-        if (val == 0)
-            val = 256;
-        s->nsector = val;
-        break;
-    case 3:
-        s->sector = val;
-        break;
-    case 4:
-        s->lcyl = val;
-        break;
-    case 5:
-        s->hcyl = val;
-        break;
-    case 6:
-        /* select drive */
-        unit = (val >> 4) & 1;
-        s = &ide_state[unit];
-        ide_state[0].cur_drive = s;
-        s->select = val;
-        break;
-    default:
-    case 7:
-        /* command */
-#if defined(DEBUG_IDE)
-        printf("ide: CMD=%02x\n", val);
-#endif
-        switch(val) {
-        case WIN_PIDENTIFY:
-        case WIN_IDENTIFY:
-            if (s->bs) {
-                ide_identify(s);
-                s->status = READY_STAT;
-                ide_transfer_start(s, 512, ide_transfer_stop);
-            } else {
-                ide_abort_command(s);
-            }
-            ide_set_irq(s);
-            break;
-        case WIN_SPECIFY:
-        case WIN_RECAL:
-            s->status = READY_STAT;
-            ide_set_irq(s);
-            break;
-        case WIN_SETMULT:
-            if (s->nsector > MAX_MULT_SECTORS || 
-                s->nsector == 0 ||
-                (s->nsector & (s->nsector - 1)) != 0) {
-                ide_abort_command(s);
-            } else {
-                s->mult_sectors = s->nsector;
-                s->status = READY_STAT;
-            }
-            ide_set_irq(s);
-            break;
-        case WIN_READ:
-        case WIN_READ_ONCE:
-            s->req_nb_sectors = 1;
-            ide_sector_read(s);
-            break;
-        case WIN_WRITE:
-        case WIN_WRITE_ONCE:
-            s->status = SEEK_STAT;
-            s->req_nb_sectors = 1;
-            ide_transfer_start(s, 512, ide_sector_write);
-            break;
-        case WIN_MULTREAD:
-            if (!s->mult_sectors)
-                goto abort_cmd;
-            s->req_nb_sectors = s->mult_sectors;
-            ide_sector_read(s);
-            break;
-        case WIN_MULTWRITE:
-            if (!s->mult_sectors)
-                goto abort_cmd;
-            s->status = SEEK_STAT;
-            s->req_nb_sectors = s->mult_sectors;
-            n = s->nsector;
-            if (n > s->req_nb_sectors)
-                n = s->req_nb_sectors;
-            ide_transfer_start(s, 512 * n, ide_sector_write);
-            break;
-        case WIN_READ_NATIVE_MAX:
-            ide_set_sector(s, s->nb_sectors - 1);
-            s->status = READY_STAT;
-            ide_set_irq(s);
-            break;
-        default:
-        abort_cmd:
-            ide_abort_command(s);
-            ide_set_irq(s);
-            break;
-        }
-    }
-}
-
-uint32_t ide_ioport_read(CPUX86State *env, uint32_t addr)
-{
-    IDEState *s = ide_state[0].cur_drive;
-    int ret;
-
-    addr &= 7;
-    switch(addr) {
-    case 0:
-        ret = 0xff;
-        break;
-    case 1:
-        ret = s->error;
-        break;
-    case 2:
-        ret = s->nsector & 0xff;
-        break;
-    case 3:
-        ret = s->sector;
-        break;
-    case 4:
-        ret = s->lcyl;
-        break;
-    case 5:
-        ret = s->hcyl;
-        break;
-    case 6:
-        ret = s->select;
-        break;
-    default:
-    case 7:
-        ret = s->status;
-        pic_set_irq(s->irq, 0);
-        break;
-    }
-#ifdef DEBUG_IDE
-    printf("ide: read addr=0x%x val=%02x\n", addr, ret);
-#endif
-    return ret;
-}
-
-uint32_t ide_status_read(CPUX86State *env, uint32_t addr)
-{
-    IDEState *s = ide_state[0].cur_drive;
-    int ret;
-    ret = s->status;
-#ifdef DEBUG_IDE
-    printf("ide: read status val=%02x\n", ret);
-#endif
-    return ret;
-}
-
-void ide_cmd_write(CPUX86State *env, uint32_t addr, uint32_t val)
-{
-    IDEState *s;
-    int i;
-
-#ifdef DEBUG_IDE
-    printf("ide: write control val=%02x\n", val);
-#endif
-    /* common for both drives */
-    if (!(ide_state[0].cmd & IDE_CMD_RESET) &&
-        (val & IDE_CMD_RESET)) {
-        /* reset low to high */
-        for(i = 0;i < 2; i++) {
-            s = &ide_state[i];
-            s->status = BUSY_STAT | SEEK_STAT;
-            s->error = 0x01;
-        }
-    } else if ((ide_state[0].cmd & IDE_CMD_RESET) &&
-               !(val & IDE_CMD_RESET)) {
-        /* high to low */
-        for(i = 0;i < 2; i++) {
-            s = &ide_state[i];
-            s->status = READY_STAT;
-            /* set hard disk drive ID */
-            s->select &= 0xf0; /* clear head */
-            s->nsector = 1;
-            s->sector = 1;
-            if (s->nb_sectors == 0) {
-                /* no disk present */
-                s->lcyl = 0x12;
-                s->hcyl = 0x34;
-            } else {
-                s->lcyl = 0;
-                s->hcyl = 0;
-            }
-        }
-    }
-
-    ide_state[0].cmd = val;
-}
-
-void ide_data_writew(CPUX86State *env, uint32_t addr, uint32_t val)
-{
-    IDEState *s = ide_state[0].cur_drive;
-    uint8_t *p;
-
-    p = s->data_ptr;
-    *(uint16_t *)p = tswap16(val);
-    p += 2;
-    s->data_ptr = p;
-    if (p >= s->data_end)
-        s->end_transfer_func(s);
-}
-
-uint32_t ide_data_readw(CPUX86State *env, uint32_t addr)
-{
-    IDEState *s = ide_state[0].cur_drive;
-    uint8_t *p;
-    int ret;
-    
-    p = s->data_ptr;
-    ret = tswap16(*(uint16_t *)p);
-    p += 2;
-    s->data_ptr = p;
-    if (p >= s->data_end)
-        s->end_transfer_func(s);
-    return ret;
-}
-
-void ide_data_writel(CPUX86State *env, uint32_t addr, uint32_t val)
-{
-    IDEState *s = ide_state[0].cur_drive;
-    uint8_t *p;
-
-    p = s->data_ptr;
-    *(uint32_t *)p = tswap32(val);
-    p += 4;
-    s->data_ptr = p;
-    if (p >= s->data_end)
-        s->end_transfer_func(s);
-}
-
-uint32_t ide_data_readl(CPUX86State *env, uint32_t addr)
-{
-    IDEState *s = ide_state[0].cur_drive;
-    uint8_t *p;
-    int ret;
-    
-    p = s->data_ptr;
-    ret = tswap32(*(uint32_t *)p);
-    p += 4;
-    s->data_ptr = p;
-    if (p >= s->data_end)
-        s->end_transfer_func(s);
-    return ret;
-}
-
-void ide_reset(IDEState *s)
-{
-    s->mult_sectors = MAX_MULT_SECTORS;
-    s->status = READY_STAT;
-    s->cur_drive = s;
-    s->select = 0xa0;
-}
-
-struct partition {
-       uint8_t boot_ind;               /* 0x80 - active */
-       uint8_t head;           /* starting head */
-       uint8_t sector;         /* starting sector */
-       uint8_t cyl;            /* starting cylinder */
-       uint8_t sys_ind;                /* What partition type */
-       uint8_t end_head;               /* end head */
-       uint8_t end_sector;     /* end sector */
-       uint8_t end_cyl;                /* end cylinder */
-       uint32_t start_sect;    /* starting sector counting from 0 */
-       uint32_t nr_sects;              /* nr of sectors in partition */
-} __attribute__((packed));
-
-/* try to guess the IDE geometry from the MSDOS partition table */
-void ide_guess_geometry(IDEState *s)
-{
-    uint8_t buf[512];
-    int ret, i;
-    struct partition *p;
-    uint32_t nr_sects;
-
-    if (s->cylinders != 0)
-        return;
-    ret = bdrv_read(s->bs, 0, buf, 1);
-    if (ret < 0)
-        return;
-    /* test msdos magic */
-    if (buf[510] != 0x55 || buf[511] != 0xaa)
-        return;
-    for(i = 0; i < 4; i++) {
-        p = ((struct partition *)(buf + 0x1be)) + i;
-        nr_sects = tswap32(p->nr_sects);
-        if (nr_sects && p->end_head) {
-            /* We make the assumption that the partition terminates on
-               a cylinder boundary */
-            s->heads = p->end_head + 1;
-            s->sectors = p->end_sector & 63;
-            s->cylinders = s->nb_sectors / (s->heads * s->sectors);
-#if 0
-            printf("guessed partition: CHS=%d %d %d\n", 
-                   s->cylinders, s->heads, s->sectors);
-#endif
-        }
-    }
-}
-
-void ide_init(void)
-{
-    IDEState *s;
-    int i, cylinders;
-    int64_t nb_sectors;
-
-    for(i = 0; i < MAX_DISKS; i++) {
-        s = &ide_state[i];
-        s->bs = bs_table[i];
-        if (s->bs) {
-            bdrv_get_geometry(s->bs, &nb_sectors);
-            s->nb_sectors = nb_sectors;
-            ide_guess_geometry(s);
-            if (s->cylinders == 0) {
-                /* if no geometry, use a LBA compatible one */
-                cylinders = nb_sectors / (16 * 63);
-                if (cylinders > 16383)
-                    cylinders = 16383;
-                else if (cylinders < 2)
-                    cylinders = 2;
-                s->cylinders = cylinders;
-                s->heads = 16;
-                s->sectors = 63;
-            }
-        }
-        s->irq = 14;
-        ide_reset(s);
-    }
-    register_ioport_write(0x1f0, 8, ide_ioport_write, 1);
-    register_ioport_read(0x1f0, 8, ide_ioport_read, 1);
-    register_ioport_read(0x3f6, 1, ide_status_read, 1);
-    register_ioport_write(0x3f6, 1, ide_cmd_write, 1);
-
-    /* data ports */
-    register_ioport_write(0x1f0, 2, ide_data_writew, 2);
-    register_ioport_read(0x1f0, 2, ide_data_readw, 2);
-    register_ioport_write(0x1f0, 4, ide_data_writel, 4);
-    register_ioport_read(0x1f0, 4, ide_data_readl, 4);
-}
-
-/***********************************************************/
 /* keyboard emulation */
 
 /*     Keyboard Controller Commands */
@@ -2594,8 +1879,8 @@ void ide_init(void)
 #define KBD_CCMD_WRITE_AUX_OBUF        0xD3    /* Write to output buffer as if
                                           initiated by the auxiliary device */
 #define KBD_CCMD_WRITE_MOUSE   0xD4    /* Write the following byte to the mouse */
-#define KBD_CCMD_ENABLE_A20     0xDD
-#define KBD_CCMD_DISABLE_A20    0xDF
+#define KBD_CCMD_DISABLE_A20    0xDD    /* HP vectra only ? */
+#define KBD_CCMD_ENABLE_A20     0xDF    /* HP vectra only ? */
 #define KBD_CCMD_RESET         0xFE
 
 /* Keyboard Commands */
@@ -2685,7 +1970,6 @@ typedef struct KBDState {
 
 KBDState kbd_state;
 int reset_requested;
-int a20_enabled;
 
 /* update irq and KBD_STAT_[MOUSE_]OBF */
 static void kbd_update_irq(KBDState *s)
@@ -2802,17 +2086,17 @@ void kbd_write_command(CPUX86State *env, uint32_t addr, uint32_t val)
         kbd_queue(s, val, 0);
         break;
     case KBD_CCMD_ENABLE_A20:
-        a20_enabled = 1;
+        cpu_x86_set_a20(env, 1);
         break;
     case KBD_CCMD_DISABLE_A20:
-        a20_enabled = 0;
+        cpu_x86_set_a20(env, 0);
         break;
     case KBD_CCMD_RESET:
         reset_requested = 1;
         cpu_x86_interrupt(global_env, CPU_INTERRUPT_EXIT);
         break;
     default:
-        fprintf(stderr, "vl: unsupported keyboard cmd=0x%02x\n", val);
+        fprintf(stderr, "qemu: unsupported keyboard cmd=0x%02x\n", val);
         break;
     }
 }
@@ -2875,6 +2159,7 @@ static void kbd_write_keyboard(KBDState *s, int val)
         case KBD_CMD_SET_LEDS:
         case KBD_CMD_SET_RATE:
             s->kbd_write_cmd = val;
+            kbd_queue(s, KBD_REPLY_ACK, 0);
             break;
         case KBD_CMD_RESET_DISABLE:
             kbd_reset_keyboard(s);
@@ -3129,7 +2414,7 @@ void kbd_write_data(CPUX86State *env, uint32_t addr, uint32_t val)
         kbd_queue(s, val, 1);
         break;
     case KBD_CCMD_WRITE_OUTPORT:
-        a20_enabled = (val >> 1) & 1;
+        cpu_x86_set_a20(env, (val >> 1) & 1);
         if (!(val & 1)) {
             reset_requested = 1;
             cpu_x86_interrupt(global_env, CPU_INTERRUPT_EXIT);
@@ -3319,6 +2604,12 @@ static void host_alarm_handler(int host_signum, siginfo_t *info,
     }
 }
 
+#ifdef CONFIG_SOFTMMU
+void *get_mmap_addr(unsigned long size)
+{
+    return NULL;
+}
+#else
 unsigned long mmap_addr = PHYS_RAM_BASE;
 
 void *get_mmap_addr(unsigned long size)
@@ -3328,6 +2619,7 @@ void *get_mmap_addr(unsigned long size)
     mmap_addr += ((size + 4095) & ~4095) + 4096;
     return (void *)addr;
 }
+#endif
 
 /* main execution loop */
 
@@ -3451,8 +2743,10 @@ void help(void)
            "'disk_image' is a raw hard image image for IDE hard disk 0\n"
            "\n"
            "Standard options:\n"
-           "-hda file       use 'file' as IDE hard disk 0 image\n"
-           "-hdb file       use 'file' as IDE hard disk 1 image\n"
+           "-hda/-hdb file  use 'file' as IDE hard disk 0/1 image\n"
+           "-hdc/-hdd file  use 'file' as IDE hard disk 2/3 image\n"
+           "-cdrom file     use 'file' as IDE cdrom 2 image\n"
+           "-boot [c|d]     boot on hard disk or CD-ROM\n"
           "-snapshot       write to temporary files instead of disk image files\n"
            "-m megs         set virtual RAM size to megs MB\n"
            "-n script       set network init script [default=%s]\n"
@@ -3499,6 +2793,10 @@ struct option long_options[] = {
     { "kernel", 1, NULL, 0, },
     { "append", 1, NULL, 0, },
     { "tun-fd", 1, NULL, 0, },
+    { "hdc", 1, NULL, 0, },
+    { "hdd", 1, NULL, 0, },
+    { "cdrom", 1, NULL, 0, },
+    { "boot", 1, NULL, 0, },
     { NULL, 0, NULL, 0 },
 };
 
@@ -3522,7 +2820,7 @@ int main(int argc, char **argv)
     struct sigaction act;
     struct itimerval itv;
     CPUX86State *env;
-    const char *tmpdir, *initrd_filename;
+    const char *initrd_filename;
     const char *hd_filename[MAX_DISKS];
     const char *kernel_filename, *kernel_cmdline;
     DisplayState *ds = &display_state;
@@ -3576,9 +2874,7 @@ int main(int argc, char **argv)
                     secs = strtol(p, (char **)&p, 0);
                     if (*p != '\0')
                         goto chs_fail;
-                    ide_state[0].cylinders = cyls;
-                    ide_state[0].heads = heads;
-                    ide_state[0].sectors = secs;
+                    ide_set_geometry(0, cyls, heads, secs);
                 chs_fail: ;
                 }
                 break;
@@ -3594,6 +2890,23 @@ int main(int argc, char **argv)
            case 8:
                net_fd = atoi(optarg);
                break;
+            case 9:
+                hd_filename[2] = optarg;
+                break;
+            case 10:
+                hd_filename[3] = optarg;
+                break;
+            case 11:
+                hd_filename[2] = optarg;
+                ide_set_cdrom(2, 1);
+                break;
+            case 12:
+                boot_device = optarg[0];
+                if (boot_device != 'c' && boot_device != 'd') {
+                    fprintf(stderr, "qemu: invalid boot device '%c'\n", boot_device);
+                    exit(1);
+                }
+                break;
             }
             break;
         case 'h':
@@ -3604,7 +2917,7 @@ int main(int argc, char **argv)
             if (phys_ram_size <= 0)
                 help();
             if (phys_ram_size > PHYS_RAM_MAX_SIZE) {
-                fprintf(stderr, "vl: at most %d MB RAM can be simulated\n",
+                fprintf(stderr, "qemu: at most %d MB RAM can be simulated\n",
                         PHYS_RAM_MAX_SIZE / (1024 * 1024));
                 exit(1);
             }
@@ -3633,7 +2946,7 @@ int main(int argc, char **argv)
 
     linux_boot = (kernel_filename != NULL);
         
-    if (!linux_boot && hd_filename[0] == '\0')
+    if (!linux_boot && hd_filename[0] == '\0' && hd_filename[2] == '\0')
         help();
 
     /* init debug */
@@ -3644,39 +2957,54 @@ int main(int argc, char **argv)
        net_init();
 
     /* init the memory */
-    tmpdir = getenv("QEMU_TMPDIR");
-    if (!tmpdir)
-        tmpdir = "/tmp";
-    snprintf(phys_ram_file, sizeof(phys_ram_file), "%s/vlXXXXXX", tmpdir);
-    if (mkstemp(phys_ram_file) < 0) {
-        fprintf(stderr, "Could not create temporary memory file '%s'\n", 
-                phys_ram_file);
-        exit(1);
-    }
-    phys_ram_fd = open(phys_ram_file, O_CREAT | O_TRUNC | O_RDWR, 0600);
-    if (phys_ram_fd < 0) {
-        fprintf(stderr, "Could not open temporary memory file '%s'\n", 
-                phys_ram_file);
-        exit(1);
-    }
     total_ram_size = phys_ram_size + vga_ram_size;
-    ftruncate(phys_ram_fd, total_ram_size);
-    unlink(phys_ram_file);
-    phys_ram_base = mmap(get_mmap_addr(total_ram_size), 
-                         total_ram_size, 
-                         PROT_WRITE | PROT_READ, MAP_SHARED | MAP_FIXED, 
-                         phys_ram_fd, 0);
-    if (phys_ram_base == MAP_FAILED) {
-        fprintf(stderr, "Could not map physical memory\n");
+
+#ifdef CONFIG_SOFTMMU
+    phys_ram_base = malloc(total_ram_size);
+    if (!phys_ram_base) {
+        fprintf(stderr, "Could not allocate physical memory\n");
         exit(1);
     }
+#else
+    /* as we must map the same page at several addresses, we must use
+       a fd */
+    {
+        const char *tmpdir;
+
+        tmpdir = getenv("QEMU_TMPDIR");
+        if (!tmpdir)
+            tmpdir = "/tmp";
+        snprintf(phys_ram_file, sizeof(phys_ram_file), "%s/vlXXXXXX", tmpdir);
+        if (mkstemp(phys_ram_file) < 0) {
+            fprintf(stderr, "Could not create temporary memory file '%s'\n", 
+                    phys_ram_file);
+            exit(1);
+        }
+        phys_ram_fd = open(phys_ram_file, O_CREAT | O_TRUNC | O_RDWR, 0600);
+        if (phys_ram_fd < 0) {
+            fprintf(stderr, "Could not open temporary memory file '%s'\n", 
+                    phys_ram_file);
+            exit(1);
+        }
+        ftruncate(phys_ram_fd, total_ram_size);
+        unlink(phys_ram_file);
+        phys_ram_base = mmap(get_mmap_addr(total_ram_size), 
+                             total_ram_size, 
+                             PROT_WRITE | PROT_READ, MAP_SHARED | MAP_FIXED, 
+                             phys_ram_fd, 0);
+        if (phys_ram_base == MAP_FAILED) {
+            fprintf(stderr, "Could not map physical memory\n");
+            exit(1);
+        }
+    }
+#endif
 
     /* open the virtual block devices */
     for(i = 0; i < MAX_DISKS; i++) {
         if (hd_filename[i]) {
             bs_table[i] = bdrv_open(hd_filename[i], snapshot);
             if (!bs_table[i]) {
-                fprintf(stderr, "vl: could not open hard disk image '%s\n",
+                fprintf(stderr, "qemu: could not open hard disk image '%s\n",
                         hd_filename[i]);
                 exit(1);
             }
@@ -3697,7 +3025,7 @@ int main(int argc, char **argv)
         /* now we can load the kernel */
         ret = load_kernel(kernel_filename, phys_ram_base + KERNEL_LOAD_ADDR);
         if (ret < 0) {
-            fprintf(stderr, "vl: could not load kernel '%s'\n", 
+            fprintf(stderr, "qemu: could not load kernel '%s'\n", 
                     kernel_filename);
             exit(1);
         }
@@ -3707,7 +3035,7 @@ int main(int argc, char **argv)
         if (initrd_filename) {
             initrd_size = load_image(initrd_filename, phys_ram_base + INITRD_LOAD_ADDR);
             if (initrd_size < 0) {
-                fprintf(stderr, "vl: could not load initial ram disk '%s'\n", 
+                fprintf(stderr, "qemu: could not load initial ram disk '%s'\n", 
                         initrd_filename);
                 exit(1);
             }
@@ -3717,14 +3045,14 @@ int main(int argc, char **argv)
         params = (void *)(phys_ram_base + KERNEL_PARAMS_ADDR);
         memset(params, 0, sizeof(struct linux_params));
         params->mount_root_rdonly = 0;
-        params->cl_magic = 0xA33F;
-        params->cl_offset = params->commandline - (uint8_t *)params;
-        params->alt_mem_k = (phys_ram_size / 1024) - 1024;
+        stw_raw(&params->cl_magic, 0xA33F);
+        stw_raw(&params->cl_offset, params->commandline - (uint8_t *)params);
+        stl_raw(&params->alt_mem_k, (phys_ram_size / 1024) - 1024);
         pstrcat(params->commandline, sizeof(params->commandline), kernel_cmdline);
         params->loader_type = 0x01;
         if (initrd_size > 0) {
-            params->initrd_start = INITRD_LOAD_ADDR;
-            params->initrd_size = initrd_size;
+            stl_raw(&params->initrd_start, INITRD_LOAD_ADDR);
+            stl_raw(&params->initrd_size, initrd_size);
         }
         params->orig_video_lines = 25;
         params->orig_video_cols = 80;
@@ -3735,11 +3063,11 @@ int main(int argc, char **argv)
         
         memset(params->idt_table, 0, sizeof(params->idt_table));
         
-        params->gdt_table[2] = 0x00cf9a000000ffffLL; /* KERNEL_CS */
-        params->gdt_table[3] = 0x00cf92000000ffffLL; /* KERNEL_DS */
+        stq_raw(&params->gdt_table[2], 0x00cf9a000000ffffLL); /* KERNEL_CS */
+        stq_raw(&params->gdt_table[3], 0x00cf92000000ffffLL); /* KERNEL_DS */
         /* for newer kernels (2.6.0) CS/DS are at different addresses */
-        params->gdt_table[12] = 0x00cf9a000000ffffLL; /* KERNEL_CS */
-        params->gdt_table[13] = 0x00cf92000000ffffLL; /* KERNEL_DS */
+        stq_raw(&params->gdt_table[12], 0x00cf9a000000ffffLL); /* KERNEL_CS */
+        stq_raw(&params->gdt_table[13], 0x00cf92000000ffffLL); /* KERNEL_DS */
         
         env->idt.base = (void *)((uint8_t *)params->idt_table - phys_ram_base);
         env->idt.limit = sizeof(params->idt_table) - 1;
@@ -3766,7 +3094,7 @@ int main(int argc, char **argv)
         snprintf(buf, sizeof(buf), "%s/%s", bios_dir, BIOS_FILENAME);
         ret = load_image(buf, phys_ram_base + 0x000f0000);
         if (ret != 0x10000) {
-            fprintf(stderr, "vl: could not load PC bios '%s'\n", buf);
+            fprintf(stderr, "qemu: could not load PC bios '%s'\n", buf);
             exit(1);
         }
 
@@ -3844,7 +3172,7 @@ int main(int argc, char **argv)
     timer_ms = itv.it_interval.tv_usec / 1000;
     pit_min_timer_count = ((uint64_t)itv.it_interval.tv_usec * PIT_FREQ) / 
         1000000;
-    
+
     if (use_gdbstub) {
         cpu_gdbstub(NULL, main_loop, gdbstub_port);
     } else {