[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/4] Support addr=... in option argument of -net nic
|
From: |
Markus Armbruster |
|
Subject: |
[Qemu-devel] [PATCH 2/4] Support addr=... in option argument of -net nic |
|
Date: |
Thu, 18 Jun 2009 15:14:08 +0200 |
Make net_client_init() accept addr=, put the value into struct
NICinfo. Use it in pci_nic_init(), and remove arguments bus and
devfn.
Don't support addr= in third argument of monitor command pci_add,
because that clashes with its first argument. Admittedly unelegant.
Machines "malta" and "r2d" have a default NIC with a well-known PCI
address. Deal with that the same way as the NIC model: make
pci_nic_init() take an optional default to be used when the user
doesn't specify one.
Signed-off-by: Markus Armbruster <address@hidden>
---
hw/mips_malta.c | 10 +++++-----
hw/pc.c | 2 +-
hw/pci-hotplug.c | 11 +++++++----
hw/pci.c | 48 +++++++++++++++++++++++++++++++++++++++++++-----
hw/pci.h | 4 ++--
hw/ppc440_bamboo.c | 2 +-
hw/ppc_newworld.c | 2 +-
hw/ppc_oldworld.c | 2 +-
hw/ppc_prep.c | 2 +-
hw/ppce500_mpc8544ds.c | 2 +-
hw/r2d.c | 2 +-
hw/realview.c | 2 +-
hw/versatilepb.c | 2 +-
net.c | 5 ++++-
net.h | 1 +
qemu-options.hx | 7 ++++---
16 files changed, 75 insertions(+), 29 deletions(-)
diff --git a/hw/mips_malta.c b/hw/mips_malta.c
index ed104f0..e916468 100644
--- a/hw/mips_malta.c
+++ b/hw/mips_malta.c
@@ -474,19 +474,19 @@ static void audio_init (PCIBus *pci_bus)
#endif
/* Network support */
-static void network_init (PCIBus *pci_bus)
+static void network_init(void)
{
int i;
for(i = 0; i < nb_nics; i++) {
NICInfo *nd = &nd_table[i];
- int devfn = -1;
+ const char *default_devaddr = NULL;
if (i == 0 && (!nd->model || strcmp(nd->model, "pcnet") == 0))
/* The malta board has a PCNet card using PCI SLOT 11 */
- devfn = 88;
+ default_devaddr = "0b";
- pci_nic_init(pci_bus, nd, devfn, "pcnet");
+ pci_nic_init(nd, "pcnet", default_devaddr);
}
}
@@ -943,7 +943,7 @@ void mips_malta_init (ram_addr_t ram_size,
#endif
/* Network card */
- network_init(pci_bus);
+ network_init();
/* Optional PCI video card */
if (cirrus_vga_enabled) {
diff --git a/hw/pc.c b/hw/pc.c
index 143b697..4b918bb 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -1063,7 +1063,7 @@ static void pc_init1(ram_addr_t ram_size,
if (!pci_enabled || (nd->model && strcmp(nd->model, "ne2k_isa") == 0))
pc_init_ne2k_isa(nd, i8259);
else
- pci_nic_init(pci_bus, nd, -1, "ne2k_pci");
+ pci_nic_init(nd, "ne2k_pci", NULL);
}
qemu_system_hot_add_init();
diff --git a/hw/pci-hotplug.c b/hw/pci-hotplug.c
index 4d49c29..e2b14ca 100644
--- a/hw/pci-hotplug.c
+++ b/hw/pci-hotplug.c
@@ -33,15 +33,18 @@
#include "virtio-blk.h"
#if defined(TARGET_I386) || defined(TARGET_X86_64)
-static PCIDevice *qemu_pci_hot_add_nic(Monitor *mon, PCIBus *pci_bus,
- const char *opts)
+static PCIDevice *qemu_pci_hot_add_nic(Monitor *mon, const char *opts)
{
int ret;
ret = net_client_init(mon, "nic", opts);
if (ret < 0)
return NULL;
- return pci_nic_init(pci_bus, &nd_table[ret], -1, "rtl8139");
+ if (nd_table[ret].devaddr) {
+ monitor_printf(mon, "Parameter addr not supported\n");
+ return NULL;
+ }
+ return pci_nic_init(&nd_table[ret], "rtl8139", NULL);
}
void drive_hot_add(Monitor *mon, const char *pci_addr, const char *opts)
@@ -149,7 +152,7 @@ void pci_device_hot_add(Monitor *mon, const char *pci_addr,
const char *type,
}
if (strcmp(type, "nic") == 0)
- dev = qemu_pci_hot_add_nic(mon, pci_bus, opts);
+ dev = qemu_pci_hot_add_nic(mon, opts);
else if (strcmp(type, "storage") == 0)
dev = qemu_pci_hot_add_storage(mon, pci_bus, opts);
else
diff --git a/hw/pci.c b/hw/pci.c
index 36c92d7..1064de8 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -238,6 +238,24 @@ int pci_assign_devaddr(const char *addr, int *domp, int
*busp, unsigned *slotp)
return pci_parse_devaddr(devaddr, domp, busp, slotp);
}
+static PCIBus *pci_get_bus_devfn(int *devfnp, const char *devaddr)
+{
+ int dom, bus;
+ unsigned slot;
+
+ if (!devaddr) {
+ *devfnp = -1;
+ return pci_find_bus(0);
+ }
+
+ if (pci_parse_devaddr(devaddr, &dom, &bus, &slot) < 0) {
+ return NULL;
+ }
+
+ *devfnp = slot << 3;
+ return pci_find_bus(bus);
+}
+
/* -1 for devfn means auto assign */
static PCIDevice *do_pci_register_device(PCIDevice *pci_dev, PCIBus *bus,
const char *name, int devfn,
@@ -786,6 +804,24 @@ void pci_info(Monitor *mon)
pci_for_each_device(0, pci_info_device);
}
+static PCIDevice *pci_create(const char *name, const char *devaddr)
+{
+ PCIBus *bus;
+ int devfn;
+ DeviceState *dev;
+
+ bus = pci_get_bus_devfn(&devfn, devaddr);
+ if (!bus) {
+ fprintf(stderr, "Invalid PCI device address %s for device %s\n",
+ devaddr, name);
+ exit(1);
+ }
+
+ dev = qdev_create(&bus->qbus, name);
+ qdev_set_prop_int(dev, "devfn", devfn);
+ return (PCIDevice *)dev;
+}
+
static const char * const pci_nic_models[] = {
"ne2k_pci",
"i82551",
@@ -811,9 +847,11 @@ static const char * const pci_nic_names[] = {
};
/* Initialize a PCI NIC. */
-PCIDevice *pci_nic_init(PCIBus *bus, NICInfo *nd, int devfn,
- const char *default_model)
+PCIDevice *pci_nic_init(NICInfo *nd, const char *default_model,
+ const char *default_devaddr)
{
+ const char *devaddr = nd->devaddr ? nd->devaddr : default_devaddr;
+ PCIDevice *pci_dev;
DeviceState *dev;
int i;
@@ -821,12 +859,12 @@ PCIDevice *pci_nic_init(PCIBus *bus, NICInfo *nd, int
devfn,
for (i = 0; pci_nic_models[i]; i++) {
if (strcmp(nd->model, pci_nic_models[i]) == 0) {
- dev = qdev_create(&bus->qbus, pci_nic_names[i]);
- qdev_set_prop_int(dev, "devfn", devfn);
+ pci_dev = pci_create(pci_nic_names[i], devaddr);
+ dev = &pci_dev->qdev;
qdev_set_netdev(dev, nd);
qdev_init(dev);
nd->private = dev;
- return (PCIDevice *)dev;
+ return pci_dev;
}
}
diff --git a/hw/pci.h b/hw/pci.h
index fcca526..935de17 100644
--- a/hw/pci.h
+++ b/hw/pci.h
@@ -183,8 +183,8 @@ PCIBus *pci_register_bus(DeviceState *parent, const char
*name,
pci_set_irq_fn set_irq, pci_map_irq_fn map_irq,
qemu_irq *pic, int devfn_min, int nirq);
-PCIDevice *pci_nic_init(PCIBus *bus, NICInfo *nd, int devfn,
- const char *default_model);
+PCIDevice *pci_nic_init(NICInfo *nd, const char *default_model,
+ const char *default_devaddr);
void pci_data_write(void *opaque, uint32_t addr, uint32_t val, int len);
uint32_t pci_data_read(void *opaque, uint32_t addr, int len);
int pci_bus_num(PCIBus *s);
diff --git a/hw/ppc440_bamboo.c b/hw/ppc440_bamboo.c
index 00aa2c7..312abde 100644
--- a/hw/ppc440_bamboo.c
+++ b/hw/ppc440_bamboo.c
@@ -125,7 +125,7 @@ static void bamboo_init(ram_addr_t ram_size,
for (i = 0; i < nb_nics; i++) {
/* There are no PCI NICs on the Bamboo board, but there are
* PCI slots, so we can pick whatever default model we want. */
- pci_nic_init(pcibus, &nd_table[i], -1, "e1000");
+ pci_nic_init(&nd_table[i], "e1000", NULL);
}
}
diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c
index 22beedb..a1057b4 100644
--- a/hw/ppc_newworld.c
+++ b/hw/ppc_newworld.c
@@ -304,7 +304,7 @@ static void ppc_core99_init (ram_addr_t ram_size,
serial_hds[0], serial_hds[1], ESCC_CLOCK, 4);
for(i = 0; i < nb_nics; i++)
- pci_nic_init(pci_bus, &nd_table[i], -1, "ne2k_pci");
+ pci_nic_init(&nd_table[i], "ne2k_pci", NULL);
if (drive_get_max_bus(IF_IDE) >= MAX_IDE_BUS) {
fprintf(stderr, "qemu: too many IDE bus\n");
diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c
index b2c329b..686e81f 100644
--- a/hw/ppc_oldworld.c
+++ b/hw/ppc_oldworld.c
@@ -315,7 +315,7 @@ static void ppc_heathrow_init (ram_addr_t ram_size,
serial_hds[1], ESCC_CLOCK, 4);
for(i = 0; i < nb_nics; i++)
- pci_nic_init(pci_bus, &nd_table[i], -1, "ne2k_pci");
+ pci_nic_init(&nd_table[i], "ne2k_pci", NULL);
if (drive_get_max_bus(IF_IDE) >= MAX_IDE_BUS) {
diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c
index 83f2eca..b6f19a5 100644
--- a/hw/ppc_prep.c
+++ b/hw/ppc_prep.c
@@ -680,7 +680,7 @@ static void ppc_prep_init (ram_addr_t ram_size,
if (strcmp(nd_table[i].model, "ne2k_isa") == 0) {
isa_ne2000_init(ne2000_io[i], i8259[ne2000_irq[i]], &nd_table[i]);
} else {
- pci_nic_init(pci_bus, &nd_table[i], -1, "ne2k_pci");
+ pci_nic_init(&nd_table[i], "ne2k_pci", NULL);
}
}
diff --git a/hw/ppce500_mpc8544ds.c b/hw/ppce500_mpc8544ds.c
index d9ed36c..aff3ae2 100644
--- a/hw/ppce500_mpc8544ds.c
+++ b/hw/ppce500_mpc8544ds.c
@@ -225,7 +225,7 @@ static void mpc8544ds_init(ram_addr_t ram_size,
/* Register network interfaces. */
for (i = 0; i < nb_nics; i++) {
- pci_nic_init(pci_bus, &nd_table[i], -1, "virtio");
+ pci_nic_init(&nd_table[i], "virtio", NULL);
}
}
diff --git a/hw/r2d.c b/hw/r2d.c
index a529ab4..8ce6832 100644
--- a/hw/r2d.c
+++ b/hw/r2d.c
@@ -231,7 +231,7 @@ static void r2d_init(ram_addr_t ram_size,
/* NIC: rtl8139 on-board, and 2 slots. */
for (i = 0; i < nb_nics; i++)
- pci_nic_init(pci, &nd_table[i], (i==0)? 2<<3: -1, "rtl8139");
+ pci_nic_init(&nd_table[i], "rtl8139", i==0 ? "2" : NULL);
/* Todo: register on board registers */
if (kernel_filename) {
diff --git a/hw/realview.c b/hw/realview.c
index 62d8bf5..8e176b9 100644
--- a/hw/realview.c
+++ b/hw/realview.c
@@ -125,7 +125,7 @@ static void realview_init(ram_addr_t ram_size,
smc91c111_init(nd, 0x4e000000, pic[28]);
done_smc = 1;
} else {
- pci_nic_init(pci_bus, nd, -1, "rtl8139");
+ pci_nic_init(nd, "rtl8139", NULL);
}
}
diff --git a/hw/versatilepb.c b/hw/versatilepb.c
index 1f1b1bc..3371121 100644
--- a/hw/versatilepb.c
+++ b/hw/versatilepb.c
@@ -212,7 +212,7 @@ static void versatile_init(ram_addr_t ram_size,
smc91c111_init(nd, 0x10010000, sic[25]);
done_smc = 1;
} else {
- pci_nic_init(pci_bus, nd, -1, "rtl8139");
+ pci_nic_init(nd, "rtl8139", NULL);
}
}
if (usb_enabled) {
diff --git a/net.c b/net.c
index af9de73..baa3412 100644
--- a/net.c
+++ b/net.c
@@ -2103,7 +2103,7 @@ int net_client_init(Monitor *mon, const char *device,
const char *p)
}
if (!strcmp(device, "nic")) {
static const char * const nic_params[] = {
- "vlan", "name", "macaddr", "model", NULL
+ "vlan", "name", "macaddr", "model", "addr", NULL
};
NICInfo *nd;
uint8_t *macaddr;
@@ -2138,6 +2138,9 @@ int net_client_init(Monitor *mon, const char *device,
const char *p)
if (get_param_value(buf, sizeof(buf), "model", p)) {
nd->model = strdup(buf);
}
+ if (get_param_value(buf, sizeof(buf), "addr", p)) {
+ nd->devaddr = strdup(buf);
+ }
nd->vlan = vlan;
nd->name = name;
nd->used = 1;
diff --git a/net.h b/net.h
index 89e7706..763d56f 100644
--- a/net.h
+++ b/net.h
@@ -88,6 +88,7 @@ struct NICInfo {
uint8_t macaddr[6];
const char *model;
const char *name;
+ const char *devaddr;
VLANState *vlan;
void *private;
int used;
diff --git a/qemu-options.hx b/qemu-options.hx
index 9d5e05a..895b248 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -733,7 +733,7 @@ STEXI
ETEXI
DEF("net", HAS_ARG, QEMU_OPTION_net,
- "-net nic[,vlan=n][,macaddr=addr][,model=type][,name=str]\n"
+ "-net nic[,vlan=n][,macaddr=mac][,model=type][,name=str][,addr=str]\n"
" create a new Network Interface Card and connect it to
VLAN 'n'\n"
#ifdef CONFIG_SLIRP
"-net user[,vlan=n][,name=str][,hostname=host]\n"
@@ -767,10 +767,11 @@ DEF("net", HAS_ARG, QEMU_OPTION_net,
"-net none use it alone to have zero network devices; if no -net
option\n"
" is provided, the default is '-net nic -net user'\n")
STEXI
address@hidden -net
nic[,address@hidden,address@hidden,address@hidden,address@hidden
address@hidden -net
nic[,address@hidden,address@hidden,address@hidden,address@hidden,address@hidden
Create a new Network Interface Card and connect it to VLAN @var{n} (@var{n}
= 0 is the default). The NIC is an ne2k_pci by default on the PC
-target. Optionally, the MAC address can be changed to @var{addr}
+target. Optionally, the MAC address can be changed to @var{mac}, the
+device address set to @var{addr} (PCI cards only),
and a @var{name} can be assigned for use in monitor commands. If no
@option{-net} option is specified, a single NIC is created.
Qemu can emulate several different models of network card.
--
1.6.0.6
- [Qemu-devel] [RFC PATCH 0/4] Configurable PCI device addresses, Markus Armbruster, 2009/06/18
- [Qemu-devel] [PATCH 4/4] Support addr=... in option argument of -drive if=virtio, Markus Armbruster, 2009/06/18
- [Qemu-devel] [PATCH 1/4] Fix do_pci_register_device() to reject devfn already in use, Markus Armbruster, 2009/06/18
- [Qemu-devel] [PATCH 3/4] Make first argument of monitor command pci_add work, Markus Armbruster, 2009/06/18
- [Qemu-devel] [PATCH 2/4] Support addr=... in option argument of -net nic,
Markus Armbruster <=
- Re: [Qemu-devel] [RFC PATCH 0/4] Configurable PCI device addresses, Richard W.M. Jones, 2009/06/18
- Re: [Qemu-devel] [RFC PATCH 0/4] Configurable PCI device addresses, Gerd Hoffmann, 2009/06/18