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/versatilepb.c | |
| parent | 07b7d05377a5e2b242ef0cce3d461d3284700fc0 (diff) | |
| download | qemu-5607c38820366954c38dd702e979499486057481.zip qemu-5607c38820366954c38dd702e979499486057481.tar.gz qemu-5607c38820366954c38dd702e979499486057481.tar.bz2 | |
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/versatilepb.c')
| -rw-r--r-- | hw/versatilepb.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) { |