Merge branch 'upstream' into qemu

Conflicts:

	block.h
	linux-user/elfload.c

diff --cc block-raw-posix.c
Simple merge

diff --cc block-raw-win32.c
Simple merge

diff --cc block.c
Simple merge

diff --cc block.h
index 218c7901dbbb2f57598294ae6ca640508a152ad2,72c1c24bb469a13ba2edb25c329e6dd87f3d019f..77fec156bc6adab0ac67b1c1fc9d81391da58a93
--- 1/block.h
--- 2/block.h
+++ b/block.h
@@@ -47,10 -47,11 +47,14 @@@ typedef struct QEMUSnapshotInfo 
                                       use a disk image format on top of
                                       it (default for
                                       bdrv_file_open()) */
- #define BDRV_O_DIRECT      0x0020
+ #define BDRV_O_NOCACHE     0x0020 /* do not use the host page cache */
+ #define BDRV_O_CACHE_WB    0x0040 /* use write-back caching */
+ 
+ #define BDRV_O_CACHE_MASK  (BDRV_O_NOCACHE | BDRV_O_CACHE_WB)
+ 
 +#define BDRV_O_EXTENDABLE  0x0080 /* allow writes out of original size range;
 +                                   only effective for some drivers */
 +
  void bdrv_info(void);
  void bdrv_info_stats(void);
  

diff --cc configure
Simple merge

diff --cc elf_ops.h
Simple merge

diff --cc hw/scsi-disk.c
index d28776191487c2dc772b9fb934e13df9b8ca9170,f7aa6d7a4333bdad80d7e81f7865ec6bc224c7b4..a6dee502643e30db2e10c1d98d30bb16c5766cce
--- 1/hw/scsi-disk.c
--- 2/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@@ -276,16 -281,6 +281,16 @@@ static uint8_t *scsi_get_buf(SCSIDevic
      return r->dma_buf;
  }
  
-       scsi_command_complete(r, SENSE_HARDWARE_ERROR);
 +static void scsi_flush_cb(void *opaque, int ret) {
 +    SCSIRequest *r = opaque;
 +    if (ret) {
 +        BADF("IO error on flush: %s\n", strerror(-ret));
-       scsi_command_complete(r, SENSE_NO_SENSE);
++      scsi_command_complete(r, STATUS_CHECK_CONDITION, SENSE_HARDWARE_ERROR);
 +    } else {
++      scsi_command_complete(r, STATUS_GOOD, SENSE_NO_SENSE);
 +    }
 +}
 +
  /* Execute a scsi command.  Returns the length of the data expected by the
     command.  This will be Positive for data transfers from the device
     (eg. disk reads), negative for transfers to the device (eg. disk writes),

diff --cc monitor.c
Simple merge

diff --cc osdep.h
Simple merge

diff --cc qemu_socket.h
Simple merge

diff --cc target-ppc/translate_init.c
Simple merge

diff --cc usb-linux.c
Simple merge

diff --cc vl.c
Simple merge