From patchwork Sat Mar 15 06:17:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 873844 Delivered-To: patch@linaro.org Received: by 2002:a5d:4308:0:b0:38f:210b:807b with SMTP id h8csp1062995wrq; Fri, 14 Mar 2025 23:30:20 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUkTZfPx4MNL3iEV9uT/FmjfTI4p9ZsbyVq2RG4qVb6C0ZdZNKX5SGYNYC/pGuHb4hqfyqxIg==@linaro.org X-Google-Smtp-Source: AGHT+IHP30llt+/8Fa/JO2eWFW+yorx0cZsq+W3I1y2dGmwSku6J4jMqbg/qJizmX4kGwVNeyxqo X-Received: by 2002:a05:6214:e48:b0:6e8:9394:cbbe with SMTP id 6a1803df08f44-6eaeaa2d10amr68455856d6.20.1742020220008; Fri, 14 Mar 2025 23:30:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742020219; cv=none; d=google.com; s=arc-20240605; b=YyfAZYVGHItv0cIr13k3VPbodTInJXiyaB/t4t2X5BBoLKljlsFwp2/0yo4NXJFGwW hIuK9HeElIVjxlz/QFITeloVSXHQd/4krDKvdY1QaOd0/LsuVex2c2oaFiNjfmVfTbef AgBxDPgzzjUxdGBNp3kskQIWNpDnpJvLymMEFcIsYldjNWd+d95GrUQISVtpxsgz2tD1 v5EdSMIsuWTX7fsME0FASPClwL7Fanfeeuz+luKkS3i6yz1dygiG+8gBPkCupOM1q1AR isu68Pi0CAco4VSXxuEmvZ3Eo1d/wsG4QofMzogOI0errtbiMD70+yB/FtLgJPakx8H9 Qggg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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; bh=uK2VWVCcjUT6XG8AvCzRCURo35eF/LydgZUNC+/RupQ=; fh=inIU3bgjueJc/0tVVGuzaeZ4IMkZrXwNnxEmi4ce+ts=; b=jyR937c6UjKAU0Mhq2FYtBlvewPtxb7wjU+xaDAiLbr3Zqa35csstNh8ouiDwyjFdV gLoFstHAZSNsvGHnDwX/YVeIvmjKvgjUIZrZGole91bFA9ky3fOp1/8hCiH/q5oTz3oB +eDxmyBFObIe4uoZjeTyKasSee24189gLxSv4ncSMced7dWOhSdblfFfl4tOtRgsjKZ+ oZi7PSmprIVrXH/nyzbVjcrz0tW1jcK8DzpHR+8o1gday2HdPT17BTOa2relZS3rFQVA auM8JcLtU6Bwn22q3yGW7od+9GrqFwOK6B9aSu17ahWlO3GgIq8DC7nZsSMd5oAwd6ld dbFQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6eade33cb3asi53434106d6.204.2025.03.14.23.30.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 14 Mar 2025 23:30:19 -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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ttKxd-0007jt-UC; Sat, 15 Mar 2025 02:25:30 -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 1ttKvA-0003fZ-6G; Sat, 15 Mar 2025 02:22:56 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ttKv8-0003t8-8Q; Sat, 15 Mar 2025 02:22:55 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 3590CFF9FD; Sat, 15 Mar 2025 09:17:08 +0300 (MSK) Received: from gandalf.tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with ESMTP id 0C12A1CAC66; Sat, 15 Mar 2025 09:18:02 +0300 (MSK) Received: by gandalf.tls.msk.ru (Postfix, from userid 1000) id A100F55911; Sat, 15 Mar 2025 09:18:01 +0300 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Pierrick Bouvier , Richard Henderson , Michael Tokarev Subject: [Stable-9.2.3 49/51] hw/xen/hvm: Fix Aarch64 typo Date: Sat, 15 Mar 2025 09:17:55 +0300 Message-Id: <20250315061801.622606-49-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.5 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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.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 From: Philippe Mathieu-Daudé There is no TARGET_ARM_64 definition. Luckily enough, when TARGET_AARCH64 is defined, TARGET_ARM also is. Fixes: 733766cd373 ("hw/arm: introduce xenpvh machine") Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Pierrick Bouvier Reviewed-by: Richard Henderson Message-Id: <20250305153929.43687-2-philmd@linaro.org> (cherry picked from commit 3a11b653a63fee0e43f4ab84b93f068b961d8fe7) Signed-off-by: Michael Tokarev diff --git a/include/hw/xen/arch_hvm.h b/include/hw/xen/arch_hvm.h index c7c515220d..df39c819c8 100644 --- a/include/hw/xen/arch_hvm.h +++ b/include/hw/xen/arch_hvm.h @@ -1,5 +1,5 @@ #if defined(TARGET_I386) || defined(TARGET_X86_64) #include "hw/i386/xen_arch_hvm.h" -#elif defined(TARGET_ARM) || defined(TARGET_ARM_64) +#elif defined(TARGET_ARM) || defined(TARGET_AARCH64) #include "hw/arm/xen_arch_hvm.h" #endif