From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:37085) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rpmou-0008Mp-8w for qemu-devel@nongnu.org; Tue, 24 Jan 2012 15:18:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RpmkP-0001Pf-1X for qemu-devel@nongnu.org; Tue, 24 Jan 2012 15:13:41 -0500 Received: from e33.co.us.ibm.com ([32.97.110.151]:36873) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RpmkO-0001PY-Ps for qemu-devel@nongnu.org; Tue, 24 Jan 2012 15:13:41 -0500 Received: from /spool/local by e33.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 24 Jan 2012 13:13:39 -0700 Received: from d03relay05.boulder.ibm.com (d03relay05.boulder.ibm.com [9.17.195.107]) by d03dlp02.boulder.ibm.com (Postfix) with ESMTP id 174F13E40047 for ; Tue, 24 Jan 2012 13:13:37 -0700 (MST) Received: from d03av04.boulder.ibm.com (d03av04.boulder.ibm.com [9.17.195.170]) by d03relay05.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q0OKDR4E054530 for ; Tue, 24 Jan 2012 13:13:27 -0700 Received: from d03av04.boulder.ibm.com (loopback [127.0.0.1]) by d03av04.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q0OKDN5i003977 for ; Tue, 24 Jan 2012 13:13:23 -0700 Message-ID: <4F1F10DE.90805@us.ibm.com> Date: Tue, 24 Jan 2012 14:13:18 -0600 From: Anthony Liguori MIME-Version: 1.0 References: <1327433600-7403-1-git-send-email-aliguori@us.ibm.com> <1327433600-7403-23-git-send-email-aliguori@us.ibm.com> <20120124195950.GD320@amit.redhat.com> In-Reply-To: <20120124195950.GD320@amit.redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 22/28] virtio-serial: convert to QEMU Object Model List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Amit Shah Cc: qemu-devel@nongnu.org On 01/24/2012 01:59 PM, Amit Shah wrote: > On (Tue) 24 Jan 2012 [13:33:14], Anthony Liguori wrote: > >> diff --git a/hw/virtio-serial-bus.c b/hw/virtio-serial-bus.c >> index 982ffbf..edf54d7 100644 >> --- a/hw/virtio-serial-bus.c >> +++ b/hw/virtio-serial-bus.c > > >> @@ -157,7 +157,7 @@ static void do_flush_queued_data(VirtIOSerialPort *port, VirtQueue *vq, >> ssize_t ret; >> >> buf_size = port->elem.out_sg[i].iov_len - port->iov_offset; >> - ret = info->have_data(port, >> + ret = vsc->have_data(port, >> port->elem.out_sg[i].iov_base >> + port->iov_offset, >> buf_size); > > Would be nice if everything was re-indented. That'll need to be a follow-on. This was mostly scripted. > >> @@ -176,7 +176,7 @@ static void do_flush_queued_data(VirtIOSerialPort *port, VirtQueue *vq, >> * 1: chardevs can notify frondends >> * 2: the guest driver does not spin in these cases >> */ >> - if (!info->is_console) { >> + if (vsc->is_console) { >> virtio_serial_throttle_port(port, true); >> } >> port->iov_idx = i; > > This change is wrong, reverses the if condition. Was this done > manually or via a script? If the latter, it would be worthwhile to > check all the conversions. This was a manual rebase conflict resolution change on my part. I'll fix. > >> -void virtio_serial_port_qdev_register(VirtIOSerialPortInfo *info) >> +void virtio_serial_port_qdev_register(DeviceInfo *info) > > Should the fn be renamed (replace qdev)? It'll go away entirely in 3/3 which I'll post in a couple days. Regards, Anthony Liguori > > Amit >