Commit 95ebda85 authored by Floris Bos's avatar Floris Bos Committed by Kevin Wolf
Browse files

ide: Adds wwn=hex qdev option 



Allow the user to specify a disk's World Wide Name.

Linux guests can address disks by their unique World Wide Name number
(e.g. /dev/disk/by-id/wwn-0x5001517959123522). This patch adds support
for assigning a World Wide Name number to a virtual IDE disk.

Cc: kwolf@redhat.com
Signed-off-by: default avatarFloris Bos <dev@noc-ps.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent aa2c91bd

hw/ide/core.c

+23 −6
Original line number Diff line number Diff line
@@ -142,8 +142,12 @@ static void ide_identify(IDEState *s) 
    put_le16(p + 82, (1 << 14) | (1 << 5) | 1);

    /* 13=flush_cache_ext,12=flush_cache,10=lba48 */

    put_le16(p + 83, (1 << 14) | (1 << 13) | (1 <<12) | (1 << 10));

    /* 14=set to 1, 1=SMART self test, 0=SMART error logging */

    /* 14=set to 1, 8=has WWN, 1=SMART self test, 0=SMART error logging */

    if (s->wwn) {

        put_le16(p + 84, (1 << 14) | (1 << 8) | 0);

    } else {

        put_le16(p + 84, (1 << 14) | 0);

    }

    /* 14 = NOP supported, 5=WCACHE enabled, 0=SMART feature set enabled */

    if (bdrv_enable_write_cache(s->bs))

         put_le16(p + 85, (1 << 14) | (1 << 5) | 1);
@@ -151,8 +155,12 @@ static void ide_identify(IDEState *s) 
         put_le16(p + 85, (1 << 14) | 1);

    /* 13=flush_cache_ext,12=flush_cache,10=lba48 */

    put_le16(p + 86, (1 << 13) | (1 <<12) | (1 << 10));

    /* 14=set to 1, 1=smart self test, 0=smart error logging */

    /* 14=set to 1, 8=has WWN, 1=SMART self test, 0=SMART error logging */

    if (s->wwn) {

        put_le16(p + 87, (1 << 14) | (1 << 8) | 0);

    } else {

        put_le16(p + 87, (1 << 14) | 0);

    }

    put_le16(p + 88, 0x3f | (1 << 13)); /* udma5 set and supported */

    put_le16(p + 93, 1 | (1 << 14) | 0x2000);

    put_le16(p + 100, s->nb_sectors);
@@ -162,6 +170,13 @@ static void ide_identify(IDEState *s) 


    if (dev && dev->conf.physical_block_size)

        put_le16(p + 106, 0x6000 | get_physical_block_exp(&dev->conf));

    if (s->wwn) {

        /* LE 16-bit words 111-108 contain 64-bit World Wide Name */

        put_le16(p + 108, s->wwn >> 48);

        put_le16(p + 109, s->wwn >> 32);

        put_le16(p + 110, s->wwn >> 16);

        put_le16(p + 111, s->wwn);

    }

    if (dev && dev->conf.discard_granularity) {

        put_le16(p + 169, 1); /* TRIM support */

    }
@@ -1833,7 +1848,8 @@ 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 *model)

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

                   uint64_t wwn)

{

    int cylinders, heads, secs;

    uint64_t nb_sectors;
@@ -1859,6 +1875,7 @@ int ide_init_drive(IDEState *s, BlockDriverState *bs, IDEDriveKind kind, 
    s->heads = heads;

    s->sectors = secs;

    s->nb_sectors = nb_sectors;

    s->wwn = wwn;

    /* The SMART values should be preserved across power cycles

       but they aren't.  */

    s->smart_enabled = 1;
@@ -1993,7 +2010,7 @@ void ide_init2_with_non_qdev_drives(IDEBus *bus, DriveInfo *hd0, 
            if (ide_init_drive(&bus->ifs[i], dinfo->bdrv,

                               dinfo->media_cd ? IDE_CD : IDE_HD, NULL,

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

                               NULL) < 0) {

                               NULL, 0) < 0) {

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

                exit(1);

            }

hw/ide/internal.h

+4 −1
Original line number Diff line number Diff line
@@ -349,6 +349,7 @@ struct IDEState { 
    int drive_serial;

    char drive_serial_str[21];

    char drive_model_str[41];

    uint64_t wwn;

    /* ide regs */

    uint8_t feature;

    uint8_t error;
@@ -470,6 +471,7 @@ struct IDEDevice { 
    char *version;

    char *serial;

    char *model;

    uint64_t wwn;

};



#define BM_STATUS_DMAING 0x01
@@ -536,7 +538,8 @@ 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 *model);

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

                   uint64_t wwn);

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

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



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

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

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

        return -1;

    }
@@ -174,6 +174,7 @@ 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_HEX64("wwn",  IDEDrive, dev.wwn, 0),    \

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

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