NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

tests: use g_strdup instead of VIR_STRDUP

Browse Source 
Replace all occurrences of
  if (VIR_STRDUP(a, b) < 0)
     /* effectively dead code */
with:
  a = g_strdup(b);

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Ján Tomko
2019-10-20 13:49:46 +02:00
parent ddb99ca516
commit 29b1e859e3
39 changed files with 115 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
tests/testutilsqemu.c
View File

@@ -74,8 +74,7 @@ static virCapsGuestMachinePtr *testQemuAllocNewerMachines(int *nmachines)
"pc-0.11", "pc", "pc-0.10", "isapc"
};
if (VIR_STRDUP(canonical, x86_machines[0]) < 0)
return NULL;
canonical = g_strdup(x86_machines[0]);
machines = virCapabilitiesAllocMachines(x86_machines,
G_N_ELEMENTS(x86_machines));
@@ -503,9 +502,8 @@ virCapsPtr testQemuCapsInit(void)
goto cleanup;
caps->host.nsecModels = 1;
if (VIR_STRDUP(caps->host.secModels[0].model, "none") < 0 ||
VIR_STRDUP(caps->host.secModels[0].doi, "0") < 0)
goto cleanup;
caps->host.secModels[0].model = g_strdup("none");
caps->host.secModels[0].doi = g_strdup("0");
if (!(cpuDefault = virCPUDefCopy(&cpuDefaultData)) ||
!(cpuHaswell = virCPUDefCopy(&cpuHaswellData)) ||
@@ -710,29 +708,22 @@ int qemuTestDriverInit(virQEMUDriver *driver)
/* Overwrite some default paths so it's consistent for tests. */
VIR_FREE(driver->config->libDir);
VIR_FREE(driver->config->channelTargetDir);
if (VIR_STRDUP(driver->config->libDir, "/tmp/lib") < 0 ||
VIR_STRDUP(driver->config->channelTargetDir, "/tmp/channel") < 0)
goto error;
driver->config->libDir = g_strdup("/tmp/lib");
driver->config->channelTargetDir = g_strdup("/tmp/channel");
if (!mkdtemp(statedir)) {
virFilePrintf(stderr, "Cannot create fake stateDir");
goto error;
}
if (VIR_STRDUP(driver->config->stateDir, statedir) < 0) {
rmdir(statedir);
goto error;
}
driver->config->stateDir = g_strdup(statedir);
if (!mkdtemp(configdir)) {
virFilePrintf(stderr, "Cannot create fake configDir");
goto error;
}
if (VIR_STRDUP(driver->config->configDir, configdir) < 0) {
rmdir(configdir);
goto error;
}
driver->config->configDir = g_strdup(configdir);
driver->caps = testQemuCapsInit();
if (!driver->caps)
@@ -827,10 +818,9 @@ testQemuGetLatestCapsForArch(const char *arch,
while ((rc = virDirRead(dir, &ent, TEST_QEMU_CAPS_PATH)) > 0) {
VIR_FREE(tmp);
if ((rc = VIR_STRDUP(tmp, STRSKIP(ent->d_name, "caps_"))) < 0)
goto cleanup;
tmp = g_strdup(STRSKIP(ent->d_name, "caps_"));
if (rc == 0)
if (!tmp)
continue;
if (!virStringStripSuffix(tmp, fullsuffix))
@@ -1051,8 +1041,7 @@ testQemuInfoSetArgs(struct testQemuInfo *info,
bool stripmachinealiases = false;
if (STREQ(capsver, "latest")) {
if (VIR_STRDUP(capsfile, virHashLookup(capslatest, capsarch)) < 0)
goto cleanup;
capsfile = g_strdup(virHashLookup(capslatest, capsarch));
stripmachinealiases = true;
} else if (virAsprintf(&capsfile, "%s/caps_%s.%s.xml",
TEST_QEMU_CAPS_PATH, capsver, capsarch) < 0) {