-# HVM NIC types
-HT_HVM_NIC_RTL8139 = "rtl8139"
-HT_HVM_NIC_NE2K_PCI = "ne2k_pci"
-HT_HVM_NIC_NE2K_ISA = "ne2k_isa"
-HT_HVM_DEV_PARAVIRTUAL = "paravirtual"
-HT_HVM_DEV_IOEMU = "ioemu"
-HT_HVM_VALID_NIC_TYPES = frozenset([HT_HVM_NIC_RTL8139, HT_HVM_NIC_NE2K_PCI,
- HT_HVM_NIC_NE2K_ISA,
- HT_HVM_DEV_PARAVIRTUAL])
-HT_HVM_VALID_DISK_TYPES = frozenset([HT_HVM_DEV_PARAVIRTUAL, HT_HVM_DEV_IOEMU])
+# Device types
+HT_NIC_RTL8139 = "rtl8139"
+HT_NIC_NE2K_PCI = "ne2k_pci"
+HT_NIC_NE2K_ISA = "ne2k_isa"
+HT_NIC_I82551 = "i82551"
+HT_NIC_I85557B = "i82557b"
+HT_NIC_I8259ER = "i82559er"
+HT_NIC_PCNET = "pcnet"
+HT_NIC_E1000 = "e1000"
+HT_NIC_PARAVIRTUAL = HT_DISK_PARAVIRTUAL = "paravirtual"
+HT_DISK_IOEMU = "ioemu"
+HT_DISK_IDE = "ide"
+HT_DISK_SCSI = "scsi"
+HT_DISK_SD = "sd"
+HT_DISK_MTD = "mtd"
+HT_DISK_PFLASH = "pflash"
+
+HT_HVM_VALID_NIC_TYPES = frozenset([HT_NIC_RTL8139, HT_NIC_NE2K_PCI,
+ HT_NIC_NE2K_ISA, HT_NIC_PARAVIRTUAL])
+HT_HVM_VALID_DISK_TYPES = frozenset([HT_DISK_PARAVIRTUAL, HT_DISK_IOEMU])
+HT_KVM_VALID_NIC_TYPES = frozenset([HT_NIC_RTL8139, HT_NIC_NE2K_PCI,
+ HT_NIC_NE2K_ISA, HT_NIC_I82551,
+ HT_NIC_I85557B, HT_NIC_I8259ER,
+ HT_NIC_PCNET, HT_NIC_E1000,
+ HT_NIC_PARAVIRTUAL])
+HT_KVM_VALID_DISK_TYPES = frozenset([HT_DISK_PARAVIRTUAL, HT_DISK_IDE,
+ HT_DISK_SCSI, HT_DISK_SD, HT_DISK_MTD,
+ HT_DISK_PFLASH])