From: Shin-ichiro KAWASAKI <kawasaki@juno.dti.ne.jp>
To: linux-sh@vger.kernel.org
Subject: [PATCH] qemu-sh : pci nic interface modified
Date: Sun, 01 Feb 2009 07:58:45 +0000 [thread overview]
Message-ID: <49855635.1090108@juno.dti.ne.jp> (raw)
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 <kawasaki@juno.dti.ne.jp>
diff --git a/staging/sh4-r2d-update-pci-usb-and-kernel-management.patch b/staging/sh4-r2d-update-pci-usb-and-kernel-management.patch
index 6ff42e0..9017909 100644
--- a/staging/sh4-r2d-update-pci-usb-and-kernel-management.patch
+++ b/staging/sh4-r2d-update-pci-usb-and-kernel-management.patch
@@ -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)
reply other threads:[~2009-02-01 7:58 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=49855635.1090108@juno.dti.ne.jp \
--to=kawasaki@juno.dti.ne.jp \
--cc=linux-sh@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox