[src/trunk]: src/sys/external/mit/xen-include-public/dist/xen/include/public/...

[jdolecek <jdolecek%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9d2b864ddac1
branches:  trunk
changeset: 930976:9d2b864ddac1
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Sun Apr 19 11:01:35 2020 +0000

description:
revert previous, it actually doesn't help so no reason to diverge from xen

diffstat:

 sys/external/mit/xen-include-public/dist/xen/include/public/io/blkif.h |  12 ++-------
 1 files changed, 3 insertions(+), 9 deletions(-)

diffs (27 lines):

diff -r 4f8af12cf175 -r 9d2b864ddac1 sys/external/mit/xen-include-public/dist/xen/include/public/io/blkif.h
--- a/sys/external/mit/xen-include-public/dist/xen/include/public/io/blkif.h    Sun Apr 19 08:59:53 2020 +0000
+++ b/sys/external/mit/xen-include-public/dist/xen/include/public/io/blkif.h    Sun Apr 19 11:01:35 2020 +0000
@@ -653,20 +653,14 @@
     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 {