From patchwork Tue Dec 22 18:44:51 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 7906751 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 60B52BF49E for ; Tue, 22 Dec 2015 18:48:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8397420553 for ; Tue, 22 Dec 2015 18:48:17 +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 8A91520573 for ; Tue, 22 Dec 2015 18:48:16 +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 1aBRwl-000293-71; Tue, 22 Dec 2015 18:46:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBRwa-0001n3-CZ for xen-devel@lists.xensource.com; Tue, 22 Dec 2015 18:45:56 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id DD/F3-21901-36A99765; Tue, 22 Dec 2015 18:45:55 +0000 X-Env-Sender: prvs=791371759=Ian.Jackson@citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1450809952!12310273!3 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 43909 invoked from network); 22 Dec 2015 18:45:54 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-11.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 22 Dec 2015 18:45:54 -0000 X-IronPort-AV: E=Sophos;i="5.20,465,1444694400"; d="scan'208";a="327002747" From: Ian Jackson To: Date: Tue, 22 Dec 2015 18:44:51 +0000 Message-ID: <1450809903-3393-17-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 16/28] libxl: emuids: Provide libxl__dm_xs_path_rel 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 This gives a relative path, suitable for driver domains. It will be used shortly. No functional change. Signed-off-by: Ian Jackson --- v6: New patch --- tools/libxl/libxl_internal.c | 10 ++++++++-- tools/libxl/libxl_internal.h | 4 ++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_internal.c b/tools/libxl/libxl_internal.c index 843fdbf..d0c98b0 100644 --- a/tools/libxl/libxl_internal.c +++ b/tools/libxl/libxl_internal.c @@ -553,6 +553,12 @@ void libxl__update_domain_configuration(libxl__gc *gc, dst->b_info.video_memkb = src->b_info.video_memkb; } +char *libxl__dm_xs_path_rel(libxl__gc *gc, + uint32_t domid, int emuid) +{ + return GCSPRINTF("device-model/%u", domid); +} + char *libxl__device_model_xs_path(libxl__gc *gc, uint32_t dm_domid, uint32_t domid, int emuid, const char *format, ...) @@ -560,8 +566,8 @@ char *libxl__device_model_xs_path(libxl__gc *gc, uint32_t dm_domid, char *s, *fmt; va_list ap; - fmt = GCSPRINTF("/local/domain/%u/device-model/%u%s", dm_domid, - domid, format); + fmt = GCSPRINTF("/local/domain/%u/%s%s", dm_domid, + libxl__dm_xs_path_rel(gc, domid, emuid), format); va_start(ap, format); s = libxl__vsprintf(gc, fmt, ap); diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 4a9003d..2248509 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1982,6 +1982,10 @@ _hidden char *libxl__device_model_xs_path(libxl__gc *gc, uint32_t domid, int emuid, const char *format, ...) PRINTF_ATTRIBUTE(5, 6); +_hidden char *libxl__dm_xs_path_rel(libxl__gc *gc, + uint32_t domid, int emuid); + /* returns relative path (ie assuming we are the toolstack) */ + /* * Calling context and GC for event-generating functions: *