Skip to content

Commit

Permalink
Staging: hv: replaced __attribute((packed)) with __packed
Browse files Browse the repository at this point in the history 
Replaced __attribute((packed)) with __packed as it's preferred

Signed-off-by: Timo von Holtz <tvh@informatik.uni-kiel.de>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Cc: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Timo von Holtz authored and Greg Kroah-Hartman committed Feb 9, 2011
1 parent 56463de commit 3c4a941
Show file tree
Hide file tree
Showing 8 changed files with 55 additions and 55 deletions.
4 changes: 2 additions & 2 deletions drivers/staging/hv/channel.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ struct vmbus_channel_packet_page_buffer {
u32 reserved;
u32 rangecount;
struct hv_page_buffer range[MAX_PAGE_BUFFER_COUNT];
} __attribute__((packed));
} __packed;

/* The format must be the same as struct vmdata_gpa_direct */
struct vmbus_channel_packet_multipage_buffer {
Expand All @@ -49,7 +49,7 @@ struct vmbus_channel_packet_multipage_buffer {
u32 reserved;
u32 rangecount; /* Always 1 in this case */
struct hv_multipage_buffer range;
} __attribute__((packed));
} __packed;


extern int vmbus_open(struct vmbus_channel *channel,
Expand Down
36 changes: 18 additions & 18 deletions drivers/staging/hv/channel_mgmt.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,19 +60,19 @@ enum vmbus_channel_message_type {
struct vmbus_channel_message_header {
enum vmbus_channel_message_type msgtype;
u32 padding;
} __attribute__((packed));
} __packed;

/* Query VMBus Version parameters */
struct vmbus_channel_query_vmbus_version {
struct vmbus_channel_message_header header;
u32 version;
} __attribute__((packed));
} __packed;

/* VMBus Version Supported parameters */
struct vmbus_channel_version_supported {
struct vmbus_channel_message_header header;
bool version_supported;
} __attribute__((packed));
} __packed;

/* Offer Channel parameters */
struct vmbus_channel_offer_channel {
Expand All @@ -81,13 +81,13 @@ struct vmbus_channel_offer_channel {
u32 child_relid;
u8 monitorid;
bool monitor_allocated;
} __attribute__((packed));
} __packed;

/* Rescind Offer parameters */
struct vmbus_channel_rescind_offer {
struct vmbus_channel_message_header header;
u32 child_relid;
} __attribute__((packed));
} __packed;

/*
* Request Offer -- no parameters, SynIC message contains the partition ID
Expand Down Expand Up @@ -123,21 +123,21 @@ struct vmbus_channel_open_channel {

/* User-specific data to be passed along to the server endpoint. */
unsigned char userdata[MAX_USER_DEFINED_BYTES];
} __attribute__((packed));
} __packed;

/* Open Channel Result parameters */
struct vmbus_channel_open_result {
struct vmbus_channel_message_header header;
u32 child_relid;
u32 openid;
u32 status;
} __attribute__((packed));
} __packed;

/* Close channel parameters; */
struct vmbus_channel_close_channel {
struct vmbus_channel_message_header header;
u32 child_relid;
} __attribute__((packed));
} __packed;

/* Channel Message GPADL */
#define GPADL_TYPE_RING_BUFFER 1
Expand All @@ -157,53 +157,53 @@ struct vmbus_channel_gpadl_header {
u16 range_buflen;
u16 rangecount;
struct gpa_range range[0];
} __attribute__((packed));
} __packed;

/* This is the followup packet that contains more PFNs. */
struct vmbus_channel_gpadl_body {
struct vmbus_channel_message_header header;
u32 msgnumber;
u32 gpadl;
u64 pfn[0];
} __attribute__((packed));
} __packed;

struct vmbus_channel_gpadl_created {
struct vmbus_channel_message_header header;
u32 child_relid;
u32 gpadl;
u32 creation_status;
} __attribute__((packed));
} __packed;

struct vmbus_channel_gpadl_teardown {
struct vmbus_channel_message_header header;
u32 child_relid;
u32 gpadl;
} __attribute__((packed));
} __packed;

struct vmbus_channel_gpadl_torndown {
struct vmbus_channel_message_header header;
u32 gpadl;
} __attribute__((packed));
} __packed;

#ifdef VMBUS_FEATURE_PARENT_OR_PEER_MEMORY_MAPPED_INTO_A_CHILD
struct vmbus_channel_view_range_add {
struct vmbus_channel_message_header header;
PHYSICAL_ADDRESS viewrange_base;
u64 viewrange_length;
u32 child_relid;
} __attribute__((packed));
} __packed;

struct vmbus_channel_view_range_remove {
struct vmbus_channel_message_header header;
PHYSICAL_ADDRESS viewrange_base;
u32 child_relid;
} __attribute__((packed));
} __packed;
#endif

struct vmbus_channel_relid_released {
struct vmbus_channel_message_header header;
u32 child_relid;
} __attribute__((packed));
} __packed;

struct vmbus_channel_initiate_contact {
struct vmbus_channel_message_header header;
Expand All @@ -212,12 +212,12 @@ struct vmbus_channel_initiate_contact {
u64 interrupt_page;
u64 monitor_page1;
u64 monitor_page2;
} __attribute__((packed));
} __packed;

struct vmbus_channel_version_response {
struct vmbus_channel_message_header header;
bool version_supported;
} __attribute__((packed));
} __packed;

enum vmbus_channel_state {
CHANNEL_OFFER_STATE,
Expand Down
26 changes: 13 additions & 13 deletions drivers/staging/hv/netvsc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ struct nvsp_message_header {
struct nvsp_message_init {
u32 min_protocol_ver;
u32 max_protocol_ver;
} __attribute__((packed));
} __packed;

/*
* This message is used by the VSP to complete the initialization of the
Expand All @@ -103,12 +103,12 @@ struct nvsp_message_init_complete {
u32 negotiated_protocol_ver;
u32 max_mdl_chain_len;
u32 status;
} __attribute__((packed));
} __packed;

union nvsp_message_init_uber {
struct nvsp_message_init init;
struct nvsp_message_init_complete init_complete;
} __attribute__((packed));
} __packed;

/* Version 1 Messages */

Expand All @@ -119,7 +119,7 @@ union nvsp_message_init_uber {
struct nvsp_1_message_send_ndis_version {
u32 ndis_major_ver;
u32 ndis_minor_ver;
} __attribute__((packed));
} __packed;

/*
* This message is used by the VSC to send a receive buffer to the VSP. The VSP
Expand All @@ -128,14 +128,14 @@ struct nvsp_1_message_send_ndis_version {
struct nvsp_1_message_send_receive_buffer {
u32 gpadl_handle;
u16 id;
} __attribute__((packed));
} __packed;

struct nvsp_1_receive_buffer_section {
u32 offset;
u32 sub_alloc_size;
u32 num_sub_allocs;
u32 end_offset;
} __attribute__((packed));
} __packed;

/*
* This message is used by the VSP to acknowledge a receive buffer send by the
Expand Down Expand Up @@ -166,7 +166,7 @@ struct nvsp_1_message_send_receive_buffer_complete {
*/

struct nvsp_1_receive_buffer_section sections[1];
} __attribute__((packed));
} __packed;

/*
* This message is sent by the VSC to revoke the receive buffer. After the VSP
Expand All @@ -184,7 +184,7 @@ struct nvsp_1_message_revoke_receive_buffer {
struct nvsp_1_message_send_send_buffer {
u32 gpadl_handle;
u16 id;
} __attribute__((packed));
} __packed;

/*
* This message is used by the VSP to acknowledge a send buffer sent by the
Expand All @@ -201,7 +201,7 @@ struct nvsp_1_message_send_send_buffer_complete {
* decreases.
*/
u32 section_size;
} __attribute__((packed));
} __packed;

/*
* This message is sent by the VSC to revoke the send buffer. After the VSP
Expand Down Expand Up @@ -231,7 +231,7 @@ struct nvsp_1_message_send_rndis_packet {
*/
u32 send_buf_section_index;
u32 send_buf_section_size;
} __attribute__((packed));
} __packed;

/*
* This message is used by both the VSP and the VSC to complete a RNDIS message
Expand All @@ -257,18 +257,18 @@ union nvsp_1_message_uber {
struct nvsp_1_message_send_rndis_packet send_rndis_pkt;
struct nvsp_1_message_send_rndis_packet_complete
send_rndis_pkt_complete;
} __attribute__((packed));
} __packed;

union nvsp_all_messages {
union nvsp_message_init_uber init_msg;
union nvsp_1_message_uber v1_msg;
} __attribute__((packed));
} __packed;

/* ALL Messages */
struct nvsp_message {
struct nvsp_message_header hdr;
union nvsp_all_messages msg;
} __attribute__((packed));
} __packed;



Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/hv/ring_buffer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ struct hv_ring_buffer {
* !!! DO NOT place any fields below this !!!
*/
u8 buffer[0];
} __attribute__((packed));
} __packed;

struct hv_ring_buffer_info {
struct hv_ring_buffer *ring_buffer;
Expand Down
14 changes: 7 additions & 7 deletions drivers/staging/hv/utils.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@
struct vmbuspipe_hdr {
u32 flags;
u32 msgsize;
} __attribute__((packed));
} __packed;

struct ic_version {
u16 major;
u16 minor;
} __attribute__((packed));
} __packed;

struct icmsg_hdr {
struct ic_version icverframe;
Expand All @@ -59,26 +59,26 @@ struct icmsg_hdr {
u8 ictransaction_id;
u8 icflags;
u8 reserved[2];
} __attribute__((packed));
} __packed;

struct icmsg_negotiate {
u16 icframe_vercnt;
u16 icmsg_vercnt;
u32 reserved;
struct ic_version icversion_data[1]; /* any size array */
} __attribute__((packed));
} __packed;

struct shutdown_msg_data {
u32 reason_code;
u32 timeout_seconds;
u32 flags;
u8 display_message[2048];
} __attribute__((packed));
} __packed;

struct heartbeat_msg_data {
u64 seq_num;
u32 reserved[8];
} __attribute__((packed));
} __packed;

/* Time Sync IC defs */
#define ICTIMESYNCFLAG_PROBE 0
Expand All @@ -96,7 +96,7 @@ struct ictimesync_data{
u64 childtime;
u64 roundtriptime;
u8 flags;
} __attribute__((packed));
} __packed;

/* Index for each IC struct in array hv_cb_utils[] */
#define HV_SHUTDOWN_MSG 0
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/hv/vmbus_channel_interface.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ struct vmbus_channel_offer {
} pipe;
} u;
u32 padding;
} __attribute__((packed));
} __packed;

/* Server Flags */
#define VMBUS_CHANNEL_ENUMERATE_DEVICE_INTERFACE 1
Expand Down
Loading

0 comments on commit 3c4a941

Please sign in to comment.