From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44983) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zcfzh-0005v8-TQ for qemu-devel@nongnu.org; Thu, 17 Sep 2015 16:41:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zcfzd-0007CB-Ss for qemu-devel@nongnu.org; Thu, 17 Sep 2015 16:41:25 -0400 References: <01a527fbf1a5de880091f98cf011616a78adeeee.1441627176.git.DirtY.iCE.hu@gmail.com> From: Eric Blake Message-ID: <55FB2566.6070902@redhat.com> Date: Thu, 17 Sep 2015 14:41:10 -0600 MIME-Version: 1.0 In-Reply-To: <01a527fbf1a5de880091f98cf011616a78adeeee.1441627176.git.DirtY.iCE.hu@gmail.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="GCPERVhKJiWFjmSFR49j7spqLtqUDlEsm" Subject: Re: [Qemu-devel] [PATCH 5/7] qapi: change Netdev into a flat union List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?UTF-8?B?S8WRdsOhZ8OzLCBab2x0w6Fu?= , qemu-devel@nongnu.org Cc: Peter Maydell , "Michael S. Tsirkin" , Jason Wang , Vincenzo Maffione , Alexander Graf , Max Filippov , Gerd Hoffmann , Dmitry Fleytman , "Edgar E. Iglesias" , Rob Herring , Markus Armbruster , Scott Feldman , Jiri Pirko , Alistair Francis , Jan Kiszka , Stefan Hajnoczi , Giuseppe Lettieri , Luiz Capitulino , Luigi Rizzo , David Gibson , Peter Crosthwaite , Michael Walle , "open list:sPAPR (pseries)" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --GCPERVhKJiWFjmSFR49j7spqLtqUDlEsm Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 09/07/2015 06:14 AM, K=C5=91v=C3=A1g=C3=B3, Zolt=C3=A1n wrote: > Except qapi-schema.json, this patch was generated by: >=20 > find . -name .git -prune -o -type f \! -name '*~' -print0 | \ > xargs -0 sed -i \ > -e 's/NetClientOptionsKind/NetClientDriver/g' \ > -e 's/NET_CLIENT_OPTIONS_KIND_/NET_CLIENT_DRIVER_/g' \ > -e 's/netdev->opts/netdev/g' \ > -e 's/netdev->kind/netdev->type/g' This last line goes away if my patch goes in first: https://lists.gnu.org/archive/html/qemu-devel/2015-09/msg02598.html >=20 > Signed-off-by: K=C5=91v=C3=A1g=C3=B3, Zolt=C3=A1n > --- > hw/arm/musicpal.c | 2 +- > qapi-schema.json | 38 +++++++++++------- > 45 files changed, 167 insertions(+), 155 deletions(-) See my counterproposal that preserves NetdevLegacy for use by the command line (that is, with 3/7 unapplied): https://lists.gnu.org/archive/html/qemu-devel/2015-09/msg02604.html The differences (other than rebase conflict resolution) are limited to qapi-schema.json and to net_client_init1(). But since I'm proposing to reuse your patch in my series, you can add this if you need to respin before my patches land: Reviewed-by: Eric Blake --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org --GCPERVhKJiWFjmSFR49j7spqLtqUDlEsm Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Public key at http://people.redhat.com/eblake/eblake.gpg Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBCAAGBQJV+yVmAAoJEKeha0olJ0Nqfz4H/3pM7Ht2XczmSGfRhuNkopJG bhNvlC7EGFf2f41/Kb0TirO8vtHHFfEjsmcjKEqRqGfqTuIbOtux1BScIppNTk7Z KhHOKcjOYIuVSeUOGivMo2fPRmHUz4Xl4+N86RJ9nEQmKgcPa9IiQkBsj09bJrzY BGyQg7+LQG0QvhRP95uyKGB7qoI/4to5N7nXFykQo2iIzm4pH0KbQMsujLbxFpAD 3ysGwyMHdkbtxFYCPTAflvSuqvKZzhnIWxhp/im9zCd3stlfXu+INzt92U/yyFnI nGB8yTW7+LJ54yCOY9z+FXu1b8/gWoNBW89Ih13ztNBRhrP5FOKvmMikIJmgeUI= =Ji1m -----END PGP SIGNATURE----- --GCPERVhKJiWFjmSFR49j7spqLtqUDlEsm--