[PATCH v2 06/14] conf: turn virCapabilitiesSetNetPrefix() to void

virCapabilitiesSetNetPrefix() always returns 0. Signed-off-by: Dmitry Frolov <frolov(a)swemel.ru&gt; --- src/conf/capabilities.c | 4 +--- src/conf/capabilities.h | 2 +- src/libxl/libxl_capabilities.c | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 096ccc18e7..f7e7610ce6 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -312,13 +312,11 @@ virCapabilitiesAddHostMigrateTransport(virCaps *caps, * * Registers the prefix that is used for generated network interfaces */ -int +void virCapabilitiesSetNetPrefix(virCaps *caps, const char *prefix) { caps->host.netprefix = g_strdup(prefix); - - return 0; } diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h index 085c0af868..d770cddd6b 100644 --- a/src/conf/capabilities.h +++ b/src/conf/capabilities.h @@ -244,7 +244,7 @@ int virCapabilitiesAddHostMigrateTransport(virCaps *caps, const char *name); -int +void virCapabilitiesSetNetPrefix(virCaps *caps, const char *prefix); diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index e141873775..1a0ce25d56 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -175,8 +175,7 @@ libxlCapsInitHost(libxl_ctx *ctx, virCaps *caps) if (libxlCapsInitCPU(caps, &phy_info) < 0) goto cleanup; - if (virCapabilitiesSetNetPrefix(caps, LIBXL_GENERATED_PREFIX_XEN) < 0) - goto cleanup; + virCapabilitiesSetNetPrefix(caps, LIBXL_GENERATED_PREFIX_XEN); ret = 0; -- 2.34.1