]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
virDomainDeviceIsUSB: Drop check for USB controller
authorLiuji (Jeremy) <jeremy.liu@huawei.com>
Thu, 5 Sep 2013 02:40:25 +0000 (02:40 +0000)
committerMichal Privoznik <mprivozn@redhat.com>
Thu, 5 Sep 2013 10:55:44 +0000 (12:55 +0200)
Delete the USB controller check from the USB Device checklist in
virDomainDeviceIsUSB as USB controller is a PCI device rather than
a USB one.

Signed-off-by: Liu Ji <jeremy.liu@huawei.com>
src/conf/domain_conf.c

index e28d28ca712ff1ab02bf2c5a3bf730a0eacc9b74..216bf7a7613bdb954c94a216224d8d34d429a27c 100644 (file)
@@ -16996,8 +16996,6 @@ virDomainDeviceIsUSB(virDomainDeviceDefPtr dev)
     int t = dev->type;
     if ((t == VIR_DOMAIN_DEVICE_DISK &&
          dev->data.disk->bus == VIR_DOMAIN_DISK_BUS_USB) ||
-        (t == VIR_DOMAIN_DEVICE_CONTROLLER &&
-         dev->data.controller->type == VIR_DOMAIN_CONTROLLER_TYPE_USB) ||
         (t == VIR_DOMAIN_DEVICE_INPUT &&
          dev->data.input->type == VIR_DOMAIN_INPUT_BUS_USB) ||
         (t == VIR_DOMAIN_DEVICE_HOSTDEV &&