Commit 53e51d85 authored Jun 16, 2011 by Markus Armbruster Committed by Michael S. Tsirkin Jul 19, 2011

Fix automatically assigned network names for netdev



If a network client doesn't have a name, we make one up, with
assign_name().  assign_name() creates a name MODEL.NUM, where MODEL is
the client's model, and NUM is the number of MODELs that already
exist.

Bug: it misses clients that are not on a VLAN, i.e. netdevs and the
NICs using them:

    $ qemu-system-x86_64 -nodefaults -vnc :0 -S -monitor stdio -netdev user,id=hostnet0 -net nic,netdev=hostnet0 -netdev user,id=hostnet1 -net nic,netdev=hostnet1
    QEMU 0.14.50 monitor - type 'help' for more information
    (qemu) info network
    Devices not on any VLAN:
      hostnet0: net=10.0.2.0, restricted=n peer=e1000.0
      hostnet1: net=10.0.2.0, restricted=n peer=e1000.0
      e1000.0: model=e1000,macaddr=52:54:00:12:34:56 peer=hostnet0
      e1000.0: model=e1000,macaddr=52:54:00:12:34:57 peer=hostnet1

Fix that.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

parent c8eac1cf

net.c

+7 −2

Original line number	Diff line number	Diff line
		@@ -150,12 +150,11 @@ void qemu_macaddr_default_if_unset(MACAddr *macaddr)
		static char assign_name(VLANClientState vc1, const char *model)
		{
		VLANState *vlan;
		VLANClientState *vc;
		char buf[256];
		int id = 0;

		QTAILQ_FOREACH(vlan, &vlans, next) {
		VLANClientState *vc;

		QTAILQ_FOREACH(vc, &vlan->clients, next) {
		if (vc != vc1 && strcmp(vc->model, model) == 0) {
		id++;
		@@ -163,6 +162,12 @@ static char assign_name(VLANClientState vc1, const char *model)
		}
		}

		QTAILQ_FOREACH(vc, &non_vlan_clients, next) {
		if (vc != vc1 && strcmp(vc->model, model) == 0) {
		id++;
		}
		}

		snprintf(buf, sizeof(buf), "%s.%d", model, id);

		return qemu_strdup(buf);