| Message ID | 20190925110639.100699-2-sameid@google.com |
|---|---|
| State | New |
| Headers | show |
| Series | Add Qemu to SeaBIOS LCHS interface | expand |
On 9/25/19 1:06 PM, Sam Eiderman wrote: > From: Sam Eiderman <shmuel.eiderman@oracle.com> > > Fixing tabbing in block related macros. > > Reviewed-by: Karl Heubaum <karl.heubaum@oracle.com> > Reviewed-by: Arbel Moshe <arbel.moshe@oracle.com> > Signed-off-by: Sam Eiderman <shmuel.eiderman@oracle.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > hw/ide/qdev.c | 2 +- > include/hw/block/block.h | 16 ++++++++-------- > 2 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c > index 6fba6b62b8..6dd219944f 100644 > --- a/hw/ide/qdev.c > +++ b/hw/ide/qdev.c > @@ -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) > > diff --git a/include/hw/block/block.h b/include/hw/block/block.h > index 607539057a..fd55a30bca 100644 > --- a/include/hw/block/block.h > +++ b/include/hw/block/block.h > @@ -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) \ >
diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c index 6fba6b62b8..6dd219944f 100644 --- a/hw/ide/qdev.c +++ b/hw/ide/qdev.c @@ -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) diff --git a/include/hw/block/block.h b/include/hw/block/block.h index 607539057a..fd55a30bca 100644 --- a/include/hw/block/block.h +++ b/include/hw/block/block.h @@ -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) \