| Message ID | 1520578898-2610-1-git-send-email-thuth@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | hw/ppc/spapr: Allow "spapr-vlan" as NIC model name beside "ibmveth" | expand |
On Fri, 9 Mar 2018 08:01:38 +0100 Thomas Huth <thuth@redhat.com> wrote: > With the new "--nic" command line parameter option, the "old" way of > specifying a NIC model via the nd_table[] is becoming more prominent > again. But for the pseries "spapr-vlan" device, there is a confusing > discrepancy between the model name that is used for "--device" (i.e. > "spapr-vlan") and the model name that has to be used for "--net nic" > or the new "--nic" parameter (i.e. "ibmveth"). Since "spapr-vlan" is > the "real" name of the device, let's allow "spapr-vlan" to be used > as model name for the nd_table[] entries, too. > > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- Reviewed-by: Greg Kurz <groug@kaod.org> > hw/ppc/spapr.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 7e1c858..dfa9e43 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -2607,10 +2607,11 @@ static void spapr_machine_init(MachineState *machine) > NICInfo *nd = &nd_table[i]; > > if (!nd->model) { > - nd->model = g_strdup("ibmveth"); > + nd->model = g_strdup("spapr-vlan"); > } > > - if (strcmp(nd->model, "ibmveth") == 0) { > + if (g_str_equal(nd->model, "spapr-vlan") || > + g_str_equal(nd->model, "ibmveth")) { > spapr_vlan_create(spapr->vio_bus, nd); > } else { > pci_nic_init_nofail(&nd_table[i], phb->bus, nd->model, NULL);
On Fri, Mar 09, 2018 at 08:01:38AM +0100, Thomas Huth wrote: > With the new "--nic" command line parameter option, the "old" way of > specifying a NIC model via the nd_table[] is becoming more prominent > again. But for the pseries "spapr-vlan" device, there is a confusing > discrepancy between the model name that is used for "--device" (i.e. > "spapr-vlan") and the model name that has to be used for "--net nic" > or the new "--nic" parameter (i.e. "ibmveth"). Since "spapr-vlan" is > the "real" name of the device, let's allow "spapr-vlan" to be used > as model name for the nd_table[] entries, too. > > Signed-off-by: Thomas Huth <thuth@redhat.com> Applied, thanks. > --- > hw/ppc/spapr.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 7e1c858..dfa9e43 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -2607,10 +2607,11 @@ static void spapr_machine_init(MachineState *machine) > NICInfo *nd = &nd_table[i]; > > if (!nd->model) { > - nd->model = g_strdup("ibmveth"); > + nd->model = g_strdup("spapr-vlan"); > } > > - if (strcmp(nd->model, "ibmveth") == 0) { > + if (g_str_equal(nd->model, "spapr-vlan") || > + g_str_equal(nd->model, "ibmveth")) { > spapr_vlan_create(spapr->vio_bus, nd); > } else { > pci_nic_init_nofail(&nd_table[i], phb->bus, nd->model, NULL);
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 7e1c858..dfa9e43 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2607,10 +2607,11 @@ static void spapr_machine_init(MachineState *machine) NICInfo *nd = &nd_table[i]; if (!nd->model) { - nd->model = g_strdup("ibmveth"); + nd->model = g_strdup("spapr-vlan"); } - if (strcmp(nd->model, "ibmveth") == 0) { + if (g_str_equal(nd->model, "spapr-vlan") || + g_str_equal(nd->model, "ibmveth")) { spapr_vlan_create(spapr->vio_bus, nd); } else { pci_nic_init_nofail(&nd_table[i], phb->bus, nd->model, NULL);
With the new "--nic" command line parameter option, the "old" way of specifying a NIC model via the nd_table[] is becoming more prominent again. But for the pseries "spapr-vlan" device, there is a confusing discrepancy between the model name that is used for "--device" (i.e. "spapr-vlan") and the model name that has to be used for "--net nic" or the new "--nic" parameter (i.e. "ibmveth"). Since "spapr-vlan" is the "real" name of the device, let's allow "spapr-vlan" to be used as model name for the nd_table[] entries, too. Signed-off-by: Thomas Huth <thuth@redhat.com> --- hw/ppc/spapr.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)