Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/conf/domain_conf.c | 347 ++++++++++++++++------------------------- 1 file changed, 132 insertions(+), 215 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index c003b5c030..51efeb0e42 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1469,8 +1469,7 @@ virDomainKeyWrapDefParseXML(virDomainDefPtr def, xmlXPathContextPtr ctxt) if ((n = virXPathNodeSet("./keywrap/cipher", ctxt, &nodes)) < 0) return n; - if (VIR_ALLOC(keywrap) < 0) - return -1; + keywrap = g_new0(virDomainKeyWrapDef, 1); for (i = 0; i < n; i++) { if (virDomainKeyWrapCipherDefParseXML(keywrap, nodes[i]) < 0) @@ -1559,8 +1558,7 @@ virDomainVirtioOptionsParseXML(xmlNodePtr driver, if (*virtio || !driver) return 0; - if (VIR_ALLOC(*virtio) < 0) - return -1; + *virtio = g_new0(virDomainVirtioOptions, 1); res = *virtio; @@ -1912,8 +1910,7 @@ virDomainVcpuDefNew(virDomainXMLOptionPtr xmlopt) !(priv = xmlopt->privateData.vcpuNew())) return NULL; - if (VIR_ALLOC(ret) < 0) - return NULL; + ret = g_new0(virDomainVcpuDef, 1); ret->privateData = g_steal_pointer(&priv); @@ -2181,8 +2178,7 @@ virDomainDiskDefNew(virDomainXMLOptionPtr xmlopt) { virDomainDiskDefPtr ret; - if (VIR_ALLOC(ret) < 0) - return NULL; + ret = g_new0(virDomainDiskDef, 1); ret->src = virStorageSourceNew(); @@ -2303,8 +2299,7 @@ virDomainControllerDefNew(virDomainControllerType type) { virDomainControllerDefPtr def; - if (VIR_ALLOC(def) < 0) - return NULL; + def = g_new0(virDomainControllerDef, 1); def->type = type; @@ -2393,8 +2388,7 @@ virDomainFSDefNew(virDomainXMLOptionPtr xmlopt) { virDomainFSDefPtr ret; - if (VIR_ALLOC(ret) < 0) - return NULL; + ret = g_new0(virDomainFSDef, 1); ret->src = virStorageSourceNew(); @@ -2460,8 +2454,7 @@ virDomainVsockDefNew(virDomainXMLOptionPtr xmlopt) virDomainVsockDefPtr ret = NULL; virDomainVsockDefPtr vsock; - if (VIR_ALLOC(vsock) < 0) - return NULL; + vsock = g_new0(virDomainVsockDef, 1); if (xmlopt && xmlopt->privateData.vsockNew && @@ -2938,8 +2931,7 @@ virDomainVideoDefNew(virDomainXMLOptionPtr xmlopt) { virDomainVideoDefPtr def; - if (VIR_ALLOC(def) < 0) - return NULL; + def = g_new0(virDomainVideoDef, 1); if (xmlopt && xmlopt->privateData.videoNew && !(def->privateData = xmlopt->privateData.videoNew())) { @@ -2989,18 +2981,11 @@ virDomainHostdevDefNew(void) { virDomainHostdevDefPtr def; - if (VIR_ALLOC(def) < 0) - return NULL; + def = g_new0(virDomainHostdevDef, 1); - if (VIR_ALLOC(def->info) < 0) - goto error; + def->info = g_new0(virDomainDeviceInfo, 1); return def; - - error: - VIR_FREE(def->info); - VIR_FREE(def); - return NULL; } @@ -3329,8 +3314,7 @@ virDomainIOThreadIDDefArrayInit(virDomainDefPtr def, _("failed to populate iothreadids")); return -1; } - if (VIR_ALLOC(iothrid) < 0) - return -1; + iothrid = g_new0(virDomainIOThreadIDDef, 1); iothrid->iothread_id = nxt; iothrid->autofill = true; def->iothreadids[def->niothreadids++] = iothrid; @@ -3678,8 +3662,7 @@ virDomainDefNew(void) { virDomainDefPtr ret; - if (VIR_ALLOC(ret) < 0) - return NULL; + ret = g_new0(virDomainDef, 1); if (!(ret->numa = virDomainNumaNew())) goto error; @@ -8761,8 +8744,7 @@ virDomainNetIPParseXML(xmlNodePtr node) else family = virSocketAddrNumericFamily(address); - if (VIR_ALLOC(ip) < 0) - return NULL; + ip = g_new0(virNetDevIPAddr, 1); if (virSocketAddrParse(&ip->address, address, family) < 0) { virReportError(VIR_ERR_XML_ERROR, @@ -8854,8 +8836,7 @@ virDomainNetDefCoalesceParseXML(xmlNodePtr node, if (!str) return NULL; - if (VIR_ALLOC(ret) < 0) - return NULL; + ret = g_new0(virNetDevCoalesce, 1); if (virStrToLong_ullp(str, NULL, 10, &tmp) < 0) { virReportError(VIR_ERR_XML_DETAIL, @@ -9226,8 +9207,7 @@ virSecurityLabelDefsParseXML(virDomainDefPtr def, if (n == 0) return 0; - if (VIR_ALLOC_N(def->seclabels, n) < 0) - goto error; + def->seclabels = g_new0(virSecurityLabelDefPtr, n); /* Parse each "seclabel" tag */ for (i = 0; i < n; i++) { @@ -9326,13 +9306,10 @@ virSecurityDeviceLabelDefParseXML(virSecurityDeviceLabelDefPtr **seclabels_rtn, if (n == 0) return 0; - if (VIR_ALLOC_N(seclabels, n) < 0) - goto error; + seclabels = g_new0(virSecurityDeviceLabelDefPtr, n); nseclabels = n; - for (i = 0; i < n; i++) { - if (VIR_ALLOC(seclabels[i]) < 0) - goto error; - } + for (i = 0; i < n; i++) + seclabels[i] = g_new0(virSecurityDeviceLabelDef, 1); for (i = 0; i < n; i++) { /* get model associated to this override */ @@ -9409,8 +9386,7 @@ virDomainLeaseDefParseXML(xmlNodePtr node) g_autofree char *path = NULL; g_autofree char *offset = NULL; - if (VIR_ALLOC(def) < 0) - return NULL; + def = g_new0(virDomainLeaseDef, 1); cur = node->children; while (cur != NULL) { @@ -9470,8 +9446,7 @@ virDomainDiskSourcePoolDefParse(xmlNodePtr node, *srcpool = NULL; - if (VIR_ALLOC(source) < 0) - return -1; + source = g_new0(virStorageSourcePoolDef, 1); source->pool = virXMLPropString(node, "pool"); source->volume = virXMLPropString(node, "volume"); @@ -11744,8 +11719,7 @@ virDomainActualNetDefParseXML(xmlNodePtr node, g_autofree char *trustGuestRxFilters = NULL; g_autofree char *macTableManager = NULL; - if (VIR_ALLOC(actual) < 0) - return -1; + actual = g_new0(virDomainActualNetDef, 1); ctxt->node = node; @@ -11910,8 +11884,7 @@ virDomainNetAppendIPAddress(virDomainNetDefPtr def, unsigned int prefix) { virNetDevIPAddrPtr ipDef = NULL; - if (VIR_ALLOC(ipDef) < 0) - return -1; + ipDef = g_new0(virNetDevIPAddr, 1); if (virSocketAddrParse(&ipDef->address, address, family) < 0) goto error; @@ -12955,8 +12928,7 @@ virDomainChrDefParseTargetXML(virDomainChrDefPtr def, addrStr = virXMLPropString(cur, "address"); portStr = virXMLPropString(cur, "port"); - if (VIR_ALLOC(def->target.addr) < 0) - return -1; + def->target.addr = g_new0(virSocketAddr, 1); if (addrStr == NULL) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -13389,8 +13361,7 @@ virDomainChrDefNew(virDomainXMLOptionPtr xmlopt) { virDomainChrDefPtr def = NULL; - if (VIR_ALLOC(def) < 0) - return NULL; + def = g_new0(virDomainChrDef, 1); def->target.port = -1; @@ -13537,8 +13508,7 @@ virDomainSmartcardDefParseXML(virDomainXMLOptionPtr xmlopt, g_autofree char *mode = NULL; g_autofree char *type = NULL; - if (VIR_ALLOC(def) < 0) - return NULL; + def = g_new0(virDomainSmartcardDef, 1); mode = virXMLPropString(node, "mode"); if (mode == NULL) { @@ -13689,8 +13659,7 @@ virDomainTPMDefParseXML(virDomainXMLOptionPtr xmlopt, g_autofree char *secretuuid = NULL; g_autofree xmlNodePtr *backends = NULL; - if (VIR_ALLOC(def) < 0) - return NULL; + def = g_new0(virDomainTPMDef, 1); model = virXMLPropString(node, "model"); if (model != NULL && @@ -13783,8 +13752,7 @@ virDomainPanicDefParseXML(virDomainXMLOptionPtr xmlopt, virDomainPanicDefPtr panic; g_autofree char *model = NULL; - if (VIR_ALLOC(panic) < 0) - return NULL; + panic = g_new0(virDomainPanicDef, 1); if (virDomainDeviceInfoParseXML(xmlopt, node, &panic->info, flags) < 0) @@ -13820,8 +13788,7 @@ virDomainInputDefParseXML(virDomainXMLOptionPtr xmlopt, g_autofree char *bus = NULL; g_autofree char *model = NULL; - if (VIR_ALLOC(def) < 0) - return NULL; + def = g_new0(virDomainInputDef, 1); ctxt->node = node; @@ -13974,8 +13941,7 @@ virDomainHubDefParseXML(virDomainXMLOptionPtr xmlopt, virDomainHubDefPtr def; g_autofree char *type = NULL; - if (VIR_ALLOC(def) < 0) - return NULL; + def = g_new0(virDomainHubDef, 1); type = virXMLPropString(node, "type"); @@ -14017,8 +13983,7 @@ virDomainTimerDefParseXML(xmlNodePtr node, g_autofree char *track = NULL; g_autofree char *mode = NULL; - if (VIR_ALLOC(def) < 0) - return NULL; + def = g_new0(virDomainTimerDef, 1); ctxt->node = node; @@ -14372,8 +14337,7 @@ virDomainGraphicsListensParseXML(virDomainGraphicsDefPtr def, if (nListens > 0) { size_t i; - if (VIR_ALLOC_N(def->listens, nListens) < 0) - goto cleanup; + def->listens = g_new0(virDomainGraphicsListenDef, nListens); for (i = 0; i < nListens; i++) { if (virDomainGraphicsListenDefParseXML(&def->listens[i], def, @@ -14918,8 +14882,7 @@ virDomainGraphicsDefNew(virDomainXMLOptionPtr xmlopt) { virDomainGraphicsDefPtr def = NULL; - if (VIR_ALLOC(def) < 0) - return NULL; + def = g_new0(virDomainGraphicsDef, 1); if (xmlopt && xmlopt->privateData.graphicsNew && !(def->privateData = xmlopt->privateData.graphicsNew())) { @@ -14936,8 +14899,7 @@ virDomainNetDefNew(virDomainXMLOptionPtr xmlopt) { virDomainNetDefPtr def = NULL; - if (VIR_ALLOC(def) < 0) - return NULL; + def = g_new0(virDomainNetDef, 1); if (xmlopt && xmlopt->privateData.networkNew && !(def->privateData = xmlopt->privateData.networkNew())) { @@ -15021,8 +14983,7 @@ virDomainSoundCodecDefParseXML(xmlNodePtr node) virDomainSoundCodecDefPtr def; g_autofree char *type = NULL; - if (VIR_ALLOC(def) < 0) - return NULL; + def = g_new0(virDomainSoundCodecDef, 1); type = virXMLPropString(node, "type"); if ((def->type = virDomainSoundCodecTypeFromString(type)) < 0) { @@ -15050,8 +15011,7 @@ virDomainSoundDefParseXML(virDomainXMLOptionPtr xmlopt, g_autofree char *model = NULL; xmlNodePtr audioNode; - if (VIR_ALLOC(def) < 0) - return NULL; + def = g_new0(virDomainSoundDef, 1); ctxt->node = node; model = virXMLPropString(node, "model"); @@ -15074,8 +15034,7 @@ virDomainSoundDefParseXML(virDomainXMLOptionPtr xmlopt, if (ncodecs > 0) { size_t i; - if (VIR_ALLOC_N(def->codecs, ncodecs) < 0) - goto error; + def->codecs = g_new0(virDomainSoundCodecDefPtr, ncodecs); for (i = 0; i < ncodecs; i++) { virDomainSoundCodecDefPtr codec = virDomainSoundCodecDefParseXML(codecNodes[i]); @@ -15161,8 +15120,7 @@ virDomainAudioDefParseXML(virDomainXMLOptionPtr xmlopt G_GNUC_UNUSED, g_autofree char *tmp = NULL; g_autofree char *type = NULL; - if (VIR_ALLOC(def) < 0) - return NULL; + def = g_new0(virDomainAudioDef, 1); ctxt->node = node; type = virXMLPropString(node, "type"); @@ -15218,8 +15176,7 @@ virDomainWatchdogDefParseXML(virDomainXMLOptionPtr xmlopt, g_autofree char *model = NULL; g_autofree char *action = NULL; - if (VIR_ALLOC(def) < 0) - return NULL; + def = g_new0(virDomainWatchdogDef, 1); model = virXMLPropString(node, "model"); if (model == NULL) { @@ -15271,8 +15228,7 @@ virDomainRNGDefParseXML(virDomainXMLOptionPtr xmlopt, g_autofree char *backend = NULL; g_autofree char *type = NULL; - if (VIR_ALLOC(def) < 0) - return NULL; + def = g_new0(virDomainRNGDef, 1); if (!(model = virXMLPropString(node, "model"))) { virReportError(VIR_ERR_XML_ERROR, "%s", _("missing RNG device model")); @@ -15382,8 +15338,7 @@ virDomainMemballoonDefParseXML(virDomainXMLOptionPtr xmlopt, g_autofree char *model = NULL; g_autofree char *deflate = NULL; - if (VIR_ALLOC(def) < 0) - return NULL; + def = g_new0(virDomainMemballoonDef, 1); model = virXMLPropString(node, "model"); if (model == NULL) { @@ -15440,8 +15395,7 @@ virDomainNVRAMDefParseXML(virDomainXMLOptionPtr xmlopt, { virDomainNVRAMDefPtr def; - if (VIR_ALLOC(def) < 0) - return NULL; + def = g_new0(virDomainNVRAMDef, 1); if (virDomainDeviceInfoParseXML(xmlopt, node, &def->info, flags) < 0) goto error; @@ -15466,8 +15420,7 @@ virDomainShmemDefParseXML(virDomainXMLOptionPtr xmlopt, xmlNodePtr server = NULL; g_autofree char *tmp = NULL; - if (VIR_ALLOC(def) < 0) - return NULL; + def = g_new0(virDomainShmemDef, 1); ctxt->node = node; @@ -15577,8 +15530,7 @@ virSysinfoBIOSParseXML(xmlNodePtr node, return ret; } - if (VIR_ALLOC(def) < 0) - goto cleanup; + def = g_new0(virSysinfoBIOSDef, 1); def->vendor = virXPathString("string(entry[@name='vendor'])", ctxt); def->version = virXPathString("string(entry[@name='version'])", ctxt); @@ -15641,8 +15593,7 @@ virSysinfoSystemParseXML(xmlNodePtr node, return ret; } - if (VIR_ALLOC(def) < 0) - goto cleanup; + def = g_new0(virSysinfoSystemDef, 1); def->manufacturer = virXPathString("string(entry[@name='manufacturer'])", ctxt); @@ -15710,8 +15661,8 @@ virSysinfoBaseBoardParseXML(xmlXPathContextPtr ctxt, if ((n = virXPathNodeSet("./baseBoard", ctxt, &nodes)) < 0) return -1; - if (n && VIR_ALLOC_N(boards, n) < 0) - return -1; + if (n) + boards = g_new0(virSysinfoBaseBoardDef, n); for (i = 0; i < n; i++) { virSysinfoBaseBoardDefPtr def = boards + nboards; @@ -15766,11 +15717,9 @@ virSysinfoOEMStringsParseXML(xmlNodePtr node, if (nstrings == 0) return 0; - if (VIR_ALLOC(def) < 0) - goto cleanup; + def = g_new0(virSysinfoOEMStringsDef, 1); - if (VIR_ALLOC_N(def->values, nstrings) < 0) - goto cleanup; + def->values = g_new0(char *, nstrings); def->nvalues = nstrings; for (i = 0; i < nstrings; i++) { @@ -15803,8 +15752,7 @@ virSysinfoChassisParseXML(xmlNodePtr node, return ret; } - if (VIR_ALLOC(def) < 0) - goto cleanup; + def = g_new0(virSysinfoChassisDef, 1); def->manufacturer = virXPathString("string(entry[@name='manufacturer'])", ctxt); @@ -15825,7 +15773,6 @@ virSysinfoChassisParseXML(xmlNodePtr node, *chassisdef = g_steal_pointer(&def); ret = 0; - cleanup: virSysinfoChassisDefFree(def); return ret; } @@ -15951,8 +15898,7 @@ virSysinfoParseXML(xmlNodePtr node, return NULL; } - if (VIR_ALLOC(def) < 0) - return NULL; + def = g_new0(virSysinfoDef, 1); typeStr = virXMLPropString(node, "type"); if (typeStr == NULL) { @@ -16130,8 +16076,7 @@ virDomainVideoDriverDefParseXML(xmlNodePtr node) if (!vgaconf) return NULL; - if (VIR_ALLOC(def) < 0) - return def; + def = g_new0(virDomainVideoDriverDef, 1); if ((val = virDomainVideoVGAConfTypeFromString(vgaconf)) <= 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -16385,8 +16330,7 @@ virDomainRedirdevDefParseXML(virDomainXMLOptionPtr xmlopt, g_autofree char *bus = NULL; g_autofree char *type = NULL; - if (VIR_ALLOC(def) < 0) - return NULL; + def = g_new0(virDomainRedirdevDef, 1); if (!(def->source = virDomainChrSourceDefNew(xmlopt))) goto error; @@ -16492,8 +16436,7 @@ virDomainRedirFilterUSBDevDefParseXML(xmlNodePtr node) g_autofree char *version = NULL; g_autofree char *allow = NULL; - if (VIR_ALLOC(def) < 0) - return NULL; + def = g_new0(virDomainRedirFilterUSBDevDef, 1); class = virXMLPropString(node, "class"); if (class) { @@ -16574,15 +16517,14 @@ virDomainRedirFilterDefParseXML(xmlNodePtr node, virDomainRedirFilterDefPtr def = NULL; g_autofree xmlNodePtr *nodes = NULL; - if (VIR_ALLOC(def) < 0) - goto error; + def = g_new0(virDomainRedirFilterDef, 1); ctxt->node = node; if ((n = virXPathNodeSet("./usbdev", ctxt, &nodes)) < 0) goto error; - if (n && VIR_ALLOC_N(def->usbdevs, n) < 0) - goto error; + if (n) + def->usbdevs = g_new0(virDomainRedirFilterUSBDevDefPtr, n); for (i = 0; i < n; i++) { virDomainRedirFilterUSBDevDefPtr usbdev = @@ -16815,8 +16757,7 @@ virDomainSEVDefParseXML(xmlNodePtr sevNode, unsigned long policy; g_autofree char *type = NULL; - if (VIR_ALLOC(def) < 0) - return NULL; + def = g_new0(virDomainSEVDef, 1); ctxt->node = sevNode; @@ -16918,8 +16859,7 @@ virDomainMemoryDefParseXML(virDomainXMLOptionPtr xmlopt, int val; g_autofree char *tmp = NULL; - if (VIR_ALLOC(def) < 0) - return NULL; + def = g_new0(virDomainMemoryDef, 1); ctxt->node = memdevNode; @@ -17015,8 +16955,7 @@ virDomainIOMMUDefParseXML(xmlNodePtr node, ctxt->node = node; - if (VIR_ALLOC(iommu) < 0) - return NULL; + iommu = g_new0(virDomainIOMMUDef, 1); if (!(tmp = virXMLPropString(node, "model"))) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -17156,8 +17095,7 @@ virDomainDeviceDefParse(const char *xmlStr, node = ctxt->node; - if (VIR_ALLOC(dev) < 0) - return NULL; + dev = g_new0(virDomainDeviceDef, 1); if ((dev->type = virDomainDeviceTypeFromString((const char *) node->name)) < 0) { /* Some crazy mapping of serial, parallel, console and channel to @@ -18016,14 +17954,14 @@ virDomainNetDHCPInterfaces(virDomainDefPtr def, goto error; if (n_leases) { - ifaces_ret = g_renew(typeof(*ifaces_ret), ifaces_ret, ifaces_count + 1); - ifaces_ret[ifaces_count] = g_new0(typeof(**ifaces_ret), 1); + ifaces_ret = g_renew(virDomainInterfacePtr, ifaces_ret, ifaces_count + 1); + ifaces_ret[ifaces_count] = g_new0(virDomainInterface, 1); iface = ifaces_ret[ifaces_count]; ifaces_count++; /* Assuming each lease corresponds to a separate IP */ iface->naddrs = n_leases; - iface->addrs = g_new0(typeof(*iface->addrs), iface->naddrs); + iface->addrs = g_new0(virDomainIPAddress, iface->naddrs); iface->name = g_strdup(def->nets[i]->ifname); iface->hwaddr = g_strdup(macaddr); } @@ -18078,15 +18016,13 @@ virDomainNetARPInterfaces(virDomainDefPtr def, virArpTableEntry entry = table->t[j]; if (STREQ(entry.mac, macaddr)) { - if (VIR_ALLOC(iface) < 0) - goto cleanup; + iface = g_new0(virDomainInterface, 1); iface->name = g_strdup(def->nets[i]->ifname); iface->hwaddr = g_strdup(macaddr); - if (VIR_ALLOC(iface->addrs) < 0) - goto cleanup; + iface->addrs = g_new0(virDomainIPAddress, 1); iface->naddrs = 1; iface->addrs->addr = g_strdup(entry.ipaddr); @@ -19037,8 +18973,7 @@ virDomainIdmapDefParseXML(xmlXPathContextPtr ctxt, virDomainIdMapEntryPtr idmap = NULL; VIR_XPATH_NODE_AUTORESTORE(ctxt) - if (VIR_ALLOC_N(idmap, num) < 0) - return idmap; + idmap = g_new0(virDomainIdMapEntry, num); for (i = 0; i < num; i++) { ctxt->node = node[i]; @@ -19084,8 +19019,7 @@ virDomainIOThreadIDDefParseXML(xmlNodePtr node) virDomainIOThreadIDDefPtr iothrid; g_autofree char *tmp = NULL; - if (VIR_ALLOC(iothrid) < 0) - return NULL; + iothrid = g_new0(virDomainIOThreadIDDef, 1); if (!(tmp = virXMLPropString(node, "id"))) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -19132,8 +19066,8 @@ virDomainDefParseIOThreads(virDomainDefPtr def, if (n > iothreads) iothreads = n; - if (n && VIR_ALLOC_N(def->iothreadids, n) < 0) - return -1; + if (n) + def->iothreadids = g_new0(virDomainIOThreadIDDefPtr, n); for (i = 0; i < n; i++) { virDomainIOThreadIDDefPtr iothrid = NULL; @@ -19414,8 +19348,7 @@ virDomainDefMaybeAddInput(virDomainDefPtr def, return 0; } - if (VIR_ALLOC(input) < 0) - return -1; + input = g_new0(virDomainInputDef, 1); input->type = type; input->bus = bus; @@ -19474,8 +19407,7 @@ virDomainResourceDefParse(xmlNodePtr node, ctxt->node = node; - if (VIR_ALLOC(def) < 0) - goto error; + def = g_new0(virDomainResourceDef, 1); /* Find out what type of virtualization to use */ if (!(def->partition = virXPathString("string(./partition)", ctxt))) { @@ -20160,8 +20092,7 @@ virDomainEmulatorSchedParse(xmlNodePtr node, { g_autofree virDomainThreadSchedParamPtr sched = NULL; - if (VIR_ALLOC(sched) < 0) - return -1; + sched = g_new0(virDomainThreadSchedParam, 1); if (virDomainSchedulerParseCommonAttrs(node, &sched->policy, @@ -20464,8 +20395,7 @@ virDomainDefParseBootOptions(virDomainDefPtr def, if ((n = virXPathNodeSet("./os/initarg", ctxt, &nodes)) < 0) return -1; - if (VIR_ALLOC_N(def->os.initargv, n+1) < 0) - return -1; + def->os.initargv = g_new0(char *, n+1); for (i = 0; i < n; i++) { if (!nodes[i]->children || !nodes[i]->children->content) { @@ -20481,8 +20411,7 @@ virDomainDefParseBootOptions(virDomainDefPtr def, if ((n = virXPathNodeSet("./os/initenv", ctxt, &nodes)) < 0) return -1; - if (VIR_ALLOC_N(def->os.initenv, n+1) < 0) - return -1; + def->os.initenv = g_new0(virDomainOSEnvPtr, n+1); for (i = 0; i < n; i++) { if (!(name = virXMLPropString(nodes[i], "name"))) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -20498,9 +20427,7 @@ virDomainDefParseBootOptions(virDomainDefPtr def, return -1; } - if (VIR_ALLOC(def->os.initenv[i]) < 0) - return -1; - + def->os.initenv[i] = g_new0(virDomainOSEnv, 1); def->os.initenv[i]->name = name; def->os.initenv[i]->value = g_strdup((const char *)nodes[i]->children->content); } @@ -20538,8 +20465,7 @@ virDomainDefParseBootOptions(virDomainDefPtr def, if ((loader_node = virXPathNode("./os/loader[1]", ctxt))) { const bool fwAutoSelect = def->os.firmware != VIR_DOMAIN_OS_DEF_FIRMWARE_NONE; - if (VIR_ALLOC(def->os.loader) < 0) - return -1; + def->os.loader = g_new0(virDomainLoaderDef, 1); if (virDomainLoaderDefParseXML(loader_node, def->os.loader, @@ -20814,8 +20740,7 @@ virDomainResctrlMonDefParse(virDomainDefPtr def, } for (i = 0; i < n; i++) { - if (VIR_ALLOC(domresmon) < 0) - goto cleanup; + domresmon = g_new0(virDomainResctrlMonDef, 1); domresmon->tag = tag; @@ -21229,8 +21154,7 @@ virDomainDefParseMemory(virDomainDefPtr def, } if (n) { - if (VIR_ALLOC_N(def->mem.hugepages, n) < 0) - goto error; + def->mem.hugepages = g_new0(virDomainHugePage, n); for (i = 0; i < n; i++) { if (virDomainHugepagesParseXML(nodes[i], ctxt, @@ -21242,9 +21166,7 @@ virDomainDefParseMemory(virDomainDefPtr def, VIR_FREE(nodes); } else { /* no hugepage pages */ - if (VIR_ALLOC(def->mem.hugepages) < 0) - goto error; - + def->mem.hugepages = g_new0(virDomainHugePage, 1); def->mem.nhugepages = 1; } } @@ -21413,8 +21335,8 @@ virDomainDefTunablesParse(virDomainDefPtr def, "%s", _("cannot extract blkiotune nodes")); goto error; } - if (n && VIR_ALLOC_N(def->blkio.devices, n) < 0) - goto error; + if (n) + def->blkio.devices = g_new0(virBlkioDevice, n); for (i = 0; i < n; i++) { if (virDomainBlkioDeviceParseXML(nodes[i], @@ -21768,8 +21690,8 @@ virDomainDefClockParse(virDomainDefPtr def, if ((n = virXPathNodeSet("./clock/timer", ctxt, &nodes)) < 0) goto error; - if (n && VIR_ALLOC_N(def->clock.timers, n) < 0) - goto error; + if (n) + def->clock.timers = g_new0(virDomainTimerDefPtr, n); for (i = 0; i < n; i++) { virDomainTimerDefPtr timer = virDomainTimerDefParseXML(nodes[i], @@ -21803,8 +21725,8 @@ virDomainDefControllersParse(virDomainDefPtr def, if ((n = virXPathNodeSet("./devices/controller", ctxt, &nodes)) < 0) goto error; - if (n && VIR_ALLOC_N(def->controllers, n) < 0) - goto error; + if (n) + def->controllers = g_new0(virDomainControllerDefPtr, n); for (i = 0; i < n; i++) { virDomainControllerDefPtr controller = virDomainControllerDefParseXML(xmlopt, @@ -21985,8 +21907,8 @@ virDomainDefParseXML(xmlDocPtr xml, if ((n = virXPathNodeSet("./devices/disk", ctxt, &nodes)) < 0) goto error; - if (n && VIR_ALLOC_N(def->disks, n) < 0) - goto error; + if (n) + def->disks = g_new0(virDomainDiskDefPtr, n); for (i = 0; i < n; i++) { virDomainDiskDefPtr disk = virDomainDiskDefParseXML(xmlopt, @@ -22009,8 +21931,8 @@ virDomainDefParseXML(xmlDocPtr xml, "%s", _("cannot extract device leases")); goto error; } - if (n && VIR_ALLOC_N(def->leases, n) < 0) - goto error; + if (n) + def->leases = g_new0(virDomainLeaseDefPtr, n); for (i = 0; i < n; i++) { virDomainLeaseDefPtr lease = virDomainLeaseDefParseXML(nodes[i]); if (!lease) @@ -22023,8 +21945,8 @@ virDomainDefParseXML(xmlDocPtr xml, /* analysis of the filesystems */ if ((n = virXPathNodeSet("./devices/filesystem", ctxt, &nodes)) < 0) goto error; - if (n && VIR_ALLOC_N(def->fss, n) < 0) - goto error; + if (n) + def->fss = g_new0(virDomainFSDefPtr, n); for (i = 0; i < n; i++) { virDomainFSDefPtr fs = virDomainFSDefParseXML(xmlopt, nodes[i], @@ -22040,8 +21962,8 @@ virDomainDefParseXML(xmlDocPtr xml, /* analysis of the network devices */ if ((n = virXPathNodeSet("./devices/interface", ctxt, &nodes)) < 0) goto error; - if (n && VIR_ALLOC_N(def->nets, n) < 0) - goto error; + if (n) + def->nets = g_new0(virDomainNetDefPtr, n); for (i = 0; i < n; i++) { virDomainNetDefPtr net = virDomainNetDefParseXML(xmlopt, nodes[i], @@ -22067,8 +21989,8 @@ virDomainDefParseXML(xmlDocPtr xml, /* analysis of the smartcard devices */ if ((n = virXPathNodeSet("./devices/smartcard", ctxt, &nodes)) < 0) goto error; - if (n && VIR_ALLOC_N(def->smartcards, n) < 0) - goto error; + if (n) + def->smartcards = g_new0(virDomainSmartcardDefPtr, n); for (i = 0; i < n; i++) { virDomainSmartcardDefPtr card = virDomainSmartcardDefParseXML(xmlopt, @@ -22086,8 +22008,8 @@ virDomainDefParseXML(xmlDocPtr xml, /* analysis of the character devices */ if ((n = virXPathNodeSet("./devices/parallel", ctxt, &nodes)) < 0) goto error; - if (n && VIR_ALLOC_N(def->parallels, n) < 0) - goto error; + if (n) + def->parallels = g_new0(virDomainChrDefPtr, n); for (i = 0; i < n; i++) { virDomainChrDefPtr chr = virDomainChrDefParseXML(xmlopt, @@ -22112,8 +22034,8 @@ virDomainDefParseXML(xmlDocPtr xml, if ((n = virXPathNodeSet("./devices/serial", ctxt, &nodes)) < 0) goto error; - if (n && VIR_ALLOC_N(def->serials, n) < 0) - goto error; + if (n) + def->serials = g_new0(virDomainChrDefPtr, n); for (i = 0; i < n; i++) { virDomainChrDefPtr chr = virDomainChrDefParseXML(xmlopt, @@ -22140,8 +22062,8 @@ virDomainDefParseXML(xmlDocPtr xml, "%s", _("cannot extract console devices")); goto error; } - if (n && VIR_ALLOC_N(def->consoles, n) < 0) - goto error; + if (n) + def->consoles = g_new0(virDomainChrDefPtr, n); for (i = 0; i < n; i++) { virDomainChrDefPtr chr = virDomainChrDefParseXML(xmlopt, @@ -22158,8 +22080,8 @@ virDomainDefParseXML(xmlDocPtr xml, if ((n = virXPathNodeSet("./devices/channel", ctxt, &nodes)) < 0) goto error; - if (n && VIR_ALLOC_N(def->channels, n) < 0) - goto error; + if (n) + def->channels = g_new0(virDomainChrDefPtr, n); for (i = 0; i < n; i++) { virDomainChrDefPtr chr = virDomainChrDefParseXML(xmlopt, @@ -22177,8 +22099,8 @@ virDomainDefParseXML(xmlDocPtr xml, /* analysis of the input devices */ if ((n = virXPathNodeSet("./devices/input", ctxt, &nodes)) < 0) goto error; - if (n && VIR_ALLOC_N(def->inputs, n) < 0) - goto error; + if (n) + def->inputs = g_new0(virDomainInputDefPtr, n); for (i = 0; i < n; i++) { virDomainInputDefPtr input = virDomainInputDefParseXML(xmlopt, @@ -22205,8 +22127,8 @@ virDomainDefParseXML(xmlDocPtr xml, /* analysis of the graphics devices */ if ((n = virXPathNodeSet("./devices/graphics", ctxt, &nodes)) < 0) goto error; - if (n && VIR_ALLOC_N(def->graphics, n) < 0) - goto error; + if (n) + def->graphics = g_new0(virDomainGraphicsDefPtr, n); for (i = 0; i < n; i++) { virDomainGraphicsDefPtr graphics = virDomainGraphicsDefParseXML(xmlopt, nodes[i], @@ -22222,8 +22144,8 @@ virDomainDefParseXML(xmlDocPtr xml, /* analysis of the sound devices */ if ((n = virXPathNodeSet("./devices/sound", ctxt, &nodes)) < 0) goto error; - if (n && VIR_ALLOC_N(def->sounds, n) < 0) - goto error; + if (n) + def->sounds = g_new0(virDomainSoundDefPtr, n); for (i = 0; i < n; i++) { virDomainSoundDefPtr sound = virDomainSoundDefParseXML(xmlopt, nodes[i], @@ -22239,8 +22161,8 @@ virDomainDefParseXML(xmlDocPtr xml, /* analysis of the audio devices */ if ((n = virXPathNodeSet("./devices/audio", ctxt, &nodes)) < 0) goto error; - if (n && VIR_ALLOC_N(def->audios, n) < 0) - goto error; + if (n) + def->audios = g_new0(virDomainAudioDefPtr, n); for (i = 0; i < n; i++) { virDomainAudioDefPtr audio = virDomainAudioDefParseXML(xmlopt, nodes[i], @@ -22255,8 +22177,8 @@ virDomainDefParseXML(xmlDocPtr xml, /* analysis of the video devices */ if ((n = virXPathNodeSet("./devices/video", ctxt, &nodes)) < 0) goto error; - if (n && VIR_ALLOC_N(def->videos, n) < 0) - goto error; + if (n) + def->videos = g_new0(virDomainVideoDefPtr, n); for (i = 0; i < n; i++) { virDomainVideoDefPtr video; ssize_t insertAt = -1; @@ -22364,8 +22286,8 @@ virDomainDefParseXML(xmlDocPtr xml, /* Parse the RNG devices */ if ((n = virXPathNodeSet("./devices/rng", ctxt, &nodes)) < 0) goto error; - if (n && VIR_ALLOC_N(def->rngs, n) < 0) - goto error; + if (n) + def->rngs = g_new0(virDomainRNGDefPtr, n); for (i = 0; i < n; i++) { virDomainRNGDefPtr rng = virDomainRNGDefParseXML(xmlopt, nodes[i], ctxt, flags); @@ -22387,8 +22309,8 @@ virDomainDefParseXML(xmlDocPtr xml, goto error; } - if (n && VIR_ALLOC_N(def->tpms, n) < 0) - goto error; + if (n) + def->tpms = g_new0(virDomainTPMDefPtr, n); for (i = 0; i < n; i++) { virDomainTPMDefPtr tpm = virDomainTPMDefParseXML(xmlopt, nodes[i], @@ -22419,8 +22341,8 @@ virDomainDefParseXML(xmlDocPtr xml, /* analysis of the hub devices */ if ((n = virXPathNodeSet("./devices/hub", ctxt, &nodes)) < 0) goto error; - if (n && VIR_ALLOC_N(def->hubs, n) < 0) - goto error; + if (n) + def->hubs = g_new0(virDomainHubDefPtr, n); for (i = 0; i < n; i++) { virDomainHubDefPtr hub; @@ -22443,8 +22365,8 @@ virDomainDefParseXML(xmlDocPtr xml, /* analysis of the redirected devices */ if ((n = virXPathNodeSet("./devices/redirdev", ctxt, &nodes)) < 0) goto error; - if (n && VIR_ALLOC_N(def->redirdevs, n) < 0) - goto error; + if (n) + def->redirdevs = g_new0(virDomainRedirdevDefPtr, n); for (i = 0; i < n; i++) { virDomainRedirdevDefPtr redirdev = virDomainRedirdevDefParseXML(xmlopt, nodes[i], ctxt, flags); @@ -22477,8 +22399,8 @@ virDomainDefParseXML(xmlDocPtr xml, /* analysis of the panic devices */ if ((n = virXPathNodeSet("./devices/panic", ctxt, &nodes)) < 0) goto error; - if (n && VIR_ALLOC_N(def->panics, n) < 0) - goto error; + if (n) + def->panics = g_new0(virDomainPanicDefPtr, n); for (i = 0; i < n; i++) { virDomainPanicDefPtr panic; @@ -22493,8 +22415,8 @@ virDomainDefParseXML(xmlDocPtr xml, /* analysis of the shmem devices */ if ((n = virXPathNodeSet("./devices/shmem", ctxt, &nodes)) < 0) goto error; - if (n && VIR_ALLOC_N(def->shmems, n) < 0) - goto error; + if (n) + def->shmems = g_new0(virDomainShmemDefPtr, n); node = ctxt->node; for (i = 0; i < n; i++) { @@ -22519,8 +22441,8 @@ virDomainDefParseXML(xmlDocPtr xml, /* analysis of memory devices */ if ((n = virXPathNodeSet("./devices/memory", ctxt, &nodes)) < 0) goto error; - if (n && VIR_ALLOC_N(def->mems, n) < 0) - goto error; + if (n) + def->mems = g_new0(virDomainMemoryDefPtr, n); for (i = 0; i < n; i++) { virDomainMemoryDefPtr mem = virDomainMemoryDefParseXML(xmlopt, @@ -25105,8 +25027,7 @@ virDomainIOThreadIDAdd(virDomainDefPtr def, { virDomainIOThreadIDDefPtr iothrid = NULL; - if (VIR_ALLOC(iothrid) < 0) - goto error; + iothrid = g_new0(virDomainIOThreadIDDef, 1); iothrid->iothread_id = iothread_id; @@ -31953,8 +31874,7 @@ virDomainDefGetShortName(const virDomainDef *def) return NULL; } - if (VIR_ALLOC_N(shortname, len + 1) < 0) - return NULL; + shortname = g_new0(char, len + 1); if (wcstombs(shortname, wshortname, len) == (size_t) -1) { virReportSystemError(errno, "%s", @@ -32100,8 +32020,7 @@ virDomainNetDefToNetworkPort(virDomainDefPtr dom, return NULL; } - if (VIR_ALLOC(port) < 0) - return NULL; + port = g_new0(virNetworkPortDef, 1); if (virUUIDGenerate(port->uuid) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -32144,8 +32063,7 @@ virDomainNetDefActualFromNetworkPort(virDomainNetDefPtr iface, return -1; } - if (VIR_ALLOC(actual) < 0) - return -1; + actual = g_new0(virDomainActualNetDef, 1); switch ((virNetworkPortPlugType)port->plugtype) { case VIR_NETWORK_PORT_PLUG_TYPE_NONE: @@ -32262,8 +32180,7 @@ virDomainNetDefActualToNetworkPort(virDomainDefPtr dom, return NULL; } - if (VIR_ALLOC(port) < 0) - return NULL; + port = g_new0(virNetworkPortDef, 1); if (virUUIDIsValid(iface->data.network.portid)) { memcpy(port->uuid, iface->data.network.portid, VIR_UUID_BUFLEN); -- 2.26.2

Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/conf/network_conf.c | 37 ++++++++++++------------------------- 1 file changed, 12 insertions(+), 25 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 2fcd498107..4f1115e103 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -442,9 +442,7 @@ virNetworkDHCPLeaseTimeDefParseXML(virNetworkDHCPLeaseTimeDefPtr *lease, } } - if (VIR_ALLOC(new_lease) < 0) - return -1; - + new_lease = g_new0(virNetworkDHCPLeaseTimeDef, 1); new_lease->expiry = expiry; new_lease->unit = unit; @@ -976,8 +974,7 @@ virNetworkDNSDefParseXML(const char *networkName, return -1; } if (nfwds > 0) { - if (VIR_ALLOC_N(def->forwarders, nfwds) < 0) - return -1; + def->forwarders = g_new0(virNetworkDNSForwarder, nfwds); for (i = 0; i < nfwds; i++) { g_autofree char *addr = virXMLPropString(fwdNodes[i], "addr"); @@ -1009,8 +1006,7 @@ virNetworkDNSDefParseXML(const char *networkName, return -1; } if (nhosts > 0) { - if (VIR_ALLOC_N(def->hosts, nhosts) < 0) - return -1; + def->hosts = g_new0(virNetworkDNSHostDef, nhosts); for (i = 0; i < nhosts; i++) { if (virNetworkDNSHostDefParseXML(networkName, hostNodes[i], @@ -1029,8 +1025,7 @@ virNetworkDNSDefParseXML(const char *networkName, return -1; } if (nsrvs > 0) { - if (VIR_ALLOC_N(def->srvs, nsrvs) < 0) - return -1; + def->srvs = g_new0(virNetworkDNSSrvDef, nsrvs); for (i = 0; i < nsrvs; i++) { if (virNetworkDNSSrvDefParseXML(networkName, srvNodes[i], ctxt, @@ -1049,8 +1044,7 @@ virNetworkDNSDefParseXML(const char *networkName, return -1; } if (ntxts > 0) { - if (VIR_ALLOC_N(def->txts, ntxts) < 0) - return -1; + def->txts = g_new0(virNetworkDNSTxtDef, ntxts); for (i = 0; i < ntxts; i++) { if (virNetworkDNSTxtDefParseXML(networkName, txtNodes[i], @@ -1551,8 +1545,7 @@ virNetworkForwardDefParseXML(const char *networkName, } if (nForwardIfs > 0 || forwardDev) { - if (VIR_ALLOC_N(def->ifs, MAX(nForwardIfs, 1)) < 0) - return -1; + def->ifs = g_new0(virNetworkForwardIfDef, MAX(nForwardIfs, 1)); if (forwardDev) { def->ifs[0].device.dev = g_steal_pointer(&forwardDev); @@ -1603,8 +1596,7 @@ virNetworkForwardDefParseXML(const char *networkName, } } else if (nForwardAddrs > 0) { - if (VIR_ALLOC_N(def->ifs, nForwardAddrs) < 0) - return -1; + def->ifs = g_new0(virNetworkForwardIfDef, nForwardAddrs); for (i = 0; i < nForwardAddrs; i++) { g_autofree char *addrType = NULL; @@ -1661,8 +1653,7 @@ virNetworkForwardDefParseXML(const char *networkName, networkName); return -1; } else if (nForwardPfs == 1) { - if (VIR_ALLOC_N(def->pfs, nForwardPfs) < 0) - return -1; + def->pfs = g_new0(virNetworkForwardPfDef, nForwardPfs); forwardDev = virXMLPropString(*forwardPfNodes, "dev"); if (!forwardDev) { @@ -1707,8 +1698,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt, xmlNodePtr vlanNode; xmlNodePtr metadataNode = NULL; - if (VIR_ALLOC(def) < 0) - return NULL; + def = g_new0(virNetworkDef, 1); /* Extract network name */ def->name = virXPathString("string(./name[1])", ctxt); @@ -1863,8 +1853,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt, size_t i; /* allocate array to hold all the portgroups */ - if (VIR_ALLOC_N(def->portGroups, nPortGroups) < 0) - return NULL; + def->portGroups = g_new0(virPortGroupDef, nPortGroups); /* parse each portgroup */ for (i = 0; i < nPortGroups; i++) { if (virNetworkPortGroupParseXML(&def->portGroups[i], @@ -1883,8 +1872,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt, size_t i; /* allocate array to hold all the addrs */ - if (VIR_ALLOC_N(def->ips, nips) < 0) - return NULL; + def->ips = g_new0(virNetworkIPDef, nips); /* parse each addr */ for (i = 0; i < nips; i++) { if (virNetworkIPDefParseXML(def->name, @@ -1904,8 +1892,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt, size_t i; /* allocate array to hold all the route definitions */ - if (VIR_ALLOC_N(def->routes, nRoutes) < 0) - return NULL; + def->routes = g_new0(virNetDevIPRoutePtr, nRoutes); /* parse each definition */ for (i = 0; i < nRoutes; i++) { virNetDevIPRoutePtr route = NULL; -- 2.26.2

Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/conf/domain_addr.c | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 9114f2d8d0..ab508b0c8f 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -1026,8 +1026,7 @@ virDomainPCIAddressSetExtensionAlloc(virDomainPCIAddressSetPtr addrs, if (addrs->zpciIds) return 0; - if (VIR_ALLOC(addrs->zpciIds) < 0) - return -1; + addrs->zpciIds = g_new0(virDomainZPCIAddressIds, 1); addrs->zpciIds->uids = virHashCreateFull(10, NULL, virZPCIAddrKeyCode, @@ -1054,12 +1053,8 @@ virDomainPCIAddressSetAlloc(unsigned int nbuses, { virDomainPCIAddressSetPtr addrs; - if (VIR_ALLOC(addrs) < 0) - goto error; - - if (VIR_ALLOC_N(addrs->buses, nbuses) < 0) - goto error; - + addrs = g_new0(virDomainPCIAddressSet, 1); + addrs->buses = g_new0(virDomainPCIAddressBus, nbuses); addrs->nbuses = nbuses; if (virDomainPCIAddressSetExtensionAlloc(addrs, extFlags) < 0) @@ -1465,8 +1460,7 @@ virDomainCCWAddressSetCreate(void) { virDomainCCWAddressSetPtr addrs = NULL; - if (VIR_ALLOC(addrs) < 0) - goto error; + addrs = g_new0(virDomainCCWAddressSet, 1); if (!(addrs->defined = virHashCreate(10, virHashValueFree))) goto error; @@ -1520,8 +1514,7 @@ virDomainVirtioSerialAddrSetCreate(void) { virDomainVirtioSerialAddrSetPtr ret = NULL; - if (VIR_ALLOC(ret) < 0) - return NULL; + ret = g_new0(virDomainVirtioSerialAddrSet, 1); return ret; } @@ -1592,8 +1585,8 @@ virDomainVirtioSerialAddrSetAddController(virDomainVirtioSerialAddrSetPtr addrs, VIR_DEBUG("Adding virtio serial controller index %u with %d" " ports to the address set", cont->idx, ports); - if (VIR_ALLOC(cnt) < 0) - goto cleanup; + cnt = g_new0(virDomainVirtioSerialController, + 1); cnt->ports = virBitmapNew(ports); cnt->idx = cont->idx; @@ -1951,8 +1944,7 @@ virDomainUSBAddressSetCreate(void) { virDomainUSBAddressSetPtr addrs; - if (VIR_ALLOC(addrs) < 0) - return NULL; + addrs = g_new0(virDomainUSBAddressSet, 1); return addrs; } @@ -2039,17 +2031,14 @@ virDomainUSBAddressHubNew(size_t nports) { virDomainUSBAddressHubPtr hub = NULL, ret = NULL; - if (VIR_ALLOC(hub) < 0) - goto cleanup; + hub = g_new0(virDomainUSBAddressHub, 1); hub->portmap = virBitmapNew(nports); - if (VIR_ALLOC_N(hub->ports, nports) < 0) - goto cleanup; + hub->ports = g_new0(virDomainUSBAddressHubPtr, nports); hub->nports = nports; ret = g_steal_pointer(&hub); - cleanup: virDomainUSBAddressHubFree(hub); return ret; } -- 2.26.2

Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/conf/interface_conf.c | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c index 1e478ac075..7bb5ec4deb 100644 --- a/src/conf/interface_conf.c +++ b/src/conf/interface_conf.c @@ -337,16 +337,14 @@ virInterfaceDefParseProtoIPv4(virInterfaceProtocolDefPtr def, if (ipNodes == NULL) return 0; - if (VIR_ALLOC_N(def->ips, nipNodes) < 0) - goto error; + def->ips = g_new0(virInterfaceIPDefPtr, nipNodes); def->nips = 0; for (i = 0; i < nipNodes; i++) { virInterfaceIPDefPtr ip; - if (VIR_ALLOC(ip) < 0) - goto error; + ip = g_new0(virInterfaceIPDef, 1); ctxt->node = ipNodes[i]; if (virInterfaceDefParseIP(ip, ctxt) < 0) { @@ -393,16 +391,14 @@ virInterfaceDefParseProtoIPv6(virInterfaceProtocolDefPtr def, if (ipNodes == NULL) return 0; - if (VIR_ALLOC_N(def->ips, nipNodes) < 0) - goto error; + def->ips = g_new0(virInterfaceIPDefPtr, nipNodes); def->nips = 0; for (i = 0; i < nipNodes; i++) { virInterfaceIPDefPtr ip; - if (VIR_ALLOC(ip) < 0) - goto error; + ip = g_new0(virInterfaceIPDef, 1); ctxt->node = ipNodes[i]; if (virInterfaceDefParseIP(ip, ctxt) < 0) { @@ -438,16 +434,14 @@ virInterfaceDefParseIfAdressing(virInterfaceDefPtr def, return 0; } - if (VIR_ALLOC_N(def->protos, nProtoNodes) < 0) - goto error; + def->protos = g_new0(virInterfaceProtocolDefPtr, nProtoNodes); def->nprotos = 0; for (pp = 0; pp < nProtoNodes; pp++) { virInterfaceProtocolDefPtr proto; - if (VIR_ALLOC(proto) < 0) - goto error; + proto = g_new0(virInterfaceProtocolDef, 1); ctxt->node = protoNodes[pp]; tmp = virXPathString("string(./@family)", ctxt); @@ -522,10 +516,7 @@ virInterfaceDefParseBridge(virInterfaceDefPtr def, goto error; } if (nbItf > 0) { - if (VIR_ALLOC_N(def->data.bridge.itf, nbItf) < 0) { - ret = -1; - goto error; - } + def->data.bridge.itf = g_new0(struct _virInterfaceDef *, nbItf); def->data.bridge.nbItf = nbItf; for (i = 0; i < nbItf; i++) { @@ -568,8 +559,7 @@ virInterfaceDefParseBondItfs(virInterfaceDefPtr def, goto cleanup; } - if (VIR_ALLOC_N(def->data.bond.itf, nbItf) < 0) - goto cleanup; + def->data.bond.itf = g_new0(struct _virInterfaceDef *, nbItf); def->data.bond.nbItf = nbItf; @@ -712,8 +702,7 @@ virInterfaceDefParseXML(xmlXPathContextPtr ctxt, } VIR_FREE(tmp); - if (VIR_ALLOC(def) < 0) - return NULL; + def = g_new0(virInterfaceDef, 1); if (((parentIfType == VIR_INTERFACE_TYPE_BOND) && (type != VIR_INTERFACE_TYPE_ETHERNET)) -- 2.26.2

Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/conf/storage_conf.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index ae63cc725e..09769e6c79 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -572,8 +572,7 @@ virStoragePoolDefParseSource(xmlXPathContextPtr ctxt, goto cleanup; if (n) { - if (VIR_ALLOC_N(source->hosts, n) < 0) - goto cleanup; + source->hosts = g_new0(virStoragePoolSourceHost, n); source->nhost = n; for (i = 0; i < source->nhost; i++) { @@ -703,8 +702,7 @@ virStoragePoolDefParseSourceString(const char *srcSpec, &xpath_ctxt))) return NULL; - if (VIR_ALLOC(def) < 0) - return NULL; + def = g_new0(virStoragePoolSource, 1); if (!(node = virXPathNode("/source", xpath_ctxt))) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -814,8 +812,7 @@ virStoragePoolDefRefreshParse(xmlXPathContextPtr ctxt, return -1; } - if (VIR_ALLOC(refresh) < 0) - return -1; + refresh = g_new0(virStoragePoolDefRefresh, 1); refresh->volume.allocation = tmp; def->refresh = g_steal_pointer(&refresh); @@ -876,8 +873,7 @@ virStoragePoolDefParseXML(xmlXPathContextPtr ctxt) g_autofree char *uuid = NULL; g_autofree char *target_path = NULL; - if (VIR_ALLOC(def) < 0) - return NULL; + def = g_new0(virStoragePoolDef, 1); type = virXPathString("string(./@type)", ctxt); if (type == NULL) { @@ -1324,8 +1320,7 @@ virStorageVolDefParseXML(virStoragePoolDefPtr pool, if (options == NULL) return NULL; - if (VIR_ALLOC(def) < 0) - return NULL; + def = g_new0(virStorageVolDef, 1); def->target.type = VIR_STORAGE_TYPE_FILE; @@ -1370,8 +1365,7 @@ virStorageVolDefParseXML(virStoragePoolDefPtr pool, } } - if (VIR_ALLOC(def->target.backingStore->perms) < 0) - return NULL; + def->target.backingStore->perms = g_new0(virStoragePerms, 1); if (virStorageDefParsePerms(ctxt, def->target.backingStore->perms, "./backingStore/permissions") < 0) return NULL; @@ -1417,8 +1411,7 @@ virStorageVolDefParseXML(virStoragePoolDefPtr pool, } } - if (VIR_ALLOC(def->target.perms) < 0) - return NULL; + def->target.perms = g_new0(virStoragePerms, 1); if (virStorageDefParsePerms(ctxt, def->target.perms, "./target/permissions") < 0) return NULL; -- 2.26.2

Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/conf/nwfilter_params.c | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c index f2ec08012a..1210079954 100644 --- a/src/conf/nwfilter_params.c +++ b/src/conf/nwfilter_params.c @@ -70,8 +70,7 @@ virNWFilterVarValueCopy(const virNWFilterVarValue *val) size_t i; char *str; - if (VIR_ALLOC(res) < 0) - return NULL; + res = g_new0(virNWFilterVarValue, 1); res->valType = val->valType; switch (res->valType) { @@ -79,8 +78,7 @@ virNWFilterVarValueCopy(const virNWFilterVarValue *val) res->u.simple.value = g_strdup(val->u.simple.value); break; case NWFILTER_VALUE_TYPE_ARRAY: - if (VIR_ALLOC_N(res->u.array.values, val->u.array.nValues) < 0) - goto err_exit; + res->u.array.values = g_new0(char *, val->u.array.nValues); res->u.array.nValues = val->u.array.nValues; for (i = 0; i < val->u.array.nValues; i++) { str = g_strdup(val->u.array.values[i]); @@ -92,10 +90,6 @@ virNWFilterVarValueCopy(const virNWFilterVarValue *val) } return res; - - err_exit: - virNWFilterVarValueFree(res); - return NULL; } virNWFilterVarValuePtr @@ -109,8 +103,7 @@ virNWFilterVarValueCreateSimple(char *value) return NULL; } - if (VIR_ALLOC(val) < 0) - return NULL; + val = g_new0(virNWFilterVarValue, 1); val->valType = NWFILTER_VALUE_TYPE_SIMPLE; val->u.simple.value = value; @@ -219,10 +212,7 @@ virNWFilterVarValueAddValue(virNWFilterVarValuePtr val, char *value) case NWFILTER_VALUE_TYPE_SIMPLE: /* switch to array */ tmp = val->u.simple.value; - if (VIR_ALLOC_N(val->u.array.values, 2) < 0) { - val->u.simple.value = tmp; - return -1; - } + val->u.array.values = g_new0(char *, 2); val->valType = NWFILTER_VALUE_TYPE_ARRAY; val->u.array.nValues = 2; val->u.array.values[0] = tmp; @@ -870,8 +860,7 @@ virNWFilterVarAccessParse(const char *varAccess) virNWFilterVarAccessPtr dest; const char *input = varAccess; - if (VIR_ALLOC(dest) < 0) - return NULL; + dest = g_new0(virNWFilterVarAccess, 1); idx = strspn(input, VALID_VARNAME); -- 2.26.2

Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/conf/checkpoint_conf.c | 4 ++-- src/conf/domain_capabilities.c | 7 +------ src/conf/domain_event.c | 3 +-- src/conf/domain_nwfilter.c | 3 +-- src/conf/netdev_bandwidth_conf.c | 9 +++------ src/conf/netdev_vlan_conf.c | 4 +--- src/conf/netdev_vport_profile_conf.c | 3 +-- src/conf/networkcommon_conf.c | 3 +-- src/conf/nwfilter_conf.c | 12 ++++-------- src/conf/object_event.c | 11 +++-------- src/conf/secret_conf.c | 3 +-- src/conf/snapshot_conf.c | 4 ++-- src/conf/virchrdev.c | 10 +++------- src/conf/virdomaincheckpointobjlist.c | 10 +++++----- src/conf/virdomainmomentobjlist.c | 6 ++---- src/conf/virdomainobjlist.c | 8 ++------ src/conf/virdomainsnapshotobjlist.c | 9 ++++----- src/conf/virinterfaceobj.c | 5 ++--- src/conf/virnetworkobj.c | 7 +++---- src/conf/virnetworkportdef.c | 4 ++-- src/conf/virnodedeviceobj.c | 7 ++----- src/conf/virnwfilterbindingdef.c | 6 ++---- src/conf/virnwfilterbindingobjlist.c | 8 ++------ src/conf/virnwfilterobj.c | 9 +++------ 24 files changed, 53 insertions(+), 102 deletions(-) diff --git a/src/conf/checkpoint_conf.c b/src/conf/checkpoint_conf.c index f97621dabf..e175917eae 100644 --- a/src/conf/checkpoint_conf.c +++ b/src/conf/checkpoint_conf.c @@ -182,8 +182,8 @@ virDomainCheckpointDefParse(xmlXPathContextPtr ctxt, if ((n = virXPathNodeSet("./disks/*", ctxt, &nodes)) < 0) return NULL; - if (n && VIR_ALLOC_N(def->disks, n) < 0) - return NULL; + if (n) + def->disks = g_new0(virDomainCheckpointDiskDef, n); def->ndisks = n; for (i = 0; i < def->ndisks; i++) { if (virDomainCheckpointDiskDefParseXML(nodes[i], ctxt, diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c index 59ad8937a4..6ee8730111 100644 --- a/src/conf/domain_capabilities.c +++ b/src/conf/domain_capabilities.c @@ -155,15 +155,10 @@ virDomainCapsCPUModelsNew(size_t nmodels) if (!(cpuModels = virObjectNew(virDomainCapsCPUModelsClass))) return NULL; - if (VIR_ALLOC_N(cpuModels->models, nmodels) < 0) - goto error; + cpuModels->models = g_new0(virDomainCapsCPUModel, nmodels); cpuModels->nmodels_max = nmodels; return cpuModels; - - error: - virObjectUnref(cpuModels); - return NULL; } diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index d3acde0236..a8bd9f1595 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -2242,8 +2242,7 @@ virDomainQemuMonitorEventStateRegisterID(virConnectPtr conn, virCheckFlags(VIR_CONNECT_DOMAIN_QEMU_MONITOR_EVENT_REGISTER_REGEX | VIR_CONNECT_DOMAIN_QEMU_MONITOR_EVENT_REGISTER_NOCASE, -1); - if (VIR_ALLOC(data) < 0) - return -1; + data = g_new0(virDomainQemuMonitorEventData, 1); data->flags = flags; if (event && flags != -1) { if (flags & VIR_CONNECT_DOMAIN_QEMU_MONITOR_EVENT_REGISTER_REGEX) { diff --git a/src/conf/domain_nwfilter.c b/src/conf/domain_nwfilter.c index a72db6f876..ef388d5d02 100644 --- a/src/conf/domain_nwfilter.c +++ b/src/conf/domain_nwfilter.c @@ -44,8 +44,7 @@ virNWFilterBindingDefForNet(const char *vmname, { virNWFilterBindingDefPtr ret; - if (VIR_ALLOC(ret) < 0) - return NULL; + ret = g_new0(virNWFilterBindingDef, 1); ret->ownername = g_strdup(vmname); diff --git a/src/conf/netdev_bandwidth_conf.c b/src/conf/netdev_bandwidth_conf.c index 396ac62019..831ee036ac 100644 --- a/src/conf/netdev_bandwidth_conf.c +++ b/src/conf/netdev_bandwidth_conf.c @@ -121,8 +121,7 @@ virNetDevBandwidthParse(virNetDevBandwidthPtr *bandwidth, xmlNodePtr in = NULL, out = NULL; char *class_id_prop = NULL; - if (VIR_ALLOC(def) < 0) - return ret; + def = g_new0(virNetDevBandwidth, 1); if (!node || !virXMLNodeNameEqual(node, "bandwidth")) { virReportError(VIR_ERR_INVALID_ARG, "%s", @@ -173,8 +172,7 @@ virNetDevBandwidthParse(virNetDevBandwidthPtr *bandwidth, } if (in) { - if (VIR_ALLOC(def->in) < 0) - goto cleanup; + def->in = g_new0(virNetDevBandwidthRate, 1); if (virNetDevBandwidthParseRate(in, def->in) < 0) { /* helper reported error for us */ @@ -189,8 +187,7 @@ virNetDevBandwidthParse(virNetDevBandwidthPtr *bandwidth, } if (out) { - if (VIR_ALLOC(def->out) < 0) - goto cleanup; + def->out = g_new0(virNetDevBandwidthRate, 1); if (virNetDevBandwidthParseRate(out, def->out) < 0) { /* helper reported error for us */ diff --git a/src/conf/netdev_vlan_conf.c b/src/conf/netdev_vlan_conf.c index 493708fee1..6c93279ec5 100644 --- a/src/conf/netdev_vlan_conf.c +++ b/src/conf/netdev_vlan_conf.c @@ -53,9 +53,7 @@ virNetDevVlanParse(xmlNodePtr node, xmlXPathContextPtr ctxt, virNetDevVlanPtr de goto cleanup; } - if (VIR_ALLOC_N(def->tag, nTags) < 0) - goto cleanup; - + def->tag = g_new0(unsigned int, nTags); def->nativeMode = 0; def->nativeTag = 0; for (i = 0; i < nTags; i++) { diff --git a/src/conf/netdev_vport_profile_conf.c b/src/conf/netdev_vport_profile_conf.c index 1dd8439adb..fdc689b38a 100644 --- a/src/conf/netdev_vport_profile_conf.c +++ b/src/conf/netdev_vport_profile_conf.c @@ -39,8 +39,7 @@ virNetDevVPortProfileParse(xmlNodePtr node, unsigned int flags) virNetDevVPortProfilePtr virtPort = NULL; xmlNodePtr cur = node->children; - if (VIR_ALLOC(virtPort) < 0) - return NULL; + virtPort = g_new0(virNetDevVPortProfile, 1); if ((virtPortType = virXMLPropString(node, "type")) && (virtPort->virtPortType = virNetDevVPortTypeFromString(virtPortType)) <= 0) { diff --git a/src/conf/networkcommon_conf.c b/src/conf/networkcommon_conf.c index 2e51c80174..26eeb6dbda 100644 --- a/src/conf/networkcommon_conf.c +++ b/src/conf/networkcommon_conf.c @@ -44,8 +44,7 @@ virNetDevIPRouteCreate(const char *errorDetail, virNetDevIPRoutePtr def = NULL; virSocketAddr testAddr; - if (VIR_ALLOC(def) < 0) - return NULL; + def = g_new0(virNetDevIPRoute, 1); def->family = g_strdup(family); diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index 53794e8f6d..be684c3512 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -2069,8 +2069,7 @@ virNWFilterIncludeParse(xmlNodePtr cur) { virNWFilterIncludeDefPtr ret; - if (VIR_ALLOC(ret) < 0) - return NULL; + ret = g_new0(virNWFilterIncludeDef, 1); ret->filterref = virXMLPropString(cur, "filter"); if (!ret->filterref) { @@ -2423,8 +2422,7 @@ virNWFilterRuleParse(xmlNodePtr node) xmlNodePtr cur; virNWFilterRuleDefPtr ret; - if (VIR_ALLOC(ret) < 0) - return NULL; + ret = g_new0(virNWFilterRuleDef, 1); action = virXMLPropString(node, "action"); direction = virXMLPropString(node, "direction"); @@ -2616,8 +2614,7 @@ virNWFilterDefParseXML(xmlXPathContextPtr ctxt) int chain_priority; const char *name_prefix; - if (VIR_ALLOC(ret) < 0) - return NULL; + ret = g_new0(virNWFilterDef, 1); ret->name = virXPathString("string(./@name)", ctxt); if (!ret->name) { @@ -2689,8 +2686,7 @@ virNWFilterDefParseXML(xmlXPathContextPtr ctxt) while (curr != NULL) { if (curr->type == XML_ELEMENT_NODE) { - if (VIR_ALLOC(entry) < 0) - goto cleanup; + entry = g_new0(virNWFilterEntry, 1); if (virXMLNodeNameEqual(curr, "rule")) { if (!(entry->rule = virNWFilterRuleParse(curr))) { diff --git a/src/conf/object_event.c b/src/conf/object_event.c index 408e0fd2b2..28e75f8b59 100644 --- a/src/conf/object_event.c +++ b/src/conf/object_event.c @@ -424,8 +424,7 @@ virObjectEventCallbackListAddID(virConnectPtr conn, return -1; } /* Allocate new cb */ - if (VIR_ALLOC(cb) < 0) - goto cleanup; + cb = g_new0(virObjectEventCallback, 1); cb->conn = virObjectRef(conn); *callbackID = cb->callbackID = cbList->nextID++; cb->cb = callback; @@ -501,10 +500,7 @@ virObjectEventQueueFree(virObjectEventQueuePtr queue) static virObjectEventQueuePtr virObjectEventQueueNew(void) { - virObjectEventQueuePtr ret; - - ignore_value(VIR_ALLOC(ret)); - return ret; + return g_new0(virObjectEventQueue, 1); } @@ -566,8 +562,7 @@ virObjectEventStateNew(void) if (!(state = virObjectLockableNew(virObjectEventStateClass))) return NULL; - if (VIR_ALLOC(state->callbacks) < 0) - goto error; + state->callbacks = g_new0(virObjectEventCallbackList, 1); if (!(state->queue = virObjectEventQueueNew())) goto error; diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c index 2e35348ce1..273987bdb4 100644 --- a/src/conf/secret_conf.c +++ b/src/conf/secret_conf.c @@ -149,8 +149,7 @@ secretXMLParseNode(xmlDocPtr xml, xmlNodePtr root) ctxt->node = root; - if (VIR_ALLOC(def) < 0) - return NULL; + def = g_new0(virSecretDef, 1); prop = virXPathString("string(./@ephemeral)", ctxt); if (prop != NULL) { diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index 7090e3a1b0..31cce15d53 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -367,8 +367,8 @@ virDomainSnapshotDefParse(xmlXPathContextPtr ctxt, if ((n = virXPathNodeSet("./disks/*", ctxt, &nodes)) < 0) goto cleanup; if (flags & VIR_DOMAIN_SNAPSHOT_PARSE_DISKS) { - if (n && VIR_ALLOC_N(def->disks, n) < 0) - goto cleanup; + if (n) + def->disks = g_new0(virDomainSnapshotDiskDef, n); def->ndisks = n; for (i = 0; i < def->ndisks; i++) { if (virDomainSnapshotDiskDefParseXML(nodes[i], ctxt, &def->disks[i], diff --git a/src/conf/virchrdev.c b/src/conf/virchrdev.c index 635aa43c49..c50f9ca720 100644 --- a/src/conf/virchrdev.c +++ b/src/conf/virchrdev.c @@ -255,8 +255,7 @@ static void virChrdevFDStreamCloseCb(virStreamPtr st G_GNUC_UNUSED, virChrdevsPtr virChrdevAlloc(void) { virChrdevsPtr devs; - if (VIR_ALLOC(devs) < 0) - return NULL; + devs = g_new0(virChrdevs, 1); if (virMutexInit(&devs->lock) < 0) { virReportSystemError(errno, "%s", @@ -388,11 +387,8 @@ int virChrdevOpen(virChrdevsPtr devs, return -1; } - if (VIR_ALLOC(cbdata) < 0) - goto error; - - if (VIR_ALLOC(ent) < 0) - goto error; + cbdata = g_new0(virChrdevStreamInfo, 1); + ent = g_new0(virChrdevHashEntry, 1); ent->st = st; ent->dev = g_strdup(path); diff --git a/src/conf/virdomaincheckpointobjlist.c b/src/conf/virdomaincheckpointobjlist.c index a4942ea706..c6f2fbe46f 100644 --- a/src/conf/virdomaincheckpointobjlist.c +++ b/src/conf/virdomaincheckpointobjlist.c @@ -62,8 +62,8 @@ virDomainCheckpointObjListNew(void) { virDomainCheckpointObjListPtr checkpoints; - if (VIR_ALLOC(checkpoints) < 0) - return NULL; + checkpoints = g_new0(virDomainCheckpointObjList, + 1); checkpoints->base = virDomainMomentObjListNew(); if (!checkpoints->base) { VIR_FREE(checkpoints); @@ -216,9 +216,9 @@ virDomainListCheckpoints(virDomainCheckpointObjListPtr checkpoints, if (!chks || count < 0) return count; - if (VIR_ALLOC_N(names, count) < 0 || - VIR_ALLOC_N(list, count + 1) < 0) - goto cleanup; + + names = g_new0(char *, count); + list = g_new0(virDomainCheckpointPtr, count + 1); if (virDomainCheckpointObjListGetNames(checkpoints, from, names, count, flags) < 0) diff --git a/src/conf/virdomainmomentobjlist.c b/src/conf/virdomainmomentobjlist.c index 18dbd434fb..8a1eb6b734 100644 --- a/src/conf/virdomainmomentobjlist.c +++ b/src/conf/virdomainmomentobjlist.c @@ -212,8 +212,7 @@ virDomainMomentObjNew(void) { virDomainMomentObjPtr moment; - if (VIR_ALLOC(moment) < 0) - return NULL; + moment = g_new0(virDomainMomentObj, 1); VIR_DEBUG("obj=%p", moment); @@ -275,8 +274,7 @@ virDomainMomentObjListNew(void) { virDomainMomentObjListPtr moments; - if (VIR_ALLOC(moments) < 0) - return NULL; + moments = g_new0(virDomainMomentObjList, 1); moments->objs = virHashCreate(50, virDomainMomentObjListDataFree); if (!moments->objs) { VIR_FREE(moments); diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c index 417025ae9f..46b28cc9a6 100644 --- a/src/conf/virdomainobjlist.c +++ b/src/conf/virdomainobjlist.c @@ -981,10 +981,7 @@ virDomainObjListCollect(virDomainObjListPtr domlist, virObjectRWLockRead(domlist); sa_assert(domlist->objs); - if (VIR_ALLOC_N(data.vms, virHashSize(domlist->objs)) < 0) { - virObjectRWUnlock(domlist); - return -1; - } + data.vms = g_new0(virDomainObjPtr, virHashSize(domlist->objs)); virHashForEach(domlist->objs, virDomainObjListCollectIterator, &data); virObjectRWUnlock(domlist); @@ -1074,8 +1071,7 @@ virDomainObjListExport(virDomainObjListPtr domlist, return -1; if (domains) { - if (VIR_ALLOC_N(doms, nvms + 1) < 0) - goto cleanup; + doms = g_new0(virDomainPtr, nvms + 1); for (i = 0; i < nvms; i++) { virDomainObjPtr vm = vms[i]; diff --git a/src/conf/virdomainsnapshotobjlist.c b/src/conf/virdomainsnapshotobjlist.c index 910b0714c7..f13150e463 100644 --- a/src/conf/virdomainsnapshotobjlist.c +++ b/src/conf/virdomainsnapshotobjlist.c @@ -85,8 +85,8 @@ virDomainSnapshotObjListNew(void) { virDomainSnapshotObjListPtr snapshots; - if (VIR_ALLOC(snapshots) < 0) - return NULL; + snapshots = g_new0(virDomainSnapshotObjList, + 1); snapshots->base = virDomainMomentObjListNew(); if (!snapshots->base) { VIR_FREE(snapshots); @@ -267,9 +267,8 @@ virDomainListSnapshots(virDomainSnapshotObjListPtr snapshots, if (!snaps || count < 0) return count; - if (VIR_ALLOC_N(names, count) < 0 || - VIR_ALLOC_N(list, count + 1) < 0) - goto cleanup; + names = g_new0(char *, count); + list = g_new0(virDomainSnapshotPtr, count + 1); if (virDomainSnapshotObjListGetNames(snapshots, from, names, count, flags) < 0) diff --git a/src/conf/virinterfaceobj.c b/src/conf/virinterfaceobj.c index 43ba395d2b..5a5fd65e14 100644 --- a/src/conf/virinterfaceobj.c +++ b/src/conf/virinterfaceobj.c @@ -319,9 +319,8 @@ virInterfaceObjListExport(virConnectPtr conn, .nifaces = 0, .error = false }; virObjectRWLockRead(ifaceobjs); - if (ifaces && VIR_ALLOC_N(data.ifaces, - virHashSize(ifaceobjs->objsName) + 1) < 0) - goto cleanup; + if (ifaces) + data.ifaces = g_new0(virInterfacePtr, virHashSize(ifaceobjs->objsName)); virHashForEach(ifaceobjs->objsName, virInterfaceObjListExportCallback, &data); diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index aefe23fde1..1fcfa9cdc2 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -1406,8 +1406,8 @@ virNetworkObjListExport(virConnectPtr conn, .nnets = 0, .error = false }; virObjectRWLockRead(netobjs); - if (nets && VIR_ALLOC_N(data.nets, virHashSize(netobjs->objs) + 1) < 0) - goto cleanup; + if (nets) + data.nets = g_new0(virNetworkPtr, virHashSize(netobjs->objs)); virHashForEach(netobjs->objs, virNetworkObjListExportCallback, &data); @@ -1801,8 +1801,7 @@ virNetworkObjPortListExport(virNetworkPtr net, if (ports) { *ports = NULL; - if (VIR_ALLOC_N(data.ports, virHashSize(obj->ports) + 1) < 0) - goto cleanup; + data.ports = g_new0(virNetworkPortPtr, virHashSize(obj->ports)); } virHashForEach(obj->ports, virNetworkObjPortListExportCallback, &data); diff --git a/src/conf/virnetworkportdef.c b/src/conf/virnetworkportdef.c index 1db3dc69e2..3183078195 100644 --- a/src/conf/virnetworkportdef.c +++ b/src/conf/virnetworkportdef.c @@ -95,8 +95,8 @@ virNetworkPortDefParseXML(xmlXPathContextPtr ctxt) g_autofree char *managed = NULL; g_autofree char *driver = NULL; - if (VIR_ALLOC(def) < 0) - return NULL; + def = g_new0(virNetworkPortDef, + 1); uuid = virXPathString("string(./uuid)", ctxt); if (!uuid) { diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c index 8aefd15e94..28905c67b6 100644 --- a/src/conf/virnodedeviceobj.c +++ b/src/conf/virnodedeviceobj.c @@ -930,11 +930,8 @@ virNodeDeviceObjListExport(virConnectPtr conn, .devices = NULL, .ndevices = 0, .error = false }; virObjectRWLockRead(devs); - if (devices && - VIR_ALLOC_N(data.devices, virHashSize(devs->objs) + 1) < 0) { - virObjectRWUnlock(devs); - return -1; - } + if (devices) + data.devices = g_new0(virNodeDevicePtr, virHashSize(devs->objs)); virHashForEach(devs->objs, virNodeDeviceObjListExportCallback, &data); virObjectRWUnlock(devs); diff --git a/src/conf/virnwfilterbindingdef.c b/src/conf/virnwfilterbindingdef.c index f286bdd840..81f8e72182 100644 --- a/src/conf/virnwfilterbindingdef.c +++ b/src/conf/virnwfilterbindingdef.c @@ -51,8 +51,7 @@ virNWFilterBindingDefCopy(virNWFilterBindingDefPtr src) { virNWFilterBindingDefPtr ret; - if (VIR_ALLOC(ret) < 0) - return NULL; + ret = g_new0(virNWFilterBindingDef, 1); ret->ownername = g_strdup(src->ownername); @@ -88,8 +87,7 @@ virNWFilterBindingDefParseXML(xmlXPathContextPtr ctxt) char *mac = NULL; xmlNodePtr node; - if (VIR_ALLOC(ret) < 0) - return NULL; + ret = g_new0(virNWFilterBindingDef, 1); ret->portdevname = virXPathString("string(./portdev/@name)", ctxt); if (!ret->portdevname) { diff --git a/src/conf/virnwfilterbindingobjlist.c b/src/conf/virnwfilterbindingobjlist.c index 97e4d3c49b..328b1b8482 100644 --- a/src/conf/virnwfilterbindingobjlist.c +++ b/src/conf/virnwfilterbindingobjlist.c @@ -434,10 +434,7 @@ virNWFilterBindingObjListCollect(virNWFilterBindingObjListPtr domlist, virObjectRWLockRead(domlist); sa_assert(domlist->objs); - if (VIR_ALLOC_N(data.bindings, virHashSize(domlist->objs)) < 0) { - virObjectRWUnlock(domlist); - return -1; - } + data.bindings = g_new0(virNWFilterBindingObjPtr, virHashSize(domlist->objs)); virHashForEach(domlist->objs, virNWFilterBindingObjListCollectIterator, &data); virObjectRWUnlock(domlist); @@ -467,8 +464,7 @@ virNWFilterBindingObjListExport(virNWFilterBindingObjListPtr bindings, return -1; if (bindinglist) { - if (VIR_ALLOC_N(*bindinglist, nbindings + 1) < 0) - goto cleanup; + *bindinglist = g_new0(virNWFilterBindingPtr, nbindings + 1); for (i = 0; i < nbindings; i++) { virNWFilterBindingObjPtr binding = bindingobjs[i]; diff --git a/src/conf/virnwfilterobj.c b/src/conf/virnwfilterobj.c index c9e224061d..fce402f907 100644 --- a/src/conf/virnwfilterobj.c +++ b/src/conf/virnwfilterobj.c @@ -53,8 +53,7 @@ virNWFilterObjNew(void) { virNWFilterObjPtr obj; - if (VIR_ALLOC(obj) < 0) - return NULL; + obj = g_new0(virNWFilterObj, 1); if (virMutexInitRecursive(&obj->lock) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -120,8 +119,7 @@ virNWFilterObjListNew(void) { virNWFilterObjListPtr nwfilters; - if (VIR_ALLOC(nwfilters) < 0) - return NULL; + nwfilters = g_new0(virNWFilterObjList, 1); return nwfilters; } @@ -450,8 +448,7 @@ virNWFilterObjListExport(virConnectPtr conn, goto cleanup; } - if (VIR_ALLOC_N(tmp_filters, nwfilters->count + 1) < 0) - goto cleanup; + tmp_filters = g_new0(virNWFilterPtr, nwfilters->count + 1); for (i = 0; i < nwfilters->count; i++) { obj = nwfilters->objs[i]; -- 2.26.2