From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Tue, 24 Oct 2006 14:31:54 +0000 (+0000)
Subject: ata_piix and ahci both claim the same chipsets, and it
X-Git-Tag: planetlab-4_0-rc1~18
X-Git-Url: http://git.onelab.eu/?p=bootmanager.git;a=commitdiff_plain;h=cdd7e0feae90c4cbc7cbda29815a68c550400832

ata_piix and ahci both claim the same chipsets, and it
is usually a non-visible BIOS option that decides which is
appropriate. Prefer ata_piix over ahci for now.
---

diff --git a/source/merge_hw_tables.py b/source/merge_hw_tables.py
index 036d0e6..ab0ae5f 100755
--- a/source/merge_hw_tables.py
+++ b/source/merge_hw_tables.py
@@ -129,6 +129,12 @@ def merge_files(modules_dep_path, modules_pcimap_path, pcitable_path):
         if module == "mptbase":
             module= "mptscsih"
 
+        # XXX ata_piix and ahci both claim the same chipsets, and it
+        # is usually a non-visible BIOS option that decides which is
+        # appropriate. Prefer ata_piix over ahci for now.
+        if module == "ahci":
+            module= "ata_piix"
+
         try:
             vendor_id= long(line_parts[1],16)
         except ValueError, e: