From nobody Mon May 20 23:45:20 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1611872402; cv=none; d=zohomail.com; s=zohoarc; b=Dt9wrANa42yfc+o0m3ujKf3/GKJR9K3y9FyURQHdnNzUc4K9eZE1TZiMCM8llq2RQWeISQCdbYKahN4w+WuVpi3J1Vm0QJdiOdemjimuAYvxAOifI/WbSr2dbHrA9KuRLv/Q8CXVsYEqUWVvZxQKQoaxUS39iS/WLd2Xbt8pLZU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611872402; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=WG+72Eb+ydRykEEHffGm51xQHUCleZCLDmkh18+KUcc=; b=YkYR5RavEWknqRb+1C/GQirpYOSKl00VXc8MaDcjj0WIpP9jMhcqXCssZ65J6p9VGFPfkgibzhqeDhVbrRayD60f36F3HkhnC9iSFNPXOvCdqBu+pTQJotsmYKDpZtK9Wij3jD/71uFQKuKOhb3fKcghYNFg5CcW+O8fs0xceXg= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1611872402873588.8716789733351; Thu, 28 Jan 2021 14:20:02 -0800 (PST) Received: from localhost ([::1]:60874 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l5Fdx-00082t-L3 for importer@patchew.org; Thu, 28 Jan 2021 17:20:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56488) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l5Fbl-0006eP-Dl for qemu-devel@nongnu.org; Thu, 28 Jan 2021 17:17:45 -0500 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:35404 helo=mail.default.ilande.uk0.bigv.io) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l5Fbj-0000Ye-Rj for qemu-devel@nongnu.org; Thu, 28 Jan 2021 17:17:45 -0500 Received: from host86-132-109-72.range86-132.btcentralplus.com ([86.132.109.72] helo=kentang.home) by mail.default.ilande.uk0.bigv.io with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1l5Fbv-0003bE-KI; Thu, 28 Jan 2021 22:17:59 +0000 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, peter.maydell@linaro.org, cfontana@suse.de, philmd@redhat.com Date: Thu, 28 Jan 2021 22:17:27 +0000 Message-Id: <20210128221728.14887-2-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210128221728.14887-1-mark.cave-ayland@ilande.co.uk> References: <20210128221728.14887-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 86.132.109.72 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH 1/2] utils/fifo8: change fatal errors from abort() to assert() X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.default.ilande.uk0.bigv.io) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.default.ilande.uk0.bigv.io X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Developer errors are better represented with assert() rather than abort(). = Also improve the strictness of the checks by using range checks within the asser= t() rather than converting the existing equality checks to inequality checks. Signed-off-by: Mark Cave-Ayland Reviewed-by: Claudio Fontana Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20210121102518.20112-1-mark.cave-ayland@ilande.co.uk> --- util/fifo8.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/util/fifo8.c b/util/fifo8.c index a5dd789ce5..d4d1c135e0 100644 --- a/util/fifo8.c +++ b/util/fifo8.c @@ -31,9 +31,7 @@ void fifo8_destroy(Fifo8 *fifo) =20 void fifo8_push(Fifo8 *fifo, uint8_t data) { - if (fifo->num =3D=3D fifo->capacity) { - abort(); - } + assert(fifo->num < fifo->capacity); fifo->data[(fifo->head + fifo->num) % fifo->capacity] =3D data; fifo->num++; } @@ -42,9 +40,7 @@ void fifo8_push_all(Fifo8 *fifo, const uint8_t *data, uin= t32_t num) { uint32_t start, avail; =20 - if (fifo->num + num > fifo->capacity) { - abort(); - } + assert(fifo->num + num <=3D fifo->capacity); =20 start =3D (fifo->head + fifo->num) % fifo->capacity; =20 @@ -63,9 +59,7 @@ uint8_t fifo8_pop(Fifo8 *fifo) { uint8_t ret; =20 - if (fifo->num =3D=3D 0) { - abort(); - } + assert(fifo->num > 0); ret =3D fifo->data[fifo->head++]; fifo->head %=3D fifo->capacity; fifo->num--; @@ -76,9 +70,7 @@ const uint8_t *fifo8_pop_buf(Fifo8 *fifo, uint32_t max, u= int32_t *num) { uint8_t *ret; =20 - if (max =3D=3D 0 || max > fifo->num) { - abort(); - } + assert(max > 0 && max <=3D fifo->num); *num =3D MIN(fifo->capacity - fifo->head, max); ret =3D &fifo->data[fifo->head]; fifo->head +=3D *num; --=20 2.20.1 From nobody Mon May 20 23:45:20 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1611872410; cv=none; d=zohomail.com; s=zohoarc; b=D5n/Q7g80pvSHivsD/vEtb8YabU2HR8qfpNBC9MahQ4B1bZfUXPCfb5at4IJCJAYtQxUTriDgEWux8YMscoG2lzQcfmTf/06C00SAOSizwN3viR9VSIykauFEa+OxF33bhvzp52BU/yvRjN4BXWjeV3hsN+mT0Cd4ie9rFhzegU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611872410; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=S4cYVBdi+jZhEr54eEeHTjSEjJYiIph7YLLe1eBjyCw=; b=QTFHJRI5NEPlbdlXlwpm+I1TOeFLQPoF87LNtjdi2Ai9K6tAC43nF2NyLKjMjx+cxoxUJkxXQ0iVKV6VusmcAZxsKfFv8puJ/u61Y03QS9ZGrZOtbmkMP9fAVdIQx8zJ9T8fRzx2C6T+nsnJT7WG8ZjRR/I7foSFfKrBNygwnXo= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1611872410413907.2154591471747; Thu, 28 Jan 2021 14:20:10 -0800 (PST) Received: from localhost ([::1]:33254 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l5Fe5-0008JZ-AH for importer@patchew.org; Thu, 28 Jan 2021 17:20:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56520) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l5Fbq-0006of-VS for qemu-devel@nongnu.org; Thu, 28 Jan 2021 17:17:50 -0500 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:35414 helo=mail.default.ilande.uk0.bigv.io) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l5Fbp-0000ak-HF for qemu-devel@nongnu.org; Thu, 28 Jan 2021 17:17:50 -0500 Received: from host86-132-109-72.range86-132.btcentralplus.com ([86.132.109.72] helo=kentang.home) by mail.default.ilande.uk0.bigv.io with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1l5Fbz-0003bE-KI; Thu, 28 Jan 2021 22:18:07 +0000 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, peter.maydell@linaro.org, cfontana@suse.de, philmd@redhat.com Date: Thu, 28 Jan 2021 22:17:28 +0000 Message-Id: <20210128221728.14887-3-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210128221728.14887-1-mark.cave-ayland@ilande.co.uk> References: <20210128221728.14887-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 86.132.109.72 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH 2/2] utils/fifo8: add VMSTATE_FIFO8_TEST macro X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.default.ilande.uk0.bigv.io) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.default.ilande.uk0.bigv.io X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Rewrite the existing VMSTATE_FIFO8 macro to use VMSTATE_FIFO8_TEST as per t= he standard pattern in include/migration/vmstate.h. Signed-off-by: Mark Cave-Ayland Reviewed-by: Peter Maydell --- include/qemu/fifo8.h | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/include/qemu/fifo8.h b/include/qemu/fifo8.h index 489c354291..28bf2cee57 100644 --- a/include/qemu/fifo8.h +++ b/include/qemu/fifo8.h @@ -148,12 +148,16 @@ uint32_t fifo8_num_used(Fifo8 *fifo); =20 extern const VMStateDescription vmstate_fifo8; =20 -#define VMSTATE_FIFO8(_field, _state) { \ - .name =3D (stringify(_field)), \ - .size =3D sizeof(Fifo8), \ - .vmsd =3D &vmstate_fifo8, \ - .flags =3D VMS_STRUCT, \ - .offset =3D vmstate_offset_value(_state, _field, Fifo8), \ +#define VMSTATE_FIFO8_TEST(_field, _state, _test) { \ + .name =3D (stringify(_field)), \ + .field_exists =3D (_test), \ + .size =3D sizeof(Fifo8), \ + .vmsd =3D &vmstate_fifo8, \ + .flags =3D VMS_STRUCT, \ + .offset =3D vmstate_offset_value(_state, _field, Fifo8), \ } =20 +#define VMSTATE_FIFO8(_field, _state) \ + VMSTATE_FIFO8_TEST(_field, _state, NULL) + #endif /* QEMU_FIFO8_H */ --=20 2.20.1