diff options
| author | Anthony PERARD <anthony.perard@citrix.com> | 2012-02-20 18:45:29 +0000 |
|---|---|---|
| committer | Anthony PERARD <anthony.perard@citrix.com> | 2012-02-20 18:45:29 +0000 |
| commit | 58aa83301c4c4f6d7000136433e36e14335dc462 (patch) | |
| tree | d2eae144dbaa8252460e9792f30d4f696ec3d9fc /tools/libxl | |
| parent | 50f10bef35f00a48c34b03640f160bb6a235ba96 (diff) | |
| download | xen-58aa83301c4c4f6d7000136433e36e14335dc462.tar.gz xen-58aa83301c4c4f6d7000136433e36e14335dc462.tar.bz2 xen-58aa83301c4c4f6d7000136433e36e14335dc462.zip | |
Provide dm_vnc() as a in libxl helper.
Just to use this function in more than one file.c.
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Acked-by: Ian Campbell <ian.campbell.com>
Committed-by: Ian Jackson <ian.jackson.citrix.com>
Diffstat (limited to 'tools/libxl')
| -rw-r--r-- | tools/libxl/libxl_dm.c | 8 | ||||
| -rw-r--r-- | 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 e99d173ef0..9187a941cd 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; @@ -890,7 +890,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 dc99d21ad3..7514ae30f4 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -903,6 +903,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 |