[libvirt] [v2 03/13] Add USB controller models
Changes since v1:
- Added pci-ohci
---
docs/schemas/domain.rng | 9 +++++++++
src/conf/domain_conf.c | 11 +++++++++++
src/conf/domain_conf.h | 13 +++++++++++++
src/libvirt_private.syms | 2 ++
4 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng
index dd8c41a..04c9b61 100644
--- a/docs/schemas/domain.rng
+++ b/docs/schemas/domain.rng
@@ -909,6 +909,15 @@
<value>lsilogic</value>
<value>lsisas1068</value>
<value>vmpvscsi</value>
+ <value>piix3-uhci</value>
+ <value>piix4-uhci</value>
+ <value>ehci</value>
+ <value>ich9-ehci1</value>
+ <value>ich9-uhci1</value>
+ <value>ich9-uhci2</value>
+ <value>ich9-uhci3</value>
+ <value>vt82c686b-uhci</value>
+ <value>pci-ohci</value>
</choice>
</attribute>
</optional>
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 5e91d54..0361065 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -202,6 +202,17 @@ VIR_ENUM_IMPL(virDomainControllerModelSCSI,
VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAS
"lsisas1068",
"vmpvscsi")
+VIR_ENUM_IMPL(virDomainControllerModelUSB, VIR_DOMAIN_CONTROLLER_MODEL_USB_LAST,
+ "piix3-uhci",
+ "piix4-uhci",
+ "ehci",
+ "ich9-ehci1",
+ "ich9-uhci1",
+ "ich9-uhci2",
+ "ich9-uhci3",
+ "vt82c686b-uhci",
+ "pci-ohci")
+
VIR_ENUM_IMPL(virDomainFS, VIR_DOMAIN_FS_TYPE_LAST,
"mount",
"block",
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 8a4cd11..e378a9c 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -267,6 +267,18 @@ enum virDomainControllerModelSCSI {
VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST
};
+enum virDomainControllerModelUSB {
+ VIR_DOMAIN_CONTROLLER_MODEL_USB_PIIX3_UHCI,
+ VIR_DOMAIN_CONTROLLER_MODEL_USB_PIIX4_UHCI,
+ VIR_DOMAIN_CONTROLLER_MODEL_USB_EHCI,
+ VIR_DOMAIN_CONTROLLER_MODEL_USB_ICH9_EHCI1,
+ VIR_DOMAIN_CONTROLLER_MODEL_USB_ICH9_UHCI1,
+ VIR_DOMAIN_CONTROLLER_MODEL_USB_ICH9_UHCI2,
+ VIR_DOMAIN_CONTROLLER_MODEL_USB_ICH9_UHCI3,
+ VIR_DOMAIN_CONTROLLER_MODEL_USB_VT82C686B_UHCI,
+ VIR_DOMAIN_CONTROLLER_MODEL_USB_PCI_OHCI,
+
+ VIR_DOMAIN_CONTROLLER_MODEL_USB_LAST
};
typedef struct _virDomainVirtioSerialOpts virDomainVirtioSerialOpts;
@@ -1676,6 +1688,7 @@ VIR_ENUM_DECL(virDomainIoEventFd)
VIR_ENUM_DECL(virDomainVirtioEventIdx)
VIR_ENUM_DECL(virDomainController)
VIR_ENUM_DECL(virDomainControllerModelSCSI)
+VIR_ENUM_DECL(virDomainControllerModelUSB)
VIR_ENUM_DECL(virDomainFS)
VIR_ENUM_DECL(virDomainFSAccessMode)
VIR_ENUM_DECL(virDomainNet)
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 91ecd7b..74948b8 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -248,6 +248,8 @@ virDomainConfigFile;
virDomainControllerDefFree;
virDomainControllerInsert;
virDomainControllerInsertPreAlloced;
+virDomainControllerModelUSBTypeFromString;
+virDomainControllerModelUSBTypeToString;
virDomainControllerModelSCSITypeFromString;
virDomainControllerModelSCSITypeToString;
virDomainControllerTypeToString;
--
1.7.6