Commit 9d903f30 authored by Thomas Huth's avatar Thomas Huth Committed by Jason Wang
Browse files

net: Drop the legacy "name" parameter from the -net option 



It's been deprecated since QEMU v3.1, so it's time to finally
remove it. The "id" parameter can simply be used instead.

Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
parent fda43b12

docs/system/deprecated.rst

+9 −6
Original line number Diff line number Diff line
@@ -47,12 +47,6 @@ The 'file' driver for drives is no longer appropriate for character or host 
devices and will only accept regular files (S_IFREG). The correct driver

for these file types is 'host_cdrom' or 'host_device' as appropriate.



``-net ...,name=``\ *name* (since 3.1)

''''''''''''''''''''''''''''''''''''''



The ``name`` parameter of the ``-net`` option is a synonym

for the ``id`` parameter, which should now be used instead.



``-smp`` (invalid topologies) (since 3.1)

'''''''''''''''''''''''''''''''''''''''''
@@ -441,6 +435,15 @@ What follows is a record of recently removed, formerly deprecated 
features that serves as a record for users who have encountered

trouble after a recent upgrade.



System emulator command line arguments

--------------------------------------



``-net ...,name=``\ *name* (removed in 5.1)

'''''''''''''''''''''''''''''''''''''''''''



The ``name`` parameter of the ``-net`` option was a synonym

for the ``id`` parameter, which should now be used instead.



QEMU Machine Protocol (QMP) commands

------------------------------------

net/net.c

+1 −9
Original line number Diff line number Diff line
@@ -969,12 +969,10 @@ static int net_client_init1(const void *object, bool is_netdev, Error **errp) 
{

    Netdev legacy = {0};

    const Netdev *netdev;

    const char *name;

    NetClientState *peer = NULL;



    if (is_netdev) {

        netdev = object;

        name = netdev->id;



        if (netdev->type == NET_CLIENT_DRIVER_NIC ||

            !net_client_init_fun[netdev->type]) {
@@ -987,12 +985,6 @@ static int net_client_init1(const void *object, bool is_netdev, Error **errp) 
        const NetLegacyOptions *opts = net->opts;

        legacy.id = net->id;

        netdev = &legacy;

        /* missing optional values have been initialized to "all bits zero" */

        name = net->has_id ? net->id : net->name;



        if (net->has_name) {

            warn_report("The 'name' parameter is deprecated, use 'id' instead");

        }



        /* Map the old options to the new flat type */

        switch (opts->type) {
@@ -1052,7 +1044,7 @@ static int net_client_init1(const void *object, bool is_netdev, Error **errp) 
        }

    }



    if (net_client_init_fun[netdev->type](netdev, name, peer, errp) < 0) {

    if (net_client_init_fun[netdev->type](netdev, netdev->id, peer, errp) < 0) {

        /* FIXME drop when all init functions store an Error */

        if (errp && !*errp) {

            error_setg(errp, QERR_DEVICE_INIT_FAILED,

qapi/net.json

+0 −3
Original line number Diff line number Diff line
@@ -474,8 +474,6 @@ 
#

# @id: identifier for monitor commands

#

# @name: identifier for monitor commands, ignored if @id is present

#

# @opts: device type specific properties (legacy)

#

# Since: 1.2
@@ -483,7 +481,6 @@ 
{ 'struct': 'NetLegacy',

  'data': {

    '*id':   'str',

    '*name': 'str',

    'opts':  'NetLegacyOptions' } }



##