[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL V2 08/12] rocker: add name field into WorldOps ale le
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL V2 08/12] rocker: add name field into WorldOps ale let world specify its name |
Date: |
Tue, 8 Mar 2016 15:52:40 +0800 |
From: Jiri Pirko <address@hidden>
Also use this in world_name getter function.
Signed-off-by: Jiri Pirko <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
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.5.0
- [Qemu-devel] [PULL V2 00/12] Net patches, Jason Wang, 2016/03/08
- [Qemu-devel] [PULL V2 01/12] net: ne2000: check ring buffer control registers, Jason Wang, 2016/03/08
- [Qemu-devel] [PULL V2 02/12] net: filter: correctly remove filter from the list during finalization, Jason Wang, 2016/03/08
- [Qemu-devel] [PULL V2 03/12] MAINTAINERS: Add entries for include/net/ files, Jason Wang, 2016/03/08
- [Qemu-devel] [PULL V2 04/12] net: simplify net_init_tap_one logic, Jason Wang, 2016/03/08
- [Qemu-devel] [PULL V2 05/12] net: netmap: probe netmap interface for virtio-net header, Jason Wang, 2016/03/08
- [Qemu-devel] [PULL V2 06/12] rocker: forbid to change world type, Jason Wang, 2016/03/08
- [Qemu-devel] [PULL V2 07/12] rocker: return -ENOMEM in case of some world alloc fails, Jason Wang, 2016/03/08
- [Qemu-devel] [PULL V2 08/12] rocker: add name field into WorldOps ale let world specify its name,
Jason Wang <=
- [Qemu-devel] [PULL V2 09/12] rocker: allow user to specify rocker world by property, Jason Wang, 2016/03/08
- [Qemu-devel] [PULL V2 10/12] filter: Add 'status' property for filter object, Jason Wang, 2016/03/08
- [Qemu-devel] [PULL V2 11/12] filter-buffer: Add status_changed callback processing, Jason Wang, 2016/03/08
- [Qemu-devel] [PULL V2 12/12] net: check packet payload length, Jason Wang, 2016/03/08
- Re: [Qemu-devel] [PULL V2 00/12] Net patches, Peter Maydell, 2016/03/08