On 09/07/2015 06:14 AM, Kővágó, Zoltán wrote: > Except qapi-schema.json, this patch was generated by: > > 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 > > Signed-off-by: Kővágó, Zoltán <dirty.ice...@gmail.com> > --- > 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 <ebl...@redhat.com> -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature