]> git.proxmox.com Git - qemu.git/commitdiff
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 6 Jan 2012 18:51:21 +0000 (12:51 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 6 Jan 2012 18:51:21 +0000 (12:51 -0600)
* stefanha/trivial-patches:
  qemu-nbd: drop loop which can never loop
  Make python mandatory
  net/socket.c: Fix fd leak in net_socket_listen_init() error paths
  gdbstub: Fix fd leak in gdbserver_open() error path
  configure: Fix test for supported host CPU type
  configure: CONFIG_QEMU_INTERP_PREFIX only for user mode
  scsi virtio-blk usb-msd: Clean up device init error messages
  Strip trailing '\n' from error_report()'s first argument (again)
  qemu-options.hx: fix tls-channel help text

1  2 
configure
hw/usb-msd.c
qemu-options.hx

diff --cc configure
Simple merge
diff --cc hw/usb-msd.c
Simple merge
diff --cc qemu-options.hx
Simple merge