From: blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Sat, 17 Jan 2009 18:41:53 +0000 (+0000)
Subject: Switch to CMD646 IDE
X-Git-Tag: stefano.display-merge-end~80
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=3b898ddaf37819f1054a82461baf632a28ab2fd9;p=qemu-xen-3.4-testing.git

Switch to CMD646 IDE

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6361 c046a42c-6fe2-441c-8c8c-71466251a162
---

diff --git a/hw/sun4u.c b/hw/sun4u.c
index 938e8b27..59aee1b0 100644
--- a/hw/sun4u.c
+++ b/hw/sun4u.c
@@ -552,8 +552,8 @@ static void sun4uv_init(ram_addr_t RAM_size, int vga_ram_size,
            hd[i] = NULL;
     }
 
-    // XXX pci_cmd646_ide_init(pci_bus, hd, 1);
-    pci_piix3_ide_init(pci_bus, hd, -1, irq);
+    pci_cmd646_ide_init(pci_bus, hd, 1);
+
     /* FIXME: wire up interrupts.  */
     i8042_init(NULL/*1*/, NULL/*12*/, 0x60);
     for(i = 0; i < MAX_FD; i++) {