Commit 8a253ec2 authored by KONRAD Frederic's avatar KONRAD Frederic Committed by Anthony Liguori
Browse files

virtio-net: add virtio_net_set_netclient_name. 



This adds virtio_net_set_netclient_name, which is used to set the
name and type shown in "info network" command.

Signed-off-by: default avatarKONRAD Frederic <fred.konrad@greensocs.com>
Message-id: 1368619970-23892-2-git-send-email-fred.konrad@greensocs.com
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 110db9b4

hw/net/virtio-net.c

+43 −2
Original line number Diff line number Diff line
@@ -1275,6 +1275,29 @@ void virtio_net_set_config_size(VirtIONet *n, uint32_t host_features) 
    n->config_size = config_size;

}



void virtio_net_set_netclient_name(VirtIONet *n, const char *name,

                                   const char *type)

{

    /*

     * The name can be NULL, the netclient name will be type.x.

     */

    assert(type != NULL);



    if (n->netclient_name) {

        g_free(n->netclient_name);

        n->netclient_name = NULL;

    }

    if (n->netclient_type) {

        g_free(n->netclient_type);

        n->netclient_type = NULL;

    }



    if (name != NULL) {

        n->netclient_name = g_strdup(name);

    }

    n->netclient_type = g_strdup(type);

}



static int virtio_net_device_init(VirtIODevice *vdev)

{

    int i;
@@ -1315,8 +1338,17 @@ static int virtio_net_device_init(VirtIODevice *vdev) 
    memcpy(&n->mac[0], &n->nic_conf.macaddr, sizeof(n->mac));

    n->status = VIRTIO_NET_S_LINK_UP;



    if (n->netclient_type) {

        /*

         * Happen when virtio_net_set_netclient_name has been called.

         */

        n->nic = qemu_new_nic(&net_virtio_info, &n->nic_conf,

                              n->netclient_type, n->netclient_name, n);

    } else {

        n->nic = qemu_new_nic(&net_virtio_info, &n->nic_conf,

                              object_get_typename(OBJECT(qdev)), qdev->id, n);

    }



    peer_test_vnet_hdr(n);

    if (peer_has_vnet_hdr(n)) {

        for (i = 0; i < n->max_queues; i++) {
@@ -1357,6 +1389,15 @@ static int virtio_net_device_exit(DeviceState *qdev) 


    unregister_savevm(qdev, "virtio-net", n);



    if (n->netclient_name) {

        g_free(n->netclient_name);

        n->netclient_name = NULL;

    }

    if (n->netclient_type) {

        g_free(n->netclient_type);

        n->netclient_type = NULL;

    }



    g_free(n->mac_table.macs);

    g_free(n->vlans);

include/hw/virtio/virtio-net.h

+4 −0
Original line number Diff line number Diff line
@@ -188,6 +188,8 @@ typedef struct VirtIONet { 
    uint16_t max_queues;

    uint16_t curr_queues;

    size_t config_size;

    char *netclient_name;

    char *netclient_type;

} VirtIONet;



#define VIRTIO_NET_CTRL_MAC    1
@@ -255,5 +257,7 @@ struct virtio_net_ctrl_mq { 
    DEFINE_PROP_STRING("tx", _state, _field.tx)



void virtio_net_set_config_size(VirtIONet *n, uint32_t host_features);

void virtio_net_set_netclient_name(VirtIONet *n, const char *name,

                                   const char *type);



#endif