[PATCH v2 00/14] Unreacheble code cleanup
A lot of unreacheble code was caused by int functions, which return nothing except zero. Unreacheble code was removed. Corresponding functions type was changed to void. Dmitry Frolov (14): cpu: turn virCPUx86DataAddItem() to void cpu: turn virCPUx86DataAdd() to void libxl: turn libxlCapsAddCPUID() to void libxl: turn virCapabilitiesAddHostFeature() to void libxl: turn libxl_get_physinfo() to void conf: turn virCapabilitiesSetNetPrefix() to void libxl: turn libxlMakeDomainOSCaps() to void libxl: turn libxlMakeDomainDeviceDiskCaps() to void libxl: turn libxlMakeDomainDeviceGraphicsCaps() to void libxl: turn libxlMakeDomainDeviceVideoCaps() to void conf: turn virDomainGraphicsListenAppendAddress() to void vbox: turn vboxDumpDisplay() to void libxl: turn xenParseXLNamespaceData() to void rpc: turn virNetClientAddProgram() to void src/admin/admin_remote.c | 3 +- src/conf/capabilities.c | 8 +-- src/conf/capabilities.h | 4 +- src/conf/domain_conf.c | 4 +- src/conf/domain_conf.h | 2 +- src/cpu/cpu_x86.c | 91 ++++++++++++--------------------- src/cpu/cpu_x86.h | 2 +- src/libxl/libxl_capabilities.c | 54 +++++++------------ src/libxl/libxl_conf.c | 20 ++------ src/libxl/libxl_driver.c | 6 +-- src/libxl/xen_common.c | 7 +-- src/libxl/xen_xl.c | 8 ++- src/locking/lock_driver_lockd.c | 3 +- src/logging/log_manager.c | 3 +- src/lxc/lxc_monitor.c | 4 +- src/remote/remote_driver.c | 7 ++- src/rpc/virnetclient.c | 3 +- src/rpc/virnetclient.h | 2 +- src/test/test_driver.c | 6 +-- src/vbox/vbox_common.c | 13 ++--- src/vmx/vmx.c | 3 +- tests/libxlmock.c | 5 +- 22 files changed, 86 insertions(+), 172 deletions(-) -- 2.34.1
virCPUx86DataAddItem() always returns 0. Signed-off-by: Dmitry Frolov <frolov@swemel.ru> --- src/cpu/cpu_x86.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 8d0e3947ce..f32770b8a3 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -531,7 +531,7 @@ x86DataCopy(virCPUx86Data *dst, const virCPUx86Data *src) } -static int +static void virCPUx86DataAddItem(virCPUx86Data *data, const virCPUx86DataItem *item) { @@ -547,8 +547,6 @@ virCPUx86DataAddItem(virCPUx86Data *data, sizeof(virCPUx86DataItem), virCPUx86DataSorter, NULL); } - - return 0; } @@ -561,10 +559,8 @@ x86DataAdd(virCPUx86Data *data1, virCPUx86DataIteratorInit(&iter, data2); while ((item = virCPUx86DataNext(&iter))) { - if (virCPUx86DataAddItem(data1, item) < 0) - return -1; + virCPUx86DataAddItem(data1, item); } - return 0; } @@ -819,8 +815,9 @@ x86DataAddSignature(virCPUx86Data *data, uint32_t signature) { virCPUx86DataItem leaf1 = CPUID(.eax_in = 0x1, .eax = signature); + virCPUx86DataAddItem(data, &leaf1); - return virCPUx86DataAddItem(data, &leaf1); + return 0; } @@ -1125,8 +1122,7 @@ x86ParseDataItemList(virCPUx86Data *cpudata, } } - if (virCPUx86DataAddItem(cpudata, &item) < 0) - return -1; + virCPUx86DataAddItem(cpudata, &item); ++i; node = xmlNextElementSibling(node); @@ -2911,9 +2907,8 @@ virCPUx86Baseline(virCPUDef **cpus, return NULL; } - if (vendor && - virCPUx86DataAddItem(&base_model->data, &vendor->data) < 0) - return NULL; + if (vendor) + virCPUx86DataAddItem(&base_model->data, &vendor->data); if (x86Decode(cpu, &base_model->data, models, (const char **) modelNames, migratable) < 0) @@ -3172,9 +3167,8 @@ virCPUx86Translate(virCPUDef *cpu, if (!(model = x86ModelFromCPU(cpu, map, -1))) return -1; - if (model->vendor && - virCPUx86DataAddItem(&model->data, &model->vendor->data) < 0) - return -1; + if (model->vendor) + virCPUx86DataAddItem(&model->data, &model->vendor->data); if (model->signatures && model->signatures->count > 0) { virCPUx86Signature *sig = &model->signatures->items[0]; @@ -3302,7 +3296,8 @@ int virCPUx86DataAdd(virCPUData *cpuData, const virCPUx86DataItem *item) { - return virCPUx86DataAddItem(&cpuData->data.x86, item); + virCPUx86DataAddItem(&cpuData->data.x86, item); + return 0; } -- 2.34.1
virCPUx86DataAdd() always returns 0. Signed-off-by: Dmitry Frolov <frolov@swemel.ru> --- src/cpu/cpu_x86.c | 66 +++++++++++++--------------------- src/cpu/cpu_x86.h | 2 +- src/libxl/libxl_capabilities.c | 7 +--- 3 files changed, 26 insertions(+), 49 deletions(-) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index f32770b8a3..4f3bfd075b 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -2380,8 +2380,8 @@ x86Encode(virArch arch, if (!(data_vendor = virCPUDataNew(arch))) return -1; - if (v && virCPUx86DataAdd(data_vendor, &v->data) < 0) - return -1; + if (v) + virCPUx86DataAdd(data_vendor, &v->data); } if (forced) @@ -2455,14 +2455,12 @@ cpuidSetLeaf4(virCPUData *data, virCPUx86DataItem item = *subLeaf0; virCPUx86CPUID *cpuid = &item.data.cpuid; - if (virCPUx86DataAdd(data, subLeaf0) < 0) - return -1; + virCPUx86DataAdd(data, subLeaf0); while (cpuid->eax & 0x1f) { cpuid->ecx_in++; cpuidCall(cpuid); - if (virCPUx86DataAdd(data, &item) < 0) - return -1; + virCPUx86DataAdd(data, &item); } return 0; } @@ -2480,14 +2478,12 @@ cpuidSetLeaf7(virCPUData *data, virCPUx86CPUID *cpuid = &item.data.cpuid; uint32_t sub; - if (virCPUx86DataAdd(data, subLeaf0) < 0) - return -1; + virCPUx86DataAdd(data, subLeaf0); for (sub = 1; sub <= subLeaf0->data.cpuid.eax; sub++) { cpuid->ecx_in = sub; cpuidCall(cpuid); - if (virCPUx86DataAdd(data, &item) < 0) - return -1; + virCPUx86DataAdd(data, &item); } return 0; } @@ -2508,8 +2504,7 @@ cpuidSetLeafB(virCPUData *data, virCPUx86CPUID *cpuid = &item.data.cpuid; while (cpuid->ecx & 0xff00) { - if (virCPUx86DataAdd(data, &item) < 0) - return -1; + virCPUx86DataAdd(data, &item); cpuid->ecx_in++; cpuidCall(cpuid); } @@ -2535,13 +2530,11 @@ cpuidSetLeafD(virCPUData *data, virCPUx86CPUID sub1; uint32_t sub; - if (virCPUx86DataAdd(data, subLeaf0) < 0) - return -1; + virCPUx86DataAdd(data, subLeaf0); cpuid->ecx_in = 1; cpuidCall(cpuid); - if (virCPUx86DataAdd(data, &item) < 0) - return -1; + virCPUx86DataAdd(data, &item); sub0 = subLeaf0->data.cpuid; sub1 = *cpuid; @@ -2557,8 +2550,7 @@ cpuidSetLeafD(virCPUData *data, cpuid->ecx_in = sub; cpuidCall(cpuid); - if (virCPUx86DataAdd(data, &item) < 0) - return -1; + virCPUx86DataAdd(data, &item); } return 0; } @@ -2582,16 +2574,14 @@ cpuidSetLeafResID(virCPUData *data, virCPUx86CPUID *cpuid = &item.data.cpuid; uint32_t sub; - if (virCPUx86DataAdd(data, subLeaf0) < 0) - return -1; + virCPUx86DataAdd(data, subLeaf0); for (sub = 1; sub < 32; sub++) { if (!(res & (1U << sub))) continue; cpuid->ecx_in = sub; cpuidCall(cpuid); - if (virCPUx86DataAdd(data, &item) < 0) - return -1; + virCPUx86DataAdd(data, &item); } return 0; } @@ -2614,20 +2604,17 @@ cpuidSetLeaf12(virCPUData *data, !(leaf7->data.cpuid.ebx & (1 << 2))) return 0; - if (virCPUx86DataAdd(data, subLeaf0) < 0) - return -1; + virCPUx86DataAdd(data, subLeaf0); cpuid->eax_in = 0x12; cpuid->ecx_in = 1; cpuidCall(cpuid); - if (virCPUx86DataAdd(data, &item) < 0) - return -1; + virCPUx86DataAdd(data, &item); cpuid->ecx_in = 2; cpuidCall(cpuid); while (cpuid->eax & 0xf) { - if (virCPUx86DataAdd(data, &item) < 0) - return -1; + virCPUx86DataAdd(data, &item); cpuid->ecx_in++; cpuidCall(cpuid); } @@ -2647,14 +2634,12 @@ cpuidSetLeaf14(virCPUData *data, virCPUx86CPUID *cpuid = &item.data.cpuid; uint32_t sub; - if (virCPUx86DataAdd(data, subLeaf0) < 0) - return -1; + virCPUx86DataAdd(data, subLeaf0); for (sub = 1; sub <= subLeaf0->data.cpuid.eax; sub++) { cpuid->ecx_in = sub; cpuidCall(cpuid); - if (virCPUx86DataAdd(data, &item) < 0) - return -1; + virCPUx86DataAdd(data, &item); } return 0; } @@ -2676,14 +2661,12 @@ cpuidSetLeaf17(virCPUData *data, if (subLeaf0->data.cpuid.eax < 3) return 0; - if (virCPUx86DataAdd(data, subLeaf0) < 0) - return -1; + virCPUx86DataAdd(data, subLeaf0); for (sub = 1; sub <= subLeaf0->data.cpuid.eax; sub++) { cpuid->ecx_in = sub; cpuidCall(cpuid); - if (virCPUx86DataAdd(data, &item) < 0) - return -1; + virCPUx86DataAdd(data, &item); } return 0; } @@ -2728,7 +2711,7 @@ cpuidSet(uint32_t base, virCPUData *data) else if (leaf == 0x17) rc = cpuidSetLeaf17(data, &item); else - rc = virCPUx86DataAdd(data, &item); + virCPUx86DataAdd(data, &item); if (rc < 0) return -1; @@ -2773,8 +2756,7 @@ virCPUx86GetHost(virCPUDef *cpu, }, }; - if (virCPUx86DataAdd(cpuData, &item) < 0) - return -1; + virCPUx86DataAdd(cpuData, &item); } } @@ -3292,12 +3274,11 @@ virCPUx86ValidateFeatures(virCPUDef *cpu) } -int +void virCPUx86DataAdd(virCPUData *cpuData, const virCPUx86DataItem *item) { virCPUx86DataAddItem(&cpuData->data.x86, item); - return 0; } @@ -3334,7 +3315,8 @@ virCPUx86DataSetVendor(virCPUData *cpuData, if (virCPUx86VendorToData(vendor, &item) < 0) return -1; - return virCPUx86DataAdd(cpuData, &item); + virCPUx86DataAdd(cpuData, &item); + return 0; } diff --git a/src/cpu/cpu_x86.h b/src/cpu/cpu_x86.h index 416d052776..f0d73a5f40 100644 --- a/src/cpu/cpu_x86.h +++ b/src/cpu/cpu_x86.h @@ -25,7 +25,7 @@ extern struct cpuArchDriver cpuDriverX86; -int virCPUx86DataAdd(virCPUData *cpuData, +void virCPUx86DataAdd(virCPUData *cpuData, const virCPUx86DataItem *cpuid); int virCPUx86DataSetSignature(virCPUData *cpuData, diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index 177e8b988e..9da0fe851c 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -64,12 +64,7 @@ libxlCapsAddCPUID(virCPUData *data, virCPUx86CPUID *cpuid, ssize_t ncaps) item.type = VIR_CPU_X86_DATA_CPUID; for (i = 0; i < ncaps; i++) { item.data.cpuid = cpuid[i]; - - if (virCPUx86DataAdd(data, &item) < 0) { - VIR_DEBUG("Failed to add CPUID(%x,%x)", - cpuid[i].eax_in, cpuid[i].ecx_in); - return -1; - } + virCPUx86DataAdd(data, &item); } return 0; -- 2.34.1
libxlCapsAddCPUID() always returns 0. Signed-off-by: Dmitry Frolov <frolov@swemel.ru> --- src/libxl/libxl_capabilities.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index 9da0fe851c..9be64a53a8 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -55,7 +55,7 @@ struct guest_arch { #define XEN_CAP_REGEX "(xen|hvm)-[[:digit:]]+\\.[[:digit:]]+-(aarch64|armv7l|x86_32|x86_64|ia64|powerpc64)(p|be)?" -static int +static void libxlCapsAddCPUID(virCPUData *data, virCPUx86CPUID *cpuid, ssize_t ncaps) { virCPUx86DataItem item = { 0 }; @@ -66,8 +66,6 @@ libxlCapsAddCPUID(virCPUData *data, virCPUx86CPUID *cpuid, ssize_t ncaps) item.data.cpuid = cpuid[i]; virCPUx86DataAdd(data, &item); } - - return 0; } /* @@ -114,8 +112,7 @@ libxlCapsNodeData(virCPUDef *cpu, libxl_hwcap hwcap) return NULL; ncaps = G_N_ELEMENTS(cpuid); - if (libxlCapsAddCPUID(cpudata, cpuid, ncaps) < 0) - return NULL; + libxlCapsAddCPUID(cpudata, cpuid, ncaps); return g_steal_pointer(&cpudata); } -- 2.34.1
virCapabilitiesAddHostFeature() always returns 0. Signed-off-by: Dmitry Frolov <frolov@swemel.ru> --- src/conf/capabilities.c | 4 +--- src/conf/capabilities.h | 2 +- src/libxl/libxl_capabilities.c | 5 ++--- src/test/test_driver.c | 6 ++---- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 32badee7b3..096ccc18e7 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -276,7 +276,7 @@ virCapsDispose(void *object) * * Registers a new host CPU feature, eg 'pae', or 'vmx' */ -int +void virCapabilitiesAddHostFeature(virCaps *caps, const char *name) { @@ -284,8 +284,6 @@ virCapabilitiesAddHostFeature(virCaps *caps, caps->host.nfeatures, 1); caps->host.features[caps->host.nfeatures] = g_strdup(name); caps->host.nfeatures++; - - return 0; } /** diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h index 9eaf6e2807..085c0af868 100644 --- a/src/conf/capabilities.h +++ b/src/conf/capabilities.h @@ -236,7 +236,7 @@ virCapabilitiesHostNUMARef(virCapsHostNUMA *caps); G_DEFINE_AUTOPTR_CLEANUP_FUNC(virCapsHostNUMA, virCapabilitiesHostNUMAUnref); -int +void virCapabilitiesAddHostFeature(virCaps *caps, const char *name); diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index 9be64a53a8..836f46341a 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -137,9 +137,8 @@ libxlCapsInitCPU(virCaps *caps, libxl_physinfo *phy_info) cpu = virCPUDefNew(); host_pae = phy_info->hw_cap[0] & LIBXL_X86_FEATURE_PAE_MASK; - if (host_pae && - virCapabilitiesAddHostFeature(caps, "pae") < 0) - return -1; + if (host_pae) + virCapabilitiesAddHostFeature(caps, "pae"); host_lm = (phy_info->hw_cap[2] & LIBXL_X86_FEATURE_LM_MASK); if (host_lm) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 67f8e75296..ec1a9b75de 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -299,10 +299,8 @@ testBuildCapabilities(virConnectPtr conn) if ((caps = virCapabilitiesNew(VIR_ARCH_I686, false, false)) == NULL) return NULL; - if (virCapabilitiesAddHostFeature(caps, "pae") < 0) - return NULL; - if (virCapabilitiesAddHostFeature(caps, "nonpae") < 0) - return NULL; + virCapabilitiesAddHostFeature(caps, "pae"); + virCapabilitiesAddHostFeature(caps, "nonpae"); virCapabilitiesHostInitIOMMU(caps); -- 2.34.1
libxl_get_physinfo() always returns 0. Signed-off-by: Dmitry Frolov <frolov@swemel.ru> --- src/libxl/libxl_capabilities.c | 6 +----- src/libxl/libxl_conf.c | 20 +++++--------------- src/libxl/libxl_driver.c | 6 +----- tests/libxlmock.c | 5 +---- 4 files changed, 8 insertions(+), 29 deletions(-) diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index 836f46341a..e141873775 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -170,11 +170,7 @@ libxlCapsInitHost(libxl_ctx *ctx, virCaps *caps) int ret = -1; libxl_physinfo_init(&phy_info); - if (libxl_get_physinfo(ctx, &phy_info) != 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Failed to get node physical info from libxenlight")); - goto cleanup; - } + libxl_get_physinfo(ctx, &phy_info); if (libxlCapsInitCPU(caps, &phy_info) < 0) goto cleanup; diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 62e1be6672..82f4dd80a2 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -856,12 +856,8 @@ libxlMakeVnumaList(virDomainDef *def, return 0; libxl_physinfo_init(&physinfo); - if (libxl_get_physinfo(ctx, &physinfo) < 0) { - libxl_physinfo_dispose(&physinfo); - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("libxl_get_physinfo_info failed")); - return -1; - } + libxl_get_physinfo(ctx, &physinfo); + nr_nodes = physinfo.nr_nodes; libxl_physinfo_dispose(&physinfo); @@ -1927,10 +1923,8 @@ libxlDriverGetDom0MaxmemConf(libxlDriverConfig *cfg, physmem: /* No 'max' specified in dom0_mem, so dom0 can use all physical memory */ libxl_physinfo_init(&physinfo); - if (libxl_get_physinfo(cfg->ctx, &physinfo)) { - VIR_WARN("libxl_get_physinfo failed"); - return -1; - } + libxl_get_physinfo(cfg->ctx, &physinfo); + *maxmem = (physinfo.total_pages * cfg->verInfo->pagesize) / 1024; libxl_physinfo_dispose(&physinfo); return 0; @@ -2405,11 +2399,7 @@ libxlDriverNodeGetInfo(libxlDriverPrivate *driver, virNodeInfoPtr info) int ret = -1; libxl_physinfo_init(&phy_info); - if (libxl_get_physinfo(cfg->ctx, &phy_info)) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("libxl_get_physinfo_info failed")); - goto cleanup; - } + libxl_get_physinfo(cfg->ctx, &phy_info); if (virStrcpyStatic(info->model, virArchToString(hostarch)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index c98d2d737a..d218cc63dc 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -4489,11 +4489,7 @@ libxlNodeGetFreeMemory(virConnectPtr conn) if (virNodeGetFreeMemoryEnsureACL(conn) < 0) goto cleanup; - if (libxl_get_physinfo(cfg->ctx, &phy_info)) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("libxl_get_physinfo_info failed")); - goto cleanup; - } + libxl_get_physinfo(cfg->ctx, &phy_info); ret = phy_info.free_pages * cfg->verInfo->pagesize; diff --git a/tests/libxlmock.c b/tests/libxlmock.c index f564a0ef72..87796e780d 100644 --- a/tests/libxlmock.c +++ b/tests/libxlmock.c @@ -68,8 +68,7 @@ VIR_MOCK_IMPL_RET_ARGS(libxl_get_version_info, return &info; } -VIR_MOCK_IMPL_RET_ARGS(libxl_get_physinfo, - int, +VIR_MOCK_IMPL_VOID_ARGS(libxl_get_physinfo, libxl_ctx *, ctx, libxl_physinfo *, physinfo) { @@ -79,8 +78,6 @@ VIR_MOCK_IMPL_RET_ARGS(libxl_get_physinfo, /* silence gcc warning about unused function */ if (0) real_libxl_get_physinfo(ctx, physinfo); - - return 0; } VIR_MOCK_STUB_RET_ARGS(libxl_get_free_memory, -- 2.34.1
virCapabilitiesSetNetPrefix() always returns 0. Signed-off-by: Dmitry Frolov <frolov@swemel.ru> --- 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
libxlMakeDomainOSCaps() always returns 0. Signed-off-by: Dmitry Frolov <frolov@swemel.ru> --- src/libxl/libxl_capabilities.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index 1a0ce25d56..f419dd9d20 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -504,7 +504,7 @@ libxlCapsInitGuests(libxl_ctx *ctx, virCaps *caps) return 0; } -static int +static void libxlMakeDomainOSCaps(const char *machine, virDomainCapsOS *os, virFirmware **firmwares, @@ -519,7 +519,7 @@ libxlMakeDomainOSCaps(const char *machine, capsLoader->readonly.report = true; if (STREQ(machine, "xenpv") || STREQ(machine, "xenpvh")) - return 0; + return; capsLoader->supported = VIR_TRISTATE_BOOL_YES; capsLoader->values.values = g_new0(char *, nfirmwares); @@ -535,7 +535,7 @@ libxlMakeDomainOSCaps(const char *machine, VIR_DOMAIN_CAPS_ENUM_SET(capsLoader->readonly, VIR_TRISTATE_BOOL_YES); - return 0; + return; } static int @@ -671,8 +671,8 @@ libxlMakeDomainCapabilities(virDomainCaps *domCaps, else domCaps->maxvcpus = PV_MAX_VCPUS; - if (libxlMakeDomainOSCaps(domCaps->machine, os, firmwares, nfirmwares) < 0 || - libxlMakeDomainDeviceDiskCaps(disk) < 0 || + libxlMakeDomainOSCaps(domCaps->machine, os, firmwares, nfirmwares); + if (libxlMakeDomainDeviceDiskCaps(disk) < 0 || libxlMakeDomainDeviceGraphicsCaps(graphics) < 0 || libxlMakeDomainDeviceVideoCaps(video) < 0) return -1; -- 2.34.1
libxlMakeDomainDeviceDiskCaps() always returns 0. Signed-off-by: Dmitry Frolov <frolov@swemel.ru> --- src/libxl/libxl_capabilities.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index f419dd9d20..31b6fbc629 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -538,7 +538,7 @@ libxlMakeDomainOSCaps(const char *machine, return; } -static int +static void libxlMakeDomainDeviceDiskCaps(virDomainCapsDeviceDisk *dev) { dev->supported = VIR_TRISTATE_BOOL_YES; @@ -555,7 +555,6 @@ libxlMakeDomainDeviceDiskCaps(virDomainCapsDeviceDisk *dev) VIR_DOMAIN_DISK_BUS_SCSI, VIR_DOMAIN_DISK_BUS_XEN); - return 0; } static int @@ -672,8 +671,8 @@ libxlMakeDomainCapabilities(virDomainCaps *domCaps, domCaps->maxvcpus = PV_MAX_VCPUS; libxlMakeDomainOSCaps(domCaps->machine, os, firmwares, nfirmwares); - if (libxlMakeDomainDeviceDiskCaps(disk) < 0 || - libxlMakeDomainDeviceGraphicsCaps(graphics) < 0 || + libxlMakeDomainDeviceDiskCaps(disk); + if (libxlMakeDomainDeviceGraphicsCaps(graphics) < 0 || libxlMakeDomainDeviceVideoCaps(video) < 0) return -1; if (STRNEQ(domCaps->machine, "xenpvh") && -- 2.34.1
libxlMakeDomainDeviceGraphicsCaps() always returns 0. Signed-off-by: Dmitry Frolov <frolov@swemel.ru> --- src/libxl/libxl_capabilities.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index 31b6fbc629..b1e0985b7a 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -557,7 +557,7 @@ libxlMakeDomainDeviceDiskCaps(virDomainCapsDeviceDisk *dev) } -static int +static void libxlMakeDomainDeviceGraphicsCaps(virDomainCapsDeviceGraphics *dev) { dev->supported = VIR_TRISTATE_BOOL_YES; @@ -568,7 +568,6 @@ libxlMakeDomainDeviceGraphicsCaps(virDomainCapsDeviceGraphics *dev) VIR_DOMAIN_GRAPHICS_TYPE_VNC, VIR_DOMAIN_GRAPHICS_TYPE_SPICE); - return 0; } static int @@ -672,8 +671,8 @@ libxlMakeDomainCapabilities(virDomainCaps *domCaps, libxlMakeDomainOSCaps(domCaps->machine, os, firmwares, nfirmwares); libxlMakeDomainDeviceDiskCaps(disk); - if (libxlMakeDomainDeviceGraphicsCaps(graphics) < 0 || - libxlMakeDomainDeviceVideoCaps(video) < 0) + libxlMakeDomainDeviceGraphicsCaps(graphics); + if (libxlMakeDomainDeviceVideoCaps(video) < 0) return -1; if (STRNEQ(domCaps->machine, "xenpvh") && libxlMakeDomainDeviceHostdevCaps(hostdev) < 0) -- 2.34.1
libxlMakeDomainDeviceVideoCaps() always returns 0. Signed-off-by: Dmitry Frolov <frolov@swemel.ru> --- src/libxl/libxl_capabilities.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index b1e0985b7a..3a2b0fe2bd 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -570,7 +570,7 @@ libxlMakeDomainDeviceGraphicsCaps(virDomainCapsDeviceGraphics *dev) } -static int +static void libxlMakeDomainDeviceVideoCaps(virDomainCapsDeviceVideo *dev) { dev->supported = VIR_TRISTATE_BOOL_YES; @@ -580,8 +580,6 @@ libxlMakeDomainDeviceVideoCaps(virDomainCapsDeviceVideo *dev) VIR_DOMAIN_VIDEO_TYPE_VGA, VIR_DOMAIN_VIDEO_TYPE_CIRRUS, VIR_DOMAIN_VIDEO_TYPE_XEN); - - return 0; } static int @@ -672,8 +670,8 @@ libxlMakeDomainCapabilities(virDomainCaps *domCaps, libxlMakeDomainOSCaps(domCaps->machine, os, firmwares, nfirmwares); libxlMakeDomainDeviceDiskCaps(disk); libxlMakeDomainDeviceGraphicsCaps(graphics); - if (libxlMakeDomainDeviceVideoCaps(video) < 0) - return -1; + libxlMakeDomainDeviceVideoCaps(video); + if (STRNEQ(domCaps->machine, "xenpvh") && libxlMakeDomainDeviceHostdevCaps(hostdev) < 0) return -1; -- 2.34.1
virDomainGraphicsListenAppendAddress() always returns 0. Signed-off-by: Dmitry Frolov <frolov@swemel.ru> --- src/conf/domain_conf.c | 4 +--- src/conf/domain_conf.h | 2 +- src/libxl/xen_common.c | 7 ++----- src/libxl/xen_xl.c | 3 +-- src/vbox/vbox_common.c | 4 +--- src/vmx/vmx.c | 3 +-- 6 files changed, 7 insertions(+), 16 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 22ad43e1d7..7b4d86d837 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -29053,7 +29053,7 @@ virDomainGraphicsGetListen(virDomainGraphicsDef *def, size_t i) } -int +void virDomainGraphicsListenAppendAddress(virDomainGraphicsDef *def, const char *address) { @@ -29064,8 +29064,6 @@ virDomainGraphicsListenAppendAddress(virDomainGraphicsDef *def, glisten.address = g_strdup(address); VIR_APPEND_ELEMENT_COPY(def->listens, def->nListens, glisten); - - return 0; } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index ed07859bc5..7002bd072b 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3909,7 +3909,7 @@ int virDomainHostdevMatch(virDomainHostdevDef *a, virDomainGraphicsListenDef * virDomainGraphicsGetListen(virDomainGraphicsDef *def, size_t i); -int virDomainGraphicsListenAppendAddress(virDomainGraphicsDef *def, +void virDomainGraphicsListenAppendAddress(virDomainGraphicsDef *def, const char *address) ATTRIBUTE_NONNULL(1); int virDomainGraphicsListenAppendSocket(virDomainGraphicsDef *def, diff --git a/src/libxl/xen_common.c b/src/libxl/xen_common.c index d5a0399613..c7bc51b926 100644 --- a/src/libxl/xen_common.c +++ b/src/libxl/xen_common.c @@ -673,8 +673,7 @@ xenParseVfb(virConf *conf, virDomainDef *def) if (xenConfigCopyStringOpt(conf, "vnclisten", &listenAddr) < 0) goto cleanup; - if (virDomainGraphicsListenAppendAddress(graphics, listenAddr) < 0) - goto cleanup; + virDomainGraphicsListenAppendAddress(graphics, listenAddr); VIR_FREE(listenAddr); if (xenConfigCopyStringOpt(conf, "vncpasswd", &graphics->data.vnc.auth.passwd) < 0) @@ -766,9 +765,7 @@ xenParseVfb(virConf *conf, virDomainDef *def) key = nextkey; } if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) { - if (virDomainGraphicsListenAppendAddress(graphics, - listenAddr) < 0) - goto cleanup; + virDomainGraphicsListenAppendAddress(graphics, listenAddr); VIR_FREE(listenAddr); } def->graphics = g_new0(virDomainGraphicsDef *, 1); diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c index f175359307..553aa77896 100644 --- a/src/libxl/xen_xl.c +++ b/src/libxl/xen_xl.c @@ -341,8 +341,7 @@ xenParseXLSpice(virConf *conf, virDomainDef *def) graphics->type = VIR_DOMAIN_GRAPHICS_TYPE_SPICE; if (xenConfigCopyStringOpt(conf, "spicehost", &listenAddr) < 0) goto cleanup; - if (virDomainGraphicsListenAppendAddress(graphics, listenAddr) < 0) - goto cleanup; + virDomainGraphicsListenAppendAddress(graphics, listenAddr); if (xenConfigGetULong(conf, "spicetls_port", &port, 0) < 0) goto cleanup; diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index de3c9989a5..9f6612ad61 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -3625,8 +3625,7 @@ vboxDumpDisplay(virDomainDef *def, struct _vboxDriver *data, IMachine *machine) if (netAddressUtf8 && STREQ(netAddressUtf8, "")) VBOX_UTF8_FREE(netAddressUtf8); - if (virDomainGraphicsListenAppendAddress(graphics, netAddressUtf8) < 0) - goto cleanup; + virDomainGraphicsListenAppendAddress(graphics, netAddressUtf8); gVBoxAPI.UIVRDEServer.GetAllowMultiConnection(VRDEServer, &allowMultiConnection); if (allowMultiConnection) @@ -3641,7 +3640,6 @@ vboxDumpDisplay(virDomainDef *def, struct _vboxDriver *data, IMachine *machine) ret = 0; - cleanup: VBOX_RELEASE(VRDEServer); VBOX_UTF8_FREE(valueTypeUtf8); VBOX_UTF8_FREE(netAddressUtf8); diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 26b89776e1..e746ff213b 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -2017,8 +2017,7 @@ virVMXParseVNC(virConf *conf, virDomainGraphicsDef **def) goto failure; } - if (virDomainGraphicsListenAppendAddress(*def, listenAddr) < 0) - goto failure; + virDomainGraphicsListenAppendAddress(*def, listenAddr); VIR_FREE(listenAddr); if (port < 0) { -- 2.34.1
On 12/14/23 8:51 AM, Dmitry Frolov wrote:
virDomainGraphicsListenAppendAddress() always returns 0.
Signed-off-by: Dmitry Frolov <frolov@swemel.ru> --- src/conf/domain_conf.c | 4 +--- src/conf/domain_conf.h | 2 +- src/libxl/xen_common.c | 7 ++----- src/libxl/xen_xl.c | 3 +-- src/vbox/vbox_common.c | 4 +--- src/vmx/vmx.c | 3 +-- 6 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 22ad43e1d7..7b4d86d837 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -29053,7 +29053,7 @@ virDomainGraphicsGetListen(virDomainGraphicsDef *def, size_t i) }
-int +void virDomainGraphicsListenAppendAddress(virDomainGraphicsDef *def, const char *address) { @@ -29064,8 +29064,6 @@ virDomainGraphicsListenAppendAddress(virDomainGraphicsDef *def, glisten.address = g_strdup(address);
VIR_APPEND_ELEMENT_COPY(def->listens, def->nListens, glisten); - - return 0; }
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index ed07859bc5..7002bd072b 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3909,7 +3909,7 @@ int virDomainHostdevMatch(virDomainHostdevDef *a,
virDomainGraphicsListenDef * virDomainGraphicsGetListen(virDomainGraphicsDef *def, size_t i); -int virDomainGraphicsListenAppendAddress(virDomainGraphicsDef *def, +void virDomainGraphicsListenAppendAddress(virDomainGraphicsDef *def, const char *address)
It looks like there's a slight alignment mismatch here now. The hanging function argument should probably be re-indented.
ATTRIBUTE_NONNULL(1); int virDomainGraphicsListenAppendSocket(virDomainGraphicsDef *def, diff --git a/src/libxl/xen_common.c b/src/libxl/xen_common.c index d5a0399613..c7bc51b926 100644 --- a/src/libxl/xen_common.c +++ b/src/libxl/xen_common.c @@ -673,8 +673,7 @@ xenParseVfb(virConf *conf, virDomainDef *def)
if (xenConfigCopyStringOpt(conf, "vnclisten", &listenAddr) < 0) goto cleanup; - if (virDomainGraphicsListenAppendAddress(graphics, listenAddr) < 0) - goto cleanup; + virDomainGraphicsListenAppendAddress(graphics, listenAddr); VIR_FREE(listenAddr);
if (xenConfigCopyStringOpt(conf, "vncpasswd", &graphics->data.vnc.auth.passwd) < 0) @@ -766,9 +765,7 @@ xenParseVfb(virConf *conf, virDomainDef *def) key = nextkey; } if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) { - if (virDomainGraphicsListenAppendAddress(graphics, - listenAddr) < 0) - goto cleanup; + virDomainGraphicsListenAppendAddress(graphics, listenAddr); VIR_FREE(listenAddr); } def->graphics = g_new0(virDomainGraphicsDef *, 1); diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c index f175359307..553aa77896 100644 --- a/src/libxl/xen_xl.c +++ b/src/libxl/xen_xl.c @@ -341,8 +341,7 @@ xenParseXLSpice(virConf *conf, virDomainDef *def) graphics->type = VIR_DOMAIN_GRAPHICS_TYPE_SPICE; if (xenConfigCopyStringOpt(conf, "spicehost", &listenAddr) < 0) goto cleanup; - if (virDomainGraphicsListenAppendAddress(graphics, listenAddr) < 0) - goto cleanup; + virDomainGraphicsListenAppendAddress(graphics, listenAddr);
if (xenConfigGetULong(conf, "spicetls_port", &port, 0) < 0) goto cleanup; diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index de3c9989a5..9f6612ad61 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -3625,8 +3625,7 @@ vboxDumpDisplay(virDomainDef *def, struct _vboxDriver *data, IMachine *machine) if (netAddressUtf8 && STREQ(netAddressUtf8, "")) VBOX_UTF8_FREE(netAddressUtf8);
- if (virDomainGraphicsListenAppendAddress(graphics, netAddressUtf8) < 0) - goto cleanup; + virDomainGraphicsListenAppendAddress(graphics, netAddressUtf8);
gVBoxAPI.UIVRDEServer.GetAllowMultiConnection(VRDEServer, &allowMultiConnection); if (allowMultiConnection) @@ -3641,7 +3640,6 @@ vboxDumpDisplay(virDomainDef *def, struct _vboxDriver *data, IMachine *machine)
ret = 0;
- cleanup: VBOX_RELEASE(VRDEServer); VBOX_UTF8_FREE(valueTypeUtf8); VBOX_UTF8_FREE(netAddressUtf8); diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 26b89776e1..e746ff213b 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -2017,8 +2017,7 @@ virVMXParseVNC(virConf *conf, virDomainGraphicsDef **def) goto failure; }
- if (virDomainGraphicsListenAppendAddress(*def, listenAddr) < 0) - goto failure; + virDomainGraphicsListenAppendAddress(*def, listenAddr); VIR_FREE(listenAddr);
if (port < 0) {
vboxDumpDisplay() always returns 0. Signed-off-by: Dmitry Frolov <frolov@swemel.ru> --- src/vbox/vbox_common.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 9f6612ad61..305c85f4ec 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -3538,7 +3538,7 @@ vboxDumpVideo(virDomainDef *def, struct _vboxDriver *data G_GNUC_UNUSED, return 0; } -static int +static void vboxDumpDisplay(virDomainDef *def, struct _vboxDriver *data, IMachine *machine) { /* dump display options vrdp/gui/sdl */ @@ -3549,7 +3549,6 @@ vboxDumpDisplay(virDomainDef *def, struct _vboxDriver *data, IMachine *machine) IVRDEServer *VRDEServer = NULL; PRBool VRDxEnabled = PR_FALSE; virDomainGraphicsDef *graphics = NULL; - int ret = -1; def->ngraphics = 0; @@ -3638,13 +3637,10 @@ vboxDumpDisplay(virDomainDef *def, struct _vboxDriver *data, IMachine *machine) VIR_APPEND_ELEMENT(def->graphics, def->ngraphics, graphics); } - ret = 0; - VBOX_RELEASE(VRDEServer); VBOX_UTF8_FREE(valueTypeUtf8); VBOX_UTF8_FREE(netAddressUtf8); virDomainGraphicsDefFree(graphics); - return ret; } static int @@ -4160,8 +4156,7 @@ static char *vboxDomainGetXMLDesc(virDomainPtr dom, unsigned int flags) if (vboxDumpVideo(def, data, machine) < 0) goto cleanup; - if (vboxDumpDisplay(def, data, machine) < 0) - goto cleanup; + vboxDumpDisplay(def, data, machine); if (vboxDumpStorageControllers(def, machine) < 0) goto cleanup; if (vboxDumpDisks(def, data, machine) < 0) -- 2.34.1
xenParseXLNamespaceData() always returns 0. Signed-off-by: Dmitry Frolov <frolov@swemel.ru> --- src/libxl/xen_xl.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c index 553aa77896..78a3e1d519 100644 --- a/src/libxl/xen_xl.c +++ b/src/libxl/xen_xl.c @@ -1017,7 +1017,7 @@ xenParseXLChannel(virConf *conf, virDomainDef *def) return -1; } -static int +static void xenParseXLNamespaceData(virConf *conf, virDomainDef *def) { virConfValue *list = virConfGetValue(conf, "device_model_args"); @@ -1104,8 +1104,7 @@ xenParseXL(virConf *conf, if (xenParseXLChannel(conf, def) < 0) return NULL; - if (xenParseXLNamespaceData(conf, def) < 0) - return NULL; + xenParseXLNamespaceData(conf, def); if (virDomainDefPostParse(def, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, xmlopt, NULL) < 0) -- 2.34.1
On 12/14/23 8:51 AM, Dmitry Frolov wrote:
xenParseXLNamespaceData() always returns 0.
Signed-off-by: Dmitry Frolov <frolov@swemel.ru> --- src/libxl/xen_xl.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c index 553aa77896..78a3e1d519 100644 --- a/src/libxl/xen_xl.c +++ b/src/libxl/xen_xl.c @@ -1017,7 +1017,7 @@ xenParseXLChannel(virConf *conf, virDomainDef *def) return -1; }
-static int +static void xenParseXLNamespaceData(virConf *conf, virDomainDef *def) { virConfValue *list = virConfGetValue(conf, "device_model_args");
You changed the return type to void, but you didn't actually remove the 'return' statements from the function.
@@ -1104,8 +1104,7 @@ xenParseXL(virConf *conf, if (xenParseXLChannel(conf, def) < 0) return NULL;
- if (xenParseXLNamespaceData(conf, def) < 0) - return NULL; + xenParseXLNamespaceData(conf, def);
if (virDomainDefPostParse(def, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, xmlopt, NULL) < 0)
virNetClientAddProgram() always returns 0. Signed-off-by: Dmitry Frolov <frolov@swemel.ru> --- src/admin/admin_remote.c | 3 +-- src/locking/lock_driver_lockd.c | 3 +-- src/logging/log_manager.c | 3 +-- src/lxc/lxc_monitor.c | 4 +--- src/remote/remote_driver.c | 7 +++---- src/rpc/virnetclient.c | 3 +-- src/rpc/virnetclient.h | 2 +- 7 files changed, 9 insertions(+), 16 deletions(-) diff --git a/src/admin/admin_remote.c b/src/admin/admin_remote.c index 3291a1e965..5c4913a76e 100644 --- a/src/admin/admin_remote.c +++ b/src/admin/admin_remote.c @@ -214,8 +214,7 @@ remoteAdminPrivNew(const char *sock_path) NULL, 0, NULL))) goto error; - if (virNetClientAddProgram(priv->client, priv->program) < 0) - goto error; + virNetClientAddProgram(priv->client, priv->program); return priv; error: diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lockd.c index d75302dd0a..0b6c720477 100644 --- a/src/locking/lock_driver_lockd.c +++ b/src/locking/lock_driver_lockd.c @@ -213,8 +213,7 @@ static virNetClient *virLockManagerLockDaemonConnectionNew(bool privileged, NULL))) goto error; - if (virNetClientAddProgram(client, *prog) < 0) - goto error; + virNetClientAddProgram(client, *prog); return client; diff --git a/src/logging/log_manager.c b/src/logging/log_manager.c index d8490f4e5a..19e23d65c5 100644 --- a/src/logging/log_manager.c +++ b/src/logging/log_manager.c @@ -88,8 +88,7 @@ virLogManagerConnect(bool privileged, NULL))) goto error; - if (virNetClientAddProgram(client, *prog) < 0) - goto error; + virNetClientAddProgram(client, *prog); VIR_FREE(daemonPath); VIR_FREE(logdpath); diff --git a/src/lxc/lxc_monitor.c b/src/lxc/lxc_monitor.c index 811d6685e5..cf2fd1897f 100644 --- a/src/lxc/lxc_monitor.c +++ b/src/lxc/lxc_monitor.c @@ -169,9 +169,7 @@ virLXCMonitor *virLXCMonitorNew(virDomainObj *vm, mon))) goto error; - if (virNetClientAddProgram(mon->client, - mon->program) < 0) - goto error; + virNetClientAddProgram(mon->client, mon->program); mon->vm = virObjectRef(vm); memcpy(&mon->cb, cb, sizeof(mon->cb)); diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 132d0194c6..8db638d6cc 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -1160,10 +1160,9 @@ doRemoteOpen(virConnectPtr conn, conn))) goto error; - if (virNetClientAddProgram(priv->client, priv->remoteProgram) < 0 || - virNetClientAddProgram(priv->client, priv->lxcProgram) < 0 || - virNetClientAddProgram(priv->client, priv->qemuProgram) < 0) - goto error; + virNetClientAddProgram(priv->client, priv->remoteProgram); + virNetClientAddProgram(priv->client, priv->lxcProgram); + virNetClientAddProgram(priv->client, priv->qemuProgram); /* Try and authenticate with server */ VIR_DEBUG("Trying authentication"); diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 4ab8af68c5..c5be82abee 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -1053,7 +1053,7 @@ bool virNetClientIsOpen(virNetClient *client) } -int virNetClientAddProgram(virNetClient *client, +void virNetClientAddProgram(virNetClient *client, virNetClientProgram *prog) { virObjectLock(client); @@ -1062,7 +1062,6 @@ int virNetClientAddProgram(virNetClient *client, client->programs[client->nprograms-1] = virObjectRef(prog); virObjectUnlock(client); - return 0; } diff --git a/src/rpc/virnetclient.h b/src/rpc/virnetclient.h index 1647a6cc71..7726b57ef4 100644 --- a/src/rpc/virnetclient.h +++ b/src/rpc/virnetclient.h @@ -117,7 +117,7 @@ int virNetClientDupFD(virNetClient *client, bool cloexec); bool virNetClientHasPassFD(virNetClient *client); -int virNetClientAddProgram(virNetClient *client, +void virNetClientAddProgram(virNetClient *client, virNetClientProgram *prog); int virNetClientAddStream(virNetClient *client, -- 2.34.1
On 12/14/23 8:51 AM, Dmitry Frolov wrote:
virNetClientAddProgram() always returns 0.
Signed-off-by: Dmitry Frolov <frolov@swemel.ru> --- src/admin/admin_remote.c | 3 +-- src/locking/lock_driver_lockd.c | 3 +-- src/logging/log_manager.c | 3 +-- src/lxc/lxc_monitor.c | 4 +--- src/remote/remote_driver.c | 7 +++---- src/rpc/virnetclient.c | 3 +-- src/rpc/virnetclient.h | 2 +- 7 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/src/admin/admin_remote.c b/src/admin/admin_remote.c index 3291a1e965..5c4913a76e 100644 --- a/src/admin/admin_remote.c +++ b/src/admin/admin_remote.c @@ -214,8 +214,7 @@ remoteAdminPrivNew(const char *sock_path) NULL, 0, NULL))) goto error;
- if (virNetClientAddProgram(priv->client, priv->program) < 0) - goto error; + virNetClientAddProgram(priv->client, priv->program);
return priv; error: diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lockd.c index d75302dd0a..0b6c720477 100644 --- a/src/locking/lock_driver_lockd.c +++ b/src/locking/lock_driver_lockd.c @@ -213,8 +213,7 @@ static virNetClient *virLockManagerLockDaemonConnectionNew(bool privileged, NULL))) goto error;
- if (virNetClientAddProgram(client, *prog) < 0) - goto error; + virNetClientAddProgram(client, *prog);
return client;
diff --git a/src/logging/log_manager.c b/src/logging/log_manager.c index d8490f4e5a..19e23d65c5 100644 --- a/src/logging/log_manager.c +++ b/src/logging/log_manager.c @@ -88,8 +88,7 @@ virLogManagerConnect(bool privileged, NULL))) goto error;
- if (virNetClientAddProgram(client, *prog) < 0) - goto error; + virNetClientAddProgram(client, *prog);
VIR_FREE(daemonPath); VIR_FREE(logdpath); diff --git a/src/lxc/lxc_monitor.c b/src/lxc/lxc_monitor.c index 811d6685e5..cf2fd1897f 100644 --- a/src/lxc/lxc_monitor.c +++ b/src/lxc/lxc_monitor.c @@ -169,9 +169,7 @@ virLXCMonitor *virLXCMonitorNew(virDomainObj *vm, mon))) goto error;
- if (virNetClientAddProgram(mon->client, - mon->program) < 0) - goto error; + virNetClientAddProgram(mon->client, mon->program);
mon->vm = virObjectRef(vm); memcpy(&mon->cb, cb, sizeof(mon->cb)); diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 132d0194c6..8db638d6cc 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -1160,10 +1160,9 @@ doRemoteOpen(virConnectPtr conn, conn))) goto error;
- if (virNetClientAddProgram(priv->client, priv->remoteProgram) < 0 || - virNetClientAddProgram(priv->client, priv->lxcProgram) < 0 || - virNetClientAddProgram(priv->client, priv->qemuProgram) < 0) - goto error; + virNetClientAddProgram(priv->client, priv->remoteProgram); + virNetClientAddProgram(priv->client, priv->lxcProgram); + virNetClientAddProgram(priv->client, priv->qemuProgram);
/* Try and authenticate with server */ VIR_DEBUG("Trying authentication"); diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 4ab8af68c5..c5be82abee 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -1053,7 +1053,7 @@ bool virNetClientIsOpen(virNetClient *client) }
-int virNetClientAddProgram(virNetClient *client, +void virNetClientAddProgram(virNetClient *client, virNetClientProgram *prog) { virObjectLock(client); @@ -1062,7 +1062,6 @@ int virNetClientAddProgram(virNetClient *client, client->programs[client->nprograms-1] = virObjectRef(prog);
virObjectUnlock(client); - return 0; }
diff --git a/src/rpc/virnetclient.h b/src/rpc/virnetclient.h index 1647a6cc71..7726b57ef4 100644 --- a/src/rpc/virnetclient.h +++ b/src/rpc/virnetclient.h @@ -117,7 +117,7 @@ int virNetClientDupFD(virNetClient *client, bool cloexec);
bool virNetClientHasPassFD(virNetClient *client);
-int virNetClientAddProgram(virNetClient *client, +void virNetClientAddProgram(virNetClient *client, virNetClientProgram *prog);
another minor alignment issue here (though not obvious in my email reply)
int virNetClientAddStream(virNetClient *client,
On 12/14/23 8:50 AM, Dmitry Frolov wrote:
A lot of unreacheble code was caused by int functions, which return nothing except zero. Unreacheble code was removed. Corresponding functions type was changed to void.
Dmitry Frolov (14): cpu: turn virCPUx86DataAddItem() to void cpu: turn virCPUx86DataAdd() to void libxl: turn libxlCapsAddCPUID() to void libxl: turn virCapabilitiesAddHostFeature() to void libxl: turn libxl_get_physinfo() to void conf: turn virCapabilitiesSetNetPrefix() to void libxl: turn libxlMakeDomainOSCaps() to void libxl: turn libxlMakeDomainDeviceDiskCaps() to void libxl: turn libxlMakeDomainDeviceGraphicsCaps() to void libxl: turn libxlMakeDomainDeviceVideoCaps() to void conf: turn virDomainGraphicsListenAppendAddress() to void vbox: turn vboxDumpDisplay() to void libxl: turn xenParseXLNamespaceData() to void rpc: turn virNetClientAddProgram() to void
src/admin/admin_remote.c | 3 +- src/conf/capabilities.c | 8 +-- src/conf/capabilities.h | 4 +- src/conf/domain_conf.c | 4 +- src/conf/domain_conf.h | 2 +- src/cpu/cpu_x86.c | 91 ++++++++++++--------------------- src/cpu/cpu_x86.h | 2 +- src/libxl/libxl_capabilities.c | 54 +++++++------------ src/libxl/libxl_conf.c | 20 ++------ src/libxl/libxl_driver.c | 6 +-- src/libxl/xen_common.c | 7 +-- src/libxl/xen_xl.c | 8 ++- src/locking/lock_driver_lockd.c | 3 +- src/logging/log_manager.c | 3 +- src/lxc/lxc_monitor.c | 4 +- src/remote/remote_driver.c | 7 ++- src/rpc/virnetclient.c | 3 +- src/rpc/virnetclient.h | 2 +- src/test/test_driver.c | 6 +-- src/vbox/vbox_common.c | 13 ++--- src/vmx/vmx.c | 3 +- tests/libxlmock.c | 5 +- 22 files changed, 86 insertions(+), 172 deletions(-)
A couple minor comments sent separately Reviewed-by: Jonathon Jongsma <jjongsma@redhat.com>
Oops... my fault. libxen-dev package was not installed, so xenParseXLNamespaceData was not compiled, thus i missed the error. Also i missed, that libxl_get_physinfo comes with libxen-dev. So, I excluded it from the patch. Many thanks! Dmitry.
A lot of unreacheble code was caused by int functions, which return nothing except zero. Unreacheble code was removed. Corresponding functions type was changed to void. --- v2: Changing functions return type to void v3: fixed errors in v2 Dmitry Frolov (13): cpu: turn virCPUx86DataAddItem() to void cpu: turn virCPUx86DataAdd() to void libxl: turn libxlCapsAddCPUID() to void libxl: turn virCapabilitiesAddHostFeature() to void conf: turn virCapabilitiesSetNetPrefix() to void libxl: turn libxlMakeDomainOSCaps() to void libxl: turn libxlMakeDomainDeviceDiskCaps() to void libxl: turn libxlMakeDomainDeviceGraphicsCaps() to void libxl: turn libxlMakeDomainDeviceVideoCaps() to void conf: turn virDomainGraphicsListenAppendAddress() to void vbox: turn vboxDumpDisplay() to void libxl: turn xenParseXLNamespaceData() to void rpc: turn virNetClientAddProgram() to void src/admin/admin_remote.c | 3 +- src/conf/capabilities.c | 8 +-- src/conf/capabilities.h | 4 +- src/conf/domain_conf.c | 4 +- src/conf/domain_conf.h | 4 +- src/cpu/cpu_x86.c | 91 ++++++++++++--------------------- src/cpu/cpu_x86.h | 2 +- src/libxl/libxl_capabilities.c | 48 ++++++----------- src/libxl/xen_common.c | 7 +-- src/libxl/xen_xl.c | 14 ++--- src/locking/lock_driver_lockd.c | 3 +- src/logging/log_manager.c | 3 +- src/lxc/lxc_monitor.c | 4 +- src/remote/remote_driver.c | 7 ++- src/rpc/virnetclient.c | 3 +- src/rpc/virnetclient.h | 2 +- src/test/test_driver.c | 6 +-- src/vbox/vbox_common.c | 13 ++--- src/vmx/vmx.c | 3 +- 19 files changed, 81 insertions(+), 148 deletions(-) -- 2.34.1
virCPUx86DataAddItem() always returns 0. Signed-off-by: Dmitry Frolov <frolov@swemel.ru> --- src/cpu/cpu_x86.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 8d0e3947ce..f32770b8a3 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -531,7 +531,7 @@ x86DataCopy(virCPUx86Data *dst, const virCPUx86Data *src) } -static int +static void virCPUx86DataAddItem(virCPUx86Data *data, const virCPUx86DataItem *item) { @@ -547,8 +547,6 @@ virCPUx86DataAddItem(virCPUx86Data *data, sizeof(virCPUx86DataItem), virCPUx86DataSorter, NULL); } - - return 0; } @@ -561,10 +559,8 @@ x86DataAdd(virCPUx86Data *data1, virCPUx86DataIteratorInit(&iter, data2); while ((item = virCPUx86DataNext(&iter))) { - if (virCPUx86DataAddItem(data1, item) < 0) - return -1; + virCPUx86DataAddItem(data1, item); } - return 0; } @@ -819,8 +815,9 @@ x86DataAddSignature(virCPUx86Data *data, uint32_t signature) { virCPUx86DataItem leaf1 = CPUID(.eax_in = 0x1, .eax = signature); + virCPUx86DataAddItem(data, &leaf1); - return virCPUx86DataAddItem(data, &leaf1); + return 0; } @@ -1125,8 +1122,7 @@ x86ParseDataItemList(virCPUx86Data *cpudata, } } - if (virCPUx86DataAddItem(cpudata, &item) < 0) - return -1; + virCPUx86DataAddItem(cpudata, &item); ++i; node = xmlNextElementSibling(node); @@ -2911,9 +2907,8 @@ virCPUx86Baseline(virCPUDef **cpus, return NULL; } - if (vendor && - virCPUx86DataAddItem(&base_model->data, &vendor->data) < 0) - return NULL; + if (vendor) + virCPUx86DataAddItem(&base_model->data, &vendor->data); if (x86Decode(cpu, &base_model->data, models, (const char **) modelNames, migratable) < 0) @@ -3172,9 +3167,8 @@ virCPUx86Translate(virCPUDef *cpu, if (!(model = x86ModelFromCPU(cpu, map, -1))) return -1; - if (model->vendor && - virCPUx86DataAddItem(&model->data, &model->vendor->data) < 0) - return -1; + if (model->vendor) + virCPUx86DataAddItem(&model->data, &model->vendor->data); if (model->signatures && model->signatures->count > 0) { virCPUx86Signature *sig = &model->signatures->items[0]; @@ -3302,7 +3296,8 @@ int virCPUx86DataAdd(virCPUData *cpuData, const virCPUx86DataItem *item) { - return virCPUx86DataAddItem(&cpuData->data.x86, item); + virCPUx86DataAddItem(&cpuData->data.x86, item); + return 0; } -- 2.34.1
virCPUx86DataAdd() always returns 0. Signed-off-by: Dmitry Frolov <frolov@swemel.ru> --- src/cpu/cpu_x86.c | 66 +++++++++++++--------------------- src/cpu/cpu_x86.h | 2 +- src/libxl/libxl_capabilities.c | 7 +--- 3 files changed, 26 insertions(+), 49 deletions(-) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index f32770b8a3..4f3bfd075b 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -2380,8 +2380,8 @@ x86Encode(virArch arch, if (!(data_vendor = virCPUDataNew(arch))) return -1; - if (v && virCPUx86DataAdd(data_vendor, &v->data) < 0) - return -1; + if (v) + virCPUx86DataAdd(data_vendor, &v->data); } if (forced) @@ -2455,14 +2455,12 @@ cpuidSetLeaf4(virCPUData *data, virCPUx86DataItem item = *subLeaf0; virCPUx86CPUID *cpuid = &item.data.cpuid; - if (virCPUx86DataAdd(data, subLeaf0) < 0) - return -1; + virCPUx86DataAdd(data, subLeaf0); while (cpuid->eax & 0x1f) { cpuid->ecx_in++; cpuidCall(cpuid); - if (virCPUx86DataAdd(data, &item) < 0) - return -1; + virCPUx86DataAdd(data, &item); } return 0; } @@ -2480,14 +2478,12 @@ cpuidSetLeaf7(virCPUData *data, virCPUx86CPUID *cpuid = &item.data.cpuid; uint32_t sub; - if (virCPUx86DataAdd(data, subLeaf0) < 0) - return -1; + virCPUx86DataAdd(data, subLeaf0); for (sub = 1; sub <= subLeaf0->data.cpuid.eax; sub++) { cpuid->ecx_in = sub; cpuidCall(cpuid); - if (virCPUx86DataAdd(data, &item) < 0) - return -1; + virCPUx86DataAdd(data, &item); } return 0; } @@ -2508,8 +2504,7 @@ cpuidSetLeafB(virCPUData *data, virCPUx86CPUID *cpuid = &item.data.cpuid; while (cpuid->ecx & 0xff00) { - if (virCPUx86DataAdd(data, &item) < 0) - return -1; + virCPUx86DataAdd(data, &item); cpuid->ecx_in++; cpuidCall(cpuid); } @@ -2535,13 +2530,11 @@ cpuidSetLeafD(virCPUData *data, virCPUx86CPUID sub1; uint32_t sub; - if (virCPUx86DataAdd(data, subLeaf0) < 0) - return -1; + virCPUx86DataAdd(data, subLeaf0); cpuid->ecx_in = 1; cpuidCall(cpuid); - if (virCPUx86DataAdd(data, &item) < 0) - return -1; + virCPUx86DataAdd(data, &item); sub0 = subLeaf0->data.cpuid; sub1 = *cpuid; @@ -2557,8 +2550,7 @@ cpuidSetLeafD(virCPUData *data, cpuid->ecx_in = sub; cpuidCall(cpuid); - if (virCPUx86DataAdd(data, &item) < 0) - return -1; + virCPUx86DataAdd(data, &item); } return 0; } @@ -2582,16 +2574,14 @@ cpuidSetLeafResID(virCPUData *data, virCPUx86CPUID *cpuid = &item.data.cpuid; uint32_t sub; - if (virCPUx86DataAdd(data, subLeaf0) < 0) - return -1; + virCPUx86DataAdd(data, subLeaf0); for (sub = 1; sub < 32; sub++) { if (!(res & (1U << sub))) continue; cpuid->ecx_in = sub; cpuidCall(cpuid); - if (virCPUx86DataAdd(data, &item) < 0) - return -1; + virCPUx86DataAdd(data, &item); } return 0; } @@ -2614,20 +2604,17 @@ cpuidSetLeaf12(virCPUData *data, !(leaf7->data.cpuid.ebx & (1 << 2))) return 0; - if (virCPUx86DataAdd(data, subLeaf0) < 0) - return -1; + virCPUx86DataAdd(data, subLeaf0); cpuid->eax_in = 0x12; cpuid->ecx_in = 1; cpuidCall(cpuid); - if (virCPUx86DataAdd(data, &item) < 0) - return -1; + virCPUx86DataAdd(data, &item); cpuid->ecx_in = 2; cpuidCall(cpuid); while (cpuid->eax & 0xf) { - if (virCPUx86DataAdd(data, &item) < 0) - return -1; + virCPUx86DataAdd(data, &item); cpuid->ecx_in++; cpuidCall(cpuid); } @@ -2647,14 +2634,12 @@ cpuidSetLeaf14(virCPUData *data, virCPUx86CPUID *cpuid = &item.data.cpuid; uint32_t sub; - if (virCPUx86DataAdd(data, subLeaf0) < 0) - return -1; + virCPUx86DataAdd(data, subLeaf0); for (sub = 1; sub <= subLeaf0->data.cpuid.eax; sub++) { cpuid->ecx_in = sub; cpuidCall(cpuid); - if (virCPUx86DataAdd(data, &item) < 0) - return -1; + virCPUx86DataAdd(data, &item); } return 0; } @@ -2676,14 +2661,12 @@ cpuidSetLeaf17(virCPUData *data, if (subLeaf0->data.cpuid.eax < 3) return 0; - if (virCPUx86DataAdd(data, subLeaf0) < 0) - return -1; + virCPUx86DataAdd(data, subLeaf0); for (sub = 1; sub <= subLeaf0->data.cpuid.eax; sub++) { cpuid->ecx_in = sub; cpuidCall(cpuid); - if (virCPUx86DataAdd(data, &item) < 0) - return -1; + virCPUx86DataAdd(data, &item); } return 0; } @@ -2728,7 +2711,7 @@ cpuidSet(uint32_t base, virCPUData *data) else if (leaf == 0x17) rc = cpuidSetLeaf17(data, &item); else - rc = virCPUx86DataAdd(data, &item); + virCPUx86DataAdd(data, &item); if (rc < 0) return -1; @@ -2773,8 +2756,7 @@ virCPUx86GetHost(virCPUDef *cpu, }, }; - if (virCPUx86DataAdd(cpuData, &item) < 0) - return -1; + virCPUx86DataAdd(cpuData, &item); } } @@ -3292,12 +3274,11 @@ virCPUx86ValidateFeatures(virCPUDef *cpu) } -int +void virCPUx86DataAdd(virCPUData *cpuData, const virCPUx86DataItem *item) { virCPUx86DataAddItem(&cpuData->data.x86, item); - return 0; } @@ -3334,7 +3315,8 @@ virCPUx86DataSetVendor(virCPUData *cpuData, if (virCPUx86VendorToData(vendor, &item) < 0) return -1; - return virCPUx86DataAdd(cpuData, &item); + virCPUx86DataAdd(cpuData, &item); + return 0; } diff --git a/src/cpu/cpu_x86.h b/src/cpu/cpu_x86.h index 416d052776..f0d73a5f40 100644 --- a/src/cpu/cpu_x86.h +++ b/src/cpu/cpu_x86.h @@ -25,7 +25,7 @@ extern struct cpuArchDriver cpuDriverX86; -int virCPUx86DataAdd(virCPUData *cpuData, +void virCPUx86DataAdd(virCPUData *cpuData, const virCPUx86DataItem *cpuid); int virCPUx86DataSetSignature(virCPUData *cpuData, diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index 177e8b988e..9da0fe851c 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -64,12 +64,7 @@ libxlCapsAddCPUID(virCPUData *data, virCPUx86CPUID *cpuid, ssize_t ncaps) item.type = VIR_CPU_X86_DATA_CPUID; for (i = 0; i < ncaps; i++) { item.data.cpuid = cpuid[i]; - - if (virCPUx86DataAdd(data, &item) < 0) { - VIR_DEBUG("Failed to add CPUID(%x,%x)", - cpuid[i].eax_in, cpuid[i].ecx_in); - return -1; - } + virCPUx86DataAdd(data, &item); } return 0; -- 2.34.1
libxlCapsAddCPUID() always returns 0. Signed-off-by: Dmitry Frolov <frolov@swemel.ru> --- src/libxl/libxl_capabilities.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index 9da0fe851c..9be64a53a8 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -55,7 +55,7 @@ struct guest_arch { #define XEN_CAP_REGEX "(xen|hvm)-[[:digit:]]+\\.[[:digit:]]+-(aarch64|armv7l|x86_32|x86_64|ia64|powerpc64)(p|be)?" -static int +static void libxlCapsAddCPUID(virCPUData *data, virCPUx86CPUID *cpuid, ssize_t ncaps) { virCPUx86DataItem item = { 0 }; @@ -66,8 +66,6 @@ libxlCapsAddCPUID(virCPUData *data, virCPUx86CPUID *cpuid, ssize_t ncaps) item.data.cpuid = cpuid[i]; virCPUx86DataAdd(data, &item); } - - return 0; } /* @@ -114,8 +112,7 @@ libxlCapsNodeData(virCPUDef *cpu, libxl_hwcap hwcap) return NULL; ncaps = G_N_ELEMENTS(cpuid); - if (libxlCapsAddCPUID(cpudata, cpuid, ncaps) < 0) - return NULL; + libxlCapsAddCPUID(cpudata, cpuid, ncaps); return g_steal_pointer(&cpudata); } -- 2.34.1
virCapabilitiesAddHostFeature() always returns 0. Signed-off-by: Dmitry Frolov <frolov@swemel.ru> --- src/conf/capabilities.c | 4 +--- src/conf/capabilities.h | 2 +- src/libxl/libxl_capabilities.c | 5 ++--- src/test/test_driver.c | 6 ++---- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 32badee7b3..096ccc18e7 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -276,7 +276,7 @@ virCapsDispose(void *object) * * Registers a new host CPU feature, eg 'pae', or 'vmx' */ -int +void virCapabilitiesAddHostFeature(virCaps *caps, const char *name) { @@ -284,8 +284,6 @@ virCapabilitiesAddHostFeature(virCaps *caps, caps->host.nfeatures, 1); caps->host.features[caps->host.nfeatures] = g_strdup(name); caps->host.nfeatures++; - - return 0; } /** diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h index 9eaf6e2807..085c0af868 100644 --- a/src/conf/capabilities.h +++ b/src/conf/capabilities.h @@ -236,7 +236,7 @@ virCapabilitiesHostNUMARef(virCapsHostNUMA *caps); G_DEFINE_AUTOPTR_CLEANUP_FUNC(virCapsHostNUMA, virCapabilitiesHostNUMAUnref); -int +void virCapabilitiesAddHostFeature(virCaps *caps, const char *name); diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index 9be64a53a8..836f46341a 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -137,9 +137,8 @@ libxlCapsInitCPU(virCaps *caps, libxl_physinfo *phy_info) cpu = virCPUDefNew(); host_pae = phy_info->hw_cap[0] & LIBXL_X86_FEATURE_PAE_MASK; - if (host_pae && - virCapabilitiesAddHostFeature(caps, "pae") < 0) - return -1; + if (host_pae) + virCapabilitiesAddHostFeature(caps, "pae"); host_lm = (phy_info->hw_cap[2] & LIBXL_X86_FEATURE_LM_MASK); if (host_lm) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 67f8e75296..ec1a9b75de 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -299,10 +299,8 @@ testBuildCapabilities(virConnectPtr conn) if ((caps = virCapabilitiesNew(VIR_ARCH_I686, false, false)) == NULL) return NULL; - if (virCapabilitiesAddHostFeature(caps, "pae") < 0) - return NULL; - if (virCapabilitiesAddHostFeature(caps, "nonpae") < 0) - return NULL; + virCapabilitiesAddHostFeature(caps, "pae"); + virCapabilitiesAddHostFeature(caps, "nonpae"); virCapabilitiesHostInitIOMMU(caps); -- 2.34.1
virCapabilitiesSetNetPrefix() always returns 0. Signed-off-by: Dmitry Frolov <frolov@swemel.ru> --- 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 836f46341a..8853ba9d88 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -179,8 +179,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
libxlMakeDomainOSCaps() always returns 0. Signed-off-by: Dmitry Frolov <frolov@swemel.ru> --- src/libxl/libxl_capabilities.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index 8853ba9d88..defbf9d223 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -508,7 +508,7 @@ libxlCapsInitGuests(libxl_ctx *ctx, virCaps *caps) return 0; } -static int +static void libxlMakeDomainOSCaps(const char *machine, virDomainCapsOS *os, virFirmware **firmwares, @@ -523,7 +523,7 @@ libxlMakeDomainOSCaps(const char *machine, capsLoader->readonly.report = true; if (STREQ(machine, "xenpv") || STREQ(machine, "xenpvh")) - return 0; + return; capsLoader->supported = VIR_TRISTATE_BOOL_YES; capsLoader->values.values = g_new0(char *, nfirmwares); @@ -539,7 +539,7 @@ libxlMakeDomainOSCaps(const char *machine, VIR_DOMAIN_CAPS_ENUM_SET(capsLoader->readonly, VIR_TRISTATE_BOOL_YES); - return 0; + return; } static int @@ -675,8 +675,8 @@ libxlMakeDomainCapabilities(virDomainCaps *domCaps, else domCaps->maxvcpus = PV_MAX_VCPUS; - if (libxlMakeDomainOSCaps(domCaps->machine, os, firmwares, nfirmwares) < 0 || - libxlMakeDomainDeviceDiskCaps(disk) < 0 || + libxlMakeDomainOSCaps(domCaps->machine, os, firmwares, nfirmwares); + if (libxlMakeDomainDeviceDiskCaps(disk) < 0 || libxlMakeDomainDeviceGraphicsCaps(graphics) < 0 || libxlMakeDomainDeviceVideoCaps(video) < 0) return -1; -- 2.34.1
libxlMakeDomainDeviceDiskCaps() always returns 0. Signed-off-by: Dmitry Frolov <frolov@swemel.ru> --- src/libxl/libxl_capabilities.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index defbf9d223..7663790649 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -542,7 +542,7 @@ libxlMakeDomainOSCaps(const char *machine, return; } -static int +static void libxlMakeDomainDeviceDiskCaps(virDomainCapsDeviceDisk *dev) { dev->supported = VIR_TRISTATE_BOOL_YES; @@ -559,7 +559,6 @@ libxlMakeDomainDeviceDiskCaps(virDomainCapsDeviceDisk *dev) VIR_DOMAIN_DISK_BUS_SCSI, VIR_DOMAIN_DISK_BUS_XEN); - return 0; } static int @@ -676,8 +675,8 @@ libxlMakeDomainCapabilities(virDomainCaps *domCaps, domCaps->maxvcpus = PV_MAX_VCPUS; libxlMakeDomainOSCaps(domCaps->machine, os, firmwares, nfirmwares); - if (libxlMakeDomainDeviceDiskCaps(disk) < 0 || - libxlMakeDomainDeviceGraphicsCaps(graphics) < 0 || + libxlMakeDomainDeviceDiskCaps(disk); + if (libxlMakeDomainDeviceGraphicsCaps(graphics) < 0 || libxlMakeDomainDeviceVideoCaps(video) < 0) return -1; if (STRNEQ(domCaps->machine, "xenpvh") && -- 2.34.1
libxlMakeDomainDeviceGraphicsCaps() always returns 0. Signed-off-by: Dmitry Frolov <frolov@swemel.ru> --- src/libxl/libxl_capabilities.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index 7663790649..9b219adb3c 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -561,7 +561,7 @@ libxlMakeDomainDeviceDiskCaps(virDomainCapsDeviceDisk *dev) } -static int +static void libxlMakeDomainDeviceGraphicsCaps(virDomainCapsDeviceGraphics *dev) { dev->supported = VIR_TRISTATE_BOOL_YES; @@ -572,7 +572,6 @@ libxlMakeDomainDeviceGraphicsCaps(virDomainCapsDeviceGraphics *dev) VIR_DOMAIN_GRAPHICS_TYPE_VNC, VIR_DOMAIN_GRAPHICS_TYPE_SPICE); - return 0; } static int @@ -676,8 +675,8 @@ libxlMakeDomainCapabilities(virDomainCaps *domCaps, libxlMakeDomainOSCaps(domCaps->machine, os, firmwares, nfirmwares); libxlMakeDomainDeviceDiskCaps(disk); - if (libxlMakeDomainDeviceGraphicsCaps(graphics) < 0 || - libxlMakeDomainDeviceVideoCaps(video) < 0) + libxlMakeDomainDeviceGraphicsCaps(graphics); + if (libxlMakeDomainDeviceVideoCaps(video) < 0) return -1; if (STRNEQ(domCaps->machine, "xenpvh") && libxlMakeDomainDeviceHostdevCaps(hostdev) < 0) -- 2.34.1
libxlMakeDomainDeviceVideoCaps() always returns 0. Signed-off-by: Dmitry Frolov <frolov@swemel.ru> --- src/libxl/libxl_capabilities.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index 9b219adb3c..b0bd468442 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -574,7 +574,7 @@ libxlMakeDomainDeviceGraphicsCaps(virDomainCapsDeviceGraphics *dev) } -static int +static void libxlMakeDomainDeviceVideoCaps(virDomainCapsDeviceVideo *dev) { dev->supported = VIR_TRISTATE_BOOL_YES; @@ -584,8 +584,6 @@ libxlMakeDomainDeviceVideoCaps(virDomainCapsDeviceVideo *dev) VIR_DOMAIN_VIDEO_TYPE_VGA, VIR_DOMAIN_VIDEO_TYPE_CIRRUS, VIR_DOMAIN_VIDEO_TYPE_XEN); - - return 0; } static int @@ -676,8 +674,8 @@ libxlMakeDomainCapabilities(virDomainCaps *domCaps, libxlMakeDomainOSCaps(domCaps->machine, os, firmwares, nfirmwares); libxlMakeDomainDeviceDiskCaps(disk); libxlMakeDomainDeviceGraphicsCaps(graphics); - if (libxlMakeDomainDeviceVideoCaps(video) < 0) - return -1; + libxlMakeDomainDeviceVideoCaps(video); + if (STRNEQ(domCaps->machine, "xenpvh") && libxlMakeDomainDeviceHostdevCaps(hostdev) < 0) return -1; -- 2.34.1
virDomainGraphicsListenAppendAddress() always returns 0. Signed-off-by: Dmitry Frolov <frolov@swemel.ru> --- src/conf/domain_conf.c | 4 +--- src/conf/domain_conf.h | 4 ++-- src/libxl/xen_common.c | 7 ++----- src/libxl/xen_xl.c | 3 +-- src/vbox/vbox_common.c | 4 +--- src/vmx/vmx.c | 3 +-- 6 files changed, 8 insertions(+), 17 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 22ad43e1d7..7b4d86d837 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -29053,7 +29053,7 @@ virDomainGraphicsGetListen(virDomainGraphicsDef *def, size_t i) } -int +void virDomainGraphicsListenAppendAddress(virDomainGraphicsDef *def, const char *address) { @@ -29064,8 +29064,6 @@ virDomainGraphicsListenAppendAddress(virDomainGraphicsDef *def, glisten.address = g_strdup(address); VIR_APPEND_ELEMENT_COPY(def->listens, def->nListens, glisten); - - return 0; } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index ed07859bc5..1ee33b90a2 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3909,8 +3909,8 @@ int virDomainHostdevMatch(virDomainHostdevDef *a, virDomainGraphicsListenDef * virDomainGraphicsGetListen(virDomainGraphicsDef *def, size_t i); -int virDomainGraphicsListenAppendAddress(virDomainGraphicsDef *def, - const char *address) +void virDomainGraphicsListenAppendAddress(virDomainGraphicsDef *def, + const char *address) ATTRIBUTE_NONNULL(1); int virDomainGraphicsListenAppendSocket(virDomainGraphicsDef *def, const char *socket) diff --git a/src/libxl/xen_common.c b/src/libxl/xen_common.c index d5a0399613..c7bc51b926 100644 --- a/src/libxl/xen_common.c +++ b/src/libxl/xen_common.c @@ -673,8 +673,7 @@ xenParseVfb(virConf *conf, virDomainDef *def) if (xenConfigCopyStringOpt(conf, "vnclisten", &listenAddr) < 0) goto cleanup; - if (virDomainGraphicsListenAppendAddress(graphics, listenAddr) < 0) - goto cleanup; + virDomainGraphicsListenAppendAddress(graphics, listenAddr); VIR_FREE(listenAddr); if (xenConfigCopyStringOpt(conf, "vncpasswd", &graphics->data.vnc.auth.passwd) < 0) @@ -766,9 +765,7 @@ xenParseVfb(virConf *conf, virDomainDef *def) key = nextkey; } if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) { - if (virDomainGraphicsListenAppendAddress(graphics, - listenAddr) < 0) - goto cleanup; + virDomainGraphicsListenAppendAddress(graphics, listenAddr); VIR_FREE(listenAddr); } def->graphics = g_new0(virDomainGraphicsDef *, 1); diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c index f175359307..553aa77896 100644 --- a/src/libxl/xen_xl.c +++ b/src/libxl/xen_xl.c @@ -341,8 +341,7 @@ xenParseXLSpice(virConf *conf, virDomainDef *def) graphics->type = VIR_DOMAIN_GRAPHICS_TYPE_SPICE; if (xenConfigCopyStringOpt(conf, "spicehost", &listenAddr) < 0) goto cleanup; - if (virDomainGraphicsListenAppendAddress(graphics, listenAddr) < 0) - goto cleanup; + virDomainGraphicsListenAppendAddress(graphics, listenAddr); if (xenConfigGetULong(conf, "spicetls_port", &port, 0) < 0) goto cleanup; diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index de3c9989a5..9f6612ad61 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -3625,8 +3625,7 @@ vboxDumpDisplay(virDomainDef *def, struct _vboxDriver *data, IMachine *machine) if (netAddressUtf8 && STREQ(netAddressUtf8, "")) VBOX_UTF8_FREE(netAddressUtf8); - if (virDomainGraphicsListenAppendAddress(graphics, netAddressUtf8) < 0) - goto cleanup; + virDomainGraphicsListenAppendAddress(graphics, netAddressUtf8); gVBoxAPI.UIVRDEServer.GetAllowMultiConnection(VRDEServer, &allowMultiConnection); if (allowMultiConnection) @@ -3641,7 +3640,6 @@ vboxDumpDisplay(virDomainDef *def, struct _vboxDriver *data, IMachine *machine) ret = 0; - cleanup: VBOX_RELEASE(VRDEServer); VBOX_UTF8_FREE(valueTypeUtf8); VBOX_UTF8_FREE(netAddressUtf8); diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 26b89776e1..e746ff213b 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -2017,8 +2017,7 @@ virVMXParseVNC(virConf *conf, virDomainGraphicsDef **def) goto failure; } - if (virDomainGraphicsListenAppendAddress(*def, listenAddr) < 0) - goto failure; + virDomainGraphicsListenAppendAddress(*def, listenAddr); VIR_FREE(listenAddr); if (port < 0) { -- 2.34.1
vboxDumpDisplay() always returns 0. Signed-off-by: Dmitry Frolov <frolov@swemel.ru> --- src/vbox/vbox_common.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 9f6612ad61..305c85f4ec 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -3538,7 +3538,7 @@ vboxDumpVideo(virDomainDef *def, struct _vboxDriver *data G_GNUC_UNUSED, return 0; } -static int +static void vboxDumpDisplay(virDomainDef *def, struct _vboxDriver *data, IMachine *machine) { /* dump display options vrdp/gui/sdl */ @@ -3549,7 +3549,6 @@ vboxDumpDisplay(virDomainDef *def, struct _vboxDriver *data, IMachine *machine) IVRDEServer *VRDEServer = NULL; PRBool VRDxEnabled = PR_FALSE; virDomainGraphicsDef *graphics = NULL; - int ret = -1; def->ngraphics = 0; @@ -3638,13 +3637,10 @@ vboxDumpDisplay(virDomainDef *def, struct _vboxDriver *data, IMachine *machine) VIR_APPEND_ELEMENT(def->graphics, def->ngraphics, graphics); } - ret = 0; - VBOX_RELEASE(VRDEServer); VBOX_UTF8_FREE(valueTypeUtf8); VBOX_UTF8_FREE(netAddressUtf8); virDomainGraphicsDefFree(graphics); - return ret; } static int @@ -4160,8 +4156,7 @@ static char *vboxDomainGetXMLDesc(virDomainPtr dom, unsigned int flags) if (vboxDumpVideo(def, data, machine) < 0) goto cleanup; - if (vboxDumpDisplay(def, data, machine) < 0) - goto cleanup; + vboxDumpDisplay(def, data, machine); if (vboxDumpStorageControllers(def, machine) < 0) goto cleanup; if (vboxDumpDisks(def, data, machine) < 0) -- 2.34.1
xenParseXLNamespaceData() always returns 0. Signed-off-by: Dmitry Frolov <frolov@swemel.ru> --- src/libxl/xen_xl.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c index 553aa77896..ea825e85bd 100644 --- a/src/libxl/xen_xl.c +++ b/src/libxl/xen_xl.c @@ -1017,7 +1017,7 @@ xenParseXLChannel(virConf *conf, virDomainDef *def) return -1; } -static int +static void xenParseXLNamespaceData(virConf *conf, virDomainDef *def) { virConfValue *list = virConfGetValue(conf, "device_model_args"); @@ -1027,7 +1027,7 @@ xenParseXLNamespaceData(virConf *conf, virDomainDef *def) size_t n = 0; if (!list || list->type != VIR_CONF_LIST) - return 0; + return; list = list->list; @@ -1039,7 +1039,7 @@ xenParseXLNamespaceData(virConf *conf, virDomainDef *def) } if (nargs == 0) - return 0; + return; nsdata = g_new0(libxlDomainXmlNsDef, 1); def->namespaceData = nsdata; @@ -1052,8 +1052,6 @@ xenParseXLNamespaceData(virConf *conf, virDomainDef *def) nsdata->args[n++] = g_strdup(next->str); } - - return 0; } virDomainDef * @@ -1104,8 +1102,7 @@ xenParseXL(virConf *conf, if (xenParseXLChannel(conf, def) < 0) return NULL; - if (xenParseXLNamespaceData(conf, def) < 0) - return NULL; + xenParseXLNamespaceData(conf, def); if (virDomainDefPostParse(def, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, xmlopt, NULL) < 0) -- 2.34.1
virNetClientAddProgram() always returns 0. Signed-off-by: Dmitry Frolov <frolov@swemel.ru> --- src/admin/admin_remote.c | 3 +-- src/locking/lock_driver_lockd.c | 3 +-- src/logging/log_manager.c | 3 +-- src/lxc/lxc_monitor.c | 4 +--- src/remote/remote_driver.c | 7 +++---- src/rpc/virnetclient.c | 3 +-- src/rpc/virnetclient.h | 2 +- 7 files changed, 9 insertions(+), 16 deletions(-) diff --git a/src/admin/admin_remote.c b/src/admin/admin_remote.c index 3291a1e965..5c4913a76e 100644 --- a/src/admin/admin_remote.c +++ b/src/admin/admin_remote.c @@ -214,8 +214,7 @@ remoteAdminPrivNew(const char *sock_path) NULL, 0, NULL))) goto error; - if (virNetClientAddProgram(priv->client, priv->program) < 0) - goto error; + virNetClientAddProgram(priv->client, priv->program); return priv; error: diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lockd.c index d75302dd0a..0b6c720477 100644 --- a/src/locking/lock_driver_lockd.c +++ b/src/locking/lock_driver_lockd.c @@ -213,8 +213,7 @@ static virNetClient *virLockManagerLockDaemonConnectionNew(bool privileged, NULL))) goto error; - if (virNetClientAddProgram(client, *prog) < 0) - goto error; + virNetClientAddProgram(client, *prog); return client; diff --git a/src/logging/log_manager.c b/src/logging/log_manager.c index d8490f4e5a..19e23d65c5 100644 --- a/src/logging/log_manager.c +++ b/src/logging/log_manager.c @@ -88,8 +88,7 @@ virLogManagerConnect(bool privileged, NULL))) goto error; - if (virNetClientAddProgram(client, *prog) < 0) - goto error; + virNetClientAddProgram(client, *prog); VIR_FREE(daemonPath); VIR_FREE(logdpath); diff --git a/src/lxc/lxc_monitor.c b/src/lxc/lxc_monitor.c index 811d6685e5..cf2fd1897f 100644 --- a/src/lxc/lxc_monitor.c +++ b/src/lxc/lxc_monitor.c @@ -169,9 +169,7 @@ virLXCMonitor *virLXCMonitorNew(virDomainObj *vm, mon))) goto error; - if (virNetClientAddProgram(mon->client, - mon->program) < 0) - goto error; + virNetClientAddProgram(mon->client, mon->program); mon->vm = virObjectRef(vm); memcpy(&mon->cb, cb, sizeof(mon->cb)); diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 132d0194c6..8db638d6cc 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -1160,10 +1160,9 @@ doRemoteOpen(virConnectPtr conn, conn))) goto error; - if (virNetClientAddProgram(priv->client, priv->remoteProgram) < 0 || - virNetClientAddProgram(priv->client, priv->lxcProgram) < 0 || - virNetClientAddProgram(priv->client, priv->qemuProgram) < 0) - goto error; + virNetClientAddProgram(priv->client, priv->remoteProgram); + virNetClientAddProgram(priv->client, priv->lxcProgram); + virNetClientAddProgram(priv->client, priv->qemuProgram); /* Try and authenticate with server */ VIR_DEBUG("Trying authentication"); diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 4ab8af68c5..c5be82abee 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -1053,7 +1053,7 @@ bool virNetClientIsOpen(virNetClient *client) } -int virNetClientAddProgram(virNetClient *client, +void virNetClientAddProgram(virNetClient *client, virNetClientProgram *prog) { virObjectLock(client); @@ -1062,7 +1062,6 @@ int virNetClientAddProgram(virNetClient *client, client->programs[client->nprograms-1] = virObjectRef(prog); virObjectUnlock(client); - return 0; } diff --git a/src/rpc/virnetclient.h b/src/rpc/virnetclient.h index 1647a6cc71..7726b57ef4 100644 --- a/src/rpc/virnetclient.h +++ b/src/rpc/virnetclient.h @@ -117,7 +117,7 @@ int virNetClientDupFD(virNetClient *client, bool cloexec); bool virNetClientHasPassFD(virNetClient *client); -int virNetClientAddProgram(virNetClient *client, +void virNetClientAddProgram(virNetClient *client, virNetClientProgram *prog); int virNetClientAddStream(virNetClient *client, -- 2.34.1
On 1/9/24 13:06, frolov@swemel.ru wrote:
ping
Can you rebase and resend? I've merged some patches earlier that touch the same area and your patches no longer apply cleanly. Also, we've entered feature freeze earlier today [1] which means only bug fixes can be merged. Michal 1: https://lists.libvirt.org/archives/list/announce@lists.libvirt.org/thread/KB...
A lot of unreacheble code was caused by int functions, which return nothing except zero. Unreacheble code was removed. Corresponding functions type was changed to void. --- v2: Changing functions return type to void v3: fixed errors in v2 v4: rebased, more functions changed to void Dmitry Frolov (19): libxl: change type to void libxlPrepareChannel() conf: change type to void virDomainDefMaybeAddInput() libxl: change type to void xenDomainDefAddImplicitInputDevice() qemu: change type to void qemuDomainDefAddImplicitInputDevice() vz: change type to void vzDomainDefAddDefaultInputDevices() conf: change type to void virDomainHostdevInsert() conf: change type to void virDomainNetInsert() conf: change type to void virCapabilitiesAddHostFeature() conf: change type to void virCapabilitiesSetNetPrefix() libxl: change type to void libxlMakeDomainOSCaps() libxl: change type to void libxlMakeDomainDeviceDiskCaps() libxl: change type to void libxlMakeDomainDeviceGraphicsCaps() libxl: change type to void libxlMakeDomainDeviceVideoCaps() libxl: change type to void virDomainGraphicsListenAppendAddress() libxl: change type to void xenParseXLNamespaceData() rpc: change type to void virNetClientAddProgram() vbox: change type to void vboxDumpDisplay() libxl: change type to void libxlMakeDomainDeviceHostdevCaps() libxl: change type to void libxlMakeDomainCapabilities() src/admin/admin_remote.c | 3 +-- src/conf/capabilities.c | 8 ++---- src/conf/capabilities.h | 4 +-- src/conf/domain_conf.c | 28 +++++++-------------- src/conf/domain_conf.h | 8 +++--- src/libxl/libxl_capabilities.c | 44 ++++++++++++--------------------- src/libxl/libxl_capabilities.h | 2 +- src/libxl/libxl_conf.c | 7 ++---- src/libxl/libxl_domain.c | 6 ++--- src/libxl/libxl_driver.c | 11 +++------ src/libxl/xen_common.c | 26 ++++++++----------- src/libxl/xen_common.h | 2 +- src/libxl/xen_xl.c | 14 ++++------- src/locking/lock_driver_lockd.c | 3 +-- src/logging/log_manager.c | 3 +-- src/lxc/lxc_driver.c | 6 ++--- src/lxc/lxc_monitor.c | 5 ++-- src/qemu/qemu_domain.c | 31 +++++++++-------------- src/qemu/qemu_driver.c | 6 ++--- src/qemu/qemu_process.c | 3 +-- src/remote/remote_driver.c | 7 +++--- src/rpc/virnetclient.c | 3 +-- src/rpc/virnetclient.h | 2 +- src/test/test_driver.c | 6 ++--- src/vbox/vbox_common.c | 13 +++------- src/vmx/vmx.c | 3 +-- src/vz/vz_driver.c | 23 +++++++---------- src/vz/vz_sdk.c | 14 +++++------ tests/domaincapstest.c | 3 +-- 29 files changed, 107 insertions(+), 187 deletions(-) -- 2.34.1
libxlPrepareChannel() returns nothing except 0. Changing return type to void. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Dmitry Frolov <frolov@swemel.ru> --- src/libxl/libxl_conf.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 62e1be6672..712b1d627f 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1937,7 +1937,7 @@ libxlDriverGetDom0MaxmemConf(libxlDriverConfig *cfg, } -static int +static void libxlPrepareChannel(virDomainChrDef *channel, const char *channelDir, const char *domainName) @@ -1954,8 +1954,6 @@ libxlPrepareChannel(virDomainChrDef *channel, channel->source->data.nix.listen = true; } - - return 0; } static int @@ -2011,8 +2009,7 @@ libxlMakeChannelList(const char *channelDir, if (l_channels[i]->deviceType != VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL) continue; - if (libxlPrepareChannel(l_channels[i], channelDir, def->name) < 0) - goto error; + libxlPrepareChannel(l_channels[i], channelDir, def->name); if (libxlMakeChannel(l_channels[i], &x_channels[nvchannels]) < 0) goto error; -- 2.34.1
virDomainDefMaybeAddInput() returns nothing except 0. Changing return type to void. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Dmitry Frolov <frolov@swemel.ru> --- src/conf/domain_conf.c | 6 ++---- src/conf/domain_conf.h | 2 +- src/libxl/xen_common.c | 14 ++++++-------- src/vz/vz_driver.c | 15 ++++++--------- src/vz/vz_sdk.c | 14 ++++++-------- 5 files changed, 21 insertions(+), 30 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index be57a1981e..fc785b188b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -16227,7 +16227,7 @@ virDomainDefMaybeAddController(virDomainDef *def, } -int +void virDomainDefMaybeAddInput(virDomainDef *def, int type, int bus) @@ -16238,7 +16238,7 @@ virDomainDefMaybeAddInput(virDomainDef *def, for (i = 0; i < def->ninputs; i++) { if (def->inputs[i]->type == type && def->inputs[i]->bus == bus) - return 0; + return; } input = g_new0(virDomainInputDef, 1); @@ -16247,8 +16247,6 @@ virDomainDefMaybeAddInput(virDomainDef *def, input->bus = bus; VIR_APPEND_ELEMENT(def->inputs, def->ninputs, input); - - return 0; } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index d176bda5f8..6a6f88e5af 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -4275,7 +4275,7 @@ virDomainDefMaybeAddController(virDomainDef *def, virDomainControllerType type, int idx, int model); -int +void virDomainDefMaybeAddInput(virDomainDef *def, int type, int bus); diff --git a/src/libxl/xen_common.c b/src/libxl/xen_common.c index d5a0399613..edb20127ab 100644 --- a/src/libxl/xen_common.c +++ b/src/libxl/xen_common.c @@ -2393,15 +2393,13 @@ xenDomainDefAddImplicitInputDevice(virDomainDef *def) if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) implicitInputBus = VIR_DOMAIN_INPUT_BUS_PS2; - if (virDomainDefMaybeAddInput(def, - VIR_DOMAIN_INPUT_TYPE_MOUSE, - implicitInputBus) < 0) - return -1; + virDomainDefMaybeAddInput(def, + VIR_DOMAIN_INPUT_TYPE_MOUSE, + implicitInputBus); - if (virDomainDefMaybeAddInput(def, - VIR_DOMAIN_INPUT_TYPE_KBD, - implicitInputBus) < 0) - return -1; + virDomainDefMaybeAddInput(def, + VIR_DOMAIN_INPUT_TYPE_KBD, + implicitInputBus); return 0; } diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index c7ceec2339..56b630bac0 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -219,16 +219,13 @@ vzDomainDefAddDefaultInputDevices(virDomainDef *def) if (def->ngraphics == 0) return 0; - if (virDomainDefMaybeAddInput(def, - VIR_DOMAIN_INPUT_TYPE_MOUSE, - bus) < 0) - return -1; - - if (virDomainDefMaybeAddInput(def, - VIR_DOMAIN_INPUT_TYPE_KBD, - bus) < 0) - return -1; + virDomainDefMaybeAddInput(def, + VIR_DOMAIN_INPUT_TYPE_MOUSE, + bus); + virDomainDefMaybeAddInput(def, + VIR_DOMAIN_INPUT_TYPE_KBD, + bus); return 0; } diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 6a15d60577..080beac351 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -1849,15 +1849,13 @@ prlsdkLoadDomain(struct _vzDriver *driver, int bus = IS_CT(def) ? VIR_DOMAIN_INPUT_BUS_PARALLELS : VIR_DOMAIN_INPUT_BUS_PS2; - if (virDomainDefMaybeAddInput(def, - VIR_DOMAIN_INPUT_TYPE_MOUSE, - bus) < 0) - return NULL; + virDomainDefMaybeAddInput(def, + VIR_DOMAIN_INPUT_TYPE_MOUSE, + bus); - if (virDomainDefMaybeAddInput(def, - VIR_DOMAIN_INPUT_TYPE_KBD, - bus) < 0) - return NULL; + virDomainDefMaybeAddInput(def, + VIR_DOMAIN_INPUT_TYPE_KBD, + bus); } if (!dom) { -- 2.34.1
xenDomainDefAddImplicitInputDevice() returns nothing except 0. Changing return type to void. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Dmitry Frolov <frolov@swemel.ru> --- src/libxl/libxl_domain.c | 3 +-- src/libxl/xen_common.c | 4 +--- src/libxl/xen_common.h | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 670fd2881e..cd24eb58d6 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -266,8 +266,7 @@ libxlDomainDefPostParse(virDomainDef *def, } /* add implicit input devices */ - if (xenDomainDefAddImplicitInputDevice(def) < 0) - return -1; + xenDomainDefAddImplicitInputDevice(def); /* For x86_64 HVM */ if (def->os.type == VIR_DOMAIN_OSTYPE_HVM && diff --git a/src/libxl/xen_common.c b/src/libxl/xen_common.c index edb20127ab..ba2a322016 100644 --- a/src/libxl/xen_common.c +++ b/src/libxl/xen_common.c @@ -2385,7 +2385,7 @@ xenFormatConfigCommon(virConf *conf, } -int +void xenDomainDefAddImplicitInputDevice(virDomainDef *def) { virDomainInputBus implicitInputBus = VIR_DOMAIN_INPUT_BUS_XEN; @@ -2400,6 +2400,4 @@ xenDomainDefAddImplicitInputDevice(virDomainDef *def) virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_KBD, implicitInputBus); - - return 0; } diff --git a/src/libxl/xen_common.h b/src/libxl/xen_common.h index b21046e959..86c2c337c1 100644 --- a/src/libxl/xen_common.h +++ b/src/libxl/xen_common.h @@ -66,4 +66,4 @@ int xenFormatConfigCommon(virConf *conf, char *xenMakeIPList(virNetDevIPInfo *guestIP); -int xenDomainDefAddImplicitInputDevice(virDomainDef *def); +void xenDomainDefAddImplicitInputDevice(virDomainDef *def); -- 2.34.1
qemuDomainDefAddImplicitInputDevice() returns nothing except 0. Changing return type to void. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Dmitry Frolov <frolov@swemel.ru> --- src/qemu/qemu_domain.c | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 003fe7c71b..0a15f77517 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3917,22 +3917,18 @@ virXMLNamespace virQEMUDriverDomainXMLNamespace = { }; -static int +static void qemuDomainDefAddImplicitInputDevice(virDomainDef *def) { if (ARCH_IS_X86(def->os.arch)) { - if (virDomainDefMaybeAddInput(def, - VIR_DOMAIN_INPUT_TYPE_MOUSE, - VIR_DOMAIN_INPUT_BUS_PS2) < 0) - return -1; + virDomainDefMaybeAddInput(def, + VIR_DOMAIN_INPUT_TYPE_MOUSE, + VIR_DOMAIN_INPUT_BUS_PS2); - if (virDomainDefMaybeAddInput(def, - VIR_DOMAIN_INPUT_TYPE_KBD, - VIR_DOMAIN_INPUT_BUS_PS2) < 0) - return -1; + virDomainDefMaybeAddInput(def, + VIR_DOMAIN_INPUT_TYPE_KBD, + VIR_DOMAIN_INPUT_BUS_PS2); } - - return 0; } static int @@ -4122,8 +4118,7 @@ qemuDomainDefAddDefaultDevices(virQEMUDriver *driver, bool addITCOWatchdog = false; /* add implicit input devices */ - if (qemuDomainDefAddImplicitInputDevice(def) < 0) - return -1; + qemuDomainDefAddImplicitInputDevice(def); /* Add implicit PCI root controller if the machine has one */ switch (def->os.arch) { @@ -4321,18 +4316,16 @@ qemuDomainDefAddDefaultDevices(virQEMUDriver *driver, } if (addDefaultUSBKBD && - def->ngraphics > 0 && + def->ngraphics > 0) virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_KBD, - VIR_DOMAIN_INPUT_BUS_USB) < 0) - return -1; + VIR_DOMAIN_INPUT_BUS_USB); if (addDefaultUSBMouse && - def->ngraphics > 0 && + def->ngraphics > 0) virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_MOUSE, - VIR_DOMAIN_INPUT_BUS_USB) < 0) - return -1; + VIR_DOMAIN_INPUT_BUS_USB); if (addPanicDevice) { size_t j; -- 2.34.1
vzDomainDefAddDefaultInputDevices() returns nothing except 0. Changing return type to void. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Dmitry Frolov <frolov@swemel.ru> --- src/vz/vz_driver.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 56b630bac0..1b31f7a7c3 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -210,14 +210,14 @@ vzConnectGetCapabilities(virConnectPtr conn) return virCapabilitiesFormatXML(privconn->driver->caps); } -static int +static void vzDomainDefAddDefaultInputDevices(virDomainDef *def) { int bus = IS_CT(def) ? VIR_DOMAIN_INPUT_BUS_PARALLELS : VIR_DOMAIN_INPUT_BUS_PS2; if (def->ngraphics == 0) - return 0; + return; virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_MOUSE, @@ -226,7 +226,6 @@ vzDomainDefAddDefaultInputDevices(virDomainDef *def) virDomainDefMaybeAddInput(def, VIR_DOMAIN_INPUT_TYPE_KBD, bus); - return 0; } static int @@ -241,8 +240,7 @@ vzDomainDefPostParse(virDomainDef *def, def->virtType)) return -1; - if (vzDomainDefAddDefaultInputDevices(def) < 0) - return -1; + vzDomainDefAddDefaultInputDevices(def); return 0; } -- 2.34.1
virDomainHostdevInsert() returns nothing except 0. Changing return type to void. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Dmitry Frolov <frolov@swemel.ru> --- src/conf/domain_conf.c | 15 +++++---------- src/conf/domain_conf.h | 2 +- src/libxl/libxl_domain.c | 3 +-- src/libxl/libxl_driver.c | 3 +-- src/lxc/lxc_driver.c | 3 +-- src/qemu/qemu_driver.c | 3 +-- src/qemu/qemu_process.c | 3 +-- 7 files changed, 11 insertions(+), 21 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index fc785b188b..9116b28360 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14142,12 +14142,10 @@ virDomainChrTargetTypeToString(int deviceType, return type; } -int +void virDomainHostdevInsert(virDomainDef *def, virDomainHostdevDef *hostdev) { VIR_APPEND_ELEMENT(def->hostdevs, def->nhostdevs, hostdev); - - return 0; } virDomainHostdevDef * @@ -14563,9 +14561,8 @@ virDomainDiskRemoveByName(virDomainDef *def, const char *name) int virDomainNetInsert(virDomainDef *def, virDomainNetDef *net) { /* hostdev net devices must also exist in the hostdevs array */ - if (net->type == VIR_DOMAIN_NET_TYPE_HOSTDEV && - virDomainHostdevInsert(def, &net->data.hostdev.def) < 0) - return -1; + if (net->type == VIR_DOMAIN_NET_TYPE_HOSTDEV) + virDomainHostdevInsert(def, &net->data.hostdev.def); VIR_APPEND_ELEMENT(def->nets, def->nnets, net); return 0; @@ -18931,10 +18928,8 @@ virDomainDefParseXML(xmlXPathContextPtr ctxt, * where the actual network type is already known to be * hostdev) must also be in the hostdevs array. */ - if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_HOSTDEV && - virDomainHostdevInsert(def, virDomainNetGetActualHostdev(net)) < 0) { - return NULL; - } + if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_HOSTDEV) + virDomainHostdevInsert(def, virDomainNetGetActualHostdev(net)); } VIR_FREE(nodes); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 6a6f88e5af..f3d32fe40c 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3902,7 +3902,7 @@ virDomainNetDef *virDomainNetRemove(virDomainDef *def, size_t i); virDomainNetDef *virDomainNetRemoveByObj(virDomainDef *def, virDomainNetDef *net); void virDomainNetRemoveHostdev(virDomainDef *def, virDomainNetDef *net); -int virDomainHostdevInsert(virDomainDef *def, virDomainHostdevDef *hostdev); +void virDomainHostdevInsert(virDomainDef *def, virDomainHostdevDef *hostdev); virDomainHostdevDef * virDomainHostdevRemove(virDomainDef *def, size_t i); int virDomainHostdevFind(virDomainDef *def, virDomainHostdevDef *match, diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index cd24eb58d6..6a14d48d3d 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -996,8 +996,7 @@ libxlNetworkPrepareDevices(virDomainDef *def) */ virDomainHostdevDef *hostdev = virDomainNetGetActualHostdev(net); - if (virDomainHostdevInsert(def, hostdev) < 0) - return -1; + virDomainHostdevInsert(def, hostdev); } } diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 6c843b9054..f8ef3f2688 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -3584,8 +3584,7 @@ libxlDomainAttachDeviceConfig(virDomainDef *vmdef, virDomainDeviceDef *dev) return -1; } - if (virDomainHostdevInsert(vmdef, hostdev) < 0) - return -1; + virDomainHostdevInsert(vmdef, hostdev); dev->data.hostdev = NULL; break; diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index c281998652..b2e04dc532 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -3023,8 +3023,7 @@ lxcDomainAttachDeviceConfig(virDomainDef *vmdef, _("device is already in the domain configuration")); return -1; } - if (virDomainHostdevInsert(vmdef, hostdev) < 0) - return -1; + virDomainHostdevInsert(vmdef, hostdev); dev->data.hostdev = NULL; ret = 0; break; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 448e6b1591..90b965b5fa 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6722,8 +6722,7 @@ qemuDomainAttachDeviceConfig(virDomainDef *vmdef, _("device is already in the domain configuration")); return -1; } - if (virDomainHostdevInsert(vmdef, hostdev)) - return -1; + virDomainHostdevInsert(vmdef, hostdev); dev->data.hostdev = NULL; break; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 3563ad215c..5e20b4a747 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5755,8 +5755,7 @@ qemuProcessPrepareDomainNetwork(virDomainObj *vm) if (qemuDomainPrepareHostdev(hostdev, priv) < 0) return -1; - if (virDomainHostdevInsert(def, hostdev) < 0) - return -1; + virDomainHostdevInsert(def, hostdev); } } return 0; -- 2.34.1
virDomainNetInsert() returns nothing except 0. Changing return type to void. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Dmitry Frolov <frolov@swemel.ru> --- src/conf/domain_conf.c | 3 +-- src/conf/domain_conf.h | 2 +- src/libxl/libxl_driver.c | 3 +-- src/lxc/lxc_driver.c | 3 +-- src/qemu/qemu_driver.c | 3 +-- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9116b28360..e232d635bb 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14558,14 +14558,13 @@ virDomainDiskRemoveByName(virDomainDef *def, const char *name) return virDomainDiskRemove(def, idx); } -int virDomainNetInsert(virDomainDef *def, virDomainNetDef *net) +void virDomainNetInsert(virDomainDef *def, virDomainNetDef *net) { /* hostdev net devices must also exist in the hostdevs array */ if (net->type == VIR_DOMAIN_NET_TYPE_HOSTDEV) virDomainHostdevInsert(def, &net->data.hostdev.def); VIR_APPEND_ELEMENT(def->nets, def->nnets, net); - return 0; } /** diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index f3d32fe40c..89257d33fc 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3892,7 +3892,7 @@ int virDomainNetFindIdx(virDomainDef *def, virDomainNetDef *net); virDomainNetDef *virDomainNetFind(virDomainDef *def, const char *device); virDomainNetDef *virDomainNetFindByName(virDomainDef *def, const char *ifname); bool virDomainHasNet(virDomainDef *def, virDomainNetDef *net); -int virDomainNetInsert(virDomainDef *def, virDomainNetDef *net); +void virDomainNetInsert(virDomainDef *def, virDomainNetDef *net); void virDomainNetUpdate(virDomainDef *def, size_t netidx, virDomainNetDef *newnet); bool virDomainNetBackendIsEqual(virDomainNetBackend *src, virDomainNetBackend *dst); diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index f8ef3f2688..68aecaef8c 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -3559,8 +3559,7 @@ libxlDomainAttachDeviceConfig(virDomainDef *vmdef, virDomainDeviceDef *dev) virMacAddrFormat(&net->mac, mac)); return -1; } - if (virDomainNetInsert(vmdef, net)) - return -1; + virDomainNetInsert(vmdef, net); dev->data.net = NULL; break; diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index b2e04dc532..017b166341 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -3010,8 +3010,7 @@ lxcDomainAttachDeviceConfig(virDomainDef *vmdef, case VIR_DOMAIN_DEVICE_NET: net = dev->data.net; - if (virDomainNetInsert(vmdef, net) < 0) - return -1; + virDomainNetInsert(vmdef, net); dev->data.net = NULL; ret = 0; break; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 90b965b5fa..830843e96e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6704,8 +6704,7 @@ qemuDomainAttachDeviceConfig(virDomainDef *vmdef, case VIR_DOMAIN_DEVICE_NET: net = dev->data.net; - if (virDomainNetInsert(vmdef, net)) - return -1; + virDomainNetInsert(vmdef, net); dev->data.net = NULL; break; -- 2.34.1
virCapabilitiesAddHostFeature() returns nothing except 0. Changing return type to void. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Dmitry Frolov <frolov@swemel.ru> --- src/conf/capabilities.c | 4 +--- src/conf/capabilities.h | 2 +- src/libxl/libxl_capabilities.c | 5 ++--- src/test/test_driver.c | 6 ++---- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 32badee7b3..096ccc18e7 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -276,7 +276,7 @@ virCapsDispose(void *object) * * Registers a new host CPU feature, eg 'pae', or 'vmx' */ -int +void virCapabilitiesAddHostFeature(virCaps *caps, const char *name) { @@ -284,8 +284,6 @@ virCapabilitiesAddHostFeature(virCaps *caps, caps->host.nfeatures, 1); caps->host.features[caps->host.nfeatures] = g_strdup(name); caps->host.nfeatures++; - - return 0; } /** diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h index 9eaf6e2807..085c0af868 100644 --- a/src/conf/capabilities.h +++ b/src/conf/capabilities.h @@ -236,7 +236,7 @@ virCapabilitiesHostNUMARef(virCapsHostNUMA *caps); G_DEFINE_AUTOPTR_CLEANUP_FUNC(virCapsHostNUMA, virCapabilitiesHostNUMAUnref); -int +void virCapabilitiesAddHostFeature(virCaps *caps, const char *name); diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index dfb602ca2f..977418d472 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -138,9 +138,8 @@ libxlCapsInitCPU(virCaps *caps, libxl_physinfo *phy_info) cpu = virCPUDefNew(); host_pae = phy_info->hw_cap[0] & LIBXL_X86_FEATURE_PAE_MASK; - if (host_pae && - virCapabilitiesAddHostFeature(caps, "pae") < 0) - return -1; + if (host_pae) + virCapabilitiesAddHostFeature(caps, "pae"); host_lm = (phy_info->hw_cap[2] & LIBXL_X86_FEATURE_LM_MASK); if (host_lm) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index ed545848af..053f1b55e1 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -299,10 +299,8 @@ testBuildCapabilities(virConnectPtr conn) if ((caps = virCapabilitiesNew(VIR_ARCH_I686, false, false)) == NULL) return NULL; - if (virCapabilitiesAddHostFeature(caps, "pae") < 0) - return NULL; - if (virCapabilitiesAddHostFeature(caps, "nonpae") < 0) - return NULL; + virCapabilitiesAddHostFeature(caps, "pae"); + virCapabilitiesAddHostFeature(caps, "nonpae"); virCapabilitiesHostInitIOMMU(caps); -- 2.34.1
virCapabilitiesSetNetPrefix() returns nothing except 0. Changing return type to void. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Dmitry Frolov <frolov@swemel.ru> --- 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 977418d472..f2ab338e74 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -180,8 +180,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
libxlMakeDomainOSCaps() returns nothing except 0. Changing return type to void. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Dmitry Frolov <frolov@swemel.ru> --- src/libxl/libxl_capabilities.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index f2ab338e74..9a5ace845d 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -509,7 +509,7 @@ libxlCapsInitGuests(libxl_ctx *ctx, virCaps *caps) return 0; } -static int +static void libxlMakeDomainOSCaps(const char *machine, virDomainCapsOS *os, virFirmware **firmwares, @@ -524,7 +524,7 @@ libxlMakeDomainOSCaps(const char *machine, capsLoader->readonly.report = true; if (STREQ(machine, "xenpv") || STREQ(machine, "xenpvh")) - return 0; + return; capsLoader->supported = VIR_TRISTATE_BOOL_YES; capsLoader->values.values = g_new0(char *, nfirmwares); @@ -539,8 +539,6 @@ libxlMakeDomainOSCaps(const char *machine, VIR_DOMAIN_LOADER_TYPE_PFLASH); VIR_DOMAIN_CAPS_ENUM_SET(capsLoader->readonly, VIR_TRISTATE_BOOL_YES); - - return 0; } static int @@ -675,8 +673,8 @@ libxlMakeDomainCapabilities(virDomainCaps *domCaps, else domCaps->maxvcpus = PV_MAX_VCPUS; - if (libxlMakeDomainOSCaps(domCaps->machine, os, firmwares, nfirmwares) < 0 || - libxlMakeDomainDeviceDiskCaps(disk) < 0 || + libxlMakeDomainOSCaps(domCaps->machine, os, firmwares, nfirmwares); + if (libxlMakeDomainDeviceDiskCaps(disk) < 0 || libxlMakeDomainDeviceGraphicsCaps(graphics) < 0 || libxlMakeDomainDeviceVideoCaps(video) < 0) return -1; -- 2.34.1
libxlMakeDomainDeviceDiskCaps() returns nothing except 0. Changing return type to void. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Dmitry Frolov <frolov@swemel.ru> --- src/libxl/libxl_capabilities.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index 9a5ace845d..bb37e5cae2 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -541,7 +541,7 @@ libxlMakeDomainOSCaps(const char *machine, VIR_TRISTATE_BOOL_YES); } -static int +static void libxlMakeDomainDeviceDiskCaps(virDomainCapsDeviceDisk *dev) { dev->supported = VIR_TRISTATE_BOOL_YES; @@ -557,8 +557,6 @@ libxlMakeDomainDeviceDiskCaps(virDomainCapsDeviceDisk *dev) VIR_DOMAIN_DISK_BUS_IDE, VIR_DOMAIN_DISK_BUS_SCSI, VIR_DOMAIN_DISK_BUS_XEN); - - return 0; } static int @@ -674,8 +672,8 @@ libxlMakeDomainCapabilities(virDomainCaps *domCaps, domCaps->maxvcpus = PV_MAX_VCPUS; libxlMakeDomainOSCaps(domCaps->machine, os, firmwares, nfirmwares); - if (libxlMakeDomainDeviceDiskCaps(disk) < 0 || - libxlMakeDomainDeviceGraphicsCaps(graphics) < 0 || + libxlMakeDomainDeviceDiskCaps(disk); + if (libxlMakeDomainDeviceGraphicsCaps(graphics) < 0 || libxlMakeDomainDeviceVideoCaps(video) < 0) return -1; if (STRNEQ(domCaps->machine, "xenpvh") && -- 2.34.1
libxlMakeDomainDeviceGraphicsCaps() returns nothing except 0. Changing return type to void. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Dmitry Frolov <frolov@swemel.ru> --- src/libxl/libxl_capabilities.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index bb37e5cae2..bef219a62d 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -559,7 +559,7 @@ libxlMakeDomainDeviceDiskCaps(virDomainCapsDeviceDisk *dev) VIR_DOMAIN_DISK_BUS_XEN); } -static int +static void libxlMakeDomainDeviceGraphicsCaps(virDomainCapsDeviceGraphics *dev) { dev->supported = VIR_TRISTATE_BOOL_YES; @@ -569,8 +569,6 @@ libxlMakeDomainDeviceGraphicsCaps(virDomainCapsDeviceGraphics *dev) VIR_DOMAIN_GRAPHICS_TYPE_SDL, VIR_DOMAIN_GRAPHICS_TYPE_VNC, VIR_DOMAIN_GRAPHICS_TYPE_SPICE); - - return 0; } static int @@ -673,8 +671,8 @@ libxlMakeDomainCapabilities(virDomainCaps *domCaps, libxlMakeDomainOSCaps(domCaps->machine, os, firmwares, nfirmwares); libxlMakeDomainDeviceDiskCaps(disk); - if (libxlMakeDomainDeviceGraphicsCaps(graphics) < 0 || - libxlMakeDomainDeviceVideoCaps(video) < 0) + libxlMakeDomainDeviceGraphicsCaps(graphics); + if (libxlMakeDomainDeviceVideoCaps(video) < 0) return -1; if (STRNEQ(domCaps->machine, "xenpvh") && libxlMakeDomainDeviceHostdevCaps(hostdev) < 0) -- 2.34.1
libxlMakeDomainDeviceVideoCaps() returns nothing except 0. Changing return type to void. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Dmitry Frolov <frolov@swemel.ru> --- src/libxl/libxl_capabilities.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index bef219a62d..2b0652b483 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -672,8 +672,8 @@ libxlMakeDomainCapabilities(virDomainCaps *domCaps, libxlMakeDomainOSCaps(domCaps->machine, os, firmwares, nfirmwares); libxlMakeDomainDeviceDiskCaps(disk); libxlMakeDomainDeviceGraphicsCaps(graphics); - if (libxlMakeDomainDeviceVideoCaps(video) < 0) - return -1; + libxlMakeDomainDeviceVideoCaps(video); + if (STRNEQ(domCaps->machine, "xenpvh") && libxlMakeDomainDeviceHostdevCaps(hostdev) < 0) return -1; -- 2.34.1
virDomainGraphicsListenAppendAddress() returns nothing except 0. Changing return type to void. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Dmitry Frolov <frolov@swemel.ru> --- src/conf/domain_conf.c | 4 +--- src/conf/domain_conf.h | 2 +- src/libxl/xen_common.c | 8 +++----- src/libxl/xen_xl.c | 3 +-- src/vbox/vbox_common.c | 9 ++------- src/vmx/vmx.c | 3 +-- 6 files changed, 9 insertions(+), 20 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e232d635bb..bd8d941f34 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -29153,7 +29153,7 @@ virDomainGraphicsGetListen(virDomainGraphicsDef *def, size_t i) } -int +void virDomainGraphicsListenAppendAddress(virDomainGraphicsDef *def, const char *address) { @@ -29164,8 +29164,6 @@ virDomainGraphicsListenAppendAddress(virDomainGraphicsDef *def, glisten.address = g_strdup(address); VIR_APPEND_ELEMENT_COPY(def->listens, def->nListens, glisten); - - return 0; } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 89257d33fc..6b70a599f1 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3912,7 +3912,7 @@ int virDomainHostdevMatch(virDomainHostdevDef *a, virDomainGraphicsListenDef * virDomainGraphicsGetListen(virDomainGraphicsDef *def, size_t i); -int virDomainGraphicsListenAppendAddress(virDomainGraphicsDef *def, +void virDomainGraphicsListenAppendAddress(virDomainGraphicsDef *def, const char *address) ATTRIBUTE_NONNULL(1); int virDomainGraphicsListenAppendSocket(virDomainGraphicsDef *def, diff --git a/src/libxl/xen_common.c b/src/libxl/xen_common.c index ba2a322016..8f4add7f30 100644 --- a/src/libxl/xen_common.c +++ b/src/libxl/xen_common.c @@ -673,8 +673,7 @@ xenParseVfb(virConf *conf, virDomainDef *def) if (xenConfigCopyStringOpt(conf, "vnclisten", &listenAddr) < 0) goto cleanup; - if (virDomainGraphicsListenAppendAddress(graphics, listenAddr) < 0) - goto cleanup; + virDomainGraphicsListenAppendAddress(graphics, listenAddr); VIR_FREE(listenAddr); if (xenConfigCopyStringOpt(conf, "vncpasswd", &graphics->data.vnc.auth.passwd) < 0) @@ -766,9 +765,8 @@ xenParseVfb(virConf *conf, virDomainDef *def) key = nextkey; } if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) { - if (virDomainGraphicsListenAppendAddress(graphics, - listenAddr) < 0) - goto cleanup; + virDomainGraphicsListenAppendAddress(graphics, + listenAddr); VIR_FREE(listenAddr); } def->graphics = g_new0(virDomainGraphicsDef *, 1); diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c index f175359307..553aa77896 100644 --- a/src/libxl/xen_xl.c +++ b/src/libxl/xen_xl.c @@ -341,8 +341,7 @@ xenParseXLSpice(virConf *conf, virDomainDef *def) graphics->type = VIR_DOMAIN_GRAPHICS_TYPE_SPICE; if (xenConfigCopyStringOpt(conf, "spicehost", &listenAddr) < 0) goto cleanup; - if (virDomainGraphicsListenAppendAddress(graphics, listenAddr) < 0) - goto cleanup; + virDomainGraphicsListenAppendAddress(graphics, listenAddr); if (xenConfigGetULong(conf, "spicetls_port", &port, 0) < 0) goto cleanup; diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index de3c9989a5..59e7a91081 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -3549,7 +3549,6 @@ vboxDumpDisplay(virDomainDef *def, struct _vboxDriver *data, IMachine *machine) IVRDEServer *VRDEServer = NULL; PRBool VRDxEnabled = PR_FALSE; virDomainGraphicsDef *graphics = NULL; - int ret = -1; def->ngraphics = 0; @@ -3625,8 +3624,7 @@ vboxDumpDisplay(virDomainDef *def, struct _vboxDriver *data, IMachine *machine) if (netAddressUtf8 && STREQ(netAddressUtf8, "")) VBOX_UTF8_FREE(netAddressUtf8); - if (virDomainGraphicsListenAppendAddress(graphics, netAddressUtf8) < 0) - goto cleanup; + virDomainGraphicsListenAppendAddress(graphics, netAddressUtf8); gVBoxAPI.UIVRDEServer.GetAllowMultiConnection(VRDEServer, &allowMultiConnection); if (allowMultiConnection) @@ -3639,14 +3637,11 @@ vboxDumpDisplay(virDomainDef *def, struct _vboxDriver *data, IMachine *machine) VIR_APPEND_ELEMENT(def->graphics, def->ngraphics, graphics); } - ret = 0; - - cleanup: VBOX_RELEASE(VRDEServer); VBOX_UTF8_FREE(valueTypeUtf8); VBOX_UTF8_FREE(netAddressUtf8); virDomainGraphicsDefFree(graphics); - return ret; + return 0; } static int diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 26b89776e1..e746ff213b 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -2017,8 +2017,7 @@ virVMXParseVNC(virConf *conf, virDomainGraphicsDef **def) goto failure; } - if (virDomainGraphicsListenAppendAddress(*def, listenAddr) < 0) - goto failure; + virDomainGraphicsListenAppendAddress(*def, listenAddr); VIR_FREE(listenAddr); if (port < 0) { -- 2.34.1
xenParseXLNamespaceData() returns nothing except 0. Changing return type to void. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Dmitry Frolov <frolov@swemel.ru> --- src/libxl/xen_xl.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c index 553aa77896..ea825e85bd 100644 --- a/src/libxl/xen_xl.c +++ b/src/libxl/xen_xl.c @@ -1017,7 +1017,7 @@ xenParseXLChannel(virConf *conf, virDomainDef *def) return -1; } -static int +static void xenParseXLNamespaceData(virConf *conf, virDomainDef *def) { virConfValue *list = virConfGetValue(conf, "device_model_args"); @@ -1027,7 +1027,7 @@ xenParseXLNamespaceData(virConf *conf, virDomainDef *def) size_t n = 0; if (!list || list->type != VIR_CONF_LIST) - return 0; + return; list = list->list; @@ -1039,7 +1039,7 @@ xenParseXLNamespaceData(virConf *conf, virDomainDef *def) } if (nargs == 0) - return 0; + return; nsdata = g_new0(libxlDomainXmlNsDef, 1); def->namespaceData = nsdata; @@ -1052,8 +1052,6 @@ xenParseXLNamespaceData(virConf *conf, virDomainDef *def) nsdata->args[n++] = g_strdup(next->str); } - - return 0; } virDomainDef * @@ -1104,8 +1102,7 @@ xenParseXL(virConf *conf, if (xenParseXLChannel(conf, def) < 0) return NULL; - if (xenParseXLNamespaceData(conf, def) < 0) - return NULL; + xenParseXLNamespaceData(conf, def); if (virDomainDefPostParse(def, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, xmlopt, NULL) < 0) -- 2.34.1
virNetClientAddProgram() returns nothing except 0. Changing return type to void. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Dmitry Frolov <frolov@swemel.ru> --- src/admin/admin_remote.c | 3 +-- src/locking/lock_driver_lockd.c | 3 +-- src/logging/log_manager.c | 3 +-- src/lxc/lxc_monitor.c | 5 ++--- src/remote/remote_driver.c | 7 +++---- src/rpc/virnetclient.c | 3 +-- src/rpc/virnetclient.h | 2 +- 7 files changed, 10 insertions(+), 16 deletions(-) diff --git a/src/admin/admin_remote.c b/src/admin/admin_remote.c index 3291a1e965..5c4913a76e 100644 --- a/src/admin/admin_remote.c +++ b/src/admin/admin_remote.c @@ -214,8 +214,7 @@ remoteAdminPrivNew(const char *sock_path) NULL, 0, NULL))) goto error; - if (virNetClientAddProgram(priv->client, priv->program) < 0) - goto error; + virNetClientAddProgram(priv->client, priv->program); return priv; error: diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lockd.c index d75302dd0a..0b6c720477 100644 --- a/src/locking/lock_driver_lockd.c +++ b/src/locking/lock_driver_lockd.c @@ -213,8 +213,7 @@ static virNetClient *virLockManagerLockDaemonConnectionNew(bool privileged, NULL))) goto error; - if (virNetClientAddProgram(client, *prog) < 0) - goto error; + virNetClientAddProgram(client, *prog); return client; diff --git a/src/logging/log_manager.c b/src/logging/log_manager.c index d8490f4e5a..19e23d65c5 100644 --- a/src/logging/log_manager.c +++ b/src/logging/log_manager.c @@ -88,8 +88,7 @@ virLogManagerConnect(bool privileged, NULL))) goto error; - if (virNetClientAddProgram(client, *prog) < 0) - goto error; + virNetClientAddProgram(client, *prog); VIR_FREE(daemonPath); VIR_FREE(logdpath); diff --git a/src/lxc/lxc_monitor.c b/src/lxc/lxc_monitor.c index 811d6685e5..d27e0fab3e 100644 --- a/src/lxc/lxc_monitor.c +++ b/src/lxc/lxc_monitor.c @@ -169,9 +169,8 @@ virLXCMonitor *virLXCMonitorNew(virDomainObj *vm, mon))) goto error; - if (virNetClientAddProgram(mon->client, - mon->program) < 0) - goto error; + virNetClientAddProgram(mon->client, + mon->program); mon->vm = virObjectRef(vm); memcpy(&mon->cb, cb, sizeof(mon->cb)); diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 392377deae..1ed0e54eda 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -1160,10 +1160,9 @@ doRemoteOpen(virConnectPtr conn, conn))) goto error; - if (virNetClientAddProgram(priv->client, priv->remoteProgram) < 0 || - virNetClientAddProgram(priv->client, priv->lxcProgram) < 0 || - virNetClientAddProgram(priv->client, priv->qemuProgram) < 0) - goto error; + virNetClientAddProgram(priv->client, priv->remoteProgram); + virNetClientAddProgram(priv->client, priv->lxcProgram); + virNetClientAddProgram(priv->client, priv->qemuProgram); /* Try and authenticate with server */ VIR_DEBUG("Trying authentication"); diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 68098b1c8d..caa4960a0b 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -1053,7 +1053,7 @@ bool virNetClientIsOpen(virNetClient *client) } -int virNetClientAddProgram(virNetClient *client, +void virNetClientAddProgram(virNetClient *client, virNetClientProgram *prog) { virObjectLock(client); @@ -1062,7 +1062,6 @@ int virNetClientAddProgram(virNetClient *client, client->programs[client->nprograms-1] = virObjectRef(prog); virObjectUnlock(client); - return 0; } diff --git a/src/rpc/virnetclient.h b/src/rpc/virnetclient.h index 1647a6cc71..7726b57ef4 100644 --- a/src/rpc/virnetclient.h +++ b/src/rpc/virnetclient.h @@ -117,7 +117,7 @@ int virNetClientDupFD(virNetClient *client, bool cloexec); bool virNetClientHasPassFD(virNetClient *client); -int virNetClientAddProgram(virNetClient *client, +void virNetClientAddProgram(virNetClient *client, virNetClientProgram *prog); int virNetClientAddStream(virNetClient *client, -- 2.34.1
vboxDumpDisplay() returns nothing except 0. Changing return type to void. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Dmitry Frolov <frolov@swemel.ru> --- src/vbox/vbox_common.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 59e7a91081..305c85f4ec 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -3538,7 +3538,7 @@ vboxDumpVideo(virDomainDef *def, struct _vboxDriver *data G_GNUC_UNUSED, return 0; } -static int +static void vboxDumpDisplay(virDomainDef *def, struct _vboxDriver *data, IMachine *machine) { /* dump display options vrdp/gui/sdl */ @@ -3641,7 +3641,6 @@ vboxDumpDisplay(virDomainDef *def, struct _vboxDriver *data, IMachine *machine) VBOX_UTF8_FREE(valueTypeUtf8); VBOX_UTF8_FREE(netAddressUtf8); virDomainGraphicsDefFree(graphics); - return 0; } static int @@ -4157,8 +4156,7 @@ static char *vboxDomainGetXMLDesc(virDomainPtr dom, unsigned int flags) if (vboxDumpVideo(def, data, machine) < 0) goto cleanup; - if (vboxDumpDisplay(def, data, machine) < 0) - goto cleanup; + vboxDumpDisplay(def, data, machine); if (vboxDumpStorageControllers(def, machine) < 0) goto cleanup; if (vboxDumpDisks(def, data, machine) < 0) -- 2.34.1
libxlMakeDomainDeviceHostdevCaps() returns nothing except 0. Changing return type to void. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Dmitry Frolov <frolov@swemel.ru> --- src/libxl/libxl_capabilities.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index 2b0652b483..159d923fc3 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -585,7 +585,7 @@ libxlMakeDomainDeviceVideoCaps(virDomainCapsDeviceVideo *dev) return 0; } -static int +static void libxlMakeDomainDeviceHostdevCaps(virDomainCapsDeviceHostdev *dev) { dev->supported = VIR_TRISTATE_BOOL_YES; @@ -616,7 +616,6 @@ libxlMakeDomainDeviceHostdevCaps(virDomainCapsDeviceHostdev *dev) virDomainCapsEnumClear(&dev->pciBackend); VIR_DOMAIN_CAPS_ENUM_SET(dev->pciBackend, VIR_DEVICE_HOSTDEV_PCI_DRIVER_NAME_XEN); - return 0; } virCaps * @@ -674,9 +673,8 @@ libxlMakeDomainCapabilities(virDomainCaps *domCaps, libxlMakeDomainDeviceGraphicsCaps(graphics); libxlMakeDomainDeviceVideoCaps(video); - if (STRNEQ(domCaps->machine, "xenpvh") && - libxlMakeDomainDeviceHostdevCaps(hostdev) < 0) - return -1; + if (STRNEQ(domCaps->machine, "xenpvh")) + libxlMakeDomainDeviceHostdevCaps(hostdev); domCaps->features[VIR_DOMAIN_CAPS_FEATURE_IOTHREADS] = VIR_TRISTATE_BOOL_NO; domCaps->features[VIR_DOMAIN_CAPS_FEATURE_VMCOREINFO] = VIR_TRISTATE_BOOL_NO; -- 2.34.1
libxlMakeDomainCapabilities() returns nothing except 0. Changing return type to void. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Dmitry Frolov <frolov@swemel.ru> --- src/libxl/libxl_capabilities.c | 4 +--- src/libxl/libxl_capabilities.h | 2 +- src/libxl/libxl_driver.c | 5 ++--- tests/domaincapstest.c | 3 +-- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index 159d923fc3..e6ed9ef29f 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -652,7 +652,7 @@ libxlMakeCapabilities(libxl_ctx *ctx) #define HVM_MAX_VCPUS 128 #define PV_MAX_VCPUS 512 -int +void libxlMakeDomainCapabilities(virDomainCaps *domCaps, virFirmware **firmwares, size_t nfirmwares) @@ -680,8 +680,6 @@ libxlMakeDomainCapabilities(virDomainCaps *domCaps, domCaps->features[VIR_DOMAIN_CAPS_FEATURE_VMCOREINFO] = VIR_TRISTATE_BOOL_NO; domCaps->features[VIR_DOMAIN_CAPS_FEATURE_GENID] = VIR_TRISTATE_BOOL_NO; domCaps->gic.supported = VIR_TRISTATE_BOOL_NO; - - return 0; } #define LIBXL_QEMU_DM_STR "Options specific to the Xen version:" diff --git a/src/libxl/libxl_capabilities.h b/src/libxl/libxl_capabilities.h index fd6332b63e..16ac3ed034 100644 --- a/src/libxl/libxl_capabilities.h +++ b/src/libxl/libxl_capabilities.h @@ -40,7 +40,7 @@ virCaps * libxlMakeCapabilities(libxl_ctx *ctx); -int +void libxlMakeDomainCapabilities(virDomainCaps *domCaps, virFirmware **firmwares, size_t nfirmwares); diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 68aecaef8c..658d7d4005 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -6416,9 +6416,8 @@ libxlConnectGetDomainCapabilities(virConnectPtr conn, if (!(domCaps = virDomainCapsNew(emulatorbin, machine, arch, virttype))) goto cleanup; - if (libxlMakeDomainCapabilities(domCaps, cfg->firmwares, - cfg->nfirmwares) < 0) - goto cleanup; + libxlMakeDomainCapabilities(domCaps, cfg->firmwares, + cfg->nfirmwares); ret = virDomainCapsFormat(domCaps); diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index 97b306f652..ceeaf08b9f 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -143,8 +143,7 @@ fillXenCaps(virDomainCaps *domCaps) firmwares[0]->name = g_strdup("/usr/lib/xen/boot/hvmloader"); firmwares[1]->name = g_strdup("/usr/lib/xen/boot/ovmf.bin"); - if (libxlMakeDomainCapabilities(domCaps, firmwares, 2) < 0) - return -1; + libxlMakeDomainCapabilities(domCaps, firmwares, 2); return 0; } -- 2.34.1
participants (4)
-
Dmitry Frolov -
frolov＠swemel.ru
-
Jonathon Jongsma -
Michal Prívozník