Merge remote-tracking branch 'stefanha/block' into staging

# By Paolo Bonzini (17) and others
# Via Stefan Hajnoczi
* stefanha/block: (48 commits)
  qemu-iotests: filter QEMU monitor \r\n
  aio: make aio_poll(ctx, true) block with no fds
  block: clean up bdrv_drain_all() throttling comments
  qcow2: use start_of_cluster() and offset_into_cluster() everywhere
  qemu-img: decrease progress update interval on convert
  qemu-img: round down request length to an aligned sector
  qemu-img: dynamically adjust iobuffer size during convert
  block/iscsi: set bs->bl.opt_transfer_length
  block: add opt_transfer_length to BlockLimits
  block/iscsi: set bdi->cluster_size
  qemu-img: fix usage instruction for qemu-img convert
  qemu-img: add support for skipping zeroes in input during convert
  qemu-nbd: add doc for option -f
  qemu-iotests: add test for snapshot in qemu-img convert
  qemu-img: add -l for snapshot in convert
  qemu-iotests: add 058 internal snapshot export with qemu-nbd case
  qemu-nbd: support internal snapshot export
  snapshot: distinguish id and name in load_tmp
  qemu-iotests: Split qcow2 only cases in 048
  qemu-iotests: Clean up spaces in usage output
  ...

Message-id: 1386347807-27359-1-git-send-email-stefanha@redhat.com
Signed-off-by: Anthony Liguori <aliguori@amazon.com>

diff --combined trace-events
index e78a8d30171f374fc7099855025ddc0f95298e69,e32d00cefbd1abd5db665f0dda0a6433a0434f86..9f4456a82e290caf3ad8958d721493a5f57d2d23
--- 1/trace-events
--- 2/trace-events
+++ b/trace-events
@@@ -60,11 -60,12 +60,12 @@@ bdrv_aio_discard(void *bs, int64_t sect
  bdrv_aio_flush(void *bs, void *opaque) "bs %p opaque %p"
  bdrv_aio_readv(void *bs, int64_t sector_num, int nb_sectors, void *opaque) "bs %p sector_num %"PRId64" nb_sectors %d opaque %p"
  bdrv_aio_writev(void *bs, int64_t sector_num, int nb_sectors, void *opaque) "bs %p sector_num %"PRId64" nb_sectors %d opaque %p"
+ bdrv_aio_write_zeroes(void *bs, int64_t sector_num, int nb_sectors, int flags, void *opaque) "bs %p sector_num %"PRId64" nb_sectors %d flags %#x opaque %p"
  bdrv_lock_medium(void *bs, bool locked) "bs %p locked %d"
  bdrv_co_readv(void *bs, int64_t sector_num, int nb_sector) "bs %p sector_num %"PRId64" nb_sectors %d"
  bdrv_co_copy_on_readv(void *bs, int64_t sector_num, int nb_sector) "bs %p sector_num %"PRId64" nb_sectors %d"
  bdrv_co_writev(void *bs, int64_t sector_num, int nb_sector) "bs %p sector_num %"PRId64" nb_sectors %d"
- bdrv_co_write_zeroes(void *bs, int64_t sector_num, int nb_sector) "bs %p sector_num %"PRId64" nb_sectors %d"
+ bdrv_co_write_zeroes(void *bs, int64_t sector_num, int nb_sector, int flags) "bs %p sector_num %"PRId64" nb_sectors %d flags %#x"
  bdrv_co_io_em(void *bs, int64_t sector_num, int nb_sectors, int is_write, void *acb) "bs %p sector_num %"PRId64" nb_sectors %d is_write %d acb %p"
  bdrv_co_do_copy_on_readv(void *bs, int64_t sector_num, int nb_sectors, int64_t cluster_sector_num, int cluster_nb_sectors) "bs %p sector_num %"PRId64" nb_sectors %d cluster_sector_num %"PRId64" cluster_nb_sectors %d"
  
@@@ -127,6 -128,7 +128,7 @@@ thread_pool_cancel(void *req, void *opa
  
  # block/raw-win32.c
  # block/raw-posix.c
+ paio_submit_co(int64_t sector_num, int nb_sectors, int type) "sector_num %"PRId64" nb_sectors %d type %d"
  paio_submit(void *acb, void *opaque, int64_t sector_num, int nb_sectors, int type) "acb %p opaque %p sector_num %"PRId64" nb_sectors %d type %d"
  
  # ioport.c
@@@ -309,9 -311,6 +311,9 @@@ usb_ehci_sitd(uint32_t addr, uint32_t n
  usb_ehci_port_attach(uint32_t port, const char *owner, const char *device) "attach port #%d, owner %s, device %s"
  usb_ehci_port_detach(uint32_t port, const char *owner) "detach port #%d, owner %s"
  usb_ehci_port_reset(uint32_t port, int enable) "reset port #%d - %d"
 +usb_ehci_port_suspend(uint32_t port) "port #%d"
 +usb_ehci_port_wakeup(uint32_t port) "port #%d"
 +usb_ehci_port_resume(uint32_t port) "port #%d"
  usb_ehci_queue_action(void *q, const char *action) "q %p: %s"
  usb_ehci_packet_action(void *q, void *p, const char *action) "q %p p %p: %s"
  usb_ehci_irq(uint32_t level, uint32_t frindex, uint32_t sts, uint32_t mask) "level %d, frindex 0x%04x, sts 0x%x, mask 0x%x"
@@@ -430,32 -429,45 +432,32 @@@ usb_uas_tmf_abort_task(int addr, uint16
  usb_uas_tmf_logical_unit_reset(int addr, uint16_t tag, int lun) "dev %d, tag 0x%x, lun %d"
  usb_uas_tmf_unsupported(int addr, uint16_t tag, uint32_t function) "dev %d, tag 0x%x, function 0x%x"
  
 -# hw/usb/host-linux.c
  # hw/usb/host-libusb.c
  usb_host_open_started(int bus, int addr) "dev %d:%d"
  usb_host_open_success(int bus, int addr) "dev %d:%d"
  usb_host_open_failure(int bus, int addr) "dev %d:%d"
 -usb_host_disconnect(int bus, int addr) "dev %d:%d"
  usb_host_close(int bus, int addr) "dev %d:%d"
  usb_host_attach_kernel(int bus, int addr, int interface) "dev %d:%d, if %d"
  usb_host_detach_kernel(int bus, int addr, int interface) "dev %d:%d, if %d"
  usb_host_set_address(int bus, int addr, int config) "dev %d:%d, address %d"
  usb_host_set_config(int bus, int addr, int config) "dev %d:%d, config %d"
  usb_host_set_interface(int bus, int addr, int interface, int alt) "dev %d:%d, interface %d, alt %d"
 -usb_host_claim_interfaces(int bus, int addr, int config, int nif) "dev %d:%d, config %d, nif %d"
  usb_host_claim_interface(int bus, int addr, int config, int interface) "dev %d:%d, config %d, if %d"
 -usb_host_release_interfaces(int bus, int addr) "dev %d:%d"
  usb_host_release_interface(int bus, int addr, int interface) "dev %d:%d, if %d"
  usb_host_req_control(int bus, int addr, void *p, int req, int value, int index) "dev %d:%d, packet %p, req 0x%x, value %d, index %d"
  usb_host_req_data(int bus, int addr, void *p, int in, int ep, int size) "dev %d:%d, packet %p, in %d, ep %d, size %d"
  usb_host_req_complete(int bus, int addr, void *p, int status, int length) "dev %d:%d, packet %p, status %d, length %d"
  usb_host_req_emulated(int bus, int addr, void *p, int status) "dev %d:%d, packet %p, status %d"
  usb_host_req_canceled(int bus, int addr, void *p) "dev %d:%d, packet %p"
 -usb_host_urb_submit(int bus, int addr, void *aurb, int length, int more) "dev %d:%d, aurb %p, length %d, more %d"
 -usb_host_urb_complete(int bus, int addr, void *aurb, int status, int length, int more) "dev %d:%d, aurb %p, status %d, length %d, more %d"
 -usb_host_urb_canceled(int bus, int addr, void *aurb) "dev %d:%d, aurb %p"
 -usb_host_ep_set_halt(int bus, int addr, int ep) "dev %d:%d, ep %d"
 -usb_host_ep_clear_halt(int bus, int addr, int ep) "dev %d:%d, ep %d"
  usb_host_iso_start(int bus, int addr, int ep) "dev %d:%d, ep %d"
  usb_host_iso_stop(int bus, int addr, int ep) "dev %d:%d, ep %d"
  usb_host_iso_out_of_bufs(int bus, int addr, int ep) "dev %d:%d, ep %d"
 -usb_host_iso_many_urbs(int bus, int addr, int count) "dev %d:%d, count %d"
  usb_host_reset(int bus, int addr) "dev %d:%d"
  usb_host_auto_scan_enabled(void)
  usb_host_auto_scan_disabled(void)
 -usb_host_claim_port(int bus, int hub, int port) "bus %d, hub addr %d, port %d"
 -usb_host_parse_device(int bus, int addr, int vendor, int product) "dev %d:%d, id %04x:%04x"
  usb_host_parse_config(int bus, int addr, int value, int active) "dev %d:%d, value %d, active %d"
  usb_host_parse_interface(int bus, int addr, int num, int alt, int active) "dev %d:%d, num %d, alt %d, active %d"
  usb_host_parse_endpoint(int bus, int addr, int ep, const char *dir, const char *type, int active) "dev %d:%d, ep %d, %s, %s, active %d"
 -usb_host_parse_unknown(int bus, int addr, int len, int type) "dev %d:%d, len %d, type %d"
  usb_host_parse_error(int bus, int addr, const char *errmsg) "dev %d:%d, msg %s"
  
  # hw/scsi/scsi-bus.c
@@@ -1000,8 -1012,6 +1002,8 @@@ dma_map_wait(void *dbs) "dbs=%p
  
  # ui/console.c
  console_gfx_new(void) ""
 +console_putchar_csi(int esc_param0, int esc_param1, int ch, int nb_esc_params) "escape sequence CSI%d;%d%c, %d parameters"
 +console_putchar_unhandled(int ch) "unhandled escape character '%c'"
  console_txt_new(int w, int h) "%dx%d"
  console_select(int nr) "%d"
  console_refresh(int interval) "interval %d ms"
@@@ -1012,11 -1022,6 +1014,11 @@@ displaychangelistener_register(void *dc
  displaychangelistener_unregister(void *dcl, const char *name) "%p [ %s ]"
  ppm_save(const char *filename, void *display_surface) "%s surface=%p"
  
 +# ui/gtk.c
 +gd_switch(int width, int height) "width=%d, height=%d"
 +gd_update(int x, int y, int w, int h) "x=%d, y=%d, w=%d, h=%d"
 +gd_key_event(int gdk_keycode, int qemu_keycode, const char *action) "translated GDK keycode %d to QEMU keycode %d (%s)"
 +
  # hw/display/vmware_vga.c
  vmware_value_read(uint32_t index, uint32_t value) "index %d, value 0x%x"
  vmware_value_write(uint32_t index, uint32_t value) "index %d, value 0x%x"