| Message ID | 1431522928-5292-1-git-send-email-famz@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 13/05/2015 15:15, Fam Zheng wrote: > raw_bsd already has QEMU_BUILD_BUG_ON(BDRV_SECTOR_SIZE != 512), so iscsi > should relax. It's okay to have the same QEMU_BUILD_BUG_ON in different places. However, you're right that this should be a compile-time check rather than run-time check. Paolo > Signed-off-by: Fam Zheng <famz@redhat.com> > --- > block/iscsi.c | 7 ------- > 1 file changed, 7 deletions(-) > > diff --git a/block/iscsi.c b/block/iscsi.c > index 8fca1d3..14e97a6 100644 > --- a/block/iscsi.c > +++ b/block/iscsi.c > @@ -1323,13 +1323,6 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags, > const char *filename; > int i, ret = 0; > > - if ((BDRV_SECTOR_SIZE % 512) != 0) { > - error_setg(errp, "iSCSI: Invalid BDRV_SECTOR_SIZE. " > - "BDRV_SECTOR_SIZE(%lld) is not a multiple " > - "of 512", BDRV_SECTOR_SIZE); > - return -EINVAL; > - } > - > opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort); > qemu_opts_absorb_qdict(opts, options, &local_err); > if (local_err) { >
On Wed, 05/13 10:43, Paolo Bonzini wrote: > > > On 13/05/2015 15:15, Fam Zheng wrote: > > raw_bsd already has QEMU_BUILD_BUG_ON(BDRV_SECTOR_SIZE != 512), so iscsi > > should relax. > > It's okay to have the same QEMU_BUILD_BUG_ON in different places. > However, you're right that this should be a compile-time check rather > than run-time check. I agree with you, but I can't imaging this value could ever change, so there is little gain to duplicate in this case. Fam > > Paolo > > > Signed-off-by: Fam Zheng <famz@redhat.com> > > --- > > block/iscsi.c | 7 ------- > > 1 file changed, 7 deletions(-) > > > > diff --git a/block/iscsi.c b/block/iscsi.c > > index 8fca1d3..14e97a6 100644 > > --- a/block/iscsi.c > > +++ b/block/iscsi.c > > @@ -1323,13 +1323,6 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags, > > const char *filename; > > int i, ret = 0; > > > > - if ((BDRV_SECTOR_SIZE % 512) != 0) { > > - error_setg(errp, "iSCSI: Invalid BDRV_SECTOR_SIZE. " > > - "BDRV_SECTOR_SIZE(%lld) is not a multiple " > > - "of 512", BDRV_SECTOR_SIZE); > > - return -EINVAL; > > - } > > - > > opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort); > > qemu_opts_absorb_qdict(opts, options, &local_err); > > if (local_err) { > > >
13.05.2015 16:15, Fam Zheng wrote: > raw_bsd already has QEMU_BUILD_BUG_ON(BDRV_SECTOR_SIZE != 512), so iscsi > should relax. Applied to -trivial, thank you! /mjt
diff --git a/block/iscsi.c b/block/iscsi.c index 8fca1d3..14e97a6 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -1323,13 +1323,6 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags, const char *filename; int i, ret = 0; - if ((BDRV_SECTOR_SIZE % 512) != 0) { - error_setg(errp, "iSCSI: Invalid BDRV_SECTOR_SIZE. " - "BDRV_SECTOR_SIZE(%lld) is not a multiple " - "of 512", BDRV_SECTOR_SIZE); - return -EINVAL; - } - opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort); qemu_opts_absorb_qdict(opts, options, &local_err); if (local_err) {
raw_bsd already has QEMU_BUILD_BUG_ON(BDRV_SECTOR_SIZE != 512), so iscsi should relax. Signed-off-by: Fam Zheng <famz@redhat.com> --- block/iscsi.c | 7 ------- 1 file changed, 7 deletions(-)