Module Name: src
Committed By: pooka
Date: Thu Jul 4 09:48:01 UTC 2013
Modified Files:
src/sys/rump/net/lib/libvirtif: rumpcomp_user.c
Log Message:
fix warnings
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/rump/net/lib/libvirtif/rumpcomp_user.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/net/lib/libvirtif/rumpcomp_user.c
diff -u src/sys/rump/net/lib/libvirtif/rumpcomp_user.c:1.6 src/sys/rump/net/lib/libvirtif/rumpcomp_user.c:1.7
--- src/sys/rump/net/lib/libvirtif/rumpcomp_user.c:1.6 Mon May 20 10:24:26 2013
+++ src/sys/rump/net/lib/libvirtif/rumpcomp_user.c Thu Jul 4 09:48:01 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpcomp_user.c,v 1.6 2013/05/20 10:24:26 pooka Exp $ */
+/* $NetBSD: rumpcomp_user.c,v 1.7 2013/07/04 09:48:01 pooka Exp $ */
/*
* Copyright (c) 2013 Antti Kantee. All Rights Reserved.
@@ -36,6 +36,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <unistd.h>
#ifdef __linux__
#include <net/if.h>
@@ -44,6 +45,8 @@
#include <rump/rumpuser_component.h>
+#include "rumpcomp_user.h"
+
struct virtif_user {
int viu_fd;
int viu_dying;
@@ -150,8 +153,11 @@ rumpcomp_virtif_recv(struct virtif_user
pfd.events = POLLIN;
for (;;) {
- if (viu->viu_dying)
+ if (viu->viu_dying) {
+ rv = 0;
+ *rcv = 0;
break;
+ }
prv = poll(&pfd, 1, POLLTIMO_MS);
if (prv == 0)
