From patchwork Wed Feb 24 22:46:40 2021 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: 12102891 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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 A5A54C433DB for ; Wed, 24 Feb 2021 22:50:59 +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 40E2164F03 for ; Wed, 24 Feb 2021 22:50:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 40E2164F03 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]:35380 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lF2zi-00005s-AU for qemu-devel@archiver.kernel.org; Wed, 24 Feb 2021 17:50:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40662) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lF2vr-0004ff-Gl for qemu-devel@nongnu.org; Wed, 24 Feb 2021 17:47:00 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:43462) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lF2vm-00060n-W9 for qemu-devel@nongnu.org; Wed, 24 Feb 2021 17:46:59 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614206813; 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=t3qKRL/5hKgwJjLrl6DX6z760KxMHjG0maONNBBWZOo=; b=KshQCUPQussEcAAXYLu727fzSayvbYnG85geCUrHlz8uOeLRkAmiqvmmBhdrSRyRK/8Dnm mDacX0axItYLCkdo7sf32l7MD30H8cpEJdTVutCTS34sExCMtPegh9gayLFCZl/uaa8Un9 Pie6gz4s70xirJtjWN04bpy3VcUwwFk= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-462-0Recl4SiO7iAWrivQbp4Qg-1; Wed, 24 Feb 2021 17:46:52 -0500 X-MC-Unique: 0Recl4SiO7iAWrivQbp4Qg-1 Received: by mail-wr1-f71.google.com with SMTP id l3so1687014wrx.15 for ; Wed, 24 Feb 2021 14:46:51 -0800 (PST) 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=t3qKRL/5hKgwJjLrl6DX6z760KxMHjG0maONNBBWZOo=; b=OTznzQSs+qnknJ5r5BAf+u0eE54vu9g1ayy1e9vOfxS0VIkRyfeGBQXEOejbFckZFM 41z9sv4/drWUh8LaQJ/ShgparUjP8z5dXocazuPtdp/p1MxxR+x/4C+KwaUXvLibnlBv tSB0k1mqriedEC9Qt5qzNqfl4qshcI5o9u5HxNbfJjnK+SiR6maBzylupFH/MkdpwgYH BRZrHM3Q8ugUfgcPs93CWq0fXOHVaY0F0cM2sGk5ySPRIvUL2ZGnPrG1wwQHf5NDf1j1 Y9w7amnZ9d9TmmM1Mip3f1BWW+jsXf5kyVnqY7aVAzNyxy68/Z3Cjew7Gdpw3KwTbWZf YLbA== X-Gm-Message-State: AOAM530CLORhKVxxTCF8rkwXWRCoG5TzfGild/BNa6aywqItDGPieFcN J4aHrg/hDRT+dZOhhw2Xaulo4mH+UYRuk3fE2y61AqksqNIhDSUIAssoIKvJeWXsESwpKZHPUSc tGs4yPOchwlx/fQqTinyodvAtzyEeG0y8ToqAxwOYvn8r8wGX9K6MvgLz5ZyXEoNo X-Received: by 2002:a1c:f019:: with SMTP id a25mr246705wmb.125.1614206810010; Wed, 24 Feb 2021 14:46:50 -0800 (PST) X-Google-Smtp-Source: ABdhPJxQ+LuWPaYSFLObDEA74/DDMFN9RFH/Udtvzcf51ajVQ+91j2B9aI4fPRfdXCuPOpXN8X7TwA== X-Received: by 2002:a1c:f019:: with SMTP id a25mr246680wmb.125.1614206809872; Wed, 24 Feb 2021 14:46:49 -0800 (PST) Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id q25sm4758201wmq.15.2021.02.24.14.46.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Feb 2021 14:46:49 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v5 1/4] target/i386/cpu: Introduce get_register_enum_32() helper Date: Wed, 24 Feb 2021 23:46:40 +0100 Message-Id: <20210224224643.3369940-2-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210224224643.3369940-1-philmd@redhat.com> References: <20210224224643.3369940-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-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Laurent Vivier , Markus Armbruster , Claudio Fontana , Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Introduce get_register_enum_32(), similar to get_register_name_32(). Signed-off-by: Philippe Mathieu-Daudé --- target/i386/cpu-internal.h | 4 ++++ target/i386/cpu.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/target/i386/cpu-internal.h b/target/i386/cpu-internal.h index be688cb393e..9df24c482ea 100644 --- a/target/i386/cpu-internal.h +++ b/target/i386/cpu-internal.h @@ -20,6 +20,8 @@ #ifndef I386_CPU_INTERNAL_H #define I386_CPU_INTERNAL_H +#include "qapi/qapi-types-machine.h" + typedef enum FeatureWordType { CPUID_FEATURE_WORD, MSR_FEATURE_WORD, @@ -55,6 +57,8 @@ typedef struct FeatureWordInfo { extern FeatureWordInfo feature_word_info[]; +X86CPURegister32 get_register_enum_32(FeatureWord w); + void x86_cpu_expand_features(X86CPU *cpu, Error **errp); #ifndef CONFIG_USER_ONLY diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 219d7652524..ffa342171ba 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -1476,6 +1476,11 @@ static const char *get_register_name_32(unsigned int reg) return x86_reg_info_32[reg].name; } +X86CPURegister32 get_register_enum_32(FeatureWord w) +{ + return x86_reg_info_32[feature_word_info[w].cpuid.reg].qapi_enum; +} + /* * Returns the set of feature flags that are supported and migratable by * QEMU, for a given FeatureWord. @@ -4548,7 +4553,7 @@ static void x86_cpu_get_feature_words(Object *obj, Visitor *v, qwi->cpuid_input_eax = wi->cpuid.eax; qwi->has_cpuid_input_ecx = wi->cpuid.needs_ecx; qwi->cpuid_input_ecx = wi->cpuid.ecx; - qwi->cpuid_register = x86_reg_info_32[wi->cpuid.reg].qapi_enum; + qwi->cpuid_register = get_register_enum_32(w); qwi->features = array[w]; /* List will be in reverse order, but order shouldn't matter */ From patchwork Wed Feb 24 22:46:41 2021 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: 12102887 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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 866BFC433DB for ; Wed, 24 Feb 2021 22:48:43 +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 3A51064EDD for ; Wed, 24 Feb 2021 22:48:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3A51064EDD 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]:58512 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lF2xW-0006KH-8X for qemu-devel@archiver.kernel.org; Wed, 24 Feb 2021 17:48:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40696) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lF2vt-0004g0-LL for qemu-devel@nongnu.org; Wed, 24 Feb 2021 17:47:02 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:33595) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lF2vr-00061p-8h for qemu-devel@nongnu.org; Wed, 24 Feb 2021 17:47:01 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614206818; 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=EVnue42BrttlBCQCGj0TZzTKP7+Zxi1Gm+4446lormI=; b=B1hB2tYmOvtiyaoTjqSPJvrDafiWKPFsoSS+jIwTvUbqBMjGKP4acwpsgw3h87/lvlgGUe gHih3nM5ba9hnG7R9SBZqlhD9RseQGj3uvvdp3QoEQ2GUo+Nu3RehsaYKntB9rGzT4HTzD mrQrvpUQ4512/FM6jUanA4EGhfHTeKc= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-362-YkL-rHf_PDipWWGX_1vYug-1; Wed, 24 Feb 2021 17:46:56 -0500 X-MC-Unique: YkL-rHf_PDipWWGX_1vYug-1 Received: by mail-wr1-f72.google.com with SMTP id u15so1679035wrn.3 for ; Wed, 24 Feb 2021 14:46:56 -0800 (PST) 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=EVnue42BrttlBCQCGj0TZzTKP7+Zxi1Gm+4446lormI=; b=nqyllAVNd6VRzSwJNdMuKOBlbPfgNMPrmT7bxZgmXblMJmgfEskpXAUm7LBHLPJLhy 6CfogRi/20+Bkv9zkUMtNsLOnlbpTB56CpeVIJBmR4qEB8GLZkCP43m194pzjhsxl8C3 nicXDn0Yt2pySooeB+aUnzV9x9YiyjUEjlxqtpgZuc4cNKSmTsKGZEcujV7MU5vclGcw TDk6jcrzmmYFN9ZK4zN9sX2zSBGAzsIm5suJBThWI+qZaw2u+3URNaD6kDk2vhUT/OXB EXnEt926pDlzhIu02Ghr9fyIT4qQnDh18AATkLH9j8IWBzw2ZNEpO2AJbzoDf3HTyRwr Km+g== X-Gm-Message-State: AOAM533TJmlGqMwQbleizpNEA9I/T+GD+XOjr0uTKblfpZHB3IlKJ2Sq cdphNsMA6kDeUd9CLQe/6NknG/+urtA3u6Xb952/GYI2sOjg0w/wYWTZER167RaQGdTwPNrNAQ6 W1SH/3Z/O+8hFy+0tfHZGzTSRxpEUNty6ZqUjaC//nU7eFzI7prHLOfKyVSOOLTFl X-Received: by 2002:a1c:65d6:: with SMTP id z205mr278842wmb.88.1614206815253; Wed, 24 Feb 2021 14:46:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJy1uPTEQliKMX3O/FOW4JYYaofFyYjKURWoqSHU31T+txdc51Rk/0Y43hyBTLMML56sBzmwng== X-Received: by 2002:a1c:65d6:: with SMTP id z205mr278821wmb.88.1614206814986; Wed, 24 Feb 2021 14:46:54 -0800 (PST) Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id i8sm6364961wry.90.2021.02.24.14.46.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Feb 2021 14:46:54 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v5 2/4] target/i386/cpu: Restrict x86_cpu_get_feature_words to sysemu Date: Wed, 24 Feb 2021 23:46:41 +0100 Message-Id: <20210224224643.3369940-3-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210224224643.3369940-1-philmd@redhat.com> References: <20210224224643.3369940-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-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Laurent Vivier , Markus Armbruster , Claudio Fontana , Paolo Bonzini 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. Signed-off-by: Philippe Mathieu-Daudé --- target/i386/cpu-internal.h | 3 +++ target/i386/cpu-softmmu.c | 36 ++++++++++++++++++++++++++++++++++ target/i386/cpu.c | 40 +++----------------------------------- 3 files changed, 42 insertions(+), 37 deletions(-) diff --git a/target/i386/cpu-internal.h b/target/i386/cpu-internal.h index 9df24c482ea..9355f86f6e1 100644 --- a/target/i386/cpu-internal.h +++ b/target/i386/cpu-internal.h @@ -69,6 +69,9 @@ void x86_cpu_get_crash_info_qom(Object *obj, Visitor *v, void x86_cpu_apic_create(X86CPU *cpu, Error **errp); void x86_cpu_apic_realize(X86CPU *cpu, Error **errp); void x86_cpu_machine_reset_cb(void *opaque); +void x86_cpu_get_feature_words(Object *obj, Visitor *v, + const char *name, void *opaque, + Error **errp); #endif /* CONFIG_USER_ONLY */ #endif /* CPU_INTERNAL_H */ diff --git a/target/i386/cpu-softmmu.c b/target/i386/cpu-softmmu.c index c824408e8eb..34fd7b0de02 100644 --- a/target/i386/cpu-softmmu.c +++ b/target/i386/cpu-softmmu.c @@ -23,6 +23,7 @@ #include "sysemu/whpx.h" #include "kvm/kvm_i386.h" #include "qapi/error.h" +#include "qapi/qapi-visit-machine.h" #include "qapi/qapi-visit-run-state.h" #include "qapi/qmp/qdict.h" #include "qom/qom-qobject.h" @@ -350,3 +351,38 @@ void x86_cpu_get_crash_info_qom(Object *obj, Visitor *v, qapi_free_GuestPanicInformation(panic_info); } +/* Generic getter for "feature-words" and "filtered-features" properties */ +void x86_cpu_get_feature_words(Object *obj, Visitor *v, + const char *name, void *opaque, + Error **errp) +{ + uint64_t *array = (uint64_t *)opaque; + FeatureWord w; + X86CPUFeatureWordInfo word_infos[FEATURE_WORDS] = { }; + X86CPUFeatureWordInfoList list_entries[FEATURE_WORDS] = { }; + X86CPUFeatureWordInfoList *list = NULL; + + for (w = 0; w < FEATURE_WORDS; w++) { + FeatureWordInfo *wi = &feature_word_info[w]; + /* + * We didn't have MSR features when "feature-words" was + * introduced. Therefore skipped other type entries. + */ + if (wi->type != CPUID_FEATURE_WORD) { + continue; + } + X86CPUFeatureWordInfo *qwi = &word_infos[w]; + qwi->cpuid_input_eax = wi->cpuid.eax; + qwi->has_cpuid_input_ecx = wi->cpuid.needs_ecx; + qwi->cpuid_input_ecx = wi->cpuid.ecx; + qwi->cpuid_register = get_register_enum_32(w); + qwi->features = array[w]; + + /* List will be in reverse order, but order shouldn't matter */ + list_entries[w].next = list; + list_entries[w].value = &word_infos[w]; + list = &list_entries[w]; + } + + visit_type_X86CPUFeatureWordInfoList(v, "feature-words", &list, errp); +} diff --git a/target/i386/cpu.c b/target/i386/cpu.c index ffa342171ba..c088bcf3113 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -27,7 +27,7 @@ #include "sysemu/hvf.h" #include "kvm/kvm_i386.h" #include "sev_i386.h" -#include "qapi/qapi-visit-machine.h" +#include "qapi/qapi-builtin-visit.h" #include "qapi/qmp/qerror.h" #include "qapi/qapi-commands-machine-target.h" #include "standard-headers/asm-x86/kvm_para.h" @@ -4529,42 +4529,6 @@ 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; } -/* 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, - Error **errp) -{ - uint64_t *array = (uint64_t *)opaque; - FeatureWord w; - X86CPUFeatureWordInfo word_infos[FEATURE_WORDS] = { }; - X86CPUFeatureWordInfoList list_entries[FEATURE_WORDS] = { }; - X86CPUFeatureWordInfoList *list = NULL; - - for (w = 0; w < FEATURE_WORDS; w++) { - FeatureWordInfo *wi = &feature_word_info[w]; - /* - * We didn't have MSR features when "feature-words" was - * introduced. Therefore skipped other type entries. - */ - if (wi->type != CPUID_FEATURE_WORD) { - continue; - } - X86CPUFeatureWordInfo *qwi = &word_infos[w]; - qwi->cpuid_input_eax = wi->cpuid.eax; - qwi->has_cpuid_input_ecx = wi->cpuid.needs_ecx; - qwi->cpuid_input_ecx = wi->cpuid.ecx; - qwi->cpuid_register = get_register_enum_32(w); - qwi->features = array[w]; - - /* List will be in reverse order, but order shouldn't matter */ - list_entries[w].next = list; - list_entries[w].value = &word_infos[w]; - list = &list_entries[w]; - } - - 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 '_'. */ @@ -6422,12 +6386,14 @@ static void x86_cpu_initfn(Object *obj) env->nr_dies = 1; cpu_set_cpustate_pointers(cpu); +#if !defined(CONFIG_USER_ONLY) object_property_add(obj, "feature-words", "X86CPUFeatureWordInfo", x86_cpu_get_feature_words, NULL, NULL, (void *)env->features); object_property_add(obj, "filtered-features", "X86CPUFeatureWordInfo", x86_cpu_get_feature_words, NULL, NULL, (void *)cpu->filtered_features); +#endif /* !CONFIG_USER_ONLY */ object_property_add_alias(obj, "sse3", obj, "pni"); object_property_add_alias(obj, "pclmuldq", obj, "pclmulqdq"); From patchwork Wed Feb 24 22:46:42 2021 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: 12102897 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=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 4342CC433E0 for ; Wed, 24 Feb 2021 22:52:20 +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 C3E0064F03 for ; Wed, 24 Feb 2021 22:52:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C3E0064F03 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]:38214 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lF310-0001QY-QS for qemu-devel@archiver.kernel.org; Wed, 24 Feb 2021 17:52:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40720) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lF2vz-0004ii-1Q for qemu-devel@nongnu.org; Wed, 24 Feb 2021 17:47:07 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:50508) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lF2vw-00063a-EE for qemu-devel@nongnu.org; Wed, 24 Feb 2021 17:47:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614206823; 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=TGc1XDROpJa7heiKjiNOwGMcXXvKXrCBpdUx/v/xVvI=; b=bWqFQe90nD45l9G4mHLkLsq200UrzwEUK0ETP8vDDBEp0dS+V3qpMvAKjUvbwEdhclDrmB cFVX8Il6sduM7z9kWffMNnPXHhn51/GOl7kfCNbUY1rFcvhXdQ8Ur5ZsHixj1L9/3ygbbg 4gPND72xZ9GoFkbYgjedV9FhF808tug= 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-602-GoHTObg-OsyC_XX9kGD35w-1; Wed, 24 Feb 2021 17:47:01 -0500 X-MC-Unique: GoHTObg-OsyC_XX9kGD35w-1 Received: by mail-wr1-f69.google.com with SMTP id p18so1701438wrt.5 for ; Wed, 24 Feb 2021 14:47:01 -0800 (PST) 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=TGc1XDROpJa7heiKjiNOwGMcXXvKXrCBpdUx/v/xVvI=; b=r/I0taFCa+LnVA8G8+PV8y+uMADblm+eLdCs64ZgxDUHzI60ZeWvi76Jv+hfNV/oO5 WGe92G4yUMgf+v7vrAAKeDHSsd8WcjtlNgKtcRIr2MWFSJgQcgIEhTWNQVBPL69yJ1JA TRdOguY6Aao34PAMWaOwZJZQ/4nkG3fXmgo0awNlwywUxcImwkJu9slLI9KxUR8xg6vs ZPtR+ndndK8Zw5cVMrF8ok6pt9cLl5gcY7M/GuxhSa+zbPw27p48GJQUjOhrj/15nzUV q4GOBVMZAZDYDY/HOLxNM7CpR5fYQBBJ4UOKe0hrH0e+ztmMU2cdiSuiJdmBXiXssTnY 0Lxg== X-Gm-Message-State: AOAM5301yfMGez8yGJRXDSnB7BPZ6YjHaQCS9TDcf15L3tYI+D+p32kb YdkBex4a5Ndx66nb6ec22qupinbVb/IIvb3grgaSZdZfLUsRTIQT8DhKmXnKQYbmzc+ztaem/3y 5N0UsvkBEDfBrFZ74lleP7xBOH1N6Hz7VWn/Ujap+m8dN8PhLNk89MZNn3RCpzAZz X-Received: by 2002:a1c:b6d7:: with SMTP id g206mr252307wmf.123.1614206820172; Wed, 24 Feb 2021 14:47:00 -0800 (PST) X-Google-Smtp-Source: ABdhPJwC3nRTJpkI8hwMSqLH5Jsmo0ek5gPNs5pMiwn1v7m2ICWfSmZdd04F/nOhzG34hmes6j6rvg== X-Received: by 2002:a1c:b6d7:: with SMTP id g206mr252284wmf.123.1614206820015; Wed, 24 Feb 2021 14:47:00 -0800 (PST) Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id k128sm4650445wmf.42.2021.02.24.14.46.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Feb 2021 14:46:59 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v5 3/4] qapi: Move X86 specific types to machine-target.json Date: Wed, 24 Feb 2021 23:46:42 +0100 Message-Id: <20210224224643.3369940-4-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210224224643.3369940-1-philmd@redhat.com> References: <20210224224643.3369940-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-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Richard Henderson , Laurent Vivier , Markus Armbruster , Claudio Fontana , Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" X86CPURegister32 enum and X86CPUFeatureWordInfo structure are specific to the x86 architecture, move these entries to machine-target.json. Restricting the x86-specific commands to machine-target.json pulls less QAPI-generated code into non-x86 targets. Acked-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- qapi/machine-target.json | 42 +++++++++++++++++++++++++++++++++++++++ qapi/machine.json | 42 --------------------------------------- target/i386/cpu-softmmu.c | 2 +- 3 files changed, 43 insertions(+), 43 deletions(-) diff --git a/qapi/machine-target.json b/qapi/machine-target.json index e7811654b72..106fbd2e9ed 100644 --- a/qapi/machine-target.json +++ b/qapi/machine-target.json @@ -329,3 +329,45 @@ ## { 'command': 'query-cpu-definitions', 'returns': ['CpuDefinitionInfo'], 'if': 'defined(TARGET_PPC) || defined(TARGET_ARM) || defined(TARGET_I386) || defined(TARGET_S390X) || defined(TARGET_MIPS)' } + +## +# @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'] } } diff --git a/qapi/machine.json b/qapi/machine.json index 330189efe3d..8053803a0e0 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -681,48 +681,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-softmmu.c b/target/i386/cpu-softmmu.c index 34fd7b0de02..a7afa7963db 100644 --- a/target/i386/cpu-softmmu.c +++ b/target/i386/cpu-softmmu.c @@ -23,7 +23,7 @@ #include "sysemu/whpx.h" #include "kvm/kvm_i386.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 "qom/qom-qobject.h" From patchwork Wed Feb 24 22:46:43 2021 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: 12102889 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=-13.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY, 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 A7C38C433E0 for ; Wed, 24 Feb 2021 22:48:49 +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 30E5464F03 for ; Wed, 24 Feb 2021 22:48:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 30E5464F03 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]:59148 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lF2xc-0006ZV-CD for qemu-devel@archiver.kernel.org; Wed, 24 Feb 2021 17:48:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40744) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lF2w3-0004qE-0L for qemu-devel@nongnu.org; Wed, 24 Feb 2021 17:47:11 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:24597) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lF2w1-00065e-3a for qemu-devel@nongnu.org; Wed, 24 Feb 2021 17:47:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614206828; 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=6dtFkRI9hyOOeUpAKA3F6JXd4eQ65AOROSFOc2P9BEU=; b=AQPSm/e2eSgQKAWnE7Pu9evWrRmkX9NeOxl0A34APcDQAUFTQfInZ3KU67wpTKTHHjcrUv +ayUbi6X/f00OAT8PNFw5EXpRva0dplJCYLAqeiSE0rOi9j3lebRMtkvZz/XStmtPukLTC oMgKwCknLWNxmCTQNSr1Aca7RS0zBu0= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-220-4RRG87WoNUCcbZHFklkeBg-1; Wed, 24 Feb 2021 17:47:06 -0500 X-MC-Unique: 4RRG87WoNUCcbZHFklkeBg-1 Received: by mail-wr1-f72.google.com with SMTP id p15so1687313wro.11 for ; Wed, 24 Feb 2021 14:47:06 -0800 (PST) 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=6dtFkRI9hyOOeUpAKA3F6JXd4eQ65AOROSFOc2P9BEU=; b=gPxYK9RKwLUtVsb7X6Ob0gO732rKya3YC1gktQlJa2Iuecmko8/Yj9MMTFE80c7ZTc j/PTwmTLhlyyYH7vDmaGPioinCFTAYo7JvSu6bZjpn6v9+AZhyj9Ni53QSji+436yYyC tb0iobZu1eNJ8sRcdXtwCUQm+h3A8mLstB1vTAMPqwENNlHedb+j2akvyXSbkLFc54+s Cg1krA8MAcxJVQ4sxNL/xu6vxm03QjG5sixH++A6xTec+pgbjj1r7ub+m/+FamLK3ZEL LKHN1sehp9NufSL9g//023+3ccsLELavCy3FCXdpNDe/c0nk7CT0JdCq8xOL2BxebZgo wx+Q== X-Gm-Message-State: AOAM530Yhie0PM7PjCqySt4pbNmtMba8tkgbfBC+KQQpsQluw615RTiv JtSasXKm9mXdM+7Ltr0ec6y5zabcw0C2yB+GMd79+DBlN/fg+6hDUq5TXTD+bYXu0E5RFSSWzgY FvBAofEPN3PhnSzdYwuAqg407vLavwPMX2v7dHx752Nt0JcwBs+seGPGX+8R9g6QH X-Received: by 2002:a7b:c957:: with SMTP id i23mr292081wml.32.1614206825054; Wed, 24 Feb 2021 14:47:05 -0800 (PST) X-Google-Smtp-Source: ABdhPJwPMD1MHIlrRzkJyhWirg05IJfKtPF6HXF3qdSMGXsVJwgpsk2XSnFXE/79lOPLG0z+v29nfQ== X-Received: by 2002:a7b:c957:: with SMTP id i23mr292059wml.32.1614206824817; Wed, 24 Feb 2021 14:47:04 -0800 (PST) Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id 75sm5375107wma.23.2021.02.24.14.47.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Feb 2021 14:47:04 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v5 4/4] qapi/machine-target: Restrict X86 features to X86 targets Date: Wed, 24 Feb 2021 23:46:43 +0100 Message-Id: <20210224224643.3369940-5-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210224224643.3369940-1-philmd@redhat.com> References: <20210224224643.3369940-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-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Laurent Vivier , Markus Armbruster , Claudio Fontana , Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" X86CPURegister32 enum and X86CPUFeatureWordInfo structure are specific to the x86 architecture, restrict them to the X86 targets. Signed-off-by: Philippe Mathieu-Daudé --- qapi/machine-target.json | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/qapi/machine-target.json b/qapi/machine-target.json index 106fbd2e9ed..a8a5b3f86f6 100644 --- a/qapi/machine-target.json +++ b/qapi/machine-target.json @@ -338,7 +338,8 @@ # Since: 1.5 ## { 'enum': 'X86CPURegister32', - 'data': [ 'EAX', 'EBX', 'ECX', 'EDX', 'ESP', 'EBP', 'ESI', 'EDI' ] } + 'data': [ 'EAX', 'EBX', 'ECX', 'EDX', 'ESP', 'EBP', 'ESI', 'EDI' ], + 'if': 'defined(TARGET_I386)' } ## # @X86CPUFeatureWordInfo: @@ -360,7 +361,8 @@ 'data': { 'cpuid-input-eax': 'int', '*cpuid-input-ecx': 'int', 'cpuid-register': 'X86CPURegister32', - 'features': 'int' } } + 'features': 'int' }, + 'if': 'defined(TARGET_I386)' } ## # @DummyForceArrays: @@ -370,4 +372,5 @@ # Since: 2.5 ## { 'struct': 'DummyForceArrays', - 'data': { 'unused': ['X86CPUFeatureWordInfo'] } } + 'data': { 'unused': ['X86CPUFeatureWordInfo'] }, + 'if': 'defined(TARGET_I386)' }