Revert "qemu: add virtio-scsi controller model"

This reverts commit c9abfadf3721505e8eaffbf56ef1e53202c1db3c.

Conflicts:

	tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.xml

diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 29497a059e04937b623cdc92095ba33764077884..2dd3fd2e923886b33b50e5953f6274bddeb14734 100644 (file)
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -1658,7 +1658,7 @@
       control how many devices can be connected through the
       controller.  A "scsi" controller has an optional
       attribute <code>model</code>, which is one of "auto", "buslogic",
-      "ibmvscsi", "lsilogic", "lsias1068", "virtio-scsi" or "vmpvscsi".
+      "ibmvscsi", "lsilogic", "lsias1068" or "vmpvscsi".
       A "usb" controller has an optional attribute <code>model</code>,
       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 724d7d04e91275e7c181f82c5ff9e132f2188e03..d3deaea457ad5eec284d328dbcb243b87a1fbb47 100644 (file)
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -1121,7 +1121,6 @@
             <value>lsisas1068</value>
             <value>vmpvscsi</value>
             <value>ibmvscsi</value>
-            <value>virtio-scsi</value>
             <value>piix3-uhci</value>
             <value>piix4-uhci</value>
             <value>ehci</value>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index a09a50624169dbab221b26bc9e8d04423eb4bef5..4d4cc840628d57b6dfa60c255a9fed0e1fcf399f 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -238,8 +238,7 @@ VIR_ENUM_IMPL(virDomainControllerModelSCSI, VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAS
               "lsilogic",
               "lsisas1068",
               "vmpvscsi",
-              "ibmvscsi",
-              "virtio-scsi");
+              "ibmvscsi");
 
 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 8bb21cf511d53d0c59b9b33187f90279bb49196f..3dd0b5d8f40558ab809eeb9a07ac1a0b66ef124e 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -452,7 +452,6 @@ enum virDomainControllerModelSCSI {
     VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSISAS1068,
     VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VMPVSCSI,
     VIR_DOMAIN_CONTROLLER_MODEL_SCSI_IBMVSCSI,
-    VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI,
 
     VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST
 };

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 1b92aa4174a9568a59b8f27e5a8070e867a01210..57387106fc90634736d76cc749eea4ea26c85315 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -2369,9 +2369,6 @@ qemuBuildControllerDevStr(virDomainDefPtr domainDef,
             }
         }
         switch (model) {
-        case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI:
-            virBufferAddLit(&buf, "virtio-scsi");
-            break;
         case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOGIC:
             virBufferAddLit(&buf, "lsi");
             break;

diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
index 1fdbd509d7f419ebed63dade9fffbe9185ce4530..5ebd81d14c8a358d2e8f39d3ace1ab3512752ca4 100644 (file)
--- a/src/vmx/vmx.c
+++ b/src/vmx/vmx.c
@@ -491,8 +491,7 @@ VIR_ENUM_IMPL(virVMXControllerModelSCSI, VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST,
               "lsilogic",
               "lsisas1068",
               "pvscsi",
-              "UNUSED ibmvscsi",
-              "UNUSED virtio-scsi");
+              "UNUSED ibmvscsi");
 
 
 

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.args
deleted file mode 100644 (file)
index 38cf56e..0000000
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.args
+++ /dev/null
@@ -1,9 +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 \
-virtio-scsi,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-virtio-scsi.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.xml
deleted file mode 100644 (file)
index 3c61e1f..0000000
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<domain type='qemu'>
-  <name>QEMUGuest1</name>
-  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-  <memory>219136</memory>
-  <currentMemory>219136</currentMemory>
-  <vcpu>1</vcpu>
-  <os>
-    <type arch='i686' machine='pc'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <clock offset='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/bin/qemu</emulator>
-    <disk type='block' device='disk'>
-      <source dev='/dev/HostVG/QEMUGuest1'/>
-      <target dev='hda' bus='ide'/>
-      <address type='drive' controller='0' bus='0' unit='0'/>
-    </disk>
-    <disk type='file' device='disk'>
-      <source file='/tmp/scsidisk.img'/>
-      <target dev='sda' bus='scsi'/>
-      <address type='drive' controller='0' bus='0' unit='0'/>
-    </disk>
-    <controller type='usb' index='0'/>
-    <controller type='ide' index='0'/>
-    <controller type='scsi' index='0' model='virtio-scsi'/>
-    <memballoon model='virtio'/>
-  </devices>
-</domain>

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index fcffc27fd08e9b8e25bd86d4710a96e45a7f2610..6b7210934c0be91fcb8d77ab25a93658f9dea519 100644 (file)
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -459,8 +459,6 @@ mymain(void)
             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-scsi-virtio-scsi", 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 ddc7caecbf654dd2f9111a4deb70cf867fe74059..da0ec21585f385d2e8f1688d9f150cd60d7431f7 100644 (file)
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -151,7 +151,6 @@ mymain(void)
     DO_TEST("disk-drive-cache-v1-none");
     DO_TEST("disk-scsi-device");
     DO_TEST("disk-scsi-vscsi");
-    DO_TEST("disk-scsi-virtio-scsi");
     DO_TEST("graphics-listen-network");
     DO_TEST("graphics-vnc");
     DO_TEST("graphics-vnc-sasl");