Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dispvm: add -Wextra -Werror, fix warnings

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2014-02-16 11:14:40 +01:00
parent 1e2459c210
commit 17d2f94d8c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dispvm/Makefile
View File

@ -1,5 +1,5 @@
CC=gcc CC=gcc
CFLAGS=-Wall CFLAGS=-Wall -Wextra -Werror
all: qubes-restore xenstore-watch all: qubes-restore xenstore-watch
qubes-restore: qubes-restore.o qubes-restore: qubes-restore.o
$(CC) -o qubes-restore qubes-restore.o -lxenstore $(CC) -o qubes-restore qubes-restore.o -lxenstore

6
dispvm/qubes-restore.c
View File

@ -270,7 +270,7 @@ void fix_conffile(FILE *conf, int conf_templ, int dispid, int netvm_id)
} }
while ((cur_len = read(conf_templ, buf+buflen, sizeof(buf)-buflen)) > 0) { while ((cur_len = read(conf_templ, buf+buflen, sizeof(buf)-buflen)) > 0) {
buflen+=cur_len; buflen+=cur_len;
if (buflen >= sizeof(buf)) { if (buflen >= (int)sizeof(buf)) {
/* We'll false positive if the file is exactly sizeof(buf) bytes, /* We'll false positive if the file is exactly sizeof(buf) bytes,
as we don't know if there's any more stuff in the file */ as we don't know if there's any more stuff in the file */
fprintf(stderr, "vm conf too large\n"); fprintf(stderr, "vm conf too large\n");
@ -381,7 +381,7 @@ int get_netvm_id_from_name(const char *name)
return n; return n;
} }
void setup_xenstore(int netvm_id, int domid, int dvmid, const char *name) void setup_xenstore(int netvm_id, int domid, int dvmid)
{ {
char val[256]; char val[256];
struct xs_handle *xs = xs_daemon_open(); struct xs_handle *xs = xs_daemon_open();
@ -515,7 +515,7 @@ int main(int argc, char **argv)
fprintf(stderr, fprintf(stderr,
"time=%s, created domid=%d, creating xenstore entries\n", "time=%s, created domid=%d, creating xenstore entries\n",
gettime(), domid); gettime(), domid);
setup_xenstore(netvm_id, domid, dispid, name); setup_xenstore(netvm_id, domid, dispid);
rm_fast_flag(); rm_fast_flag();
fprintf(stderr, "time=%s, starting qrexec\n", gettime()); fprintf(stderr, "time=%s, starting qrexec\n", gettime());
start_rexec(domid, dispname_by_dispid(dispid), default_user); start_rexec(domid, dispname_by_dispid(dispid), default_user);