openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

util: virNetDevBridgeSet: split declarations 

Declare the variables at the beginning of the function,
then fill them up.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Ján Tomko 2020-07-28 20:09:22 +02:00
parent c93bcd339c
commit 8687408f90
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/util/virnetdevbridge.c
View File

@ -119,6 +119,8 @@ static int virNetDevBridgeSet(const char *brname,
struct ifreq *ifr) /* pre-filled bridge name */
{
g_autofree char *path = NULL;
unsigned long args[] = { 0, value, 0, 0 };
unsigned long paramid;
path = g_strdup_printf(SYSFS_NET_DIR "%s/bridge/%s", brname, paramname);
@ -129,7 +131,6 @@ static int virNetDevBridgeSet(const char *brname,
VIR_DEBUG("Unable to set bridge %s %s via sysfs", brname, paramname);
}
unsigned long paramid;
if (STREQ(paramname, "stp_state")) {
paramid = BRCTL_SET_BRIDGE_STP_STATE;
} else if (STREQ(paramname, "forward_delay")) {
@ -140,7 +141,8 @@ static int virNetDevBridgeSet(const char *brname,
brname, paramname);
return -1;
}
unsigned long args[] = { paramid, value, 0, 0 };
args[0] = paramid;
ifr->ifr_data = (char*)&args;
if (ioctl(fd, SIOCDEVPRIVATE, ifr) < 0) {
virReportSystemError(errno,