Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp2029345pxa; Mon, 3 Aug 2020 05:49:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJypPFGvCFL9/Uppp7TLx2TF480TTRZoYas2UFeyiX78l1568qXP8edxNRzvNFSZoYS4VBmz X-Received: by 2002:a05:6402:1a46:: with SMTP id bf6mr15396274edb.284.1596458946752; Mon, 03 Aug 2020 05:49:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1596458946; cv=none; d=google.com; s=arc-20160816; b=p48nI4bafx8Lz/QiU+/D26thV8x7C+AIs5eArTyEg6G/e+BmSyMfx8jTAer74Qk9Oe ll0OibdcUSaZUrcy/2zL8NvjSYEUAZtRdzee4n2qBdTqrSdJX6041467gUZIPFhdPIQx n2ev2J+IAlogNIzAUYQmzIUT8kMFsGssjOesTo5ffW52p17yEHAfXvtN4XnCysMknF+z XNUb0Rg1XMTppdvGBNCtiohfR6jVszy1iGl2k9xJl1REe1tPyY9znE3buuFn2wBd9//9 smRHfnPwqSe9Cf5DjARiNQs/ZDncNFt2oOjtOHJf7Y3rOvsXTZmODKjQDUnsHuIGRopm iFlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=Sk0TPXfrAiHCoNRk7J9IvpspjLkpgAhrnbuU+zE0ABg=; b=ymE+B9tHQ6mE5UvUmHOSa5wKU6PS+j17VgOy+g89URCYr1CJCh6ZC6H4ruCR4MQ1GW jKgZw+3ugdpQety8QSXvYKSNOlo4rt0BoizgLTNO1O/jPIN6DZo0d0xrhxYWnSjtvkGU F03FJ4rsE1MB4mxnNhppTFKglaE+Vo5iWBc+FmjqQjabDrBbqir3Fxaa6kCJeVEB1+sQ 12zzBBrgM7LEgAYRjEpqcvqbiHUzuh3lvTkUemU4HI7pc+qqVfz29DMn6tZbkU7AaDK5 HMYGkipzZcDq+OjBEnmfsmAbKQk60mRuqxOVHUAzTRYFOY2XQeDWEQLI+O4csvN4xWUI FjlA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=8bytes.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j12si2069417ejc.680.2020.08.03.05.48.44; Mon, 03 Aug 2020 05:49:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=8bytes.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728392AbgHCMpu (ORCPT + 99 others); Mon, 3 Aug 2020 08:45:50 -0400 Received: from 8bytes.org ([81.169.241.247]:34698 "EHLO theia.8bytes.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728537AbgHCM10 (ORCPT ); Mon, 3 Aug 2020 08:27:26 -0400 Received: by theia.8bytes.org (Postfix, from userid 1000) id AE694CA2; Mon, 3 Aug 2020 14:27:24 +0200 (CEST) From: Joerg Roedel To: Paolo Bonzini Cc: Sean Christopherson , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , Tom Lendacky , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Borislav Petkov , Joerg Roedel Subject: [PATCH v3 4/4] KVM: SVM: Use __packed shorthand Date: Mon, 3 Aug 2020 14:27:08 +0200 Message-Id: <20200803122708.5942-5-joro@8bytes.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200803122708.5942-1-joro@8bytes.org> References: <20200803122708.5942-1-joro@8bytes.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Borislav Petkov Use the shorthand to make it more readable. No functional changes. Signed-off-by: Borislav Petkov Signed-off-by: Joerg Roedel --- arch/x86/include/asm/svm.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/x86/include/asm/svm.h b/arch/x86/include/asm/svm.h index 71a308f1fbc8..f41b329943e5 100644 --- a/arch/x86/include/asm/svm.h +++ b/arch/x86/include/asm/svm.h @@ -150,14 +150,14 @@ struct __attribute__ ((__packed__)) vmcb_control_area { #define SVM_NESTED_CTL_NP_ENABLE BIT(0) #define SVM_NESTED_CTL_SEV_ENABLE BIT(1) -struct __attribute__ ((__packed__)) vmcb_seg { +struct vmcb_seg { u16 selector; u16 attrib; u32 limit; u64 base; -}; +} __packed; -struct __attribute__ ((__packed__)) vmcb_save_area { +struct vmcb_save_area { struct vmcb_seg es; struct vmcb_seg cs; struct vmcb_seg ss; @@ -231,9 +231,9 @@ struct __attribute__ ((__packed__)) vmcb_save_area { u64 xcr0; u8 valid_bitmap[16]; u64 x87_state_gpa; -}; +} __packed; -struct __attribute__ ((__packed__)) ghcb { +struct ghcb { struct vmcb_save_area save; u8 reserved_save[2048 - sizeof(struct vmcb_save_area)]; @@ -242,7 +242,7 @@ struct __attribute__ ((__packed__)) ghcb { u8 reserved_1[10]; u16 protocol_version; /* negotiated SEV-ES/GHCB protocol version */ u32 ghcb_usage; -}; +} __packed; static inline void __unused_size_checks(void) @@ -252,11 +252,11 @@ static inline void __unused_size_checks(void) BUILD_BUG_ON(sizeof(struct ghcb) != 4096); } -struct __attribute__ ((__packed__)) vmcb { +struct vmcb { struct vmcb_control_area control; u8 reserved_control[1024 - sizeof(struct vmcb_control_area)]; struct vmcb_save_area save; -}; +} __packed; #define SVM_CPUID_FUNC 0x8000000a -- 2.17.1