diff options
| author | Markus Armbruster <armbru@redhat.com> | 2009-06-18 15:14:08 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-06-22 10:15:29 -0500 |
| commit | 5607c38820366954c38dd702e979499486057481 (patch) | |
| tree | 9d7f6624fc7b24c6eb887d4b634f57cb6f2b33f1 /hw/r2d.c | |
| parent | 07b7d05377a5e2b242ef0cce3d461d3284700fc0 (diff) | |
| download | focaccia-qemu-5607c38820366954c38dd702e979499486057481.tar.gz focaccia-qemu-5607c38820366954c38dd702e979499486057481.zip | |
Support addr=... in option argument of -net nic
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 <armbru@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/r2d.c')
| -rw-r--r-- | hw/r2d.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/r2d.c b/hw/r2d.c index a529ab4a83..8ce68325c2 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) { |