mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-22 17:34:18 +03:00
tests: use g_new0 instead of VIR_ALLOC_N
Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
parent
d202681781
commit
5eed9a6ab3
@ -1057,10 +1057,9 @@ static int test27(const void *unused G_GNUC_UNUSED)
|
||||
"%s%s%s" \
|
||||
"END STDERR\n"
|
||||
|
||||
if (VIR_ALLOC_N(buffer0, buflen) < 0 ||
|
||||
VIR_ALLOC_N(buffer1, buflen) < 0 ||
|
||||
VIR_ALLOC_N(buffer2, buflen) < 0)
|
||||
goto cleanup;
|
||||
buffer0 = g_new0(char, buflen);
|
||||
buffer1 = g_new0(char, buflen);
|
||||
buffer2 = g_new0(char, buflen);
|
||||
|
||||
memset(buffer0, 'H', buflen - 2);
|
||||
buffer0[buflen - 2] = '\n';
|
||||
|
@ -147,8 +147,7 @@ fillXenCaps(virDomainCapsPtr domCaps)
|
||||
virFirmwarePtr *firmwares;
|
||||
int ret = -1;
|
||||
|
||||
if (VIR_ALLOC_N(firmwares, 2) < 0)
|
||||
return ret;
|
||||
firmwares = g_new0(virFirmwarePtr, 2);
|
||||
|
||||
firmwares[0] = g_new0(virFirmware, 1);
|
||||
firmwares[1] = g_new0(virFirmware, 1);
|
||||
|
@ -54,9 +54,8 @@ static int testFDStreamReadCommon(const char *scratchdir, bool blocking)
|
||||
if (!(conn = virConnectOpen("test:///default")))
|
||||
goto cleanup;
|
||||
|
||||
if (VIR_ALLOC_N(pattern, PATTERN_LEN) < 0 ||
|
||||
VIR_ALLOC_N(buf, PATTERN_LEN) < 0)
|
||||
goto cleanup;
|
||||
pattern = g_new0(char, PATTERN_LEN);
|
||||
buf = g_new0(char, PATTERN_LEN);
|
||||
|
||||
for (i = 0; i < PATTERN_LEN; i++)
|
||||
pattern[i] = i;
|
||||
@ -185,9 +184,8 @@ static int testFDStreamWriteCommon(const char *scratchdir, bool blocking)
|
||||
if (!(conn = virConnectOpen("test:///default")))
|
||||
goto cleanup;
|
||||
|
||||
if (VIR_ALLOC_N(pattern, PATTERN_LEN) < 0 ||
|
||||
VIR_ALLOC_N(buf, PATTERN_LEN) < 0)
|
||||
goto cleanup;
|
||||
pattern = g_new0(char, PATTERN_LEN);
|
||||
buf = g_new0(char, PATTERN_LEN);
|
||||
|
||||
for (i = 0; i < PATTERN_LEN; i++)
|
||||
pattern[i] = i;
|
||||
|
@ -753,8 +753,7 @@ mymain(void)
|
||||
driver.config->nbdTLSx509certdir = g_strdup("/etc/pki/libvirt-nbd/dummy,path");
|
||||
|
||||
VIR_FREE(driver.config->hugetlbfs);
|
||||
if (VIR_ALLOC_N(driver.config->hugetlbfs, 2) < 0)
|
||||
return EXIT_FAILURE;
|
||||
driver.config->hugetlbfs = g_new0(virHugeTLBFS, 2);
|
||||
driver.config->nhugetlbfs = 2;
|
||||
driver.config->hugetlbfs[0].mnt_dir = g_strdup("/dev/hugepages2M");
|
||||
driver.config->hugetlbfs[1].mnt_dir = g_strdup("/dev/hugepages1G");
|
||||
|
@ -114,8 +114,7 @@ testSELinuxLoadFileList(const char *testname,
|
||||
if (!(fp = fopen(path, "r")))
|
||||
goto cleanup;
|
||||
|
||||
if (VIR_ALLOC_N(line, 1024) < 0)
|
||||
goto cleanup;
|
||||
line = g_new0(char, 1024);
|
||||
|
||||
while (!feof(fp)) {
|
||||
char *file = NULL, *context = NULL, *tmp;
|
||||
|
@ -71,8 +71,7 @@ testBuildDomainDef(bool dynamic,
|
||||
goto error;
|
||||
|
||||
def->virtType = VIR_DOMAIN_VIRT_KVM;
|
||||
if (VIR_ALLOC_N(def->seclabels, 1) < 0)
|
||||
goto error;
|
||||
def->seclabels = g_new0(virSecurityLabelDefPtr, 1);
|
||||
|
||||
secdef = g_new0(virSecurityLabelDef, 1);
|
||||
|
||||
|
@ -211,10 +211,7 @@ virTestLoadFile(const char *file, char **buf)
|
||||
|
||||
tmplen = buflen = st.st_size + 1;
|
||||
|
||||
if (VIR_ALLOC_N(*buf, buflen) < 0) {
|
||||
VIR_FORCE_FCLOSE(fp);
|
||||
return -1;
|
||||
}
|
||||
*buf = g_new0(char, buflen);
|
||||
|
||||
tmp = *buf;
|
||||
(*buf)[0] = '\0';
|
||||
@ -977,8 +974,7 @@ virTestCapsBuildNUMATopology(int seq)
|
||||
|
||||
id = 0;
|
||||
for (cell_id = 0; cell_id < MAX_CELLS; cell_id++) {
|
||||
if (VIR_ALLOC_N(cell_cpus, MAX_CPUS_IN_CELL) < 0)
|
||||
goto error;
|
||||
cell_cpus = g_new0(virCapsHostNUMACellCPU, MAX_CPUS_IN_CELL);
|
||||
|
||||
for (core_id = 0; core_id < MAX_CPUS_IN_CELL; core_id++) {
|
||||
cell_cpus[core_id].id = id + core_id;
|
||||
|
@ -204,8 +204,7 @@ virCapsPtr testQemuCapsInit(void)
|
||||
|
||||
/* Add dummy 'none' security_driver. This is equal to setting
|
||||
* security_driver = "none" in qemu.conf. */
|
||||
if (VIR_ALLOC_N(caps->host.secModels, 1) < 0)
|
||||
goto cleanup;
|
||||
caps->host.secModels = g_new0(virCapsHostSecModel, 1);
|
||||
caps->host.nsecModels = 1;
|
||||
|
||||
caps->host.secModels[0].model = g_strdup("none");
|
||||
@ -459,8 +458,7 @@ testQemuCapsSetGIC(virQEMUCapsPtr qemuCaps,
|
||||
virGICCapability *gicCapabilities = NULL;
|
||||
size_t ngicCapabilities = 0;
|
||||
|
||||
if (VIR_ALLOC_N(gicCapabilities, 2) < 0)
|
||||
return -1;
|
||||
gicCapabilities = g_new0(virGICCapability, 2);
|
||||
|
||||
# define IMPL_BOTH \
|
||||
VIR_GIC_IMPLEMENTATION_KERNEL|VIR_GIC_IMPLEMENTATION_EMULATED
|
||||
|
@ -708,8 +708,7 @@ static int testCgroupGetPercpuStats(const void *args G_GNUC_UNUSED)
|
||||
635751356ULL, 0, 0, 0, 0, 0, 0, 0,
|
||||
};
|
||||
|
||||
if (VIR_ALLOC_N(params, EXPECTED_NCPUS) < 0)
|
||||
goto cleanup;
|
||||
params = g_new0(virTypedParameter, EXPECTED_NCPUS);
|
||||
|
||||
if ((rv = virCgroupNewPartition("/virtualmachines", true,
|
||||
(1 << VIR_CGROUP_CONTROLLER_CPU) |
|
||||
|
@ -83,9 +83,8 @@ testCryptoEncrypt(const void *opaque)
|
||||
return EXIT_AM_SKIP;
|
||||
}
|
||||
|
||||
if (VIR_ALLOC_N(enckey, enckeylen) < 0 ||
|
||||
VIR_ALLOC_N(iv, ivlen) < 0)
|
||||
goto cleanup;
|
||||
enckey = g_new0(uint8_t, enckeylen);
|
||||
iv = g_new0(uint8_t, ivlen);
|
||||
|
||||
if (virRandomBytes(enckey, enckeylen) < 0 ||
|
||||
virRandomBytes(iv, ivlen) < 0) {
|
||||
|
@ -124,8 +124,7 @@ linuxCPUStatsCompareFiles(const char *cpustatfile,
|
||||
if (virHostCPUGetStatsLinux(NULL, 0, NULL, &nparams) < 0)
|
||||
goto fail;
|
||||
|
||||
if (VIR_ALLOC_N(params, nparams) < 0)
|
||||
goto fail;
|
||||
params = g_new0(virNodeCPUStats, nparams);
|
||||
|
||||
if (virHostCPUGetStatsLinux(cpustat, VIR_NODE_CPU_STATS_ALL_CPUS, params,
|
||||
&nparams) < 0)
|
||||
|
@ -102,8 +102,7 @@ static int testMessageHeaderDecode(const void *args G_GNUC_UNUSED)
|
||||
return -1;
|
||||
|
||||
msg->bufferLength = 4;
|
||||
if (VIR_ALLOC_N(msg->buffer, msg->bufferLength) < 0)
|
||||
goto cleanup;
|
||||
msg->buffer = g_new0(char, msg->bufferLength);
|
||||
memcpy(msg->buffer, input_buf, msg->bufferLength);
|
||||
|
||||
msg->header.prog = 0x11223344;
|
||||
@ -332,8 +331,7 @@ static int testMessagePayloadDecode(const void *args G_GNUC_UNUSED)
|
||||
return -1;
|
||||
|
||||
msg->bufferLength = 4;
|
||||
if (VIR_ALLOC_N(msg->buffer, msg->bufferLength) < 0)
|
||||
goto cleanup;
|
||||
msg->buffer = g_new0(char, msg->bufferLength);
|
||||
memcpy(msg->buffer, input_buffer, msg->bufferLength);
|
||||
|
||||
if (virNetMessageDecodeLength(msg) < 0) {
|
||||
|
@ -206,11 +206,7 @@ testSocketAccept(const void *opaque)
|
||||
if (virNetSocketNewListenUNIX(path, 0700, -1, getegid(), &usock) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if (VIR_ALLOC_N(lsock, 1) < 0) {
|
||||
virObjectUnref(usock);
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
lsock = g_new0(virNetSocketPtr, 1);
|
||||
lsock[0] = usock;
|
||||
nlsock = 1;
|
||||
|
||||
|
@ -117,8 +117,7 @@ static void testTLSDerEncode(ASN1_TYPE src,
|
||||
size = 0;
|
||||
asn1_der_coding(src, src_name, NULL, &size, NULL);
|
||||
|
||||
if (VIR_ALLOC_N(data, size) < 0)
|
||||
abort();
|
||||
data = g_new0(char, size);
|
||||
|
||||
asn1_der_coding(src, src_name, data, &size, NULL);
|
||||
|
||||
|
@ -555,8 +555,7 @@ testVirStringListFreeCount(const void *opaque G_GNUC_UNUSED)
|
||||
{
|
||||
char **list;
|
||||
|
||||
if (VIR_ALLOC_N(list, 4) < 0)
|
||||
return -1;
|
||||
list = g_new0(char *, 4);
|
||||
|
||||
list[0] = g_strdup("test1");
|
||||
list[2] = g_strdup("test2");
|
||||
|
@ -73,8 +73,7 @@ testCompareParseXML(const char *xlcfg, const char *xml, bool replaceVars)
|
||||
virDomainDefPtr def = NULL;
|
||||
char *replacedXML = NULL;
|
||||
|
||||
if (VIR_ALLOC_N(gotxlcfgData, wrote) < 0)
|
||||
goto fail;
|
||||
gotxlcfgData = g_new0(char, wrote);
|
||||
|
||||
conn = virGetConnect();
|
||||
if (!conn) goto fail;
|
||||
|
@ -46,8 +46,7 @@ testCompareParseXML(const char *xmcfg, const char *xml)
|
||||
int wrote = 4096;
|
||||
virDomainDefPtr def = NULL;
|
||||
|
||||
if (VIR_ALLOC_N(gotxmcfgData, wrote) < 0)
|
||||
goto fail;
|
||||
gotxmcfgData = g_new0(char, wrote);
|
||||
|
||||
conn = virGetConnect();
|
||||
if (!conn) goto fail;
|
||||
|
Loading…
Reference in New Issue
Block a user