Commit 27e0c9a1 authored by Floris Bos's avatar Floris Bos Committed by Kevin Wolf
Browse files

ide: Add "model=s" qdev option 



Allow the user to override the default disk model name "QEMU HARDDISK".

Some Linux distributions use the /dev/disk/by-id/scsi-SATA_name-of-disk-
model_serial addressing scheme when refering to partitions in /etc/fstab
and elsewhere. This causes problems when starting a disk image taken from
an existing physical server under qemu, because when running under qemu
name-of-disk-model is always "QEMU HARDDISK".

This patch introduces a model=s option which in combination with the
existing serial=s option can be used to fake the disk the operating
system was previously on, allowing the OS to boot properly.

Cc: kwolf@redhat.com
Signed-off-by: default avatarFloris Bos <dev@noc-ps.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 2844bdd9

hw/ide/core.c

+22 −5
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ static void ide_identify(IDEState *s) 
    put_le16(p + 21, 512); /* cache size in sectors */

    put_le16(p + 22, 4); /* ecc bytes */

    padstr((char *)(p + 23), s->version, 8); /* firmware version */

    padstr((char *)(p + 27), "QEMU HARDDISK", 40); /* model */

    padstr((char *)(p + 27), s->drive_model_str, 40); /* model */

#if MAX_MULT_SECTORS > 1

    put_le16(p + 47, 0x8000 | MAX_MULT_SECTORS);

#endif
@@ -188,7 +188,7 @@ static void ide_atapi_identify(IDEState *s) 
    put_le16(p + 21, 512); /* cache size in sectors */

    put_le16(p + 22, 4); /* ecc bytes */

    padstr((char *)(p + 23), s->version, 8); /* firmware version */

    padstr((char *)(p + 27), "QEMU DVD-ROM", 40); /* model */

    padstr((char *)(p + 27), s->drive_model_str, 40); /* model */

    put_le16(p + 48, 1); /* dword I/O (XXX: should not be set on CDROM) */

#ifdef USE_DMA_CDROM

    put_le16(p + 49, 1 << 9 | 1 << 8); /* DMA and LBA supported */
@@ -245,7 +245,7 @@ static void ide_cfata_identify(IDEState *s) 
    padstr((char *)(p + 10), s->drive_serial_str, 20); /* serial number */

    put_le16(p + 22, 0x0004);			/* ECC bytes */

    padstr((char *) (p + 23), s->version, 8);	/* Firmware Revision */

    padstr((char *) (p + 27), "QEMU MICRODRIVE", 40);/* Model number */

    padstr((char *) (p + 27), s->drive_model_str, 40);/* Model number */

#if MAX_MULT_SECTORS > 1

    put_le16(p + 47, 0x8000 | MAX_MULT_SECTORS);

#else
@@ -1833,7 +1833,7 @@ static const BlockDevOps ide_cd_block_ops = { 
};



int ide_init_drive(IDEState *s, BlockDriverState *bs, IDEDriveKind kind,

                   const char *version, const char *serial)

                   const char *version, const char *serial, const char *model)

{

    int cylinders, heads, secs;

    uint64_t nb_sectors;
@@ -1884,6 +1884,22 @@ int ide_init_drive(IDEState *s, BlockDriverState *bs, IDEDriveKind kind, 
        snprintf(s->drive_serial_str, sizeof(s->drive_serial_str),

                 "QM%05d", s->drive_serial);

    }

    if (model) {

        pstrcpy(s->drive_model_str, sizeof(s->drive_model_str), model);

    } else {

        switch (kind) {

        case IDE_CD:

            strcpy(s->drive_model_str, "QEMU DVD-ROM");

            break;

        case IDE_CFATA:

            strcpy(s->drive_model_str, "QEMU MICRODRIVE");

            break;

        default:

            strcpy(s->drive_model_str, "QEMU HARDDISK");

            break;

        }

    }



    if (version) {

        pstrcpy(s->version, sizeof(s->version), version);

    } else {
@@ -1976,7 +1992,8 @@ void ide_init2_with_non_qdev_drives(IDEBus *bus, DriveInfo *hd0, 
        if (dinfo) {

            if (ide_init_drive(&bus->ifs[i], dinfo->bdrv,

                               dinfo->media_cd ? IDE_CD : IDE_HD, NULL,

                               *dinfo->serial ? dinfo->serial : NULL) < 0) {

                               *dinfo->serial ? dinfo->serial : NULL,

                               NULL) < 0) {

                error_report("Can't set up IDE drive %s", dinfo->id);

                exit(1);

            }

hw/ide/internal.h

+3 −1
Original line number Diff line number Diff line
@@ -348,6 +348,7 @@ struct IDEState { 
    uint8_t identify_data[512];

    int drive_serial;

    char drive_serial_str[21];

    char drive_model_str[41];

    /* ide regs */

    uint8_t feature;

    uint8_t error;
@@ -468,6 +469,7 @@ struct IDEDevice { 
    BlockConf conf;

    char *version;

    char *serial;

    char *model;

};



#define BM_STATUS_DMAING 0x01
@@ -534,7 +536,7 @@ void ide_data_writel(void *opaque, uint32_t addr, uint32_t val); 
uint32_t ide_data_readl(void *opaque, uint32_t addr);



int ide_init_drive(IDEState *s, BlockDriverState *bs, IDEDriveKind kind,

                   const char *version, const char *serial);

                   const char *version, const char *serial, const char *model);

void ide_init2(IDEBus *bus, qemu_irq irq);

void ide_init2_with_non_qdev_drives(IDEBus *bus, DriveInfo *hd0,

                                    DriveInfo *hd1, qemu_irq irq);

hw/ide/qdev.c

+4 −2
Original line number Diff line number Diff line
@@ -136,7 +136,8 @@ static int ide_dev_initfn(IDEDevice *dev, IDEDriveKind kind) 
        }

    }



    if (ide_init_drive(s, dev->conf.bs, kind, dev->version, serial) < 0) {

    if (ide_init_drive(s, dev->conf.bs, kind,

                       dev->version, serial, dev->model) < 0) {

        return -1;

    }
@@ -173,7 +174,8 @@ static int ide_drive_initfn(IDEDevice *dev) 
#define DEFINE_IDE_DEV_PROPERTIES()                     \

    DEFINE_BLOCK_PROPERTIES(IDEDrive, dev.conf),        \

    DEFINE_PROP_STRING("ver",  IDEDrive, dev.version),  \

    DEFINE_PROP_STRING("serial",  IDEDrive, dev.serial)

    DEFINE_PROP_STRING("serial",  IDEDrive, dev.serial),\

    DEFINE_PROP_STRING("model", IDEDrive, dev.model)



static Property ide_hd_properties[] = {

    DEFINE_IDE_DEV_PROPERTIES(),