Add Qemu to SeaBIOS LCHS interface
v8 cover Add Qemu to SeaBIOS LCHS interface
v1:
Non-standard logical geometries break under QEMU.
A virtual disk which contains an operating system which depends on logical geometries (consistent values being reported from BIOS INT13 AH=08) will most likely break under QEMU/SeaBIOS if it has non-standard logical geometries - for example 56 SPT (sectors per track). No matter what QEMU will guess - SeaBIOS, for large enough disks - will use LBA translation, which will report 63 SPT instead.
In addition we can not enforce SeaBIOS to rely on phyiscal geometries at all. A virtio-blk-pci virtual disk with 255 phyiscal heads can not report more than 16 physical heads when moved to an IDE controller, the ATA spec allows a maximum of 16 heads - this is an artifact of virtualization.
By supplying the logical geometies directly we are able to support such "exotic" disks.
We will use fw_cfg to do just that.
v2:
Fix missing parenthesis check in
"hd-geo-test: Add tests for lchs override"
v3:
* Rename fw_cfg key to "bios-geometry".
* Remove "extendible" interface.
* Add cpu_to_le32 fix as Laszlo suggested or big endian hosts
* Fix last qtest commit - automatic docker tester for some reason does not have qemu-img set
v4:
* Change fw_cfg interface from mixed textual/binary to textual only
v5:
* Fix line > 80 chars in tests/hd-geo-test.c
v6:
* Small fixes for issues pointed by Max
* (&conf->conf)->lcyls to conf->conf.lcyls and so on
* Remove scsi_unrealize from everything other than scsi-hd
* Add proper include to sysemu.h
* scsi_device_unrealize() after scsi_device_purge_requests()
v7:
* Adapted last commit (tests) to changes in qtest
v8:
* Fixed BE issue with tests by using qfw_cfg_get_file() instead of read_fw_cfg_file(), thanks Laszlo.
* Removed incorrect comment in 7/8.
Sam Eiderman (8):
block: Refactor macros - fix tabbing
block: Support providing LCHS from user
bootdevice: Add interface to gather LCHS
scsi: Propagate unrealize() callback to scsi-hd
bootdevice: Gather LCHS from all relevant devices
bootdevice: Refactor get_boot_devices_list
bootdevice: FW_CFG interface for LCHS values
hd-geo-test: Add tests for lchs override
bootdevice.c | 147 +++++++++-- hw/block/virtio-blk.c | 6 + hw/ide/qdev.c | 7 +- hw/nvram/fw_cfg.c | 14 +- hw/scsi/scsi-bus.c | 16 ++ hw/scsi/scsi-disk.c | 12 + include/hw/block/block.h | 22 +- include/hw/scsi/scsi.h | 1 + include/sysemu/sysemu.h | 4 + tests/Makefile.include | 2 +- tests/hd-geo-test.c | 551 +++++++++++++++++++++++++++++++++++++++ 11 files changed, 741 insertions(+), 41 deletions(-)
Signature · 1 line
2.23.0.700.g56cf767bdb-goog
PATCH v8 1/8 block: Refactor macros - fix tabbing
From: Sam Eiderman <[email protected]>
Fixing tabbing in block related macros.
--- hw/ide/qdev.c | 2 +- include/hw/block/block.h | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-)
hw/ide/qdev.c +1 -1
@@ -290,7 +290,7 @@ static void ide_drive_realize(IDEDevice *dev, Error **errp)DEFINE_BLOCK_PROPERTIES (IDEDrive, dev.conf), \DEFINE_BLOCK_ERROR_PROPERTIES (IDEDrive, dev.conf), \DEFINE_PROP_STRING ("ver" , IDEDrive, dev.version), \ -DEFINE_PROP_UINT64 ("wwn" , IDEDrive, dev.wwn,0 ), \ +DEFINE_PROP_UINT64 ("wwn" , IDEDrive, dev.wwn,0 ), \DEFINE_PROP_STRING ("serial" , IDEDrive, dev.serial),\DEFINE_PROP_STRING ("model" , IDEDrive, dev.model)
include/hw/block/block.h +8 -8
@@ -50,21 +50,21 @@ static inline unsigned int get_physical_block_exp(BlockConf *conf) _conf.logical_block_size), \DEFINE_PROP_BLOCKSIZE ("physical_block_size" , _state, \ _conf.physical_block_size), \ -DEFINE_PROP_UINT16 ("min_io_size" , _state, _conf.min_io_size,0 ), \ +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_UINT32 ("discard_granularity" , _state, \ - _conf.discard_granularity,-1 ), \ -DEFINE_PROP_ON_OFF_AUTO ("write-cache" , _state, _conf.wce, \ -ON_OFF_AUTO_AUTO ), \ +DEFINE_PROP_UINT32 ("discard_granularity" , _state, \ + _conf.discard_granularity,-1 ), \ +DEFINE_PROP_ON_OFF_AUTO ("write-cache" , _state, _conf.wce, \ +ON_OFF_AUTO_AUTO ), \ DEFINE_PROP_BOOL("share-rw", _state, _conf.share_rw, false) #define DEFINE_BLOCK_PROPERTIES(_state, _conf) \DEFINE_PROP_DRIVE ("drive" , _state, _conf.blk), \ DEFINE_BLOCK_PROPERTIES_BASE(_state, _conf) -#define DEFINE_BLOCK_CHS_PROPERTIES(_state, _conf) \ -DEFINE_PROP_UINT32 ("cyls" , _state, _conf.cyls,0 ), \ -DEFINE_PROP_UINT32 ("heads" , _state, _conf.heads,0 ), \ +#define DEFINE_BLOCK_CHS_PROPERTIES(_state, _conf) \ +DEFINE_PROP_UINT32 ("cyls" , _state, _conf.cyls,0 ), \ +DEFINE_PROP_UINT32 ("heads" , _state, _conf.heads,0 ), \ DEFINE_PROP_UINT32("secs", _state, _conf.secs, 0) #define DEFINE_BLOCK_ERROR_PROPERTIES(_state, _conf) \
Signature · 1 line
2.23.0.700.g56cf767bdb-goog
PATCH v8 1/1 hd-geo-test: Add tests for lchs override
In reply to Sam EidermanFrom: Sam Eiderman <[email protected]>
Add QTest tests to check the logical geometry override option.
The tests in hd-geo-test are out of date - they only test IDE and do not test interesting MBRs.
Creating qcow2 disks with specific size and MBR layout is currently unused - we only use a default empty MBR.
--- tests/Makefile.include | 2 +- tests/hd-geo-test.c | 551 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 552 insertions(+), 1 deletion(-)
tests/Makefile.include +1 -1
@@ -780,7 +780,7 @@ tests/ide-test$(EXESUF): tests/ide-test.o $(libqos-pc-obj-y) tests/ahci-test$(EXESUF): tests/ahci-test.o $(libqos-pc-obj-y) qemu-img$(EXESUF) tests/ipmi-kcs-test$(EXESUF): tests/ipmi-kcs-test.o tests/ipmi-bt-test$(EXESUF): tests/ipmi-bt-test.o -tests/hd-geo-test$(EXESUF): tests/hd-geo-test.o +tests/hd-geo-test$(EXESUF): tests/hd-geo-test.o $(libqos-obj-y) tests/boot-order-test$(EXESUF): tests/boot-order-test.o $(libqos-obj-y) tests/boot-serial-test$(EXESUF): tests/boot-serial-test.o $(libqos-obj-y) tests/bios-tables-test$(EXESUF): tests/bios-tables-test.o \
tests/hd-geo-test.c +551 -0
570 lines not on this page · raw message
Signature · 1 line
2.23.0.700.g56cf767bdb-goog
PATCH v8 2/8 block: Support providing LCHS from user
In reply to Sam EidermanFrom: Sam Eiderman <[email protected]>
Add logical geometry variables to BlockConf.
A user can now supply "lcyls", "lheads" & "lsecs" for any HD device that supports CHS ("cyls", "heads", "secs").
These devices include:
* ide-hd
* scsi-hd
* virtio-blk-pci
In future commits we will use the provided LCHS and pass it to the BIOS through fw_cfg to be supplied using INT13 routines.
--- include/hw/block/block.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
include/hw/block/block.h +5 -1
@@ -26,6 +26,7 @@ typedef struct BlockConf {uint32_t discard_granularity;/* geometry, not all devices use this */ uint32_t cyls, heads, secs; +uint32_t lcyls, lheads, lsecs;OnOffAuto wce;bool share_rw;BlockdevOnError rerror;
@@ -65,7 +66,10 @@ static inline unsigned int get_physical_block_exp(BlockConf *conf)#define DEFINE_BLOCK_CHS_PROPERTIES (_state, _conf) \ DEFINE_PROP_UINT32("cyls", _state, _conf.cyls, 0), \ DEFINE_PROP_UINT32("heads", _state, _conf.heads, 0), \ - DEFINE_PROP_UINT32("secs", _state, _conf.secs, 0) + DEFINE_PROP_UINT32("secs", _state, _conf.secs, 0), \ + DEFINE_PROP_UINT32("lcyls", _state, _conf.lcyls, 0), \ + DEFINE_PROP_UINT32("lheads", _state, _conf.lheads, 0), \ + DEFINE_PROP_UINT32("lsecs", _state, _conf.lsecs, 0)#define DEFINE_BLOCK_ERROR_PROPERTIES (_state, _conf) \ DEFINE_PROP_BLOCKDEV_ON_ERROR("rerror", _state, _conf.rerror, \
Signature · 1 line
2.23.0.700.g56cf767bdb-goog
Re: [PATCH v8 2/8] block: Support providing LCHS from user
Quoted 12 lines · Sam Eiderman
From: Sam Eiderman <[email protected]>
Add logical geometry variables to BlockConf.
A user can now supply "lcyls", "lheads" & "lsecs" for any HD device that supports CHS ("cyls", "heads", "secs").
These devices include:
* ide-hd
* scsi-hd
* virtio-blk-pci
Quoted 7 lines
In future commits we will use the provided LCHS and pass it to the BIOS through
fw_cfgto be supplied using INT13 routines.Reviewed-by Karl Heubaum <[email protected]>Reviewed-by Arbel Moshe <[email protected]>Signed-off-by Sam Eiderman <[email protected]>Signed-off-by Sam Eiderman <[email protected]>
Quoted 29 lines
--- include/hw/block/block.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)include/hw/block/block.h +5
-1@@ -26,6 +26,7 @@ typedef struct BlockConf {uint32_t discard_granularity;/* geometry, not all devices use this */ uint32_t cyls, heads, secs; +uint32_t lcyls, lheads, lsecs;OnOffAuto wce;bool share_rw;BlockdevOnError rerror;@@ -65,7 +66,10 @@ static inline unsigned int get_physical_block_exp(BlockConf *conf)#define DEFINE_BLOCK_CHS_PROPERTIES (_state, _conf) \ DEFINE_PROP_UINT32("cyls", _state, _conf.cyls, 0), \ DEFINE_PROP_UINT32("heads", _state, _conf.heads, 0), \ - DEFINE_PROP_UINT32("secs", _state, _conf.secs, 0) + DEFINE_PROP_UINT32("secs", _state, _conf.secs, 0), \ + DEFINE_PROP_UINT32("lcyls", _state, _conf.lcyls, 0), \ + DEFINE_PROP_UINT32("lheads", _state, _conf.lheads, 0), \ + DEFINE_PROP_UINT32("lsecs", _state, _conf.lsecs, 0)#define DEFINE_BLOCK_ERROR_PROPERTIES (_state, _conf) \ DEFINE_PROP_BLOCKDEV_ON_ERROR("rerror", _state, _conf.rerror, \
PATCH v8 3/8 bootdevice: Add interface to gather LCHS
In reply to Sam EidermanFrom: Sam Eiderman <[email protected]>
Add an interface to provide direct logical CHS values for boot devices. We will use this interface in the next commits.
--- bootdevice.c | 55 +++++++++++++++++++++++++++++++++++++++++ include/sysemu/sysemu.h | 3 +++ 2 files changed, 58 insertions(+)
bootdevice.c +55 -0
@@ -343,3 +343,58 @@ 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 ; + } + } +}
include/sysemu/sysemu.h +3 -0
@@ -103,6 +103,9 @@ void device_add_bootindex_property(Object *obj, int32_t *bootindex, DeviceState *dev, Error **errp);void restore_boot_order (void *opaque);void validate_bootdevices (const char *devices,Error **errp); +void add_boot_device_lchs (DeviceState *dev,const char *suffix, +uint32_t lcyls,uint32_t lheads,uint32_t lsecs); +void del_boot_device_lchs (DeviceState *dev,const char *suffix);/* handler to set the boot_device order for a specific type of MachineClass */ typedef void QEMUBootSetHandler(void *opaque, const char *boot_order,
Signature · 1 line
2.23.0.700.g56cf767bdb-goog
Re: [PATCH v8 3/8] bootdevice: Add interface to gather LCHS
Quoted 83 lines · Sam Eiderman
From: Sam Eiderman <[email protected]>
Add an interface to provide direct logical CHS values for boot devices. We will use this interface in the next commits.
Reviewed-by Karl Heubaum <[email protected]>Reviewed-by Arbel Moshe <[email protected]>Signed-off-by Sam Eiderman <[email protected]>Signed-off-by Sam Eiderman <[email protected]>--- bootdevice.c | 55 +++++++++++++++++++++++++++++++++++++++++ include/sysemu/sysemu.h | 3 +++ 2 files changed, 58 insertions(+)bootdevice.c +55
-0@@ -343,3 +343,58 @@ 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 ; + } + } +}include/sysemu/sysemu.h +0
-0
include/sysemu/sysemu.h void device_add_bootindex_property(Object *obj, int32_t *bootindex, · line 111
Quoted 9 lines
include/sysemu/sysemu.h +3
-0@@ -103,6 +103,9 @@ void device_add_bootindex_property(Object *obj, int32_t *bootindex, DeviceState *dev, Error **errp);void restore_boot_order (void *opaque);void validate_bootdevices (const char *devices,Error **errp); +void add_boot_device_lchs (DeviceState *dev,const char *suffix, +uint32_t lcyls,uint32_t lheads,uint32_t lsecs); +void del_boot_device_lchs (DeviceState *dev,const char *suffix);/* handler to set the boot_device order for a specific type of MachineClass */ typedef void QEMUBootSetHandler(void *opaque, const char *boot_order,
PATCH v8 4/8 scsi: Propagate unrealize() callback to scsi-hd
In reply to Sam EidermanFrom: Sam Eiderman <[email protected]>
We will need to add LCHS removal logic to scsi-hd's unrealize() in the next commit.
--- hw/scsi/scsi-bus.c | 16 ++++++++++++++++ include/hw/scsi/scsi.h | 1 + 2 files changed, 17 insertions(+)
hw/scsi/scsi-bus.c +16 -0
@@ -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); }
include/hw/scsi/scsi.h +1 -0
@@ -59,6 +59,7 @@ struct SCSIRequest { typedef struct SCSIDeviceClass { DeviceClass parent_class; void (*realize)(SCSIDevice *dev, Error **errp); + void (*unrealize)(SCSIDevice *dev, Error **errp); int (*parse_cdb)(SCSIDevice *dev, SCSICommand *cmd, uint8_t *buf, void *hba_private); SCSIRequest *(*alloc_req)(SCSIDevice *s, uint32_t tag, uint32_t lun,
Signature · 1 line
2.23.0.700.g56cf767bdb-goog
Re: [PATCH v8 4/8] scsi: Propagate unrealize() callback to scsi-hd
Quoted 61 lines · Sam Eiderman
From: Sam Eiderman <[email protected]>
We will need to add LCHS removal logic to scsi-hd's
unrealize()in the next commit.Reviewed-by Karl Heubaum <[email protected]>Reviewed-by Arbel Moshe <[email protected]>Reviewed-by Philippe Mathieu-Daudé <[email protected]>Signed-off-by Sam Eiderman <[email protected]>Signed-off-by Sam Eiderman <[email protected]>--- hw/scsi/scsi-bus.c | 16 ++++++++++++++++ include/hw/scsi/scsi.h | 1 + 2 files changed, 17 insertions(+)hw/scsi/scsi-bus.c +16
-0@@ -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); }include/hw/scsi/scsi.h +0
-0
include/hw/scsi/scsi.h struct SCSIRequest { · line 65
Quoted 7 lines
include/hw/scsi/scsi.h +1
-0@@ -59,6 +59,7 @@ struct SCSIRequest { typedef struct SCSIDeviceClass { DeviceClass parent_class; void (*realize)(SCSIDevice *dev, Error **errp); + void (*unrealize)(SCSIDevice *dev, Error **errp); int (*parse_cdb)(SCSIDevice *dev, SCSICommand *cmd, uint8_t *buf, void *hba_private); SCSIRequest *(*alloc_req)(SCSIDevice *s, uint32_t tag, uint32_t lun,
PATCH v8 5/8 bootdevice: Gather LCHS from all relevant devices
In reply to Sam EidermanFrom: Sam Eiderman <[email protected]>
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.
--- hw/block/virtio-blk.c | 6 ++++++ hw/ide/qdev.c | 5 +++++ hw/scsi/scsi-disk.c | 12 ++++++++++++ 3 files changed, 23 insertions(+)
hw/block/virtio-blk.c +6 -0
@@ -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)
@@ -1207,6 +1212,7 @@ static void virtio_blk_device_unrealize(DeviceState *dev, Error **errp)VirtIODevice *vdev =VIRTIO_DEVICE (dev);VirtIOBlock *s =VIRTIO_BLK (dev); +del_boot_device_lchs (dev,"/disk@0,0" );virtio_blk_data_plane_destroy (s->dataplane); s->dataplane =NULL ;qemu_del_vm_change_state_handler (s->change);
hw/ide/qdev.c +5 -0
@@ -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
@@ -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" ;
Signature · 1 line
2.23.0.700.g56cf767bdb-goog
Re: [PATCH v8 5/8] bootdevice: Gather LCHS from all relevant devices
Quoted 91 lines · Sam Eiderman
From: Sam Eiderman <[email protected]>
Relevant devices are:
* ide-hd (and ide-cd, ide-drive)
* scsi-hd (and scsi-cd, scsi-disk, scsi-block)
* virtio-blk-pciWe do not call
del_boot_device_lchs()for ide-* since we don't need to - IDE block devices do not support unplugging.Reviewed-by Karl Heubaum <[email protected]>Reviewed-by Arbel Moshe <[email protected]>Signed-off-by Sam Eiderman <[email protected]>Signed-off-by Sam Eiderman <[email protected]>--- hw/block/virtio-blk.c | 6 ++++++ hw/ide/qdev.c | 5 +++++ hw/scsi/scsi-disk.c | 12 ++++++++++++ 3 files changed, 23 insertions(+)hw/block/virtio-blk.c +6
-0@@ -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)@@ -1207,6 +1212,7 @@ static void virtio_blk_device_unrealize(DeviceState *dev, Error **errp)VirtIODevice *vdev =VIRTIO_DEVICE (dev);VirtIOBlock *s =VIRTIO_BLK (dev); +del_boot_device_lchs (dev,"/disk@0,0" );virtio_blk_data_plane_destroy (s->dataplane); s->dataplane =NULL ;qemu_del_vm_change_state_handler (s->change);hw/ide/qdev.c +5
-0@@ -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 +11
-0@@ -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)
hw/scsi/scsi-disk.c static void scsi_hd_class_initfn(ObjectClass *klass, void *data) · line 3035
Quoted 7 lines
hw/scsi/scsi-disk.c +1
-0@@ -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" ;
PATCH v8 6/8 bootdevice: Refactor get_boot_devices_list
In reply to Sam EidermanFrom: Sam Eiderman <[email protected]>
Move device name construction to a separate function.
We will reuse this function in the following commit to pass logical CHS parameters through fw_cfg much like we currently pass bootindex.
--- bootdevice.c | 61 +++++++++++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 27 deletions(-)
bootdevice.c +34 -27
@@ -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' ;
Signature · 1 line
2.23.0.700.g56cf767bdb-goog
Re: [PATCH v8 6/8] bootdevice: Refactor get_boot_devices_list
Quoted 89 lines · Sam Eiderman
From: Sam Eiderman <[email protected]>
Move device name construction to a separate function.
We will reuse this function in the following commit to pass logical CHS parameters through
fw_cfgmuch like we currently pass bootindex.Reviewed-by Karl Heubaum <[email protected]>Reviewed-by Arbel Moshe <[email protected]>Reviewed-by Philippe Mathieu-Daudé <[email protected]>Signed-off-by Sam Eiderman <[email protected]>Signed-off-by Sam Eiderman <[email protected]>--- bootdevice.c | 61 +++++++++++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 27 deletions(-)bootdevice.c +33
-21@@ -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); - } - }
bootdevice.c char *get_boot_devices_list(size_t *size) · line 260
Quoted 10 lines
bootdevice.c +1
-6- - 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' ;
PATCH v8 7/8 bootdevice: FW_CFG interface for LCHS values
In reply to Sam EidermanFrom: Sam Eiderman <[email protected]>
Using fw_cfg, supply logical CHS values directly from QEMU to the BIOS.
Non-standard logical geometries break under QEMU.
A virtual disk which contains an operating system which depends on logical geometries (consistent values being reported from BIOS INT13 AH=08) will most likely break under QEMU/SeaBIOS if it has non-standard logical geometries - for example 56 SPT (sectors per track). No matter what QEMU will report - SeaBIOS, for large enough disks - will use LBA translation, which will report 63 SPT instead.
In addition we cannot force SeaBIOS to rely on physical geometries at all. A virtio-blk-pci virtual disk with 255 phyiscal heads cannot report more than 16 physical heads when moved to an IDE controller, since the ATA spec allows a maximum of 16 heads - this is an artifact of virtualization.
By supplying the logical geometries directly we are able to support such "exotic" disks.
We serialize this information in a similar way to the "bootorder" interface.
The new fw_cfg entry is "bios-geometry".
--- bootdevice.c | 31 +++++++++++++++++++++++++++++++ hw/nvram/fw_cfg.c | 14 +++++++++++--- include/sysemu/sysemu.h | 1 + 3 files changed, 43 insertions(+), 3 deletions(-)
bootdevice.c +31 -0
@@ -405,3 +405,34 @@ void del_boot_device_lchs(DeviceState *dev, const char *suffix) } } } + +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/nvram/fw_cfg.c +11 -3
@@ -920,13 +920,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)
include/sysemu/sysemu.h +1 -0
@@ -106,6 +106,7 @@ void validate_bootdevices(const char *devices, Error **errp);void add_boot_device_lchs (DeviceState *dev,const char *suffix,uint32_t lcyls,uint32_t lheads,uint32_t lsecs);void del_boot_device_lchs (DeviceState *dev,const char *suffix); +char *get_boot_devices_lchs_list (size_t *size);/* handler to set the boot_device order for a specific type of MachineClass */ typedef void QEMUBootSetHandler(void *opaque, const char *boot_order,
Signature · 1 line
2.23.0.700.g56cf767bdb-goog
Re: [PATCH v8 7/8] bootdevice: FW_CFG interface for LCHS values
Quoted 62 lines · Sam Eiderman
From: Sam Eiderman <[email protected]>
Using
fw_cfg, supply logical CHS values directly from QEMU to the BIOS.Non-standard logical geometries break under QEMU.
A virtual disk which contains an operating system which depends on logical geometries (consistent values being reported from BIOS INT13 AH=08) will most likely break under QEMU/SeaBIOS if it has non-standard logical geometries - for example 56 SPT (sectors per track). No matter what QEMU will report - SeaBIOS, for large enough disks - will use LBA translation, which will report 63 SPT instead.
In addition we cannot force SeaBIOS to rely on physical geometries at all. A virtio-blk-pci virtual disk with 255 phyiscal heads cannot report more than 16 physical heads when moved to an IDE controller, since the ATA spec allows a maximum of 16 heads - this is an artifact of virtualization.
By supplying the logical geometries directly we are able to support such "exotic" disks.
We serialize this information in a similar way to the "bootorder" interface.
The newfw_cfgentry is "bios-geometry".Reviewed-by Karl Heubaum <[email protected]>Reviewed-by Arbel Moshe <[email protected]>Reviewed-by Philippe Mathieu-Daudé <[email protected]>Signed-off-by Sam Eiderman <[email protected]>Signed-off-by Sam Eiderman <[email protected]>--- bootdevice.c | 31 +++++++++++++++++++++++++++++++ hw/nvram/fw_cfg.c | 14 +++++++++++--- include/sysemu/sysemu.h | 1 + 3 files changed, 43 insertions(+), 3 deletions(-)bootdevice.c +17
-0@@ -405,3 +405,34 @@ void del_boot_device_lchs(DeviceState *dev, const char *suffix) } } } + +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) {
bootdevice.c void del_boot_device_lchs(DeviceState *dev, const char *suffix) · line 434
Quoted 10 lines
bootdevice.c +10
-0+ 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); + } +
Hmm maybe assert(size != NULL) or if(size) {
bootdevice.c void del_boot_device_lchs(DeviceState *dev, const char *suffix) · line 435
Quoted 1 line
bootdevice.c +1
-0+ *size = total;
} or simply document "@size must not be NULL" in the declaration.
Can be a follow-up cleaning patch.
Regardless:
Quoted 38 lines
bootdevice.c +3
-0+ +return list; +}hw/nvram/fw_cfg.c +11
-3@@ -920,13 +920,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)include/sysemu/sysemu.h +0
-0
include/sysemu/sysemu.h void validate_bootdevices(const char *devices, Error **errp); · line 112
Quoted 7 lines
include/sysemu/sysemu.h +1
-0@@ -106,6 +106,7 @@ void validate_bootdevices(const char *devices, Error **errp);void add_boot_device_lchs (DeviceState *dev,const char *suffix,uint32_t lcyls,uint32_t lheads,uint32_t lsecs);void del_boot_device_lchs (DeviceState *dev,const char *suffix); +char *get_boot_devices_lchs_list (size_t *size);/* handler to set the boot_device order for a specific type of MachineClass */ typedef void QEMUBootSetHandler(void *opaque, const char *boot_order,
PATCH v8 8/8 hd-geo-test: Add tests for lchs override
In reply to Sam EidermanFrom: Sam Eiderman <[email protected]>
Add QTest tests to check the logical geometry override option.
The tests in hd-geo-test are out of date - they only test IDE and do not test interesting MBRs.
Creating qcow2 disks with specific size and MBR layout is currently unused - we only use a default empty MBR.
--- tests/Makefile.include | 2 +- tests/hd-geo-test.c | 551 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 552 insertions(+), 1 deletion(-)
tests/Makefile.include +1 -1
@@ -780,7 +780,7 @@ tests/ide-test$(EXESUF): tests/ide-test.o $(libqos-pc-obj-y) tests/ahci-test$(EXESUF): tests/ahci-test.o $(libqos-pc-obj-y) qemu-img$(EXESUF) tests/ipmi-kcs-test$(EXESUF): tests/ipmi-kcs-test.o tests/ipmi-bt-test$(EXESUF): tests/ipmi-bt-test.o -tests/hd-geo-test$(EXESUF): tests/hd-geo-test.o +tests/hd-geo-test$(EXESUF): tests/hd-geo-test.o $(libqos-obj-y) tests/boot-order-test$(EXESUF): tests/boot-order-test.o $(libqos-obj-y) tests/boot-serial-test$(EXESUF): tests/boot-serial-test.o $(libqos-obj-y) tests/bios-tables-test$(EXESUF): tests/bios-tables-test.o \
tests/hd-geo-test.c +551 -0
570 lines not on this page · raw message
Signature · 1 line
2.23.0.700.g56cf767bdb-goog
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series seems to have some coding style problems. See output below for more information:
Subject: [PATCH v8 0/8] Add Qemu to SeaBIOS LCHS interface
Type: series
Message-id: [email protected]
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Switched to a new branch 'test'
c45edbb bootdevice: FW_CFG interface for LCHS values 729ce76 bootdevice: Refactor get_boot_devices_list 46853bd bootdevice: Gather LCHS from all relevant devices 4f9e597 scsi: Propagate unrealize() callback to scsi-hd 50179a7 bootdevice: Add interface to gather LCHS 968cf33 block: Support providing LCHS from user ccb1747 hd-geo-test: Add tests for lchs override 538dbd3 block: Refactor macros - fix tabbing
=== OUTPUT BEGIN ===
1/8 Checking commit 538dbd328a6b (block: Refactor macros - fix tabbing)
ERROR: Macros with complex values should be enclosed in parenthesis #57: FILE: include/hw/block/block.h:65:
+#define DEFINE_BLOCK_CHS_PROPERTIES(_state, _conf) \
+ DEFINE_PROP_UINT32("cyls", _state, _conf.cyls, 0), \
+ DEFINE_PROP_UINT32("heads", _state, _conf.heads, 0), \
DEFINE_PROP_UINT32("secs", _state, _conf.secs, 0)total: 1 errors, 0 warnings, 37 lines checked
Patch 1/8 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS.
2/8 Checking commit ccb1747f11c5 (hd-geo-test: Add tests for lchs override)
WARNING: Block comments use a leading /* on a separate line #606: FILE: tests/hd-geo-test.c:965:
+ "skipping hd-geo/override/* tests");
total: 0 errors, 1 warnings, 578 lines checked
Patch 2/8 has style problems, please review. If any of these errors are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
3/8 Checking commit 968cf330ecbc (block: Support providing LCHS from user) 4/8 Checking commit 50179a7c4473 (bootdevice: Add interface to gather LCHS) 5/8 Checking commit 4f9e597a32b8 (scsi: Propagate unrealize() callback to scsi-hd) 6/8 Checking commit 46853bd0b7bf (bootdevice: Gather LCHS from all relevant devices) 7/8 Checking commit 729ce765a499 (bootdevice: Refactor get_boot_devices_list) 8/8 Checking commit c45edbb64fde (bootdevice: FW_CFG interface for LCHS values) === OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/[email protected]/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]
John Snow
AppliedQuoted 71 lines · Sam Eiderman
v1:
Non-standard logical geometries break under QEMU.
A virtual disk which contains an operating system which depends on logical geometries (consistent values being reported from BIOS INT13 AH=08) will most likely break under QEMU/SeaBIOS if it has non-standard logical geometries - for example 56 SPT (sectors per track). No matter what QEMU will guess - SeaBIOS, for large enough disks - will use LBA translation, which will report 63 SPT instead.
In addition we can not enforce SeaBIOS to rely on phyiscal geometries at all. A virtio-blk-pci virtual disk with 255 phyiscal heads can not report more than 16 physical heads when moved to an IDE controller, the ATA spec allows a maximum of 16 heads - this is an artifact of virtualization.
By supplying the logical geometies directly we are able to support such "exotic" disks.
We will use
fw_cfgto do just that.v2:
Fix missing parenthesis check in
"hd-geo-test: Add tests for lchs override"v3:
* Rename
fw_cfgkey to "bios-geometry".
* Remove "extendible" interface.
* Addcpu_to_le32fix as Laszlo suggested or big endian hosts
* Fix last qtest commit - automatic docker tester for some reason does not have qemu-img setv4:
* Change
fw_cfginterface from mixed textual/binary to textual onlyv5:
* Fix line > 80 chars in
tests/hd-geo-test.cv6:
* Small fixes for issues pointed by Max
* (&conf->conf)->lcyls toconf->conf.lcylsand so on
* Removescsi_unrealizefrom everything other than scsi-hd
* Add proper include tosysemu.h
*scsi_device_unrealize()afterscsi_device_purge_requests()v7:
* Adapted last commit (tests) to changes in qtest
v8:
* Fixed BE issue with tests by using
qfw_cfg_get_file()instead ofread_fw_cfg_file(), thanks Laszlo.
* Removed incorrect comment in 7/8.Sam Eiderman (8):
block: Refactor macros - fix tabbing
block: Support providing LCHS from user
bootdevice: Add interface to gather LCHS
scsi: Propagateunrealize()callback to scsi-hd
bootdevice: Gather LCHS from all relevant devices
bootdevice: Refactorget_boot_devices_list
bootdevice:FW_CFGinterface for LCHS values
hd-geo-test: Add tests for lchs override
Quoted 13 lines
bootdevice.c | 147 +++++++++-- hw/block/virtio-blk.c | 6 + hw/ide/qdev.c | 7 +- hw/nvram/fw_cfg.c | 14 +- hw/scsi/scsi-bus.c | 16 ++ hw/scsi/scsi-disk.c | 12 + include/hw/block/block.h | 22 +- include/hw/scsi/scsi.h | 1 + include/sysemu/sysemu.h | 4 + tests/Makefile.include | 2 +- tests/hd-geo-test.c | 551 +++++++++++++++++++++++++++++++++++++++ 11 files changed, 741 insertions(+), 41 deletions(-)
Thanks, applied to my IDE tree:
https://github.com/jnsnow/qemu/commits/ide
https://github.com/jnsnow/qemu.git
--js
(Philippe, you have a few days to check that I didn't snub your reviews if you want to look ...!)