From patchwork Fri Feb 19 10:06:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 8359171 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id ACE8DC0553 for ; Fri, 19 Feb 2016 10:08:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CCF1620416 for ; Fri, 19 Feb 2016 10:08:28 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0D936203F7 for ; Fri, 19 Feb 2016 10:08:26 +0000 (UTC) Received: from localhost ([::1]:50633 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWhz7-0004a7-8b for patchwork-qemu-devel@patchwork.kernel.org; Fri, 19 Feb 2016 05:08:25 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59399) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWhxc-0001o0-2B for qemu-devel@nongnu.org; Fri, 19 Feb 2016 05:06:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aWhxY-0008Ju-8b for qemu-devel@nongnu.org; Fri, 19 Feb 2016 05:06:52 -0500 Received: from mail-wm0-x22a.google.com ([2a00:1450:400c:c09::22a]:35035) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWhxY-0008Iu-0d for qemu-devel@nongnu.org; Fri, 19 Feb 2016 05:06:48 -0500 Received: by mail-wm0-x22a.google.com with SMTP id c200so67812852wme.0 for ; Fri, 19 Feb 2016 02:06:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=51+iycUkwAS4phQDX2qg8/UkUryLK0CfClWeLtWc8s0=; b=h+dZBIN9Fahb87vjfDKLx/5LhEW+eJ4sSnrjVZ5DDNrWegPbtMgaF0kaGuNCjWyNFc 0EduUaOlHmRIyPzj/GddGauxJyRK6b3vA9Fo/AjjsVY4UEshvAEwGc3GSPqXDBDWmQYd GpUNShgLpM3sLKusRbOaDgrG4OEk1U3Ag72Fm+6haLGMm+ez4GFivQXN2MbFEBdelHXJ QWHpfwxZriGCe/qN4BjmlMDDotRJ3dyb68+B2jIu6o5k4651lE2syoz/pYjUbpTlZkHG LMQpyJPBGdmq1vh4RmE6SE/NS/bsTP3k2vM+n6DAfBPnnrkbQ+7hLjB25JpqFEHy2ABB 2HbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=51+iycUkwAS4phQDX2qg8/UkUryLK0CfClWeLtWc8s0=; b=VMymdORjmcHdC0lIyAEYGjxN5XFs3HTuo7wHXy5RxNXJKcqYWoGcxP32hYm2kV1Z/z MUXDBrLvs/+KBA1QoHczdSA88lR4Zd74LCUrLvizYofnucXgBYqePikMYsQ9xZyVRskj lNTMNVk2TyN1dZv2JeBR5SCZrdwUUbMfRjKYHn+JDMPD4tHiXt1zp1QpqIitAz+SxLGB Y3goV3iPzOHrw37StRG+V/RPLr9F/eQZzp1+AQWF80fVQ8x6U6+WqTpZCM372Gxw5XM5 a+OjNFN6j5e2Y7MmbzCY88zGygnGKx41+7G2bfYat1O3wWnAqaMT0XqJnpcO2eGwFrcm faZA== X-Gm-Message-State: AG10YOSHU4WD8fPItUZXtwmZWL8Vu4TNa37bmUC7eEvxACpGKzcYBK5qhIEZfefNB/VRSQ== X-Received: by 10.194.216.40 with SMTP id on8mr13694926wjc.40.1455876407344; Fri, 19 Feb 2016 02:06:47 -0800 (PST) Received: from localhost ([2001:470:6f:505::8f2]) by smtp.gmail.com with ESMTPSA id lc3sm10529012wjb.7.2016.02.19.02.06.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 19 Feb 2016 02:06:46 -0800 (PST) From: Jiri Pirko To: qemu-devel@nongnu.org Date: Fri, 19 Feb 2016 11:06:42 +0100 Message-Id: <1455876403-8575-3-git-send-email-jiri@resnulli.us> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1455876403-8575-1-git-send-email-jiri@resnulli.us> References: <1455876403-8575-1-git-send-email-jiri@resnulli.us> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::22a 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 Subject: [Qemu-devel] [patch qemu 2/3] rocker: add name field into WorldOps ale let world specify its name X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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;