[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL V2 09/12] rocker: allow user to specify rocker world
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL V2 09/12] rocker: allow user to specify rocker world by property |
Date: |
Tue, 8 Mar 2016 15:52:41 +0800 |
From: Jiri Pirko <address@hidden>
Add property to specify rocker world. All ports will be assigned to this
world.
Signed-off-by: Jiri Pirko <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
hw/net/rocker/rocker.c | 29 ++++++++++++++++++++++++++++-
1 file changed, 28 insertions(+), 1 deletion(-)
diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c
index 104c097..30f2ce4 100644
--- a/hw/net/rocker/rocker.c
+++ b/hw/net/rocker/rocker.c
@@ -43,6 +43,7 @@ struct rocker {
/* switch configuration */
char *name; /* switch name */
+ char *world_name; /* world name */
uint32_t fp_ports; /* front-panel port count */
NICPeers *fp_ports_peers;
MACAddr fp_start_macaddr; /* front-panel port 0 mac addr */
@@ -1286,6 +1287,18 @@ static void rocker_msix_uninit(Rocker *r)
rocker_msix_vectors_unuse(r, ROCKER_MSIX_VEC_COUNT(r->fp_ports));
}
+static World *rocker_world_type_by_name(Rocker *r, const char *name)
+{
+ int i;
+
+ for (i = 0; i < ROCKER_WORLD_TYPE_MAX; i++) {
+ if (strcmp(name, world_name(r->worlds[i])) == 0) {
+ return r->worlds[i];
+ }
+ }
+ return NULL;
+}
+
static int pci_rocker_init(PCIDevice *dev)
{
Rocker *r = to_rocker(dev);
@@ -1297,7 +1310,6 @@ static int pci_rocker_init(PCIDevice *dev)
/* allocate worlds */
r->worlds[ROCKER_WORLD_TYPE_OF_DPA] = of_dpa_world_alloc(r);
- r->world_dflt = r->worlds[ROCKER_WORLD_TYPE_OF_DPA];
for (i = 0; i < ROCKER_WORLD_TYPE_MAX; i++) {
if (!r->worlds[i]) {
@@ -1306,6 +1318,19 @@ static int pci_rocker_init(PCIDevice *dev)
}
}
+ if (!r->world_name) {
+ r->world_name =
g_strdup(world_name(r->worlds[ROCKER_WORLD_TYPE_OF_DPA]));
+ }
+
+ r->world_dflt = rocker_world_type_by_name(r, r->world_name);
+ if (!r->world_dflt) {
+ fprintf(stderr,
+ "rocker: requested world \"%s\" does not exist\n",
+ r->world_name);
+ err = -EINVAL;
+ goto err_world_type_by_name;
+ }
+
/* set up memory-mapped region at BAR0 */
memory_region_init_io(&r->mmio, OBJECT(r), &rocker_mmio_ops, r,
@@ -1439,6 +1464,7 @@ err_duplicate:
err_msix_init:
object_unparent(OBJECT(&r->msix_bar));
object_unparent(OBJECT(&r->mmio));
+err_world_type_by_name:
err_world_alloc:
for (i = 0; i < ROCKER_WORLD_TYPE_MAX; i++) {
if (r->worlds[i]) {
@@ -1510,6 +1536,7 @@ static void rocker_reset(DeviceState *dev)
static Property rocker_properties[] = {
DEFINE_PROP_STRING("name", Rocker, name),
+ DEFINE_PROP_STRING("world", Rocker, world_name),
DEFINE_PROP_MACADDR("fp_start_macaddr", Rocker,
fp_start_macaddr),
DEFINE_PROP_UINT64("switch_id", Rocker,
--
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, 2016/03/08
- [Qemu-devel] [PULL V2 09/12] rocker: allow user to specify rocker world by property,
Jason Wang <=
- [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