From 5607c38820366954c38dd702e979499486057481 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 18 Jun 2009 15:14:08 +0200 Subject: 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 Signed-off-by: Anthony Liguori --- hw/ppc_oldworld.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'hw/ppc_oldworld.c') diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c index b2c329b74f..686e81f02f 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) { -- cgit v1.2.3