From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39350) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSyHA-0005UJ-Sf for qemu-devel@nongnu.org; Thu, 28 Jul 2016 23:15:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bSyH8-0002pu-WC for qemu-devel@nongnu.org; Thu, 28 Jul 2016 23:15:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39628) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSyH8-0002pq-QN for qemu-devel@nongnu.org; Thu, 28 Jul 2016 23:15:50 -0400 Date: Fri, 29 Jul 2016 06:15:47 +0300 From: "Michael S. Tsirkin" Message-ID: <1469762011-7902-13-git-send-email-mst@redhat.com> References: <1469762011-7902-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1469762011-7902-1-git-send-email-mst@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 12/41] vhost-user: minor simplification List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , =?iso-8859-1?Q?Marc-Andr=E9?= Lureau , Jason Wang From: Marc-Andr=E9 Lureau Shorten the code and make it more clear by using the specialized function g_str_has_prefix(). Signed-off-by: Marc-Andr=E9 Lureau Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- net/vhost-user.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/vhost-user.c b/net/vhost-user.c index c4d63e0..2af212b 100644 --- a/net/vhost-user.c +++ b/net/vhost-user.c @@ -316,7 +316,6 @@ static int net_vhost_check_net(void *opaque, QemuOpts= *opts, Error **errp) { const char *name =3D opaque; const char *driver, *netdev; - const char virtio_name[] =3D "virtio-net-"; =20 driver =3D qemu_opt_get(opts, "driver"); netdev =3D qemu_opt_get(opts, "netdev"); @@ -326,7 +325,7 @@ static int net_vhost_check_net(void *opaque, QemuOpts= *opts, Error **errp) } =20 if (strcmp(netdev, name) =3D=3D 0 && - strncmp(driver, virtio_name, strlen(virtio_name)) !=3D 0) { + !g_str_has_prefix(driver, "virtio-net-")) { error_setg(errp, "vhost-user requires frontend driver virtio-net= -*"); return -1; } --=20 MST