Re: [Qemu-devel] [PATCH RFC v4 27/29] qapi: Change Netdev into a flat union

[Eric Blake <eblake@redhat.com>]

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

On 09/17/2015 03:15 AM, Wen Congyang wrote:
> On 09/10/2015 12:06 PM, Eric Blake wrote:
>> From: Kővágó, Zoltán <dirty.ice.hu@gmail.com>
>>
>> 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'
>>
>> Signed-off-by: Kővágó, Zoltán <DirtY.iCE.hu@gmail.com>
>> Message-Id: <01a527fbf1a5de880091f98cf011616a78adeeee.1441627176.git.DirtY.iCE.hu@gmail.com>
>>
>> Additional changes:
>> Rebase the patch on top of an earlier change from netdev->kind to
>> netdev->type, so that tweak no longer needed here.
>>
>> Rework so that NetdevLegacy doesn't pollute QMP command but is instead
>> copied piecewise into the new Netdev, which means that NetClientOptions
>> must still remain in qapi. Since legacy previously always rejected
>> 'hubport', we can now make that explicit by having the two unions be
>> slightly different; but that means we must manually map between the
>> two structures.
> 
> I apply Markus's v8 patch and this series, make check will fail:
> TEST: tests/virtio-net-test... (pid=23648)
>   /x86_64/virtio/net/pci/basic:                                        qemu-system-x86_64: -netdev socket,fd=6,id=hs0: Invalid parameter 'fd'

Oh dear. I guess I was focused on 'make check-qapi-schema', and forgot
to test the rest of the suite.  The bug is most likely in my patches,
and will be fixed by the time I post v5, now that you've pointed it out
to me.

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]