From patchwork Tue Dec 22 18:44:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 7906551 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 919DABEEE5 for ; Tue, 22 Dec 2015 18:47:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5C55620503 for ; Tue, 22 Dec 2015 18:47:52 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7AAD920502 for ; Tue, 22 Dec 2015 18:47:51 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBRwd-0001ta-FC; Tue, 22 Dec 2015 18:45:59 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBRwY-0001jl-Rt for xen-devel@lists.xensource.com; Tue, 22 Dec 2015 18:45:54 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id 45/C2-28221-26A99765; Tue, 22 Dec 2015 18:45:54 +0000 X-Env-Sender: prvs=791371759=Ian.Jackson@citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1450809948!12405671!6 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18380 invoked from network); 22 Dec 2015 18:45:53 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-3.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 22 Dec 2015 18:45:53 -0000 X-IronPort-AV: E=Sophos;i="5.20,465,1444694400"; d="scan'208";a="327002746" From: Ian Jackson To: Date: Tue, 22 Dec 2015 18:44:50 +0000 Message-ID: <1450809903-3393-16-git-send-email-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1450809903-3393-1-git-send-email-ian.jackson@eu.citrix.com> References: <1450809903-3393-1-git-send-email-ian.jackson@eu.citrix.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: Ian Jackson , Wei Liu , Ian Campbell , Stefano Stabellini Subject: [Xen-devel] [PATCH 15/28] libxl: emuids: Pass emuid to device model argument construction X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP No functional change yet. Signed-off-by: Ian Jackson --- 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)