On 2011-05-18 10:09, Markus Armbruster wrote:
> Jan Kiszka <jan.kis...@siemens.com> writes:
>
>> Include the client type name into the output of 'info network'. The
>> result looks like this:
>>
>> (qemu) info network
>> VLAN 0 devices:
>> rtl8139.0 (NIC): model=rtl8139,macaddr=52:54:00:12:34:57
>> Devices not on any VLAN:
>> virtio-net-pci.0 (NIC): model=virtio-net-pci,macaddr=52:54:00:12:34:56
>> \ network1 (tap): fd=5
>
> I guess I'd prefix vc->infostr with type=WHATEVER, for consistency with
> the command line, like this:
>
> (qemu) info network
> VLAN 0 devices:
> rtl8139.0: type=nic,model=rtl8139,macaddr=52:54:00:12:34:57
> Devices not on any VLAN:
> virtio-net-pci.0: type=nic,model=virtio-net-pci,macaddr=52:54:00:12:34:56
> \ network1: type=tap,fd=5
That really only creates consistency for the 'user' client. Other
clients put arbitrarily formatted strings into info_str. If it's still
preferred that way, no big deal, just wanted to point it out.
>
>>
>> Signed-off-by: Jan Kiszka <jan.kis...@siemens.com>
>> ---
>> net.c | 18 +++++++++++++++---
>> 1 files changed, 15 insertions(+), 3 deletions(-)
>>
>> diff --git a/net.c b/net.c
>> index 606ce70..a4ee6b1 100644
>> --- a/net.c
>> +++ b/net.c
>> @@ -1223,6 +1223,15 @@ int do_netdev_del(Monitor *mon, const QDict *qdict,
>> QObject **ret_data)
>>
>> void do_info_network(Monitor *mon)
>> {
>> + static const char *typename[] = {
>> + [NET_CLIENT_TYPE_NONE] = "none",
>> + [NET_CLIENT_TYPE_NIC] = "NIC",
>> + [NET_CLIENT_TYPE_SLIRP] = "user IPv4",
>> + [NET_CLIENT_TYPE_TAP] = "tap",
>> + [NET_CLIENT_TYPE_SOCKET] = "socket",
>> + [NET_CLIENT_TYPE_VDE] = "VDE",
>> + [NET_CLIENT_TYPE_DUMP] = "dump",
>> + };
>
> Why not use the type names from net_client_types[]? Easier, and
> consistent with the command line.
Will do.
Thanks,
Jan
--
Siemens AG, Corporate Technology, CT T DE IT 1
Corporate Competence Center Embedded Linux
