Commit 8dece34f authored by Gonglei's avatar Gonglei Committed by Gerd Hoffmann
Browse files

block: remove bootindex property from qdev to qom 



Remove bootindex form qdev property to qom, things will
continue to work just fine, and we can use qom features
which are not supported by qdev property.

Signed-off-by: default avatarGonglei <arei.gonglei@huawei.com>
Reviewed-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 3342ec32

hw/scsi/scsi-bus.c

+2 −1
Original line number Diff line number Diff line
@@ -231,7 +231,8 @@ SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, BlockDriverState *bdrv, 
    dev = qdev_create(&bus->qbus, driver);

    qdev_prop_set_uint32(dev, "scsi-id", unit);

    if (bootindex >= 0) {

        qdev_prop_set_int32(dev, "bootindex", bootindex);

        object_property_set_int(OBJECT(dev), bootindex, "bootindex",

                                &error_abort);

    }

    if (object_property_find(OBJECT(dev), "removable", NULL)) {

        qdev_prop_set_bit(dev, "removable", removable);

hw/scsi/scsi-disk.c

+0 −1
Original line number Diff line number Diff line
@@ -2662,7 +2662,6 @@ static const TypeInfo scsi_cd_info = { 
#ifdef __linux__

static Property scsi_block_properties[] = {

    DEFINE_PROP_DRIVE("drive", SCSIDiskState, qdev.conf.bs),

    DEFINE_PROP_INT32("bootindex", SCSIDiskState, qdev.conf.bootindex, -1),

    DEFINE_PROP_END_OF_LIST(),

};

hw/scsi/scsi-generic.c

+0 −1
Original line number Diff line number Diff line
@@ -463,7 +463,6 @@ static SCSIRequest *scsi_new_request(SCSIDevice *d, uint32_t tag, uint32_t lun, 


static Property scsi_generic_properties[] = {

    DEFINE_PROP_DRIVE("drive", SCSIDevice, conf.bs),

    DEFINE_PROP_INT32("bootindex", SCSIDevice, conf.bootindex, -1),

    DEFINE_PROP_END_OF_LIST(),

};

include/hw/block/block.h

+0 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ static inline unsigned int get_physical_block_exp(BlockConf *conf) 
                          _conf.physical_block_size, 512),              \

    DEFINE_PROP_UINT16("min_io_size", _state, _conf.min_io_size, 0),  \

    DEFINE_PROP_UINT32("opt_io_size", _state, _conf.opt_io_size, 0),    \

    DEFINE_PROP_INT32("bootindex", _state, _conf.bootindex, -1),        \

    DEFINE_PROP_UINT32("discard_granularity", _state, \

                       _conf.discard_granularity, -1)