From cd3b06b7f605b0e66fafe9b54ad6d063f502acda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
Date: Thu, 19 May 2016 19:32:29 +0200
Subject: [PATCH] Assume QEMU_CAPS_DEVICE in qemuBuildDiskDriveCommandLine

We no longer need to handle -usbdevice and the withDeviceArg
logic becomes clearer.
---
 src/qemu/qemu_command.c | 28 +++++-----------------------
 1 file changed, 5 insertions(+), 23 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index bb40c17cca..c0d11b2d65 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -1907,22 +1907,6 @@ qemuBuildDiskDriveCommandLine(virCommandPtr cmd,
         bool withDeviceArg = false;
         bool deviceFlagMasked = false;
 
-        /* Unless we have -device, then USB disks need special
-           handling */
-        if ((disk->bus == VIR_DOMAIN_DISK_BUS_USB) &&
-            !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) {
-            if (disk->device == VIR_DOMAIN_DISK_DEVICE_DISK) {
-                virCommandAddArg(cmd, "-usbdevice");
-                virCommandAddArgFormat(cmd, "disk:%s", disk->src->path);
-            } else {
-                virReportError(VIR_ERR_INTERNAL_ERROR,
-                               _("unsupported usb disk type for '%s'"),
-                               disk->src->path);
-                return -1;
-            }
-            continue;
-        }
-
         /* PowerPC pseries based VMs do not support floppy device */
         if ((disk->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY) &&
             ARCH_IS_PPC64(def->os.arch) &&
@@ -1955,13 +1939,11 @@ qemuBuildDiskDriveCommandLine(virCommandPtr cmd,
            devices. Fortunately, those don't need
            static PCI addresses, so we don't really
            care that we can't use -device */
-        if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) {
-            if (disk->bus != VIR_DOMAIN_DISK_BUS_SD) {
-                withDeviceArg = true;
-            } else {
-                virQEMUCapsClear(qemuCaps, QEMU_CAPS_DEVICE);
-                deviceFlagMasked = true;
-            }
+        if (disk->bus != VIR_DOMAIN_DISK_BUS_SD) {
+            withDeviceArg = true;
+        } else {
+            virQEMUCapsClear(qemuCaps, QEMU_CAPS_DEVICE);
+            deviceFlagMasked = true;
         }
         optstr = qemuBuildDriveStr(disk,
                                    emitBootindex ? false : !!bootindex,