From patchwork Thu Oct 1 14:41:50 2020 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: 303923 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 58972C4727F for ; Thu, 1 Oct 2020 14:43:40 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id C47D620780 for ; Thu, 1 Oct 2020 14:43:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Ghsw2t1z" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C47D620780 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:46616 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNzo2-0000Ll-UU for qemu-devel@archiver.kernel.org; Thu, 01 Oct 2020 10:43:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41092) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNzmb-0007Iz-74 for qemu-devel@nongnu.org; Thu, 01 Oct 2020 10:42:09 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:54899) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kNzmZ-0002DV-3T for qemu-devel@nongnu.org; Thu, 01 Oct 2020 10:42:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601563322; 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=ZpPmzecL1JnaAFfxJvQhWfBsNXB+MnX+YoPFlhUhAaM=; b=Ghsw2t1zUezR7K21U9XuJwMRLm5TpexpzuTM7/x7iuojdz6F2HCspYML52EGW80jR9GEg0 WKaZI7mpw9zD9dasH4gt5oEAEQjpWwlE24lhGYc+3DVMD8xm2t1KVm6FjcnWEsCFMpihnc s2Kx+s3DhYkjCTcDNjFaByWSuN/JQZk= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-201-hId5VefkNrahtWTpo-cDpw-1; Thu, 01 Oct 2020 10:42:01 -0400 X-MC-Unique: hId5VefkNrahtWTpo-cDpw-1 Received: by mail-wm1-f71.google.com with SMTP id 13so32713wmf.0 for ; Thu, 01 Oct 2020 07:42:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZpPmzecL1JnaAFfxJvQhWfBsNXB+MnX+YoPFlhUhAaM=; b=thzryQ8rywpAehc2/i0bdKF+a3+p4naWoSe+5cVAsMWRK+pUo8em0IRPEI8+kBzPZw PorzwCexBwe8Kw3aq3bJRYca+not54hoY5DB4uihiuTU8sF/PjdX+EdamAwauAEjtFLH 24EDrTTZdDjNBn9zuFSZ/xoITfDY9Tzs1pM/pzUP44a2uj9AzkbMjiZWsCx0HIPBIvEk qw3MV5HbhbeLWZ++Q6X9jamCQq/8qBNg8wqMTmonBCqbJND7PPJ5j4fdJDCpHXBNkEzi VBNbx1UpKszuJXys7E3xbsHCp1gqJZsfWoV7NPso/sbZwIe2gEsFuf5hEF9xukp/Zh87 058g== X-Gm-Message-State: AOAM533AuMU/Xs22SluDL7JZ02Ol2BTrmkP7oWIVA4ZC1WH09j/PX7b3 Pqc4Aes+mkYFl9oN7030pWOmFo7k5dW5aXoRQR0u2uYCnPsHva28HGPdXO8xF3cyOP7Nhk3rj9L rF2oNQFVqqoiIpqg= X-Received: by 2002:a1c:1fc6:: with SMTP id f189mr389800wmf.20.1601563319922; Thu, 01 Oct 2020 07:41:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy2AAR5AwX//vaLlPmReSLdJYvN2sSBWcXdstcx/2WdlHHsuG5ZThU4FZ3f6fFxfbGf2Mb3Lg== X-Received: by 2002:a1c:1fc6:: with SMTP id f189mr389784wmf.20.1601563319688; Thu, 01 Oct 2020 07:41:59 -0700 (PDT) Received: from x1w.redhat.com (74.red-83-53-161.dynamicip.rima-tde.net. [83.53.161.74]) by smtp.gmail.com with ESMTPSA id z67sm235870wme.41.2020.10.01.07.41.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Oct 2020 07:41:58 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Laurent Vivier , qemu-devel@nongnu.org Subject: [PATCH v4 1/3] target/i386/cpu: Trivial code movement Date: Thu, 1 Oct 2020 16:41:50 +0200 Message-Id: <20201001144152.1555659-2-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201001144152.1555659-1-philmd@redhat.com> References: <20201001144152.1555659-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/01 04:25:37 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=-0.001, 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_H5=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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , qemu-trivial@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Michael Tokarev , Markus Armbruster , Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Trivial code movement to reduce #ifdef'ry in the next commit. Signed-off-by: Philippe Mathieu-Daudé --- target/i386/cpu.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 3ffd877dd5..2eec53ca22 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -4643,16 +4643,6 @@ static void x86_cpu_get_feature_words(Object *obj, Visitor *v, visit_type_X86CPUFeatureWordInfoList(v, "feature-words", &list, errp); } -/* Convert all '_' in a feature string option name to '-', to make feature - * name conform to QOM property naming rule, which uses '-' instead of '_'. - */ -static inline void feat2prop(char *s) -{ - while ((s = strchr(s, '_'))) { - *s = '-'; - } -} - /* Return the feature property name for a feature flag bit */ static const char *x86_cpu_feature_name(FeatureWord w, int bitnr) { @@ -4677,6 +4667,17 @@ static const char *x86_cpu_feature_name(FeatureWord w, int bitnr) return name; } +/* + * Convert all '_' in a feature string option name to '-', to make feature + * name conform to QOM property naming rule, which uses '-' instead of '_'. + */ +static inline void feat2prop(char *s) +{ + while ((s = strchr(s, '_'))) { + *s = '-'; + } +} + /* Compatibily hack to maintain legacy +-feat semantic, * where +-feat overwrites any feature set by * feat=on|feat even if the later is parsed after +-feat From patchwork Thu Oct 1 14:41:51 2020 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: 303922 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 11CC0C4727F for ; Thu, 1 Oct 2020 14:45:04 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 7DC112158C for ; Thu, 1 Oct 2020 14:45:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="BAJC5M41" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7DC112158C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:51136 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNzpO-0002Ia-7c for qemu-devel@archiver.kernel.org; Thu, 01 Oct 2020 10:45:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41138) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNzmg-0007MM-Bd for qemu-devel@nongnu.org; Thu, 01 Oct 2020 10:42:14 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:56326) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kNzmb-0002E0-0j for qemu-devel@nongnu.org; Thu, 01 Oct 2020 10:42:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601563328; 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=13dFYoU6KvfqYyBOP1RLSUELKZQPOuaHJ8QYH3lau34=; b=BAJC5M41zf1AAgYqMOW9lah3fXDlsFm9sD/DABlOe7kameH4X/WJ8BYe1SNzAitiCzPkzv nxuilhB60xvMtJ1EJHvACeodXb+3sVZXAOb2+J84aXWRUhJpxmupGLPycT8ZkSUARFeruL XuVvrh+RQUVlEmabWfKpvGlNSxK1ej8= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-436--a3oxEwWOeqR_MWeyVB16Q-1; Thu, 01 Oct 2020 10:42:06 -0400 X-MC-Unique: -a3oxEwWOeqR_MWeyVB16Q-1 Received: by mail-wm1-f72.google.com with SMTP id f2so384010wml.6 for ; Thu, 01 Oct 2020 07:42:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=13dFYoU6KvfqYyBOP1RLSUELKZQPOuaHJ8QYH3lau34=; b=cEF8QW3i6ESYzYk9Oj0lZLmQllxJnVN8d6oKf4Jx2Zn6M+3kKshOPvVEzZiiowhnGG Jo18w/j3Zbr+WY+D9lPFpiqt5RhPMA7An8Cb8dxWE3ovUEyxAf3O1dcrWA2MF1prtDl1 wBKwUXM/Q32j+PHYUNVUbk9W4Mz7FPFb/F4UM4UyXw3XpJapiY0jncbmxSBC2neeHJpJ NU+f/3AHsKfRynujPSpPTU2Jij/I78TCj8gYJi03M/JYEFz1047T6U8L25GdwAx1lESg KAnwe2UhMHKU9a2HvcWwVQi4jQUL/5qChVhydlc9h94ja2ZXHhuOrDwQ5DWKe8Dmytoy +YxQ== X-Gm-Message-State: AOAM532urSi8ELHxeros2ClhdqkYby9WZeveF5WUIxS+EJzp0gL2PE4Y 9+upnZel861Zw6OCMEGPPTIvmx74JAVhOY67yWS9ivxXGZ0+LXH3sLJEq9BnBtHBFeUaUd7IGB6 qwco/fqx7baU4K/w= X-Received: by 2002:a05:6000:151:: with SMTP id r17mr9251136wrx.311.1601563325333; Thu, 01 Oct 2020 07:42:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxrzt9S3V7X1vy2AEYQIyqcVrhP7bOQbPWynLiIbO1fC4A1y5IZ7wB2zXD9goNUo4cVKkvc5w== X-Received: by 2002:a05:6000:151:: with SMTP id r17mr9251103wrx.311.1601563325121; Thu, 01 Oct 2020 07:42:05 -0700 (PDT) Received: from x1w.redhat.com (74.red-83-53-161.dynamicip.rima-tde.net. [83.53.161.74]) by smtp.gmail.com with ESMTPSA id o194sm301374wme.24.2020.10.01.07.42.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Oct 2020 07:42:04 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Laurent Vivier , qemu-devel@nongnu.org Subject: [PATCH v4 2/3] target/i386/cpu: Restrict some of feature-words uses to system-mode Date: Thu, 1 Oct 2020 16:41:51 +0200 Message-Id: <20201001144152.1555659-3-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201001144152.1555659-1-philmd@redhat.com> References: <20201001144152.1555659-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/01 02:15:30 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=-0.001, 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_H5=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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , qemu-trivial@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Michael Tokarev , Markus Armbruster , Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" The feature-words properties are not used in user-mode emulation, restrict it to system-mode. Signed-off-by: Philippe Mathieu-Daudé --- target/i386/cpu.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 2eec53ca22..9f72342506 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -4607,6 +4607,7 @@ static void x86_cpuid_set_tsc_freq(Object *obj, Visitor *v, const char *name, cpu->env.tsc_khz = cpu->env.user_tsc_khz = value / 1000; } +#if !defined(CONFIG_USER_ONLY) /* Generic getter for "feature-words" and "filtered-features" properties */ static void x86_cpu_get_feature_words(Object *obj, Visitor *v, const char *name, void *opaque, @@ -4666,6 +4667,7 @@ static const char *x86_cpu_feature_name(FeatureWord w, int bitnr) assert(bitnr < 32 || !(name && feature_word_info[w].type == CPUID_FEATURE_WORD)); return name; } +#endif /* CONFIG_USER_ONLY */ /* * Convert all '_' in a feature string option name to '-', to make feature @@ -4783,6 +4785,7 @@ static void x86_cpu_parse_featurestr(const char *typename, char *features, static void x86_cpu_expand_features(X86CPU *cpu, Error **errp); static void x86_cpu_filter_features(X86CPU *cpu, bool verbose); +#if !defined(CONFIG_USER_ONLY) /* Build a list with the name of all features on a feature word array */ static void x86_cpu_list_feature_names(FeatureWordArray features, strList **feat_names) @@ -4853,6 +4856,7 @@ static void x86_cpu_class_check_missing_features(X86CPUClass *xcc, object_unref(OBJECT(xc)); } +#endif /* CONFIG_USER_ONLY */ /* Print all cpuid feature names in featureset */ @@ -4987,7 +4991,9 @@ static void x86_cpu_definition_entry(gpointer data, gpointer user_data) info = g_malloc0(sizeof(*info)); info->name = x86_cpu_class_get_model_name(cc); +#if !defined(CONFIG_USER_ONLY) x86_cpu_class_check_missing_features(cc, &info->unavailable_features); +#endif info->has_unavailable_features = true; info->q_typename = g_strdup(object_class_get_name(oc)); info->migration_safe = cc->migration_safe; @@ -6941,6 +6947,7 @@ static void x86_cpu_initfn(Object *obj) object_property_add(obj, "tsc-frequency", "int", x86_cpuid_get_tsc_freq, x86_cpuid_set_tsc_freq, NULL, NULL); +#if !defined(CONFIG_USER_ONLY) object_property_add(obj, "feature-words", "X86CPUFeatureWordInfo", x86_cpu_get_feature_words, NULL, NULL, (void *)env->features); @@ -6957,7 +6964,6 @@ static void x86_cpu_initfn(Object *obj) x86_cpu_get_unavailable_features, NULL, NULL, NULL); -#if !defined(CONFIG_USER_ONLY) object_property_add(obj, "crash-information", "GuestPanicInformation", x86_cpu_get_crash_info_qom, NULL, NULL, NULL); #endif From patchwork Thu Oct 1 14:41:52 2020 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: 303921 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 744AEC4727C for ; Thu, 1 Oct 2020 14:48:32 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id E1C8D207DE for ; Thu, 1 Oct 2020 14:48:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="gRPMSfT4" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E1C8D207DE Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:56614 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNzsk-0004pF-UN for qemu-devel@archiver.kernel.org; Thu, 01 Oct 2020 10:48:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41194) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNzmo-0007P1-0r for qemu-devel@nongnu.org; Thu, 01 Oct 2020 10:42:22 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:60130) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kNzmi-0002Eb-5V for qemu-devel@nongnu.org; Thu, 01 Oct 2020 10:42:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601563334; 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=LYzXqWXgtonVt/u84ke3FsaTsZ2wUQSqwruvuCAoYPY=; b=gRPMSfT4TPp9/Oe8pb3nZGSRHbaBhnhqCIlRm2BpXTbrpzRfS33Hq/mWi9//+mwusr0Nll Pt9H7QH1oLcRgrLIKFDJM3wIFBexLKiLcqCpzpEARZ0EXUYp1DWAT1FSDUsWGDH/I5BTbC VcIjyA+EgnVVUvY6+953zjaj4whFV7M= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-363-cZwLscGIO96G7266rJynLA-1; Thu, 01 Oct 2020 10:42:12 -0400 X-MC-Unique: cZwLscGIO96G7266rJynLA-1 Received: by mail-wr1-f69.google.com with SMTP id s8so2122576wrb.15 for ; Thu, 01 Oct 2020 07:42:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LYzXqWXgtonVt/u84ke3FsaTsZ2wUQSqwruvuCAoYPY=; b=gg/jbIJErytY6dOI7tTu8y/HvWsBZ6B63LNr6OaB9xGmNvovBpkpJyHKxTlpxD9jDy JztrmRo2kiValmXF3DK4U83xuuSYvBOyKFFejPcsDP0LtP1Dcjv7RZMOJm+1uYS6ZTNP A3sDnhCl9UGzdyGYvlOwiOkiLO4mgakpk7E5R07IBfSnBZQNBHO1l8S8rYKt0vuECawn mDt8PDFQ/UxuyXVJX5WKl47K6W0bC9tUuoaV8NONBBUaXlXOwJLWY0m4sWmzzh5iuUrP qPZ803YEejcQ6UZZy2CBJpfGjqgwQyykJPeKdZ1zuViN78lu0pnWqLS9j3b1Iic7oyyJ HKLg== X-Gm-Message-State: AOAM532h0EI4tV4hVXKfHHqr1cBBdKI9jEiKkCE4z5FhGxxF5IwGKxKz bz8W6VOzsRTRk5JSRnP+E1KEJBq5Jf2hgx9vxbfiW69a/XQrbwcfJ8tq8swLhFAk2bCwQZFYmEp P5is+KF+3beqcuPY= X-Received: by 2002:a7b:c111:: with SMTP id w17mr396974wmi.28.1601563330798; Thu, 01 Oct 2020 07:42:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyfZsOqeK8ZHFNvsrASWtTpI7huwLdL1ZQpRYSjqV4DvIReW346xR/JUEwh2tzoJnIHjL20OQ== X-Received: by 2002:a7b:c111:: with SMTP id w17mr396947wmi.28.1601563330571; Thu, 01 Oct 2020 07:42:10 -0700 (PDT) Received: from x1w.redhat.com (74.red-83-53-161.dynamicip.rima-tde.net. [83.53.161.74]) by smtp.gmail.com with ESMTPSA id 88sm9710069wrl.76.2020.10.01.07.42.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Oct 2020 07:42:09 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Laurent Vivier , qemu-devel@nongnu.org Subject: [PATCH v4 3/3] target/i386: Restrict X86CPUFeatureWord to X86 targets Date: Thu, 1 Oct 2020 16:41:52 +0200 Message-Id: <20201001144152.1555659-4-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201001144152.1555659-1-philmd@redhat.com> References: <20201001144152.1555659-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/01 04:25:37 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=-0.001, 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_H5=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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , qemu-trivial@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Michael Tokarev , Markus Armbruster , Paolo Bonzini , Richard Henderson , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Only qemu-system-FOO and qemu-storage-daemon provide QMP monitors, therefore such declarations and definitions are irrelevant for user-mode emulation. Restricting the x86-specific commands to machine-target.json pulls less QAPI-generated code into user-mode. Acked-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- qapi/machine-target.json | 45 ++++++++++++++++++++++++++++++++++++++++ qapi/machine.json | 42 ------------------------------------- target/i386/cpu.c | 2 +- 3 files changed, 46 insertions(+), 43 deletions(-) diff --git a/qapi/machine-target.json b/qapi/machine-target.json index 698850cc78..b4d769a53b 100644 --- a/qapi/machine-target.json +++ b/qapi/machine-target.json @@ -4,6 +4,51 @@ # This work is licensed under the terms of the GNU GPL, version 2 or later. # See the COPYING file in the top-level directory. +## +# @X86CPURegister32: +# +# A X86 32-bit register +# +# Since: 1.5 +## +{ 'enum': 'X86CPURegister32', + 'data': [ 'EAX', 'EBX', 'ECX', 'EDX', 'ESP', 'EBP', 'ESI', 'EDI' ], + 'if': 'defined(TARGET_I386)' } + +## +# @X86CPUFeatureWordInfo: +# +# Information about a X86 CPU feature word +# +# @cpuid-input-eax: Input EAX value for CPUID instruction for that feature word +# +# @cpuid-input-ecx: Input ECX value for CPUID instruction for that +# feature word +# +# @cpuid-register: Output register containing the feature bits +# +# @features: value of output register, containing the feature bits +# +# Since: 1.5 +## +{ 'struct': 'X86CPUFeatureWordInfo', + 'data': { 'cpuid-input-eax': 'int', + '*cpuid-input-ecx': 'int', + 'cpuid-register': 'X86CPURegister32', + 'features': 'int' }, + 'if': 'defined(TARGET_I386)' } + +## +# @DummyForceArrays: +# +# Not used by QMP; hack to let us use X86CPUFeatureWordInfoList internally +# +# Since: 2.5 +## +{ 'struct': 'DummyForceArrays', + 'data': { 'unused': ['X86CPUFeatureWordInfo'] }, + 'if': 'defined(TARGET_I386)' } + ## # @CpuModelInfo: # diff --git a/qapi/machine.json b/qapi/machine.json index 756dacb06f..995e972858 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -574,48 +574,6 @@ 'dst': 'uint16', 'val': 'uint8' }} -## -# @X86CPURegister32: -# -# A X86 32-bit register -# -# Since: 1.5 -## -{ 'enum': 'X86CPURegister32', - 'data': [ 'EAX', 'EBX', 'ECX', 'EDX', 'ESP', 'EBP', 'ESI', 'EDI' ] } - -## -# @X86CPUFeatureWordInfo: -# -# Information about a X86 CPU feature word -# -# @cpuid-input-eax: Input EAX value for CPUID instruction for that feature word -# -# @cpuid-input-ecx: Input ECX value for CPUID instruction for that -# feature word -# -# @cpuid-register: Output register containing the feature bits -# -# @features: value of output register, containing the feature bits -# -# Since: 1.5 -## -{ 'struct': 'X86CPUFeatureWordInfo', - 'data': { 'cpuid-input-eax': 'int', - '*cpuid-input-ecx': 'int', - 'cpuid-register': 'X86CPURegister32', - 'features': 'int' } } - -## -# @DummyForceArrays: -# -# Not used by QMP; hack to let us use X86CPUFeatureWordInfoList internally -# -# Since: 2.5 -## -{ 'struct': 'DummyForceArrays', - 'data': { 'unused': ['X86CPUFeatureWordInfo'] } } - ## # @NumaCpuOptions: # diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 9f72342506..848a65ded2 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -38,7 +38,7 @@ #include "qemu/option.h" #include "qemu/config-file.h" #include "qapi/error.h" -#include "qapi/qapi-visit-machine.h" +#include "qapi/qapi-visit-machine-target.h" #include "qapi/qapi-visit-run-state.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qerror.h"