From: David van Moolenbroek <david@minix3.org>
Date: Tue, 25 Feb 2014 14:08:20 +0000 (+0100)
Subject: RS: also wait for VM's RS_INIT message
X-Git-Tag: v3.3.0~411
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/man.rndc-confgen.html?a=commitdiff_plain;h=b539f91aba9b294011b0aeec6850d694dec1cc3d;p=minix.git

RS: also wait for VM's RS_INIT message

Bug reported by JD Begin.

Change-Id: Idd8c4299f20253fe2d982af319002bfb67af27c6
---

diff --git a/servers/rs/main.c b/servers/rs/main.c
index 7ac1f4c49..adcb8df4d 100644
--- a/servers/rs/main.c
+++ b/servers/rs/main.c
@@ -348,6 +348,10 @@ static int sef_cb_init_fresh(int UNUSED(type), sef_init_info_t *UNUSED(info))
           if ((s = init_service(rp, SEF_INIT_FRESH)) != OK) {
               panic("unable to initialize %d: %d", boot_image_priv->endpoint, s);
           }
+          /* VM will still send an RS_INIT message, though. */
+          if (boot_image_priv->endpoint != RS_PROC_NR) {
+              nr_uncaught_init_srvs++;
+          }
           continue;
       }