From: Fam Zheng <famz@redhat.com>
Date: Wed, 13 May 2015 13:15:28 +0000 (+0000)
Subject: iscsi: Remove pointless runtime check of macro value
X-Git-Tag: v2.4.0-rc0~100^2~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=44f192f364b71683379e104157b15b0685d24394;p=thirdparty%2Fqemu.git

iscsi: Remove pointless runtime check of macro value

raw_bsd already has QEMU_BUILD_BUG_ON(BDRV_SECTOR_SIZE != 512), so iscsi
should relax.

Signed-off-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---

diff --git a/block/iscsi.c b/block/iscsi.c
index 8fca1d32cb0..14e97a6b48a 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) {