Fix up ipf.c for recent merges

Commit Message

Markus Armbruster July 1, 2009, 4:24 p.m. UTC

Commit 42f0a928 merged support for addr=... in option argument of -net
nic, but failed to update ipf_init1().

Commit 7a8f3ed9 merged support for addr=... in option argument of
-drive if=virtio, but failed to update ipf_init1().

Untested.

Signed-off-by: Markus Armbruster <[e-mail]>
---
 hw/ipf.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

Comments

Avi Kivity July 2, 2009, 12:04 p.m. UTC | #1

On 07/01/2009 07:24 PM, Markus Armbruster wrote:
> Commit 42f0a928 merged support for addr=... in option argument of -net
> nic, but failed to update ipf_init1().
>
> Commit 7a8f3ed9 merged support for addr=... in option argument of
> -drive if=virtio, but failed to update ipf_init1().
>
> Untested.
>    

Applied, thanks.

Patch

diff --git a/hw/ipf.c b/hw/ipf.c
index 8aec258..04b7b2c 100644
--- a/hw/ipf.c
+++ b/hw/ipf.c
@@ -384,6 +384,7 @@  static void ipf_init1(ram_addr_t ram_size,
     ram_addr_t ram_addr;
     ram_addr_t above_4g_mem_size = 0;
     PCIBus *pci_bus;
+    PCIDevice *pci_dev;
     int piix3_devfn = -1;
     CPUState *env;
     qemu_irq *cpu_irq;
@@ -543,7 +544,7 @@  static void ipf_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, "e1000");
+            pci_nic_init(nd, "e1000", NULL);
     }
 
 #undef USE_HYPERCALL  //Disable it now, need to implement later!
@@ -628,7 +629,9 @@  static void ipf_init1(ram_addr_t ram_size,
 	int unit_id = 0;
 
 	while ((index = drive_get_index(IF_VIRTIO, 0, unit_id)) != -1) {
-            pci_create_simple(pci_bus, -1, "virtio-blk-pci");
+            pci_dev = pci_create("virtio-blk-pci",
+                                 drives_table[index].devaddr);
+            qdev_init(&pci_dev->qdev);
 	    unit_id++;
 	}
     }