Merge commit 'fd2f659ee3f6f991f4f194f3fde5c9f957fd663d' into upstream-merge

* commit 'fd2f659ee3f6f991f4f194f3fde5c9f957fd663d': (58 commits)
  Update version for 0.13.0-rc0
  vnc: better default values for VNC options
  vnc: tight: split send_sub_rect
  vnc: tight: fix rgb_prepare_row
  vnc: add missing lock for vnc_cursor_define()
  vnc: threaded VNC server
  qemu-thread: add qemu_mutex/cond_destroy and qemu_mutex_exit
  vnc: fix tight png memory leak
  vnc: encapsulate encoding members
  vnc: tight: stop using qdict for palette stuff
  vnc: tight: specific zlib level and filters for each compression level
  vnc: tight add PNG encoding
  vnc: tight: remove a memleak in send_jpeg_rect()
  vnc: tight: don't forget do at the last color
  vnc: rename vnc-encoding-* vnc-enc-*
  ui: move all ui components in ui/
  vnc: add lossy option
  vnc: JPEG should be disabled if the client don't set tight quality
  vnc: tight: add JPEG and gradient subencoding with smooth image detection
  Initial documentation for migration
  ...

Merge 0.13 branch point.

Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 1 insertions, 0 deletions

diff --git a/hw/scsi.h b/hw/scsi.h
index 4fbf1d5df..cb06d6d82 100644
--- a/hw/scsi.h
+++ b/hw/scsi.h
@@ -43,6 +43,7 @@ typedef struct SCSIRequest {
         enum SCSIXferMode mode;
     } cmd;
     BlockDriverAIOCB  *aiocb;
+    bool enqueued;
     QTAILQ_ENTRY(SCSIRequest) next;
 } SCSIRequest;