From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56455) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYwxd-0001MS-JH for qemu-devel@nongnu.org; Thu, 25 Feb 2016 09:32:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aYwxY-00083i-2z for qemu-devel@nongnu.org; Thu, 25 Feb 2016 09:32:09 -0500 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:33519) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYwxX-00083U-TH for qemu-devel@nongnu.org; Thu, 25 Feb 2016 09:32:04 -0500 Received: by mail-wm0-x242.google.com with SMTP id c200so3809908wme.0 for ; Thu, 25 Feb 2016 06:32:03 -0800 (PST) From: Jiri Pirko Date: Thu, 25 Feb 2016 15:31:57 +0100 Message-Id: <1456410718-24506-4-git-send-email-jiri@resnulli.us> In-Reply-To: <1456410718-24506-1-git-send-email-jiri@resnulli.us> References: <1456410718-24506-1-git-send-email-jiri@resnulli.us> Subject: [Qemu-devel] [patch qemu v2 3/4] rocker: add name field into WorldOps ale let world specify its name List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: prem@barefootnetworks.com, daniel@iogearbox.net, stefanha@gmail.com, jasowang@redhat.com, parag.bhide@barefootnetworks.com, idosch@mellanox.com, sfeldma@gmail.com, eladr@mellanox.com, pbonzini@redhat.com, alexei.starovoitov@gmail.com From: Jiri Pirko Also use this in world_name getter function. Signed-off-by: Jiri Pirko --- hw/net/rocker/rocker_of_dpa.c | 1 + hw/net/rocker/rocker_world.c | 7 +------ hw/net/rocker/rocker_world.h | 1 + 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/hw/net/rocker/rocker_of_dpa.c b/hw/net/rocker/rocker_of_dpa.c index da3fc54..0a134eb 100644 --- a/hw/net/rocker/rocker_of_dpa.c +++ b/hw/net/rocker/rocker_of_dpa.c @@ -2614,6 +2614,7 @@ RockerOfDpaGroupList *qmp_query_rocker_of_dpa_groups(const char *name, } static WorldOps of_dpa_ops = { + .name = "ofdpa", .init = of_dpa_init, .uninit = of_dpa_uninit, .ig = of_dpa_ig, diff --git a/hw/net/rocker/rocker_world.c b/hw/net/rocker/rocker_world.c index 1ed0fcd..89777e9 100644 --- a/hw/net/rocker/rocker_world.c +++ b/hw/net/rocker/rocker_world.c @@ -98,10 +98,5 @@ enum rocker_world_type world_type(World *world) const char *world_name(World *world) { - switch (world->type) { - case ROCKER_WORLD_TYPE_OF_DPA: - return "OF_DPA"; - default: - return "unknown"; - } + return world->ops->name; } diff --git a/hw/net/rocker/rocker_world.h b/hw/net/rocker/rocker_world.h index 18d277b..58ade47 100644 --- a/hw/net/rocker/rocker_world.h +++ b/hw/net/rocker/rocker_world.h @@ -33,6 +33,7 @@ typedef int (world_cmd)(World *world, DescInfo *info, RockerTlv *cmd_info_tlv); typedef struct world_ops { + const char *name; world_init *init; world_uninit *uninit; world_ig *ig; -- 2.4.3