[Xen-changelog] [xen-unstable] hvm: buffered_ioreq does not need a 'df' field. Add explicit bitfield

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1196954268 0
# Node ID 381781af1d5ab454dd618039295cbbaea38ca592
# Parent  baf90ee3c1dab65f4a386521be6e108920622866
hvm: buffered_ioreq does not need a 'df' field. Add explicit bitfield
padding to ioreq and buf_ioreq structs.
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 tools/ioemu/target-i386-dm/helper2.c |    2 +-
 xen/arch/x86/hvm/intercept.c         |    1 -
 xen/include/public/hvm/ioreq.h       |    3 ++-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff -r baf90ee3c1da -r 381781af1d5a tools/ioemu/target-i386-dm/helper2.c
--- a/tools/ioemu/target-i386-dm/helper2.c      Thu Dec 06 13:56:00 2007 +0000
+++ b/tools/ioemu/target-i386-dm/helper2.c      Thu Dec 06 15:17:48 2007 +0000
@@ -556,7 +556,7 @@ void __handle_buffered_iopage(CPUState *
         req.data = buf_req->data;
         req.state = STATE_IOREQ_READY;
         req.dir = buf_req->dir;
-        req.df = buf_req->df;
+        req.df = 1;
         req.type = buf_req->type;
         req.data_is_ptr = 0;
         qw = (req.size == 8);
diff -r baf90ee3c1da -r 381781af1d5a xen/arch/x86/hvm/intercept.c
--- a/xen/arch/x86/hvm/intercept.c      Thu Dec 06 13:56:00 2007 +0000
+++ b/xen/arch/x86/hvm/intercept.c      Thu Dec 06 15:17:48 2007 +0000
@@ -176,7 +176,6 @@ int hvm_buffered_io_send(ioreq_t *p)
 
     bp.type = p->type;
     bp.dir  = p->dir;
-    bp.df   = p->df;
     switch ( p->size )
     {
     case 1:
diff -r baf90ee3c1da -r 381781af1d5a xen/include/public/hvm/ioreq.h
--- a/xen/include/public/hvm/ioreq.h    Thu Dec 06 13:56:00 2007 +0000
+++ b/xen/include/public/hvm/ioreq.h    Thu Dec 06 15:17:48 2007 +0000
@@ -58,6 +58,7 @@ struct ioreq {
                              *   of the real data to use.   */
     uint8_t dir:1;          /*  1=read, 0=write             */
     uint8_t df:1;
+    uint8_t pad:1;
     uint8_t type;           /* I/O type                     */
     uint8_t _pad0[6];
     uint64_t io_count;      /* How many IO done on a vcpu   */
@@ -79,7 +80,7 @@ typedef struct shared_iopage shared_iopa
 
 struct buf_ioreq {
     uint8_t  type;   /* I/O type                    */
-    uint8_t  df:1;   /* EFLAGS.DF                   */
+    uint8_t  pad:1;
     uint8_t  dir:1;  /* 1=read, 0=write             */
     uint8_t  size:2; /* 0=>1, 1=>2, 2=>4, 3=>8. If 8, use two buf_ioreqs */
     uint32_t addr:20;/* physical address            */

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog