9:02 a.m.
Found by cppcheck.
Ján Tomko (4):
conf: domain: remove unreachable break
qemu: command: join two adjacent conditions
ch: pinVcpuLive: remove unused variable
conf: storage: remove redundant condition
src/ch/ch_driver.c | 5 -----
src/conf/domain_conf.c | 1 -
src/conf/storage_conf.c | 22 +++++++++-------------
src/qemu/qemu_command.c | 2 --
4 files changed, 9 insertions(+), 21 deletions(-)
--
2.39.2
9:02 a.m.
New subject: [libvirt PATCH 1/4] conf: domain: remove unreachable break
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/conf/domain_conf.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 5c0b837697..cda50e56d0 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -30064,7 +30064,6 @@ virDomainNetResolveActualType(virDomainNetDef *iface)
* is VIR_DOMAIN_NET_TYPE_BRIDGE
*/
return VIR_DOMAIN_NET_TYPE_BRIDGE;
- break;
}
/* intentionally fall through to the direct case for
--
2.39.2
9:02 a.m.
New subject: [libvirt PATCH 2/4] qemu: command: join two adjacent conditions
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/qemu/qemu_command.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 4ca93bf3dc..0afb038954 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -8482,9 +8482,7 @@ qemuBuildInterfaceConnect(virDomainObj *vm,
vm->def, tapfd[i]) < 0)
return -1;
}
- }
- if (vhostfd) {
if (qemuInterfaceOpenVhostNet(vm, net) < 0)
return -1;
}
--
2.39.2
9:02 a.m.
New subject: [libvirt PATCH 3/4] ch: pinVcpuLive: remove unused variable
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/ch/ch_driver.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/src/ch/ch_driver.c b/src/ch/ch_driver.c
index 72fe3198b2..45cdbfd37c 100644
--- a/src/ch/ch_driver.c
+++ b/src/ch/ch_driver.c
@@ -1148,8 +1148,6 @@ chDomainPinVcpuLive(virDomainObj *vm,
virDomainVcpuDef *vcpuinfo;
virCHDomainObjPrivate *priv = vm->privateData;
- g_autofree char *str = NULL;
-
if (!virCHDomainHasVcpuPids(vm)) {
virReportError(VIR_ERR_OPERATION_INVALID,
"%s", _("cpu affinity is not supported"));
@@ -1166,9 +1164,6 @@ chDomainPinVcpuLive(virDomainObj *vm,
if (!(tmpmap = virBitmapNewCopy(cpumap)))
return -1;
- if (!(str = virBitmapFormat(cpumap)))
- return -1;
-
if (vcpuinfo->online) {
/* Configure the corresponding cpuset cgroup before set affinity. */
if (virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_CPUSET)) {
--
2.39.2
9:02 a.m.
New subject: [libvirt PATCH 4/4] conf: storage: remove redundant condition
We exit early if poolOptions->formatToString is false.
Fixes: 9dadc7302920f9fca0057c655d03c2b0206b9a70
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/conf/storage_conf.c | 22 +++++++++-------------
1 file changed, 9 insertions(+), 13 deletions(-)
diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
index 3e584ad9b9..68842004b7 100644
--- a/src/conf/storage_conf.c
+++ b/src/conf/storage_conf.c
@@ -364,6 +364,7 @@ virStoragePoolOptionsFormatPool(virBuffer *buf,
int type)
{
virStoragePoolOptions *poolOptions;
+ size_t i;
if (!(poolOptions = virStoragePoolOptionsForPoolType(type)))
return -1;
@@ -374,22 +375,17 @@ virStoragePoolOptionsFormatPool(virBuffer *buf,
virBufferAddLit(buf, "<poolOptions>\n");
virBufferAdjustIndent(buf, 2);
- if (poolOptions->formatToString) {
- size_t i;
+ virBufferAsprintf(buf, "<defaultFormat type='%s'/>\n",
+ (poolOptions->formatToString)(poolOptions->defaultFormat));
- virBufferAsprintf(buf, "<defaultFormat type='%s'/>\n",
-
(poolOptions->formatToString)(poolOptions->defaultFormat));
+ virBufferAddLit(buf, "<enum name='sourceFormatType'>\n");
+ virBufferAdjustIndent(buf, 2);
- virBufferAddLit(buf, "<enum
name='sourceFormatType'>\n");
- virBufferAdjustIndent(buf, 2);
+ for (i = 0; i < poolOptions->lastFormat; i++)
+ virBufferAsprintf(buf, "<value>%s</value>\n",
(poolOptions->formatToString)(i));
- for (i = 0; i < poolOptions->lastFormat; i++)
- virBufferAsprintf(buf, "<value>%s</value>\n",
- (poolOptions->formatToString)(i));
-
- virBufferAdjustIndent(buf, -2);
- virBufferAddLit(buf, "</enum>\n");
- }
+ virBufferAdjustIndent(buf, -2);
+ virBufferAddLit(buf, "</enum>\n");
virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</poolOptions>\n");
--
2.39.2
9:08 a.m.
On Thu, Apr 20, 2023 at 04:02:12PM +0200, Ján Tomko wrote:
Found by cppcheck.
Ján Tomko (4):
conf: domain: remove unreachable break
qemu: command: join two adjacent conditions
ch: pinVcpuLive: remove unused variable
conf: storage: remove redundant condition
Reviewed-by: Pavel Hrdina <phrdina(a)redhat.com>
612
days inactive
612
days old
5 comments
2 participants
participants (2)
-
Ján Tomko -
Pavel Hrdina