From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48617) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V7QMJ-0001tK-Qr for qemu-devel@nongnu.org; Thu, 08 Aug 2013 09:34:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V7QMD-0004as-12 for qemu-devel@nongnu.org; Thu, 08 Aug 2013 09:34:31 -0400 Received: from mail-ie0-f171.google.com ([209.85.223.171]:63715) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V7QMC-0004aZ-Mh for qemu-devel@nongnu.org; Thu, 08 Aug 2013 09:34:24 -0400 Received: by mail-ie0-f171.google.com with SMTP id 10so1831466ied.30 for ; Thu, 08 Aug 2013 06:34:24 -0700 (PDT) From: Anthony Liguori In-Reply-To: <1375938949-22622-8-git-send-email-rusty@rustcorp.com.au> References: <1375938949-22622-1-git-send-email-rusty@rustcorp.com.au> <1375938949-22622-8-git-send-email-rusty@rustcorp.com.au> Date: Thu, 08 Aug 2013 08:34:22 -0500 Message-ID: <877gfwgvc1.fsf@codemonkey.ws> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Subject: Re: [Qemu-devel] [PATCH 7/7] hw/char/virtio-serial-bus: use virtio wrappers to access headers. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Rusty Russell , qemu-devel@nongnu.org Rusty Russell writes: > Signed-off-by: Rusty Russell Reviewed-by: Anthony Liguori Regards, Anthony Liguori > --- > hw/char/virtio-serial-bus.c | 34 ++++++++++++++++++---------------- > 1 file changed, 18 insertions(+), 16 deletions(-) > > diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c > index cc3d1dd..0421725 100644 > --- a/hw/char/virtio-serial-bus.c > +++ b/hw/char/virtio-serial-bus.c > @@ -24,6 +24,7 @@ > #include "hw/sysbus.h" > #include "trace.h" > #include "hw/virtio/virtio-serial.h" > +#include "hw/virtio/virtio-access.h" > > static VirtIOSerialPort *find_port_by_id(VirtIOSerial *vser, uint32_t id) > { > @@ -185,9 +186,9 @@ static size_t send_control_event(VirtIOSerial *vser, uint32_t port_id, > { > struct virtio_console_control cpkt; > > - stl_p(&cpkt.id, port_id); > - stw_p(&cpkt.event, event); > - stw_p(&cpkt.value, value); > + virtio_stl_p(&cpkt.id, port_id); > + virtio_stw_p(&cpkt.event, event); > + virtio_stw_p(&cpkt.value, value); > > trace_virtio_serial_send_control_event(port_id, event, value); > return send_control_msg(vser, &cpkt, sizeof(cpkt)); > @@ -291,8 +292,8 @@ static void handle_control_message(VirtIOSerial *vser, void *buf, size_t len) > return; > } > > - cpkt.event = lduw_p(&gcpkt->event); > - cpkt.value = lduw_p(&gcpkt->value); > + cpkt.event = virtio_lduw_p(&gcpkt->event); > + cpkt.value = virtio_lduw_p(&gcpkt->value); > > trace_virtio_serial_handle_control_message(cpkt.event, cpkt.value); > > @@ -312,10 +313,10 @@ static void handle_control_message(VirtIOSerial *vser, void *buf, size_t len) > return; > } > > - port = find_port_by_id(vser, ldl_p(&gcpkt->id)); > + port = find_port_by_id(vser, virtio_ldl_p(&gcpkt->id)); > if (!port) { > error_report("virtio-serial-bus: Unexpected port id %u for device %s", > - ldl_p(&gcpkt->id), vser->bus.qbus.name); > + virtio_ldl_p(&gcpkt->id), vser->bus.qbus.name); > return; > } > > @@ -342,9 +343,9 @@ static void handle_control_message(VirtIOSerial *vser, void *buf, size_t len) > } > > if (port->name) { > - stl_p(&cpkt.id, port->id); > - stw_p(&cpkt.event, VIRTIO_CONSOLE_PORT_NAME); > - stw_p(&cpkt.value, 1); > + virtio_stl_p(&cpkt.id, port->id); > + virtio_stw_p(&cpkt.event, VIRTIO_CONSOLE_PORT_NAME); > + virtio_stw_p(&cpkt.value, 1); > > buffer_len = sizeof(cpkt) + strlen(port->name) + 1; > buffer = g_malloc(buffer_len); > @@ -536,7 +537,7 @@ static void virtio_serial_save(QEMUFile *f, void *opaque) > qemu_put_be32s(f, &s->config.max_nr_ports); > > /* The ports map */ > - max_nr_ports = tswap32(s->config.max_nr_ports); > + max_nr_ports = virtio_tswap32(s->config.max_nr_ports); > for (i = 0; i < (max_nr_ports + 31) / 32; i++) { > qemu_put_be32s(f, &s->ports_map[i]); > } > @@ -690,8 +691,8 @@ static int virtio_serial_load(QEMUFile *f, void *opaque, int version_id) > qemu_get_be16s(f, &s->config.rows); > > qemu_get_be32s(f, &max_nr_ports); > - tswap32s(&max_nr_ports); > - if (max_nr_ports > tswap32(s->config.max_nr_ports)) { > + virtio_tswap32s(&max_nr_ports); > + if (max_nr_ports > virtio_tswap32(s->config.max_nr_ports)) { > /* Source could have had more ports than us. Fail migration. */ > return -EINVAL; > } > @@ -760,7 +761,7 @@ static uint32_t find_free_port_id(VirtIOSerial *vser) > { > unsigned int i, max_nr_ports; > > - max_nr_ports = tswap32(vser->config.max_nr_ports); > + max_nr_ports = virtio_tswap32(vser->config.max_nr_ports); > for (i = 0; i < (max_nr_ports + 31) / 32; i++) { > uint32_t map, bit; > > @@ -846,7 +847,7 @@ static int virtser_port_qdev_init(DeviceState *qdev) > } > } > > - max_nr_ports = tswap32(port->vser->config.max_nr_ports); > + max_nr_ports = virtio_tswap32(port->vser->config.max_nr_ports); > if (port->id >= max_nr_ports) { > error_report("virtio-serial-bus: Out-of-range port id specified, max. allowed: %u", > max_nr_ports - 1); > @@ -946,7 +947,8 @@ static int virtio_serial_device_init(VirtIODevice *vdev) > vser->ovqs[i] = virtio_add_queue(vdev, 128, handle_output); > } > > - vser->config.max_nr_ports = tswap32(vser->serial.max_virtserial_ports); > + vser->config.max_nr_ports = > + virtio_tswap32(vser->serial.max_virtserial_ports); > vser->ports_map = g_malloc0(((vser->serial.max_virtserial_ports + 31) / 32) > * sizeof(vser->ports_map[0])); > /* > -- > 1.8.1.2