From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:44362) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gviTM-000851-OC for qemu-devel@nongnu.org; Mon, 18 Feb 2019 07:56:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gviTL-0000lb-ER for qemu-devel@nongnu.org; Mon, 18 Feb 2019 07:56:36 -0500 From: Markus Armbruster Date: Mon, 18 Feb 2019 13:56:07 +0100 Message-Id: <20190218125615.18970-3-armbru@redhat.com> In-Reply-To: <20190218125615.18970-1-armbru@redhat.com> References: <20190218125615.18970-1-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 02/10] pflash: Macro PFLASH_BUG() is used just once, expand List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, lersek@redhat.com, kwolf@redhat.com, mreitz@redhat.com, qemu-block@nongnu.org, qemu-ppc@nongnu.org PFLASH_BUG()'s lone use has a suspicious smell: it prints "Possible BUG", which sounds like a warning, then calls exit(1), followed by unreachable goto reset_flash. All this commit does is expanding the macro, so the smell becomes more poignant, and the macro can be deleted. Signed-off-by: Markus Armbruster --- hw/block/pflash_cfi01.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c index 9efa7aa9af..f73c30a3ee 100644 --- a/hw/block/pflash_cfi01.c +++ b/hw/block/pflash_cfi01.c @@ -49,12 +49,6 @@ #include "sysemu/sysemu.h" #include "trace.h" -#define PFLASH_BUG(fmt, ...) \ -do { \ - fprintf(stderr, "PFLASH: Possible BUG - " fmt, ## __VA_ARGS__); \ - exit(1); \ -} while(0) - /* #define PFLASH_DEBUG */ #ifdef PFLASH_DEBUG #define DPRINTF(fmt, ...) \ @@ -624,8 +618,8 @@ static void pflash_write(PFlashCFI01 *pfl, hwaddr offset, pfl->status |= 0x80; } else { DPRINTF("%s: unknown command for \"write block\"\n", __func__); - PFLASH_BUG("Write block confirm"); - goto reset_flash; + fprintf(stderr, "PFLASH: Possible BUG - Write block confirm"); + exit(1); } break; default: -- 2.17.2