Merge branch 'qemu'

Conflicts:

	block.c
	hw/scsi-disk.c
	vl.c

diff --cc Makefile.target
Simple merge

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

diff --cc block.c
index 4676e10dd51cbe9b64e84d3267ad0946e82bec45,e02104bf9b8ab2aafb75c333765e8360e366023e..64e7c3edc789e39460dcafbdb76e4fb32d19e32d
--- 1/block.c
--- 2/block.c
+++ b/block.c
@@@ -479,7 -459,7 +479,7 @@@ int bdrv_open2(BlockDriverState *bs, co
          }
          path_combine(backing_filename, sizeof(backing_filename),
                       filename, bs->backing_file);
-         if (bdrv_open2(bs->backing_hd, backing_filename, 0, &bdrv_raw) < 0)
 -        if (bdrv_open(bs->backing_hd, backing_filename, open_flags) < 0)
++        if (bdrv_open2(bs->backing_hd, backing_filename, open_flags, &bdrv_raw) < 0)
              goto fail;
      }
  

diff --cc configure
Simple merge

diff --cc hw/scsi-disk.c
index 471081e50a9fa1d71a2439a3c9fa6fe83acb7687,a6dee502643e30db2e10c1d98d30bb16c5766cce..974a826b5b4371d51d203290b36e54940a297871
--- 1/hw/scsi-disk.c
--- 2/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@@ -34,12 -34,10 +34,15 @@@ do { fprintf(stderr, "scsi-disk: " fmt 
  #define SENSE_HARDWARE_ERROR  4
  #define SENSE_ILLEGAL_REQUEST 5
  
+ #define STATUS_GOOD            0
+ #define STATUS_CHECK_CONDITION 2
+ 
 +#ifdef CONFIG_STUBDOM
 +#include <xen/io/blkif.h>
 +#define SCSI_DMA_BUF_SIZE    ((BLKIF_MAX_SEGMENTS_PER_REQUEST - 1) * PAGE_SIZE)
 +#else
  #define SCSI_DMA_BUF_SIZE    131072
 +#endif
  
  typedef struct SCSIRequest {
      SCSIDeviceState *dev;

diff --cc hw/vga.c
Simple merge

diff --cc monitor.c
Simple merge

diff --cc sysemu.h
Simple merge

diff --cc vl.c
index c2e5ab410554af885912e846d776408b15105f30,393459847f52a4c1c0360cdc98248628a37a173d..bdddb600225a55ec558141500b3f45539582e55d
--- 1/vl.c
--- 2/vl.c
+++ b/vl.c
@@@ -39,10 -38,9 +39,11 @@@
  #include "qemu-char.h"
  #include "block.h"
  #include "audio/audio.h"
 +#include "qemu-xen.h"
+ #include "migration.h"
  
  #include <unistd.h>
 +#include <stdlib.h>
  #include <fcntl.h>
  #include <signal.h>
  #include <time.h>
@@@ -3390,8 -3345,7 +3390,7 @@@ static void udp_chr_update_read_handler
      }
  }
  
- int parse_host_port(struct sockaddr_in *saddr, const char *str);
 -#ifndef _WIN32
 +#ifndef NO_UNIX_SOCKETS
  static int parse_unix_path(struct sockaddr_un *uaddr, const char *str);
  #endif
  int parse_host_src_port(struct sockaddr_in *haddr,
@@@ -8840,35 -8771,8 +8924,36 @@@ int main(int argc, char **argv
      const char *pid_file = NULL;
      VLANState *vlan;
      int autostart;
+     const char *incoming = NULL;
  
 +    logfile = stderr; /* initial value */
 +
 +#if !defined(__sun__) && !defined(CONFIG_STUBDOM)
 +    /* Maximise rlimits. Needed where default constraints are tight (*BSD). */
 +    if (getrlimit(RLIMIT_STACK, &rl) != 0) {
 +       perror("getrlimit(RLIMIT_STACK)");
 +       exit(1);
 +    }
 +    rl.rlim_cur = rl.rlim_max;
 +    if (setrlimit(RLIMIT_STACK, &rl) != 0)
 +       perror("setrlimit(RLIMIT_STACK)");
 +    if (getrlimit(RLIMIT_DATA, &rl) != 0) {
 +       perror("getrlimit(RLIMIT_DATA)");
 +       exit(1);
 +    }
 +    rl.rlim_cur = rl.rlim_max;
 +    if (setrlimit(RLIMIT_DATA, &rl) != 0)
 +       perror("setrlimit(RLIMIT_DATA)");
 +    rl.rlim_cur = RLIM_INFINITY;
 +    rl.rlim_max = RLIM_INFINITY;
 +    if (setrlimit(RLIMIT_RSS, &rl) != 0)
 +       perror("setrlimit(RLIMIT_RSS)");
 +    rl.rlim_cur = RLIM_INFINITY;
 +    rl.rlim_max = RLIM_INFINITY;
 +    if (setrlimit(RLIMIT_MEMLOCK, &rl) != 0)
 +       perror("setrlimit(RLIMIT_MEMLOCK)");
 + #endif
 + 
      LIST_INIT (&vm_change_state_head);
  #ifndef _WIN32
      {