From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6373DC10F1A for ; Thu, 9 May 2024 14:40:47 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s54wK-0006nK-Ip; Thu, 09 May 2024 10:40:08 -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 1s54wD-0006mR-Q5 for qemu-devel@nongnu.org; Thu, 09 May 2024 10:40:01 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s54wB-0007ya-Rf for qemu-devel@nongnu.org; Thu, 09 May 2024 10:40:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1715265598; h=from:from:reply-to: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=927kGMV0fQxaTR2ZxiLdImjjB1frzAi3EvjJjjIqpUo=; b=OqzqwGEbq4xHvEFoP6T1xNQEysDSJSIJpViWpTLxJfMz1xIJsDX9LrLaUkrcnDtEVFrP1Z nrkvvp7BZrtwFCCGwuUYX8Bsik8Z1N7bvzaoiMqh34MSagN7+8Oldxb3sf+eYsmjulm7hr G+p8Zyq1LvsbTjuubOh14jO4aUm2wKY= 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-567-Ymmo9ysrPuqKIG-7bSJzVw-1; Thu, 09 May 2024 10:39:57 -0400 X-MC-Unique: Ymmo9ysrPuqKIG-7bSJzVw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (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 3A8211C05132; Thu, 9 May 2024 14:39:56 +0000 (UTC) Received: from redhat.com (unknown [10.42.28.79]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A70A7208BC1F; Thu, 9 May 2024 14:39:52 +0000 (UTC) Date: Thu, 9 May 2024 15:39:50 +0100 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: Eric Blake Cc: qemu-devel@nongnu.org, Harsh Prateek Bora , Peter Maydell , Nicholas Piggin , Richard Henderson , Yanan Wang , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Thomas Huth , =?utf-8?Q?C=C3=A9dric?= Le Goater , Halil Pasic , Laurent Vivier , qemu-arm@nongnu.org, Daniel Henrique Barboza , Eduardo Habkost , qemu-ppc@nongnu.org, David Gibson , Ilya Leoshkevich , Eric Farman , Christian Borntraeger , "Michael S. Tsirkin" , Paolo Bonzini , Marcel Apfelbaum , David Hildenbrand , qemu-s390x@nongnu.org Subject: Re: [PATCH 01/14] include/hw: add helpers for defining versioned machine types Message-ID: References: <20240501182759.2934195-1-berrange@redhat.com> <20240501182759.2934195-2-berrange@redhat.com> <6lfkvaovs4tz5nep43zw5ueudqy2zrns6fttu4bmq3q5wqvgqx@hxnvw7sqsyzo> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <6lfkvaovs4tz5nep43zw5ueudqy2zrns6fttu4bmq3q5wqvgqx@hxnvw7sqsyzo> User-Agent: Mutt/2.2.12 (2023-09-09) X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.581, 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=ham 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: , Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On Thu, May 02, 2024 at 09:57:21AM -0500, Eric Blake wrote: > On Wed, May 01, 2024 at 07:27:46PM +0100, Daniel P. Berrangé wrote: > > The various targets which define versioned machine types have > > a bunch of obfuscated macro code for defining unique function > > and variable names using string concatenation. > > > > This addes a couple of helpers to improve the clarity of such > > code macro. > > > > Signed-off-by: Daniel P. Berrangé > > --- > > include/hw/boards.h | 166 ++++++++++++++++++++++++++++++++++++++++++++ > > 1 file changed, 166 insertions(+) > > > > diff --git a/include/hw/boards.h b/include/hw/boards.h > > index 2fa800f11a..47ca450fca 100644 > > --- a/include/hw/boards.h > > +++ b/include/hw/boards.h > > @@ -414,6 +414,172 @@ struct MachineState { > > struct NumaState *numa_state; > > }; > > > > +/* > > + * The macros which follow are intended to facilitate the > > + * definition of versioned machine types, using a somewhat > > + * similar pattern across targets: > > + * > > + * #define DEFINE_VIRT_MACHINE_IMPL(latest, ...) \ > > + * static void MACHINE_VER_SYM(class_init, virt, __VA_ARGS__)( \ > > + * ObjectClass *oc, \ > > + * void *data) \ > > + * { \ > > + * MachineClass *mc = MACHINE_CLASS(oc); \ > > + * MACHINE_VER_SYM(options, virt, __VA_ARGS__)(mc); \ > > Nice to include example usage of the macros. __VA_ARGS__ is getting > expanded quite a few times here, but I don't see that as being too > much of a problem. > > > + * // Normal 2 digit eg 'virt-9.0' > > + * #define DEFINE_VIRT_MACHINE(major, minor) \ > > + * DEFINE_VIRT_MACHINE_IMPL(false, major, minor) > > + * > > + * // Bugfix 3 digit eg 'virt-9.0.1' > > Inconsistent on whether you are using one or two spaces before 'eg'. Will fix > > > + > > +#define _MACHINE_VER_PICK(x1, x2, x3, x4, x5, x6, ...) x6 > > This helper macro is powerful; it may be worth a short comment, maybe > along the lines of: > > /* Helper macro used to pick the right macro name based on the number > * of extra arguments passed to the containing macro; usage: > * > * _MACHINE_VER_PICK(__VA_ARGS__, \ > * MACRO_FOR_5_ARGS, \ > * MACRO_FOR_4_ARGS, \ > * MACRO_FOR_3_ARGS, \ > * MACRO_FOR_2_ARGS)(optional prefix args, __VA_ARGS__) > */ Yes, will add something like this > > But once understood, I see it comes in handy in several places below. > > Reviewed-by: Eric Blake > > -- > Eric Blake, Principal Software Engineer > Red Hat, Inc. > Virtualization: qemu.org | libguestfs.org > With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|