From nobody Mon Feb 9 21:02:25 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1528787667274335.3942332623684; Tue, 12 Jun 2018 00:14:27 -0700 (PDT) Received: from localhost ([::1]:53391 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSdVa-00027l-Gg for importer@patchew.org; Tue, 12 Jun 2018 03:14:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59114) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSd3s-0002rb-KT for qemu-devel@nongnu.org; Tue, 12 Jun 2018 02:45:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fSd3r-00020V-9P for qemu-devel@nongnu.org; Tue, 12 Jun 2018 02:45:48 -0400 Received: from ozlabs.org ([2401:3900:2:1::2]:37503) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fSd3q-0001um-Nu; Tue, 12 Jun 2018 02:45:47 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 414gPX1hPYzB3sp; Tue, 12 Jun 2018 16:45:34 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1528785936; bh=b8/FNPWYjO+pf1gEhU5mrfxJLJKDf3Jld7UK5mJMc1c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bbVdzH9asvZ9x1XIuz7FYEXaKxcLB3A2Swfp0eirqPoqILQcv6PUU362KjtrjeKVj 4e1GGDeQn8R+HGEhpDcxCHvfULB2PlCkXLHGGalTQuB5iieYezvIsBphsrXonR0hih om2a5D4sjYi48LMiFMmUxYCuLC/RaCx1sNoHCbmU= From: David Gibson To: peter.maydell@linaro.org Date: Tue, 12 Jun 2018 16:44:51 +1000 Message-Id: <20180612064503.14282-22-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180612064503.14282-1-david@gibson.dropbear.id.au> References: <20180612064503.14282-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 Subject: [Qemu-devel] [PULL 21/33] mos6522: convert VMSTATE_TIMER_PTR_TEST to VMSTATE_TIMER_PTR X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, Mark Cave-Ayland , qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nongnu.org, clg@kaod.org, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Mark Cave-Ayland The timers are configured in the mos6522 init function and therefore will always exist, so the function can never return false. Peter also pointed out that this is the only remaining user of VMSTATE_TIMER_PTR_TEST in the codebase, so we might as well just convert it over to VMSTATE_TIMER_PTR and remove mos6522_timer_exist() as it is no longer required. Signed-off-by: Mark Cave-Ayland Reviewed-by: Peter Maydell Signed-off-by: David Gibson --- hw/misc/mos6522.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/hw/misc/mos6522.c b/hw/misc/mos6522.c index 2f58b9707f..44eb306cf1 100644 --- a/hw/misc/mos6522.c +++ b/hw/misc/mos6522.c @@ -369,13 +369,6 @@ static const MemoryRegionOps mos6522_ops =3D { }, }; =20 -static bool mos6522_timer_exist(void *opaque, int version_id) -{ - MOS6522Timer *s =3D opaque; - - return s->timer !=3D NULL; -} - static const VMStateDescription vmstate_mos6522_timer =3D { .name =3D "mos6522_timer", .version_id =3D 0, @@ -385,7 +378,7 @@ static const VMStateDescription vmstate_mos6522_timer = =3D { VMSTATE_UINT16(counter_value, MOS6522Timer), VMSTATE_INT64(load_time, MOS6522Timer), VMSTATE_INT64(next_irq_time, MOS6522Timer), - VMSTATE_TIMER_PTR_TEST(timer, MOS6522Timer, mos6522_timer_exist), + VMSTATE_TIMER_PTR(timer, MOS6522Timer), VMSTATE_END_OF_LIST() } }; --=20 2.17.1