qemu-sh : pci nic interface modified

PATCH New Shin-ichiro KAWASAKI 1 participant 1 message Feb 1, 2009 SuperH

Share & tools

Shin-ichiro KAWASAKI

author

2009-02-01 07:58 UTC #0 lore raw

PATCH 1/1 qemu-sh : pci nic interface modified

QEMU revision 6287 modifies pci nic interface. As a result, 'sh4-r2d-update-pci-usb-and-kernel-management.patch' does not apply smoothly. This patch solves it.

Signed-off-by Shin-ichiro KAWASAKI <[email protected]>

staging/sh4-r2d-update-pci-usb-and-kernel-management.patch +3 -3

index 6ff42e0..9017909 100644
@@ -28,11 +28,11 @@ Index: qemu/hw/r2d.c
 +    pci = sh_pci_register_bus(r2d_pci_set_irq, r2d_pci_map_irq, irq, 0, 4);
  
      /* NIC: rtl8139 on-board, and 2 slots. */
--    pci_rtl8139_init(pci, &nd_table[0], 2 << 3);
+-    pci_nic_init(pci, &nd_table[0], 2 << 3, "rtl8139");
 +    if (nb_nics)
-+        pci_rtl8139_init(pci, &nd_table[0], 2 << 3);
++        pci_nic_init(pci, &nd_table[0], 2 << 3, "rtl8139");
      for (i = 1; i < nb_nics; i++)
-         pci_nic_init(pci, &nd_table[i], -1);
+         pci_nic_init(pci, &nd_table[i], -1, "ne2k_pci");
  
 +    /* USB OHCI for keyboard & mouse */
 +    if (usb_enabled)