mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-27 19:11:16 +00:00
hostdev: Remove temporary variable when checking for VF
The virHostdevIsVirtualFunction() was called exactly twice, and in both cases the return value was saved to a temporary variable before being checked. This would be okay if it improved readability, but in this case is pretty pointless. Get rid of the temporary variable and check the return value directly; while at it, change the check from '<= 0' to '!= 1' to align it with the way other similar *IsVirtualFunction() functions are used thorough the code.
This commit is contained in:
parent
dec3a4a135
commit
b2ce5b027c
@ -416,10 +416,8 @@ virHostdevNetConfigReplace(virDomainHostdevDefPtr hostdev,
|
||||
int vf = -1;
|
||||
int vlanid = -1;
|
||||
bool port_profile_associate = true;
|
||||
int isvf;
|
||||
|
||||
isvf = virHostdevIsVirtualFunction(hostdev);
|
||||
if (isvf <= 0) {
|
||||
if (virHostdevIsVirtualFunction(hostdev) != 1) {
|
||||
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
|
||||
_("Interface type hostdev is currently supported on"
|
||||
" SR-IOV Virtual Functions only"));
|
||||
@ -489,7 +487,6 @@ virHostdevNetConfigRestore(virDomainHostdevDefPtr hostdev,
|
||||
int ret = -1;
|
||||
int vf = -1;
|
||||
bool port_profile_associate = false;
|
||||
int isvf;
|
||||
|
||||
/* This is only needed for PCI devices that have been defined
|
||||
* using <interface type='hostdev'>. For all others, it is a NOP.
|
||||
@ -497,8 +494,7 @@ virHostdevNetConfigRestore(virDomainHostdevDefPtr hostdev,
|
||||
if (!virHostdevIsPCINetDevice(hostdev))
|
||||
return 0;
|
||||
|
||||
isvf = virHostdevIsVirtualFunction(hostdev);
|
||||
if (isvf <= 0) {
|
||||
if (virHostdevIsVirtualFunction(hostdev) != 1) {
|
||||
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
|
||||
_("Interface type hostdev is currently supported on"
|
||||
" SR-IOV Virtual Functions only"));
|
||||
|
Loading…
Reference in New Issue
Block a user