Drivers: hv: util: make struct hv_do_fcopy match Hyper-V host messages

An attempt to fix fcopy on i586 (bc5a5b0 Drivers: hv: util: Properly pack the data for file copy functionality) led to a regression on x86_64 (and actually didn't fix i586 breakage). Fcopy messages from Hyper-V host come in the following format: struct do_fcopy_hdr | 36 bytes 0000 | 4 bytes offset | 8 bytes size | 4 bytes data | 6144 bytes On x86_64 struct hv_do_fcopy matched this format without ' __attribute__((packed))' and on i586 adding ' __attribute__((packed))' to it doesn't change anything. Keep the structure packed and add padding to match re reality. Tested both i586 and x86_64 on Hyper-V Server 2012 R2.

Vitaly Kuznetsov committed 12 years ago

Commit 31d4ea11 parent 170f4be1 file · +1 −0Browse files

Unified · Split

include/uapi/linux/hyperv.h+1−0

@@ -134,6 +134,7 @@ struct hv_start_fcopy { · 133 unmodified lines
134		134
135	struct hv_do_fcopy {	135	struct hv_do_fcopy {
136	struct hv_fcopy_hdr hdr;	136	struct hv_fcopy_hdr hdr;
		137	__u32 pad;
137	__u64 offset;	138	__u64 offset;
138	__u32 size;	139	__u32 size;
139	__u8 data[DATA_FRAGMENT];	140	__u8 data[DATA_FRAGMENT];