From patchwork Sat Mar 15 07:42:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 873860 Delivered-To: patch@linaro.org Received: by 2002:a5d:4308:0:b0:38f:210b:807b with SMTP id h8csp1081530wrq; Sat, 15 Mar 2025 00:49:07 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXiPG0SdLtXFBqZ/GfCQgJ5xINzBj7ALJn3csCsUHDgpQI7IZOyUPCdf+2QUXll5wghu/0OQg==@linaro.org X-Google-Smtp-Source: AGHT+IEO+xBqFTYPSBkuD0ozvwYWmCTqWygzkm34CVJCZyegvWH+oqHG4Z5s8T679gUaWEVMk4B4 X-Received: by 2002:a05:622a:56:b0:472:28d:62b0 with SMTP id d75a77b69052e-476c81c4a77mr91617721cf.41.1742024947428; Sat, 15 Mar 2025 00:49:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742024947; cv=none; d=google.com; s=arc-20240605; b=F6p8mRU+9k1/uRtyLWeQJ0hpNNwZowjlU774RVK/0PZB1i4w/uy1E+Vcyu1PAlAo5w 03hxeSgcC5AgkwKXCziwO+7IfP8UkW4r/QT4zEGzcC4Rgh9zhKM+fkSEHmEMxGhGXqEl olHtVHzF3Hl84MZ4JvJIEEPhHfSGAFz3ZcZwXlswLHEwiX/pJxPtzuRN2+8Q5q736PQc SPZsdbS/Z6mDCnvzQU0EIBPOVCK4dwofGd831EQxiUJW9ipMnfleTLx+LA48sfCIcwSn Lo1qFoKps0crHfN56mDhDGJSyKW5b6BoGV+0lA9KZmcrcGsxd7z+UG/t+7im/wpU27o9 2HAA== 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=DcXA7rwSgEM8Ua6cGy8ReLPwrFg6ONUsFUPvEQP2bciaZjb8bqyX9un4zMcW31p4XV RQ0aFPR5t7LHELn+LJYS0GerBzgQpwxwbBzQd+AG8S7vCsY80Pt+GlvlLC2wvVngPw7M Uah9yMVAxQ7sHheheQkHLWT9GWpL4+ZPOLIzO3exsKqUD1AP/LEHkwW9DDpbFuDMwnyf mitZUJuOddJqokSXr4cFdS7GhWbVUbizAEoMskx2uV6XV7XjYRC58gbS8kr7Outp8QT1 98UEnNdvCYJPewTa3lOX+/X2hnbfZtSgMiyzjkE7tTP5aoqRIeI+8tCEuBzgqrHpD5W7 Ek8g==; 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 d75a77b69052e-476bb617cc6si51230581cf.10.2025.03.15.00.49.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 15 Mar 2025 00:49:07 -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 1ttME5-0003ox-6m; Sat, 15 Mar 2025 03:46:33 -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 1ttME0-0003bR-8T; Sat, 15 Mar 2025 03:46:29 -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 1ttMDy-0005M0-LW; Sat, 15 Mar 2025 03:46:27 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 26A9EFFB1B; Sat, 15 Mar 2025 10:41:56 +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 157031CACE5; Sat, 15 Mar 2025 10:42:50 +0300 (MSK) Received: by gandalf.tls.msk.ru (Postfix, from userid 1000) id B617255A22; Sat, 15 Mar 2025 10:42:49 +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-8.2.10 39/42] hw/xen/hvm: Fix Aarch64 typo Date: Sat, 15 Mar 2025 10:42:41 +0300 Message-Id: <20250315074249.634718-39-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