[PATCH 15/28] libxl: emuids: Pass emuid to device model argument construction

[Ian Jackson <ian.jackson@eu.citrix.com>]

No functional change yet.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
 tools/libxl/libxl_dm.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c
index bcae664..5b56047 100644
--- a/tools/libxl/libxl_dm.c
+++ b/tools/libxl/libxl_dm.c
@@ -752,6 +752,7 @@ static int libxl__dm_runas_helper(libxl__gc *gc, const char *username)
 
 static int libxl__build_device_model_args_new(libxl__gc *gc,
                                         const char *dm, int guest_domid,
+                                        int emuid,
                                         const libxl_domain_config *guest_config,
                                         char ***args, char ***envs,
                                         const libxl__domain_build_state *state,
@@ -1296,6 +1297,7 @@ end_search:
 
 static int libxl__build_device_model_args(libxl__gc *gc,
                                         const char *dm, int guest_domid,
+                                        int emuid,
                                         const libxl_domain_config *guest_config,
                                         char ***args, char ***envs,
                                         const libxl__domain_build_state *state,
@@ -1313,7 +1315,8 @@ static int libxl__build_device_model_args(libxl__gc *gc,
         assert(dm_state_fd != NULL);
         assert(*dm_state_fd < 0);
         return libxl__build_device_model_args_new(gc, dm,
-                                                  guest_domid, guest_config,
+                                                  guest_domid, emuid,
+                                                  guest_config,
                                                   args, envs,
                                                   state, dm_state_fd);
     default:
@@ -1531,6 +1534,7 @@ void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state *sdss,
         goto out;
 
     ret = libxl__build_device_model_args(gc, "stubdom-dm", guest_domid,
+                                         emuid,
                                          guest_config, &args, NULL,
                                          d_state, NULL);
     if (ret) {
@@ -1817,7 +1821,7 @@ void libxl__spawn_local_dm(libxl__egc *egc, libxl__dm_spawn_state *dmss,
         rc = ERROR_FAIL;
         goto out;
     }
-    rc = libxl__build_device_model_args(gc, dm, domid, guest_config,
+    rc = libxl__build_device_model_args(gc, dm, domid, emuid, guest_config,
                                           &args, &envs, state,
                                           &dm_state_fd);
     if (rc)
-- 
1.7.10.4