From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49758) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WUfaI-0001DG-EW for qemu-devel@nongnu.org; Mon, 31 Mar 2014 13:01:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WUfaC-00071e-0J for qemu-devel@nongnu.org; Mon, 31 Mar 2014 13:01:18 -0400 Received: from cantor2.suse.de ([195.135.220.15]:45169 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WUfaB-00071T-Ln for qemu-devel@nongnu.org; Mon, 31 Mar 2014 13:01:11 -0400 Message-ID: <53399F56.7000200@suse.de> Date: Mon, 31 Mar 2014 19:01:10 +0200 From: Alexander Graf MIME-Version: 1.0 References: <20140328105709.21018.88000.stgit@bahia.local> <20140328105803.21018.81186.stgit@bahia.local> In-Reply-To: <20140328105803.21018.81186.stgit@bahia.local> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v6 7/8] virtio-serial-bus: use virtio wrappers to access headers List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Greg Kurz Cc: kwolf@redhat.com, peter.maydell@linaro.org, thuth@linux.vnet.ibm.com, mst@redhat.com, marc.zyngier@arm.com, rusty@rustcorp.com.au, qemu-devel@nongnu.org, stefanha@redhat.com, cornelia.huck@de.ibm.com, pbonzini@redhat.com, anthony@codemonkey.ws, afaerber@suse.de On 03/28/2014 11:58 AM, Greg Kurz wrote: > From: Rusty Russell > > Signed-off-by: Rusty Russell > Reviewed-by: Anthony Liguori > [ use per-device needs_byteswap flag, > Greg Kurz ] > Signed-off-by: Greg Kurz > --- > hw/char/virtio-serial-bus.c | 39 +++++++++++++++++++++++---------------- > 1 file changed, 23 insertions(+), 16 deletions(-) > > diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c > index 2b647b6..7a84b2a 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_DEVICE(vser)); These are dynamic casts. You at least want to do these only once, probably even use some faster form of casting. Alex > + virtio_stw_p(&cpkt.event, event, VIRTIO_DEVICE(vser)); > + virtio_stw_p(&cpkt.value, value, VIRTIO_DEVICE(vser)); > > 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, VIRTIO_DEVICE(vser)); > + cpkt.value = virtio_lduw_p(&gcpkt->value, VIRTIO_DEVICE(vser)); > > trace_virtio_serial_handle_control_message(cpkt.event, cpkt.value); > > @@ -312,10 +313,11 @@ 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, VIRTIO_DEVICE(vser))); > 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, VIRTIO_DEVICE(vser)), > + vser->bus.qbus.name); > return; > } > > @@ -342,9 +344,10 @@ 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_DEVICE(vser)); > + virtio_stw_p(&cpkt.event, VIRTIO_CONSOLE_PORT_NAME, > + VIRTIO_DEVICE(vser)); > + virtio_stw_p(&cpkt.value, 1, VIRTIO_DEVICE(vser)); > > buffer_len = sizeof(cpkt) + strlen(port->name) + 1; > buffer = g_malloc(buffer_len); > @@ -536,7 +539,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, VIRTIO_DEVICE(s)); > for (i = 0; i < (max_nr_ports + 31) / 32; i++) { > qemu_put_be32s(f, &s->ports_map[i]); > } > @@ -690,8 +693,9 @@ 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, VIRTIO_DEVICE(s)); > + if (max_nr_ports > virtio_tswap32(s->config.max_nr_ports, > + VIRTIO_DEVICE(s))) { > /* Source could have had more ports than us. Fail migration. */ > return -EINVAL; > } > @@ -760,7 +764,8 @@ 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, > + VIRTIO_DEVICE(vser)); > for (i = 0; i < (max_nr_ports + 31) / 32; i++) { > uint32_t map, bit; > > @@ -848,7 +853,8 @@ static void virtser_port_device_realize(DeviceState *dev, Error **errp) > } > } > > - max_nr_ports = tswap32(port->vser->config.max_nr_ports); > + max_nr_ports = virtio_tswap32(port->vser->config.max_nr_ports, > + VIRTIO_DEVICE(port->vser)); > if (port->id >= max_nr_ports) { > error_setg(errp, "virtio-serial-bus: Out-of-range port id specified, " > "max. allowed: %u", max_nr_ports - 1); > @@ -949,7 +955,8 @@ static void virtio_serial_device_realize(DeviceState *dev, Error **errp) > 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, VIRTIO_DEVICE(vser)); > vser->ports_map = g_malloc0(((vser->serial.max_virtserial_ports + 31) / 32) > * sizeof(vser->ports_map[0])); > /* >