Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/core

This commit is contained in:
Joanna Rutkowska 2012-07-20 16:45:35 +02:00
commit f0ca597814

View File

@ -154,6 +154,17 @@ int main(int argc, char **argv)
perror("xs_domain_open"); perror("xs_domain_open");
exit(1); exit(1);
} }
if (argc == 3) {
/* if not waiting for signal, fork after first info written to xenstore */
n = pread(fd, buf, sizeof(buf), 0);
buf[n] = 0;
meminfo_data = parse(buf);
if (meminfo_data)
send_to_qmemman(xs, meminfo_data);
if (fork() > 0)
exit(0);
}
for (;;) { for (;;) {
n = pread(fd, buf, sizeof(buf), 0); n = pread(fd, buf, sizeof(buf), 0);
buf[n] = 0; buf[n] = 0;