Merge remote-tracking branch 'kwolf/for-anthony' into staging

diff --combined hw/virtio-serial-bus.c
index 6d73386,53c58d0..bdc760c
--- 1/hw/virtio-serial-bus.c
--- 2/hw/virtio-serial-bus.c
+++ b/hw/virtio-serial-bus.c
@@@ -19,7 -19,6 +19,7 @@@
  #include "monitor.h"
  #include "qemu-queue.h"
  #include "sysbus.h"
 +#include "trace.h"
  #include "virtio-serial.h"
  
  /* The virtio-serial bus on top of which the ports will ride as devices */
@@@ -104,7 -103,7 +104,7 @@@ static size_t write_to_port(VirtIOSeria
          }
  
          len = iov_from_buf(elem.in_sg, elem.in_num,
-                            buf + offset, size - offset);
+                            buf + offset, 0, size - offset);
          offset += len;
  
          virtqueue_push(vq, &elem, len);
@@@ -222,7 -221,6 +222,7 @@@ static size_t send_control_event(VirtIO
      stw_p(&cpkt.event, event);
      stw_p(&cpkt.value, value);
  
 +    trace_virtio_serial_send_control_event(port->id, event, value);
      return send_control_msg(port, &cpkt, sizeof(cpkt));
  }
  
@@@ -304,7 -302,6 +304,7 @@@ void virtio_serial_throttle_port(VirtIO
          return;
      }
  
 +    trace_virtio_serial_throttle_port(port->id, throttle);
      port->throttled = throttle;
      if (throttle) {
          return;
@@@ -331,8 -328,6 +331,8 @@@ static void handle_control_message(Virt
      cpkt.event = lduw_p(&gcpkt->event);
      cpkt.value = lduw_p(&gcpkt->value);
  
 +    trace_virtio_serial_handle_control_message(cpkt.event, cpkt.value);
 +
      if (cpkt.event == VIRTIO_CONSOLE_DEVICE_READY) {
          if (!cpkt.value) {
              error_report("virtio-serial-bus: Guest failure in adding device %s",
@@@ -351,13 -346,11 +351,13 @@@
  
      port = find_port_by_id(vser, ldl_p(&gcpkt->id));
      if (!port) {
 -        error_report("virtio-serial-bus: Unexpected port id %u for device %s\n",
 +        error_report("virtio-serial-bus: Unexpected port id %u for device %s",
                       ldl_p(&gcpkt->id), vser->bus.qbus.name);
          return;
      }
  
 +    trace_virtio_serial_handle_control_message_port(port->id);
 +
      info = DO_UPCAST(VirtIOSerialPortInfo, qdev, port->dev.info);
  
      switch(cpkt.event) {