From patchwork Wed Mar 15 11:28:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 663362 Delivered-To: patch@linaro.org Received: by 2002:a5d:5602:0:0:0:0:0 with SMTP id l2csp1527799wrv; Wed, 15 Mar 2023 04:29:06 -0700 (PDT) X-Google-Smtp-Source: AK7set/XU1EoGtPjgQ4/LOqVqD6MFp7ZnqNQo3+cv0wSZX7INuKdpm67S0DJMW+Yn1XN78u3j+OU X-Received: by 2002:ac8:5a13:0:b0:3b8:57a7:7836 with SMTP id n19-20020ac85a13000000b003b857a77836mr71207708qta.46.1678879746648; Wed, 15 Mar 2023 04:29:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678879746; cv=none; d=google.com; s=arc-20160816; b=Q6H922nnOtkvVaGxAwuyGZ2B4whJ7HBepyxy8DjCZutjNErewh+vMCTr4lFTjxPYND hJZT1xt8YCcke8J1yMSHg2oPLrv7YT8vprTbfJ64w304b+FBivqWccjJAmx0NogMxOa4 0+F1dfajdkWvXrBp/Pfj168CdIfcLmLiYzL1RZ+lr5GsJ+cSamxYONQJQgqsCm7pcyh9 q+M2U3K9OpCXDX/D/t/WjOyBvkDOQDEJEYAUHuRLHMdckkXUBDxE8wcrvoE27oTawFHH uIg5Wu8dgiCmlEv6N5FujId+HOwYhzR0uE6dEMP2N+73TrEJYUVVXtybYsFqtPTFnfvW LxDQ== 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 :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=zRrGzszfrZGMg2X+7IsIUSESP6wobh0iMm2i1zCnBkE=; b=il0q4vC0z374vrXmQWq4O6Zlm9GCldhEyryhoFzMFCjxrGPDov7NZI6/BItEuAAqNR vIX4PhXtI6PLto1GvP2vklqczW6w6KRK7f6kCcO7nDJ98ReHrOvmm/Nvpcd7LEWF1kco AZvu2M5D6p6GxH+OoD+iQREOBui32vUGAIiHYNcV2nHgo/iA70RfuJNMuDIUSIIrusXq 84kJNBijiWk30RcEFAqMWEah9FeBpba0hYo4Tu9F+6Jnxylqt6V9Vbhxbu+uSL1nOqe8 LWJyJm8POy2NT5Y778vlGOHFrme//m4/EJCLnKnkPCgU/8EOYRs38BHQBY3BxfL2GHbV 26AA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Nbee7ezj; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v25-20020a05622a189900b003d61ee43e14si365531qtc.763.2023.03.15.04.29.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Mar 2023 04:29:06 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=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=@linaro.org header.s=google header.b=Nbee7ezj; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pcPJ5-0004B2-VI; Wed, 15 Mar 2023 07:28:36 -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 1pcPJ4-0004Am-Gr for qemu-devel@nongnu.org; Wed, 15 Mar 2023 07:28:34 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pcPJ2-0000O1-9k for qemu-devel@nongnu.org; Wed, 15 Mar 2023 07:28:34 -0400 Received: by mail-wm1-x331.google.com with SMTP id p16so12311483wmq.5 for ; Wed, 15 Mar 2023 04:28:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678879709; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zRrGzszfrZGMg2X+7IsIUSESP6wobh0iMm2i1zCnBkE=; b=Nbee7ezjAzZXL1+XZT0FOhh5b8BhiuBjSn2DpMGUUaxBwhLXkhtAO6TU9ZNXtmDjUO FNEv3+xysgFMsp819L4mSjfJPADIU0nu0kui6U/w7fNJVHq291CCkGkeAxb5ySPlhqqX 9tKhRb7Qura3rgXEm/zmF3trmQpetc1TWWgk7AiMgu6FZe0HkIFCarmHEKoIBDKqiLUY k6TYBa4K9bYUbvSoydsjF+JePrmcnc4PeThNbnrMJAABDW/Qo1ooDLIu9wNFoeJyrp4N 910NbmXai0cwnrT5Le3a2dWG95GnyRiPjxlWP470Olfj92T3E77PMonl1D4ICOsKUQh5 ukvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678879709; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zRrGzszfrZGMg2X+7IsIUSESP6wobh0iMm2i1zCnBkE=; b=mkkA9hcpheLa+tfLeb7MTJCM7rG7rxh2j62J532brpiwyGafkIqb/Ljnpg/NglIgn+ aOZ6Zk6SCG0/fQIPOig+a3CLHXFj1kWVNnW8yiAAlYfD8h6JsizMkCZfrxHhn7vNAIrS 2AZZAXRBwZQbS67dcjsy1qqWU27Gpr+b5AdVooIEPyjtqua9VvXjIX8IIHNDQ+MbWuLi axPj8Gbdta/tYK8Fg4LHvm/73qU2fiJSiWohwChqn4k8p56ntS7XWdARkVkdV0NWbv3Q kyWD9GqEMVVAPuW3Yi2VgUFIwvpq9fp/AgqsSJIGuiRlKNMB8z5DUDiAypXnh1ix+zpr dS4g== X-Gm-Message-State: AO0yUKVQRsgIpsaHe23g5hCGkzC0gHyxS+bQLnar0EUif+SOQnn28OYp MgPLITAxva4qwWnO3MOIdUASa/mNy7lKneMhTCdeAQ== X-Received: by 2002:a05:600c:310b:b0:3ed:30fb:7276 with SMTP id g11-20020a05600c310b00b003ed30fb7276mr2460416wmo.18.1678879709545; Wed, 15 Mar 2023 04:28:29 -0700 (PDT) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id k26-20020a7bc31a000000b003eb596cbc54sm1677285wmj.0.2023.03.15.04.28.28 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 15 Mar 2023 04:28:29 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Markus Armbruster , Pavel Dovgalyuk , "Dr. David Alan Gilbert" , Michael Roth , Stefan Berger , Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Juan Quintela , Gerd Hoffmann , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v3 3/3] qapi: Generate enum count as definition Date: Wed, 15 Mar 2023 12:28:11 +0100 Message-Id: <20230315112811.22355-4-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230315112811.22355-1-philmd@linaro.org> References: <20230315112811.22355-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org QAPI's gen_enum() generates QAPI enum values and the number of this values (as foo__MAX). The number of entries in an enum type is not part of the enumerated values, but we generate it as such. See for example: typedef enum OnOffAuto { ON_OFF_AUTO_AUTO, ON_OFF_AUTO_ON, ON_OFF_AUTO_OFF, ON_OFF_AUTO__MAX, <--------- } OnOffAuto; Instead of declaring the enum count as the last enumerated value, #define it, so it is not part of the enum. The previous example becomes: typedef enum OnOffAuto { ON_OFF_AUTO_AUTO, ON_OFF_AUTO_ON, ON_OFF_AUTO_OFF, #define ON_OFF_AUTO__MAX 3 <--------- } OnOffAuto; When iterating over a QAPISchemaEnumType, all possible values are covered. The 'default' switch case generated in gen_visit_object_members() is now unreachable, remove it. Since Clang enables the -Wswitch warning by default [*], remove all pointless foo__MAX cases in switch statement, in order to avoid: audio/audio.c:2231:10: error: case value not in enumerated type 'AudioFormat' (aka 'enum AudioFormat') [-Wswitch] case AUDIO_FORMAT__MAX: ^ ui/input.c:233:14: error: case value not in enumerated type 'KeyValueKind' (aka 'enum KeyValueKind') [-Wswitch] case KEY_VALUE_KIND__MAX: ^ ... [*] https://clang.llvm.org/docs/DiagnosticsReference.html#wswitch Reviewed-by: Richard Henderson Reviewed-by: Juan Quintela Signed-off-by: Philippe Mathieu-Daudé Acked-by: Dr. David Alan Gilbert --- docs/devel/qapi-code-gen.rst | 4 ++-- scripts/qapi/types.py | 11 +++++++---- scripts/qapi/visit.py | 2 -- audio/audio_template.h | 3 --- audio/audio.c | 6 ------ migration/migration.c | 2 -- replay/replay-input.c | 12 ------------ softmmu/tpm-hmp-cmds.c | 2 -- ui/input-linux.c | 4 ---- ui/input.c | 6 ------ 10 files changed, 9 insertions(+), 43 deletions(-) diff --git a/docs/devel/qapi-code-gen.rst b/docs/devel/qapi-code-gen.rst index d684c7c24d..45b0da448d 100644 --- a/docs/devel/qapi-code-gen.rst +++ b/docs/devel/qapi-code-gen.rst @@ -227,7 +227,7 @@ optional 'prefix' member overrides PREFIX. The generated C enumeration constants have values 0, 1, ..., N-1 (in QAPI schema order), where N is the number of values. There is an -additional enumeration constant PREFIX__MAX with value N. +additional definition constant PREFIX__MAX with value N. Do not use string or an integer type when an enumeration type can do the job satisfactorily. @@ -1825,7 +1825,7 @@ Example:: typedef enum example_QAPIEvent { EXAMPLE_QAPI_EVENT_MY_EVENT, - EXAMPLE_QAPI_EVENT__MAX, + #define EXAMPLE_QAPI_EVENT__MAX 1 } example_QAPIEvent; #define example_QAPIEvent_str(val) \ diff --git a/scripts/qapi/types.py b/scripts/qapi/types.py index 7a7be7315f..6459a6f925 100644 --- a/scripts/qapi/types.py +++ b/scripts/qapi/types.py @@ -88,16 +88,13 @@ def gen_enum(name: str, members: List[QAPISchemaEnumMember], prefix: Optional[str] = None) -> str: assert members - # append automatically generated _MAX value - enum_members = members + [QAPISchemaEnumMember('_MAX', None)] - ret = mcgen(''' typedef enum %(c_name)s { ''', c_name=c_name(name)) - for memb in enum_members: + for memb in members: ret += memb.ifcond.gen_if() ret += mcgen(''' %(c_enum)s, @@ -105,6 +102,12 @@ def gen_enum(name: str, c_enum=c_enum_const(name, memb.name, prefix)) ret += memb.ifcond.gen_endif() + ret += mcgen(''' +#define %(c_name)s %(c_length)s +''', + c_name=c_enum_const(name, '_MAX', prefix), + c_length=len(members)) + ret += mcgen(''' } %(c_name)s; ''', diff --git a/scripts/qapi/visit.py b/scripts/qapi/visit.py index 26a584ee4c..f66a31a963 100644 --- a/scripts/qapi/visit.py +++ b/scripts/qapi/visit.py @@ -159,8 +159,6 @@ def gen_visit_object_members(name: str, ret += var.ifcond.gen_endif() ret += mcgen(''' - default: - abort(); } ''') diff --git a/audio/audio_template.h b/audio/audio_template.h index e42326c20d..d545c03afb 100644 --- a/audio/audio_template.h +++ b/audio/audio_template.h @@ -376,9 +376,6 @@ AudiodevPerDirectionOptions *glue(audio_get_pdo_, TYPE)(Audiodev *dev) #endif case AUDIODEV_DRIVER_WAV: return dev->u.wav.TYPE; - - case AUDIODEV_DRIVER__MAX: - break; } abort(); } diff --git a/audio/audio.c b/audio/audio.c index 70b096713c..ea372288eb 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -2071,9 +2071,6 @@ void audio_create_pdos(Audiodev *dev) CASE(SPICE, spice, ); #endif CASE(WAV, wav, ); - - case AUDIODEV_DRIVER__MAX: - abort(); }; } @@ -2219,9 +2216,6 @@ int audioformat_bytes_per_sample(AudioFormat fmt) case AUDIO_FORMAT_S32: case AUDIO_FORMAT_F32: return 4; - - case AUDIO_FORMAT__MAX: - ; } abort(); } diff --git a/migration/migration.c b/migration/migration.c index ae2025d9d8..bdadab3b5e 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -2220,8 +2220,6 @@ bool migration_is_idle(void) case MIGRATION_STATUS_DEVICE: case MIGRATION_STATUS_WAIT_UNPLUG: return false; - case MIGRATION_STATUS__MAX: - g_assert_not_reached(); } return false; diff --git a/replay/replay-input.c b/replay/replay-input.c index 1147e3d34e..c6de8e33ac 100644 --- a/replay/replay-input.c +++ b/replay/replay-input.c @@ -38,9 +38,6 @@ void replay_save_input_event(InputEvent *evt) replay_put_dword(key->key->u.qcode.data); replay_put_byte(key->down); break; - case KEY_VALUE_KIND__MAX: - /* keep gcc happy */ - break; } break; case INPUT_EVENT_KIND_BTN: @@ -58,9 +55,6 @@ void replay_save_input_event(InputEvent *evt) replay_put_dword(move->axis); replay_put_qword(move->value); break; - case INPUT_EVENT_KIND__MAX: - /* keep gcc happy */ - break; } } @@ -89,9 +83,6 @@ InputEvent *replay_read_input_event(void) evt.u.key.data->key->u.qcode.data = (QKeyCode)replay_get_dword(); evt.u.key.data->down = replay_get_byte(); break; - case KEY_VALUE_KIND__MAX: - /* keep gcc happy */ - break; } break; case INPUT_EVENT_KIND_BTN: @@ -109,9 +100,6 @@ InputEvent *replay_read_input_event(void) evt.u.abs.data->axis = (InputAxis)replay_get_dword(); evt.u.abs.data->value = replay_get_qword(); break; - case INPUT_EVENT_KIND__MAX: - /* keep gcc happy */ - break; } return QAPI_CLONE(InputEvent, &evt); diff --git a/softmmu/tpm-hmp-cmds.c b/softmmu/tpm-hmp-cmds.c index 9ed6ad6c4d..5a354cf6ac 100644 --- a/softmmu/tpm-hmp-cmds.c +++ b/softmmu/tpm-hmp-cmds.c @@ -52,8 +52,6 @@ void hmp_info_tpm(Monitor *mon, const QDict *qdict) teo = ti->options->u.emulator.data; monitor_printf(mon, ",chardev=%s", teo->chardev); break; - case TPM_TYPE__MAX: - break; } monitor_printf(mon, "\n"); c++; diff --git a/ui/input-linux.c b/ui/input-linux.c index e572a2e905..a6e7574422 100644 --- a/ui/input-linux.c +++ b/ui/input-linux.c @@ -120,10 +120,6 @@ static bool input_linux_check_toggle(InputLinux *il) return (il->keydown[KEY_LEFTCTRL] || il->keydown[KEY_RIGHTCTRL]) && il->keydown[KEY_SCROLLLOCK]; - - case GRAB_TOGGLE_KEYS__MAX: - /* avoid gcc error */ - break; } return false; } diff --git a/ui/input.c b/ui/input.c index f2d1e7a3a7..ca8f49a403 100644 --- a/ui/input.c +++ b/ui/input.c @@ -230,9 +230,6 @@ static void qemu_input_event_trace(QemuConsole *src, InputEvent *evt) name = QKeyCode_str(key->key->u.qcode.data); trace_input_event_key_qcode(idx, name, key->down); break; - case KEY_VALUE_KIND__MAX: - /* keep gcc happy */ - break; } break; case INPUT_EVENT_KIND_BTN: @@ -250,9 +247,6 @@ static void qemu_input_event_trace(QemuConsole *src, InputEvent *evt) name = InputAxis_str(move->axis); trace_input_event_abs(idx, name, move->value); break; - case INPUT_EVENT_KIND__MAX: - /* keep gcc happy */ - break; } }