diff options
author | Ian Campbell <ian.campbell@citrix.com> | 2011-10-06 18:49:41 +0100 |
---|---|---|
committer | Ian Campbell <ian.campbell@citrix.com> | 2011-10-06 18:49:41 +0100 |
commit | f43458f6e2f777228fc78cb38280f670fe603b9a (patch) | |
tree | 902203e4e6b0e9e2a4815a25f475161f495ececc | |
parent | ec0c9b58c2a50f33904800882400315c49f65b72 (diff) | |
download | xen-f43458f6e2f777228fc78cb38280f670fe603b9a.tar.gz xen-f43458f6e2f777228fc78cb38280f670fe603b9a.tar.bz2 xen-f43458f6e2f777228fc78cb38280f670fe603b9a.zip |
libxl: add and use parse_mac helper function
rather than open coding a bunch it a bunch of times.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
-rw-r--r-- | tools/libxl/libxl_internal.c | 17 | ||||
-rw-r--r-- | tools/libxl/libxl_internal.h | 2 | ||||
-rw-r--r-- | tools/libxl/libxl_utils.c | 26 |
3 files changed, 30 insertions, 15 deletions
diff --git a/tools/libxl/libxl_internal.c b/tools/libxl/libxl_internal.c index 56e6618653..eabb9f27db 100644 --- a/tools/libxl/libxl_internal.c +++ b/tools/libxl/libxl_internal.c @@ -277,6 +277,23 @@ int libxl__file_reference_unmap(libxl_file_reference *f) return ERROR_FAIL; } +_hidden int libxl__parse_mac(const char *s, libxl_mac mac) +{ + const char *tok; + char *endptr; + int i; + + for (i = 0, tok = s; *tok && (i < 6); ++i, tok += 3) { + mac[i] = strtol(tok, &endptr, 16); + if (endptr != (tok + 2) || (*endptr != '\0' && *endptr != ':') ) + return ERROR_INVAL; + } + if ( i != 6 ) + return ERROR_INVAL; + + return 0; +} + int libxl__fd_set_cloexec(int fd) { int flags = 0; diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index d9b5e350e0..fff44f5128 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -416,6 +416,8 @@ _hidden int libxl__fd_set_cloexec(int fd); _hidden int libxl__e820_alloc(libxl_ctx *ctx, uint32_t domid, libxl_domain_config *d_config); +_hidden int libxl__parse_mac(const char *s, libxl_mac mac); + #define STRINGIFY(x) #x #define TOSTRING(x) STRINGIFY(x) diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c index 3804c45353..15578b1c4e 100644 --- a/tools/libxl/libxl_utils.c +++ b/tools/libxl/libxl_utils.c @@ -452,22 +452,19 @@ int libxl_mac_to_device_nic(libxl_ctx *ctx, uint32_t domid, const char *mac, libxl_device_nic *nic) { libxl_nicinfo *nics; - unsigned int nb, i; + unsigned int nb, rc, i; int found; - uint8_t mac_n[6]; + libxl_mac mac_n; uint8_t *a, *b; - const char *tok; - char *endptr; + + rc = libxl__parse_mac(mac, mac_n); + if (rc) + return rc; nics = libxl_list_nics(ctx, domid, &nb); if (!nics) return ERROR_FAIL; - for (i = 0, tok = mac; *tok && (i < 6); ++i, tok += 3) { - mac_n[i] = strtol(tok, &endptr, 16); - if (endptr != (tok + 2)) - return ERROR_INVAL; - } memset(nic, 0, sizeof (libxl_device_nic)); found = 0; for (i = 0; i < nb; ++i) { @@ -494,9 +491,8 @@ int libxl_devid_to_device_nic(libxl_ctx *ctx, uint32_t domid, const char *devid, libxl_device_nic *nic) { libxl__gc gc = LIBXL_INIT_GC(ctx); - char *tok, *val; + char *val; char *dompath, *nic_path_fe, *nic_path_be; - unsigned int i; int rc = ERROR_FAIL; memset(nic, 0, sizeof (libxl_device_nic)); @@ -515,10 +511,10 @@ int libxl_devid_to_device_nic(libxl_ctx *ctx, uint32_t domid, nic->devid = strtoul(devid, NULL, 10); val = libxl__xs_read(&gc, XBT_NULL, libxl__sprintf(&gc, "%s/mac", nic_path_fe)); - for (i = 0, tok = strtok(val, ":"); tok && (i < 6); - ++i, tok = strtok(NULL, ":")) { - nic->mac[i] = strtoul(tok, NULL, 16); - } + rc = libxl__parse_mac(val, nic->mac); + if (rc) + goto out; + nic->script = xs_read(ctx->xsh, XBT_NULL, libxl__sprintf(&gc, "%s/script", nic_path_be), NULL); rc = 0; out: |