qemu: hostdev: Fix function spacing and header formatting

This commit is contained in:
Peter Krempa 2013-10-08 15:47:36 +02:00
parent a863b89010
commit f24150b1f5

View File

@ -85,6 +85,7 @@ qemuGetPciHostDeviceList(virDomainHostdevDefPtr *hostdevs, int nhostdevs)
return list; return list;
} }
/* /*
* qemuGetActivePciHostDeviceList - make a new list with a *copy* of * qemuGetActivePciHostDeviceList - make a new list with a *copy* of
* every virPCIDevice object that is found on the activePciHostdevs * every virPCIDevice object that is found on the activePciHostdevs
@ -128,7 +129,9 @@ qemuGetActivePciHostDeviceList(virQEMUDriverPtr driver,
return list; return list;
} }
int qemuUpdateActivePciHostdevs(virQEMUDriverPtr driver,
int
qemuUpdateActivePciHostdevs(virQEMUDriverPtr driver,
virDomainDefPtr def) virDomainDefPtr def)
{ {
virDomainHostdevDefPtr hostdev = NULL; virDomainHostdevDefPtr hostdev = NULL;
@ -188,6 +191,7 @@ cleanup:
return ret; return ret;
} }
int int
qemuUpdateActiveUsbHostdevs(virQEMUDriverPtr driver, qemuUpdateActiveUsbHostdevs(virQEMUDriverPtr driver,
virDomainDefPtr def) virDomainDefPtr def)
@ -274,8 +278,10 @@ cleanup:
return ret; return ret;
} }
static int static int
qemuDomainHostdevPciSysfsPath(virDomainHostdevDefPtr hostdev, char **sysfs_path) qemuDomainHostdevPciSysfsPath(virDomainHostdevDefPtr hostdev,
char **sysfs_path)
{ {
virPCIDeviceAddress config_address; virPCIDeviceAddress config_address;
@ -287,6 +293,7 @@ qemuDomainHostdevPciSysfsPath(virDomainHostdevDefPtr hostdev, char **sysfs_path)
return virPCIDeviceAddressGetSysfsFile(&config_address, sysfs_path); return virPCIDeviceAddressGetSysfsFile(&config_address, sysfs_path);
} }
int int
qemuDomainHostdevIsVirtualFunction(virDomainHostdevDefPtr hostdev) qemuDomainHostdevIsVirtualFunction(virDomainHostdevDefPtr hostdev)
{ {
@ -303,6 +310,7 @@ qemuDomainHostdevIsVirtualFunction(virDomainHostdevDefPtr hostdev)
return ret; return ret;
} }
static int static int
qemuDomainHostdevNetDevice(virDomainHostdevDefPtr hostdev, char **linkdev, qemuDomainHostdevNetDevice(virDomainHostdevDefPtr hostdev, char **linkdev,
int *vf) int *vf)
@ -331,6 +339,7 @@ cleanup:
return ret; return ret;
} }
static int static int
qemuDomainHostdevNetConfigVirtPortProfile(const char *linkdev, int vf, qemuDomainHostdevNetConfigVirtPortProfile(const char *linkdev, int vf,
virNetDevVPortProfilePtr virtPort, virNetDevVPortProfilePtr virtPort,
@ -370,6 +379,7 @@ qemuDomainHostdevNetConfigVirtPortProfile(const char *linkdev, int vf,
return ret; return ret;
} }
int int
qemuDomainHostdevNetConfigReplace(virDomainHostdevDefPtr hostdev, qemuDomainHostdevNetConfigReplace(virDomainHostdevDefPtr hostdev,
const unsigned char *uuid, const unsigned char *uuid,
@ -438,6 +448,7 @@ cleanup:
return ret; return ret;
} }
int int
qemuDomainHostdevNetConfigRestore(virDomainHostdevDefPtr hostdev, qemuDomainHostdevNetConfigRestore(virDomainHostdevDefPtr hostdev,
char *stateDir) char *stateDir)
@ -474,7 +485,9 @@ qemuDomainHostdevNetConfigRestore(virDomainHostdevDefPtr hostdev,
return ret; return ret;
} }
int qemuPrepareHostdevPCIDevices(virQEMUDriverPtr driver,
int
qemuPrepareHostdevPCIDevices(virQEMUDriverPtr driver,
const char *name, const char *name,
const unsigned char *uuid, const unsigned char *uuid,
virDomainHostdevDefPtr *hostdevs, virDomainHostdevDefPtr *hostdevs,
@ -670,6 +683,7 @@ cleanup:
return ret; return ret;
} }
int int
qemuPrepareHostdevUSBDevices(virQEMUDriverPtr driver, qemuPrepareHostdevUSBDevices(virQEMUDriverPtr driver,
const char *name, const char *name,
@ -722,6 +736,7 @@ error:
return -1; return -1;
} }
int int
qemuFindHostdevUSBDevice(virDomainHostdevDefPtr hostdev, qemuFindHostdevUSBDevice(virDomainHostdevDefPtr hostdev,
bool mandatory, bool mandatory,
@ -809,6 +824,7 @@ out:
return 0; return 0;
} }
static int static int
qemuPrepareHostUSBDevices(virQEMUDriverPtr driver, qemuPrepareHostUSBDevices(virQEMUDriverPtr driver,
virDomainDefPtr def, virDomainDefPtr def,
@ -878,6 +894,7 @@ cleanup:
return ret; return ret;
} }
int int
qemuPrepareHostdevSCSIDevices(virQEMUDriverPtr driver, qemuPrepareHostdevSCSIDevices(virQEMUDriverPtr driver,
const char *name, const char *name,
@ -996,7 +1013,9 @@ cleanup:
return -1; return -1;
} }
int qemuPrepareHostDevices(virQEMUDriverPtr driver,
int
qemuPrepareHostDevices(virQEMUDriverPtr driver,
virDomainDefPtr def, virDomainDefPtr def,
bool coldBoot) bool coldBoot)
{ {
@ -1022,7 +1041,8 @@ int qemuPrepareHostDevices(virQEMUDriverPtr driver,
* Pre-condition: driver->inactivePciHostdevs & driver->activePciHostdevs * Pre-condition: driver->inactivePciHostdevs & driver->activePciHostdevs
* are locked * are locked
*/ */
void qemuReattachPciDevice(virPCIDevicePtr dev, virQEMUDriverPtr driver) void
qemuReattachPciDevice(virPCIDevicePtr dev, virQEMUDriverPtr driver)
{ {
int retries = 100; int retries = 100;
@ -1052,7 +1072,8 @@ void qemuReattachPciDevice(virPCIDevicePtr dev, virQEMUDriverPtr driver)
} }
void qemuDomainReAttachHostdevDevices(virQEMUDriverPtr driver, void
qemuDomainReAttachHostdevDevices(virQEMUDriverPtr driver,
const char *name, const char *name,
virDomainHostdevDefPtr *hostdevs, virDomainHostdevDefPtr *hostdevs,
int nhostdevs) int nhostdevs)
@ -1140,6 +1161,7 @@ cleanup:
virObjectUnref(cfg); virObjectUnref(cfg);
} }
static void static void
qemuDomainReAttachHostUsbDevices(virQEMUDriverPtr driver, qemuDomainReAttachHostUsbDevices(virQEMUDriverPtr driver,
const char *name, const char *name,
@ -1203,6 +1225,7 @@ qemuDomainReAttachHostUsbDevices(virQEMUDriverPtr driver,
virObjectUnlock(driver->activeUsbHostdevs); virObjectUnlock(driver->activeUsbHostdevs);
} }
void void
qemuDomainReAttachHostScsiDevices(virQEMUDriverPtr driver, qemuDomainReAttachHostScsiDevices(virQEMUDriverPtr driver,
const char *name, const char *name,
@ -1272,7 +1295,8 @@ qemuDomainReAttachHostScsiDevices(virQEMUDriverPtr driver,
virObjectUnlock(driver->activeScsiHostdevs); virObjectUnlock(driver->activeScsiHostdevs);
} }
void qemuDomainReAttachHostDevices(virQEMUDriverPtr driver, void
qemuDomainReAttachHostDevices(virQEMUDriverPtr driver,
virDomainDefPtr def) virDomainDefPtr def)
{ {
if (!def->nhostdevs) if (!def->nhostdevs)