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 7ac1f4c49e4c83e210db4e111849758fefab16ff..adcb8df4d871ebca865371a880acbb2a439e8adb 100644 (file)
--- 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;
       }