From patchwork Fri Oct 4 16:33:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1992880 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=AcIF0Ant; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XKvJq539rz1xtH for ; Sat, 5 Oct 2024 02:34:35 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1swlGC-0005W0-3g; Fri, 04 Oct 2024 12:34:32 -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 1swlG7-0004jR-Ks for qemu-devel@nongnu.org; Fri, 04 Oct 2024 12:34:27 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1swlG5-00066Q-Ti for qemu-devel@nongnu.org; Fri, 04 Oct 2024 12:34:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1728059665; 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=gUXOLixf54/Phpgl1bLqDDS7TZylxbd8N1kxNtuKv2s=; b=AcIF0AntI16NzRUjX/eOsh9RppQAv9oRQdqo3HjaHxJro+Eknd7HJcUetMgn8O777GqHLk EzglIrO+LyRcDbzVgrDyOoTWY29ZQGioCPXoxO5XFmg3YVnO9RGBhL3OjYBm2nKW3IPQRu O0QSIRYYKWncXNvr9vUJQtdu8d1SRIg= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-527---KYKEBQNUGgaixaPnpcpQ-1; Fri, 04 Oct 2024 12:34:24 -0400 X-MC-Unique: --KYKEBQNUGgaixaPnpcpQ-1 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-42cb635b108so15828705e9.2 for ; Fri, 04 Oct 2024 09:34:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728059662; x=1728664462; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gUXOLixf54/Phpgl1bLqDDS7TZylxbd8N1kxNtuKv2s=; b=DvtTT9LPVgjYsOl93qCOuManzDCUcfTkGrhnlzJ/ocDFi94YVkhuahmkJ1kWA/YNDi XacXL9xBBbRxZlo4SpdXEIElBJkCjJRMinFMVmVu2D7wf/yY3+Gmv2YxlCk/291dNuwW Z07zWmmZBY/Fp2ipkPjGHoB6S5oTrkjNq+TcqURyKRm1q8j8JMbXqG0W8LOLRV1BH2oS Zd0UzZDjb5ccHqf9Phzsd6nLuTLjXTqPc9pyKt8UoKacxQnbi9icndv36r4PbnyYxyzh twZlGs5LoWo4N7wOf6IhMYOC/qRebQR9km6BfkQG/4NW3wcyZSPf5DsVSKTGkVXd5Fpe 731Q== X-Gm-Message-State: AOJu0Yz51zlj0SxCAcqLDH3hUgLtwPbOMkq9iCcJCcgJxfGMAbv0V6pJ 4hFBor9txce7/mC81NWiFa95qs2BVGpOZ4VSYveX5fivKpiXSbFswaMjtJAP1flPMoEUpgBPYES 859OYOWZGx/nNQwGzRaIdieO4fsiHN/xNxPAK70MYz9AU2FTkCtn4PRrQBH0rN8r4IKT+LoteLG 9Csw5h2d06UP2c96jhKIFeI8M2Zj2EMJ9rUG4AD/4= X-Received: by 2002:a05:600c:19c6:b0:42f:8515:e47d with SMTP id 5b1f17b1804b1-42f85ab68femr26865725e9.11.1728059662440; Fri, 04 Oct 2024 09:34:22 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFPJd52gdJpiVPDM77fyImR7BVciNpcbGpdeHcj90FBsrO9t6PfIvqSBP0CJH77WRqij9RSng== X-Received: by 2002:a05:600c:19c6:b0:42f:8515:e47d with SMTP id 5b1f17b1804b1-42f85ab68femr26865515e9.11.1728059661948; Fri, 04 Oct 2024 09:34:21 -0700 (PDT) Received: from avogadro.local ([151.95.43.71]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42f86b4a38bsm19419185e9.39.2024.10.04.09.34.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Oct 2024 09:34:21 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: "Xin Li (Intel)" Subject: [PULL 01/23] target/i386: Delete duplicated macro definition CR4_FRED_MASK Date: Fri, 4 Oct 2024 18:33:53 +0200 Message-ID: <20241004163415.951106-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.46.1 In-Reply-To: <20241004163415.951106-1-pbonzini@redhat.com> References: <20241004163415.951106-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.146, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: "Xin Li (Intel)" Macro CR4_FRED_MASK is defined twice, delete one. Signed-off-by: Xin Li (Intel) Link: https://lore.kernel.org/r/20240807081813.735158-2-xin@zytor.com Signed-off-by: Paolo Bonzini --- target/i386/cpu.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 14edd57a37b..2bf37dd15e0 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -267,12 +267,6 @@ typedef enum X86Seg { #define CR4_FRED_MASK 0 #endif -#ifdef TARGET_X86_64 -#define CR4_FRED_MASK (1ULL << 32) -#else -#define CR4_FRED_MASK 0 -#endif - #define CR4_RESERVED_MASK \ (~(target_ulong)(CR4_VME_MASK | CR4_PVI_MASK | CR4_TSD_MASK \ | CR4_DE_MASK | CR4_PSE_MASK | CR4_PAE_MASK \