Commit 71f571a2 authored by Sam Eiderman's avatar Sam Eiderman Committed by John Snow
Browse files

bootdevice: Gather LCHS from all relevant devices 



Relevant devices are:
    * ide-hd (and ide-cd, ide-drive)
    * scsi-hd (and scsi-cd, scsi-disk, scsi-block)
    * virtio-blk-pci

We do not call del_boot_device_lchs() for ide-* since we don't need to -
IDE block devices do not support unplugging.

Reviewed-by: default avatarKarl Heubaum <karl.heubaum@oracle.com>
Reviewed-by: default avatarArbel Moshe <arbel.moshe@oracle.com>
Signed-off-by: default avatarSam Eiderman <shmuel.eiderman@oracle.com>
Signed-off-by: default avatarSam Eiderman <sameid@google.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
parent 6b98c5aa

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

+5 −0
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,

hw/scsi/scsi-disk.c

+12 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include "hw/block/block.h"

#include "hw/qdev-properties.h"

#include "sysemu/dma.h"

#include "sysemu/sysemu.h"

#include "qemu/cutils.h"

#include "trace.h"
@@ -2414,6 +2415,16 @@ static void scsi_realize(SCSIDevice *dev, Error **errp) 
    blk_set_guest_block_size(s->qdev.conf.blk, s->qdev.blocksize);



    blk_iostatus_enable(s->qdev.conf.blk);



    add_boot_device_lchs(&dev->qdev, NULL,

                         dev->conf.lcyls,

                         dev->conf.lheads,

                         dev->conf.lsecs);

}



static void scsi_unrealize(SCSIDevice *dev, Error **errp)

{

    del_boot_device_lchs(&dev->qdev, NULL);

}



static void scsi_hd_realize(SCSIDevice *dev, Error **errp)
@@ -3018,6 +3029,7 @@ static void scsi_hd_class_initfn(ObjectClass *klass, void *data) 
    SCSIDeviceClass *sc = SCSI_DEVICE_CLASS(klass);



    sc->realize      = scsi_hd_realize;

    sc->unrealize    = scsi_unrealize;

    sc->alloc_req    = scsi_new_request;

    sc->unit_attention_reported = scsi_disk_unit_attention_reported;

    dc->desc = "virtual SCSI disk";