diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 2dd3fd2e92..5305f82daa 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -1657,8 +1657,8 @@
attributes ports
and vectors
, which
control how many devices can be connected through the
controller. A "scsi" controller has an optional
- attribute model
, which is one of "auto", "buslogic",
- "ibmvscsi", "lsilogic", "lsias1068" or "vmpvscsi".
+ attribute model
, which is one of "auto",
+ "buslogic", "lsilogic", "lsias1068", or "vmpvscsi".
A "usb" controller has an optional attribute model
,
which is one of "piix3-uhci", "piix4-uhci", "ehci",
"ich9-ehci1", "ich9-uhci1", "ich9-uhci2", "ich9-uhci3",
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index d3deaea457..e276a92ce1 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -1120,7 +1120,6 @@
lsilogic
lsisas1068
vmpvscsi
- ibmvscsi
piix3-uhci
piix4-uhci
ehci
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 4d4cc84062..f8d0a4ced4 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -237,8 +237,7 @@ VIR_ENUM_IMPL(virDomainControllerModelSCSI, VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAS
"buslogic",
"lsilogic",
"lsisas1068",
- "vmpvscsi",
- "ibmvscsi");
+ "vmpvscsi")
VIR_ENUM_IMPL(virDomainControllerModelUSB, VIR_DOMAIN_CONTROLLER_MODEL_USB_LAST,
"piix3-uhci",
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 3dd0b5d8f4..59aff0dc00 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -451,7 +451,6 @@ enum virDomainControllerModelSCSI {
VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOGIC,
VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSISAS1068,
VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VMPVSCSI,
- VIR_DOMAIN_CONTROLLER_MODEL_SCSI_IBMVSCSI,
VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST
};
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 57387106fc..99d7129b78 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -2355,30 +2355,14 @@ qemuBuildControllerDevStr(virDomainDefPtr domainDef,
int *nusbcontroller)
{
virBuffer buf = VIR_BUFFER_INITIALIZER;
- int model;
switch (def->type) {
case VIR_DOMAIN_CONTROLLER_TYPE_SCSI:
- model = def->model;
- if (model == -1 || model == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_AUTO) {
- if (STREQ(domainDef->os.arch, "ppc64") &&
- STREQ(domainDef->os.machine, "pseries")) {
- model = VIR_DOMAIN_CONTROLLER_MODEL_SCSI_IBMVSCSI;
- } else {
- model = VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOGIC;
- }
- }
- switch (model) {
- case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOGIC:
- virBufferAddLit(&buf, "lsi");
- break;
- case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_IBMVSCSI:
+ if (STREQ(domainDef->os.arch, "ppc64") &&
+ STREQ(domainDef->os.machine, "pseries")) {
virBufferAddLit(&buf, "spapr-vscsi");
- break;
- default:
- qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED,
- _("Unsupported controller model: %s"),
- virDomainControllerModelSCSITypeToString(model));
+ } else {
+ virBufferAddLit(&buf, "lsi");
}
virBufferAsprintf(&buf, ",id=scsi%d", def->idx);
break;
diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
index 5ebd81d14c..823d5dfc9c 100644
--- a/src/vmx/vmx.c
+++ b/src/vmx/vmx.c
@@ -481,17 +481,16 @@ def->parallels[0]...
#define VMX_BUILD_NAME(_suffix) \
VMX_BUILD_NAME_EXTRA(_suffix, #_suffix)
-/* directly map the virDomainControllerModel to virVMXSCSIControllerModel.
- * Using an uppercase name for unused values ensures that they will never
- * be used. */
+/* directly map the virDomainControllerModel to virVMXSCSIControllerModel,
+ * this is good enough for now because all virDomainControllerModel values
+ * are actually SCSI controller models in the ESX case */
VIR_ENUM_DECL(virVMXControllerModelSCSI)
VIR_ENUM_IMPL(virVMXControllerModelSCSI, VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST,
"auto", /* just to match virDomainControllerModel, will never be used */
"buslogic",
"lsilogic",
"lsisas1068",
- "pvscsi",
- "UNUSED ibmvscsi");
+ "pvscsi");
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.args
deleted file mode 100644
index 799eb920eb..0000000000
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.args
+++ /dev/null
@@ -1,8 +0,0 @@
-LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
-pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -monitor \
-unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -device spapr-vscsi,id=scsi0,\
-bus=pci.0,addr=0x3 -drive file=/dev/HostVG/QEMUGuest1,if=none,\
-id=drive-ide0-0-0 -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,\
-id=ide0-0-0 -drive file=/tmp/scsidisk.img,if=none,id=drive-scsi0-0-0 -device \
-scsi-disk,bus=scsi0.0,scsi-id=0,drive=drive-scsi0-0-0,id=scsi0-0-0 -usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.xml
deleted file mode 100644
index 12f928a03c..0000000000
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
- QEMUGuest1
- c7a5fdbd-edaf-9455-926a-d65c16db1809
- 219136
- 219136
- 1
-
- hvm
-
-
-
- destroy
- restart
- destroy
-
- /usr/bin/qemu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 6b7210934c..13d364ed3c 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -457,8 +457,6 @@ mymain(void)
QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
DO_TEST("disk-scsi-device-auto", false,
QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
- DO_TEST("disk-scsi-vscsi", false,
- QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
DO_TEST("disk-sata-device", false,
QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE,
QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_ICH9_AHCI);
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index da0ec21585..c1b2b141dc 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -150,7 +150,6 @@ mymain(void)
DO_TEST("disk-drive-cache-v1-wb");
DO_TEST("disk-drive-cache-v1-none");
DO_TEST("disk-scsi-device");
- DO_TEST("disk-scsi-vscsi");
DO_TEST("graphics-listen-network");
DO_TEST("graphics-vnc");
DO_TEST("graphics-vnc-sasl");