Module Name: src
Committed By: jdolecek
Date: Sun Apr 19 11:01:36 UTC 2020
Modified Files:
src/sys/external/mit/xen-include-public/dist/xen/include/public/io:
blkif.h
Log Message:
revert previous, it actually doesn't help so no reason to diverge from xen
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/mit/xen-include-public/dist/xen/include/public/io/blkif.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/mit/xen-include-public/dist/xen/include/public/io/blkif.h
diff -u src/sys/external/mit/xen-include-public/dist/xen/include/public/io/blkif.h:1.2 src/sys/external/mit/xen-include-public/dist/xen/include/public/io/blkif.h:1.3
--- src/sys/external/mit/xen-include-public/dist/xen/include/public/io/blkif.h:1.2 Thu Apr 16 15:58:13 2020
+++ src/sys/external/mit/xen-include-public/dist/xen/include/public/io/blkif.h Sun Apr 19 11:01:35 2020
@@ -653,20 +653,14 @@ struct blkif_request_indirect {
uint8_t operation; /* BLKIF_OP_INDIRECT */
uint8_t indirect_op; /* BLKIF_OP_{READ/WRITE} */
uint16_t nr_segments; /* number of segments */
-#ifndef __i386__
- uint32_t _pad1;
-#endif
uint64_t id; /* private guest value, echoed in resp */
blkif_sector_t sector_number;/* start sector idx on disk (r/w only) */
blkif_vdev_t handle; /* same as for read/write requests */
- uint16_t _pad2;
grant_ref_t indirect_grefs[BLKIF_MAX_INDIRECT_PAGES_PER_REQUEST];
-#ifndef __i386__
- uint32_t _pad3; /* Make it 64 byte aligned */
-#else
- uint64_t _pad3; /* Make it 64 byte aligned */
+#ifdef __i386__
+ uint64_t pad; /* Make it 64 byte aligned on i386 */
#endif
-} __packed;
+};
typedef struct blkif_request_indirect blkif_request_indirect_t;
struct blkif_response {
