From: Aurelien Jarno <aurelien@aurel32.net>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [6673] sh4: r2d fix no ide/net case
Date: Tue, 03 Mar 2009 06:23:18 +0000 [thread overview]
Message-ID: <E1LeO2A-0005ff-4h@cvs.savannah.gnu.org> (raw)
Revision: 6673
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6673
Author: aurel32
Date: 2009-03-03 06:23:17 +0000 (Tue, 03 Mar 2009)
Log Message:
-----------
sh4: r2d fix no ide/net case
Fix invalid access/crash when there is no IDE device or NET device.
Signed-off-by: Takashi YOSHII <takasi-y@ops.dti.ne.jp>
Tested-by: Shin-ichiro KAWASAKI <kawasaki@juno.dti.ne.jp>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Modified Paths:
--------------
trunk/hw/r2d.c
Modified: trunk/hw/r2d.c
===================================================================
--- trunk/hw/r2d.c 2009-03-03 06:14:43 UTC (rev 6672)
+++ trunk/hw/r2d.c 2009-03-03 06:23:17 UTC (rev 6673)
@@ -224,13 +224,13 @@
serial_hds[2]);
/* onboard CF (True IDE mode, Master only). */
- mmio_ide_init(0x14001000, 0x1400080c, irq[CF_IDE], 1,
- drives_table[drive_get_index(IF_IDE, 0, 0)].bdrv, NULL);
+ if ((i = drive_get_index(IF_IDE, 0, 0)) != -1)
+ mmio_ide_init(0x14001000, 0x1400080c, irq[CF_IDE], 1,
+ drives_table[i].bdrv, NULL);
/* NIC: rtl8139 on-board, and 2 slots. */
- 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, "ne2k_pci");
+ for (i = 0; i < nb_nics; i++)
+ pci_nic_init(pci, &nd_table[i], (i==0)? 2<<3: -1, "rtl8139");
/* Todo: register on board registers */
{
reply other threads:[~2009-03-03 6:23 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=E1LeO2A-0005ff-4h@cvs.savannah.gnu.org \
--to=aurelien@aurel32.net \
--cc=qemu-devel@nongnu.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;
as well as URLs for NNTP newsgroup(s).