Commit b7c9a7f3 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging 



Pull request

# gpg: Signature made Thu 31 Oct 2019 15:55:44 GMT
# gpg:                using RSA key F9B7ABDBBCACDF95BE76CBD07DEF8106AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>" [full]
# Primary key fingerprint: FAEB 9711 A12C F475 812F  18F2 88A9 064D 1835 61EB
#      Subkey fingerprint: F9B7 ABDB BCAC DF95 BE76  CBD0 7DEF 8106 AAFC 390E

* remotes/jnsnow/tags/ide-pull-request:
  hd-geo-test: Add tests for lchs override
  bootdevice: FW_CFG interface for LCHS values
  bootdevice: Refactor get_boot_devices_list
  bootdevice: Gather LCHS from all relevant devices
  scsi: Propagate unrealize() callback to scsi-hd
  bootdevice: Add interface to gather LCHS
  block: Support providing LCHS from user
  block: Refactor macros - fix tabbing
  IDE: deprecate ide-drive

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents f3cad9c6 dc237c45

bootdevice.c

+120 −27
Original line number Diff line number Diff line
@@ -202,6 +202,39 @@ DeviceState *get_boot_device(uint32_t position) 
    return res;

}



static char *get_boot_device_path(DeviceState *dev, bool ignore_suffixes,

                                  const char *suffix)

{

    char *devpath = NULL, *s = NULL, *d, *bootpath;



    if (dev) {

        devpath = qdev_get_fw_dev_path(dev);

        assert(devpath);

    }



    if (!ignore_suffixes) {

        if (dev) {

            d = qdev_get_own_fw_dev_path_from_handler(dev->parent_bus, dev);

            if (d) {

                assert(!suffix);

                s = d;

            } else {

                s = g_strdup(suffix);

            }

        } else {

            s = g_strdup(suffix);

        }

    }



    bootpath = g_strdup_printf("%s%s",

                               devpath ? devpath : "",

                               s ? s : "");

    g_free(devpath);

    g_free(s);



    return bootpath;

}



/*

 * This function returns null terminated string that consist of new line

 * separated device paths.
@@ -218,36 +251,10 @@ char *get_boot_devices_list(size_t *size) 
    bool ignore_suffixes = mc->ignore_boot_device_suffixes;



    QTAILQ_FOREACH(i, &fw_boot_order, link) {

        char *devpath = NULL,  *suffix = NULL;

        char *bootpath;

        char *d;

        size_t len;



        if (i->dev) {

            devpath = qdev_get_fw_dev_path(i->dev);

            assert(devpath);

        }



        if (!ignore_suffixes) {

            if (i->dev) {

                d = qdev_get_own_fw_dev_path_from_handler(i->dev->parent_bus,

                                                          i->dev);

                if (d) {

                    assert(!i->suffix);

                    suffix = d;

                } else {

                    suffix = g_strdup(i->suffix);

                }

            } else {

                suffix = g_strdup(i->suffix);

            }

        }



        bootpath = g_strdup_printf("%s%s",

                                   devpath ? devpath : "",

                                   suffix ? suffix : "");

        g_free(devpath);

        g_free(suffix);

        bootpath = get_boot_device_path(i->dev, ignore_suffixes, i->suffix);



        if (total) {

            list[total-1] = '\n';
@@ -343,3 +350,89 @@ void device_add_bootindex_property(Object *obj, int32_t *bootindex, 
    /* initialize devices' bootindex property to -1 */

    object_property_set_int(obj, -1, name, NULL);

}



typedef struct FWLCHSEntry FWLCHSEntry;



struct FWLCHSEntry {

    QTAILQ_ENTRY(FWLCHSEntry) link;

    DeviceState *dev;

    char *suffix;

    uint32_t lcyls;

    uint32_t lheads;

    uint32_t lsecs;

};



static QTAILQ_HEAD(, FWLCHSEntry) fw_lchs =

    QTAILQ_HEAD_INITIALIZER(fw_lchs);



void add_boot_device_lchs(DeviceState *dev, const char *suffix,

                          uint32_t lcyls, uint32_t lheads, uint32_t lsecs)

{

    FWLCHSEntry *node;



    if (!lcyls && !lheads && !lsecs) {

        return;

    }



    assert(dev != NULL || suffix != NULL);



    node = g_malloc0(sizeof(FWLCHSEntry));

    node->suffix = g_strdup(suffix);

    node->dev = dev;

    node->lcyls = lcyls;

    node->lheads = lheads;

    node->lsecs = lsecs;



    QTAILQ_INSERT_TAIL(&fw_lchs, node, link);

}



void del_boot_device_lchs(DeviceState *dev, const char *suffix)

{

    FWLCHSEntry *i;



    if (dev == NULL) {

        return;

    }



    QTAILQ_FOREACH(i, &fw_lchs, link) {

        if ((!suffix || !g_strcmp0(i->suffix, suffix)) &&

             i->dev == dev) {

            QTAILQ_REMOVE(&fw_lchs, i, link);

            g_free(i->suffix);

            g_free(i);



            break;

        }

    }

}



char *get_boot_devices_lchs_list(size_t *size)

{

    FWLCHSEntry *i;

    size_t total = 0;

    char *list = NULL;



    QTAILQ_FOREACH(i, &fw_lchs, link) {

        char *bootpath;

        char *chs_string;

        size_t len;



        bootpath = get_boot_device_path(i->dev, false, i->suffix);

        chs_string = g_strdup_printf("%s %" PRIu32 " %" PRIu32 " %" PRIu32,

                                     bootpath, i->lcyls, i->lheads, i->lsecs);



        if (total) {

            list[total - 1] = '\n';

        }

        len = strlen(chs_string) + 1;

        list = g_realloc(list, total + len);

        memcpy(&list[total], chs_string, len);

        total += len;

        g_free(chs_string);

        g_free(bootpath);

    }



    *size = total;



    return list;

}

hw/block/virtio-blk.c

+6 −0
Original line number Diff line number Diff line
@@ -1200,6 +1200,11 @@ static void virtio_blk_device_realize(DeviceState *dev, Error **errp) 
    blk_set_guest_block_size(s->blk, s->conf.conf.logical_block_size);



    blk_iostatus_enable(s->blk);



    add_boot_device_lchs(dev, "/disk@0,0",

                         conf->conf.lcyls,

                         conf->conf.lheads,

                         conf->conf.lsecs);

}



static void virtio_blk_device_unrealize(DeviceState *dev, Error **errp)
@@ -1210,6 +1215,7 @@ static void virtio_blk_device_unrealize(DeviceState *dev, Error **errp) 
    unsigned i;



    blk_drain(s->blk);

    del_boot_device_lchs(dev, "/disk@0,0");

    virtio_blk_data_plane_destroy(s->dataplane);

    s->dataplane = NULL;

    for (i = 0; i < conf->num_queues; i++) {

hw/ide/qdev.c

+9 −1
Original line number Diff line number Diff line
@@ -220,6 +220,11 @@ static void ide_dev_initfn(IDEDevice *dev, IDEDriveKind kind, Error **errp) 


    add_boot_device_path(dev->conf.bootindex, &dev->qdev,

                         dev->unit ? "/disk@1" : "/disk@0");



    add_boot_device_lchs(&dev->qdev, dev->unit ? "/disk@1" : "/disk@0",

                         dev->conf.lcyls,

                         dev->conf.lheads,

                         dev->conf.lsecs);

}



static void ide_dev_get_bootindex(Object *obj, Visitor *v, const char *name,
@@ -279,6 +284,9 @@ static void ide_drive_realize(IDEDevice *dev, Error **errp) 
{

    DriveInfo *dinfo = NULL;



    warn_report("'ide-drive' is deprecated, "

                "please use 'ide-hd' or 'ide-cd' instead");



    if (dev->conf.blk) {

        dinfo = blk_legacy_dinfo(dev->conf.blk);

    }

hw/nvram/fw_cfg.c

+11 −3
Original line number Diff line number Diff line
@@ -949,13 +949,21 @@ void *fw_cfg_modify_file(FWCfgState *s, const char *filename, 


static void fw_cfg_machine_reset(void *opaque)

{

    MachineClass *mc = MACHINE_GET_CLASS(qdev_get_machine());

    FWCfgState *s = opaque;

    void *ptr;

    size_t len;

    FWCfgState *s = opaque;

    char *bootindex = get_boot_devices_list(&len);

    char *buf;



    ptr = fw_cfg_modify_file(s, "bootorder", (uint8_t *)bootindex, len);

    buf = get_boot_devices_list(&len);

    ptr = fw_cfg_modify_file(s, "bootorder", (uint8_t *)buf, len);

    g_free(ptr);



    if (!mc->legacy_fw_cfg_order) {

        buf = get_boot_devices_lchs_list(&len);

        ptr = fw_cfg_modify_file(s, "bios-geometry", (uint8_t *)buf, len);

        g_free(ptr);

    }

}



static void fw_cfg_machine_ready(struct Notifier *n, void *data)

hw/scsi/scsi-bus.c

+16 −0
Original line number Diff line number Diff line
@@ -59,6 +59,14 @@ static void scsi_device_realize(SCSIDevice *s, Error **errp) 
    }

}



static void scsi_device_unrealize(SCSIDevice *s, Error **errp)

{

    SCSIDeviceClass *sc = SCSI_DEVICE_GET_CLASS(s);

    if (sc->unrealize) {

        sc->unrealize(s, errp);

    }

}



int scsi_bus_parse_cdb(SCSIDevice *dev, SCSICommand *cmd, uint8_t *buf,

                       void *hba_private)

{
@@ -217,12 +225,20 @@ static void scsi_qdev_realize(DeviceState *qdev, Error **errp) 
static void scsi_qdev_unrealize(DeviceState *qdev, Error **errp)

{

    SCSIDevice *dev = SCSI_DEVICE(qdev);

    Error *local_err = NULL;



    if (dev->vmsentry) {

        qemu_del_vm_change_state_handler(dev->vmsentry);

    }



    scsi_device_purge_requests(dev, SENSE_CODE(NO_SENSE));



    scsi_device_unrealize(dev, &local_err);

    if (local_err) {

        error_propagate(errp, local_err);

        return;

    }



    blockdev_mark_auto_del(dev->conf.blk);

}