usb-storage: Forward serial number to scsi-disk
PATCH 1/1 usb-storage: Forward serial number to scsi-disk
usb-storage takes care to fetch the USB serial number from -drive options, but it neglected to pass its own 'serial' property to the scsi-disk it creates. With this patch, the 'serial' qdev property and the 'serial' option in -drive behave the same and correctly apply the serial number on both USB and SCSI level.
--- hw/pci/pci-hotplug.c | 2 +- hw/scsi-bus.c | 8 ++++++-- hw/scsi.h | 3 ++- hw/usb/dev-storage.c | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-)
hw/pci/pci-hotplug.c +1 -1
@@ -99,7 +99,7 @@ static int scsi_hot_add(Monitor *mon, DeviceState *adapter, dinfo->unit =qemu_opt_get_number (dinfo->opts,"unit" ,-1 ); dinfo->bus = scsibus->busnr; scsidev =scsi_bus_legacy_add_drive (scsibus, dinfo->bdrv, dinfo->unit, - false,-1 ); + false,-1 ,NULL );if (!scsidev) {return -1 ; }
hw/scsi-bus.c +6 -2
@@ -207,7 +207,8 @@ static int scsi_qdev_exit(DeviceState *qdev)/* handle legacy '-drive if=scsi,...' cmd line args */ SCSIDevice *scsi_bus_legacy_add_drive (SCSIBus *bus,BlockDriverState *bdrv, -int unit,bool removable,int bootindex) +int unit,bool removable,int bootindex, +const char *serial) {const char *driver;DeviceState *dev;
@@ -221,6 +222,9 @@ SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, BlockDriverState *bdrv,if (object_property_find (OBJECT (dev),"removable" ,NULL )) {qdev_prop_set_bit (dev,"removable" , removable); } +if (serial) { +qdev_prop_set_string (dev,"serial" , serial); + }if (qdev_prop_set_drive (dev,"drive" , bdrv) <0 ) {qdev_free (dev);return NULL ;
@@ -243,7 +247,7 @@ int scsi_bus_legacy_handle_cmdline(SCSIBus *bus)continue ; }qemu_opts_loc_restore (dinfo->opts); -if (!scsi_bus_legacy_add_drive (bus, dinfo->bdrv, unit, false,-1 )) { +if (!scsi_bus_legacy_add_drive (bus, dinfo->bdrv, unit, false,-1 ,NULL )) { res =-1 ;break ; }
hw/scsi.h +2 -1
@@ -160,7 +160,8 @@ static inline SCSIBus *scsi_bus_from_device(SCSIDevice *d) }SCSIDevice *scsi_bus_legacy_add_drive (SCSIBus *bus,BlockDriverState *bdrv, -int unit,bool removable,int bootindex); +int unit,bool removable,int bootindex, +const char *serial);int scsi_bus_legacy_handle_cmdline (SCSIBus *bus);/*
hw/usb/dev-storage.c +1 -1
@@ -625,7 +625,7 @@ static int usb_msd_initfn_storage(USBDevice *dev)usb_desc_init (dev);scsi_bus_new (&s->bus, &s->dev.qdev, &usb_msd_scsi_info_storage); scsi_dev =scsi_bus_legacy_add_drive (&s->bus, bs,0 , !!s->removable, - s->conf.bootindex); + s->conf.bootindex, s->serial);if (!scsi_dev) {return -1 ; }
Signature · 1 line
1.8.1.4
Quoted 5 lines · Kevin Wolf
usb-storage takes care to fetch the USB serial number from -drive options, but it neglected to pass its own 'serial' property to the scsi-disk it creates. With this patch, the 'serial' qdev property and the 'serial' option in -drive behave the same and correctly apply the serial number on both USB and SCSI level.
Looks good. Do you stick it into the block branch or should I pick it up into the usb queue?
cheers,
Gerd
Am 04.04.2013 um 10:07 hat Gerd Hoffmann geschrieben:
Quoted 9 lines · Kevin Wolf
Quoted 5 lines
usb-storage takes care to fetch the USB serial number from -drive options, but it neglected to pass its own 'serial' property to the scsi-disk it creates. With this patch, the 'serial' qdev property and the 'serial' option in -drive behave the same and correctly apply the serial number on both USB and SCSI level.
Looks good. Do you stick it into the block branch or should I pick it up into the usb queue?
I can take it through the block branch. I'll add your Acked-by then.
Kevin
Quoted 5 lines · Kevin Wolf
usb-storage takes care to fetch the USB serial number from -drive options, but it neglected to pass its own 'serial' property to the scsi-disk it creates. With this patch, the 'serial' qdev property and the 'serial' option in -drive behave the same and correctly apply the serial number on both USB and SCSI level.
cheers,
Gerd