From mboxrd@z Thu Jan 1 00:00:00 1970 From: Anthony PERARD Subject: [PATCH V2 2/3] Provide dm_vnc() as a in libxl helper. Date: Thu, 9 Feb 2012 14:06:37 +0000 Message-ID: <1328796398-2242-3-git-send-email-anthony.perard@citrix.com> References: <1328796398-2242-1-git-send-email-anthony.perard@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1328796398-2242-1-git-send-email-anthony.perard@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Xen Devel Cc: Anthony PERARD List-Id: xen-devel@lists.xenproject.org Just to use this function in more than one file.c. Signed-off-by: Anthony PERARD --- tools/libxl/libxl_dm.c | 8 ++++---- tools/libxl/libxl_internal.h | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 5fec137..3422ec0 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -73,7 +73,7 @@ static const char *libxl__domain_bios(libxl__gc *gc, } } -static const libxl_vnc_info *dm_vnc(const libxl_domain_config *guest_config) +const libxl_vnc_info *libxl__dm_vnc(const libxl_domain_config *guest_config) { const libxl_vnc_info *vnc = NULL; if (guest_config->b_info.type == LIBXL_DOMAIN_TYPE_HVM) { @@ -113,7 +113,7 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc, const libxl_domain_create_info *c_info = &guest_config->c_info; const libxl_domain_build_info *b_info = &guest_config->b_info; const libxl_device_nic *vifs = guest_config->vifs; - const libxl_vnc_info *vnc = dm_vnc(guest_config); + const libxl_vnc_info *vnc = libxl__dm_vnc(guest_config); const libxl_sdl_info *sdl = dm_sdl(guest_config); const int num_vifs = guest_config->num_vifs; const char *keymap = dm_keymap(guest_config); @@ -328,7 +328,7 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, const libxl_device_nic *vifs = guest_config->vifs; const int num_disks = guest_config->num_disks; const int num_vifs = guest_config->num_vifs; - const libxl_vnc_info *vnc = dm_vnc(guest_config); + const libxl_vnc_info *vnc = libxl__dm_vnc(guest_config); const libxl_sdl_info *sdl = dm_sdl(guest_config); const char *keymap = dm_keymap(guest_config); flexarray_t *dm_args; @@ -889,7 +889,7 @@ int libxl__create_device_model(libxl__gc *gc, libxl_ctx *ctx = libxl__gc_owner(gc); const libxl_domain_create_info *c_info = &guest_config->c_info; const libxl_domain_build_info *b_info = &guest_config->b_info; - const libxl_vnc_info *vnc = dm_vnc(guest_config); + const libxl_vnc_info *vnc = libxl__dm_vnc(guest_config); char *path, *logfile; int logfile_w, null; int rc; diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 972c818..957eca2 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -899,6 +899,8 @@ _hidden int libxl__wait_for_device_model(libxl__gc *gc, _hidden int libxl__destroy_device_model(libxl__gc *gc, uint32_t domid); +_hidden const libxl_vnc_info *libxl__dm_vnc(const libxl_domain_config *g_cfg); + _hidden char *libxl__abs_path(libxl__gc *gc, const char *s, const char *path); #define LIBXL__LOG_DEBUG XTL_DEBUG -- Anthony PERARD