From: Dr. David Alan Gilbert Date: Fri, 25 Oct 2019 10:34:03 +0000 (+0100) Subject: virtio_net: use RCU_READ_LOCK_GUARD X-Git-Tag: qemu-xen-4.14.0~313^2~1 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=068ddfa970063730c5a61b06bae336d68de114e1;p=qemu-xen.git virtio_net: use RCU_READ_LOCK_GUARD Use RCU_READ_LOCK_GUARD rather than the manual rcu_read_(un)lock call. Signed-off-by: Dr. David Alan Gilbert Message-Id: <20191025103403.120616-3-dgilbert@redhat.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 314f365e7c..97a5113f7e 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -1490,12 +1490,9 @@ static ssize_t virtio_net_receive_rcu(NetClientState *nc, const uint8_t *buf, static ssize_t virtio_net_do_receive(NetClientState *nc, const uint8_t *buf, size_t size) { - ssize_t r; + RCU_READ_LOCK_GUARD(); - rcu_read_lock(); - r = virtio_net_receive_rcu(nc, buf, size); - rcu_read_unlock(); - return r; + return virtio_net_receive_rcu(nc, buf, size); } static void virtio_net_rsc_extract_unit4(VirtioNetRscChain *chain,