From: Liuji (Jeremy) Date: Thu, 5 Sep 2013 02:40:25 +0000 (+0000) Subject: virDomainDeviceIsUSB: Drop check for USB controller X-Git-Tag: CVE-2013-4311~108 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce78098e880f128b3dbfa87dcfa351a0c2b51751;p=thirdparty%2Flibvirt.git virDomainDeviceIsUSB: Drop check for USB controller 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 --- diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e28d28ca71..216bf7a761 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -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 &&