Received: by 2002:a25:ca44:0:0:0:0:0 with SMTP id a65csp1120299ybg; Wed, 29 Jul 2020 06:24:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyN+dPz8JQutkDKKli1oha2XiPd9ZodfHXujjMnVbWWGQVmc9tPljARUwdJ7VzFgjjJmMxU X-Received: by 2002:aa7:d411:: with SMTP id z17mr4546874edq.85.1596029087233; Wed, 29 Jul 2020 06:24:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1596029087; cv=none; d=google.com; s=arc-20160816; b=OxzopGKWI5RgM3ooYyGW3oxoalyuy8LLjXnr+9HB2kh0ISRUhPUkcZyrXfWMm+IY3K En5L7zRwqL5Fbds6jNYNKWX5v9rF9zzolR+AySxwHmDDHlQuq0hXxOc86SaI6wOSkUtr brrOQwr2KneaNENZYcBs16mBFi4Q5duIZyNsgJiovjCIMXL3cQFzJigFH3LbkFGeJ9Pb ejwJ5EznMPZARSqWR5p0bO2zLLMAXsdfmiICN6DYd+mUKcrx+T3nMYzEVSVOi2eljpnd U9zTyq8dquqe4P4V9NL64zzm5cQrFQGj6KIn5vS2YChXMntt36/kb4EyPsAtIthOaiTw WtbA== 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=LZ1oPV+XGqtgxoqDK1a/TPbKOAeqJqGIoJiIPK6K9O0=; b=EgTlsThatk087rb1ZrozdcsCn5N4NRHjAyXOMNHiBxYf6o9Curqlk9oUwbANTV7aoo NHyu0/qyVU4QJKJFho1oB9zqVv0aersNMM5ldIMDMw63UZ0QmJ3+T/iyErK8XSJR8rF3 qLh+CVdyjbu26EzseM+/ZhT3LfVh7ffzXQuH5ODaIJw8fSJJWA2v0MHnrYbdPQhrwe0X 84wEbmwkrBdO0y5F8V+Dj6kz4TRegcmWzKj1qMzONneb30AhgUD+5BIU2Y+XT91LEL4c Z8Ld+cpDJmmeQrTgvB36wn200tGGISb3PgET6QwkqLQMPWCt7JHTd4JevwWTjgKhvPhR fWEg== 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 gq12si1167456ejb.428.2020.07.29.06.24.24; Wed, 29 Jul 2020 06:24:47 -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 S1727071AbgG2NXJ (ORCPT + 99 others); Wed, 29 Jul 2020 09:23:09 -0400 Received: from 8bytes.org ([81.169.241.247]:33836 "EHLO theia.8bytes.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727022AbgG2NWs (ORCPT ); Wed, 29 Jul 2020 09:22:48 -0400 Received: by theia.8bytes.org (Postfix, from userid 1000) id A71C27CB; Wed, 29 Jul 2020 15:22:45 +0200 (CEST) From: Joerg Roedel To: Paolo Bonzini Cc: Sean Christopherson , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Borislav Petkov , Joerg Roedel Subject: [PATCH 4/4] KVM: SVM: Use __packed shorthand Date: Wed, 29 Jul 2020 15:22:34 +0200 Message-Id: <20200729132234.2346-5-joro@8bytes.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200729132234.2346-1-joro@8bytes.org> References: <20200729132234.2346-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: 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 0420250b008b..af91ced0f370 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