Commit 7a9180b7 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging 



# gpg: Signature made Mon 14 May 2018 08:51:53 BST
# gpg:                using RSA key EF04965B398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 215D 46F4 8246 689E C77F  3562 EF04 965B 398D 6211

* remotes/jasowang/tags/net-pull-request:
  net: Get rid of 'vlan' terminology and use 'hub' instead in the doc files
  net: Get rid of 'vlan' terminology and use 'hub' instead in the source files
  net: Remove the deprecated "vlan" parameter
  net: Fix memory leak in net_param_nic()

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents bbd87423 0e0266c2

docs/qdev-device-use.txt

+0 −3
Original line number Diff line number Diff line
@@ -277,9 +277,6 @@ devices and ne2k_isa are. 


Some PCI devices aren't available with -net nic, e.g. i82558a.



To connect to a VLAN instead of an ordinary host part, replace

netdev=NET-ID by vlan=VLAN.



=== Graphics Devices ===



Host and guest part of graphics devices have always been separate.

hw/core/qdev-properties-system.c

+0 −80
Original line number Diff line number Diff line
@@ -321,86 +321,6 @@ const PropertyInfo qdev_prop_netdev = { 
    .set   = set_netdev,

};



/* --- vlan --- */



static int print_vlan(DeviceState *dev, Property *prop, char *dest, size_t len)

{

    NetClientState **ptr = qdev_get_prop_ptr(dev, prop);



    if (*ptr) {

        int id;

        if (!net_hub_id_for_client(*ptr, &id)) {

            return snprintf(dest, len, "%d", id);

        }

    }



    return snprintf(dest, len, "<null>");

}



static void get_vlan(Object *obj, Visitor *v, const char *name, void *opaque,

                     Error **errp)

{

    DeviceState *dev = DEVICE(obj);

    Property *prop = opaque;

    NetClientState **ptr = qdev_get_prop_ptr(dev, prop);

    int32_t id = -1;



    if (*ptr) {

        int hub_id;

        if (!net_hub_id_for_client(*ptr, &hub_id)) {

            id = hub_id;

        }

    }



    visit_type_int32(v, name, &id, errp);

}



static void set_vlan(Object *obj, Visitor *v, const char *name, void *opaque,

                     Error **errp)

{

    DeviceState *dev = DEVICE(obj);

    Property *prop = opaque;

    NICPeers *peers_ptr = qdev_get_prop_ptr(dev, prop);

    NetClientState **ptr = &peers_ptr->ncs[0];

    Error *local_err = NULL;

    int32_t id;

    NetClientState *hubport;



    if (dev->realized) {

        qdev_prop_set_after_realize(dev, name, errp);

        return;

    }



    visit_type_int32(v, name, &id, &local_err);

    if (local_err) {

        error_propagate(errp, local_err);

        return;

    }

    if (id == -1) {

        *ptr = NULL;

        return;

    }

    if (*ptr) {

        error_set_from_qdev_prop_error(errp, -EINVAL, dev, prop, name);

        return;

    }



    hubport = net_hub_port_find(id);

    if (!hubport) {

        error_setg(errp, QERR_INVALID_PARAMETER_VALUE,

                   name, prop->info->name);

        return;

    }

    *ptr = hubport;

}



const PropertyInfo qdev_prop_vlan = {

    .name  = "int32",

    .description = "Integer VLAN id to connect to",

    .print = print_vlan,

    .get   = get_vlan,

    .set   = set_vlan,

};



void qdev_prop_set_drive(DeviceState *dev, const char *name,

                         BlockBackend *value, Error **errp)

include/hw/qdev-properties.h

+0 −3
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ extern const PropertyInfo qdev_prop_bios_chs_trans; 
extern const PropertyInfo qdev_prop_fdc_drive_type;

extern const PropertyInfo qdev_prop_drive;

extern const PropertyInfo qdev_prop_netdev;

extern const PropertyInfo qdev_prop_vlan;

extern const PropertyInfo qdev_prop_pci_devfn;

extern const PropertyInfo qdev_prop_blocksize;

extern const PropertyInfo qdev_prop_pci_host_devaddr;
@@ -195,8 +194,6 @@ extern const PropertyInfo qdev_prop_off_auto_pcibar; 
    DEFINE_PROP(_n, _s, _f, qdev_prop_string, char*)

#define DEFINE_PROP_NETDEV(_n, _s, _f)             \

    DEFINE_PROP(_n, _s, _f, qdev_prop_netdev, NICPeers)

#define DEFINE_PROP_VLAN(_n, _s, _f)             \

    DEFINE_PROP(_n, _s, _f, qdev_prop_vlan, NICPeers)

#define DEFINE_PROP_DRIVE(_n, _s, _f) \

    DEFINE_PROP(_n, _s, _f, qdev_prop_drive, BlockBackend *)

#define DEFINE_PROP_MACADDR(_n, _s, _f)         \

include/net/net.h

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ typedef struct NICConf { 


#define DEFINE_NIC_PROPERTIES(_state, _conf)                            \

    DEFINE_PROP_MACADDR("mac",   _state, _conf.macaddr),                \

    DEFINE_PROP_VLAN("vlan",     _state, _conf.peers),                   \

    DEFINE_PROP_NETDEV("netdev", _state, _conf.peers)

net/hub.c

+3 −4
Original line number Diff line number Diff line
@@ -23,8 +23,7 @@ 


/*

 * A hub broadcasts incoming packets to all its ports except the source port.

 * Hubs can be used to provide independent network segments, also confusingly

 * named the QEMU 'vlan' feature.

 * Hubs can be used to provide independent emulated network segments.

 */



typedef struct NetHub NetHub;
@@ -345,10 +344,10 @@ void net_hub_check_clients(void) 
            }

        }

        if (has_host_dev && !has_nic) {

            warn_report("vlan %d with no nics", hub->id);

            warn_report("hub %d with no nics", hub->id);

        }

        if (has_nic && !has_host_dev) {

            warn_report("vlan %d is not connected to host network", hub->id);

            warn_report("hub %d is not connected to host network", hub->id);

        }

    }

}