External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-02 01:45:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace Usb with USB throughout

Browse Source 
Since it is an abbreviation, USB should always be fully
capitalized or full lower case, never Usb.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2014-03-13 11:58:17 +00:00
parent 21a2446d92
commit edfe82c7f9
13 changed files with 61 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/conf/domain_conf.c
View File

@ -3789,7 +3789,7 @@ virDomainParseLegacyDeviceAddress(char *devaddr,
} }
static int static int
virDomainHostdevSubsysUsbDefParseXML(xmlNodePtr node, virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node,
virDomainHostdevDefPtr def) virDomainHostdevDefPtr def)
{ {
@ -4337,7 +4337,7 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
break; break;
case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB:
if (virDomainHostdevSubsysUsbDefParseXML(sourcenode, def) < 0) if (virDomainHostdevSubsysUSBDefParseXML(sourcenode, def) < 0)
goto error; goto error;
break; break;
@ -9591,8 +9591,8 @@ virDomainRedirdevDefParseXML(xmlNodePtr node,
* USB 1.1 as 0x0110 and USB 1.0 as 0x0100. * USB 1.1 as 0x0110 and USB 1.0 as 0x0100.
*/ */
static int static int
virDomainRedirFilterUsbVersionHelper(const char *version, virDomainRedirFilterUSBVersionHelper(const char *version,
virDomainRedirFilterUsbDevDefPtr def) virDomainRedirFilterUSBDevDefPtr def)
{ {
char *version_copy = NULL; char *version_copy = NULL;
char *temp = NULL; char *temp = NULL;
@ -9645,13 +9645,13 @@ virDomainRedirFilterUsbVersionHelper(const char *version,
return ret; return ret;
} }
static virDomainRedirFilterUsbDevDefPtr static virDomainRedirFilterUSBDevDefPtr
virDomainRedirFilterUsbDevDefParseXML(xmlNodePtr node) virDomainRedirFilterUSBDevDefParseXML(xmlNodePtr node)
{ {
char *class; char *class;
char *vendor = NULL, *product = NULL; char *vendor = NULL, *product = NULL;
char *version = NULL, *allow = NULL; char *version = NULL, *allow = NULL;
virDomainRedirFilterUsbDevDefPtr def; virDomainRedirFilterUSBDevDefPtr def;
if (VIR_ALLOC(def) < 0) if (VIR_ALLOC(def) < 0)
return NULL; return NULL;
@ -9699,7 +9699,7 @@ virDomainRedirFilterUsbDevDefParseXML(xmlNodePtr node)
if (version) { if (version) {
if (STREQ(version, "-1")) if (STREQ(version, "-1"))
def->version = -1; def->version = -1;
else if ((virDomainRedirFilterUsbVersionHelper(version, def)) < 0) else if ((virDomainRedirFilterUSBVersionHelper(version, def)) < 0)
goto error; goto error;
} else { } else {
def->version = -1; def->version = -1;
@ -9758,8 +9758,8 @@ virDomainRedirFilterDefParseXML(xmlNodePtr node,
goto error; goto error;
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
virDomainRedirFilterUsbDevDefPtr usbdev = virDomainRedirFilterUSBDevDefPtr usbdev =
virDomainRedirFilterUsbDevDefParseXML(nodes[i]); virDomainRedirFilterUSBDevDefParseXML(nodes[i]);
if (!usbdev) if (!usbdev)
goto error; goto error;
@ -13802,37 +13802,37 @@ virDomainRedirFilterDefCheckABIStability(virDomainRedirFilterDefPtr src,
} }
for (i = 0; i < src->nusbdevs; i++) { for (i = 0; i < src->nusbdevs; i++) {
virDomainRedirFilterUsbDevDefPtr srcUsbDev = src->usbdevs[i]; virDomainRedirFilterUSBDevDefPtr srcUSBDev = src->usbdevs[i];
virDomainRedirFilterUsbDevDefPtr dstUsbDev = dst->usbdevs[i]; virDomainRedirFilterUSBDevDefPtr dstUSBDev = dst->usbdevs[i];
if (srcUsbDev->usbClass != dstUsbDev->usbClass) { if (srcUSBDev->usbClass != dstUSBDev->usbClass) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
"%s", _("Target USB Class code does not match source")); "%s", _("Target USB Class code does not match source"));
return false; return false;
} }
if (srcUsbDev->vendor != dstUsbDev->vendor) { if (srcUSBDev->vendor != dstUSBDev->vendor) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
"%s", _("Target USB vendor ID does not match source")); "%s", _("Target USB vendor ID does not match source"));
return false; return false;
} }
if (srcUsbDev->product != dstUsbDev->product) { if (srcUSBDev->product != dstUSBDev->product) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
"%s", _("Target USB product ID does not match source")); "%s", _("Target USB product ID does not match source"));
return false; return false;
} }
if (srcUsbDev->version != dstUsbDev->version) { if (srcUSBDev->version != dstUSBDev->version) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
"%s", _("Target USB version does not match source")); "%s", _("Target USB version does not match source"));
return false; return false;
} }
if (srcUsbDev->allow != dstUsbDev->allow) { if (srcUSBDev->allow != dstUSBDev->allow) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("Target USB allow '%s' does not match source '%s'"), _("Target USB allow '%s' does not match source '%s'"),
dstUsbDev->allow ? "yes" : "no", dstUSBDev->allow ? "yes" : "no",
srcUsbDev->allow ? "yes" : "no"); srcUSBDev->allow ? "yes" : "no");
return false; return false;
} }
} }
@ -16903,7 +16903,7 @@ virDomainRedirFilterDefFormat(virBufferPtr buf,
virBufferAddLit(buf, "<redirfilter>\n"); virBufferAddLit(buf, "<redirfilter>\n");
virBufferAdjustIndent(buf, 2); virBufferAdjustIndent(buf, 2);
for (i = 0; i < filter->nusbdevs; i++) { for (i = 0; i < filter->nusbdevs; i++) {
virDomainRedirFilterUsbDevDefPtr usbdev = filter->usbdevs[i]; virDomainRedirFilterUSBDevDefPtr usbdev = filter->usbdevs[i];
virBufferAddLit(buf, "<usbdev"); virBufferAddLit(buf, "<usbdev");
if (usbdev->usbClass >= 0) if (usbdev->usbClass >= 0)
virBufferAsprintf(buf, " class='0x%02X'", usbdev->usbClass); virBufferAsprintf(buf, " class='0x%02X'", usbdev->usbClass);

8
src/conf/domain_conf.h
View File

@ -94,8 +94,8 @@ typedef virDomainHubDef *virDomainHubDefPtr;
typedef struct _virDomainRedirdevDef virDomainRedirdevDef; typedef struct _virDomainRedirdevDef virDomainRedirdevDef;
typedef virDomainRedirdevDef *virDomainRedirdevDefPtr; typedef virDomainRedirdevDef *virDomainRedirdevDefPtr;
typedef struct _virDomainRedirFilterUsbDevDef virDomainRedirFilterUsbDevDef; typedef struct _virDomainRedirFilterUSBDevDef virDomainRedirFilterUSBDevDef;
typedef virDomainRedirFilterUsbDevDef *virDomainRedirFilterUsbDevDefPtr; typedef virDomainRedirFilterUSBDevDef *virDomainRedirFilterUSBDevDefPtr;
typedef struct _virDomainRedirFilterDef virDomainRedirFilterDef; typedef struct _virDomainRedirFilterDef virDomainRedirFilterDef;
typedef virDomainRedirFilterDef *virDomainRedirFilterDefPtr; typedef virDomainRedirFilterDef *virDomainRedirFilterDefPtr;
@ -1450,7 +1450,7 @@ struct _virDomainRedirdevDef {
virDomainDeviceInfo info; /* Guest address */ virDomainDeviceInfo info; /* Guest address */
}; };
struct _virDomainRedirFilterUsbDevDef { struct _virDomainRedirFilterUSBDevDef {
int usbClass; int usbClass;
int vendor; int vendor;
int product; int product;
@ -1460,7 +1460,7 @@ struct _virDomainRedirFilterUsbDevDef {
struct _virDomainRedirFilterDef { struct _virDomainRedirFilterDef {
size_t nusbdevs; size_t nusbdevs;
virDomainRedirFilterUsbDevDefPtr *usbdevs; virDomainRedirFilterUSBDevDefPtr *usbdevs;
}; };
enum virDomainMemDump { enum virDomainMemDump {

8
src/conf/node_device_conf.c
View File

@ -876,7 +876,7 @@ virNodeDevCapNetParseXML(xmlXPathContextPtr ctxt,
} }
static int static int
virNodeDevCapUsbInterfaceParseXML(xmlXPathContextPtr ctxt, virNodeDevCapUSBInterfaceParseXML(xmlXPathContextPtr ctxt,
virNodeDeviceDefPtr def, virNodeDeviceDefPtr def,
xmlNodePtr node, xmlNodePtr node,
union _virNodeDevCapData *data) union _virNodeDevCapData *data)
@ -943,7 +943,7 @@ virNodeDevCapsDefParseHexId(const char *xpath,
} }
static int static int
virNodeDevCapUsbDevParseXML(xmlXPathContextPtr ctxt, virNodeDevCapUSBDevParseXML(xmlXPathContextPtr ctxt,
virNodeDeviceDefPtr def, virNodeDeviceDefPtr def,
xmlNodePtr node, xmlNodePtr node,
union _virNodeDevCapData *data) union _virNodeDevCapData *data)
@ -1189,10 +1189,10 @@ virNodeDevCapsDefParseXML(xmlXPathContextPtr ctxt,
ret = virNodeDevCapPciDevParseXML(ctxt, def, node, &caps->data); ret = virNodeDevCapPciDevParseXML(ctxt, def, node, &caps->data);
break; break;
case VIR_NODE_DEV_CAP_USB_DEV: case VIR_NODE_DEV_CAP_USB_DEV:
ret = virNodeDevCapUsbDevParseXML(ctxt, def, node, &caps->data); ret = virNodeDevCapUSBDevParseXML(ctxt, def, node, &caps->data);
break; break;
case VIR_NODE_DEV_CAP_USB_INTERFACE: case VIR_NODE_DEV_CAP_USB_INTERFACE:
ret = virNodeDevCapUsbInterfaceParseXML(ctxt, def, node, &caps->data); ret = virNodeDevCapUSBInterfaceParseXML(ctxt, def, node, &caps->data);
break; break;
case VIR_NODE_DEV_CAP_NET: case VIR_NODE_DEV_CAP_NET:
ret = virNodeDevCapNetParseXML(ctxt, def, node, &caps->data); ret = virNodeDevCapNetParseXML(ctxt, def, node, &caps->data);

6
src/lxc/lxc_cgroup.c
View File

@ -317,7 +317,7 @@ struct _virLXCCgroupDevicePolicy {
int int
virLXCSetupHostUsbDeviceCgroup(virUSBDevicePtr dev ATTRIBUTE_UNUSED, virLXCSetupHostUSBDeviceCgroup(virUSBDevicePtr dev ATTRIBUTE_UNUSED,
const char *path, const char *path,
void *opaque) void *opaque)
{ {
@ -333,7 +333,7 @@ virLXCSetupHostUsbDeviceCgroup(virUSBDevicePtr dev ATTRIBUTE_UNUSED,
int int
virLXCTeardownHostUsbDeviceCgroup(virUSBDevicePtr dev ATTRIBUTE_UNUSED, virLXCTeardownHostUSBDeviceCgroup(virUSBDevicePtr dev ATTRIBUTE_UNUSED,
const char *path, const char *path,
void *opaque) void *opaque)
{ {
@ -421,7 +421,7 @@ static int virLXCCgroupSetupDeviceACL(virDomainDefPtr def,
NULL)) == NULL) NULL)) == NULL)
goto cleanup; goto cleanup;
if (virUSBDeviceFileIterate(usb, virLXCSetupHostUsbDeviceCgroup, if (virUSBDeviceFileIterate(usb, virLXCSetupHostUSBDeviceCgroup,
cgroup) < 0) { cgroup) < 0) {
virUSBDeviceFree(usb); virUSBDeviceFree(usb);
goto cleanup; goto cleanup;

4
src/lxc/lxc_cgroup.h
View File

@ -36,12 +36,12 @@ int virLXCCgroupSetup(virDomainDefPtr def,
int virLXCCgroupGetMeminfo(virLXCMeminfoPtr meminfo); int virLXCCgroupGetMeminfo(virLXCMeminfoPtr meminfo);
int int
virLXCSetupHostUsbDeviceCgroup(virUSBDevicePtr dev, virLXCSetupHostUSBDeviceCgroup(virUSBDevicePtr dev,
const char *path, const char *path,
void *opaque); void *opaque);
int int
virLXCTeardownHostUsbDeviceCgroup(virUSBDevicePtr dev, virLXCTeardownHostUSBDeviceCgroup(virUSBDevicePtr dev,
const char *path, const char *path,
void *opaque); void *opaque);

6
src/lxc/lxc_driver.c
View File

@ -4281,7 +4281,7 @@ lxcDomainAttachDeviceHostdevSubsysUSBLive(virLXCDriverPtr driver,
goto cleanup; goto cleanup;
if (virUSBDeviceFileIterate(usb, if (virUSBDeviceFileIterate(usb,
virLXCSetupHostUsbDeviceCgroup, virLXCSetupHostUSBDeviceCgroup,
priv->cgroup) < 0) priv->cgroup) < 0)
goto cleanup; goto cleanup;
@ -4292,7 +4292,7 @@ lxcDomainAttachDeviceHostdevSubsysUSBLive(virLXCDriverPtr driver,
dev, dev,
src) < 0) { src) < 0) {
if (virUSBDeviceFileIterate(usb, if (virUSBDeviceFileIterate(usb,
virLXCTeardownHostUsbDeviceCgroup, virLXCTeardownHostUSBDeviceCgroup,
priv->cgroup) < 0) priv->cgroup) < 0)
VIR_WARN("cannot deny device %s for domain %s", VIR_WARN("cannot deny device %s for domain %s",
src, vm->def->name); src, vm->def->name);
@ -4723,7 +4723,7 @@ lxcDomainDetachDeviceHostdevUSBLive(virLXCDriverPtr driver,
virDomainAuditHostdev(vm, def, "detach", true); virDomainAuditHostdev(vm, def, "detach", true);
if (virUSBDeviceFileIterate(usb, if (virUSBDeviceFileIterate(usb,
virLXCTeardownHostUsbDeviceCgroup, virLXCTeardownHostUSBDeviceCgroup,
priv->cgroup) < 0) priv->cgroup) < 0)
VIR_WARN("cannot deny device %s for domain %s", VIR_WARN("cannot deny device %s for domain %s",
dst, vm->def->name); dst, vm->def->name);

6
src/lxc/lxc_hostdev.c
View File

@ -34,7 +34,7 @@
VIR_LOG_INIT("lxc.lxc_hostdev"); VIR_LOG_INIT("lxc.lxc_hostdev");
int int
virLXCUpdateActiveUsbHostdevs(virLXCDriverPtr driver, virLXCUpdateActiveUSBHostdevs(virLXCDriverPtr driver,
virDomainDefPtr def) virDomainDefPtr def)
{ {
virHostdevManagerPtr hostdev_mgr = driver->hostdevMgr; virHostdevManagerPtr hostdev_mgr = driver->hostdevMgr;
@ -118,7 +118,7 @@ int virLXCPrepareHostDevices(virLXCDriverPtr driver,
static void static void
virLXCDomainReAttachHostUsbDevices(virLXCDriverPtr driver, virLXCDomainReAttachHostUSBDevices(virLXCDriverPtr driver,
const char *name, const char *name,
virDomainHostdevDefPtr *hostdevs, virDomainHostdevDefPtr *hostdevs,
int nhostdevs) int nhostdevs)
@ -135,6 +135,6 @@ void virLXCDomainReAttachHostDevices(virLXCDriverPtr driver,
if (!def->nhostdevs) if (!def->nhostdevs)
return; return;
virLXCDomainReAttachHostUsbDevices(driver, def->name, def->hostdevs, virLXCDomainReAttachHostUSBDevices(driver, def->name, def->hostdevs,
def->nhostdevs); def->nhostdevs);
} }

2
src/lxc/lxc_hostdev.h
View File

@ -27,7 +27,7 @@
# include "lxc_conf.h" # include "lxc_conf.h"
# include "domain_conf.h" # include "domain_conf.h"
int virLXCUpdateActiveUsbHostdevs(virLXCDriverPtr driver, int virLXCUpdateActiveUSBHostdevs(virLXCDriverPtr driver,
virDomainDefPtr def); virDomainDefPtr def);
int virLXCFindHostdevUSBDevice(virDomainHostdevDefPtr hostdev, int virLXCFindHostdevUSBDevice(virDomainHostdevDefPtr hostdev,
bool mandatory, bool mandatory,

2
src/lxc/lxc_process.c
View File

@ -1501,7 +1501,7 @@ virLXCProcessReconnectDomain(virDomainObjPtr vm,
goto error; goto error;
} }
if (virLXCUpdateActiveUsbHostdevs(driver, vm->def) < 0) if (virLXCUpdateActiveUSBHostdevs(driver, vm->def) < 0)
goto error; goto error;
if (virSecurityManagerReserveLabel(driver->securityManager, if (virSecurityManagerReserveLabel(driver->securityManager,

18
src/qemu/qemu_capabilities.c
View File

@ -1480,12 +1480,12 @@ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsPixx4PM[] = {
{ "disable_s4", QEMU_CAPS_DISABLE_S4 }, { "disable_s4", QEMU_CAPS_DISABLE_S4 },
}; };
static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsUsbRedir[] = { static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsUSBRedir[] = {
{ "filter", QEMU_CAPS_USB_REDIR_FILTER }, { "filter", QEMU_CAPS_USB_REDIR_FILTER },
{ "bootindex", QEMU_CAPS_USB_REDIR_BOOTINDEX }, { "bootindex", QEMU_CAPS_USB_REDIR_BOOTINDEX },
}; };
static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsUsbHost[] = { static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsUSBHost[] = {
{ "bootindex", QEMU_CAPS_USB_HOST_BOOTINDEX }, { "bootindex", QEMU_CAPS_USB_HOST_BOOTINDEX },
}; };
@ -1501,7 +1501,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsQ35PciHost[] = {
{ "pci-hole64-size", QEMU_CAPS_Q35_PCI_HOLE64_SIZE }, { "pci-hole64-size", QEMU_CAPS_Q35_PCI_HOLE64_SIZE },
}; };
static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsUsbStorage[] = { static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsUSBStorage[] = {
{ "removable", QEMU_CAPS_USB_STORAGE_REMOVABLE }, { "removable", QEMU_CAPS_USB_STORAGE_REMOVABLE },
}; };
@ -1540,18 +1540,18 @@ static struct virQEMUCapsObjectTypeProps virQEMUCapsObjectProps[] = {
ARRAY_CARDINALITY(virQEMUCapsObjectPropsIDEDrive) }, ARRAY_CARDINALITY(virQEMUCapsObjectPropsIDEDrive) },
{ "PIIX4_PM", virQEMUCapsObjectPropsPixx4PM, { "PIIX4_PM", virQEMUCapsObjectPropsPixx4PM,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsPixx4PM) }, ARRAY_CARDINALITY(virQEMUCapsObjectPropsPixx4PM) },
{ "usb-redir", virQEMUCapsObjectPropsUsbRedir, { "usb-redir", virQEMUCapsObjectPropsUSBRedir,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsUsbRedir) }, ARRAY_CARDINALITY(virQEMUCapsObjectPropsUSBRedir) },
{ "usb-host", virQEMUCapsObjectPropsUsbHost, { "usb-host", virQEMUCapsObjectPropsUSBHost,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsUsbHost) }, ARRAY_CARDINALITY(virQEMUCapsObjectPropsUSBHost) },
{ "scsi-generic", virQEMUCapsObjectPropsSCSIGeneric, { "scsi-generic", virQEMUCapsObjectPropsSCSIGeneric,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsSCSIGeneric) }, ARRAY_CARDINALITY(virQEMUCapsObjectPropsSCSIGeneric) },
{ "i440FX-pcihost", virQEMUCapsObjectPropsI440FXPciHost, { "i440FX-pcihost", virQEMUCapsObjectPropsI440FXPciHost,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsI440FXPciHost) }, ARRAY_CARDINALITY(virQEMUCapsObjectPropsI440FXPciHost) },
{ "q35-pcihost", virQEMUCapsObjectPropsQ35PciHost, { "q35-pcihost", virQEMUCapsObjectPropsQ35PciHost,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsQ35PciHost) }, ARRAY_CARDINALITY(virQEMUCapsObjectPropsQ35PciHost) },
{ "usb-storage", virQEMUCapsObjectPropsUsbStorage, { "usb-storage", virQEMUCapsObjectPropsUSBStorage,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsUsbStorage) }, ARRAY_CARDINALITY(virQEMUCapsObjectPropsUSBStorage) },
{ "kvm-pit", virQEMUCapsObjectPropsKVMPit, { "kvm-pit", virQEMUCapsObjectPropsKVMPit,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsKVMPit) }, ARRAY_CARDINALITY(virQEMUCapsObjectPropsKVMPit) },
}; };

6
src/qemu/qemu_cgroup.c
View File

@ -185,7 +185,7 @@ qemuSetupTPMCgroup(virDomainDefPtr def,
static int static int
qemuSetupHostUsbDeviceCgroup(virUSBDevicePtr dev ATTRIBUTE_UNUSED, qemuSetupHostUSBDeviceCgroup(virUSBDevicePtr dev ATTRIBUTE_UNUSED,
const char *path, const char *path,
void *opaque) void *opaque)
{ {
@ -283,10 +283,10 @@ qemuSetupHostdevCGroup(virDomainObjPtr vm,
goto cleanup; goto cleanup;
} }
/* oddly, qemuSetupHostUsbDeviceCgroup doesn't ever /* oddly, qemuSetupHostUSBDeviceCgroup doesn't ever
* reference the usb object we just created * reference the usb object we just created
*/ */
if (virUSBDeviceFileIterate(usb, qemuSetupHostUsbDeviceCgroup, if (virUSBDeviceFileIterate(usb, qemuSetupHostUSBDeviceCgroup,
vm) < 0) { vm) < 0) {
goto cleanup; goto cleanup;
} }

14
src/qemu/qemu_command.c
View File

@ -2994,7 +2994,7 @@ qemuAssignDevicePCISlots(virDomainDefPtr def,
} }
static void static void
qemuUsbId(virBufferPtr buf, int idx) qemuUSBId(virBufferPtr buf, int idx)
{ {
if (idx == 0) if (idx == 0)
virBufferAddLit(buf, "usb"); virBufferAddLit(buf, "usb");
@ -3091,7 +3091,7 @@ qemuBuildDeviceAddressStr(virBufferPtr buf,
virBufferAsprintf(buf, ".0x%x", info->addr.pci.function); virBufferAsprintf(buf, ".0x%x", info->addr.pci.function);
} else if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB) { } else if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB) {
virBufferAddLit(buf, ",bus="); virBufferAddLit(buf, ",bus=");
qemuUsbId(buf, info->addr.usb.bus); qemuUSBId(buf, info->addr.usb.bus);
virBufferAsprintf(buf, ".0,port=%s", info->addr.usb.port); virBufferAsprintf(buf, ".0,port=%s", info->addr.usb.port);
} else if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO) { } else if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO) {
if (info->addr.spaprvio.has_reg) if (info->addr.spaprvio.has_reg)
@ -4781,11 +4781,11 @@ qemuBuildUSBControllerDevStr(virDomainDefPtr domainDef,
if (def->info.mastertype == VIR_DOMAIN_CONTROLLER_MASTER_USB) { if (def->info.mastertype == VIR_DOMAIN_CONTROLLER_MASTER_USB) {
virBufferAddLit(buf, ",masterbus="); virBufferAddLit(buf, ",masterbus=");
qemuUsbId(buf, def->idx); qemuUSBId(buf, def->idx);
virBufferAsprintf(buf, ".0,firstport=%d", def->info.master.usb.startport); virBufferAsprintf(buf, ".0,firstport=%d", def->info.master.usb.startport);
} else { } else {
virBufferAddLit(buf, ",id="); virBufferAddLit(buf, ",id=");
qemuUsbId(buf, def->idx); qemuUSBId(buf, def->idx);
} }
return 0; return 0;
@ -5626,7 +5626,7 @@ qemuBuildRedirdevDevStr(virDomainDefPtr def,
virBufferAddLit(&buf, ",filter="); virBufferAddLit(&buf, ",filter=");
for (i = 0; i < redirfilter->nusbdevs; i++) { for (i = 0; i < redirfilter->nusbdevs; i++) {
virDomainRedirFilterUsbDevDefPtr usbdev = redirfilter->usbdevs[i]; virDomainRedirFilterUSBDevDefPtr usbdev = redirfilter->usbdevs[i];
if (usbdev->usbClass >= 0) if (usbdev->usbClass >= 0)
virBufferAsprintf(&buf, "0x%02X:", usbdev->usbClass); virBufferAsprintf(&buf, "0x%02X:", usbdev->usbClass);
else else
@ -5758,7 +5758,7 @@ qemuBuildHubDevStr(virDomainDefPtr def,
char * char *
qemuBuildUSBHostdevUsbDevStr(virDomainHostdevDefPtr dev) qemuBuildUSBHostdevUSBDevStr(virDomainHostdevDefPtr dev)
{ {
char *ret = NULL; char *ret = NULL;
@ -9465,7 +9465,7 @@ qemuBuildCommandLine(virConnectPtr conn,
VIR_FREE(devstr); VIR_FREE(devstr);
} else { } else {
virCommandAddArg(cmd, "-usbdevice"); virCommandAddArg(cmd, "-usbdevice");
if (!(devstr = qemuBuildUSBHostdevUsbDevStr(hostdev))) if (!(devstr = qemuBuildUSBHostdevUSBDevStr(hostdev)))
goto error; goto error;
virCommandAddArg(cmd, devstr); virCommandAddArg(cmd, devstr);
VIR_FREE(devstr); VIR_FREE(devstr);

2
src/qemu/qemu_command.h
View File

@ -162,7 +162,7 @@ char * qemuBuildPCIHostdevDevStr(virDomainDefPtr def,
int qemuOpenPCIConfig(virDomainHostdevDefPtr dev); int qemuOpenPCIConfig(virDomainHostdevDefPtr dev);
/* Legacy, pre device support */ /* Legacy, pre device support */
char * qemuBuildUSBHostdevUsbDevStr(virDomainHostdevDefPtr dev); char * qemuBuildUSBHostdevUSBDevStr(virDomainHostdevDefPtr dev);
/* Current, best practice */ /* Current, best practice */
char * qemuBuildUSBHostdevDevStr(virDomainDefPtr def, char * qemuBuildUSBHostdevDevStr(virDomainDefPtr def,
virDomainHostdevDefPtr dev, virDomainHostdevDefPtr dev,