From nobody Tue Feb 10 02:49:52 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614206829; cv=none; d=zohomail.com; s=zohoarc; b=Pqcl5l0mMh9zk7inY3BdTQjJMvf3uzxNuNUBo7/u9RT8Rwc3X7tN0tVrv7oJ5t8uc3tT9GXW3Tsgl7CJR7tpmHbjPUdVpeoXPKiqaYfmBLK0CO3mHpkc7/08djarRCs3dLumOTwStfM+0VSrldmw6m3XtjJKa0J0HqwZHN2CjuI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614206829; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=6dtFkRI9hyOOeUpAKA3F6JXd4eQ65AOROSFOc2P9BEU=; b=Be8J7RpPQmJNQeqhj91swq36E0A9mpVs7RY9dz7cN5C29ieQsAiMmdbBo1OkcdDHx20bUVd73RmiAxKdJVVtBcQtBvCkajOLokoJemW7+qzaiRNEGNlUPsDJcuxqwWX4Bv9IjoXNWAwpSHZGHqD7F0U49b8KZelBB9g1kH6NkHY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1614206829803240.0489879885215; Wed, 24 Feb 2021 14:47:09 -0800 (PST) Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-2-dhpO6oleOpqApsn9vE8_Gg-1; Wed, 24 Feb 2021 17:47:06 -0500 Received: by mail-wr1-f70.google.com with SMTP id g5so1672880wrd.22 for ; Wed, 24 Feb 2021 14:47:05 -0800 (PST) Return-Path: Return-Path: 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) 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= X-MC-Unique: dhpO6oleOpqApsn9vE8_Gg-1 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=Lj+KUgRSjj4KXFahF6jF/BTurPV/w0K0hpozRod/JuzR3ztsNtS9BgauQpc+nEi7VH 47/YObMkRis++gILRuwDYXg/LGbFUgBcpdorGI3Glm6rdaHYqyhLuRZtP7qEClpl0Whi rVxQh+0CT/e4oZgCNBK7JVgppCk7fC967QG8bNdQH6tr5ZUCkR506WpZPtrvDJGrSHh7 3RwzxiixCJy91m3dTU6iDeFtCSXpsv3GPLsZzEFVY1KSa6ATEhiwBtQh2guEc7hIO87d AXla8vfO0LBaIFyZgGEind6k9ne6wIM5s0byoqshspOh3EV03iC/UdHga7b/QlzlXMVB kx+g== X-Gm-Message-State: AOAM533HB114xrJw0RUWEurGSM1FoQIZgdgVjGf/GIuAz66ZT2e3LdGL QvJENTwWcmDMTavLOG0FHio+wHPR5/iACwleOEznr3AZ3GxrQ3CH6Oze6u2NjaogHA4G9ptGV8j +nzr1bweRGwXYog== X-Received: by 2002:a7b:c957:: with SMTP id i23mr292072wml.32.1614206824966; Wed, 24 Feb 2021 14:47:04 -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) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Eduardo Habkost , Markus Armbruster , Laurent Vivier , Eric Blake , Marcel Apfelbaum , Claudio Fontana , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X86CPURegister32 enum and X86CPUFeatureWordInfo structure are specific to the x86 architecture, restrict them to the X86 targets. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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)' } =20 ## # @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)' } =20 ## # @DummyForceArrays: @@ -370,4 +372,5 @@ # Since: 2.5 ## { 'struct': 'DummyForceArrays', - 'data': { 'unused': ['X86CPUFeatureWordInfo'] } } + 'data': { 'unused': ['X86CPUFeatureWordInfo'] }, + 'if': 'defined(TARGET_I386)' } --=20 2.26.2