Re: [Qemu-devel] [PATCH v3 3/8] qapi: change Netdev and NetLegacy into a flat union

From: Stefan Hajnoczi <stefanha@redhat.com>
To: "Kővágó, Zoltán" <dirty.ice.hu@gmail.com>
Cc: Peter Maydell <peter.maydell@linaro.org>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	Jason Wang <jasowang@redhat.com>,
	qemu-devel@nongnu.org, Vincenzo Maffione <v.maffione@gmail.com>,
	Alexander Graf <agraf@suse.de>, Max Filippov <jcmvbkbc@gmail.com>,
	Gerd Hoffmann <kraxel@redhat.com>,
	Dmitry Fleytman <dmitry@daynix.com>,
	"Edgar E. Iglesias" <edgar.iglesias@gmail.com>,
	Rob Herring <robh@kernel.org>,
	Markus Armbruster <armbru@redhat.com>,
	Scott Feldman <sfeldma@gmail.com>, Jiri Pirko <jiri@resnulli.us>,
	Jan Kiszka <jan.kiszka@web.de>,
	Giuseppe Lettieri <g.lettieri@iet.unipi.it>,
	Luiz Capitulino <lcapitulino@redhat.com>,
	Luigi Rizzo <rizzo@iet.unipi.it>,
	David Gibson <david@gibson.dropbear.id.au>,
	Peter Crosthwaite <peter.crosthwaite@xilinx.com>,
	Michael Walle <michael@walle.cc>,
	"open list:sPAPR (pseries)" <qemu-ppc@nongnu.org>
Subject: Re: [Qemu-devel] [PATCH v3 3/8] qapi: change Netdev and NetLegacy into a flat union
Date: Fri, 19 Jun 2015 15:06:32 +0100	[thread overview]
Message-ID: <20150619140632.GA18654@stefanha-thinkpad.redhat.com> (raw)
In-Reply-To: <ae443cdf65c94a99e5c00a6273bd6556081dd5cd.1434644665.git.DirtY.iCE.hu@gmail.com>

[-- Attachment #1: Type: text/plain, Size: 1666 bytes --]

On Thu, Jun 18, 2015 at 06:43:45PM +0200, Kővágó, Zoltán wrote:
> @@ -713,8 +710,6 @@ int net_init_tap(const NetClientOptions *opts, const char *name,
>      const char *vhostfdname;
>      char ifname[128];
>  
> -    assert(opts->kind == NET_CLIENT_OPTIONS_KIND_TAP);
> -    tap = opts->tap;
...
> @@ -109,14 +109,11 @@ static int net_vde_init(NetClientState *peer, const char *model,
>      return 0;
>  }
>  
> -int net_init_vde(const NetClientOptions *opts, const char *name,
> +int net_init_vde(const void *opts, const char *name,
>                   NetClientState *peer, Error **errp)
>  {
>      /* FIXME error_setg(errp, ...) on failure */
> -    const NetdevVdeOptions *vde;
> -
> -    assert(opts->kind == NET_CLIENT_OPTIONS_KIND_VDE);
> -    vde = opts->vde;
> +    const NetdevVdeOptions *vde = opts;
>  
>      /* missing optional values have been initialized to "all bits zero" */
>      if (net_vde_init(peer, "vde", name, vde->sock, vde->port, vde->group,
...
> @@ -228,16 +228,13 @@ static int net_vhost_check_net(void *opaque, QemuOpts *opts, Error **errp)
>      return 0;
>  }
>  
> -int net_init_vhost_user(const NetClientOptions *opts, const char *name,
> +int net_init_vhost_user(const void *opts, const char *name,
>                          NetClientState *peer, Error **errp)
>  {
>      uint32_t queues;
> -    const NetdevVhostUserOptions *vhost_user_opts;
> +    const NetdevVhostUserOptions *vhost_user_opts = opts;
>      CharDriverState *chr;
>  
> -    assert(opts->kind == NET_CLIENT_OPTIONS_KIND_VHOST_USER);
> -    vhost_user_opts = opts->vhost_user;
> -

Why drop the assertion?

[-- Attachment #2: Type: application/pgp-signature, Size: 473 bytes --]