Commit 0f1da449 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

scsi: more fixes to properties for passthrough devices 



Commit 03847837 (scsi-block: remove properties that are not relevant for
passthrough, 2012-07-09) removed one property that should have been
left there, "bootindex".

It also did not touch scsi-generic, while it should have.

Fix both problems.

Reported-by: default avatarAlexandre DERUMIER <aderumier@odiso.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 9ea73f8b

hw/scsi-disk.c

+1 −0
Original line number Diff line number Diff line
@@ -2421,6 +2421,7 @@ static 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-generic.c

+2 −1
Original line number Diff line number Diff line
@@ -479,7 +479,8 @@ static SCSIRequest *scsi_new_request(SCSIDevice *d, uint32_t tag, uint32_t lun, 
}



static Property scsi_generic_properties[] = {

    DEFINE_BLOCK_PROPERTIES(SCSIDevice, conf),

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

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

    DEFINE_PROP_END_OF_LIST(),

};