Received: by 2002:a17:906:a205:b0:a52:4db9:938b with SMTP id r5csp1068305ejy; Thu, 2 May 2024 03:35:32 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVUnV5vPO7meyZ91QL7CFHGdaIvmxI9MiQRBSvRZATs9egBQ8x21qdyMNPcDbYcilDgtAa+00SesGDz+r1jK/b0mC/y57Ec X-Google-Smtp-Source: AGHT+IELT6IzZ6lQ/H62i8URmFDmcLLPri96is0BhdI6vDETzchu0JD6zGqzy8W+9D5tdLqjUtVn X-Received: by 2002:a05:6808:1443:b0:3c7:640:f0b3 with SMTP id x3-20020a056808144300b003c70640f0b3mr6997014oiv.47.1714646132666; Thu, 02 May 2024 03:35:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714646132; cv=none; d=google.com; s=arc-20160816; b=RAoUeihK910Cep5MtrhNGOsmrMz0+/RtoWaY9gVIART2pusK6Nm9KbiceJH9D00JAp KMAeS10G74qiz1/Pz+pZhrTP2ZJusw2m9a9AJKEW57XxbmfBaDelksr+TPkbv3pM3UZp 395340l5k2Alo6eojKGCQ8IgSWTvztM5YR0Q7gHXI+pXx8Mlu2UINJ6HizdR8R+mO7bJ N6BMqSCk4n1Q4CR5BfvExZxyMahWdifqOtz9CqwHEWqZ0LNsQJJgcPQNMc9MVQk7Ajya 5Oxzq/lCrm065Q3bdXJxCnNKand+4/eHyAWzRYQA6UPggVA3PsC11Q0/AnLZemXUr2Nv MYzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :content-language:in-reply-to:autocrypt:from:references:cc:to :subject:user-agent:mime-version:date:message-id:dkim-signature; bh=iiVd0G9i8ioNF7sCsNEbc65IpuyI4eDtrz4lbvFtKkU=; fh=S66pMwg0jrInLslyrLju6Cq8IXxOmd5gvXPJJIvRE74=; b=JKiNT02MExveOunKqoXlud78VkZ/PlSS+T9KcTeLgDz5pak3BQ75/fxn2y3MG11UQl +Vj7E2AE2R7FIidd5224ut0k6pp9aSg2IlXDzqutyQ15mmXQzxa6kTH54HstkHdDYoaL +7d7iSOQ8ftiM9BQ17LS3HivMq3zBK9g1zffhDoC8vHYfXSMYawAXvQqMumZP2qyt4yr WMhTqLAmiPw0n4kqIMN/tGeIkiYnyeO4KpO23eWo460ZGS6Zs6HaXte5Qu/V1ilbEwFI 5duJFagmvT/01SyZ9YeM1PjcRwHyuY45Pyx21cxHFwR0hPn2xzoaCSjt6Z+fYl+7U8FH voqg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=VqDeusXl; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id jz2-20020a0562140e6200b006a0d1f42532si620963qvb.558.2024.05.02.03.35.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 02 May 2024 03:35:32 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=VqDeusXl; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s2TmT-0001Me-BR; Thu, 02 May 2024 06:35:13 -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 1s2TmM-0001JV-Ur for qemu-arm@nongnu.org; Thu, 02 May 2024 06:35:08 -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 1s2TmH-0007hB-PX for qemu-arm@nongnu.org; Thu, 02 May 2024 06:35:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714646099; 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:autocrypt:autocrypt; bh=iiVd0G9i8ioNF7sCsNEbc65IpuyI4eDtrz4lbvFtKkU=; b=VqDeusXlOtx43K4KAf1ophDZqvUvsDOJOFxpgo5hh3lBa0rmUunM/MJLJFb/u4sHmvboQ7 jZfVjOVY5urPT/P6eX0SidQyAJebz1HLpKWlQYnVeYrb3gMmhJ/YEDpTi4F/C5lQFOimIE B7/shoDy1wjR4DayusrDxf3b1Ahq1aE= Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-589-KYeZH9JZNSysWJIWd0vktw-1; Thu, 02 May 2024 06:34:58 -0400 X-MC-Unique: KYeZH9JZNSysWJIWd0vktw-1 Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-78f017ea9e1so1113442985a.0 for ; Thu, 02 May 2024 03:34:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714646097; x=1715250897; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :from:references:cc:to:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=iiVd0G9i8ioNF7sCsNEbc65IpuyI4eDtrz4lbvFtKkU=; b=jgPI2/F0VH6HDlnqMxns7hAebjHjQ88/9FOaqS8pNa+ba4FlkgoDBBObEzO+tjKU8j haR9NWY9EerAitP6iLpU6tHT3bqmTukfvFgxDKXKpe0yJdU82OKLo2/IK4/wXywquEew BC1RAdSZ4TaCv8NSwb0w2UrmBzdZT7YryuE8arzrRuHkXAi/zmWqVAGdisyFJ4QPbsFv zkRP9uD8psIMpLosZbyHlCPg8qD6Hm8j3aNn5W6XDBjbrRQpo82nUy8SyUpAUuUvGIqL CFreJP6x1014Guj1fybcbUUd/AIEgMld9MnXEvCwC/SSjX2jXaD58thuXFp3enWgvxbP jhwQ== X-Forwarded-Encrypted: i=1; AJvYcCWzwO3vvCjeEFDU1LtxMPRjDPHjkxpj2ohMKgwYLTD2m1TjAYzTgzgJlU7qwLh5MuGNeVnca24nDpjMLy2dhMac17vy X-Gm-Message-State: AOJu0YxgoVn5gCGy8XZjDQS9myWSXtUT9X7iyw+JxE9s/teJn1w8RxFS OqAVdFp3IFuyw7twwjXpmhpDW2QT6e9/YFEY/8tC0KDSEDl9NNlgpMMGiSq46rCAbfTd8IAwNSe V64xnZvKh3BS0KJt6XEUffSDPTUUrPPF3scmmV/m3kOt1y5F2Tg== X-Received: by 2002:a05:620a:244c:b0:790:c4e3:9aaf with SMTP id h12-20020a05620a244c00b00790c4e39aafmr6754712qkn.75.1714646097552; Thu, 02 May 2024 03:34:57 -0700 (PDT) X-Received: by 2002:a05:620a:244c:b0:790:c4e3:9aaf with SMTP id h12-20020a05620a244c00b00790c4e39aafmr6754679qkn.75.1714646097140; Thu, 02 May 2024 03:34:57 -0700 (PDT) Received: from [192.168.0.9] (ip-109-43-179-34.web.vodafone.de. [109.43.179.34]) by smtp.gmail.com with ESMTPSA id ay10-20020a05620a178a00b0078d677e72f3sm254433qkb.118.2024.05.02.03.34.52 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 02 May 2024 03:34:56 -0700 (PDT) Message-ID: <07cdc5df-781d-4833-9092-af3ef520dbed@redhat.com> Date: Thu, 2 May 2024 12:34:49 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 01/14] include/hw: add helpers for defining versioned machine types To: =?UTF-8?Q?Daniel_P=2E_Berrang=C3=A9?= , qemu-devel@nongnu.org Cc: Harsh Prateek Bora , Peter Maydell , Nicholas Piggin , Richard Henderson , Yanan Wang , =?UTF-8?Q?Philippe_Mathieu-Daud=C3=A9?= , =?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 References: <20240501182759.2934195-1-berrange@redhat.com> <20240501182759.2934195-2-berrange@redhat.com> From: Thomas Huth Autocrypt: addr=thuth@redhat.com; keydata= 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 In-Reply-To: <20240501182759.2934195-2-berrange@redhat.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@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.897, 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-arm@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-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org X-TUID: G+0zatuxqkbY On 01/05/2024 20.27, 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: I'd suggest to add a sentence at the end saying something like this: "For example, to create the macro for setting up a versioned "virt" machine could look like this:" (otherwise it's not immediately clear whether the example is about only the "macros which follow" or whether it's about how to set up a machine type) > + * #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); \ > + * mc->desc = "QEMU " MACHINE_VER_STR(__VA_ARGS__) " Virtual Machine"; \ > + * if (latest) { \ > + * mc->alias = "virt"; \ > + * } \ > + * } \ > + * static const TypeInfo MACHINE_VER_SYM(info, virt, __VA_ARGS__) = { \ > + * .name = MACHINE_VER_TYPE_NAME("virt", __VA_ARGS__), \ > + * .parent = TYPE_VIRT_MACHINE, \ > + * .class_init = MACHINE_VER_SYM(class_init, virt, __VA_ARGS__), \ > + * }; \ > + * static void MACHINE_VER_SYM(register, virt, __VA_ARGS__)(void) \ > + * { \ > + * type_register_static(&MACHINE_VER_SYM(info, virt, __VA_ARGS__)); \ > + * } \ > + * type_init(MACHINE_VER_SYM(register, virt, __VA_ARGS__)); > + * > + * Following this, one (or more) helpers can be added for > + * whichever scenarios need to be catered for with a machine: > + * > + * // Normal 2 digit, marked as latest eg 'virt-9.0' > + * #define DEFINE_VIRT_MACHINE_LATEST(major, minor) \ > + * DEFINE_VIRT_MACHINE_IMPL(true, major, minor) > + * > + * // 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' > + * #define DEFINE_VIRT_MACHINE_BUGFIX(major, minor, micro) \ > + * DEFINE_VIRT_MACHINE_IMPL(false, major, minor, micro) > + * > + * // Tagged 2 digit eg 'virt-9.0-extra' > + * #define DEFINE_VIRT_MACHINE_TAGGED(major, minor, tag) \ > + * DEFINE_VIRT_MACHINE_IMPL(false, major, minor, _, tag) > + * > + * // Tagged bugffix 2 digit eg 'virt-9.0.1-extra' s/bugffix/bugfix/ > + * #define DEFINE_VIRT_MACHINE_TAGGED(major, minor, micro, tag) \ > + * DEFINE_VIRT_MACHINE_IMPL(false, major, minor, micro, _, tag) > + */ I'd suggest to add a separate comment for the macro below, explaining that it is supposed to be used with __VA_ARGS__ to pick a certain other macro depending on the amount of entries in __VA_ARGS__. > +#define _MACHINE_VER_PICK(x1, x2, x3, x4, x5, x6, ...) x6 > + > +/* > + * Construct a human targetted machine version string. s/targetted/targeted/ according to my spell checker ? Apart from the nits: Reviewed-by: Thomas Huth Thomas