Add Qemu to SeaBIOS LCHS interface
PATCH v7 1/8 block: Refactor macros - fix tabbing
In reply to Sam Eiderman viaFrom: 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.351.gc4317032e6-goog
PATCH v7 3/8 bootdevice: Add interface to gather LCHS
In reply to Sam Eiderman viaFrom: 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.351.gc4317032e6-goog
PATCH v7 5/8 bootdevice: Gather LCHS from all relevant devices
In reply to Sam Eiderman viaFrom: 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
@@ -1186,6 +1186,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)
@@ -1193,6 +1198,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"
@@ -2402,6 +2403,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)
@@ -3006,6 +3017,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.351.gc4317032e6-goog
v7 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
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 | 148 ++++++++-- 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 | 589 +++++++++++++++++++++++++++++++++++++++ 11 files changed, 780 insertions(+), 41 deletions(-)
Signature · 1 line
2.23.0.351.gc4317032e6-goog
PATCH v7 7/8 bootdevice: FW_CFG interface for LCHS values
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 new fw_cfg entry is "bios-geometry".
--- bootdevice.c | 32 ++++++++++++++++++++++++++++++++ hw/nvram/fw_cfg.c | 14 +++++++++++--- include/sysemu/sysemu.h | 1 + 3 files changed, 44 insertions(+), 3 deletions(-)
bootdevice.c +32 -0
@@ -405,3 +405,35 @@ void del_boot_device_lchs(DeviceState *dev, const char *suffix) } } } + +/* Serialized as: (device name\0 + lchs struct) x devices */ +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.351.gc4317032e6-goog
PATCH v7 8/8 hd-geo-test: Add tests for lchs override
In reply to Sam Eiderman viaFrom: 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.
I added a few helper functions which will make adding more tests easier.
QTest's fw_cfg helper functions support only legacy fw_cfg, so I had to read the new fw_cfg layout on my own.
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 | 589 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 590 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 +589 -0
608 lines not on this page · raw message
Signature · 1 line
2.23.0.351.gc4317032e6-goog
PATCH v7 6/8 bootdevice: Refactor get_boot_devices_list
In reply to Sam Eiderman viaFrom: 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, +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.351.gc4317032e6-goog
PATCH v7 2/8 block: Support providing LCHS from user
In reply to Sam Eiderman viaFrom: 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.351.gc4317032e6-goog
PATCH v7 4/8 scsi: Propagate unrealize() callback to scsi-hd
In reply to Sam Eiderman viaFrom: 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.351.gc4317032e6-goog
John Snow
AppliedQuoted 64 lines · Sam Eiderman via
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
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 | 148 ++++++++-- 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 | 589 +++++++++++++++++++++++++++++++++++++++ 11 files changed, 780 insertions(+), 41 deletions(-)
Thanks, applied to my IDE tree:
https://github.com/jnsnow/qemu/commits/ide
https://github.com/jnsnow/qemu.git
--js
Is that the right tree? Nope, but time's marching on without us. If any other maintainer has an objection, you have until Friday before I send the PR!
Re: [SeaBIOS] [PATCH v7 1/8] block: Refactor macros - fix tabbing
In reply to Sam Eiderman viaQuoted 7 lines · Sam Eiderman
From: Sam Eiderman <[email protected]>
Fixing tabbing in block related macros.
Reviewed-by Karl Heubaum <[email protected]>Reviewed-by Arbel Moshe <[email protected]>Signed-off-by Sam Eiderman <[email protected]>
Quoted 53 lines
--- 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) \
Re: [SeaBIOS] [PATCH v7 4/8] scsi: Propagate unrealize() callback to scsi-hd
In reply to Sam Eiderman viaQuoted 9 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.Signed-off-by Sam Eiderman <[email protected]>Reviewed-by Karl Heubaum <[email protected]>Reviewed-by Arbel Moshe <[email protected]>Signed-off-by Sam Eiderman <[email protected]>
Quoted 58 lines
--- 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,
Re: [SeaBIOS] [PATCH v7 6/8] bootdevice: Refactor get_boot_devices_list
In reply to Sam Eiderman viaQuoted 19 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]>Signed-off-by Sam Eiderman <[email protected]>--- bootdevice.c | 61 +++++++++++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 27 deletions(-)bootdevice.c +0
-0
bootdevice.c DeviceState *get_boot_device(uint32_t position) · line 206
Quoted 5 lines
bootdevice.c +2
-0@@ -202,6 +202,39 @@ DeviceState *get_boot_device(uint32_t position)return res; } +static char *get_boot_device_path (DeviceState *dev,bool ignore_suffixes, +char *suffix)
Please update to 'const char *suffix'.
John, can you do it directly in your tree before sending the pull request? With it:
Quoted 73 lines
bootdevice.c +32
-27+{ +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' ;
Re: [SeaBIOS] [PATCH v7 7/8] bootdevice: FW_CFG interface for LCHS values
In reply to Sam Eiderman viaHi Sam,
Quoted 49 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]>Signed-off-by Sam Eiderman <[email protected]>--- bootdevice.c | 32 ++++++++++++++++++++++++++++++++ hw/nvram/fw_cfg.c | 14 +++++++++++--- include/sysemu/sysemu.h | 1 + 3 files changed, 44 insertions(+), 3 deletions(-)bootdevice.c +6
-0@@ -405,3 +405,35 @@ void del_boot_device_lchs(DeviceState *dev, const char *suffix) } } } + +/* Serialized as: (device name\0 + lchs struct) x devices */ +char *get_boot_devices_lchs_list (size_t *size) +{ +FWLCHSEntry *i; +size_t total =0 ;
bootdevice.c void del_boot_device_lchs(DeviceState *dev, const char *suffix) · line 423
Quoted 10 lines
bootdevice.c +10
-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);
Hmm maybe we can g_free(bootpath) directly here.
Quoted 30 lines
bootdevice.c +16
-0+ +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 +2
-2@@ -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);
hw/nvram/fw_cfg.c void *fw_cfg_modify_file(FWCfgState *s, const char *filename, · line 935
Quoted 10 lines
hw/nvram/fw_cfg.c +7
-1+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);
OK. Can you add a test in tests/fw_cfg-test.c please?
Quoted 10 lines
hw/nvram/fw_cfg.c +2
-0+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 109
Quoted 4 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);
Please add some documentation. At least 'size' must be non-NULL.
Ideally you should add doc for the other functions added in 3/8 "bootdevice: Add interface to gather LCHS" too.
John, what do you think about extracting the *boot_device* functions out of "sysemu.h"?
Thanks,
Phil.
Quoted 4 lines
include/sysemu/sysemu.h +0
-0/* handler to set the boot_device order for a specific type of MachineClass */ typedef void QEMUBootSetHandler(void *opaque, const char *boot_order,
Re: [SeaBIOS] [PATCH v7 8/8] hd-geo-test: Add tests for lchs override
In reply to Sam Eiderman viaQuoted 217 lines · Sam Eiderman
From: 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.
I added a few helper functions which will make adding more tests easier.
QTest's
fw_cfghelper functions support only legacyfw_cfg, so I had to read the newfw_cfglayout on my own.Creating qcow2 disks with specific size and MBR layout is currently unused - we only use a default empty MBR.
Reviewed-by Karl Heubaum <[email protected]>Reviewed-by Arbel Moshe <[email protected]>Signed-off-by Sam Eiderman <[email protected]>--- tests/Makefile.include | 2 +- tests/hd-geo-test.c | 589 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 590 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 +165
-0@@ -17,7 +17,12 @@#include "qemu/osdep.h" #include "qemu-common.h" +#include "qemu/bswap.h" +#include "qapi/qmp/qlist.h" #include "libqtest.h" +#include "libqos/fw_cfg.h" +#include "libqos/libqos.h" +#include "standard-headers/linux/qemu_fw_cfg.h" #define ARGV_SIZE 256@@ -388,6 +393,575 @@ static void test_ide_drive_cd_0(void)qtest_quit (qts); } +typedef struct { +bool active; +uint32_t head; +uint32_t sector; +uint32_t cyl; +uint32_t end_head; +uint32_t end_sector; +uint32_t end_cyl; +uint32_t start_sect; +uint32_t nr_sects; +}MBRpartitions [4 ]; + +static MBRpartitions empty_mbr = { {false,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 }, + {false,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 }, + {false,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 }, + {false,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 } }; + +static char *create_qcow2_with_mbr (MBRpartitions mbr,uint64_t sectors) +{ +const char *template ="/tmp/qtest.XXXXXX" ; +char *raw_path =strdup (template); +char *qcow2_path =strdup (template); +char cmd[100 +2 *PATH_MAX ]; +uint8_t buf[512 ]; +int i, ret, fd, offset; +uint64_t qcow2_size = sectors *512 ; +uint8_t status, parttype, head, sector, cyl; +char *qemu_img_path; +char *qemu_img_abs_path; + + offset =0xbe ; + +for (i =0 ; i <4 ; i++) { + status = mbr[i].active ?0x80 :0x00 ; +g_assert (mbr[i].head <256 ); +g_assert (mbr[i].sector <64 ); +g_assert (mbr[i].cyl <1024 ); + head = mbr[i].head; + sector = mbr[i].sector + ((mbr[i].cyl &0x300 ) >>2 ); + cyl = mbr[i].cyl &0xff ; + + buf[offset +0x0 ] = status; + buf[offset +0x1 ] = head; + buf[offset +0x2 ] = sector; + buf[offset +0x3 ] = cyl; + + parttype =0 ; +g_assert (mbr[i].end_head <256 ); +g_assert (mbr[i].end_sector <64 ); +g_assert (mbr[i].end_cyl <1024 ); + head = mbr[i].end_head; + sector = mbr[i].end_sector + ((mbr[i].end_cyl &0x300 ) >>2 ); + cyl = mbr[i].end_cyl &0xff ; + + buf[offset +0x4 ] = parttype; + buf[offset +0x5 ] = head; + buf[offset +0x6 ] = sector; + buf[offset +0x7 ] = cyl; + + (*(uint32_t *)&buf[offset +0x8 ]) =cpu_to_le32 (mbr[i].start_sect); + (*(uint32_t *)&buf[offset +0xc ]) =cpu_to_le32 (mbr[i].nr_sects); + + offset +=0x10 ; + } + + fd =mkstemp (raw_path); +g_assert (fd); +close (fd); + + fd =open (raw_path,O_WRONLY ); +g_assert (fd >=0 ); + ret =write (fd, buf,sizeof (buf)); +g_assert (ret ==sizeof (buf)); +close (fd); + + fd =mkstemp (qcow2_path); +g_assert (fd); +close (fd); + + qemu_img_path =getenv ("QTEST_QEMU_IMG" ); +g_assert (qemu_img_path); + qemu_img_abs_path =realpath (qemu_img_path,NULL ); +g_assert (qemu_img_abs_path); + + ret =snprintf (cmd,sizeof (cmd), +"%s convert -f raw -O qcow2 %s %s > /dev/null" , + qemu_img_abs_path, + raw_path, qcow2_path); +g_assert ((0 < ret) && (ret <=sizeof (cmd))); + ret =system (cmd); +g_assert (ret ==0 ); + + ret =snprintf (cmd,sizeof (cmd), +"%s resize %s %" PRIu64" > /dev/null" , + qemu_img_abs_path, + qcow2_path, qcow2_size); +g_assert ((0 < ret) && (ret <=sizeof (cmd))); + ret =system (cmd); +g_assert (ret ==0 ); + +free (qemu_img_abs_path); + +unlink (raw_path); +free (raw_path); + +return qcow2_path; +} + +struct QemuCfgFile { +uint32_t size;/* file size */ +uint16_t select;/* write this to 0x510 to read it */ +uint16_t reserved; +char name[56 ]; +}; + +static uint16_t find_fw_cfg_file (QFWCFG *fw_cfg, +const char *filename) +{ +struct QemuCfgFile qfile; +uint32_t count, e; +uint16_t select; + + count =qfw_cfg_get_u32 (fw_cfg,FW_CFG_FILE_DIR ); + count =be32_to_cpu (count); +for (select =0 , e =0 ; e < count; e++) { +qfw_cfg_read_data (fw_cfg, &qfile,sizeof (qfile)); +if (!strcmp (filename, qfile.name)) { + select =be16_to_cpu (qfile.select); + } + } + +return select; +} + +static void read_fw_cfg_file (QFWCFG *fw_cfg, +const char *filename, +void *data, +size_t len) +{ +uint16_t select =find_fw_cfg_file (fw_cfg, filename); + +g_assert (select); + +qfw_cfg_get (fw_cfg, select, data, len); +} + +#define BIOS_GEOMETRY_MAX_SIZE 10000 + +typedef struct { +uint32_t c; +uint32_t h; +uint32_t s; +}CHS ; + +typedef struct { +const char *dev_path; +CHS chs; +}CHSResult ; + +static void read_bootdevices (QFWCFG *fw_cfg,CHSResult expected[])
tests/hd-geo-test.c static void test_ide_drive_cd_0(void) · line 565
Quoted 10 lines
tests/hd-geo-test.c +10
-0+{ +char *buf =g_malloc0 (BIOS_GEOMETRY_MAX_SIZE ); +char *cur; +GList *results =NULL , *cur_result; +CHSResult *r; +int i; +int res; +bool found; + +read_fw_cfg_file (fw_cfg,"bios-geometry" , buf,BIOS_GEOMETRY_MAX_SIZE );
Oh I'm glad to see the test I requested while reviewing the previous patch! I'll have a look at it, but John 589 LoC I doubt I can do it for Friday.
Quoted 425 lines
tests/hd-geo-test.c +414
-0+ +for (cur = buf; *cur; cur++) { +if (*cur =='\n' ) { + *cur ='\0' ; + } + } + cur = buf; + +while (strlen (cur)) { + + r =g_malloc0 (sizeof (*r)); + r->dev_path =g_malloc0 (strlen (cur) +1 ); + res =sscanf (cur,"%s %" PRIu32" %" PRIu32" %" PRIu32, + (char *)r->dev_path, + &(r->chs.c), &(r->chs.h), &(r->chs.s)); + +g_assert (res ==4 ); + + results =g_list_prepend (results, r); + + cur +=strlen (cur) +1 ; + } + + i =0 ; + +while (expected[i].dev_path) { + found = false; + cur_result = results; +while (cur_result) { + r = cur_result->data; +if (!strcmp (r->dev_path, expected[i].dev_path) && + !memcmp (&(r->chs), &(expected[i].chs),sizeof (r->chs))) { + found = true; +break ; + } + cur_result =g_list_next (cur_result); + } +g_assert (found); +g_free ((char *)((CHSResult *)cur_result->data)->dev_path); +g_free (cur_result->data); + results =g_list_delete_link (results, cur_result); + i++; + } + +g_assert (results ==NULL ); + +g_free (buf); +} + +#define MAX_DRIVES 30 + +typedef struct { +char **argv; +int argc; +char **drives; +int n_drives; +int n_scsi_disks; +int n_scsi_controllers; +int n_virtio_disks; +}TestArgs ; + +static TestArgs *create_args (void ) +{ +TestArgs *args =g_malloc0 (sizeof (*args)); + args->argv = g_new0(char *, ARGV_SIZE); + args->argc =append_arg (args->argc, args->argv, +ARGV_SIZE ,g_strdup ("-nodefaults" )); + args->drives = g_new0(char *, MAX_DRIVES); +return args; +} + +static void add_drive_with_mbr (TestArgs *args, +MBRpartitions mbr,uint64_t sectors) +{ +char *img_file_name; +char part[300 ]; +int ret; + +g_assert (args->n_drives <MAX_DRIVES ); + + img_file_name =create_qcow2_with_mbr (mbr, sectors); + + args->drives[args->n_drives] = img_file_name; + ret =snprintf (part,sizeof (part), +"-drive file=%s,if=none,format=qcow2,id=disk%d" , + img_file_name, args->n_drives); +g_assert ((0 < ret) && (ret <=sizeof (part))); + args->argc =append_arg (args->argc, args->argv,ARGV_SIZE ,g_strdup (part)); + args->n_drives++; +} + +static void add_ide_disk (TestArgs *args, +int drive_idx,int bus,int unit,int c,int h,int s) +{ +char part[300 ]; +int ret; + + ret =snprintf (part,sizeof (part), +"-device ide-hd,drive=disk%d,bus=ide.%d,unit=%d," +"lcyls=%d,lheads=%d,lsecs=%d" , + drive_idx, bus, unit, c, h, s); +g_assert ((0 < ret) && (ret <=sizeof (part))); + args->argc =append_arg (args->argc, args->argv,ARGV_SIZE ,g_strdup (part)); +} + +static void add_scsi_controller (TestArgs *args, +const char *type, +const char *bus, +int addr) +{ +char part[300 ]; +int ret; + + ret =snprintf (part,sizeof (part), +"-device %s,id=scsi%d,bus=%s,addr=%d" , + type, args->n_scsi_controllers, bus, addr); +g_assert ((0 < ret) && (ret <=sizeof (part))); + args->argc =append_arg (args->argc, args->argv,ARGV_SIZE ,g_strdup (part)); + args->n_scsi_controllers++; +} + +static void add_scsi_disk (TestArgs *args, +int drive_idx,int bus, +int channel,int scsi_id,int lun, +int c,int h,int s) +{ +char part[300 ]; +int ret; + + ret =snprintf (part,sizeof (part), +"-device scsi-hd,id=scsi-disk%d,drive=disk%d," +"bus=scsi%d.0," +"channel=%d,scsi-id=%d,lun=%d," +"lcyls=%d,lheads=%d,lsecs=%d" , + args->n_scsi_disks, drive_idx, bus, channel, scsi_id, lun, + c, h, s); +g_assert ((0 < ret) && (ret <=sizeof (part))); + args->argc =append_arg (args->argc, args->argv,ARGV_SIZE ,g_strdup (part)); + args->n_scsi_disks++; +} + +static void add_virtio_disk (TestArgs *args, +int drive_idx,const char *bus,int addr, +int c,int h,int s) +{ +char part[300 ]; +int ret; + + ret =snprintf (part,sizeof (part), +"-device virtio-blk-pci,id=virtio-disk%d," +"drive=disk%d,bus=%s,addr=%d," +"lcyls=%d,lheads=%d,lsecs=%d" , + args->n_virtio_disks, drive_idx, bus, addr, c, h, s); +g_assert ((0 < ret) && (ret <=sizeof (part))); + args->argc =append_arg (args->argc, args->argv,ARGV_SIZE ,g_strdup (part)); + args->n_virtio_disks++; +} + +static void test_override (TestArgs *args,CHSResult expected[]) +{ +QTestState *qts; +char *joined_args; +QFWCFG *fw_cfg; +int i; + + joined_args =g_strjoinv (" " , args->argv); + + qts =qtest_init (joined_args); + fw_cfg =pc_fw_cfg_init (qts); + +read_bootdevices (fw_cfg, expected); + +g_free (joined_args); +qtest_quit (qts); + +g_free (fw_cfg); + +for (i =0 ; i < args->n_drives; i++) { +unlink (args->drives[i]); +free (args->drives[i]); + } +g_free (args->drives); +g_strfreev (args->argv); +g_free (args); +} + +static void test_override_ide (void ) +{ +TestArgs *args =create_args (); +CHSResult expected[] = { + {"/pci@i0cf8/ide@1,1/drive@0/disk@0" , {10000 ,120 ,30 } }, + {"/pci@i0cf8/ide@1,1/drive@0/disk@1" , {9000 ,120 ,30 } }, + {"/pci@i0cf8/ide@1,1/drive@1/disk@0" , {0 ,1 ,1 } }, + {"/pci@i0cf8/ide@1,1/drive@1/disk@1" , {1 ,0 ,0 } }, + {NULL , {0 ,0 ,0 } } + }; +add_drive_with_mbr (args, empty_mbr,1 ); +add_drive_with_mbr (args, empty_mbr,1 ); +add_drive_with_mbr (args, empty_mbr,1 ); +add_drive_with_mbr (args, empty_mbr,1 ); +add_ide_disk (args,0 ,0 ,0 ,10000 ,120 ,30 ); +add_ide_disk (args,1 ,0 ,1 ,9000 ,120 ,30 ); +add_ide_disk (args,2 ,1 ,0 ,0 ,1 ,1 ); +add_ide_disk (args,3 ,1 ,1 ,1 ,0 ,0 ); +test_override (args, expected); +} + +static void test_override_scsi (void ) +{ +TestArgs *args =create_args (); +CHSResult expected[] = { + {"/pci@i0cf8/scsi@3/channel@0/disk@0,0" , {10000 ,120 ,30 } }, + {"/pci@i0cf8/scsi@3/channel@0/disk@1,0" , {9000 ,120 ,30 } }, + {"/pci@i0cf8/scsi@3/channel@0/disk@2,0" , {1 ,0 ,0 } }, + {"/pci@i0cf8/scsi@3/channel@0/disk@3,0" , {0 ,1 ,0 } }, + {NULL , {0 ,0 ,0 } } + }; +add_drive_with_mbr (args, empty_mbr,1 ); +add_drive_with_mbr (args, empty_mbr,1 ); +add_drive_with_mbr (args, empty_mbr,1 ); +add_drive_with_mbr (args, empty_mbr,1 ); +add_scsi_controller (args,"lsi53c895a" ,"pci.0" ,3 ); +add_scsi_disk (args,0 ,0 ,0 ,0 ,0 ,10000 ,120 ,30 ); +add_scsi_disk (args,1 ,0 ,0 ,1 ,0 ,9000 ,120 ,30 ); +add_scsi_disk (args,2 ,0 ,0 ,2 ,0 ,1 ,0 ,0 ); +add_scsi_disk (args,3 ,0 ,0 ,3 ,0 ,0 ,1 ,0 ); +test_override (args, expected); +} + +static void test_override_scsi_2_controllers (void ) +{ +TestArgs *args =create_args (); +CHSResult expected[] = { + {"/pci@i0cf8/scsi@3/channel@0/disk@0,0" , {10000 ,120 ,30 } }, + {"/pci@i0cf8/scsi@3/channel@0/disk@1,0" , {9000 ,120 ,30 } }, + {"/pci@i0cf8/scsi@4/channel@0/disk@0,1" , {1 ,0 ,0 } }, + {"/pci@i0cf8/scsi@4/channel@0/disk@1,2" , {0 ,1 ,0 } }, + {NULL , {0 ,0 ,0 } } + }; +add_drive_with_mbr (args, empty_mbr,1 ); +add_drive_with_mbr (args, empty_mbr,1 ); +add_drive_with_mbr (args, empty_mbr,1 ); +add_drive_with_mbr (args, empty_mbr,1 ); +add_scsi_controller (args,"lsi53c895a" ,"pci.0" ,3 ); +add_scsi_controller (args,"virtio-scsi-pci" ,"pci.0" ,4 ); +add_scsi_disk (args,0 ,0 ,0 ,0 ,0 ,10000 ,120 ,30 ); +add_scsi_disk (args,1 ,0 ,0 ,1 ,0 ,9000 ,120 ,30 ); +add_scsi_disk (args,2 ,1 ,0 ,0 ,1 ,1 ,0 ,0 ); +add_scsi_disk (args,3 ,1 ,0 ,1 ,2 ,0 ,1 ,0 ); +test_override (args, expected); +} + +static void test_override_virtio_blk (void ) +{ +TestArgs *args =create_args (); +CHSResult expected[] = { + {"/pci@i0cf8/scsi@3/disk@0,0" , {10000 ,120 ,30 } }, + {"/pci@i0cf8/scsi@4/disk@0,0" , {9000 ,120 ,30 } }, + {NULL , {0 ,0 ,0 } } + }; +add_drive_with_mbr (args, empty_mbr,1 ); +add_drive_with_mbr (args, empty_mbr,1 ); +add_virtio_disk (args,0 ,"pci.0" ,3 ,10000 ,120 ,30 ); +add_virtio_disk (args,1 ,"pci.0" ,4 ,9000 ,120 ,30 ); +test_override (args, expected); +} + +static void test_override_zero_chs (void ) +{ +TestArgs *args =create_args (); +CHSResult expected[] = { + {NULL , {0 ,0 ,0 } } + }; +add_drive_with_mbr (args, empty_mbr,1 ); +add_ide_disk (args,0 ,1 ,1 ,0 ,0 ,0 ); +test_override (args, expected); +} + +static void test_override_scsi_hot_unplug (void ) +{ +QTestState *qts; +char *joined_args; +QFWCFG *fw_cfg; +QDict *response; +int i; +TestArgs *args =create_args (); +CHSResult expected[] = { + {"/pci@i0cf8/scsi@2/channel@0/disk@0,0" , {10000 ,120 ,30 } }, + {"/pci@i0cf8/scsi@2/channel@0/disk@1,0" , {20 ,20 ,20 } }, + {NULL , {0 ,0 ,0 } } + }; +CHSResult expected2[] = { + {"/pci@i0cf8/scsi@2/channel@0/disk@1,0" , {20 ,20 ,20 } }, + {NULL , {0 ,0 ,0 } } + }; +add_drive_with_mbr (args, empty_mbr,1 ); +add_drive_with_mbr (args, empty_mbr,1 ); +add_scsi_controller (args,"virtio-scsi-pci" ,"pci.0" ,2 ); +add_scsi_disk (args,0 ,0 ,0 ,0 ,0 ,10000 ,120 ,30 ); +add_scsi_disk (args,1 ,0 ,0 ,1 ,0 ,20 ,20 ,20 ); + + joined_args =g_strjoinv (" " , args->argv); + + qts =qtest_init (joined_args); + fw_cfg =pc_fw_cfg_init (qts); + +read_bootdevices (fw_cfg, expected); + +/* unplug device an restart */ + response =qtest_qmp (qts, +"{ 'execute': 'device_del'," +" 'arguments': {'id': 'scsi-disk0' }}" ); +g_assert (response); +g_assert (!qdict_haskey (response,"error" )); +qobject_unref (response); + response =qtest_qmp (qts, +"{ 'execute': 'system_reset', 'arguments': { }}" ); +g_assert (response); +g_assert (!qdict_haskey (response,"error" )); +qobject_unref (response); + +qtest_qmp_eventwait (qts,"RESET" ); + +read_bootdevices (fw_cfg, expected2); + +g_free (joined_args); +qtest_quit (qts); + +g_free (fw_cfg); + +for (i =0 ; i < args->n_drives; i++) { +unlink (args->drives[i]); +free (args->drives[i]); + } +g_free (args->drives); +g_strfreev (args->argv); +g_free (args); +} + +static void test_override_virtio_hot_unplug (void ) +{ +QTestState *qts; +char *joined_args; +QFWCFG *fw_cfg; +QDict *response; +int i; +TestArgs *args =create_args (); +CHSResult expected[] = { + {"/pci@i0cf8/scsi@2/disk@0,0" , {10000 ,120 ,30 } }, + {"/pci@i0cf8/scsi@3/disk@0,0" , {20 ,20 ,20 } }, + {NULL , {0 ,0 ,0 } } + }; +CHSResult expected2[] = { + {"/pci@i0cf8/scsi@3/disk@0,0" , {20 ,20 ,20 } }, + {NULL , {0 ,0 ,0 } } + }; +add_drive_with_mbr (args, empty_mbr,1 ); +add_drive_with_mbr (args, empty_mbr,1 ); +add_virtio_disk (args,0 ,"pci.0" ,2 ,10000 ,120 ,30 ); +add_virtio_disk (args,1 ,"pci.0" ,3 ,20 ,20 ,20 ); + + joined_args =g_strjoinv (" " , args->argv); + + qts =qtest_init (joined_args); + fw_cfg =pc_fw_cfg_init (qts); + +read_bootdevices (fw_cfg, expected); + +/* unplug device an restart */ + response =qtest_qmp (qts, +"{ 'execute': 'device_del'," +" 'arguments': {'id': 'virtio-disk0' }}" ); +g_assert (response); +g_assert (!qdict_haskey (response,"error" )); +qobject_unref (response); + response =qtest_qmp (qts, +"{ 'execute': 'system_reset', 'arguments': { }}" ); +g_assert (response); +g_assert (!qdict_haskey (response,"error" )); +qobject_unref (response); + +qtest_qmp_eventwait (qts,"RESET" ); + +read_bootdevices (fw_cfg, expected2); + +g_free (joined_args); +qtest_quit (qts); + +g_free (fw_cfg); + +for (i =0 ; i < args->n_drives; i++) { +unlink (args->drives[i]); +free (args->drives[i]); + } +g_free (args->drives); +g_strfreev (args->argv); +g_free (args); +} +int main (int argc,char **argv) {Backend i;@@ -413,6 +987,21 @@ int main(int argc, char **argv)qtest_add_func ("hd-geo/ide/device/mbr/chs" , test_ide_device_mbr_chs);qtest_add_func ("hd-geo/ide/device/user/chs" , test_ide_device_user_chs);qtest_add_func ("hd-geo/ide/device/user/chst" , test_ide_device_user_chst); +if (have_qemu_img ()) { +qtest_add_func ("hd-geo/override/ide" , test_override_ide); +qtest_add_func ("hd-geo/override/scsi" , test_override_scsi); +qtest_add_func ("hd-geo/override/scsi_2_controllers" , + test_override_scsi_2_controllers); +qtest_add_func ("hd-geo/override/virtio_blk" , test_override_virtio_blk); +qtest_add_func ("hd-geo/override/zero_chs" , test_override_zero_chs); +qtest_add_func ("hd-geo/override/scsi_hot_unplug" , + test_override_scsi_hot_unplug); +qtest_add_func ("hd-geo/override/virtio_hot_unplug" , + test_override_virtio_hot_unplug); + }else { +g_test_message ("QTEST_QEMU_IMG not set or qemu-img missing; " +"skipping hd-geo/override/* tests" ); + } ret =g_test_run ();
Re: [SeaBIOS] [PATCH v7 8/8] hd-geo-test: Add tests for lchs override
Quoted 224 lines · Philippe Mathieu-Daudé
Quoted 223 lines · Sam Eiderman
From: 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.
I added a few helper functions which will make adding more tests easier.
QTest's
fw_cfghelper functions support only legacyfw_cfg, so I had to read the newfw_cfglayout on my own.Creating qcow2 disks with specific size and MBR layout is currently unused - we only use a default empty MBR.
Reviewed-by Karl Heubaum <[email protected]>Reviewed-by Arbel Moshe <[email protected]>Signed-off-by Sam Eiderman <[email protected]>--- tests/Makefile.include | 2 +- tests/hd-geo-test.c | 589 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 590 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 +171
-0@@ -17,7 +17,12 @@#include "qemu/osdep.h" #include "qemu-common.h" +#include "qemu/bswap.h" +#include "qapi/qmp/qlist.h" #include "libqtest.h" +#include "libqos/fw_cfg.h" +#include "libqos/libqos.h" +#include "standard-headers/linux/qemu_fw_cfg.h" #define ARGV_SIZE 256@@ -388,6 +393,575 @@ static void test_ide_drive_cd_0(void)qtest_quit (qts); } +typedef struct { +bool active; +uint32_t head; +uint32_t sector; +uint32_t cyl; +uint32_t end_head; +uint32_t end_sector; +uint32_t end_cyl; +uint32_t start_sect; +uint32_t nr_sects; +}MBRpartitions [4 ]; + +static MBRpartitions empty_mbr = { {false,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 }, + {false,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 }, + {false,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 }, + {false,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 } }; + +static char *create_qcow2_with_mbr (MBRpartitions mbr,uint64_t sectors) +{ +const char *template ="/tmp/qtest.XXXXXX" ; +char *raw_path =strdup (template); +char *qcow2_path =strdup (template); +char cmd[100 +2 *PATH_MAX ]; +uint8_t buf[512 ]; +int i, ret, fd, offset; +uint64_t qcow2_size = sectors *512 ; +uint8_t status, parttype, head, sector, cyl; +char *qemu_img_path; +char *qemu_img_abs_path; + + offset =0xbe ; + +for (i =0 ; i <4 ; i++) { + status = mbr[i].active ?0x80 :0x00 ; +g_assert (mbr[i].head <256 ); +g_assert (mbr[i].sector <64 ); +g_assert (mbr[i].cyl <1024 ); + head = mbr[i].head; + sector = mbr[i].sector + ((mbr[i].cyl &0x300 ) >>2 ); + cyl = mbr[i].cyl &0xff ; + + buf[offset +0x0 ] = status; + buf[offset +0x1 ] = head; + buf[offset +0x2 ] = sector; + buf[offset +0x3 ] = cyl; + + parttype =0 ; +g_assert (mbr[i].end_head <256 ); +g_assert (mbr[i].end_sector <64 ); +g_assert (mbr[i].end_cyl <1024 ); + head = mbr[i].end_head; + sector = mbr[i].end_sector + ((mbr[i].end_cyl &0x300 ) >>2 ); + cyl = mbr[i].end_cyl &0xff ; + + buf[offset +0x4 ] = parttype; + buf[offset +0x5 ] = head; + buf[offset +0x6 ] = sector; + buf[offset +0x7 ] = cyl; + + (*(uint32_t *)&buf[offset +0x8 ]) =cpu_to_le32 (mbr[i].start_sect); + (*(uint32_t *)&buf[offset +0xc ]) =cpu_to_le32 (mbr[i].nr_sects); + + offset +=0x10 ; + } + + fd =mkstemp (raw_path); +g_assert (fd); +close (fd); + + fd =open (raw_path,O_WRONLY ); +g_assert (fd >=0 ); + ret =write (fd, buf,sizeof (buf)); +g_assert (ret ==sizeof (buf)); +close (fd); + + fd =mkstemp (qcow2_path); +g_assert (fd); +close (fd); + + qemu_img_path =getenv ("QTEST_QEMU_IMG" ); +g_assert (qemu_img_path); + qemu_img_abs_path =realpath (qemu_img_path,NULL ); +g_assert (qemu_img_abs_path); + + ret =snprintf (cmd,sizeof (cmd), +"%s convert -f raw -O qcow2 %s %s > /dev/null" , + qemu_img_abs_path, + raw_path, qcow2_path); +g_assert ((0 < ret) && (ret <=sizeof (cmd))); + ret =system (cmd); +g_assert (ret ==0 ); + + ret =snprintf (cmd,sizeof (cmd), +"%s resize %s %" PRIu64" > /dev/null" , + qemu_img_abs_path, + qcow2_path, qcow2_size); +g_assert ((0 < ret) && (ret <=sizeof (cmd))); + ret =system (cmd); +g_assert (ret ==0 ); + +free (qemu_img_abs_path); + +unlink (raw_path); +free (raw_path); + +return qcow2_path; +} + +struct QemuCfgFile { +uint32_t size;/* file size */ +uint16_t select;/* write this to 0x510 to read it */ +uint16_t reserved; +char name[56 ]; +}; + +static uint16_t find_fw_cfg_file (QFWCFG *fw_cfg, +const char *filename) +{ +struct QemuCfgFile qfile; +uint32_t count, e; +uint16_t select; + + count =qfw_cfg_get_u32 (fw_cfg,FW_CFG_FILE_DIR ); + count =be32_to_cpu (count); +for (select =0 , e =0 ; e < count; e++) { +qfw_cfg_read_data (fw_cfg, &qfile,sizeof (qfile)); +if (!strcmp (filename, qfile.name)) { + select =be16_to_cpu (qfile.select); + } + } + +return select; +} + +static void read_fw_cfg_file (QFWCFG *fw_cfg, +const char *filename, +void *data, +size_t len) +{ +uint16_t select =find_fw_cfg_file (fw_cfg, filename); + +g_assert (select); + +qfw_cfg_get (fw_cfg, select, data, len); +} + +#define BIOS_GEOMETRY_MAX_SIZE 10000 + +typedef struct { +uint32_t c; +uint32_t h; +uint32_t s; +}CHS ; + +typedef struct { +const char *dev_path; +CHS chs; +}CHSResult ; + +static void read_bootdevices (QFWCFG *fw_cfg,CHSResult expected[]) +{ +char *buf =g_malloc0 (BIOS_GEOMETRY_MAX_SIZE ); +char *cur; +GList *results =NULL , *cur_result; +CHSResult *r; +int i;
Quoted 9 lines
tests/hd-geo-test.c static void test_ide_drive_cd_0(void) · line 565
Quoted 4 lines
tests/hd-geo-test.c +4
-0+int res; +bool found; + +read_fw_cfg_file (fw_cfg,"bios-geometry" , buf,BIOS_GEOMETRY_MAX_SIZE );Oh I'm glad to see the test I requested while reviewing the previous patch! I'll have a look at it, but John 589 LoC I doubt I can do it for Friday.
It's just a test, even so -- we can amend it. There's no real hurry.
--js
Re: [SeaBIOS] [PATCH v7 7/8] bootdevice: FW_CFG interface for LCHS values
In reply to Philippe Mathieu-DaudéQuoted 56 lines · Philippe Mathieu-Daudé
Hi Sam,
Quoted 53 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]>Signed-off-by Sam Eiderman <[email protected]>--- bootdevice.c | 32 ++++++++++++++++++++++++++++++++ hw/nvram/fw_cfg.c | 14 +++++++++++--- include/sysemu/sysemu.h | 1 + 3 files changed, 44 insertions(+), 3 deletions(-)bootdevice.c +10
-0@@ -405,3 +405,35 @@ void del_boot_device_lchs(DeviceState *dev, const char *suffix) } } } + +/* Serialized as: (device name\0 + lchs struct) x devices */ +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;
Quoted 9 lines
bootdevice.c void del_boot_device_lchs(DeviceState *dev, const char *suffix) · line 423
Quoted 6 lines
bootdevice.c +6
-0+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);Hmm maybe we can
g_free(bootpath)directly here.
I think it's okay to do it at the bottom of the loop. No real benefit to being that eager to free resources in my mind. I expect setup at the top of a block and teardown at the bottom of a block.
Trying to do too much in the middle gets messy in my opinion, not that it seems to matter here.
Quoted 32 lines
Quoted 32 lines
bootdevice.c +16
-0+ +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 +3
-2@@ -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;
Quoted 11 lines
hw/nvram/fw_cfg.c void *fw_cfg_modify_file(FWCfgState *s, const char *filename, · line 935
Quoted 8 lines
hw/nvram/fw_cfg.c +6
-1- 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);OK. Can you add a test in
tests/fw_cfg-test.cplease?
:D
Quoted 4 lines
Quoted 4 lines
hw/nvram/fw_cfg.c +2
-0+g_free (ptr); + } }
Quoted 13 lines
include/sysemu/sysemu.h void validate_bootdevices(const char *devices, Error **errp); · line 109
Quoted 10 lines
hw/nvram/fw_cfg.c +0
-0static 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);Please add some documentation. At least 'size' must be non-NULL.
Sure; but I wasn't going to gate on it because this series went unloved for so long. At this point, a follow-up patch is fine.
Quoted 3 lines
Ideally you should add doc for the other functions added in 3/8 "bootdevice: Add interface to gather LCHS" too.
Same thing here.
Quoted 3 lines
John, what do you think about extracting the *boot_device* functions out of "
sysemu.h"?
Potentially worthwhile; but not critical at the moment. The source tree is not the best-organized thing as-is and I don't think it's fair to hold this series up for much longer for nice-to-haves, ultimately.
More targeted improvements might avoid the "whose responsibility is it to stage this?" hot potato we played with this one; so I'd rather have smaller follow-up patches handled by the respective maintainers.
Quoted 4 lines
Thanks,
Phil.
Thanks for the reviews :)
--js
Re: [SeaBIOS] [PATCH v7 7/8] bootdevice: FW_CFG interface for LCHS values
Quoted 67 lines · John Snow
Quoted 56 lines · Philippe Mathieu-Daudé
Hi Sam,
Quoted 53 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]>Signed-off-by Sam Eiderman <[email protected]>--- bootdevice.c | 32 ++++++++++++++++++++++++++++++++ hw/nvram/fw_cfg.c | 14 +++++++++++--- include/sysemu/sysemu.h | 1 + 3 files changed, 44 insertions(+), 3 deletions(-)bootdevice.c +10
-0@@ -405,3 +405,35 @@ void del_boot_device_lchs(DeviceState *dev, const char *suffix) } } } + +/* Serialized as: (device name\0 + lchs struct) x devices */ +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;Quoted 9 lines
bootdevice.c void del_boot_device_lchs(DeviceState *dev, const char *suffix) · line 423
Quoted 6 lines
bootdevice.c +6
-0+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);Hmm maybe we can
g_free(bootpath)directly here.
Quoted 6 lines
I think it's okay to do it at the bottom of the loop. No real benefit to being that eager to free resources in my mind. I expect setup at the top of a block and teardown at the bottom of a block.
Trying to do too much in the middle gets messy in my opinion, not that it seems to matter here.
No problem.
Quoted 64 lines
Quoted 32 lines
Quoted 32 lines
bootdevice.c +16
-0+ +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 +3
-2@@ -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;Quoted 11 lines
hw/nvram/fw_cfg.c void *fw_cfg_modify_file(FWCfgState *s, const char *filename, · line 935
Quoted 8 lines
hw/nvram/fw_cfg.c +6
-1- 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);OK. Can you add a test in
tests/fw_cfg-test.cplease?:D
Quoted 4 lines
Quoted 4 lines
hw/nvram/fw_cfg.c +2
-0+g_free (ptr); + } }Quoted 13 lines
include/sysemu/sysemu.h void validate_bootdevices(const char *devices, Error **errp); · line 109
Quoted 10 lines
hw/nvram/fw_cfg.c +0
-0static 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);Please add some documentation. At least 'size' must be non-NULL.
Quoted 2 lines
Sure; but I wasn't going to gate on it because this series went unloved for so long. At this point, a follow-up patch is fine.
OK
Quoted 11 lines
Quoted 4 lines
Ideally you should add doc for the other functions added in 3/8 "bootdevice: Add interface to gather LCHS" too.
Same thing here.
Quoted 3 lines
John, what do you think about extracting the *boot_device* functions out of "
sysemu.h"?
Quoted 7 lines
Potentially worthwhile; but not critical at the moment. The source tree is not the best-organized thing as-is and I don't think it's fair to hold this series up for much longer for nice-to-haves, ultimately.
More targeted improvements might avoid the "whose responsibility is it to stage this?" hot potato we played with this one; so I'd rather have smaller follow-up patches handled by the respective maintainers.
Sure, fair enough.
Quoted 6 lines
Quoted 5 lines
Thanks,
Phil.
Thanks for the reviews :)
:)
Philippe Mathieu-Daudé
Reviewed-byRe: [SeaBIOS] [PATCH v7 7/8] bootdevice: FW_CFG interface for LCHS values
Quoted 161 lines · Philippe Mathieu-Daudé
Quoted 67 lines · John Snow
Quoted 56 lines · Philippe Mathieu-Daudé
Hi Sam,
Quoted 53 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]>Signed-off-by Sam Eiderman <[email protected]>--- bootdevice.c | 32 ++++++++++++++++++++++++++++++++ hw/nvram/fw_cfg.c | 14 +++++++++++--- include/sysemu/sysemu.h | 1 + 3 files changed, 44 insertions(+), 3 deletions(-)bootdevice.c +10
-0@@ -405,3 +405,35 @@ void del_boot_device_lchs(DeviceState *dev, const char *suffix) } } } + +/* Serialized as: (device name\0 + lchs struct) x devices */ +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;Quoted 9 lines
bootdevice.c void del_boot_device_lchs(DeviceState *dev, const char *suffix) · line 423
Quoted 6 lines
bootdevice.c +6
-0+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);Hmm maybe we can
g_free(bootpath)directly here.Quoted 6 lines
I think it's okay to do it at the bottom of the loop. No real benefit to being that eager to free resources in my mind. I expect setup at the top of a block and teardown at the bottom of a block.
Trying to do too much in the middle gets messy in my opinion, not that it seems to matter here.
No problem.
Quoted 64 lines
Quoted 32 lines
Quoted 32 lines
bootdevice.c +16
-0+ +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 +3
-2@@ -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;Quoted 11 lines
hw/nvram/fw_cfg.c void *fw_cfg_modify_file(FWCfgState *s, const char *filename, · line 935
Quoted 8 lines
hw/nvram/fw_cfg.c +6
-1- 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);OK. Can you add a test in
tests/fw_cfg-test.cplease?:D
Quoted 4 lines
Quoted 4 lines
hw/nvram/fw_cfg.c +2
-0+g_free (ptr); + } }Quoted 13 lines
include/sysemu/sysemu.h void validate_bootdevices(const char *devices, Error **errp); · line 109
Quoted 10 lines
hw/nvram/fw_cfg.c +0
-0static 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);Please add some documentation. At least 'size' must be non-NULL.
Quoted 2 lines
Sure; but I wasn't going to gate on it because this series went unloved for so long. At this point, a follow-up patch is fine.
OK
Quoted 15 lines
Quoted 4 lines
Ideally you should add doc for the other functions added in 3/8 "bootdevice: Add interface to gather LCHS" too.
Same thing here.
Quoted 3 lines
John, what do you think about extracting the *boot_device* functions out of "
sysemu.h"?Potentially worthwhile; but not critical at the moment. The source tree is not the best-organized thing as-is and I don't think it's fair to hold this series up for much longer for nice-to-haves, ultimately.
Quoted 5 lines
Quoted 3 lines
More targeted improvements might avoid the "whose responsibility is it to stage this?" hot potato we played with this one; so I'd rather have smaller follow-up patches handled by the respective maintainers.
Sure, fair enough.
I forgot:
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:
Type: series
Message-id: [email protected]
Subject: [PATCH v7 0/8] Add Qemu to SeaBIOS LCHS interface
=== 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 ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
deee6ff..c6f5012 master -> master - [tag update] patchew/[email protected] -> patchew/[email protected] - [tag update] patchew/[email protected] -> patchew/[email protected] * [new tag] patchew/[email protected] -> patchew/[email protected] * [new tag] patchew/[email protected] -> patchew/[email protected] * [new tag] patchew/[email protected] -> patchew/[email protected] * [new tag] patchew/[email protected] -> patchew/[email protected]
Switched to a new branch 'test'
3d14890 hd-geo-test: Add tests for lchs override 8db970f bootdevice: FW_CFG interface for LCHS values f73e65a8 bootdevice: Refactor get_boot_devices_list d1d97ec bootdevice: Gather LCHS from all relevant devices 31221f5 scsi: Propagate unrealize() callback to scsi-hd 6422c6a bootdevice: Add interface to gather LCHS b2360f7 block: Support providing LCHS from user 1c43be6 block: Refactor macros - fix tabbing
=== OUTPUT BEGIN ===
1/8 Checking commit 1c43be6de15d (block: Refactor macros - fix tabbing)
ERROR: Macros with complex values should be enclosed in parenthesis #55: 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 b2360f718807 (block: Support providing LCHS from user) 3/8 Checking commit 6422c6acc42a (bootdevice: Add interface to gather LCHS) 4/8 Checking commit 31221f5a0d4d (scsi: Propagate unrealize() callback to scsi-hd) 5/8 Checking commit d1d97eca7de2 (bootdevice: Gather LCHS from all relevant devices) 6/8 Checking commit f73e65a879c8 (bootdevice: Refactor get_boot_devices_list) 7/8 Checking commit 8db970f739ad (bootdevice: FW_CFG interface for LCHS values) 8/8 Checking commit 3d148902136a (hd-geo-test: Add tests for lchs override)
WARNING: Block comments use a leading /* on a separate line
#648: FILE: tests/hd-geo-test.c:1003:
+ "skipping hd-geo/override/* tests");
total: 0 errors, 1 warnings, 616 lines checked
Patch 8/8 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS.
=== 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]
Re: [SeaBIOS] [PATCH v7 7/8] bootdevice: FW_CFG interface for LCHS values
In reply to Philippe Mathieu-DaudéPhilippe, thanks for the fast review,
John, thanks for picking up this hot potato :-)
Sam
Quoted 185 lines · Philippe Mathieu-Daudé
Quoted 8 lines · Philippe Mathieu-Daudé
Quoted 7 lines · John Snow
Quoted 6 lines · Philippe Mathieu-Daudé
Hi Sam,
Quoted 3 lines · Sam Eiderman
From: Sam Eiderman <[email protected]>
Using
fw_cfg, supply logical CHS values directly from QEMU to theBIOS.
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
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
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
logical geometries - for example 56 SPT (sectors per track). No matter what QEMU will report - SeaBIOS, for large enough disks -
will
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
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
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
virtualization.
By supplying the logical geometries directly we are able to support
such
Quoted 15 lines
Quoted 15 lines
Quoted 15 lines
Quoted 15 lines
"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]>Signed-off-by Sam Eiderman <[email protected]>--- bootdevice.c | 32 ++++++++++++++++++++++++++++++++ hw/nvram/fw_cfg.c | 14 +++++++++++--- include/sysemu/sysemu.h | 1 + 3 files changed, 44 insertions(+), 3 deletions(-)Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
bootdevice.c void del_boot_device_lchs(DeviceState *dev,
Quoted 5 lines
bootdevice.c +0
-0@@ -405,3 +405,35 @@ void del_boot_device_lchs(DeviceState *dev,const char *suffix)
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
bootdevice.c +7
-0} } } + +/* Serialized as: (device name\0 + lchs struct) x devices */ +char *get_boot_devices_lchs_list (size_t *size) +{ +FWLCHSEntry *i; +size_t total =0 ; +char *list =NULL ;Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
bootdevice.c void del_boot_device_lchs(DeviceState *dev, const char *suffix)
Quoted 8 lines
bootdevice.c +8
-0+ + 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,
Quoted 1 line
Quoted 1 line
Quoted 1 line
bootdevice.c void del_boot_device_lchs(DeviceState *dev, · line 423
Quoted 1 line
bootdevice.c +1
-0+ bootpath, i->lcyls, i->lheads,
i->lsecs);Quoted 26 lines
Quoted 10 lines
Quoted 3 lines
Hmm maybe we can
g_free(bootpath)directly here.I think it's okay to do it at the bottom of the loop. No real benefit to being that eager to free resources in my mind. I expect setup at the top of a block and teardown at the bottom of a block.
Trying to do too much in the middle gets messy in my opinion, not that it seems to matter here.
No problem.
Quoted 13 lines
Quoted 13 lines
Quoted 13 lines
bootdevice.c +13
-0+ +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;Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
hw/nvram/fw_cfg.c void *fw_cfg_modify_file(FWCfgState *s, const
Quoted 8 lines
bootdevice.c +3
-0+ +return list; +}hw/nvram/fw_cfg.c +0
-0@@ -920,13 +920,21 @@ void *fw_cfg_modify_file(FWCfgState *s, constchar *filename,
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
hw/nvram/fw_cfg.c +3
-2static 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;Quoted 1 line
Quoted 1 line
Quoted 1 line
hw/nvram/fw_cfg.c void *fw_cfg_modify_file(FWCfgState *s, const · line 927
Quoted 1 line
hw/nvram/fw_cfg.c +0
-1- ptr = fw_cfg_modify_file(s, "bootorder", (uint8_t *)bootindex,len);
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
hw/nvram/fw_cfg.c void *fw_cfg_modify_file(FWCfgState *s, const char *filename,
Quoted 7 lines
hw/nvram/fw_cfg.c +6
-0+ 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);
Quoted 10 lines
Quoted 10 lines
Quoted 3 lines
OK. Can you add a test in
tests/fw_cfg-test.cplease?:D
Quoted 4 lines
Quoted 4 lines
hw/nvram/fw_cfg.c +2
-0+g_free (ptr); + } }Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
include/sysemu/sysemu.h void validate_bootdevices(const char *devices,
Quoted 6 lines
hw/nvram/fw_cfg.c +0
-0static void fw_cfg_machine_ready (struct Notifier *n,void *data)include/sysemu/sysemu.h +0
-0@@ -106,6 +106,7 @@ void validate_bootdevices(const char *devices,Error **errp);
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
include/sysemu/sysemu.h void validate_bootdevices(const char *devices, · line 107
Quoted 2 lines
include/sysemu/sysemu.h +0
-0void add_boot_device_lchs (DeviceState *dev,const char *suffix, uint32_t lcyls, uint32_t lheads, uint32_tlsecs);
Quoted 19 lines
Quoted 8 lines
Quoted 5 lines
include/sysemu/sysemu.h void validate_bootdevices(const char *devices, Error **errp); · line 109
Quoted 2 lines
include/sysemu/sysemu.h +1
-0void del_boot_device_lchs (DeviceState *dev,const char *suffix); +char *get_boot_devices_lchs_list (size_t *size);Please add some documentation. At least 'size' must be non-NULL.
Sure; but I wasn't going to gate on it because this series went unloved for so long. At this point, a follow-up patch is fine.
OK
Quoted 8 lines
Quoted 4 lines
Ideally you should add doc for the other functions added in 3/8 "bootdevice: Add interface to gather LCHS" too.
Same thing here.
Quoted 1 line
John, what do you think about extracting the *boot_device* functions
out
Quoted 7 lines
Quoted 7 lines
Quoted 2 lines
of "
sysemu.h"?Potentially worthwhile; but not critical at the moment. The source tree is not the best-organized thing as-is and I don't think it's fair to hold this series up for much longer for nice-to-haves, ultimately.
Quoted 5 lines
Quoted 3 lines
More targeted improvements might avoid the "whose responsibility is it to stage this?" hot potato we played with this one; so I'd rather have smaller follow-up patches handled by the respective maintainers.
Sure, fair enough.
I forgot:
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
Re: [SeaBIOS] [PATCH v7 7/8] bootdevice: FW_CFG interface for LCHS values
Hi Sam,
Quoted 1 line · Sam Eiderman
Philippe, thanks for the fast review,
Fast is not always the friend of careful.
Quoted 63 lines
John, thanks for picking up this hot potato :-)
Sam
On Thu, Sep 26, 2019 at 10:16 PM Philippe Mathieu-Daudé <[email protected] <mailto:[email protected]>> wrote:
On 9/26/19 9:09 PM, Philippe Mathieu-Daudé wrote: > On 9/26/19 8:26 PM, John Snow wrote: >> On 9/26/19 5:57 AM, Philippe Mathieu-Daudé wrote: >>> Hi Sam, >>> >>> On 9/25/19 1:06 PM, Sam Eiderman wrote: >>>> From: Sam Eiderman <[email protected] <mailto:[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". >>>> >>>> Reviewed-by: Karl Heubaum <[email protected] <mailto:[email protected]>> >>>> Reviewed-by: Arbel Moshe <[email protected] <mailto:[email protected]>> >>>> Signed-off-by: Sam Eiderman <[email protected] <mailto:[email protected]>> >>>> --- >>>> bootdevice.c | 32 ++++++++++++++++++++++++++++++++ >>>> hw/nvram/fw_cfg.c | 14 +++++++++++--- >>>> include/sysemu/sysemu.h | 1 + >>>> 3 files changed, 44 insertions(+), 3 deletions(-) >>>> >>>> diff --git a/bootdevice.c b/bootdevice.c >>>> index 2b12fb85a4..b034ad7bdc 100644 >>>> --- a/bootdevice.c
Quoted 8 lines
>>>> +++ b/bootdevice.c
>>>> @@ -405,3 +405,35 @@ void del_boot_device_lchs(DeviceState
*dev, const char *suffix)
>>>> }
>>>> }
>>>> }
>>>> +
>>>> +/* Serialized as: (device name\0 + lchs struct) x devices */I suppose the lchs struct is serialized in little-endian.
Quoted 9 lines
>>>> +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;Quoted 8 lines
>>>> + 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);Sam. can you check if you don't need endianness conversion here?
Quoted 112 lines
>>>
>>> Hmm maybe we can g_free(bootpath) directly here.
>>>
>>
>> I think it's okay to do it at the bottom of the loop. No real
benefit to
>> being that eager to free resources in my mind. I expect setup at
the top
>> of a block and teardown at the bottom of a block.
>>
>> Trying to do too much in the middle gets messy in my opinion,
not that
>> it seems to matter here.
>
> No problem.
>
>>>> +
>>>> + 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;
>>>> +}
>>>> diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
>>>> index 7dc3ac378e..18aff658c0 100644
>>>> --- a/hw/nvram/fw_cfg.c
>>>> +++ b/hw/nvram/fw_cfg.c
>>>> @@ -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);
>>>
>>> OK. Can you add a test in tests/fw_cfg-test.c please?
>>>
>>
>> :D
>>
>>>> + g_free(ptr);
>>>> + }
>>>> }
>>>>
>>>> static void fw_cfg_machine_ready(struct Notifier *n, void *data)
>>>> diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
>>>> index 5bc5c79cbc..80c57fdc4e 100644
>>>> --- a/include/sysemu/sysemu.h
>>>> +++ b/include/sysemu/sysemu.h
>>>> @@ -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);
>>>
>>> Please add some documentation. At least 'size' must be non-NULL.
>>>
>>
>> Sure; but I wasn't going to gate on it because this series went
unloved
>> for so long. At this point, a follow-up patch is fine.
>
> OK
>
>>
>>> Ideally you should add doc for the other functions added in 3/8
>>> "bootdevice: Add interface to gather LCHS" too.
>>>
>>
>> Same thing here.
>>
>>> John, what do you think about extracting the *boot_device*
functions out
>>> of "sysemu.h"?
>>>
>>
>> Potentially worthwhile; but not critical at the moment. The
source tree
>> is not the best-organized thing as-is and I don't think it's fair to
>> hold this series up for much longer for nice-to-haves, ultimately.
>>
>> More targeted improvements might avoid the "whose responsibility
is it
>> to stage this?" hot potato we played with this one; so I'dQuoted 8 lines
rather have
>> smaller follow-up patches handled by the respective maintainers.
>
> Sure, fair enough.
I forgot:
Reviewed-by: Philippe Mathieu-Daudé <[email protected]
<mailto:[email protected]>>Meanwhile I withdraw my fast R-b :(
Regards,
Phil.
Re: [SeaBIOS] [PATCH v7 7/8] bootdevice: FW_CFG interface for LCHS values
Quoted 83 lines · On Tue, Oct 8, 2019, 13:34 Philippe Mathieu-Daudé <[email protected]> wrote:
Hi Sam,
Quoted 1 line · Sam Eiderman
Philippe, thanks for the fast review,
Fast is not always the friend of careful.
Quoted 8 lines
John, thanks for picking up this hot potato :-)
Sam
On Thu, Sep 26, 2019 at 10:16 PM Philippe Mathieu-Daudé <[email protected] <mailto:[email protected]>> wrote:
Quoted 15 lines
On 9/26/19 9:09 PM, Philippe Mathieu-Daudé wrote: > On 9/26/19 8:26 PM, John Snow wrote: >> On 9/26/19 5:57 AM, Philippe Mathieu-Daudé wrote: >>> Hi Sam, >>> >>> On 9/25/19 1:06 PM, Sam Eiderman wrote: >>>> From: Sam Eiderman <[email protected] <mailto:[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 whichdepends on
Quoted 4 lines
>>>> logical geometries (consistent values being reported from BIOS
INT13
>>>> AH=08) will most likely break under QEMU/SeaBIOS if it has
non-standardQuoted 8 lines
>>>> 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 headscannot
Quoted 11 lines
>>>> 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"
Quoted 18 lines
>>>> interface. >>>> The new fw_cfg entry is "bios-geometry". >>>> >>>> Reviewed-by: Karl Heubaum <[email protected] <mailto:[email protected]>> >>>> Reviewed-by: Arbel Moshe <[email protected] <mailto:[email protected]>> >>>> Signed-off-by: Sam Eiderman <[email protected] <mailto:[email protected]>> >>>> --- >>>> bootdevice.c | 32 ++++++++++++++++++++++++++++++++ >>>> hw/nvram/fw_cfg.c | 14 +++++++++++--- >>>> include/sysemu/sysemu.h | 1 + >>>> 3 files changed, 44 insertions(+), 3 deletions(-) >>>> >>>> diff --git a/bootdevice.c b/bootdevice.c >>>> index 2b12fb85a4..b034ad7bdc 100644 >>>> --- a/bootdevice.cQuoted 8 lines
>>>> +++ b/bootdevice.c >>>> @@ -405,3 +405,35 @@ void del_boot_device_lchs(DeviceState *dev, const char *suffix) >>>> } >>>> } >>>> } >>>> + >>>> +/* Serialized as: (device name\0 + lchs struct) x devices */
Quoted 2 lines
I suppose the lchs struct is serialized in little-endian.
Nice catch, that's just a bad comment, should be removed. There used to be a struct with 3 uint32_t values, Laszlo pointed out that there is an endianess problem (this was fixed in v3) later Kevin suggested to make it a textual interface and the struct was removed (in v4) but the comment remained.
Quoted 19 lines
Quoted 10 lines
>>>> +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;Quoted 8 lines
>>>> + 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);
Quoted 2 lines
Sam. can you check if you don't need endianness conversion here?
Hmm, since this is a textual interface, I believe this should work no?
uint32_t a = 4;g_strdup_printf("%s" PRIu32, a);
Should return "4" no matter the endianess? (Taken care of by glib?)
Quoted 132 lines
Quoted 63 lines
>>> >>> Hmm maybe we can g_free(bootpath) directly here. >>> >> >> I think it's okay to do it at the bottom of the loop. No real benefit to >> being that eager to free resources in my mind. I expect setup at the top >> of a block and teardown at the bottom of a block. >> >> Trying to do too much in the middle gets messy in my opinion, not that >> it seems to matter here. > > No problem. > >>>> + >>>> + 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; >>>> +} >>>> diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c >>>> index 7dc3ac378e..18aff658c0 100644 >>>> --- a/hw/nvram/fw_cfg.c >>>> +++ b/hw/nvram/fw_cfg.c >>>> @@ -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); >>> >>> OK. Can you add a test in tests/fw_cfg-test.c please? >>>Quoted 8 lines
>> >> :D >> >>>> + g_free(ptr); >>>> + } >>>> } >>>> >>>> static void fw_cfg_machine_ready(struct Notifier *n, void*data)
Quoted 7 lines
>>>> diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h >>>> index 5bc5c79cbc..80c57fdc4e 100644 >>>> --- a/include/sysemu/sysemu.h >>>> +++ b/include/sysemu/sysemu.h >>>> @@ -106,6 +106,7 @@ void validate_bootdevices(const char *devices, Error **errp); >>>> void add_boot_device_lchs(DeviceState *dev, const char*suffix,
Quoted 3 lines
>>>>
uint32_tlcyls,uint32_tlheads,
uint32_tlsecs);
>>>> void del_boot_device_lchs(DeviceState *dev, const char*suffix);
Quoted 18 lines
>>>> +char *get_boot_devices_lchs_list(size_t *size); >>> >>> Please add some documentation. At least 'size' must be non-NULL. >>> >> >> Sure; but I wasn't going to gate on it because this series went unloved >> for so long. At this point, a follow-up patch is fine. > > OK > >> >>> Ideally you should add doc for the other functions added in 3/8 >>> "bootdevice: Add interface to gather LCHS" too. >>> >> >> Same thing here. >>Quoted 8 lines
>>> John, what do you think about extracting the *boot_device* functions out >>> of "sysemu.h"? >>> >> >> Potentially worthwhile; but not critical at the moment. The source tree >> is not the best-organized thing as-is and I don't think it'sfair to
Quoted 1 line
>> hold this series up for much longer for nice-to-haves,
ultimately.
Quoted 9 lines
>>
>> More targeted improvements might avoid the "whose responsibility
is it
>> to stage this?" hot potato we played with this one; so I'd
rather have
>> smaller follow-up patches handled by the respective maintainers. >
> Sure, fair enough.Quoted 3 lines
I forgot:
Reviewed-by Philippe Mathieu-Daudé <[email protected]<mailto:[email protected]>>
Meanwhile I withdraw my fast R-b :(
Regards,
Phil.
Re: [SeaBIOS] [PATCH v7 7/8] bootdevice: FW_CFG interface for LCHS values
Gentle Ping,
Philippe, John?
Just wondering if the series is okay, as Gerd pointed out this series is a blocker for the corresponding changes in SeaBIOS for v 1.13
Sam
Quoted 247 lines · Sam Eiderman
Quoted 81 lines · On Tue, Oct 8, 2019, 13:34 Philippe Mathieu-Daudé <[email protected]> wrote:
Hi Sam,
Quoted 1 line · Sam Eiderman
Philippe, thanks for the fast review,
Fast is not always the friend of careful.
Quoted 64 lines
John, thanks for picking up this hot potato :-)
Sam
On Thu, Sep 26, 2019 at 10:16 PM Philippe Mathieu-Daudé <[email protected] <mailto:[email protected]>> wrote:
On 9/26/19 9:09 PM, Philippe Mathieu-Daudé wrote: > On 9/26/19 8:26 PM, John Snow wrote: >> On 9/26/19 5:57 AM, Philippe Mathieu-Daudé wrote: >>> Hi Sam, >>> >>> On 9/25/19 1:06 PM, Sam Eiderman wrote: >>>> From: Sam Eiderman <[email protected] <mailto:[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". >>>> >>>> Reviewed-by: Karl Heubaum <[email protected] <mailto:[email protected]>> >>>> Reviewed-by: Arbel Moshe <[email protected] <mailto:[email protected]>> >>>> Signed-off-by: Sam Eiderman <[email protected] <mailto:[email protected]>> >>>> --- >>>> bootdevice.c | 32 ++++++++++++++++++++++++++++++++ >>>> hw/nvram/fw_cfg.c | 14 +++++++++++--- >>>> include/sysemu/sysemu.h | 1 + >>>> 3 files changed, 44 insertions(+), 3 deletions(-) >>>> >>>> diff --git a/bootdevice.c b/bootdevice.c >>>> index 2b12fb85a4..b034ad7bdc 100644 >>>> --- a/bootdevice.cQuoted 8 lines
>>>> +++ b/bootdevice.c >>>> @@ -405,3 +405,35 @@ void del_boot_device_lchs(DeviceState *dev, const char *suffix) >>>> } >>>> } >>>> } >>>> + >>>> +/* Serialized as: (device name\0 + lchs struct) x devices */Quoted 1 line
I suppose the lchs struct is serialized in little-endian.
Nice catch, that's just a bad comment, should be removed.
There used to be a struct with 3uint32_tvalues, Laszlo pointed out that there is an endianess problem (this was fixed in v3) later Kevin suggested to make it a textual interface and the struct was removed (in v4) but the comment remained.Quoted 20 lines
Quoted 11 lines
>>>> +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;Quoted 8 lines
>>>> + 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);Quoted 1 line
Sam. can you check if you don't need endianness conversion here?
Hmm, since this is a textual interface, I believe this should work no?
uint32_ta = 4;g_strdup_printf("%s" PRIu32, a);Should return "4" no matter the endianess? (Taken care of by glib?)
Quoted 127 lines
Quoted 113 lines
>>> >>> Hmm maybe we can g_free(bootpath) directly here. >>> >> >> I think it's okay to do it at the bottom of the loop. No real benefit to >> being that eager to free resources in my mind. I expect setup at the top >> of a block and teardown at the bottom of a block. >> >> Trying to do too much in the middle gets messy in my opinion, not that >> it seems to matter here. > > No problem. > >>>> + >>>> + 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; >>>> +} >>>> diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c >>>> index 7dc3ac378e..18aff658c0 100644 >>>> --- a/hw/nvram/fw_cfg.c >>>> +++ b/hw/nvram/fw_cfg.c >>>> @@ -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); >>> >>> OK. Can you add a test in tests/fw_cfg-test.c please? >>> >> >> :D >> >>>> + g_free(ptr); >>>> + } >>>> } >>>> >>>> static void fw_cfg_machine_ready(struct Notifier *n, void *data) >>>> diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h >>>> index 5bc5c79cbc..80c57fdc4e 100644 >>>> --- a/include/sysemu/sysemu.h >>>> +++ b/include/sysemu/sysemu.h >>>> @@ -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); >>> >>> Please add some documentation. At least 'size' must be non-NULL. >>> >> >> Sure; but I wasn't going to gate on it because this series went unloved >> for so long. At this point, a follow-up patch is fine. > > OK > >> >>> Ideally you should add doc for the other functions added in 3/8 >>> "bootdevice: Add interface to gather LCHS" too. >>> >> >> Same thing here. >> >>> John, what do you think about extracting the *boot_device* functions out >>> of "sysemu.h"? >>> >> >> Potentially worthwhile; but not critical at the moment. The source tree >> is not the best-organized thing as-is and I don't think it's fair to >> hold this series up for much longer for nice-to-haves, ultimately. >> >> More targeted improvements might avoid the "whose responsibility is it >> to stage this?" hot potato we played with this one; so I'dQuoted 8 lines
rather have >> smaller follow-up patches handled by the respective maintainers. > > Sure, fair enough. I forgot: Reviewed-by: Philippe Mathieu-Daudé <[email protected] <mailto:[email protected]>>Meanwhile I withdraw my fast R-b :(
Regards,
Phil.
Re: [SeaBIOS] Re: [PATCH v7 7/8] bootdevice: FW_CFG interface for LCHS values
Hi Sam,
Quoted 6 lines · Sam Eiderman
Gentle Ping,
Philippe, John?
Just wondering if the series is okay, as Gerd pointed out this series is a blocker for the corresponding changes in SeaBIOS for v 1.13
The QEMU series is still not merged, due to a bug in the last patch (namely, the test case, "hd-geo-test: Add tests for lchs override").
To my knowledge, SeaBIOS prefers to merge patches with the underlying QEMU patches merged first, so you'll likely have to fix that QEMU issue first.
I explained the bug in the QEMU test case here:
http://mid.mail-archive.com/[email protected]
http://mid.mail-archive.com/[email protected]
(Alternative links to the same:
https://lists.gnu.org/archive/html/qemu-devel/2019-10/msg01790.html
https://lists.gnu.org/archive/html/qemu-devel/2019-10/msg01793.html
)
I've never received feedback to those messages, and I think you must have missed them.
FWIW, when I hit "Reply All" in that thread, you were on the "To:" list with:
Sam Eiderman <[email protected]>
but here you are present with
Sam Eiderman <[email protected]>
In addition, when I posted those messages, I got the following auto-response ("Undelivered Mail Returned to Sender"):
Quoted 7 lines
This is the mail system at host mx1.redhat.com.
I'm sorry to have to inform you that your message could not be delivered to one or more recipients. It's attached below.
For further assistance, please send mail to postmaster.
Quoted 8 lines
If you do so, please include this problem report. You can delete your own text from the attached returned message.
The mail system
<[email protected]>: host aserp2030.oracle.com[141.146.126.74] said:
550 5.1.1 Unknown recipient address. (in reply to RCPT TO command)
I didn't know your new address, so I could only hope you'd find my feedback on qemu-devel.
Thanks
Laszlo
Re: [SeaBIOS] Re: [PATCH v7 7/8] bootdevice: FW_CFG interface for LCHS values
Quoted 13 lines · Laszlo Ersek
Hi Sam,
Quoted 6 lines · Sam Eiderman
Gentle Ping,
Philippe, John?
Just wondering if the series is okay, as Gerd pointed out this series is a blocker for the corresponding changes in SeaBIOS for v 1.13
The QEMU series is still not merged, due to a bug in the last patch (namely, the test case, "hd-geo-test: Add tests for lchs override").
Quoted 8 lines
To my knowledge, SeaBIOS prefers to merge patches with the underlying QEMU patches merged first, so you'll likely have to fix that QEMU issue first.
I explained the bug in the QEMU test case here:
http://mid.mail-archive.com/[email protected] http://mid.mail-archive.com/[email protected]
Yes, I was expecting a respin with find_fw_cfg_file() fixed per Laszlo detailed review.
Quoted 12 lines
(Alternative links to the same:
https://lists.gnu.org/archive/html/qemu-devel/2019-10/msg01790.html https://lists.gnu.org/archive/html/qemu-devel/2019-10/msg01793.html)
I've never received feedback to those messages, and I think you must have missed them.
FWIW, when I hit "Reply All" in that thread, you were on the "To:" list with:
Quoted 24 lines
Sam Eiderman <[email protected]>
but here you are present with
Sam Eiderman <[email protected]>
In addition, when I posted those messages, I got the following auto-response ("Undelivered Mail Returned to Sender"):
Quoted 15 lines
This is the mail system at host mx1.redhat.com.
I'm sorry to have to inform you that your message could not be delivered to one or more recipients. It's attached below.
For further assistance, please send mail to postmaster.
If you do so, please include this problem report. You can delete your own text from the attached returned message.
The mail system
<[email protected]>: host aserp2030.oracle.com[141.146.126.74] said:
550 5.1.1 Unknown recipient address. (in reply to RCPT TO command)
That explains it :)
Quoted 7 lines
I didn't know your new address, so I could only hope you'd find my feedback on qemu-devel.
Thanks
Laszlo
Re: [SeaBIOS] Re: [PATCH v7 7/8] bootdevice: FW_CFG interface for LCHS values
Thanks for the detailed comment Laszlo,
Indeed my e-mail has changed and I only received replies to the commits where I added this new mail in the S-o-b section, should of added in all of them.
So as you said it, the problem was actually in using qfw_cfg_get_u32 which assumes the value is encoded LE and has an additional le32_to_cpu, should have used qfw_cfg_get directly like qfw_cfg_get_file does.
Regarding qfw_cfg_get_file - I wrote this code when this function did not exist yet, I think it was added 6 months ago. In any case, I will use it instead.
Thanks for this.
I will resubmit this entire commit series:
* I will only change code in the last commit (tests)
* I will remove a comment which is now not true anymore
* I will add my new email in S-o-b
Sam
Quoted 73 lines · Philippe Mathieu-Daudé
Quoted 13 lines · Laszlo Ersek
Hi Sam,
Quoted 6 lines · Sam Eiderman
Gentle Ping,
Philippe, John?
Just wondering if the series is okay, as Gerd pointed out this series is a blocker for the corresponding changes in SeaBIOS for v 1.13
The QEMU series is still not merged, due to a bug in the last patch (namely, the test case, "hd-geo-test: Add tests for lchs override").
Quoted 8 lines
To my knowledge, SeaBIOS prefers to merge patches with the underlying QEMU patches merged first, so you'll likely have to fix that QEMU issue first.
I explained the bug in the QEMU test case here:
http://mid.mail-archive.com/[email protected] http://mid.mail-archive.com/[email protected]Yes, I was expecting a respin with
find_fw_cfg_file()fixed per Laszlo detailed review.Quoted 12 lines
(Alternative links to the same:
https://lists.gnu.org/archive/html/qemu-devel/2019-10/msg01790.html https://lists.gnu.org/archive/html/qemu-devel/2019-10/msg01793.html)
I've never received feedback to those messages, and I think you must have missed them.
FWIW, when I hit "Reply All" in that thread, you were on the "To:" list with:
Quoted 24 lines
Sam Eiderman <[email protected]>
but here you are present with
Sam Eiderman <[email protected]>
In addition, when I posted those messages, I got the following auto-response ("Undelivered Mail Returned to Sender"):
Quoted 15 lines
This is the mail system at host mx1.redhat.com.
I'm sorry to have to inform you that your message could not be delivered to one or more recipients. It's attached below.
For further assistance, please send mail to postmaster.
If you do so, please include this problem report. You can delete your own text from the attached returned message.
The mail system
<[email protected]>: host aserp2030.oracle.com[141.146.126.74] said:
550 5.1.1 Unknown recipient address. (in reply to RCPT TO command)That explains it :)
Quoted 7 lines
I didn't know your new address, so I could only hope you'd find my feedback on qemu-devel.
Thanks
Laszlo
Re: [SeaBIOS] Re: [PATCH v7 7/8] bootdevice: FW_CFG interface for LCHS values
Quoted 15 lines · Sam Eiderman
Thanks for the detailed comment Laszlo,
Indeed my e-mail has changed and I only received replies to the commits where I added this new mail in the S-o-b section, should of added in all of them.
So as you said it, the problem was actually in using
qfw_cfg_get_u32which assumes the value is encoded LE and has an additionalle32_to_cpu, should have usedqfw_cfg_getdirectly likeqfw_cfg_get_filedoes.Regarding
qfw_cfg_get_file- I wrote this code when this function did not exist yet, I think it was added 6 months ago. In any case, I will use it instead.
Quoted 9 lines
Thanks for this.
I will resubmit this entire commit series:
* I will only change code in the last commit (tests)
* I will remove a comment which is now not true anymore
* I will add my new email in S-o-bSam
Philippe gave me a verbal tut-tut for not including his review tags in my last pull request; when you re-spin could you be so kind as to include any that still apply?
--js
Re: [SeaBIOS] Re: [PATCH v7 7/8] bootdevice: FW_CFG interface for LCHS values
Sure!
Philippe withdrew his R-b on 7/8, as I explained 7/8 is fine (only need to remove a bad comment) the problem was in the tests 8/8 - should I include the original R/b?
I guess all other 1-6 are fine to add R/b...
Quoted 34 lines · John Snow
Quoted 15 lines · Sam Eiderman
Thanks for the detailed comment Laszlo,
Indeed my e-mail has changed and I only received replies to the commits where I added this new mail in the S-o-b section, should of added in all of them.
So as you said it, the problem was actually in using
qfw_cfg_get_u32which assumes the value is encoded LE and has an additionalle32_to_cpu, should have usedqfw_cfg_getdirectly likeqfw_cfg_get_filedoes.Regarding
qfw_cfg_get_file- I wrote this code when this function did not exist yet, I think it was added 6 months ago. In any case, I will use it instead.Quoted 9 lines
Thanks for this.
I will resubmit this entire commit series:
* I will only change code in the last commit (tests)
* I will remove a comment which is now not true anymore
* I will add my new email in S-o-bSam
Philippe gave me a verbal tut-tut for not including his review tags in my last pull request; when you re-spin could you be so kind as to include any that still apply?
--js
Re: [SeaBIOS] Re: [PATCH v7 7/8] bootdevice: FW_CFG interface for LCHS values
Quoted 5 lines · Sam Eiderman
Sure!
Philippe withdrew his R-b on 7/8, as I explained 7/8 is fine (only need to remove a bad comment) the problem was in the tests 8/8 - should I include the original R/b?
I withdrew it because John was preparing his pull request, and I needed more time to review this again. But then Laszlo was quicker and figured out the problem is in the other patch, so please keep my original R-b.
Thanks to all 3 of you :)
Quoted 37 lines
I guess all other 1-6 are fine to add R/b...
Quoted 34 lines · John Snow
Quoted 15 lines · Sam Eiderman
Thanks for the detailed comment Laszlo,
Indeed my e-mail has changed and I only received replies to the commits where I added this new mail in the S-o-b section, should of added in all of them.
So as you said it, the problem was actually in using
qfw_cfg_get_u32which assumes the value is encoded LE and has an additionalle32_to_cpu, should have usedqfw_cfg_getdirectly likeqfw_cfg_get_filedoes.Regarding
qfw_cfg_get_file- I wrote this code when this function did not exist yet, I think it was added 6 months ago. In any case, I will use it instead.Quoted 9 lines
Thanks for this.
I will resubmit this entire commit series:
* I will only change code in the last commit (tests)
* I will remove a comment which is now not true anymore
* I will add my new email in S-o-bSam
Philippe gave me a verbal tut-tut for not including his review tags in my last pull request; when you re-spin could you be so kind as to include any that still apply?
--js