From patchwork Wed May 15 14:15:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 1935616 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=cs2Lk+ju; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Vfb0v5dGbz1ymf for ; Thu, 16 May 2024 00:18:07 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s7FRG-0004gG-61; Wed, 15 May 2024 10:17:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s7FR1-0004b3-IZ for qemu-devel@nongnu.org; Wed, 15 May 2024 10:16:54 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s7FQt-0005sq-Kt for qemu-devel@nongnu.org; Wed, 15 May 2024 10:16:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1715782594; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RNE/jXp6GiXETKwqHemMdMmdIUBy45oCg12YyvDwuO0=; b=cs2Lk+juVa9OB+ECwmRUYyIIlAZkL3AhzPNqkBXujOGVQrVEx9UWI9dgQwDlSOIEXByINM PdnPM1GWOHqVb1LCchwZqCdVs/TtI4J+DhQB+pzEg8OAPmyECO3EItMiFNKC0EldaYV2mz yrV4pag+ssCngQttOln8CEmd8U1UjZc= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-526-65jl5_7fOSqvrTjaqnCN0g-1; Wed, 15 May 2024 10:16:17 -0400 X-MC-Unique: 65jl5_7fOSqvrTjaqnCN0g-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6F2AF29AC00C; Wed, 15 May 2024 14:16:16 +0000 (UTC) Received: from localhost (unknown [10.39.208.9]) by smtp.corp.redhat.com (Postfix) with ESMTP id BB0ECC15BB9; Wed, 15 May 2024 14:16:14 +0000 (UTC) From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: Eduardo Habkost , "Michael S. Tsirkin" , Marcel Apfelbaum , Fiona Ebner , Paolo Bonzini , Richard Henderson , qemu-arm@nongnu.org, Peter Maydell , Fabiano Rosas , Gerd Hoffmann , Yanan Wang , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Peter Xu , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Subject: [PATCH v3 3/5] hw/boards: add machine_check_version() Date: Wed, 15 May 2024 18:15:54 +0400 Message-ID: <20240515141557.1277999-4-marcandre.lureau@redhat.com> In-Reply-To: <20240515141557.1277999-1-marcandre.lureau@redhat.com> References: <20240515141557.1277999-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 Received-SPF: pass client-ip=170.10.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.935, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Marc-André Lureau Add optional major/minor version fields to the MachineClass, and a helper to check if the current machine version is >= (major, minor). This function can be used to check for extra migration fields, instead of relying on structure version which are typically associated to a machine version via compatibility properties. Notes: - undefined version is considered latest - a few machines have a micro version, I don't think it's necessary to have here at this point - there is already a less formal char *hw_version, but it is only used for legacy code (< 2.5) Signed-off-by: Marc-André Lureau --- include/hw/boards.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/hw/boards.h b/include/hw/boards.h index 2fa800f11a..b36a363fb7 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -248,6 +248,8 @@ struct MachineClass { const char *alias; const char *desc; const char *deprecation_reason; + unsigned int major; + unsigned int minor; void (*init)(MachineState *state); void (*reset)(MachineState *state, ShutdownCause reason); @@ -306,6 +308,18 @@ struct MachineClass { ram_addr_t (*fixup_ram_size)(ram_addr_t size); }; +static inline bool machine_check_version(int major, int minor) +{ + MachineClass *mc = MACHINE_GET_CLASS(qdev_get_machine()); + + /* unversioned is latest */ + if (mc->major == 0 && mc->minor == 0) { + return true; + } + + return mc->major > major || (mc->major == major && mc->minor >= minor); +} + /** * DeviceMemoryState: * @base: address in guest physical address space where the memory