From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:32848) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gucbN-000056-JL for qemu-devel@nongnu.org; Fri, 15 Feb 2019 07:28:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gucbL-0003bg-Hd for qemu-devel@nongnu.org; Fri, 15 Feb 2019 07:28:21 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:36774) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gucbL-0003Zm-5X for qemu-devel@nongnu.org; Fri, 15 Feb 2019 07:28:19 -0500 Received: by mail-wm1-x334.google.com with SMTP id j125so9459011wmj.1 for ; Fri, 15 Feb 2019 04:28:18 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= Date: Fri, 15 Feb 2019 12:28:08 +0000 Message-Id: <20190215122808.22301-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH v2] hw/block: report when pflash backing file isn't aligned List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: lersek@redhat.com, armbru@redhat.com, stappers@stappers.nl, =?UTF-8?q?Alex=20Benn=C3=A9e?= It looks like there was going to be code to check we had some sort of alignment so lets replace it with an actual check. This is a bit more useful than the enigmatic "failed to read the initial flash content" when we attempt to read the number of bytes the device should have. This is a potential confusing stumbling block when you move from using -bios to using -drive if=pflash,file=blob,format=raw,readonly for loading your firmware code. Signed-off-by: Alex Bennée --- v2 - use PRIu64 instead of PRId64 - tweaked message output --- hw/block/pflash_cfi01.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c index bffb4c40e7..7532c8d8e8 100644 --- a/hw/block/pflash_cfi01.c +++ b/hw/block/pflash_cfi01.c @@ -722,12 +722,20 @@ static void pflash_cfi01_realize(DeviceState *dev, Error **errp) } device_len = sector_len_per_device * blocks_per_device; - /* XXX: to be fixed */ -#if 0 - if (total_len != (8 * 1024 * 1024) && total_len != (16 * 1024 * 1024) && - total_len != (32 * 1024 * 1024) && total_len != (64 * 1024 * 1024)) - return NULL; -#endif + /* + * Validate the backing store is the right size for pflash + * devices. It has to be padded to a multiple of the flash block + * size. + */ + if (pfl->blk) { + uint64_t backing_len = blk_getlength(pfl->blk); + if (device_len != backing_len) { + error_setg(errp, "device needs %" PRIu64 " bytes, " + "backing file provides only %" PRIu64 " bytes", + device_len, backing_len); + return; + } + } memory_region_init_rom_device( &pfl->mem, OBJECT(dev), -- 2.20.1