Skip to content

Commit 36fc1b2

Browse files
committed
Fix build breakage with older gcc
1 parent d9cd460 commit 36fc1b2

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

netdev.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ static int net_init_tap(netdev_t *netdev)
5555
return 0;
5656
}
5757

58-
static int net_init_user(netdev_t *netdev)
58+
static int net_init_user(netdev_t *netdev UNUSED)
5959
{
6060
/* TODO: create slirp dev */
6161
return 0;

virtio-net.c

+6-3
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ static ssize_t handle_read(netdev_t *netdev,
121121
ssize_t plen = 0;
122122
#define _(dev) NETDEV_IMPL_##dev
123123
switch (netdev->type) {
124-
case _(tap):
124+
case _(tap): {
125125
net_tap_options_t *tap = (net_tap_options_t *) netdev->op;
126126
plen = readv(tap->tap_fd, iovs_cursor, niovs);
127127
if (plen < 0 && (errno == EWOULDBLOCK || errno == EAGAIN)) {
@@ -134,6 +134,7 @@ static ssize_t handle_read(netdev_t *netdev,
134134
strerror(errno));
135135
}
136136
break;
137+
}
137138
case _(user):
138139
/* TODO: handle read */
139140
break;
@@ -152,7 +153,7 @@ static ssize_t handle_write(netdev_t *netdev,
152153
ssize_t plen = 0;
153154
#define _(dev) NETDEV_IMPL_##dev
154155
switch (netdev->type) {
155-
case _(tap):
156+
case _(tap): {
156157
net_tap_options_t *tap = (net_tap_options_t *) netdev->op;
157158
plen = writev(tap->tap_fd, iovs_cursor, niovs);
158159
if (plen < 0 && (errno == EWOULDBLOCK || errno == EAGAIN)) {
@@ -165,6 +166,7 @@ static ssize_t handle_write(netdev_t *netdev,
165166
strerror(errno));
166167
}
167168
break;
169+
}
168170
case _(user):
169171
/* TODO: handle slirp_input */
170172
break;
@@ -280,7 +282,7 @@ void virtio_net_refresh_queue(virtio_net_state_t *vnet)
280282
netdev_impl_t dev_type = vnet->peer.type;
281283
#define _(dev) NETDEV_IMPL_##dev
282284
switch (dev_type) {
283-
case _(tap):
285+
case _(tap): {
284286
net_tap_options_t *tap = (net_tap_options_t *) vnet->peer.op;
285287
struct pollfd pfd = {tap->tap_fd, POLLIN | POLLOUT, 0};
286288
poll(&pfd, 1, 0);
@@ -293,6 +295,7 @@ void virtio_net_refresh_queue(virtio_net_state_t *vnet)
293295
virtio_net_try_tx(vnet);
294296
}
295297
break;
298+
}
296299
case _(user):
297300
/* TODO: handle slirp input/output */
298301
break;

0 commit comments

Comments
 (0)