[libvirt PATCH 00/10] Unused cleanups
Patches 4-9/10 all depend on patch 3/10 10/10 can be pushed independently Ján Tomko (10): qemu: seccomp sandbox: remove incorect G_GNUC_UNUSED marker qemu: validate: fs: remove unneeded parameter qemu: remove qemuCaps from qemuBuildObjectCommandlineFromJSON qemu: remove qemuCaps from qemuBuildObjectSecretCommandLine qemu: remove qemuCaps from qemuBuildTLSx509CommandLine qemu: remove qemuCaps from qemuBuildObjectCommandline qemu: remove qemuCaps from qemuBuildIOThreadCommandLine qemu: remove unused vm from qemuBuildSEVSNPCommandLine qemu: remove unused vm from qemuBuildPVCommandLine Remove unreachable breaks right after return src/qemu/qemu_cgroup.c | 2 - src/qemu/qemu_command.c | 110 +++++++++++++------------------ src/qemu/qemu_driver.c | 1 - src/qemu/qemu_hotplug.c | 1 - src/qemu/qemu_monitor_json.c | 1 - src/qemu/qemu_validate.c | 3 +- src/security/security_apparmor.c | 1 - src/vmx/vmx.c | 2 - tools/virsh-domain.c | 1 - tools/virsh-host.c | 2 - tools/vsh.c | 7 -- 11 files changed, 48 insertions(+), 83 deletions(-) -- 2.48.1
qemuCaps is obviously used. Signed-off-by: Ján Tomko <jtomko@redhat.com> --- src/qemu/qemu_command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 51e428e017..e2e19743d8 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -10075,7 +10075,7 @@ qemuBuildCommandLineValidate(virQEMUDriver *driver, static int qemuBuildSeccompSandboxCommandLine(virCommand *cmd, virQEMUDriverConfig *cfg, - virQEMUCaps *qemuCaps G_GNUC_UNUSED) + virQEMUCaps *qemuCaps) { if (cfg->seccompSandbox == 0) { if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SECCOMP_SANDBOX)) -- 2.48.1
No longer required since we don't require driver->privileged anymore. Signed-off-by: Ján Tomko <jtomko@redhat.com> --- src/qemu/qemu_validate.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 4ef944addb..af334aa96a 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -4578,7 +4578,6 @@ qemuValidateDomainDeviceDefGraphics(const virDomainGraphicsDef *graphics, static int qemuValidateDomainDeviceDefFS(virDomainFSDef *fs, const virDomainDef *def, - virQEMUDriver *driver G_GNUC_UNUSED, virQEMUCaps *qemuCaps) { if (fs->type != VIR_DOMAIN_FS_TYPE_MOUNT) { @@ -5544,7 +5543,7 @@ qemuValidateDomainDeviceDef(const virDomainDeviceDef *dev, return qemuValidateDomainDeviceDefIOMMU(dev->data.iommu, def, qemuCaps); case VIR_DOMAIN_DEVICE_FS: - return qemuValidateDomainDeviceDefFS(dev->data.fs, def, driver, qemuCaps); + return qemuValidateDomainDeviceDefFS(dev->data.fs, def, qemuCaps); case VIR_DOMAIN_DEVICE_NVRAM: return qemuValidateDomainDeviceDefNVRAM(dev->data.nvram, def, qemuCaps); -- 2.48.1
Signed-off-by: Ján Tomko <jtomko@redhat.com> --- src/qemu/qemu_command.c | 65 ++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 36 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index e2e19743d8..ae187dac78 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -184,8 +184,7 @@ qemuOnOffAuto(virTristateSwitch s) static int qemuBuildObjectCommandlineFromJSON(virCommand *cmd, - virJSONValue *props, - virQEMUCaps *qemuCaps G_GNUC_UNUSED) + virJSONValue *props) { g_autofree char *arg = NULL; @@ -324,7 +323,7 @@ qemuBuildMasterKeyCommandLine(virCommand *cmd, NULL) < 0) return -1; - if (qemuBuildObjectCommandlineFromJSON(cmd, props, priv->qemuCaps) < 0) + if (qemuBuildObjectCommandlineFromJSON(cmd, props) < 0) return -1; return 0; @@ -1222,14 +1221,14 @@ qemuBuildSecretInfoProps(qemuDomainSecretInfo *secinfo, static int qemuBuildObjectSecretCommandLine(virCommand *cmd, qemuDomainSecretInfo *secinfo, - virQEMUCaps *qemuCaps) + virQEMUCaps *qemuCaps G_GNUC_UNUSED) { g_autoptr(virJSONValue) props = NULL; if (qemuBuildSecretInfoProps(secinfo, &props) < 0) return -1; - if (qemuBuildObjectCommandlineFromJSON(cmd, props, qemuCaps) < 0) + if (qemuBuildObjectCommandlineFromJSON(cmd, props) < 0) return -1; return 0; @@ -1289,7 +1288,7 @@ qemuBuildTLSx509CommandLine(virCommand *cmd, bool verifypeer, const char *certEncSecretAlias, const char *alias, - virQEMUCaps *qemuCaps) + virQEMUCaps *qemuCaps G_GNUC_UNUSED) { g_autoptr(virJSONValue) props = NULL; @@ -1297,7 +1296,7 @@ qemuBuildTLSx509CommandLine(virCommand *cmd, certEncSecretAlias, &props) < 0) return -1; - if (qemuBuildObjectCommandlineFromJSON(cmd, props, qemuCaps) < 0) + if (qemuBuildObjectCommandlineFromJSON(cmd, props) < 0) return -1; return 0; @@ -1969,12 +1968,12 @@ qemuBuildFloppyCommandLineControllerOptions(virCommand *cmd, static int qemuBuildObjectCommandline(virCommand *cmd, virJSONValue *objProps, - virQEMUCaps *qemuCaps) + virQEMUCaps *qemuCaps G_GNUC_UNUSED) { if (!objProps) return 0; - if (qemuBuildObjectCommandlineFromJSON(cmd, objProps, qemuCaps) < 0) + if (qemuBuildObjectCommandlineFromJSON(cmd, objProps) < 0) return -1; return 0; @@ -3442,11 +3441,10 @@ qemuBuildMemoryDimmBackendStr(virCommand *cmd, return -1; if (tcProps && - qemuBuildObjectCommandlineFromJSON(cmd, tcProps, - priv->qemuCaps) < 0) + qemuBuildObjectCommandlineFromJSON(cmd, tcProps) < 0) return -1; - if (qemuBuildObjectCommandlineFromJSON(cmd, props, priv->qemuCaps) < 0) + if (qemuBuildObjectCommandlineFromJSON(cmd, props) < 0) return -1; return 0; @@ -4247,7 +4245,7 @@ qemuBuildInputCommandLine(virCommand *cmd, if (!(props = qemuBuildInputEvdevProps(input))) return -1; - if (qemuBuildObjectCommandlineFromJSON(cmd, props, qemuCaps) < 0) + if (qemuBuildObjectCommandlineFromJSON(cmd, props) < 0) return -1; } else { g_autoptr(virJSONValue) props = NULL; @@ -5371,7 +5369,7 @@ qemuBuildRNGCommandLine(virCommand *cmd, if (qemuBuildRNGBackendProps(rng, &props) < 0) return -1; - if (qemuBuildObjectCommandlineFromJSON(cmd, props, qemuCaps) < 0) + if (qemuBuildObjectCommandlineFromJSON(cmd, props) < 0) return -1; /* add the device */ @@ -7230,11 +7228,10 @@ qemuBuildMemCommandLineMemoryDefaultBackend(virCommand *cmd, return -1; if (tcProps && - qemuBuildObjectCommandlineFromJSON(cmd, tcProps, - priv->qemuCaps) < 0) + qemuBuildObjectCommandlineFromJSON(cmd, tcProps) < 0) return -1; - if (qemuBuildObjectCommandlineFromJSON(cmd, props, priv->qemuCaps) < 0) + if (qemuBuildObjectCommandlineFromJSON(cmd, props) < 0) return -1; return 0; @@ -7304,7 +7301,7 @@ qemuBuildMemCommandLine(virCommand *cmd, static int qemuBuildIOThreadCommandLine(virCommand *cmd, const virDomainDef *def, - virQEMUCaps *qemuCaps) + virQEMUCaps *qemuCaps G_GNUC_UNUSED) { size_t i; @@ -7339,7 +7336,7 @@ qemuBuildIOThreadCommandLine(virCommand *cmd, NULL) < 0) return -1; - if (qemuBuildObjectCommandlineFromJSON(cmd, props, qemuCaps) < 0) + if (qemuBuildObjectCommandlineFromJSON(cmd, props) < 0) return -1; } @@ -7352,7 +7349,7 @@ qemuBuildIOThreadCommandLine(virCommand *cmd, NULL) < 0) return -1; - if (qemuBuildObjectCommandlineFromJSON(cmd, props, qemuCaps) < 0) + if (qemuBuildObjectCommandlineFromJSON(cmd, props) < 0) return -1; } @@ -7584,12 +7581,10 @@ qemuBuildNumaCommandLine(virQEMUDriverConfig *cfg, goto cleanup; if (tcProps && - qemuBuildObjectCommandlineFromJSON(cmd, tcProps, - priv->qemuCaps) < 0) + qemuBuildObjectCommandlineFromJSON(cmd, tcProps) < 0) goto cleanup; - if (qemuBuildObjectCommandlineFromJSON(cmd, nodeBackends[i], - priv->qemuCaps) < 0) + if (qemuBuildObjectCommandlineFromJSON(cmd, nodeBackends[i]) < 0) goto cleanup; } @@ -9027,7 +9022,7 @@ qemuBuildShmemCommandLine(virCommand *cmd, if (!(memProps = qemuBuildShmemBackendMemProps(shmem))) return -1; - if (qemuBuildObjectCommandlineFromJSON(cmd, memProps, qemuCaps) < 0) + if (qemuBuildObjectCommandlineFromJSON(cmd, memProps) < 0) return -1; G_GNUC_FALLTHROUGH; @@ -9648,7 +9643,7 @@ qemuBuildSEVCommandLine(virDomainObj *vm, virCommand *cmd, NULL) < 0) return -1; - if (qemuBuildObjectCommandlineFromJSON(cmd, props, priv->qemuCaps) < 0) + if (qemuBuildObjectCommandlineFromJSON(cmd, props) < 0) return -1; return 0; @@ -9656,12 +9651,11 @@ qemuBuildSEVCommandLine(virDomainObj *vm, virCommand *cmd, static int -qemuBuildSEVSNPCommandLine(virDomainObj *vm, +qemuBuildSEVSNPCommandLine(virDomainObj *vm G_GNUC_UNUSED, virCommand *cmd, virDomainSEVSNPDef *def) { g_autoptr(virJSONValue) props = NULL; - qemuDomainObjPrivate *priv = vm->privateData; virTristateBool vcek_disabled = VIR_TRISTATE_BOOL_ABSENT; VIR_DEBUG("policy=0x%llx cbitpos=%d reduced_phys_bits=%d", @@ -9688,7 +9682,7 @@ qemuBuildSEVSNPCommandLine(virDomainObj *vm, NULL) < 0) return -1; - if (qemuBuildObjectCommandlineFromJSON(cmd, props, priv->qemuCaps) < 0) + if (qemuBuildObjectCommandlineFromJSON(cmd, props) < 0) return -1; return 0; @@ -9696,16 +9690,15 @@ qemuBuildSEVSNPCommandLine(virDomainObj *vm, static int -qemuBuildPVCommandLine(virDomainObj *vm, virCommand *cmd) +qemuBuildPVCommandLine(virDomainObj *vm G_GNUC_UNUSED, virCommand *cmd) { g_autoptr(virJSONValue) props = NULL; - qemuDomainObjPrivate *priv = vm->privateData; if (qemuMonitorCreateObjectProps(&props, "s390-pv-guest", "lsec0", NULL) < 0) return -1; - if (qemuBuildObjectCommandlineFromJSON(cmd, props, priv->qemuCaps) < 0) + if (qemuBuildObjectCommandlineFromJSON(cmd, props) < 0) return -1; return 0; @@ -9884,7 +9877,7 @@ qemuBuildManagedPRCommandLine(virCommand *cmd, if (!(props = qemuBuildPRManagedManagerInfoProps(priv))) return -1; - if (qemuBuildObjectCommandlineFromJSON(cmd, props, priv->qemuCaps) < 0) + if (qemuBuildObjectCommandlineFromJSON(cmd, props) < 0) return -1; return 0; @@ -9971,7 +9964,7 @@ qemuBuildDBusVMStateCommandLine(virCommand *cmd, if (!(props = qemuBuildDBusVMStateInfoProps(driver, vm))) return -1; - if (qemuBuildObjectCommandlineFromJSON(cmd, props, priv->qemuCaps) < 0) + if (qemuBuildObjectCommandlineFromJSON(cmd, props) < 0) return -1; priv->dbusVMState = true; @@ -10221,7 +10214,7 @@ qemuBuildCryptoCommandLine(virCommand *cmd, if (qemuBuildCryptoBackendProps(crypto, &props) < 0) return -1; - if (qemuBuildObjectCommandlineFromJSON(cmd, props, qemuCaps) < 0) + if (qemuBuildObjectCommandlineFromJSON(cmd, props) < 0) return -1; /* add the device */ @@ -10278,7 +10271,7 @@ qemuBuildPstoreCommandLine(virCommand *cmd, if (qemuBuildDeviceAddressProps(devProps, def, &pstore->info) < 0) return -1; - if (qemuBuildObjectCommandlineFromJSON(cmd, memProps, qemuCaps) < 0 || + if (qemuBuildObjectCommandlineFromJSON(cmd, memProps) < 0 || qemuBuildDeviceCommandlineFromJSON(cmd, devProps, def, qemuCaps) < 0) return -1; -- 2.48.1
Signed-off-by: Ján Tomko <jtomko@redhat.com> --- src/qemu/qemu_command.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ae187dac78..4f0a9a517c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1220,8 +1220,7 @@ qemuBuildSecretInfoProps(qemuDomainSecretInfo *secinfo, */ static int qemuBuildObjectSecretCommandLine(virCommand *cmd, - qemuDomainSecretInfo *secinfo, - virQEMUCaps *qemuCaps G_GNUC_UNUSED) + qemuDomainSecretInfo *secinfo) { g_autoptr(virJSONValue) props = NULL; @@ -1323,8 +1322,7 @@ qemuBuildChardevCommand(virCommand *cmd, * functions can just check the config fields */ if (chrSourcePriv->secinfo) { if (qemuBuildObjectSecretCommandLine(cmd, - chrSourcePriv->secinfo, - qemuCaps) < 0) + chrSourcePriv->secinfo) < 0) return -1; tlsCertEncSecAlias = chrSourcePriv->secinfo->alias; @@ -8099,8 +8097,7 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfig *cfg, if (gfxPriv->secinfo) { if (qemuBuildObjectSecretCommandLine(cmd, - gfxPriv->secinfo, - qemuCaps) < 0) + gfxPriv->secinfo) < 0) return -1; secretAlias = gfxPriv->secinfo->alias; } -- 2.48.1
On Thu, Mar 13, 2025 at 16:30:18 +0100, Ján Tomko wrote:
Signed-off-by: Ján Tomko <jtomko@redhat.com> --- src/qemu/qemu_command.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ae187dac78..4f0a9a517c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1220,8 +1220,7 @@ qemuBuildSecretInfoProps(qemuDomainSecretInfo *secinfo, */
'qemuCaps' is documented in the funcion comment above this block.
Also from qemuBuildGraphicsVNCCommandLine Signed-off-by: Ján Tomko <jtomko@redhat.com> --- src/qemu/qemu_command.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 4f0a9a517c..ef1ba9269c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1286,8 +1286,7 @@ qemuBuildTLSx509CommandLine(virCommand *cmd, bool isListen, bool verifypeer, const char *certEncSecretAlias, - const char *alias, - virQEMUCaps *qemuCaps G_GNUC_UNUSED) + const char *alias) { g_autoptr(virJSONValue) props = NULL; @@ -1335,7 +1334,7 @@ qemuBuildChardevCommand(virCommand *cmd, dev->data.tcp.listen, chrSourcePriv->tlsVerify, tlsCertEncSecAlias, - objalias, qemuCaps) < 0) { + objalias) < 0) { return -1; } @@ -8026,7 +8025,6 @@ static int qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfig *cfg, const virDomainDef *def, virCommand *cmd, - virQEMUCaps *qemuCaps, virDomainGraphicsDef *graphics) { g_autofree char *audioid = qemuGetAudioIDString(def, graphics->data.vnc.audioId); @@ -8107,8 +8105,7 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfig *cfg, true, cfg->vncTLSx509verify, secretAlias, - gfxPriv->tlsAlias, - qemuCaps) < 0) + gfxPriv->tlsAlias) < 0) return -1; virBufferAsprintf(&opt, ",tls-creds=%s", gfxPriv->tlsAlias); @@ -8417,7 +8414,7 @@ qemuBuildGraphicsCommandLine(virQEMUDriverConfig *cfg, break; case VIR_DOMAIN_GRAPHICS_TYPE_VNC: if (qemuBuildGraphicsVNCCommandLine(cfg, def, cmd, - qemuCaps, graphics) < 0) + graphics) < 0) return -1; break; -- 2.48.1
On Thu, Mar 13, 2025 at 16:30:19 +0100, Ján Tomko wrote:
Also from qemuBuildGraphicsVNCCommandLine
Signed-off-by: Ján Tomko <jtomko@redhat.com> --- src/qemu/qemu_command.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 4f0a9a517c..ef1ba9269c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1286,8 +1286,7 @@ qemuBuildTLSx509CommandLine(virCommand *cmd,
'qemuCaps' is documented above.
bool isListen, bool verifypeer, const char *certEncSecretAlias, - const char *alias, - virQEMUCaps *qemuCaps G_GNUC_UNUSED) + const char *alias) { g_autoptr(virJSONValue) props = NULL;
Signed-off-by: Ján Tomko <jtomko@redhat.com> --- src/qemu/qemu_command.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ef1ba9269c..4b178cac71 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1964,8 +1964,7 @@ qemuBuildFloppyCommandLineControllerOptions(virCommand *cmd, static int qemuBuildObjectCommandline(virCommand *cmd, - virJSONValue *objProps, - virQEMUCaps *qemuCaps G_GNUC_UNUSED) + virJSONValue *objProps) { if (!objProps) return 0; @@ -1985,15 +1984,15 @@ qemuBuildBlockStorageSourceAttachDataCommandline(virCommand *cmd, char *tmp; size_t i; - if (qemuBuildObjectCommandline(cmd, data->prmgrProps, qemuCaps) < 0 || - qemuBuildObjectCommandline(cmd, data->authsecretProps, qemuCaps) < 0 || - qemuBuildObjectCommandline(cmd, data->httpcookiesecretProps, qemuCaps) < 0 || - qemuBuildObjectCommandline(cmd, data->tlsKeySecretProps, qemuCaps) < 0 || - qemuBuildObjectCommandline(cmd, data->tlsProps, qemuCaps) < 0) + if (qemuBuildObjectCommandline(cmd, data->prmgrProps) < 0 || + qemuBuildObjectCommandline(cmd, data->authsecretProps) < 0 || + qemuBuildObjectCommandline(cmd, data->httpcookiesecretProps) < 0 || + qemuBuildObjectCommandline(cmd, data->tlsKeySecretProps) < 0 || + qemuBuildObjectCommandline(cmd, data->tlsProps) < 0) return -1; for (i = 0; i < data->encryptsecretCount; ++i) { - if (qemuBuildObjectCommandline(cmd, data->encryptsecretProps[i], qemuCaps) < 0) { + if (qemuBuildObjectCommandline(cmd, data->encryptsecretProps[i]) < 0) { return -1; } } -- 2.48.1
Signed-off-by: Ján Tomko <jtomko@redhat.com> --- src/qemu/qemu_command.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 4b178cac71..456df9ae0e 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7296,8 +7296,7 @@ qemuBuildMemCommandLine(virCommand *cmd, static int qemuBuildIOThreadCommandLine(virCommand *cmd, - const virDomainDef *def, - virQEMUCaps *qemuCaps G_GNUC_UNUSED) + const virDomainDef *def) { size_t i; @@ -10454,7 +10453,7 @@ qemuBuildCommandLine(virDomainObj *vm, if (qemuBuildSmpCommandLine(cmd, def, qemuCaps) < 0) return NULL; - if (qemuBuildIOThreadCommandLine(cmd, def, qemuCaps) < 0) + if (qemuBuildIOThreadCommandLine(cmd, def) < 0) return NULL; if (virDomainNumaGetNodeCount(def->numa) && -- 2.48.1
Signed-off-by: Ján Tomko <jtomko@redhat.com> --- src/qemu/qemu_command.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 456df9ae0e..0b618e5c88 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9643,8 +9643,7 @@ qemuBuildSEVCommandLine(virDomainObj *vm, virCommand *cmd, static int -qemuBuildSEVSNPCommandLine(virDomainObj *vm G_GNUC_UNUSED, - virCommand *cmd, +qemuBuildSEVSNPCommandLine(virCommand *cmd, virDomainSEVSNPDef *def) { g_autoptr(virJSONValue) props = NULL; @@ -9709,7 +9708,7 @@ qemuBuildSecCommandLine(virDomainObj *vm, virCommand *cmd, return qemuBuildSEVCommandLine(vm, cmd, &sec->data.sev); break; case VIR_DOMAIN_LAUNCH_SECURITY_SEV_SNP: - return qemuBuildSEVSNPCommandLine(vm, cmd, &sec->data.sev_snp); + return qemuBuildSEVSNPCommandLine(cmd, &sec->data.sev_snp); break; case VIR_DOMAIN_LAUNCH_SECURITY_PV: return qemuBuildPVCommandLine(vm, cmd); -- 2.48.1
Signed-off-by: Ján Tomko <jtomko@redhat.com> --- src/qemu/qemu_command.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 0b618e5c88..92560d381f 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9681,7 +9681,7 @@ qemuBuildSEVSNPCommandLine(virCommand *cmd, static int -qemuBuildPVCommandLine(virDomainObj *vm G_GNUC_UNUSED, virCommand *cmd) +qemuBuildPVCommandLine(virCommand *cmd) { g_autoptr(virJSONValue) props = NULL; @@ -9711,7 +9711,7 @@ qemuBuildSecCommandLine(virDomainObj *vm, virCommand *cmd, return qemuBuildSEVSNPCommandLine(cmd, &sec->data.sev_snp); break; case VIR_DOMAIN_LAUNCH_SECURITY_PV: - return qemuBuildPVCommandLine(vm, cmd); + return qemuBuildPVCommandLine(cmd); break; case VIR_DOMAIN_LAUNCH_SECURITY_NONE: case VIR_DOMAIN_LAUNCH_SECURITY_LAST: -- 2.48.1
Signed-off-by: Ján Tomko <jtomko@redhat.com> --- src/qemu/qemu_cgroup.c | 2 -- src/qemu/qemu_command.c | 6 +++--- src/qemu/qemu_driver.c | 1 - src/qemu/qemu_hotplug.c | 1 - src/qemu/qemu_monitor_json.c | 1 - src/security/security_apparmor.c | 1 - src/vmx/vmx.c | 2 -- tools/virsh-domain.c | 1 - tools/virsh-host.c | 2 -- tools/vsh.c | 7 ------- 10 files changed, 3 insertions(+), 21 deletions(-) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index f3c85d65e8..48af467bf9 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -436,7 +436,6 @@ qemuSetupInputCgroup(virDomainObj *vm, case VIR_DOMAIN_INPUT_TYPE_EVDEV: return qemuCgroupAllowDevicePath(vm, dev->source.evdev, VIR_CGROUP_DEVICE_RW, false); - break; } return ret; @@ -457,7 +456,6 @@ qemuTeardownInputCgroup(virDomainObj *vm, case VIR_DOMAIN_INPUT_TYPE_EVDEV: return qemuCgroupDenyDevicePath(vm, dev->source.evdev, VIR_CGROUP_DEVICE_RWM, false); - break; } return 0; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 92560d381f..ca5a228572 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9706,13 +9706,13 @@ qemuBuildSecCommandLine(virDomainObj *vm, virCommand *cmd, switch (sec->sectype) { case VIR_DOMAIN_LAUNCH_SECURITY_SEV: return qemuBuildSEVCommandLine(vm, cmd, &sec->data.sev); - break; + case VIR_DOMAIN_LAUNCH_SECURITY_SEV_SNP: return qemuBuildSEVSNPCommandLine(cmd, &sec->data.sev_snp); - break; + case VIR_DOMAIN_LAUNCH_SECURITY_PV: return qemuBuildPVCommandLine(cmd); - break; + case VIR_DOMAIN_LAUNCH_SECURITY_NONE: case VIR_DOMAIN_LAUNCH_SECURITY_LAST: virReportEnumRangeError(virDomainLaunchSecurity, sec->sectype); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index af5445f78d..f0e9681161 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11990,7 +11990,6 @@ qemuDomainGetJobInfoDumpStats(virDomainObj *vm, _("dump query failed, status=%1$d"), privJob->stats.dump.status); return -1; - break; case QEMU_MONITOR_DUMP_STATUS_ACTIVE: jobData->status = VIR_DOMAIN_JOB_STATUS_ACTIVE; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 28ca321c5c..b6ef10edf9 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -7268,7 +7268,6 @@ qemuDomainChangeMemoryLiveValidateChange(const virDomainMemoryDef *oldDef, _("cannot modify memory of model '%1$s'"), virDomainMemoryModelTypeToString(oldDef->model)); return false; - break; } if (oldDef->model != newDef->model) { diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 3caeb39a1b..9c60807926 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -5601,7 +5601,6 @@ int qemuMonitorJSONGetObjectProperty(qemuMonitor *mon, _("qom-get invalid object property type %1$d"), prop->type); return -1; - break; } if (ret == -1) { diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c index 91c51f6395..68ac39611f 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -681,7 +681,6 @@ AppArmorSetInputLabel(virSecurityManager *mgr, return -1; } return reload_profile(mgr, def, input->source.evdev, true); - break; case VIR_DOMAIN_INPUT_TYPE_MOUSE: case VIR_DOMAIN_INPUT_TYPE_TABLET: diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 8d10b6e9e8..0dd03c1a88 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -2250,13 +2250,11 @@ virVMXGenerateDiskTarget(virDomainDiskDef *def, virDomainDiskBusTypeToString(def->bus), virDomainDiskDeviceTypeToString(def->device)); return -1; - break; case VIR_DOMAIN_DISK_BUS_NONE: case VIR_DOMAIN_DISK_BUS_LAST: virReportEnumRangeError(virDomainDiskBus, def->bus); return -1; - break; } def->dst = virIndexToDiskName(idx, prefix); diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 93c34c4971..7624cb90fe 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -1070,7 +1070,6 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) vshError(ctl, _("No support for %1$s in command 'attach-interface'"), type); return false; - break; } if (target != NULL) diff --git a/tools/virsh-host.c b/tools/virsh-host.c index 9e8f542c96..8a92e15b21 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -1217,7 +1217,6 @@ cmdCPUCompare(vshControl *ctl, const vshCmd *cmd) vshPrint(ctl, _("CPU described in %1$s is incompatible with host CPU\n"), from); return false; - break; case VIR_CPU_COMPARE_IDENTICAL: vshPrint(ctl, _("CPU described in %1$s is identical to host CPU\n"), @@ -1632,7 +1631,6 @@ cmdHypervisorCPUCompare(vshControl *ctl, _("CPU described in %1$s is incompatible with the CPU provided by hypervisor on the host\n"), from); return false; - break; case VIR_CPU_COMPARE_IDENTICAL: vshPrint(ctl, diff --git a/tools/vsh.c b/tools/vsh.c index fd6156ea76..b42e2f0c50 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -1922,31 +1922,24 @@ vshGetTypedParamValue(vshControl *ctl, virTypedParameterPtr item) switch (item->type) { case VIR_TYPED_PARAM_INT: return g_strdup_printf("%d", item->value.i); - break; case VIR_TYPED_PARAM_UINT: return g_strdup_printf("%u", item->value.ui); - break; case VIR_TYPED_PARAM_LLONG: return g_strdup_printf("%lld", item->value.l); - break; case VIR_TYPED_PARAM_ULLONG: return g_strdup_printf("%llu", item->value.ul); - break; case VIR_TYPED_PARAM_DOUBLE: return g_strdup_printf("%f", item->value.d); - break; case VIR_TYPED_PARAM_BOOLEAN: return g_strdup(item->value.b ? _("yes") : _("no")); - break; case VIR_TYPED_PARAM_STRING: return g_strdup(item->value.s); - break; default: vshError(ctl, _("unimplemented parameter type %1$d"), item->type); -- 2.48.1
On Thu, Mar 13, 2025 at 04:30:14PM +0100, Ján Tomko wrote:
Patches 4-9/10 all depend on patch 3/10 10/10 can be pushed independently
Ján Tomko (10): qemu: seccomp sandbox: remove incorect G_GNUC_UNUSED marker qemu: validate: fs: remove unneeded parameter qemu: remove qemuCaps from qemuBuildObjectCommandlineFromJSON qemu: remove qemuCaps from qemuBuildObjectSecretCommandLine qemu: remove qemuCaps from qemuBuildTLSx509CommandLine qemu: remove qemuCaps from qemuBuildObjectCommandline qemu: remove qemuCaps from qemuBuildIOThreadCommandLine qemu: remove unused vm from qemuBuildSEVSNPCommandLine qemu: remove unused vm from qemuBuildPVCommandLine Remove unreachable breaks right after return
I wonder whether there was some tool that got confused by return without break in a switch statement, but in any case that's a problem of that tool, if such thing exists. For the series: Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
src/qemu/qemu_cgroup.c | 2 - src/qemu/qemu_command.c | 110 +++++++++++++------------------ src/qemu/qemu_driver.c | 1 - src/qemu/qemu_hotplug.c | 1 - src/qemu/qemu_monitor_json.c | 1 - src/qemu/qemu_validate.c | 3 +- src/security/security_apparmor.c | 1 - src/vmx/vmx.c | 2 - tools/virsh-domain.c | 1 - tools/virsh-host.c | 2 - tools/vsh.c | 7 -- 11 files changed, 48 insertions(+), 83 deletions(-)
-- 2.48.1
On Thu, Mar 13, 2025 at 04:52:13PM +0100, Martin Kletzander wrote:
On Thu, Mar 13, 2025 at 04:30:14PM +0100, Ján Tomko wrote:
Patches 4-9/10 all depend on patch 3/10 10/10 can be pushed independently
Ján Tomko (10): qemu: seccomp sandbox: remove incorect G_GNUC_UNUSED marker qemu: validate: fs: remove unneeded parameter qemu: remove qemuCaps from qemuBuildObjectCommandlineFromJSON qemu: remove qemuCaps from qemuBuildObjectSecretCommandLine qemu: remove qemuCaps from qemuBuildTLSx509CommandLine qemu: remove qemuCaps from qemuBuildObjectCommandline qemu: remove qemuCaps from qemuBuildIOThreadCommandLine qemu: remove unused vm from qemuBuildSEVSNPCommandLine qemu: remove unused vm from qemuBuildPVCommandLine Remove unreachable breaks right after return
I wonder whether there was some tool that got confused by return without break in a switch statement, but in any case that's a problem of that tool, if such thing exists.
Probably a case where we did ret = .... and then did a simple search & replace for 's/ret = /return/', when we eliminated the need for a centralize return path thanks to g_auto* With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
On Thu, Mar 13, 2025 at 03:59:07PM +0000, Daniel P. Berrangé wrote:
On Thu, Mar 13, 2025 at 04:52:13PM +0100, Martin Kletzander wrote:
On Thu, Mar 13, 2025 at 04:30:14PM +0100, Ján Tomko wrote:
Patches 4-9/10 all depend on patch 3/10 10/10 can be pushed independently
Ján Tomko (10): qemu: seccomp sandbox: remove incorect G_GNUC_UNUSED marker qemu: validate: fs: remove unneeded parameter qemu: remove qemuCaps from qemuBuildObjectCommandlineFromJSON qemu: remove qemuCaps from qemuBuildObjectSecretCommandLine qemu: remove qemuCaps from qemuBuildTLSx509CommandLine qemu: remove qemuCaps from qemuBuildObjectCommandline qemu: remove qemuCaps from qemuBuildIOThreadCommandLine qemu: remove unused vm from qemuBuildSEVSNPCommandLine qemu: remove unused vm from qemuBuildPVCommandLine Remove unreachable breaks right after return
I wonder whether there was some tool that got confused by return without break in a switch statement, but in any case that's a problem of that tool, if such thing exists.
Probably a case where we did
ret = ....
and then did a simple search & replace for 's/ret = /return/', when we eliminated the need for a centralize return path thanks to g_auto*
Yeah, probably that.
With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
On Thu, Mar 13, 2025 at 16:30:14 +0100, Ján Tomko wrote:
Patches 4-9/10 all depend on patch 3/10 10/10 can be pushed independently
Ján Tomko (10): qemu: seccomp sandbox: remove incorect G_GNUC_UNUSED marker qemu: validate: fs: remove unneeded parameter qemu: remove qemuCaps from qemuBuildObjectCommandlineFromJSON qemu: remove qemuCaps from qemuBuildObjectSecretCommandLine qemu: remove qemuCaps from qemuBuildTLSx509CommandLine qemu: remove qemuCaps from qemuBuildObjectCommandline qemu: remove qemuCaps from qemuBuildIOThreadCommandLine qemu: remove unused vm from qemuBuildSEVSNPCommandLine qemu: remove unused vm from qemuBuildPVCommandLine Remove unreachable breaks right after return
With the two docs things fixed: Reviewed-by: Peter Krempa <pkrempa@redhat.com>
participants (4)
-
Daniel P. Berrangé -
Ján Tomko -
Martin Kletzander -
Peter Krempa