From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752803; cv=none; d=zoho.com; s=zohoarc; b=ZJSEI9J8/5WZVbix0r45ofo3YpAC7L+hhD8FWc03+YWM3OaFpaf3iYjA0rElpC5mAMAufAyHsQsSkLP9nL57rlDZGjwsP0Ob6BncxIsRpLD9XGzHRegaDyYnEDuW/yjQEAw+6ZGQXGwtzSxI15nFZESghldyCW6B6+2V2eYwxcs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752803; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=v5XisFHfgii0yEt7F8XIduwQQHNtFUXodLYtEHcPuZU=; b=FrNxrkMLHMWxNUS5/dQsU2JL01pFLwmu4YOAiAlFm5wTX7a6ijDbo/gJW55ZrSt09eSHnf7h1cBOM/Ict43kGi/LRZflFrbt8MXg1/ekIxGXJFHa3Ki6mLugagsNYArC/u5lRYMp00vbVj8ynhu0cgdhzCK0j45rJ0QYfSdjpvo= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1571752803299641.9806994802641; Tue, 22 Oct 2019 07:00:03 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-47-dlWPMRHxO8OFbHrIhpXW3w-1; Tue, 22 Oct 2019 09:58:37 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9CD0D80183E; Tue, 22 Oct 2019 13:58:31 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6E7405DC18; Tue, 22 Oct 2019 13:58:31 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 1C5374EE6E; Tue, 22 Oct 2019 13:58:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9MDwMlE001516 for ; Tue, 22 Oct 2019 09:58:22 -0400 Received: by smtp.corp.redhat.com (Postfix) id 257F06012D; Tue, 22 Oct 2019 13:58:22 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id A2EF16012C for ; Tue, 22 Oct 2019 13:58:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752802; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=v5XisFHfgii0yEt7F8XIduwQQHNtFUXodLYtEHcPuZU=; b=DyYs1Z1xgwnY+NwahKjEOaUZCIMey/ouuIHHcW57f72I/nF9UdBYnkihs6qpLKz27RpQSO FhkfzxdJM1fqYjpCN16MUP5fGz/nX+LvJG/PJUAWPdQsKCe4NO/SmCphLu9yUj1o/VoX/f y/KeAtikXfcjpiJJMHJLG/9CWrFz2+M= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:05 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 01/75] src: Don't rely on virAsprintf() returning string length X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: dlWPMRHxO8OFbHrIhpXW3w-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" In a few places our code relies on the fact that virAsprintf() not only prints to allocated string but also that it returns the length of that string. Fortunately, only few such places were identified: https://www.redhat.com/archives/libvir-list/2019-September/msg01382.html In case of virNWFilterSnoopLeaseFileWrite() and virFilePrintf() we can use strlen() right after virAsprintf() to calculate the length. In case of virDoubleToStr() it's only caller checks for error case only, so we can limit the set of returned values to just [-1, 0]. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- src/nwfilter/nwfilter_dhcpsnoop.c | 7 +++---- src/util/virfile.c | 5 +++-- src/util/virstring.c | 10 ++++++---- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcp= snoop.c index bf25345e2c..665e7bff9c 100644 --- a/src/nwfilter/nwfilter_dhcpsnoop.c +++ b/src/nwfilter/nwfilter_dhcpsnoop.c @@ -1766,13 +1766,12 @@ virNWFilterSnoopLeaseFileWrite(int lfd, const char = *ifkey, } =20 /* time intf ip dhcpserver */ - len =3D virAsprintf(&lbuf, "%u %s %s %s\n", ipl->timeout, - ifkey, ipstr, dhcpstr); - - if (len < 0) { + if (virAsprintf(&lbuf, "%u %s %s %s\n", ipl->timeout, + ifkey, ipstr, dhcpstr) < 0) { ret =3D -1; goto cleanup; } + len =3D strlen(lbuf); =20 if (safewrite(lfd, lbuf, len) !=3D len) { virReportSystemError(errno, "%s", _("lease file write failed")); diff --git a/src/util/virfile.c b/src/util/virfile.c index c4d544be73..7c97317994 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -3394,12 +3394,13 @@ int virFilePrintf(FILE *fp, const char *msg, ...) { va_list vargs; g_autofree char *str =3D NULL; - int ret; + int ret =3D -1; =20 va_start(vargs, msg); =20 - if ((ret =3D virVasprintf(&str, msg, vargs)) < 0) + if (virVasprintf(&str, msg, vargs) < 0) goto cleanup; + ret =3D strlen(str); =20 if (fwrite(str, 1, ret, fp) !=3D ret) { virReportSystemError(errno, "%s", diff --git a/src/util/virstring.c b/src/util/virstring.c index 1494eab132..4294b7456e 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -703,23 +703,25 @@ virStrToDouble(char const *s, * * converts double to string with C locale (thread-safe). * - * Returns -1 on error, size of the string otherwise. + * Returns: on success, -1 otherwise. */ int virDoubleToStr(char **strp, double number) { virLocale oldlocale; - int ret =3D -1; + int rc =3D -1; =20 if (virLocaleSetRaw(&oldlocale) < 0) return -1; =20 - ret =3D virAsprintf(strp, "%lf", number); + rc =3D virAsprintf(strp, "%lf", number); =20 virLocaleRevert(&oldlocale); virLocaleFixupRadix(strp); =20 - return ret; + if (rc < 0) + return -1; + return 0; } =20 =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752713; cv=none; d=zoho.com; s=zohoarc; b=lbkYQYHZJJHSZgvjmnozXwKmmxASh55S/wah9SqK+0ET3FBJkqJ4f3HG4B/EUJt22uyGU5x38C/umR7koMPa0/cd240xKlPQHyrArRQHHNVkGywLJG4GXk0i/w39drz25Y/Re7gr6d41FWg6rkt4qYk+1x177L3p1r3lVVVDCDg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752713; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=IBd71aavnK9cLpCjXNkc74nfSHDZEhiRh4bdvFUnrS8=; b=CHsWNN/BVoehNK6EDZ+JitWBCgmsUiQY3rCc7GFBXRvBoOP9uaWjyZ/14//cSxeW8aGAIa1nkmtvE0KadITkyW/1UOiJubsizo+YUQaY/y+l3GRISHrOmvmbYl2JahcSn3SD70l7TSqUJLd++WSe8qZ7r1KhBtFkeHchpk+ZUMc= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1571752713459388.5627848649016; Tue, 22 Oct 2019 06:58:33 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-264-bk4WHs7QMK6oiAe1G3ztpA-1; Tue, 22 Oct 2019 09:58:30 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BE6745ED; Tue, 22 Oct 2019 13:58:25 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 98C8360856; Tue, 22 Oct 2019 13:58:25 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 533BE4EE50; Tue, 22 Oct 2019 13:58:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9MDwMNl001524 for ; Tue, 22 Oct 2019 09:58:22 -0400 Received: by smtp.corp.redhat.com (Postfix) id E84B06012D; Tue, 22 Oct 2019 13:58:22 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7238A6012C for ; Tue, 22 Oct 2019 13:58:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752712; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=IBd71aavnK9cLpCjXNkc74nfSHDZEhiRh4bdvFUnrS8=; b=XcgHqcnIm7Ygibg/7YQEtPNPXHKZho0C7KBJiNgEtCHhqWbTJToRSp1ww+09aPz7Po7NC0 MDiTicgSwwHSq0TPpC0FCaaNKbqzYmQ9hCMTEJiQ4Wfc4ct6F9xwHPjiGsv7XOy5iMLX7G wSAI5oQHKb5cOq21Z9qSaYPWQlVQnV8= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:06 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 02/75] qemu_command: Change logic in qemuVirCommandGet{FDSet, GetDevSet} X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: bk4WHs7QMK6oiAe1G3ztpA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" These two functions have pattern that's preventing us from simpler virAsprintf() -> g_strdup_printf() transition. Modify their logic a bit. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_command.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f24013f9eb..0160507737 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -256,13 +256,13 @@ qemuVirCommandGetFDSet(virCommandPtr cmd, int fd) char *result =3D NULL; int idx =3D virCommandPassFDGetFDIndex(cmd, fd); =20 - if (idx >=3D 0) { - ignore_value(virAsprintf(&result, "set=3D%d,fd=3D%d", idx, fd)); - } else { + if (idx < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("file descriptor %d has not been transferred"), f= d); + return NULL; } =20 + ignore_value(virAsprintf(&result, "set=3D%d,fd=3D%d", idx, fd)); return result; } =20 @@ -283,12 +283,13 @@ qemuVirCommandGetDevSet(virCommandPtr cmd, int fd) char *result =3D NULL; int idx =3D virCommandPassFDGetFDIndex(cmd, fd); =20 - if (idx >=3D 0) { - ignore_value(virAsprintf(&result, "/dev/fdset/%d", idx)); - } else { + if (idx < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("file descriptor %d has not been transferred"), f= d); + return NULL; } + + ignore_value(virAsprintf(&result, "/dev/fdset/%d", idx)); return result; } =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752746; cv=none; d=zoho.com; s=zohoarc; b=UbgykCIUlNtsYYKhoSZLotnXQueFVAhb8QeMYcCZLyAYhWcU72VJX67vTuzLLNBuOL29afzk0gmDd7gMlE0URD6CyyH6FfJ0H76X5JntENejh/vfro+Auy3zTs74LQnbWuPrepYHtoaWrXNzjrWY7QY+cT35eCiMAH/tvCAkfEk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752746; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=91lXJ4JRbWOX0tZlR+jpa7q5kRic9l4PPJigS5y7rvE=; b=iqkgIqYMxmgOnVkxtjm+Rk9wOa3790DKMLZOOsZ8ed1NT/HuuzpDBg+C5egcoZkvVZj//AhrqyMTK/QJLbDBUMpOMt9BTeGQE9trJXavS9KzCb3qjsCCset/6mU+WDnK+kmtcBKJTU9u2Q+lhDOM9j+3hyhxYHWMRpnMfpSyDl0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1571752746122953.9186125326722; Tue, 22 Oct 2019 06:59:06 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-179-CuIXQ71VM7K_bj8-sA7LDA-1; Tue, 22 Oct 2019 09:58:30 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6C4E5801E52; Tue, 22 Oct 2019 13:58:25 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 11D1352CE; Tue, 22 Oct 2019 13:58:25 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id B7D241803517; Tue, 22 Oct 2019 13:58:24 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9MDwNwu001531 for ; Tue, 22 Oct 2019 09:58:23 -0400 Received: by smtp.corp.redhat.com (Postfix) id B71086012E; Tue, 22 Oct 2019 13:58:23 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4172D6012C for ; Tue, 22 Oct 2019 13:58:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752742; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=91lXJ4JRbWOX0tZlR+jpa7q5kRic9l4PPJigS5y7rvE=; b=EzmG5GxSVC7gAJr3tSV/qXzvBzDIctnwTEQ992HcRYWXYbZKc9Z7LazenpMikT3J6DbWC9 oa9Hk6Cy+aAs5T1/1cXrZFRKkDJi/cZc8EKwRT3uNtqBTLVgMXBks1hiMiu2EkMiNzM16z bY8wFb+RQTiIWWsYOCG4FOiiZ1YtNUQ= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:07 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 03/75] access: Drop virAsprintf() and virAsprintfQuiet() retval checking X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: CuIXQ71VM7K_bj8-sA7LDA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" These functions can't fail really. Drop checking of their retval then. Signed-off-by: Michal Privoznik --- src/access/viraccessdriverpolkit.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/access/viraccessdriverpolkit.c b/src/access/viraccessdrive= rpolkit.c index 496210fabe..5d6c4204ff 100644 --- a/src/access/viraccessdriverpolkit.c +++ b/src/access/viraccessdriverpolkit.c @@ -59,10 +59,8 @@ virAccessDriverPolkitFormatAction(const char *typename, char *actionid =3D NULL; size_t i; =20 - if (virAsprintf(&actionid, "%s.%s.%s", - VIR_ACCESS_DRIVER_POLKIT_ACTION_PREFIX, - typename, permname) < 0) - return NULL; + virAsprintf(&actionid, "%s.%s.%s", VIR_ACCESS_DRIVER_POLKIT_ACTION_PRE= FIX, + typename, permname); =20 for (i =3D 0; actionid[i]; i++) if (actionid[i] =3D=3D '_') --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752722; cv=none; d=zoho.com; s=zohoarc; b=Qvhz+2asbc4bPv/ZBS1+OvAGi3DE/vA5Rd/q3ZwDuIOCjbtF5Ccd6GFKofnRagZJRMHy3EuTubmHp8D6dTFSY6n/9d4HG6LBRn+IqXVHsWg14HYDOwAHVbJ1qHChFyX5iRaFsyHjmaiP7m18OQ0YNJdqBbdHIK5UwyMZ7514hVk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752722; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=EgZcWKE7bHKDQJm68x9ugPvweaiE10MHHQwPqmroTus=; b=ItqRYlYcXgLfo1jcqdBf7gyxiJ4qIcBnDwM00x07iINMM2/MW64ZP2lbf2eCzKYYNgiz4ZKqMQty2H+4zYRxMA4pJmpgyXRvndsfkNGv2A39itKnx8LEfyC2GAzDfZA1YPDbA+rDP1wg34MQP0icSRAIA+9Y5MXDGTVGts9gFOc= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1571752722070371.7789629182388; Tue, 22 Oct 2019 06:58:42 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-91-ZCjUnwQHPD2gy7qFlzGDpQ-1; Tue, 22 Oct 2019 09:58:39 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6F7C31800E03; Tue, 22 Oct 2019 13:58:34 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 471E31001B39; Tue, 22 Oct 2019 13:58:34 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id EBC6D180BA98; Tue, 22 Oct 2019 13:58:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9MDwOao001536 for ; Tue, 22 Oct 2019 09:58:24 -0400 Received: by smtp.corp.redhat.com (Postfix) id 87BAC6012E; Tue, 22 Oct 2019 13:58:24 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 115316012D for ; Tue, 22 Oct 2019 13:58:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752721; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=EgZcWKE7bHKDQJm68x9ugPvweaiE10MHHQwPqmroTus=; b=Tz79RPzsn6cFaY5PPMUVuCrv91/6lwv4JPiDnBUUSGf5qHgKWpAPvNJ+8blO3LAwY41uFP K+129T4sbDT4C9hJkiHWnq8LxP07d9ml0Z+Cudvyze5PFt88x1AqY1wef6vXEHEITZtQ93 /+tgvTuOz/glTPxCvbtLAPssZRbhe2E= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:08 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 04/75] bhyve: Drop virAsprintf() and virAsprintfQuiet() retval checking X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: ZCjUnwQHPD2gy7qFlzGDpQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" These functions can't fail really. Drop checking of their retval then. Signed-off-by: Michal Privoznik --- src/bhyve/bhyve_capabilities.c | 6 ++---- src/bhyve/bhyve_process.c | 16 +++++----------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/src/bhyve/bhyve_capabilities.c b/src/bhyve/bhyve_capabilities.c index 27fa8ee5ef..2f03bd6131 100644 --- a/src/bhyve/bhyve_capabilities.c +++ b/src/bhyve/bhyve_capabilities.c @@ -159,10 +159,8 @@ virBhyveDomainCapsBuild(bhyveConnPtr conn, firmwares_alloc, firmwares->nvalues, 1) < 0) goto cleanup; =20 - if (virAsprintf( - &firmwares->values[firmwares->nvalues], - "%s/%s", firmware_dir, entry->d_name) < 0) - goto cleanup; + virAsprintf(&firmwares->values[firmwares->nvalues], "%s/%s", + firmware_dir, entry->d_name); =20 firmwares->nvalues++; } diff --git a/src/bhyve/bhyve_process.c b/src/bhyve/bhyve_process.c index 5193f6e612..17e32176d9 100644 --- a/src/bhyve/bhyve_process.c +++ b/src/bhyve/bhyve_process.c @@ -86,11 +86,10 @@ bhyveNetCleanup(virDomainObjPtr vm) } } =20 -static int +static void virBhyveFormatDevMapFile(const char *vm_name, char **fn_out) { - return virAsprintf(fn_out, "%s/grub_bhyve-%s-device.map", BHYVE_STATE_= DIR, - vm_name); + virAsprintf(fn_out, "%s/grub_bhyve-%s-device.map", BHYVE_STATE_DIR, vm= _name); } =20 int @@ -113,9 +112,7 @@ virBhyveProcessStart(virConnectPtr conn, int ret =3D -1, rc; virCapsPtr caps =3D NULL; =20 - if (virAsprintf(&logfile, "%s/%s.log", - BHYVE_LOG_DIR, vm->def->name) < 0) - return -1; + virAsprintf(&logfile, "%s/%s.log", BHYVE_LOG_DIR, vm->def->name); =20 caps =3D bhyveDriverGetCapabilities(privconn); if (!caps) @@ -165,9 +162,7 @@ virBhyveProcessStart(virConnectPtr conn, * domain is ready to be started, so we can build * and execute bhyveload command */ =20 - rc =3D virBhyveFormatDevMapFile(vm->def->name, &devmap_file); - if (rc < 0) - goto cleanup; + virBhyveFormatDevMapFile(vm->def->name, &devmap_file); =20 if (!(load_cmd =3D virBhyveProcessBuildLoadCmd(conn, vm->def, devm= ap_file, &devicemap))) @@ -408,8 +403,7 @@ virBhyveProcessReconnect(virDomainObjPtr vm, if (kp =3D=3D NULL || nprocs !=3D 1) goto cleanup; =20 - if (virAsprintf(&expected_proctitle, "bhyve: %s", vm->def->name) < 0) - goto cleanup; + virAsprintf(&expected_proctitle, "bhyve: %s", vm->def->name); =20 proc_argv =3D kvm_getargv(data->kd, kp, 0); if (proc_argv && proc_argv[0]) { --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752803; cv=none; d=zoho.com; s=zohoarc; b=DmACp9uxrA6RaB4CP9Ygc9ogjbaSloCr40LwN/5R2yrzTt1z2+KnWxPUtU4ock1/XpJ3sXPhJOQe3JZ5yyTclG3mJvKw1iMpT5NBV2J+Ec5NLrBJcKgYJuYBxOlY6YrHUpRhw0w40O/a2j/IpC+XCMozkFu59goZOKSUxWi9DVw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752803; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+psdt8niFoh+FHMzOmE5A15IlTpNlL6Y5v2Vc+OrIrw=; b=Io7wPg2Lcvuqff+ZoSfOOkp3t9CAr2U27pa3rmjWN4+lEneY5paHWXwMFgoTD9rbnlpSS34/K8EK0AiiCqec/p4UDl9ods5wQ9OWniA3J2k8aLFc20pdpS2X5lrAdUXs1JUE6t0eXNudc/vOffP9aOOt+9575V2tE9V8aPdcAZ0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1571752803274497.20902861763454; Tue, 22 Oct 2019 07:00:03 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-23-ui1Y1kOpMNKKlU1j2tB57g-1; Tue, 22 Oct 2019 09:58:41 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5837D107AD38; Tue, 22 Oct 2019 13:58:32 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3161A5DD78; Tue, 22 Oct 2019 13:58:32 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id E885C180B536; Tue, 22 Oct 2019 13:58:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9MDwP1u001544 for ; Tue, 22 Oct 2019 09:58:25 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7DDD06012D; Tue, 22 Oct 2019 13:58:25 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id D49D36012C for ; Tue, 22 Oct 2019 13:58:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752802; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=+psdt8niFoh+FHMzOmE5A15IlTpNlL6Y5v2Vc+OrIrw=; b=EO+fFW5vVdX/v8tJ3b1YwMJe4/gUJofxDTRT9S7uNpuhCYpnh62EKjaNqdd7K5pJSmSjcm ysdtQ8sOJqE2wwnFmEs7PxxeKWRsE7vr1TudPWf5U4PpEJyFEbS1GUb+dPjk1Jideo59KX YqwqXmEaArK7vxFk3PmCATheV9Ve1R0= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:09 +0200 Message-Id: <8db15985cdb31156e295f8e9adf930c92505d29d.1571752582.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 05/75] conf: Drop virAsprintf() and virAsprintfQuiet() retval checking X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: ui1Y1kOpMNKKlU1j2tB57g-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" These functions can't fail really. Drop checking of their retval then. Signed-off-by: Michal Privoznik --- src/conf/capabilities.c | 3 +- src/conf/domain_addr.c | 8 ++--- src/conf/domain_audit.c | 60 ++++++++++++-------------------- src/conf/domain_conf.c | 48 ++++++++++--------------- src/conf/moment_conf.c | 5 ++- src/conf/network_conf.c | 2 +- src/conf/node_device_util.c | 3 +- src/conf/snapshot_conf.c | 5 +-- src/conf/storage_conf.c | 6 ++-- src/conf/virchrdev.c | 7 ++-- src/conf/virnetworkobj.c | 8 ++--- src/conf/virnetworkportdef.c | 2 +- src/conf/virnwfilterbindingobj.c | 2 +- src/conf/virstorageobj.c | 3 +- 14 files changed, 61 insertions(+), 101 deletions(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 697d464fe9..b93b6ff451 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -1869,8 +1869,7 @@ virCapabilitiesInitCaches(virCapsPtr caps) int rv =3D -1; =20 VIR_FREE(path); - if (virAsprintf(&path, "%s/cpu/cpu%zd/cache/", SYSFS_SYSTEM_PATH, = pos) < 0) - goto cleanup; + virAsprintf(&path, "%s/cpu/cpu%zd/cache/", SYSFS_SYSTEM_PATH, pos); =20 VIR_DIR_CLOSE(dirp); =20 diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index dd8e04576a..9cc098a025 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -1388,10 +1388,10 @@ virDomainCCWAddressAsString(virDomainDeviceCCWAddre= ssPtr addr) { char *addrstr =3D NULL; =20 - ignore_value(virAsprintf(&addrstr, "%x.%x.%04x", - addr->cssid, - addr->ssid, - addr->devno)); + virAsprintf(&addrstr, "%x.%x.%04x", + addr->cssid, + addr->ssid, + addr->devno); return addrstr; } =20 diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c index 2ae39e3698..98b80e5bec 100644 --- a/src/conf/domain_audit.c +++ b/src/conf/domain_audit.c @@ -53,7 +53,7 @@ virDomainAuditGetRdev(const char *path) (S_ISCHR(sb.st_mode) || S_ISBLK(sb.st_mode))) { int maj =3D major(sb.st_rdev); int min =3D minor(sb.st_rdev); - ignore_value(virAsprintfQuiet(&ret, "%02X:%02X", maj, min)); + virAsprintfQuiet(&ret, "%02X:%02X", maj, min); } return ret; } @@ -101,11 +101,8 @@ virDomainAuditGenericDev(virDomainObjPtr vm, if (!newsrcpath && !oldsrcpath) return; =20 - if (virAsprintfQuiet(&newdev, "new-%s", type) < 0) - goto no_memory; - - if (virAsprintfQuiet(&olddev, "old-%s", type) < 0) - goto no_memory; + virAsprintfQuiet(&newdev, "new-%s", type); + virAsprintfQuiet(&olddev, "old-%s", type); =20 virUUIDFormat(vm->def->uuid, uuidstr); =20 @@ -376,22 +373,15 @@ virDomainAuditHostdev(virDomainObjPtr vm, virDomainHo= stdevDefPtr hostdev, case VIR_DOMAIN_HOSTDEV_MODE_SUBSYS: switch ((virDomainHostdevSubsysType) hostdev->source.subsys.type) { case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: - if (virAsprintfQuiet(&address, - VIR_PCI_DEVICE_ADDRESS_FMT, - pcisrc->addr.domain, - pcisrc->addr.bus, - pcisrc->addr.slot, - pcisrc->addr.function) < 0) { - VIR_WARN("OOM while encoding audit message"); - goto cleanup; - } + virAsprintfQuiet(&address, + VIR_PCI_DEVICE_ADDRESS_FMT, + pcisrc->addr.domain, + pcisrc->addr.bus, + pcisrc->addr.slot, + pcisrc->addr.function); break; case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: - if (virAsprintfQuiet(&address, "%.3d.%.3d", - usbsrc->bus, usbsrc->device) < 0) { - VIR_WARN("OOM while encoding audit message"); - goto cleanup; - } + virAsprintfQuiet(&address, "%.3d.%.3d", usbsrc->bus, usbsrc->d= evice); break; case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI: { if (scsisrc->protocol =3D=3D @@ -403,13 +393,10 @@ virDomainAuditHostdev(virDomainObjPtr vm, virDomainHo= stdevDefPtr hostdev, } else { virDomainHostdevSubsysSCSIHostPtr scsihostsrc =3D &scsisrc->u.host; - if (virAsprintfQuiet(&address, "%s:%u:%u:%llu", - scsihostsrc->adapter, scsihostsrc->bu= s, - scsihostsrc->target, - scsihostsrc->unit) < 0) { - VIR_WARN("OOM while encoding audit message"); - goto cleanup; - } + virAsprintfQuiet(&address, "%s:%u:%u:%llu", + scsihostsrc->adapter, scsihostsrc->bus, + scsihostsrc->target, + scsihostsrc->unit); } break; } @@ -661,11 +648,8 @@ virDomainAuditCgroupMajor(virDomainObjPtr vm, virCgrou= pPtr cgroup, { char *extra; =20 - if (virAsprintfQuiet(&extra, "major category=3D%s maj=3D%02X acl=3D%s", - name, maj, perms) < 0) { - VIR_WARN("OOM while encoding audit message"); - return; - } + virAsprintfQuiet(&extra, "major category=3D%s maj=3D%02X acl=3D%s", + name, maj, perms); =20 virDomainAuditCgroup(vm, cgroup, reason, extra, success); =20 @@ -699,13 +683,14 @@ virDomainAuditCgroupPath(virDomainObjPtr vm, virCgrou= pPtr cgroup, =20 rdev =3D virDomainAuditGetRdev(path); =20 - if (!(detail =3D virAuditEncode("path", path)) || - virAsprintfQuiet(&extra, "path %s rdev=3D%s acl=3D%s", - detail, VIR_AUDIT_STR(rdev), perms) < 0) { + if (!(detail =3D virAuditEncode("path", path))) { VIR_WARN("OOM while encoding audit message"); goto cleanup; } =20 + virAsprintfQuiet(&extra, "path %s rdev=3D%s acl=3D%s", + detail, VIR_AUDIT_STR(rdev), perms); + virDomainAuditCgroup(vm, cgroup, reason, extra, rc =3D=3D 0); =20 cleanup: @@ -936,12 +921,13 @@ virDomainAuditShmem(virDomainObjPtr vm, =20 virUUIDFormat(vm->def->uuid, uuidstr); =20 - if (!vmname || - virAsprintfQuiet(&shmpath, "/dev/shm/%s", def->name) < 0) { + if (!vmname) { VIR_WARN("OOM while encoding audit message"); goto cleanup; } =20 + virAsprintfQuiet(&shmpath, "/dev/shm/%s", def->name); + if (!virt) { VIR_WARN("Unexpected virt type %d while encoding audit message", vm->def->virtType); diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 80e19a15df..5674032b30 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4911,8 +4911,7 @@ virDomainPostParseCheckISCSIPath(char **srcpath) if (strchr(*srcpath, '/')) return 0; =20 - if (virAsprintf(&path, "%s/0", *srcpath) < 0) - return -1; + virAsprintf(&path, "%s/0", *srcpath); VIR_FREE(*srcpath); *srcpath =3D g_steal_pointer(&path); return 0; @@ -5573,8 +5572,7 @@ virDomainDefCollectBootOrder(virDomainDefPtr def G_GN= UC_UNUSED, */ return 0; } - if (virAsprintf(&order, "%u", info->bootIndex) < 0) - return -1; + virAsprintf(&order, "%u", info->bootIndex); =20 if (virHashLookup(bootHash, order)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -10122,9 +10120,8 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlo= pt, =20 if (!target && !(flags & VIR_DOMAIN_DEF_PARSE_DISK_SOURCE)) { if (def->src->srcpool) { - if (virAsprintf(&tmp, "pool =3D '%s', volume =3D '%s'", - def->src->srcpool->pool, def->src->srcpool->volume) < 0) - goto error; + virAsprintf(&tmp, "pool =3D '%s', volume =3D '%s'", + def->src->srcpool->pool, def->src->srcpool->volume= ); =20 virReportError(VIR_ERR_NO_TARGET, "%s", tmp); VIR_FREE(tmp); @@ -10321,8 +10318,7 @@ virDomainParseScaledValue(const char *xpath, g_autofree char *bytes_str =3D NULL; =20 *val =3D 0; - if (virAsprintf(&xpath_full, "string(%s)", xpath) < 0) - return -1; + virAsprintf(&xpath_full, "string(%s)", xpath); =20 bytes_str =3D virXPathString(xpath_full, ctxt); if (!bytes_str) { @@ -10342,11 +10338,10 @@ virDomainParseScaledValue(const char *xpath, return -1; } =20 - if ((units_xpath && - virAsprintf(&xpath_full, "string(%s)", units_xpath) < 0) || - (!units_xpath && - virAsprintf(&xpath_full, "string(%s/@unit)", xpath) < 0)) - return -1; + if (units_xpath) + virAsprintf(&xpath_full, "string(%s)", units_xpath); + else + virAsprintf(&xpath_full, "string(%s/@unit)", xpath); unit =3D virXPathString(xpath_full, ctxt); =20 if (virScaleInteger(&bytes, unit, scale, max) < 0) @@ -19375,8 +19370,7 @@ virDomainResctrlMonDefParse(virDomainDefPtr def, if (!(tmp =3D virBitmapFormat(domresmon->vcpus))) goto cleanup; =20 - if (virAsprintf(&id, "vcpus_%s", tmp) < 0) - goto cleanup; + virAsprintf(&id, "vcpus_%s", tmp); } =20 virResctrlMonitorSetAlloc(domresmon->instance, resctrl->alloc); @@ -19426,8 +19420,7 @@ virDomainResctrlNew(xmlNodePtr node, * directory, so it's nice to have it named appropriately. For no= w it's * 'vcpus_...' but it's designed in order for it to be changeable = in the * future (it's part of the status XML). */ - if (virAsprintf(&alloc_id, "vcpus_%s", vcpus_str) < 0) - goto cleanup; + virAsprintf(&alloc_id, "vcpus_%s", vcpus_str); } =20 if (virResctrlAllocSetID(alloc, alloc_id) < 0) @@ -24028,10 +24021,8 @@ virDomainDiskSourceFormatNetwork(virBufferPtr attr= Buf, virBufferAsprintf(attrBuf, " protocol=3D'%s'", virStorageNetProtocolTypeToString(src->protocol)); =20 - if (src->volume) { - if (virAsprintf(&path, "%s/%s", src->volume, src->path) < 0) - return -1; - } + if (src->volume) + virAsprintf(&path, "%s/%s", src->volume, src->path); =20 virBufferEscapeString(attrBuf, " name=3D'%s'", path ? path : src->path= ); =20 @@ -29198,7 +29189,7 @@ char { char *ret; =20 - ignore_value(virAsprintf(&ret, "%s/%s.xml", dir, name)); + virAsprintf(&ret, "%s/%s.xml", dir, name); return ret; } =20 @@ -30348,8 +30339,7 @@ virDomainDefGetShortName(const virDomainDef *def) len =3D mbstowcs(NULL, def->name, 0); if ((len =3D=3D (size_t) -1 && errno =3D=3D EILSEQ) || len =3D=3D strlen(def->name)) { - ignore_value(virAsprintf(&ret, "%d-%.*s", def->id, - VIR_DOMAIN_SHORT_NAME_MAX, def->name)); + virAsprintf(&ret, "%d-%.*s", def->id, VIR_DOMAIN_SHORT_NAME_MAX, d= ef->name); return ret; } =20 @@ -30385,7 +30375,7 @@ virDomainDefGetShortName(const virDomainDef *def) return NULL; } =20 - ignore_value(virAsprintf(&ret, "%d-%s", def->id, shortname)); + virAsprintf(&ret, "%d-%s", def->id, shortname); return ret; } =20 @@ -31191,10 +31181,8 @@ virDomainDiskAddISCSIPoolSourceHost(virDomainDiskD= efPtr def, } =20 /* iscsi pool has only one source device path */ - if (virAsprintf(&def->src->path, "%s/%s", - pooldef->source.devices[0].path, - tokens[3]) < 0) - goto cleanup; + virAsprintf(&def->src->path, "%s/%s", pooldef->source.devices[0].path, + tokens[3]); =20 /* Storage pool have not supported these 2 attributes yet, * use the defaults. diff --git a/src/conf/moment_conf.c b/src/conf/moment_conf.c index f54a44b33e..f11ba76dd4 100644 --- a/src/conf/moment_conf.c +++ b/src/conf/moment_conf.c @@ -77,9 +77,8 @@ virDomainMomentDefPostParse(virDomainMomentDefPtr def) =20 gettimeofday(&tv, NULL); =20 - if (!def->name && - virAsprintf(&def->name, "%lld", (long long)tv.tv_sec) < 0) - return -1; + if (!def->name) + virAsprintf(&def->name, "%lld", (long long)tv.tv_sec); =20 def->creationTime =3D tv.tv_sec; return 0; diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 7f8e43b25c..8d2bef439b 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -2756,7 +2756,7 @@ virNetworkConfigFile(const char *dir, { char *ret =3D NULL; =20 - ignore_value(virAsprintf(&ret, "%s/%s.xml", dir, name)); + virAsprintf(&ret, "%s/%s.xml", dir, name); return ret; } =20 diff --git a/src/conf/node_device_util.c b/src/conf/node_device_util.c index 2728b8a510..6c7b73384f 100644 --- a/src/conf/node_device_util.c +++ b/src/conf/node_device_util.c @@ -182,8 +182,7 @@ virNodeDeviceDeleteVport(virConnectPtr conn, goto cleanup; } =20 - if (virAsprintf(&scsi_host_name, "scsi_%s", name) < 0) - goto cleanup; + virAsprintf(&scsi_host_name, "scsi_%s", name); =20 /* If at startup time we provided a parent, then use that to * get the parent_host value; otherwise, we have to determine diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index f9fbca3c07..2c53e9d764 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -618,10 +618,7 @@ virDomainSnapshotDefAssignExternalNames(virDomainSnaps= hotDefPtr def) if ((tmp =3D strrchr(tmppath, '.')) && !strchr(tmp, '/')) *tmp =3D '\0'; =20 - if (virAsprintf(&disk->src->path, "%s.%s", tmppath, def->parent.na= me) < 0) { - VIR_FREE(tmppath); - return -1; - } + virAsprintf(&disk->src->path, "%s.%s", tmppath, def->parent.name); =20 VIR_FREE(tmppath); =20 diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index f212eefe25..ec9db7edb0 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -953,11 +953,9 @@ virStoragePoolDefParseXML(xmlXPathContextPtr ctxt) * path and permissions */ if (!(options->flags & VIR_STORAGE_POOL_SOURCE_NETWORK)) { if (def->type =3D=3D VIR_STORAGE_POOL_LOGICAL) { - if (virAsprintf(&target_path, "/dev/%s", def->source.name) < 0) - return NULL; + virAsprintf(&target_path, "/dev/%s", def->source.name); } else if (def->type =3D=3D VIR_STORAGE_POOL_ZFS) { - if (virAsprintf(&target_path, "/dev/zvol/%s", def->source.name= ) < 0) - return NULL; + virAsprintf(&target_path, "/dev/zvol/%s", def->source.name); } else { target_path =3D virXPathString("string(./target/path)", ctxt); if (!target_path) { diff --git a/src/conf/virchrdev.c b/src/conf/virchrdev.c index 1d02a4ad66..204813c5fd 100644 --- a/src/conf/virchrdev.c +++ b/src/conf/virchrdev.c @@ -88,12 +88,10 @@ static char *virChrdevLockFilePath(const char *dev) ++p; } =20 - if (virAsprintf(&path, "%s/LCK..%s", VIR_CHRDEV_LOCK_FILE_PATH, filena= me) < 0) - goto cleanup; + virAsprintf(&path, "%s/LCK..%s", VIR_CHRDEV_LOCK_FILE_PATH, filename); =20 sanitizedPath =3D virFileSanitizePath(path); =20 - cleanup: VIR_FREE(path); VIR_FREE(devCopy); =20 @@ -135,8 +133,7 @@ static int virChrdevLockFileCreate(const char *dev) =20 /* ensure correct format according to filesystem hierarchy standard */ /* http://www.pathname.com/fhs/pub/fhs-2.3.html#VARLOCKLOCKFILES */ - if (virAsprintf(&pidStr, "%10lld\n", (long long) getpid()) < 0) - goto cleanup; + virAsprintf(&pidStr, "%10lld\n", (long long)getpid()); =20 /* create the lock file */ if ((lockfd =3D open(path, O_WRONLY | O_CREAT | O_EXCL, 00644)) < 0) { diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index e7017bffa9..852c0a5e43 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -1627,7 +1627,7 @@ virNetworkObjGetPortStatusDir(virNetworkObjPtr net, const char *stateDir) { char *ret; - ignore_value(virAsprintf(&ret, "%s/%s/ports", stateDir, net->def->name= )); + virAsprintf(&ret, "%s/%s/ports", stateDir, net->def->name); return ret; } =20 @@ -1739,8 +1739,7 @@ virNetworkObjDeleteAllPorts(virNetworkObjPtr net, if (!virStringStripSuffix(de->d_name, ".xml")) continue; =20 - if (virAsprintf(&file, "%s/%s.xml", dir, de->d_name) < 0) - goto cleanup; + virAsprintf(&file, "%s/%s.xml", dir, de->d_name); =20 if (unlink(file) < 0 && errno !=3D ENOENT) VIR_WARN("Unable to delete %s", file); @@ -1900,8 +1899,7 @@ virNetworkObjLoadAllPorts(virNetworkObjPtr net, if (!virStringStripSuffix(de->d_name, ".xml")) continue; =20 - if (virAsprintf(&file, "%s/%s.xml", dir, de->d_name) < 0) - goto cleanup; + virAsprintf(&file, "%s/%s.xml", dir, de->d_name); =20 portdef =3D virNetworkPortDefParseFile(file); VIR_FREE(file); diff --git a/src/conf/virnetworkportdef.c b/src/conf/virnetworkportdef.c index 459384611c..09bd25a9ef 100644 --- a/src/conf/virnetworkportdef.c +++ b/src/conf/virnetworkportdef.c @@ -428,7 +428,7 @@ virNetworkPortDefConfigFile(const char *dir, { char *ret =3D NULL; =20 - ignore_value(virAsprintf(&ret, "%s/%s.xml", dir, name)); + virAsprintf(&ret, "%s/%s.xml", dir, name); return ret; } =20 diff --git a/src/conf/virnwfilterbindingobj.c b/src/conf/virnwfilterbinding= obj.c index 48d53fafb1..0066faadd8 100644 --- a/src/conf/virnwfilterbindingobj.c +++ b/src/conf/virnwfilterbindingobj.c @@ -142,7 +142,7 @@ virNWFilterBindingObjConfigFile(const char *dir, { char *ret; =20 - ignore_value(virAsprintf(&ret, "%s/%s.xml", dir, name)); + virAsprintf(&ret, "%s/%s.xml", dir, name); return ret; } =20 diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c index a4fd330663..15c5f2624d 100644 --- a/src/conf/virstorageobj.c +++ b/src/conf/virstorageobj.c @@ -1229,8 +1229,7 @@ matchFCHostToSCSIHost(virStorageAdapterFCHostPtr fcho= st, */ if (!fchost->parent && (conn =3D virGetConnectNodeDev())) { - if (virAsprintf(&scsi_host_name, "scsi_%s", name) < 0) - goto cleanup; + virAsprintf(&scsi_host_name, "scsi_%s", name); if ((parent_name =3D virNodeDeviceGetParentName(conn, scsi_host_name))= ) { if (virStorageIsSameHostnum(parent_name, scsi_hostnum)) { --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752724; cv=none; d=zoho.com; s=zohoarc; b=E20bEkY8XKXOHT1CYktjIgxMjGF8lDOkdrKm8vGmuU76zdQwyXzT981SidAuNfZRVfJFfh7NPZcBf1q9b0dEIHWA0fFwMm5p96X765TlU/vdlwtTyggw8YqIqcDF63ryUxOXXSxYPqwDdWhB/uceY3LnVpum26yR7seboedn+So= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752724; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2+HXYGMHPox28UwNycDOUxu3WrKeauprJxdPgFOIBPM=; b=AsQa0s2wGHQOnkGHQRdD9r2G2eWHMK/VYMwgDo2HCoWTcc/b4ChJLsLf1EO3DDRSYytYF8B44b3NyXIeYWXgIBQTkjFYv7+B4mZRrsKgjtBHUrRCBJDN+v1kNz4zYiWvGVZu5p7I6UsWoPqfx/Eg6yrK/nk2dfeXzKJI9If88C0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1571752724183114.29286711888778; Tue, 22 Oct 2019 06:58:44 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-143-j1P9zHWdPZ-nk_8h--XEkQ-1; Tue, 22 Oct 2019 09:58:41 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6529A1800E08; Tue, 22 Oct 2019 13:58:36 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 40EBF5DAAD; Tue, 22 Oct 2019 13:58:36 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id E21B24EE75; Tue, 22 Oct 2019 13:58:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9MDwQqA001549 for ; Tue, 22 Oct 2019 09:58:26 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4DC956012E; Tue, 22 Oct 2019 13:58:26 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id CA8526012D for ; Tue, 22 Oct 2019 13:58:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752723; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=2+HXYGMHPox28UwNycDOUxu3WrKeauprJxdPgFOIBPM=; b=cubxxOyY0D32UcmgDoyr2Kk7nlBSGhG5hZ3cZ7/RTewQ/+f8WZvgLo4EDVEl4wbPOwTmsE WL6RYSVv+FYCRvWYm/8Gd+7WuMWFGdl2f2fo5D/cX98DQz2mfjf2oS0149r/uiY1TM6yt4 ssLxmAMz0OYOpa3X0AkiTkbFmzn1l1o= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:10 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 06/75] cpu: Drop virAsprintf() and virAsprintfQuiet() retval checking X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: j1P9zHWdPZ-nk_8h--XEkQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" These functions can't fail really. Drop checking of their retval then. Signed-off-by: Michal Privoznik --- src/cpu/cpu_ppc64.c | 21 ++++++++++----------- src/cpu/cpu_x86.c | 19 ++++++++----------- 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/src/cpu/cpu_ppc64.c b/src/cpu/cpu_ppc64.c index 59a5e1fc1d..990bbbd45f 100644 --- a/src/cpu/cpu_ppc64.c +++ b/src/cpu/cpu_ppc64.c @@ -459,11 +459,10 @@ ppc64Compute(virCPUDefPtr host, if (!found) { VIR_DEBUG("CPU arch %s does not match host arch", virArchToString(cpu->arch)); - if (message && + if (message) virAsprintf(message, _("CPU arch %s does not match host arch"), - virArchToString(cpu->arch)) < 0) - goto cleanup; + virArchToString(cpu->arch)); =20 ret =3D VIR_CPU_COMPARE_INCOMPATIBLE; goto cleanup; @@ -477,12 +476,12 @@ ppc64Compute(virCPUDefPtr host, (!host->vendor || STRNEQ(cpu->vendor, host->vendor))) { VIR_DEBUG("host CPU vendor does not match required CPU vendor %s", cpu->vendor); - if (message && + if (message) { virAsprintf(message, _("host CPU vendor does not match required " - "CPU vendor %s"), - cpu->vendor) < 0) - goto cleanup; + "CPU vendor %s"), + cpu->vendor); + } =20 ret =3D VIR_CPU_COMPARE_INCOMPATIBLE; goto cleanup; @@ -532,12 +531,12 @@ ppc64Compute(virCPUDefPtr host, if (STRNEQ(guest_model->name, host_model->name)) { VIR_DEBUG("host CPU model does not match required CPU model %s", guest_model->name); - if (message && + if (message) { virAsprintf(message, _("host CPU model does not match required " - "CPU model %s"), - guest_model->name) < 0) - goto cleanup; + "CPU model %s"), + guest_model->name); + } =20 ret =3D VIR_CPU_COMPARE_INCOMPATIBLE; goto cleanup; diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index d7fcb3b147..8418339d6f 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -1724,11 +1724,8 @@ virCPUx86DataParse(xmlXPathContextPtr ctxt) virReportOOMError(); \ goto error; \ } \ - if (message && \ - virAsprintf(message, "%s: %s", _(MSG), flagsStr) < 0) { \ - VIR_FREE(flagsStr); \ - goto error; \ - } \ + if (message) \ + virAsprintf(message, "%s: %s", _(MSG), flagsStr); \ VIR_DEBUG("%s: %s", MSG, flagsStr); \ VIR_FREE(flagsStr); \ ret =3D VIR_CPU_COMPARE_INCOMPATIBLE; \ @@ -1769,11 +1766,11 @@ x86Compute(virCPUDefPtr host, if (!found) { VIR_DEBUG("CPU arch %s does not match host arch", virArchToString(cpu->arch)); - if (message && + if (message) { virAsprintf(message, _("CPU arch %s does not match host arch"), - virArchToString(cpu->arch)) < 0) - goto error; + virArchToString(cpu->arch)); + } return VIR_CPU_COMPARE_INCOMPATIBLE; } arch =3D cpu->arch; @@ -1785,12 +1782,12 @@ x86Compute(virCPUDefPtr host, (!host->vendor || STRNEQ(cpu->vendor, host->vendor))) { VIR_DEBUG("host CPU vendor does not match required CPU vendor %s", cpu->vendor); - if (message && + if (message) { virAsprintf(message, _("host CPU vendor does not match required " "CPU vendor %s"), - cpu->vendor) < 0) - goto error; + cpu->vendor); + } =20 return VIR_CPU_COMPARE_INCOMPATIBLE; } --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752747; cv=none; d=zoho.com; s=zohoarc; b=RYCGh7k25jWbWkbmuVFywRH7jhqxDDmujMvkyt0WWLFQN60Rqh5vEJtl0K3OQUvL4+PCr2f+gyXTa7zvFNcIRieBuveh9RDnjBt8lYOD+eUCm45XhCAubjtjCp6YXBVqe3YmjLxAYKf8j8HkALPARsH8E7cCKAIis5/EZFfx6W8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752747; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=EflYjXwYxeK1t1Es031MH9UkQRDzeZ4+8d7vp6WP8eE=; b=MbBQiFEv113sZOo+c8/05+Wt2dZlEEN0ZcWmaaclBoJQg2nxOa+hey/4qbfkBB/c9D3mLJVxHTx6HKrR759W5wP8voGusYm4P5/EQ3RRtH9tW1ftuH6XOcDZUC8ZPWUpYw8kdemhvguM73DyCCpB755jQ5Or4yxlOpeuIf9bHmY= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1571752747516916.012568476448; Tue, 22 Oct 2019 06:59:07 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-189-CBev1aSzPPSXzry-HhnWEQ-1; Tue, 22 Oct 2019 09:58:43 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4631B1800E09; Tue, 22 Oct 2019 13:58:38 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1E2725C3F8; Tue, 22 Oct 2019 13:58:38 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id D54F34EE96; Tue, 22 Oct 2019 13:58:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9MDwRl4001559 for ; Tue, 22 Oct 2019 09:58:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1E2AF6012E; Tue, 22 Oct 2019 13:58:27 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 99B816012D for ; Tue, 22 Oct 2019 13:58:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752743; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=EflYjXwYxeK1t1Es031MH9UkQRDzeZ4+8d7vp6WP8eE=; b=ILRZLSkCh/ukNlYDNdBlOqgGmxAzm69Ol67h4qUmHnZRzFvgohpjtZ6jELZz3mdugFfUIL GX/nECOJ5JVji+eKGvkrH2th/XJbVQbmfyFGiXhBIEr62tGQDLSsceY+pH46z1AMdy3r6S MZxv+58lSvcLFGW0kksxbSKwFq6O3ec= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:11 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 07/75] esx: Drop virAsprintf() and virAsprintfQuiet() retval checking X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: CBev1aSzPPSXzry-HhnWEQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" These functions can't fail really. Drop checking of their retval then. Signed-off-by: Michal Privoznik --- src/esx/esx_driver.c | 54 +++++++++--------------- src/esx/esx_storage_backend_vmfs.c | 67 +++++++++++------------------- src/esx/esx_stream.c | 11 ++--- src/esx/esx_vi.c | 32 ++++++-------- 4 files changed, 61 insertions(+), 103 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 8e39075701..117ac674d4 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -143,9 +143,8 @@ esxParseVMXFileName(const char *fileName, void *opaque) =20 if (!strchr(fileName, '/') && !strchr(fileName, '\\')) { /* Plain file name, use same directory as for the .vmx file */ - if (virAsprintf(&result, "%s/%s", - data->datastorePathWithoutFileName, fileName) < 0) - goto cleanup; + virAsprintf(&result, "%s/%s", data->datastorePathWithoutFileName, + fileName); } else { if (esxVI_String_AppendValueToList(&propertyNameList, "summary.name") < 0 || @@ -189,9 +188,7 @@ esxParseVMXFileName(const char *fileName, void *opaque) ++tmp; } =20 - if (virAsprintf(&result, "[%s] %s", datastoreName, - strippedFileName) < 0) - goto cleanup; + virAsprintf(&result, "[%s] %s", datastoreName, strippedFileNam= e); =20 break; } @@ -225,9 +222,8 @@ esxParseVMXFileName(const char *fileName, void *opaque) goto cleanup; } =20 - if (virAsprintf(&result, "[%s] %s", datastoreName, - directoryAndFileName) < 0) - goto cleanup; + virAsprintf(&result, "[%s] %s", datastoreName, + directoryAndFileName); } =20 /* If it's an absolute path outside of a datastore just use it as = is */ @@ -639,9 +635,8 @@ esxConnectToHost(esxPrivate *priv, conn->uri->server))) goto cleanup; =20 - if (virAsprintf(&url, "%s://%s:%d/sdk", priv->parsedUri->transport, - conn->uri->server, conn->uri->port) < 0) - goto cleanup; + virAsprintf(&url, "%s://%s:%d/sdk", priv->parsedUri->transport, + conn->uri->server, conn->uri->port); =20 if (esxVI_Context_Alloc(&priv->host) < 0 || esxVI_Context_Connect(priv->host, url, ipAddress, username, passwo= rd, @@ -728,9 +723,8 @@ esxConnectToVCenter(esxPrivate *priv, if (!(password =3D virAuthGetPassword(conn, auth, "esx", username, hos= tname))) goto cleanup; =20 - if (virAsprintf(&url, "%s://%s:%d/sdk", priv->parsedUri->transport, - hostname, conn->uri->port) < 0) - goto cleanup; + virAsprintf(&url, "%s://%s:%d/sdk", priv->parsedUri->transport, hostna= me, + conn->uri->port); =20 if (esxVI_Context_Alloc(&priv->vCenter) < 0 || esxVI_Context_Connect(priv->vCenter, url, ipAddress, username, @@ -1164,8 +1158,7 @@ esxConnectGetHostname(virConnectPtr conn) if (!domainName || strlen(domainName) < 1) { complete =3D g_strdup(hostName); } else { - if (virAsprintf(&complete, "%s.%s", hostName, domainName) < 0) - goto cleanup; + virAsprintf(&complete, "%s.%s", hostName, domainName); } =20 cleanup: @@ -2645,13 +2638,10 @@ esxDomainGetXMLDesc(virDomainPtr domain, unsigned i= nt flags) data.ctx =3D priv->primary; =20 if (!directoryName) { - if (virAsprintf(&data.datastorePathWithoutFileName, "[%s]", - datastoreName) < 0) - goto cleanup; + virAsprintf(&data.datastorePathWithoutFileName, "[%s]", datastoreN= ame); } else { - if (virAsprintf(&data.datastorePathWithoutFileName, "[%s] %s", - datastoreName, directoryName) < 0) - goto cleanup; + virAsprintf(&data.datastorePathWithoutFileName, "[%s] %s", + datastoreName, directoryName); } =20 ctx.opaque =3D &data; @@ -3116,13 +3106,11 @@ esxDomainDefineXMLFlags(virConnectPtr conn, const c= har *xml, unsigned int flags) =20 /* Register the domain */ if (directoryName) { - if (virAsprintf(&datastoreRelatedPath, "[%s] %s/%s.vmx", datastore= Name, - directoryName, escapedName) < 0) - goto cleanup; + virAsprintf(&datastoreRelatedPath, "[%s] %s/%s.vmx", datastoreName, + directoryName, escapedName); } else { - if (virAsprintf(&datastoreRelatedPath, "[%s] %s.vmx", datastoreNam= e, - escapedName) < 0) - goto cleanup; + virAsprintf(&datastoreRelatedPath, "[%s] %s.vmx", datastoreName, + escapedName); } =20 if (esxVI_RegisterVM_Task(priv->primary, priv->primary->datacenter->vm= Folder, @@ -3734,11 +3722,9 @@ esxDomainMigratePrepare(virConnectPtr dconn, virCheckFlags(ESX_MIGRATION_FLAGS, -1); =20 if (!uri_in) { - if (virAsprintf(uri_out, "vpxmigr://%s/%s/%s", - priv->vCenter->ipAddress, - priv->vCenter->computeResource->resourcePool->valu= e, - priv->vCenter->hostSystem->_reference->value) < 0) - return -1; + virAsprintf(uri_out, "vpxmigr://%s/%s/%s", priv->vCenter->ipAddres= s, + priv->vCenter->computeResource->resourcePool->value, + priv->vCenter->hostSystem->_reference->value); } =20 return 0; diff --git a/src/esx/esx_storage_backend_vmfs.c b/src/esx/esx_storage_backe= nd_vmfs.c index dfb4b7be15..24deee7215 100644 --- a/src/esx/esx_storage_backend_vmfs.c +++ b/src/esx/esx_storage_backend_vmfs.c @@ -605,9 +605,9 @@ esxStoragePoolListVolumes(virStoragePoolPtr pool, char = **const names, fileInfo =3D fileInfo->_next) { if (length < 1) { names[count] =3D g_strdup(fileInfo->path); - } else if (virAsprintf(&names[count], "%s/%s", directoryAndFil= eName, - fileInfo->path) < 0) { - goto cleanup; + } else { + virAsprintf(&names[count], "%s/%s", + directoryAndFileName, fileInfo->path); } =20 ++count; @@ -641,8 +641,7 @@ esxStorageVolLookupByName(virStoragePoolPtr pool, char *datastorePath =3D NULL; char *key =3D NULL; =20 - if (virAsprintf(&datastorePath, "[%s] %s", pool->name, name) < 0) - goto cleanup; + virAsprintf(&datastorePath, "[%s] %s", pool->name, name); =20 if (esxVI_LookupStorageVolumeKeyByDatastorePath(priv->primary, datastorePath, &key) <= 0) { @@ -773,15 +772,12 @@ esxStorageVolLookupByKey(virConnectPtr conn, const ch= ar *key) =20 if (length < 1) { volumeName =3D g_strdup(fileInfo->path); - } else if (virAsprintf(&volumeName, "%s/%s", - directoryAndFileName, - fileInfo->path) < 0) { - goto cleanup; + } else { + virAsprintf(&volumeName, "%s/%s", + directoryAndFileName, fileInfo->path); } =20 - if (virAsprintf(&datastorePath, "[%s] %s", datastoreName, - volumeName) < 0) - goto cleanup; + virAsprintf(&datastorePath, "[%s] %s", datastoreName, volu= meName); =20 if (!esxVI_VmDiskFileInfo_DynamicCast(fileInfo)) { /* Only a VirtualDisk has a UUID */ @@ -888,9 +884,7 @@ esxStorageVolCreateXML(virStoragePoolPtr pool, goto cleanup; } =20 - if (virAsprintf(&unescapedDatastorePath, "[%s] %s", pool->name, - def->name) < 0) - goto cleanup; + virAsprintf(&unescapedDatastorePath, "[%s] %s", pool->name, def->name); =20 if (def->target.format =3D=3D VIR_STORAGE_FILE_VMDK) { /* Parse and escape datastore path */ @@ -911,13 +905,11 @@ esxStorageVolCreateXML(virStoragePoolPtr pool, if (!fileName) goto cleanup; =20 - if (virAsprintf(&datastorePathWithoutFileName, "[%s] %s", pool->na= me, - directoryName) < 0) - goto cleanup; + virAsprintf(&datastorePathWithoutFileName, "[%s] %s", pool->name, + directoryName); =20 - if (virAsprintf(&datastorePath, "[%s] %s/%s", pool->name, director= yName, - fileName) < 0) - goto cleanup; + virAsprintf(&datastorePath, "[%s] %s/%s", pool->name, directoryNam= e, + fileName); =20 /* Create directory, if it doesn't exist yet */ if (esxVI_LookupFileInfoByDatastorePath @@ -1074,9 +1066,8 @@ esxStorageVolCreateXMLFrom(virStoragePoolPtr pool, goto cleanup; } =20 - if (virAsprintf(&sourceDatastorePath, "[%s] %s", sourceVolume->pool, - sourceVolume->name) < 0) - goto cleanup; + virAsprintf(&sourceDatastorePath, "[%s] %s", sourceVolume->pool, + sourceVolume->name); =20 /* Parse config */ def =3D virStorageVolDefParseString(&poolDef, xmldesc, 0); @@ -1107,9 +1098,7 @@ esxStorageVolCreateXMLFrom(virStoragePoolPtr pool, goto cleanup; } =20 - if (virAsprintf(&unescapedDatastorePath, "[%s] %s", pool->name, - def->name) < 0) - goto cleanup; + virAsprintf(&unescapedDatastorePath, "[%s] %s", pool->name, def->name); =20 if (def->target.format =3D=3D VIR_STORAGE_FILE_VMDK) { /* Parse and escape datastore path */ @@ -1130,13 +1119,11 @@ esxStorageVolCreateXMLFrom(virStoragePoolPtr pool, if (!fileName) goto cleanup; =20 - if (virAsprintf(&datastorePathWithoutFileName, "[%s] %s", pool->na= me, - directoryName) < 0) - goto cleanup; + virAsprintf(&datastorePathWithoutFileName, "[%s] %s", pool->name, + directoryName); =20 - if (virAsprintf(&datastorePath, "[%s] %s/%s", pool->name, director= yName, - fileName) < 0) - goto cleanup; + virAsprintf(&datastorePath, "[%s] %s/%s", pool->name, directoryNam= e, + fileName); =20 /* Create directory, if it doesn't exist yet */ if (esxVI_LookupFileInfoByDatastorePath @@ -1231,8 +1218,7 @@ esxStorageVolDelete(virStorageVolPtr volume, unsigned= int flags) =20 virCheckFlags(0, -1); =20 - if (virAsprintf(&datastorePath, "[%s] %s", volume->pool, volume->name)= < 0) - goto cleanup; + virAsprintf(&datastorePath, "[%s] %s", volume->pool, volume->name); =20 if (esxVI_DeleteVirtualDisk_Task(priv->primary, datastorePath, priv->primary->datacenter->_reference, @@ -1274,8 +1260,7 @@ esxStorageVolWipe(virStorageVolPtr volume, unsigned i= nt flags) =20 virCheckFlags(0, -1); =20 - if (virAsprintf(&datastorePath, "[%s] %s", volume->pool, volume->name)= < 0) - goto cleanup; + virAsprintf(&datastorePath, "[%s] %s", volume->pool, volume->name); =20 if (esxVI_ZeroFillVirtualDisk_Task(priv->primary, datastorePath, priv->primary->datacenter->_referen= ce, @@ -1317,8 +1302,7 @@ esxStorageVolGetInfo(virStorageVolPtr volume, =20 memset(info, 0, sizeof(*info)); =20 - if (virAsprintf(&datastorePath, "[%s] %s", volume->pool, volume->name)= < 0) - goto cleanup; + virAsprintf(&datastorePath, "[%s] %s", volume->pool, volume->name); =20 if (esxVI_LookupFileInfoByDatastorePath(priv->primary, datastorePath, false, &fileInfo, @@ -1375,8 +1359,7 @@ esxStorageVolGetXMLDesc(virStorageVolPtr volume, } =20 /* Lookup file info */ - if (virAsprintf(&datastorePath, "[%s] %s", volume->pool, volume->name)= < 0) - goto cleanup; + virAsprintf(&datastorePath, "[%s] %s", volume->pool, volume->name); =20 if (esxVI_LookupFileInfoByDatastorePath(priv->primary, datastorePath, false, &fileInfo, @@ -1437,7 +1420,7 @@ esxStorageVolGetPath(virStorageVolPtr volume) { char *path; =20 - ignore_value(virAsprintf(&path, "[%s] %s", volume->pool, volume->name)= ); + virAsprintf(&path, "[%s] %s", volume->pool, volume->name); return path; } =20 diff --git a/src/esx/esx_stream.c b/src/esx/esx_stream.c index b820b38ee2..1a779aa095 100644 --- a/src/esx/esx_stream.c +++ b/src/esx/esx_stream.c @@ -415,11 +415,9 @@ esxStreamOpen(virStreamPtr stream, esxPrivate *priv, c= onst char *url, streamPriv->mode =3D mode; =20 if (length > 0) { - if (virAsprintf(&range, "%llu-%llu", offset, offset + length - 1) = < 0) - goto cleanup; + virAsprintf(&range, "%llu-%llu", offset, offset + length - 1); } else if (offset > 0) { - if (virAsprintf(&range, "%llu-", offset) < 0) - goto cleanup; + virAsprintf(&range, "%llu-", offset); } =20 if (esxVI_CURL_Alloc(&streamPriv->curl) < 0 || @@ -448,9 +446,8 @@ esxStreamOpen(virStreamPtr stream, esxPrivate *priv, co= nst char *url, curl_easy_setopt(streamPriv->curl->handle, CURLOPT_PASSWORD, priv->primary->password); #else - if (virAsprintf(&userpwd, "%s:%s", priv->primary->username, - priv->primary->password) < 0) - goto cleanup; + virAsprintf(&userpwd, "%s:%s", priv->primary->username, + priv->primary->password); =20 curl_easy_setopt(streamPriv->curl->handle, CURLOPT_USERPWD, userpwd); #endif diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 78e61ecd24..61082c5113 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -387,11 +387,9 @@ esxVI_CURL_Download(esxVI_CURL *curl, const char *url,= char **content, return -1; } =20 - if (virAsprintf(&range, "%llu-%llu", offset, offset + *length - 1)= < 0) - goto cleanup; + virAsprintf(&range, "%llu-%llu", offset, offset + *length - 1); } else if (offset > 0) { - if (virAsprintf(&range, "%llu-", offset) < 0) - goto cleanup; + virAsprintf(&range, "%llu-", offset); } =20 virMutexLock(&curl->lock); @@ -1489,10 +1487,9 @@ esxVI_Context_Execute(esxVI_Context *ctx, const char= *methodName, =20 goto cleanup; } else { - if (virAsprintf(&xpathExpression, - "/soapenv:Envelope/soapenv:Body/vim:%sResponse= ", - methodName) < 0) - goto cleanup; + virAsprintf(&xpathExpression, + "/soapenv:Envelope/soapenv:Body/vim:%sResponse", + methodName); =20 responseNode =3D virXPathNode(xpathExpression, xpathContext); =20 @@ -3588,15 +3585,12 @@ esxVI_LookupFileInfoByDatastorePath(esxVI_Context *= ctx, * The part of the datatore path didn't contain a '/', assu= me * that the part is actually the file name. */ - if (virAsprintf(&datastorePathWithoutFileName, "[%s]", - datastoreName) < 0) - goto cleanup; + virAsprintf(&datastorePathWithoutFileName, "[%s]", datastoreName); =20 fileName =3D g_strdup(directoryAndFileName); } else { - if (virAsprintf(&datastorePathWithoutFileName, "[%s] %s", - datastoreName, directoryName) < 0) - goto cleanup; + virAsprintf(&datastorePathWithoutFileName, "[%s] %s", datastoreNam= e, + directoryName); =20 length =3D strlen(directoryName); =20 @@ -3822,8 +3816,7 @@ esxVI_LookupDatastoreContentByDatastoreName floppyImageFileQuery =3D NULL; =20 /* Search datastore for files */ - if (virAsprintf(&datastorePath, "[%s]", datastoreName) < 0) - goto cleanup; + virAsprintf(&datastorePath, "[%s]", datastoreName); =20 if (esxVI_SearchDatastoreSubFolders_Task(ctx, hostDatastoreBrowser, datastorePath, searchSpec, @@ -4541,10 +4534,9 @@ esxVI_WaitForTaskCompletion(esxVI_Context *ctx, } else if (!taskInfo->error->localizedMessage) { *errorMessage =3D g_strdup(taskInfo->error->fault->_actualType= ); } else { - if (virAsprintf(errorMessage, "%s - %s", - taskInfo->error->fault->_actualType, - taskInfo->error->localizedMessage) < 0) - goto cleanup; + virAsprintf(errorMessage, "%s - %s", + taskInfo->error->fault->_actualType, + taskInfo->error->localizedMessage); } } =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752747; cv=none; d=zoho.com; s=zohoarc; b=TEkYvA4uubuU5HtlgiWaAVLUN58caRLaKPF96ZhbuEkJXbu2dcrYunzZH/KkaurEDbL0/JmgKKPvhN1OAt0nNcUCG633GwtlIU737TIevt1eHhaF6Xh3zlaCC6iLifOBdYP99DNKCo6Mn5cvxGFWJDUNe+kaxv7FC3HRulgllRc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752747; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=yXTs1nw5VIkm+TOtnRd9nswMUd8B+3hUn8Y9uji4ts8=; b=T25T69gXgO+N4a+9IRc1WHqwz+PRrErWiC1IFS5J1xHmPIZklRLYXpb2wbzJH8iGZFxTdO7nFcIfFv89XkzAlCcSJN0MeRmtlM/1yFtyb5Za+CSA1TcLHdGZXLre7ggCu+0ZwLs+t4Bh7pe5n+zClvn9LoHvdn9NT9dxftlRDL0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1571752747577101.81169561289664; Tue, 22 Oct 2019 06:59:07 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-37-tdiJ_EaZOIeBGZkGYWU2tQ-1; Tue, 22 Oct 2019 09:58:48 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1265A5FB; Tue, 22 Oct 2019 13:58:42 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DADED5DD78; Tue, 22 Oct 2019 13:58:41 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 8656C1803B4A; Tue, 22 Oct 2019 13:58:41 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9MDwRo9001569 for ; Tue, 22 Oct 2019 09:58:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id E1B156012C; Tue, 22 Oct 2019 13:58:27 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6A4816012D for ; Tue, 22 Oct 2019 13:58:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752745; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=yXTs1nw5VIkm+TOtnRd9nswMUd8B+3hUn8Y9uji4ts8=; b=ESjNKVi+JM/ozQ7w1RsgZ7OtWaPedSZLPzaPXRp8y8S6ze6kjVPpXAaTWy4GiY3x5ragII 45Z5qhhnReJWXWegsnc1UQnYK++yUIqCG6WSPI/lHrIv3YbonsqgrxyVjFxMkhVLit6PFK W2TFcZr2ciUZQmXFhSehkjm7EvxmRsU= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:12 +0200 Message-Id: <3d669012448adc1c3c128caaeb8b0278cde3cb86.1571752582.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 08/75] hyperv: Drop virAsprintf() and virAsprintfQuiet() retval checking X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: tdiJ_EaZOIeBGZkGYWU2tQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" These functions can't fail really. Drop checking of their retval then. Signed-off-by: Michal Privoznik --- src/hyperv/hyperv_driver.c | 9 +++------ src/hyperv/hyperv_wmi.c | 21 ++++++++------------- 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index 542253b8b8..eb35cf6115 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -1378,11 +1378,9 @@ hypervDomainSendKey(virDomainPtr domain, unsigned in= t codeset, } } =20 - if (virAsprintf(&selector, - "CreationClassName=3DMsvm_Keyboard&DeviceID=3D%s&" + virAsprintf(&selector, "CreationClassName=3DMsvm_Keyboard&DeviceID=3D%= s&" "SystemCreationClassName=3DMsvm_ComputerSystem&" - "SystemName=3D%s", keyboard->data.common->DeviceID, uuid_s= tring) < 0) - goto cleanup; + "SystemName=3D%s", keyboard->data.common->DeviceID, uuid_s= tring); =20 /* press the keys */ for (i =3D 0; i < nkeycodes; i++) { @@ -1464,8 +1462,7 @@ hypervDomainSetMemoryFlags(virDomainPtr domain, unsig= ned long memory, =20 virCheckFlags(0, -1); =20 - if (virAsprintf(&memory_str, "%lu", memory_mb) < 0) - goto cleanup; + virAsprintf(&memory_str, "%lu", memory_mb); =20 virUUIDFormat(domain->uuid, uuid_string); =20 diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c index 04f82389c1..c0c9b7f77e 100644 --- a/src/hyperv/hyperv_wmi.c +++ b/src/hyperv/hyperv_wmi.c @@ -439,8 +439,7 @@ hypervCreateInvokeXmlDoc(hypervInvokeParamsListPtr para= ms, WsXmlDocH *docRoot) char *method =3D NULL; WsXmlNodeH xmlNodeMethod =3D NULL; =20 - if (virAsprintf(&method, "%s_INPUT", params->method) < 0) - goto cleanup; + virAsprintf(&method, "%s_INPUT", params->method); =20 *docRoot =3D ws_xml_create_doc(NULL, method); if (*docRoot =3D=3D NULL) { @@ -849,9 +848,9 @@ hypervInvokeMethod(hypervPrivate *priv, hypervInvokePar= amsListPtr params, params->method, paramsDocRoot); =20 /* check return code of invocation */ - if (virAsprintf(&returnValue_xpath, "/s:Envelope/s:Body/p:%s_OUTPUT/p:= ReturnValue", - params->method) < 0) - goto cleanup; + virAsprintf(&returnValue_xpath, + "/s:Envelope/s:Body/p:%s_OUTPUT/p:ReturnValue", + params->method); =20 returnValue =3D ws_xml_get_xpath_value(response, returnValue_xpath); if (!returnValue) { @@ -865,12 +864,10 @@ hypervInvokeMethod(hypervPrivate *priv, hypervInvokeP= aramsListPtr params, goto cleanup; =20 if (returnCode =3D=3D CIM_RETURNCODE_TRANSITION_STARTED) { - if (virAsprintf(&jobcode_instance_xpath, + virAsprintf(&jobcode_instance_xpath, "/s:Envelope/s:Body/p:%s_OUTPUT/p:Job/a:ReferenceParam= eters/" "w:SelectorSet/w:Selector[@Name=3D'InstanceID']", - params->method) < 0) { - goto cleanup; - } + params->method); =20 instanceID =3D ws_xml_get_xpath_value(response, jobcode_instance_x= path); if (!instanceID) { @@ -1341,10 +1338,8 @@ hypervInvokeMsvmComputerSystemRequestStateChange(vir= DomainPtr domain, =20 virUUIDFormat(domain->uuid, uuid_string); =20 - if (virAsprintf(&selector, "Name=3D%s&CreationClassName=3DMsvm_Compute= rSystem", - uuid_string) < 0 || - virAsprintf(&properties, "RequestedState=3D%d", requestedState) < = 0) - goto cleanup; + virAsprintf(&selector, "Name=3D%s&CreationClassName=3DMsvm_ComputerSys= tem", uuid_string); + virAsprintf(&properties, "RequestedState=3D%d", requestedState); =20 if (priv->wmiVersion =3D=3D HYPERV_WMI_VERSION_V1) resourceUri =3D MSVM_COMPUTERSYSTEM_V1_RESOURCE_URI; --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571753118; cv=none; d=zoho.com; s=zohoarc; b=hcimDogGKD86GQtr2FKWt1cUJQrefvs+fxZUfYLmIHIEq57/le404i/wPIRtinfs2v8bpFdyBf4p3J6bD9+0G9oCYqszDTVeqBKX99i+AzO79SUx0dEiqjJStHyMc7ys2ia+iTFdgkdfmajAVDVWiPBY2EzqE/Lan/Cb7qshfJ0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571753118; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=llF5geroIplX9CgRuvGbFEDZqhsvr063FHpaP3PZxUY=; b=dYGSVs9U1YzZL2O57SQiR3ihdKA+qCiLHWFQfVc9ylFMHf6DnC3TazXrDAU9AEpk9U5Thf11LDZgSIaIj5Ns2QiKeg1QfH/LfCoSXgcPeSl2vG9BRuQmqrackLoZUmQLLlJmnbQLwPFYDcpCFo+7Kg+IqSUCt7skpnu09YFM8so= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1571753118424219.56802931450534; Tue, 22 Oct 2019 07:05:18 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-217-oVw1AmMzOeqiUj3Znk7cSA-1; Tue, 22 Oct 2019 09:58:50 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B3C5D801E70; Tue, 22 Oct 2019 13:58:45 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7D58C6012C; Tue, 22 Oct 2019 13:58:45 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 3CA0C4EEBD; Tue, 22 Oct 2019 13:58:45 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9MDwSki001576 for ; Tue, 22 Oct 2019 09:58:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id B08A76012C; Tue, 22 Oct 2019 13:58:28 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 38FBD6012E for ; Tue, 22 Oct 2019 13:58:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571753117; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=llF5geroIplX9CgRuvGbFEDZqhsvr063FHpaP3PZxUY=; b=Nuq+vb8mNjRS2LIP+rjQ9tCObOOxonduvbfkJdzJIvrKu2r/3UWSacArnjiSq3xX5FOg3n aCxpSzhQFog/Q3V+R/Ii8Wj4zODvFyPpT9AXj+yxOjH6UlnD/W3txFLpGud7rrdgFKaz/v Sc4nd4rhvn8EYd4GzWoiRCa/W4pc5gQ= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:13 +0200 Message-Id: <76ae357eb7ba3f10cb55329dd9edd847f81b3455.1571752582.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 09/75] interface: Drop virAsprintf() and virAsprintfQuiet() retval checking X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: oVw1AmMzOeqiUj3Znk7cSA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" These functions can't fail really. Drop checking of their retval then. Signed-off-by: Michal Privoznik --- src/interface/interface_backend_netcf.c | 7 ++----- src/interface/interface_backend_udev.c | 14 ++++---------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interf= ace_backend_netcf.c index 27590af134..170361e761 100644 --- a/src/interface/interface_backend_netcf.c +++ b/src/interface/interface_backend_netcf.c @@ -101,16 +101,13 @@ netcfStateInitialize(bool privileged, driver->privileged =3D privileged; =20 if (privileged) { - if (virAsprintf(&driver->stateDir, - "%s/libvirt/interface", RUNSTATEDIR) < 0) - goto error; + virAsprintf(&driver->stateDir, "%s/libvirt/interface", RUNSTATEDIR= ); } else { g_autofree char *rundir =3D NULL; =20 if (!(rundir =3D virGetUserRuntimeDirectory())) goto error; - if (virAsprintf(&driver->stateDir, "%s/interface/run", rundir) < 0) - goto error; + virAsprintf(&driver->stateDir, "%s/interface/run", rundir); } =20 if (virFileMakePathWithMode(driver->stateDir, S_IRWXU) < 0) { diff --git a/src/interface/interface_backend_udev.c b/src/interface/interfa= ce_backend_udev.c index 251c2ecdf0..a906756830 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -856,9 +856,7 @@ udevGetIfaceDefBridge(struct udev *udev, } =20 /* Members of the bridge */ - if (virAsprintf(&member_path, "%s/%s", - udev_device_get_syspath(dev), "brif") < 0) - goto error; + virAsprintf(&member_path, "%s/%s", udev_device_get_syspath(dev), "brif= "); =20 /* Get each member of the bridge */ member_count =3D scandir(member_path, &member_list, @@ -920,8 +918,7 @@ udevGetIfaceDefVlan(struct udev *udev G_GNUC_UNUSED, const char *dev_prefix =3D "\nDevice: "; int ret =3D -1; =20 - if (virAsprintf(&procpath, "/proc/net/vlan/%s", name) < 0) - goto cleanup; + virAsprintf(&procpath, "/proc/net/vlan/%s", name); =20 if (virFileReadAll(procpath, BUFSIZ, &buf) < 0) goto cleanup; @@ -1164,16 +1161,13 @@ udevStateInitialize(bool privileged, driver->lockFD =3D -1; =20 if (privileged) { - if (virAsprintf(&driver->stateDir, - "%s/libvirt/interface", RUNSTATEDIR) < 0) - goto cleanup; + virAsprintf(&driver->stateDir, "%s/libvirt/interface", RUNSTATEDIR= ); } else { g_autofree char *rundir =3D NULL; =20 if (!(rundir =3D virGetUserRuntimeDirectory())) goto cleanup; - if (virAsprintf(&driver->stateDir, "%s/interface/run", rundir) < 0) - goto cleanup; + virAsprintf(&driver->stateDir, "%s/interface/run", rundir); } =20 if (virFileMakePathWithMode(driver->stateDir, S_IRWXU) < 0) { --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752740; cv=none; d=zoho.com; s=zohoarc; b=NA7kEPoRo1kVtbhLlkROMWLjvq7Jq/CYmDVDnLs5svhgldCH/4gCZYKRDFW+fXssG891u6efjQ4mT+O6HtiWcWzExQxK33fwpSuCkPfglQKwi+kPdAgQPODKjUbfgZmgw+15qAsHyiZJF8YDisrlQtCNulNY+48q0SIXjTCaV0s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752740; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=f5NjlWbzb/4SzMv0xXCCTdPdZhoDP9nN77omL7BcwO4=; b=dISib2nG6FIC6/mWmX+jJuSB5eEItxIILCvdjpObRYx8vw4Hqk49NSFo3GySsJAoIYpVVVtEL1M7q+Qz502lgISbWb2yUAiRveSPuZqE6q7c/IJpHC83dHTffTNunUoavktevEX+EJDZR9JmUaRSL8qxSecG3QUilyYUXgPrsvk= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1571752740009209.00037436678383; Tue, 22 Oct 2019 06:59:00 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-348-zUEzkOKlNFKeuxLcm45gUA-1; Tue, 22 Oct 2019 09:58:55 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6799E107AD31; Tue, 22 Oct 2019 13:58:49 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 45EB2424F; Tue, 22 Oct 2019 13:58:49 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 05CC0C592; Tue, 22 Oct 2019 13:58:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9MDwT6U001584 for ; Tue, 22 Oct 2019 09:58:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id 86A2E6012C; Tue, 22 Oct 2019 13:58:29 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0FE3160BC6 for ; Tue, 22 Oct 2019 13:58:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752738; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=f5NjlWbzb/4SzMv0xXCCTdPdZhoDP9nN77omL7BcwO4=; b=gdQgcQ36CSe2ZR3ckOWfAO/eX8uUoSWa9OiISxrWDSwSSGI5g3RKoj5ijwQYIGvGKgELBg jgpQK5aNp+j68/8bSCZijQxnguUcLQOcEwBU61ZXbzYBMovCiLVPJvxVxUsEvypQImtjst hVy5HdzOsaFlF4XdLfu6Ev3WrGztNJU= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:14 +0200 Message-Id: <7945c0b5dd0bcff856c6062b61784ca981fa8be6.1571752582.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 10/75] libxl: Drop virAsprintf() and virAsprintfQuiet() retval checking X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: zUEzkOKlNFKeuxLcm45gUA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" These functions can't fail really. Drop checking of their retval then. Signed-off-by: Michal Privoznik --- src/libxl/libxl_conf.c | 34 +++++++++++----------------------- src/libxl/libxl_domain.c | 35 +++++++++++++---------------------- src/libxl/libxl_domain.h | 2 +- src/libxl/libxl_driver.c | 19 +++++++------------ src/libxl/libxl_logger.c | 11 ++++------- src/libxl/libxl_migration.c | 9 +++------ src/libxl/xen_common.c | 11 +++++------ src/libxl/xen_xl.c | 18 ++++++------------ src/libxl/xen_xm.c | 6 ++---- 9 files changed, 52 insertions(+), 93 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 3f08f0f710..a984c9c8aa 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -212,8 +212,7 @@ libxlMakeChrdevStr(virDomainChrDefPtr def, char **buf) =20 case VIR_DOMAIN_CHR_TYPE_FILE: case VIR_DOMAIN_CHR_TYPE_PIPE: - if (virAsprintf(buf, "%s:%s", type, srcdef->data.file.path) < 0) - return -1; + virAsprintf(buf, "%s:%s", type, srcdef->data.file.path); break; =20 case VIR_DOMAIN_CHR_TYPE_DEV: @@ -232,12 +231,8 @@ libxlMakeChrdevStr(virDomainChrDefPtr def, char **buf) if (bindService =3D=3D NULL) bindService =3D "0"; =20 - if (virAsprintf(buf, "udp:%s:%s@%s:%s", - connectHost, - srcdef->data.udp.connectService, - bindHost, - bindService) < 0) - return -1; + virAsprintf(buf, "udp:%s:%s@%s:%s", connectHost, + srcdef->data.udp.connectService, bindHost, bindService= ); break; } =20 @@ -249,20 +244,15 @@ libxlMakeChrdevStr(virDomainChrDefPtr def, char **buf) else prefix =3D "tcp"; =20 - if (virAsprintf(buf, "%s:%s:%s%s", - prefix, - srcdef->data.tcp.host, - srcdef->data.tcp.service, - srcdef->data.tcp.listen ? ",server,nowait" : "") <= 0) - return -1; + virAsprintf(buf, "%s:%s:%s%s", prefix, srcdef->data.tcp.host, + srcdef->data.tcp.service, + srcdef->data.tcp.listen ? ",server,nowait" : ""); break; } =20 case VIR_DOMAIN_CHR_TYPE_UNIX: - if (virAsprintf(buf, "unix:%s%s", - srcdef->data.nix.path, - srcdef->data.nix.listen ? ",server,nowait" : "") <= 0) - return -1; + virAsprintf(buf, "unix:%s%s", srcdef->data.nix.path, + srcdef->data.nix.listen ? ",server,nowait" : ""); break; =20 default: @@ -1937,11 +1927,9 @@ libxlPrepareChannel(virDomainChrDefPtr channel, if (channel->targetType =3D=3D VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_XEN = && channel->source->type =3D=3D VIR_DOMAIN_CHR_TYPE_UNIX && !channel->source->data.nix.path) { - if (virAsprintf(&channel->source->data.nix.path, - "%s/%s-%s", channelDir, domainName, - channel->target.name ? channel->target.name - : "unknown.sock") < 0) - return -1; + virAsprintf(&channel->source->data.nix.path, "%s/%s-%s", channelDi= r, + domainName, + channel->target.name ? channel->target.name : "unknown= .sock"); =20 channel->source->data.nix.listen =3D true; } diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index d79c3c1ed7..ebb739ae54 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -714,7 +714,7 @@ libxlDomainManagedSavePath(libxlDriverPrivatePtr driver= , virDomainObjPtr vm) char *ret; g_autoptr(libxlDriverConfig) cfg =3D libxlDriverConfigGet(driver); =20 - ignore_value(virAsprintf(&ret, "%s/%s.save", cfg->saveDir, vm->def->na= me)); + virAsprintf(&ret, "%s/%s.save", cfg->saveDir, vm->def->name); return ret; } =20 @@ -905,11 +905,11 @@ libxlDomainCleanup(libxlDriverPrivatePtr driver, } } =20 - if (virAsprintf(&file, "%s/%s.xml", cfg->stateDir, vm->def->name) > 0)= { - if (unlink(file) < 0 && errno !=3D ENOENT && errno !=3D ENOTDIR) - VIR_DEBUG("Failed to remove domain XML for %s", vm->def->name); - VIR_FREE(file); - } + virAsprintf(&file, "%s/%s.xml", cfg->stateDir, vm->def->name); + + if (unlink(file) < 0 && errno !=3D ENOENT && errno !=3D ENOTDIR) + VIR_DEBUG("Failed to remove domain XML for %s", vm->def->name); + VIR_FREE(file); =20 /* The "release" hook cleans up additional resources */ if (virHookPresent(VIR_HOOK_DRIVER_LIBXL)) { @@ -931,7 +931,7 @@ libxlDomainCleanup(libxlDriverPrivatePtr driver, * * virDomainObjPtr must be locked on invocation */ -int +void libxlDomainAutoCoreDump(libxlDriverPrivatePtr driver, virDomainObjPtr vm) { @@ -940,28 +940,19 @@ libxlDomainAutoCoreDump(libxlDriverPrivatePtr driver, char timestr[100]; struct tm time_info; char *dumpfile =3D NULL; - int ret =3D -1; =20 localtime_r(&curtime, &time_info); strftime(timestr, sizeof(timestr), "%Y-%m-%d-%H:%M:%S", &time_info); =20 - if (virAsprintf(&dumpfile, "%s/%s-%s", - cfg->autoDumpDir, - vm->def->name, - timestr) < 0) - goto cleanup; + virAsprintf(&dumpfile, "%s/%s-%s", cfg->autoDumpDir, vm->def->name, + timestr); =20 /* Unlock virDomainObj while dumping core */ virObjectUnlock(vm); libxl_domain_core_dump(cfg->ctx, vm->def->id, dumpfile, NULL); virObjectLock(vm); =20 - ret =3D 0; - - cleanup: VIR_FREE(dumpfile); - - return ret; } =20 int @@ -1130,7 +1121,7 @@ libxlConsoleCallback(libxl_ctx *ctx, libxl_event *ev,= void *for_callback) for (i =3D 0; i < vm->def->nserials; i++) { chr =3D vm->def->serials[i]; =20 - ignore_value(virAsprintf(&chr->info.alias, "serial%zd", i)); + virAsprintf(&chr->info.alias, "serial%zd", i); if (chr->source->type =3D=3D VIR_DOMAIN_CHR_TYPE_PTY) { if (chr->source->data.file.path) continue; @@ -1170,9 +1161,9 @@ libxlDomainCreateIfaceNames(virDomainDefPtr def, libx= l_domain_config *d_config) if (net->ifname) continue; =20 - ignore_value(virAsprintf(&net->ifname, - LIBXL_GENERATED_PREFIX_XEN "%d.%d%s", - def->id, x_nic->devid, suffix)); + virAsprintf(&net->ifname, + LIBXL_GENERATED_PREFIX_XEN "%d.%d%s", + def->id, x_nic->devid, suffix); } } =20 diff --git a/src/libxl/libxl_domain.h b/src/libxl/libxl_domain.h index 7e28093722..e78a3ce6b2 100644 --- a/src/libxl/libxl_domain.h +++ b/src/libxl/libxl_domain.h @@ -131,7 +131,7 @@ void libxlDomainEventHandler(void *data, VIR_LIBXL_EVENT_CONST libxl_event *event); =20 -int +void libxlDomainAutoCoreDump(libxlDriverPrivatePtr driver, virDomainObjPtr vm); =20 diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 5cc6b87b8c..69a949ee26 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -693,8 +693,7 @@ libxlStateInitialize(bool privileged, if (!(cfg =3D libxlDriverConfigNew())) goto error; =20 - if (virAsprintf(&driverConf, "%s/libxl.conf", cfg->configBaseDir) < 0) - goto error; + virAsprintf(&driverConf, "%s/libxl.conf", cfg->configBaseDir); =20 if (libxlDriverConfigLoadFile(cfg, driverConf) < 0) goto error; @@ -5391,16 +5390,13 @@ libxlDiskSectorSize(int domid, int devno) } =20 path =3D val =3D NULL; - if (virAsprintf(&path, "/local/domain/%d/device/vbd/%d/backend", - domid, devno) < 0) - goto cleanup; + virAsprintf(&path, "/local/domain/%d/device/vbd/%d/backend", domid, de= vno); =20 if ((val =3D xs_read(handle, XBT_NULL, path, &len)) =3D=3D NULL) goto cleanup; =20 VIR_FREE(path); - if (virAsprintf(&path, "%s/physical-sector-size", val) < 0) - goto cleanup; + virAsprintf(&path, "%s/physical-sector-size", val); =20 VIR_FREE(val); if ((val =3D xs_read(handle, XBT_NULL, path, &len)) =3D=3D NULL) @@ -5438,9 +5434,8 @@ libxlDomainBlockStatsVBD(virDomainObjPtr vm, =20 stats->backend =3D g_strdup("vbd"); =20 - if (virAsprintf(&path, "/sys/bus/xen-backend/devices/vbd-%d-%d/statist= ics", - vm->def->id, devno) < 0) - return ret; + virAsprintf(&path, "/sys/bus/xen-backend/devices/vbd-%d-%d/statistics", + vm->def->id, devno); =20 if (!virFileExists(path)) { virReportError(VIR_ERR_OPERATION_FAILED, @@ -5449,8 +5444,8 @@ libxlDomainBlockStatsVBD(virDomainObjPtr vm, } =20 # define LIBXL_SET_VBDSTAT(FIELD, VAR, MUL) \ - if ((virAsprintf(&name, "%s/"FIELD, path) < 0) || \ - (virFileReadAll(name, 256, &val) < 0) || \ + virAsprintf(&name, "%s/"FIELD, path); \ + if ((virFileReadAll(name, 256, &val) < 0) || \ (sscanf(val, "%llu", &status) !=3D 1)) { \ virReportError(VIR_ERR_OPERATION_FAILED, \ _("cannot read %s"), name); \ diff --git a/src/libxl/libxl_logger.c b/src/libxl/libxl_logger.c index 87ad793fb5..4bdca54fcc 100644 --- a/src/libxl/libxl_logger.c +++ b/src/libxl/libxl_logger.c @@ -158,8 +158,7 @@ libxlLoggerNew(const char *logDir, virLogPriority minLe= vel) if ((logger.files =3D virHashCreate(3, libxlLoggerFileFree)) =3D=3D NU= LL) return NULL; =20 - if (virAsprintf(&path, "%s/libxl-driver.log", logDir) < 0) - goto error; + virAsprintf(&path, "%s/libxl-driver.log", logDir); =20 if ((logger.defaultLogFile =3D fopen(path, "a")) =3D=3D NULL) goto error; @@ -196,9 +195,8 @@ libxlLoggerOpenFile(libxlLoggerPtr logger, char *domidstr =3D NULL; char ebuf[1024]; =20 - if (virAsprintf(&path, "%s/%s.log", logger->logDir, name) < 0 || - virAsprintf(&domidstr, "%d", id) < 0) - goto cleanup; + virAsprintf(&path, "%s/%s.log", logger->logDir, name); + virAsprintf(&domidstr, "%d", id); =20 if (!(logFile =3D fopen(path, "a"))) { VIR_WARN("Failed to open log file %s: %s", @@ -222,8 +220,7 @@ void libxlLoggerCloseFile(libxlLoggerPtr logger, int id) { char *domidstr =3D NULL; - if (virAsprintf(&domidstr, "%d", id) < 0) - return; + virAsprintf(&domidstr, "%d", id); =20 ignore_value(virHashRemoveEntry(logger->files, domidstr)); =20 diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index 0a57b6fcb0..09b709e51b 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -709,14 +709,12 @@ libxlDomainMigrationDstPrepare(virConnectPtr dconn, goto endjob; =20 priv->migrationPort =3D port; - if (virAsprintf(uri_out, "tcp://%s:%d", hostname, port) < 0) - goto endjob; + virAsprintf(uri_out, "tcp://%s:%d", hostname, port); } else { if (!(STRPREFIX(uri_in, "tcp://"))) { /* not full URI, add prefix tcp:// */ char *tmp; - if (virAsprintf(&tmp, "tcp://%s", uri_in) < 0) - goto endjob; + virAsprintf(&tmp, "tcp://%s", uri_in); uri =3D virURIParse(tmp); VIR_FREE(tmp); } else { @@ -747,8 +745,7 @@ libxlDomainMigrationDstPrepare(virConnectPtr dconn, port =3D uri->port; } =20 - if (virAsprintf(uri_out, "tcp://%s:%d", hostname, port) < 0) - goto endjob; + virAsprintf(uri_out, "tcp://%s:%d", hostname, port); } =20 snprintf(portstr, sizeof(portstr), "%d", port); diff --git a/src/libxl/xen_common.c b/src/libxl/xen_common.c index cc9039a0cf..826e6699bf 100644 --- a/src/libxl/xen_common.c +++ b/src/libxl/xen_common.c @@ -1838,12 +1838,11 @@ xenFormatPCI(virConfPtr conf, virDomainDefPtr def) virConfValuePtr val, tmp; char *buf; =20 - if (virAsprintf(&buf, "%04x:%02x:%02x.%x", - def->hostdevs[i]->source.subsys.u.pci.addr.dom= ain, - def->hostdevs[i]->source.subsys.u.pci.addr.bus, - def->hostdevs[i]->source.subsys.u.pci.addr.slo= t, - def->hostdevs[i]->source.subsys.u.pci.addr.fun= ction) < 0) - goto error; + virAsprintf(&buf, "%04x:%02x:%02x.%x", + def->hostdevs[i]->source.subsys.u.pci.addr.domain, + def->hostdevs[i]->source.subsys.u.pci.addr.bus, + def->hostdevs[i]->source.subsys.u.pci.addr.slot, + def->hostdevs[i]->source.subsys.u.pci.addr.functio= n); =20 if (VIR_ALLOC(val) < 0) { VIR_FREE(buf); diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c index 6bdad2a59d..a7c51e3c98 100644 --- a/src/libxl/xen_xl.c +++ b/src/libxl/xen_xl.c @@ -83,11 +83,9 @@ static int xenParseCmdline(virConfPtr conf, char **r_cmd= line) VIR_WARN("ignoring root=3D and extra=3D in favour of cmdline= =3D"); } else { if (root && extra) { - if (virAsprintf(&cmdline, "root=3D%s %s", root, extra) < 0) - return -1; + virAsprintf(&cmdline, "root=3D%s %s", root, extra); } else if (root) { - if (virAsprintf(&cmdline, "root=3D%s", root) < 0) - return -1; + virAsprintf(&cmdline, "root=3D%s", root); } else if (extra) { cmdline =3D g_strdup(extra); } @@ -1396,10 +1394,7 @@ xenFormatXLCPUID(virConfPtr conf, virDomainDefPtr de= f) policy =3D "0"; break; } - if (virAsprintf(&cpuid_pairs[j++], "%s=3D%s", - feature_name, - policy) < 0) - goto cleanup; + virAsprintf(&cpuid_pairs[j++], "%s=3D%s", feature_name, policy); } cpuid_pairs[j] =3D NULL; =20 @@ -2073,10 +2068,9 @@ xenFormatXLUSB(virConfPtr conf, virConfValuePtr val, tmp; char *buf; =20 - if (virAsprintf(&buf, "hostbus=3D%x,hostaddr=3D%x", - def->hostdevs[i]->source.subsys.u.usb.bus, - def->hostdevs[i]->source.subsys.u.usb.device) = < 0) - goto error; + virAsprintf(&buf, "hostbus=3D%x,hostaddr=3D%x", + def->hostdevs[i]->source.subsys.u.usb.bus, + def->hostdevs[i]->source.subsys.u.usb.device); =20 if (VIR_ALLOC(val) < 0) { VIR_FREE(buf); diff --git a/src/libxl/xen_xm.c b/src/libxl/xen_xm.c index fdf4e1cd29..d962b13cbb 100644 --- a/src/libxl/xen_xm.c +++ b/src/libxl/xen_xm.c @@ -90,11 +90,9 @@ xenParseXMOS(virConfPtr conf, virDomainDefPtr def) return -1; =20 if (root && extra) { - if (virAsprintf(&def->os.cmdline, "root=3D%s %s", root, extra)= < 0) - return -1; + virAsprintf(&def->os.cmdline, "root=3D%s %s", root, extra); } else if (root) { - if (virAsprintf(&def->os.cmdline, "root=3D%s", root) < 0) - return -1; + virAsprintf(&def->os.cmdline, "root=3D%s", root); } else if (extra) { def->os.cmdline =3D g_strdup(extra); } --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752747; cv=none; d=zoho.com; s=zohoarc; b=O4wetMQZ3IvLY+kNS3T+kYuUaYl8q4C45MeprDbimz7tQltqPk2rplchoDUA0Kjlc9elvv5XD/yM2xZt7kdMIwGc42DbxRQN2GZ9vKHKCPqdjEsamFz3PcAB/elZ80aCtZ60yhHY6tV99W7wsRcp70deHqugGDE2zBQmIRgDPgA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752747; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=V9rnkQNJLTMztF4qePbrnEviqgcEbu3KJPyCyXWRSkI=; b=cY/xsvzv8gGMnzhp/TFxr0CBDkV52mcfIr0s5hJ3vlGMFp9v5KQWFZJcueTPFE+dYoj8TiS73Bs06QrKSHXW43fL+UlYW96HBGx2Pp/dwfCXWSQVDAbyKc7IkJUtOzhcyYRm0Gd61mIOUFwNWEV7mNLIejNUvbCNb8gpFBsVvoI= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1571752747312379.7292000005506; Tue, 22 Oct 2019 06:59:07 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-7-kv8XyoxmPoage_n-wbyADA-1; Tue, 22 Oct 2019 09:59:02 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A826D1800E06; Tue, 22 Oct 2019 13:58:53 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7A3345D6A9; Tue, 22 Oct 2019 13:58:53 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 392E1180BAA1; Tue, 22 Oct 2019 13:58:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9MDwcVW001627 for ; Tue, 22 Oct 2019 09:58:38 -0400 Received: by smtp.corp.redhat.com (Postfix) id C1BD460161; Tue, 22 Oct 2019 13:58:38 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4B7776012C for ; Tue, 22 Oct 2019 13:58:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752746; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=V9rnkQNJLTMztF4qePbrnEviqgcEbu3KJPyCyXWRSkI=; b=GMIqnQ/o5TRuGqPYQmhzshGgXkYpb8IIfnkE3EarWXmkkyDtWjXuMmcIf9naJW/C0TKALj HTHJ00GJOlC23UkpjOmz73Huif8b4aLS6pkWgWERDsDox11xMojCuZwGZfndBZyraw9pOA 8Oc+lyOPk/NquOPqofDeOTdY/LkyPdw= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:15 +0200 Message-Id: <39c9054b19ad094108225bf91c4960bfa7f5f62f.1571752582.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 11/75] locking: Drop virAsprintf() and virAsprintfQuiet() retval checking X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: kv8XyoxmPoage_n-wbyADA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" These functions can't fail really. Drop checking of their retval then. Signed-off-by: Michal Privoznik --- src/locking/lock_daemon.c | 17 +++++------------ src/locking/lock_daemon_config.c | 5 +---- src/locking/lock_driver_lockd.c | 9 ++------- src/locking/lock_driver_sanlock.c | 12 ++++-------- src/locking/lock_manager.c | 4 +--- 5 files changed, 13 insertions(+), 34 deletions(-) diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index 7d8c11a2a3..dc23179009 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -464,11 +464,8 @@ virLockDaemonUnixSocketPaths(bool privileged, } umask(old_umask); =20 - if (virAsprintf(sockfile, "%s/virtlockd-sock", rundir) < 0 || - virAsprintf(adminSockfile, "%s/virtlockd-admin-sock", rundir) = < 0) { - VIR_FREE(rundir); - goto error; - } + virAsprintf(sockfile, "%s/virtlockd-sock", rundir); + virAsprintf(adminSockfile, "%s/virtlockd-admin-sock", rundir); =20 VIR_FREE(rundir); } @@ -531,8 +528,7 @@ virLockDaemonSetupLogging(virLockDaemonConfigPtr config, /* Define the default output. This is only applied if there was no set= ting * from either the config or the environment. */ - if (virLogSetDefaultOutput("virtlockd", godaemon, privileged) < 0) - return -1; + virLogSetDefaultOutput("virtlockd", godaemon, privileged); =20 if (virLogGetNbOutputs() =3D=3D 0) virLogSetOutputs(virLogGetDefaultOutput()); @@ -845,10 +841,7 @@ virLockDaemonExecRestartStatePath(bool privileged, } umask(old_umask); =20 - if (virAsprintf(state_file, "%s/virtlockd-restart-exec.json", rund= ir) < 0) { - VIR_FREE(rundir); - goto error; - } + virAsprintf(state_file, "%s/virtlockd-restart-exec.json", rundir); =20 VIR_FREE(rundir); } @@ -865,7 +858,7 @@ virLockDaemonGetExecRestartMagic(void) { char *ret; =20 - ignore_value(virAsprintf(&ret, "%lld", (long long int)getpid())); + virAsprintf(&ret, "%lld", (long long int)getpid()); return ret; } =20 diff --git a/src/locking/lock_daemon_config.c b/src/locking/lock_daemon_con= fig.c index 6e635f1e0b..e77e2b7bf6 100644 --- a/src/locking/lock_daemon_config.c +++ b/src/locking/lock_daemon_config.c @@ -46,10 +46,7 @@ virLockDaemonConfigFilePath(bool privileged, char **conf= igfile) if (!(configdir =3D virGetUserConfigDirectory())) goto error; =20 - if (virAsprintf(configfile, "%s/virtlockd.conf", configdir) < 0) { - VIR_FREE(configdir); - goto error; - } + virAsprintf(configfile, "%s/virtlockd.conf", configdir); VIR_FREE(configdir); } =20 diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lock= d.c index 9452f2957c..73f699044b 100644 --- a/src/locking/lock_driver_lockd.c +++ b/src/locking/lock_driver_lockd.c @@ -127,10 +127,7 @@ static char *virLockManagerLockDaemonPath(bool privile= ged) if (!(rundir =3D virGetUserRuntimeDirectory())) return NULL; =20 - if (virAsprintf(&path, "%s/virtlockd-sock", rundir) < 0) { - VIR_FREE(rundir); - return NULL; - } + virAsprintf(&path, "%s/virtlockd-sock", rundir); =20 VIR_FREE(rundir); } @@ -577,9 +574,7 @@ static int virLockManagerLockDaemonAddResource(virLockM= anagerPtr lock, _("Missing path or lockspace for lease resource= ")); goto cleanup; } - if (virAsprintf(&newLockspace, "%s/%s", - path, lockspace) < 0) - goto cleanup; + virAsprintf(&newLockspace, "%s/%s", path, lockspace); newName =3D g_strdup(name); =20 } break; diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sa= nlock.c index beeeb6066b..0aee93c195 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -103,7 +103,7 @@ virLockManagerSanlockError(int err, #if HAVE_SANLOCK_STRERROR *message =3D g_strdup(sanlock_strerror(err)); #else - ignore_value(virAsprintfQuiet(message, _("sanlock error %d"), err)= ); + virAsprintfQuiet(message, _("sanlock error %d"), err); #endif return true; } else { @@ -211,10 +211,8 @@ virLockManagerSanlockSetupLockspace(virLockManagerSanl= ockDriverPtr driver) char *dir =3D NULL; int retries =3D LOCKSPACE_RETRIES; =20 - if (virAsprintf(&path, "%s/%s", - driver->autoDiskLeasePath, - VIR_LOCK_MANAGER_SANLOCK_AUTO_DISK_LOCKSPACE) < 0) - goto error; + virAsprintf(&path, "%s/%s", driver->autoDiskLeasePath, + VIR_LOCK_MANAGER_SANLOCK_AUTO_DISK_LOCKSPACE); =20 if (virStrcpyStatic(ls.name, VIR_LOCK_MANAGER_SANLOCK_AUTO_DISK_LOCKSPACE) < 0)= { @@ -645,9 +643,7 @@ virLockManagerSanlockAddDisk(virLockManagerSanlockDrive= rPtr driver, goto cleanup; } =20 - if (virAsprintf(&path, "%s/%s", - driver->autoDiskLeasePath, res->name) < 0) - goto cleanup; + virAsprintf(&path, "%s/%s", driver->autoDiskLeasePath, res->name); if (virStrcpy(res->disks[0].path, path, SANLK_PATH_LEN) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Lease path '%s' exceeds %d characters"), diff --git a/src/locking/lock_manager.c b/src/locking/lock_manager.c index 6898bfc556..0986cafe6c 100644 --- a/src/locking/lock_manager.c +++ b/src/locking/lock_manager.c @@ -131,9 +131,7 @@ virLockManagerPluginPtr virLockManagerPluginNew(const c= har *name, VIR_DEBUG("name=3D%s driverName=3D%s configDir=3D%s flags=3D0x%x", name, driverName, configDir, flags); =20 - if (virAsprintf(&configFile, "%s/%s-%s.conf", - configDir, driverName, name) < 0) - return NULL; + virAsprintf(&configFile, "%s/%s-%s.conf", configDir, driverName, name); =20 if (STREQ(name, "nop")) { driver =3D &virLockDriverNop; --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752732; cv=none; d=zoho.com; s=zohoarc; b=IPzT2Ikh/fJLPquzJxAMDFNUv9pRMNKSmOmPAq3qALs6z11CuLzytVAO1YVVocSIW4mi9E7CpdQ4gspNG6hXgPdDm5V9g3o2nfl72o5fgJTuYN5fQg19/554zun/2EyrRvih8AQEMb4x4H9zTc8vbBNn+S/Sbe4nQU9rwKP+bmk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752732; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=e5WowoKzGmUiTsczwLTngeBn3E1CaVx2aJJ69pAlBY8=; b=fTguc6ZdlH5bB97coYMCHtwDvbyr3Ttkz6kXN+cmI354yG6i5DBdFMlL9SNTobrv4dY6OU1PefVnrKgMoKXa7nH2fEL2/ly0SnA6Ao8JbE69/nzmWuaCc8EujMAejzkjoZWRP0Eh0d+jc/k0KMJ+ZHfIWEZJa28WXorm4aGgBUk= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1571752732261356.281584968781; Tue, 22 Oct 2019 06:58:52 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-324-8w8pP1hGNaWmYaVU7BIjZA-1; Tue, 22 Oct 2019 09:58:46 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DC2DA1005526; Tue, 22 Oct 2019 13:58:40 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B249C60619; Tue, 22 Oct 2019 13:58:40 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 6053918037C9; Tue, 22 Oct 2019 13:58:40 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9MDwdel001636 for ; Tue, 22 Oct 2019 09:58:39 -0400 Received: by smtp.corp.redhat.com (Postfix) id 917EE60161; Tue, 22 Oct 2019 13:58:39 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1A5B86012C for ; Tue, 22 Oct 2019 13:58:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752731; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=e5WowoKzGmUiTsczwLTngeBn3E1CaVx2aJJ69pAlBY8=; b=K2k55o0a9PS1U/lyOTKGeVLUl2fBSEWUXxa4bZTCKtatdYThuyqK31giR1HgnrkoOlmtZA gIJ+gRLCgG5eWCCBhtF/v8hgN5S4KdBNWB6Tg6igRclwomg5wcyokvAd7Ty9+0uZsq+wM4 5cuoamuVwvRm9WSgM1eZXpDzoAO0bog= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:16 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 12/75] logging: Drop virAsprintf() and virAsprintfQuiet() retval checking X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: 8w8pP1hGNaWmYaVU7BIjZA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" These functions can't fail really. Drop checking of their retval then. Signed-off-by: Michal Privoznik --- src/logging/log_daemon.c | 26 +++++++------------------- src/logging/log_daemon_config.c | 5 +---- src/logging/log_manager.c | 5 +---- 3 files changed, 9 insertions(+), 27 deletions(-) diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index 73bd3c4ac2..2304c310d1 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -405,11 +405,8 @@ virLogDaemonUnixSocketPaths(bool privileged, } umask(old_umask); =20 - if (virAsprintf(sockfile, "%s/virtlogd-sock", rundir) < 0 || - virAsprintf(adminSockfile, "%s/virtlogd-admin-sock", rundir) <= 0) { - VIR_FREE(rundir); - goto error; - } + virAsprintf(sockfile, "%s/virtlogd-sock", rundir); + virAsprintf(adminSockfile, "%s/virtlogd-admin-sock", rundir); =20 VIR_FREE(rundir); } @@ -429,7 +426,7 @@ virLogDaemonErrorHandler(void *opaque G_GNUC_UNUSED, } =20 =20 -static int +static void virLogDaemonSetupLogging(virLogDaemonConfigPtr config, bool privileged, bool verbose, @@ -466,13 +463,10 @@ virLogDaemonSetupLogging(virLogDaemonConfigPtr config, /* Define the default output. This is only applied if there was no set= ting * from either the config or the environment. */ - if (virLogSetDefaultOutput("virtlogd", godaemon, privileged) < 0) - return -1; + virLogSetDefaultOutput("virtlogd", godaemon, privileged); =20 if (virLogGetNbOutputs() =3D=3D 0) virLogSetOutputs(virLogGetDefaultOutput()); - - return 0; } =20 =20 @@ -638,10 +632,7 @@ virLogDaemonExecRestartStatePath(bool privileged, } umask(old_umask); =20 - if (virAsprintf(state_file, "%s/virtlogd-restart-exec.json", rundi= r) < 0) { - VIR_FREE(rundir); - goto error; - } + virAsprintf(state_file, "%s/virtlogd-restart-exec.json", rundir); =20 VIR_FREE(rundir); } @@ -658,7 +649,7 @@ virLogDaemonGetExecRestartMagic(void) { char *ret; =20 - ignore_value(virAsprintf(&ret, "%lld", (long long int)getpid())); + virAsprintf(&ret, "%lld", (long long int)getpid()); return ret; } =20 @@ -980,10 +971,7 @@ int main(int argc, char **argv) { exit(EXIT_FAILURE); } =20 - if (virLogDaemonSetupLogging(config, privileged, verbose, godaemon) < = 0) { - VIR_ERROR(_("Can't initialize logging")); - exit(EXIT_FAILURE); - } + virLogDaemonSetupLogging(config, privileged, verbose, godaemon); =20 if (!pid_file && virPidFileConstructPath(privileged, diff --git a/src/logging/log_daemon_config.c b/src/logging/log_daemon_confi= g.c index df7c6339b7..a0e4c4dd1b 100644 --- a/src/logging/log_daemon_config.c +++ b/src/logging/log_daemon_config.c @@ -47,10 +47,7 @@ virLogDaemonConfigFilePath(bool privileged, char **confi= gfile) if (!(configdir =3D virGetUserConfigDirectory())) goto error; =20 - if (virAsprintf(configfile, "%s/virtlogd.conf", configdir) < 0) { - VIR_FREE(configdir); - goto error; - } + virAsprintf(configfile, "%s/virtlogd.conf", configdir); VIR_FREE(configdir); } =20 diff --git a/src/logging/log_manager.c b/src/logging/log_manager.c index b60a6aaf59..024fe9b592 100644 --- a/src/logging/log_manager.c +++ b/src/logging/log_manager.c @@ -52,10 +52,7 @@ virLogManagerDaemonPath(bool privileged) if (!(rundir =3D virGetUserRuntimeDirectory())) return NULL; =20 - if (virAsprintf(&path, "%s/virtlogd-sock", rundir) < 0) { - VIR_FREE(rundir); - return NULL; - } + virAsprintf(&path, "%s/virtlogd-sock", rundir); =20 VIR_FREE(rundir); } --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571753105; cv=none; d=zoho.com; s=zohoarc; b=ARHGiCSLvv8wcUBB+fsz/rg+YBu458yyzBwNuWrx5Xpx1gHtOHaOL01Uz9BrfzHLhIyMN3oKJCidiqTB+vK4mx1/NtAVs/0alHdLgHrY1P4K7ZcP5PSTXmAtbS9zXWy8QuiMKHOsYamVPmtxkBtUA1lBpAlbcpcVpE2UMPVbeAk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571753105; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=m+vAagpc7RpzlaE9kf/Wg4fowDFKxpylk5vv8610CPs=; b=k6EILSy4qnxDB4QXAl3Qh0vMhH1p1JmhCOtrpJDjK2FL+awLkmWc9c/SThHzfNjGSG0JbJbS1NJpST+DSIytjlpblejUaC/8wjnowBzEF9VvNWE+0kXPUckUNCHZgr2SJq3fnsL/6zVq7TX1tvR0tO9QmDbsOpap2x3faHHhcdc= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1571753105725688.2607948079643; Tue, 22 Oct 2019 07:05:05 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-271-a6biTjoXOxOarggZmfggHA-1; Tue, 22 Oct 2019 09:58:48 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 03B5F80183E; Tue, 22 Oct 2019 13:58:43 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CD8F061F21; Tue, 22 Oct 2019 13:58:42 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 7FA351803B4D; Tue, 22 Oct 2019 13:58:42 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9MDwesi001645 for ; Tue, 22 Oct 2019 09:58:40 -0400 Received: by smtp.corp.redhat.com (Postfix) id 61E5E6012C; Tue, 22 Oct 2019 13:58:40 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id DE05D60161 for ; Tue, 22 Oct 2019 13:58:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571753104; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=m+vAagpc7RpzlaE9kf/Wg4fowDFKxpylk5vv8610CPs=; b=QpfmdudKsiuvlndYrxk2YttOwbnHCIQz1sl80jdprYwoXXxRyMg195HNoYp1g6Aq4WMWOj L7Zf27y0pd4RVU68RzI9ECxl5fOOTy1E0RenwJUQNIBjcaQbnoV/N7e+KbJZM1/c6hRMtW 8zg+oPnAu0tTeA3B2SSvX5BQ09IzjxM= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:17 +0200 Message-Id: <9a1c08356f212a90df88bb3ebf5ea292b7872eea.1571752582.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 13/75] lxc: Drop virAsprintf() and virAsprintfQuiet() retval checking X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: a6biTjoXOxOarggZmfggHA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" These functions can't fail really. Drop checking of their retval then. Signed-off-by: Michal Privoznik --- src/lxc/lxc_container.c | 69 ++++++++++++++--------------------- src/lxc/lxc_controller.c | 79 +++++++++++++--------------------------- src/lxc/lxc_driver.c | 15 ++------ src/lxc/lxc_fuse.c | 10 ++--- src/lxc/lxc_monitor.c | 4 +- src/lxc/lxc_native.c | 11 ++---- src/lxc/lxc_process.c | 35 +++++------------- 7 files changed, 75 insertions(+), 148 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 88dc2e2bdf..090a22571d 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -682,9 +682,7 @@ static int lxcContainerPrepareRoot(virDomainDefPtr def, if (lxcContainerResolveSymlinks(root, false) < 0) return -1; =20 - if (virAsprintf(&dst, "%s/%s.root", - LXC_STATE_DIR, def->name) < 0) - return -1; + virAsprintf(&dst, "%s/%s.root", LXC_STATE_DIR, def->name); =20 tmp =3D root->dst; root->dst =3D dst; @@ -719,8 +717,7 @@ static int lxcContainerPivotRoot(virDomainFSDefPtr root) goto err; } =20 - if (virAsprintf(&oldroot, "%s/.oldroot", root->src->path) < 0) - goto err; + virAsprintf(&oldroot, "%s/.oldroot", root->src->path); =20 if (virFileMakePath(oldroot) < 0) { virReportSystemError(errno, @@ -739,8 +736,7 @@ static int lxcContainerPivotRoot(virDomainFSDefPtr root) } =20 /* Create a directory called 'new' in tmpfs */ - if (virAsprintf(&newroot, "%s/new", oldroot) < 0) - goto err; + virAsprintf(&newroot, "%s/new", oldroot); =20 if (virFileMakePath(newroot) < 0) { virReportSystemError(errno, @@ -925,8 +921,7 @@ static int lxcContainerMountBasicFS(bool userns_enabled, char *hostdir; int ret; =20 - if (virAsprintf(&hostdir, "/.oldroot%s", mnt->dst) < 0) - goto cleanup; + virAsprintf(&hostdir, "/.oldroot%s", mnt->dst); =20 ret =3D virFileIsMountPoint(hostdir); VIR_FREE(hostdir); @@ -1017,11 +1012,10 @@ static int lxcContainerMountProcFuse(virDomainDefPt= r def, =20 VIR_DEBUG("Mount /proc/meminfo stateDir=3D%s", stateDir); =20 - if ((ret =3D virAsprintf(&meminfo_path, - "/.oldroot/%s/%s.fuse/meminfo", - stateDir, - def->name)) < 0) - return ret; + virAsprintf(&meminfo_path, + "/.oldroot/%s/%s.fuse/meminfo", + stateDir, + def->name); =20 if ((ret =3D mount(meminfo_path, "/proc/meminfo", NULL, MS_BIND, NULL)) < 0) { @@ -1050,9 +1044,7 @@ static int lxcContainerMountFSDev(virDomainDefPtr def, =20 VIR_DEBUG("Mount /dev/ stateDir=3D%s", stateDir); =20 - if ((ret =3D virAsprintf(&path, "/.oldroot/%s/%s.dev", - stateDir, def->name)) < 0) - return ret; + virAsprintf(&path, "/.oldroot/%s/%s.dev", stateDir, def->name); =20 if (virFileMakePath("/dev") < 0) { virReportSystemError(errno, "%s", @@ -1086,9 +1078,7 @@ static int lxcContainerMountFSDevPTS(virDomainDefPtr = def, =20 VIR_DEBUG("Mount /dev/pts stateDir=3D%s", stateDir); =20 - if (virAsprintf(&path, "/.oldroot/%s/%s.devpts", - stateDir, def->name) < 0) - return ret; + virAsprintf(&path, "/.oldroot/%s/%s.devpts", stateDir, def->name); =20 if (virFileMakePath("/dev/pts") < 0) { virReportSystemError(errno, "%s", @@ -1140,8 +1130,7 @@ static int lxcContainerSetupDevices(char **ttyPaths, = size_t nttyPaths) =20 for (i =3D 0; i < nttyPaths; i++) { char *tty; - if (virAsprintf(&tty, "/dev/tty%zu", i+1) < 0) - return -1; + virAsprintf(&tty, "/dev/tty%zu", i + 1); =20 if (virFileBindMountDevice(ttyPaths[i], tty) < 0) { VIR_FREE(tty); @@ -1167,8 +1156,7 @@ static int lxcContainerMountFSBind(virDomainFSDefPtr = fs, =20 VIR_DEBUG("src=3D%s dst=3D%s", fs->src->path, fs->dst); =20 - if (virAsprintf(&src, "%s%s", srcprefix, fs->src->path) < 0) - goto cleanup; + virAsprintf(&src, "%s%s", srcprefix, fs->src->path); =20 if (stat(fs->dst, &st) < 0) { if (errno !=3D ENOENT) { @@ -1338,9 +1326,8 @@ static int lxcContainerMountFSBlockAuto(virDomainFSDe= fPtr fs, =20 /* First time around we use /etc/filesystems */ retry: - if (virAsprintf(&fslist, "%s%s", srcprefix, - tryProc ? "/proc/filesystems" : "/etc/filesystems") < = 0) - goto cleanup; + virAsprintf(&fslist, "%s%s", srcprefix, + tryProc ? "/proc/filesystems" : "/etc/filesystems"); =20 VIR_DEBUG("Open fslist %s", fslist); if (!(fp =3D fopen(fslist, "r"))) { @@ -1501,14 +1488,12 @@ static int lxcContainerMountFSBlock(virDomainFSDefP= tr fs, =20 VIR_DEBUG("src=3D%s dst=3D%s", fs->src->path, fs->dst); =20 - if (virAsprintf(&src, "%s%s", srcprefix, fs->src->path) < 0) - goto cleanup; + virAsprintf(&src, "%s%s", srcprefix, fs->src->path); =20 ret =3D lxcContainerMountFSBlockHelper(fs, src, srcprefix, sec_mount_o= ptions); =20 VIR_DEBUG("Done mounting filesystem ret=3D%d", ret); =20 - cleanup: VIR_FREE(src); return ret; } @@ -1522,9 +1507,7 @@ static int lxcContainerMountFSTmpfs(virDomainFSDefPtr= fs, =20 VIR_DEBUG("usage=3D%lld sec=3D%s", fs->usage, sec_mount_options); =20 - if (virAsprintf(&data, - "size=3D%lld%s", fs->usage, sec_mount_options) < 0) - goto cleanup; + virAsprintf(&data, "size=3D%lld%s", fs->usage, sec_mount_options); =20 if (virFileMakePath(fs->dst) < 0) { virReportSystemError(errno, @@ -1672,19 +1655,22 @@ static int lxcContainerUnmountForSharedRoot(const c= har *stateDir, =20 /* These filesystems are created by libvirt temporarily, they * shouldn't appear in container. */ - if (virAsprintf(&tmp, "%s/%s.dev", stateDir, domain) < 0 || - lxcContainerUnmountSubtree(tmp, false) < 0) + virAsprintf(&tmp, "%s/%s.dev", stateDir, domain); + + if (lxcContainerUnmountSubtree(tmp, false) < 0) goto cleanup; =20 VIR_FREE(tmp); - if (virAsprintf(&tmp, "%s/%s.devpts", stateDir, domain) < 0 || - lxcContainerUnmountSubtree(tmp, false) < 0) + virAsprintf(&tmp, "%s/%s.devpts", stateDir, domain); + + if (lxcContainerUnmountSubtree(tmp, false) < 0) goto cleanup; =20 #if WITH_FUSE VIR_FREE(tmp); - if (virAsprintf(&tmp, "%s/%s.fuse", stateDir, domain) < 0 || - lxcContainerUnmountSubtree(tmp, false) < 0) + virAsprintf(&tmp, "%s/%s.fuse", stateDir, domain); + + if (lxcContainerUnmountSubtree(tmp, false) < 0) goto cleanup; #endif =20 @@ -2246,9 +2232,8 @@ static int lxcContainerChild(void *data) const char *tty =3D argv->ttyPaths[0]; if (STRPREFIX(tty, "/dev/pts/")) tty +=3D strlen("/dev/pts/"); - if (virAsprintf(&ttyPath, "%s/%s.devpts/%s", - LXC_STATE_DIR, vmDef->name, tty) < 0) - goto cleanup; + virAsprintf(&ttyPath, "%s/%s.devpts/%s", LXC_STATE_DIR, vmDef->nam= e, + tty); } else { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("At least one tty is required")); diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 0c5b9e713d..56e30eeaa9 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -565,10 +565,11 @@ static int virLXCControllerAppendNBDPids(virLXCContro= llerPtr ctrl, size_t loops =3D 0; pid_t pid; =20 - if (!STRPREFIX(dev, "/dev/") || - virAsprintf(&pidpath, "/sys/devices/virtual/block/%s/pid", dev + 5= ) < 0) + if (!STRPREFIX(dev, "/dev/")) goto cleanup; =20 + virAsprintf(&pidpath, "/sys/devices/virtual/block/%s/pid", dev + 5); + /* Wait for the pid file to appear */ while (!virFileExists(pidpath)) { /* wait for 100ms before checking again, but don't do it for ever = */ @@ -945,9 +946,7 @@ static int virLXCControllerSetupServer(virLXCController= Ptr ctrl) virNetServerServicePtr svc =3D NULL; char *sockpath; =20 - if (virAsprintf(&sockpath, "%s/%s.sock", - LXC_STATE_DIR, ctrl->name) < 0) - return -1; + virAsprintf(&sockpath, "%s/%s.sock", LXC_STATE_DIR, ctrl->name); =20 if (!(srv =3D virNetServerNew("LXC", 1, 0, 0, 0, 1, @@ -1435,16 +1434,14 @@ static int virLXCControllerSetupUserns(virLXCContro= llerPtr ctrl) } =20 VIR_DEBUG("Setting up userns maps"); - if (virAsprintf(&uid_map, "/proc/%d/uid_map", ctrl->initpid) < 0) - goto cleanup; + virAsprintf(&uid_map, "/proc/%d/uid_map", ctrl->initpid); =20 if (virLXCControllerSetupUsernsMap(ctrl->def->idmap.uidmap, ctrl->def->idmap.nuidmap, uid_map) < 0) goto cleanup; =20 - if (virAsprintf(&gid_map, "/proc/%d/gid_map", ctrl->initpid) < 0) - goto cleanup; + virAsprintf(&gid_map, "/proc/%d/gid_map", ctrl->initpid); =20 if (virLXCControllerSetupUsernsMap(ctrl->def->idmap.gidmap, ctrl->def->idmap.ngidmap, @@ -1470,18 +1467,14 @@ static int virLXCControllerSetupDev(virLXCControlle= rPtr ctrl) mount_options =3D virSecurityManagerGetMountOptions(ctrl->securityMana= ger, ctrl->def); =20 - if (virAsprintf(&dev, "/%s/%s.dev", - LXC_STATE_DIR, ctrl->def->name) < 0) - goto cleanup; + virAsprintf(&dev, "/%s/%s.dev", LXC_STATE_DIR, ctrl->def->name); =20 /* * tmpfs is limited to 64kb, since we only have device nodes in there * and don't want to DOS the entire OS RAM usage */ =20 - if (virAsprintf(&opts, - "mode=3D755,size=3D65536%s", mount_options) < 0) - goto cleanup; + virAsprintf(&opts, "mode=3D755,size=3D65536%s", mount_options); =20 if (virFileSetupDev(dev, opts) < 0) goto cleanup; @@ -1521,9 +1514,8 @@ static int virLXCControllerPopulateDevices(virLXCCont= rollerPtr ctrl) =20 /* Populate /dev/ with a few important bits */ for (i =3D 0; i < G_N_ELEMENTS(devs); i++) { - if (virAsprintf(&path, "/%s/%s.dev/%s", - LXC_STATE_DIR, ctrl->def->name, devs[i].path) < 0) - goto cleanup; + virAsprintf(&path, "/%s/%s.dev/%s", LXC_STATE_DIR, ctrl->def->name, + devs[i].path); =20 dev_t dev =3D makedev(devs[i].maj, devs[i].min); if (mknod(path, S_IFCHR, dev) < 0 || @@ -1561,19 +1553,13 @@ virLXCControllerSetupHostdevSubsysUSB(virDomainDefP= tr vmDef, mode_t mode; virDomainHostdevSubsysUSBPtr usbsrc =3D &def->source.subsys.u.usb; =20 - if (virAsprintf(&src, USB_DEVFS "/%03d/%03d", - usbsrc->bus, usbsrc->device) < 0) - goto cleanup; + virAsprintf(&src, USB_DEVFS "/%03d/%03d", usbsrc->bus, usbsrc->device); =20 - if (virAsprintf(&vroot, "/%s/%s.dev/bus/usb/", - LXC_STATE_DIR, vmDef->name) < 0) - goto cleanup; + virAsprintf(&vroot, "/%s/%s.dev/bus/usb/", LXC_STATE_DIR, vmDef->name); =20 - if (virAsprintf(&dstdir, "%s/%03d/", vroot, usbsrc->bus) < 0) - goto cleanup; + virAsprintf(&dstdir, "%s/%03d/", vroot, usbsrc->bus); =20 - if (virAsprintf(&dstfile, "%s/%03d", dstdir, usbsrc->device) < 0) - goto cleanup; + virAsprintf(&dstfile, "%s/%03d", dstdir, usbsrc->device); =20 if (stat(src, &sb) < 0) { virReportSystemError(errno, @@ -1647,10 +1633,8 @@ virLXCControllerSetupHostdevCapsStorage(virDomainDef= Ptr vmDef, while (*(path + len) =3D=3D '/') len++; =20 - if (virAsprintf(&dst, "/%s/%s.dev/%s", - LXC_STATE_DIR, vmDef->name, - strchr(path + len, '/')) < 0) - goto cleanup; + virAsprintf(&dst, "/%s/%s.dev/%s", LXC_STATE_DIR, vmDef->name, + strchr(path + len, '/')); =20 if (stat(dev, &sb) < 0) { virReportSystemError(errno, @@ -1725,10 +1709,8 @@ virLXCControllerSetupHostdevCapsMisc(virDomainDefPtr= vmDef, while (*(path + len) =3D=3D '/') len++; =20 - if (virAsprintf(&dst, "/%s/%s.dev/%s", - LXC_STATE_DIR, vmDef->name, - strchr(path + len, '/')) < 0) - goto cleanup; + virAsprintf(&dst, "/%s/%s.dev/%s", LXC_STATE_DIR, vmDef->name, + strchr(path + len, '/')); =20 if (stat(dev, &sb) < 0) { virReportSystemError(errno, @@ -1883,9 +1865,8 @@ static int virLXCControllerSetupDisk(virLXCController= Ptr ctrl, goto cleanup; } =20 - if (virAsprintf(&dst, "/%s/%s.dev/%s", - LXC_STATE_DIR, ctrl->def->name, def->dst) < 0) - goto cleanup; + virAsprintf(&dst, "/%s/%s.dev/%s", LXC_STATE_DIR, ctrl->def->name, + def->dst); =20 if (stat(def->src->path, &sb) < 0) { virReportSystemError(errno, @@ -2074,12 +2055,8 @@ lxcCreateTty(virLXCControllerPtr ctrl, int *ttymaste= r, * while glibc has to fstat(), fchmod(), and fchown() for older * kernels, we can skip those steps. ptyno shouldn't currently be * anything other than 0, but let's play it safe. */ - if ((virAsprintf(ttyName, "/dev/pts/%d", ptyno) < 0) || - (virAsprintf(ttyHostPath, "/%s/%s.devpts/%d", LXC_STATE_DIR, - ctrl->def->name, ptyno) < 0)) { - errno =3D ENOMEM; - goto cleanup; - } + virAsprintf(ttyName, "/dev/pts/%d", ptyno); + virAsprintf(ttyHostPath, "/%s/%s.devpts/%d", LXC_STATE_DIR, ctrl->def-= >name, ptyno); =20 ret =3D 0; =20 @@ -2135,11 +2112,8 @@ virLXCControllerSetupDevPTS(virLXCControllerPtr ctrl) mount_options =3D virSecurityManagerGetMountOptions(ctrl->securityMana= ger, ctrl->def); =20 - if (virAsprintf(&devpts, "%s/%s.devpts", - LXC_STATE_DIR, ctrl->def->name) < 0 || - virAsprintf(&ctrl->devptmx, "%s/%s.devpts/ptmx", - LXC_STATE_DIR, ctrl->def->name) < 0) - goto cleanup; + virAsprintf(&devpts, "%s/%s.devpts", LXC_STATE_DIR, ctrl->def->name); + virAsprintf(&ctrl->devptmx, "%s/%s.devpts/ptmx", LXC_STATE_DIR, ctrl->= def->name); =20 if (virFileMakePath(devpts) < 0) { virReportSystemError(errno, @@ -2155,9 +2129,8 @@ virLXCControllerSetupDevPTS(virLXCControllerPtr ctrl) =20 /* XXX should we support gid=3DX for X!=3D5 for distros which use * a different gid for tty? */ - if (virAsprintf(&opts, "newinstance,ptmxmode=3D0666,mode=3D0620,gid=3D= %u%s", - ptsgid, NULLSTR_EMPTY(mount_options)) < 0) - goto cleanup; + virAsprintf(&opts, "newinstance,ptmxmode=3D0666,mode=3D0620,gid=3D%u%s= ", ptsgid, + NULLSTR_EMPTY(mount_options)); =20 VIR_DEBUG("Mount devpts on %s type=3Dtmpfs flags=3D0x%x, opts=3D%s", devpts, MS_NOSUID, opts); diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 41a6a446bd..acaeae9311 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -3788,9 +3788,7 @@ lxcDomainAttachDeviceDiskLive(virLXCDriverPtr driver, if (VIR_REALLOC_N(vm->def->disks, vm->def->ndisks + 1) < 0) goto cleanup; =20 - if (virAsprintf(&file, - "/dev/%s", def->dst) < 0) - goto cleanup; + virAsprintf(&file, "/dev/%s", def->dst); =20 if (lxcDomainAttachDeviceMknod(driver, 0700 | S_IFBLK, @@ -3975,9 +3973,7 @@ lxcDomainAttachDeviceHostdevSubsysUSBLive(virLXCDrive= rPtr driver, } =20 usbsrc =3D &def->source.subsys.u.usb; - if (virAsprintf(&src, "/dev/bus/usb/%03d/%03d", - usbsrc->bus, usbsrc->device) < 0) - goto cleanup; + virAsprintf(&src, "/dev/bus/usb/%03d/%03d", usbsrc->bus, usbsrc->devic= e); =20 if (!(usb =3D virUSBDeviceNew(usbsrc->bus, usbsrc->device, NULL))) goto cleanup; @@ -4313,8 +4309,7 @@ lxcDomainDetachDeviceDiskLive(virDomainObjPtr vm, def =3D vm->def->disks[idx]; src =3D virDomainDiskGetSource(def); =20 - if (virAsprintf(&dst, "/dev/%s", def->dst) < 0) - goto cleanup; + virAsprintf(&dst, "/dev/%s", def->dst); =20 if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_DEVICE= S)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", @@ -4452,9 +4447,7 @@ lxcDomainDetachDeviceHostdevUSBLive(virLXCDriverPtr d= river, } =20 usbsrc =3D &def->source.subsys.u.usb; - if (virAsprintf(&dst, "/dev/bus/usb/%03d/%03d", - usbsrc->bus, usbsrc->device) < 0) - goto cleanup; + virAsprintf(&dst, "/dev/bus/usb/%03d/%03d", usbsrc->bus, usbsrc->devic= e); =20 if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_DEVICE= S)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", diff --git a/src/lxc/lxc_fuse.c b/src/lxc/lxc_fuse.c index b64b275a87..35dbad7986 100644 --- a/src/lxc/lxc_fuse.c +++ b/src/lxc/lxc_fuse.c @@ -47,8 +47,7 @@ static int lxcProcGetattr(const char *path, struct stat *= stbuf) virDomainDefPtr def =3D (virDomainDefPtr)context->private_data; =20 memset(stbuf, 0, sizeof(struct stat)); - if (virAsprintf(&mempath, "/proc/%s", path) < 0) - return -errno; + virAsprintf(&mempath, "/proc/%s", path); =20 res =3D 0; =20 @@ -251,8 +250,7 @@ static int lxcProcRead(const char *path G_GNUC_UNUSED, struct fuse_context *context =3D NULL; virDomainDefPtr def =3D NULL; =20 - if (virAsprintf(&hostpath, "/proc/%s", path) < 0) - return -errno; + virAsprintf(&hostpath, "/proc/%s", path); =20 context =3D fuse_get_context(); def =3D (virDomainDefPtr)context->private_data; @@ -307,9 +305,7 @@ int lxcSetupFuse(virLXCFusePtr *f, virDomainDefPtr def) if (virMutexInit(&fuse->lock) < 0) goto cleanup2; =20 - if (virAsprintf(&fuse->mountpoint, "%s/%s.fuse/", LXC_STATE_DIR, - def->name) < 0) - goto cleanup1; + virAsprintf(&fuse->mountpoint, "%s/%s.fuse/", LXC_STATE_DIR, def->name= ); =20 if (virFileMakePath(fuse->mountpoint) < 0) { virReportSystemError(errno, _("Cannot create %s"), diff --git a/src/lxc/lxc_monitor.c b/src/lxc/lxc_monitor.c index 028e401236..1983af135e 100644 --- a/src/lxc/lxc_monitor.c +++ b/src/lxc/lxc_monitor.c @@ -151,9 +151,7 @@ virLXCMonitorPtr virLXCMonitorNew(virDomainObjPtr vm, if (!(mon =3D virObjectLockableNew(virLXCMonitorClass))) return NULL; =20 - if (virAsprintf(&sockpath, "%s/%s.sock", - socketdir, vm->def->name) < 0) - goto error; + virAsprintf(&sockpath, "%s/%s.sock", socketdir, vm->def->name); =20 if (!(mon->client =3D virNetClientNewUNIX(sockpath, false, NULL))) goto error; diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index 5df09a849e..c7cf2c4b0e 100644 --- a/src/lxc/lxc_native.c +++ b/src/lxc/lxc_native.c @@ -265,8 +265,7 @@ lxcAddFstabLine(virDomainDefPtr def, lxcFstabPtr fstab) return -1; =20 if (fstab->dst[0] !=3D '/') { - if (virAsprintf(&dst, "/%s", fstab->dst) < 0) - goto cleanup; + virAsprintf(&dst, "/%s", fstab->dst); } else { dst =3D g_strdup(fstab->dst); } @@ -492,9 +491,8 @@ lxcAddNetworkDefinition(lxcNetworkParseData *data) * on the host */ if (isVlan && data->vlanid) { VIR_FREE(hostdev->source.caps.u.net.ifname); - if (virAsprintf(&hostdev->source.caps.u.net.ifname, - "%s.%s", data->link, data->vlanid) < 0) - goto error; + virAsprintf(&hostdev->source.caps.u.net.ifname, "%s.%s", + data->link, data->vlanid); } =20 hostdev->source.caps.u.net.ip.ips =3D data->ips; @@ -950,8 +948,7 @@ lxcBlkioDeviceWalkCallback(const char *name, virConfVal= uePtr value, void *data) goto cleanup; } =20 - if (virAsprintf(&path, "/dev/block/%s", parts[0]) < 0) - goto cleanup; + virAsprintf(&path, "/dev/block/%s", parts[0]); =20 /* Do we already have a device definition for this path? * Get that device or create a new one */ diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 450053d163..2ec5762856 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -138,8 +138,7 @@ lxcProcessRemoveDomainStatus(virLXCDriverConfigPtr cfg, char ebuf[1024]; char *file =3D NULL; =20 - if (virAsprintf(&file, "%s/%s.xml", cfg->stateDir, vm->def->name) < 0) - return; + virAsprintf(&file, "%s/%s.xml", cfg->stateDir, vm->def->name); =20 if (unlink(file) < 0 && errno !=3D ENOENT && errno !=3D ENOTDIR) VIR_WARN("Failed to remove domain XML for %s: %s", @@ -419,10 +418,8 @@ static int virLXCProcessSetupNamespaceName(virConnectP= tr conn, int ns_type, cons goto cleanup; } =20 - if (virAsprintf(&path, "/proc/%lld/ns/%s", - (long long int)priv->initpid, - nsInfoLocal[ns_type]) < 0) - goto cleanup; + virAsprintf(&path, "/proc/%lld/ns/%s", (long long int)priv->initpid, + nsInfoLocal[ns_type]); =20 if ((fd =3D open(path, O_RDONLY)) < 0) { virReportSystemError(errno, @@ -443,10 +440,7 @@ static int virLXCProcessSetupNamespacePID(int ns_type,= const char *name) int fd; char *path; =20 - if (virAsprintf(&path, "/proc/%s/ns/%s", - name, - nsInfoLocal[ns_type]) < 0) - return -1; + virAsprintf(&path, "/proc/%s/ns/%s", name, nsInfoLocal[ns_type]); fd =3D open(path, O_RDONLY); VIR_FREE(path); if (fd < 0) { @@ -470,8 +464,7 @@ static int virLXCProcessSetupNamespaceNet(int ns_type, = const char *name) return -1; } =20 - if (virAsprintf(&path, "%s/netns/%s", RUNSTATEDIR, name) < 0) - return -1; + virAsprintf(&path, "%s/netns/%s", RUNSTATEDIR, name); fd =3D open(path, O_RDONLY); VIR_FREE(path); if (fd < 0) { @@ -632,8 +625,7 @@ static int virLXCProcessSetupInterfaces(virConnectPtr c= onn, =20 /* Make sure all net definitions will have a name in the container= */ if (!net->ifname_guest) { - if (virAsprintf(&net->ifname_guest, "eth%zu", niface) < 0) - goto cleanup; + virAsprintf(&net->ifname_guest, "eth%zu", niface); niface++; } } @@ -757,9 +749,7 @@ virLXCProcessGetNsInode(pid_t pid, struct stat sb; int ret =3D -1; =20 - if (virAsprintf(&path, "/proc/%lld/ns/%s", - (long long)pid, nsname) < 0) - goto cleanup; + virAsprintf(&path, "/proc/%lld/ns/%s", (long long)pid, nsname); =20 if (stat(path, &sb) < 0) { virReportSystemError(errno, @@ -984,9 +974,7 @@ virLXCProcessBuildControllerCmd(virLXCDriverPtr driver, for (i =3D 0; i < VIR_LXC_DOMAIN_NAMESPACE_LAST; i++) { if (nsInheritFDs[i] > 0) { char *tmp =3D NULL; - if (virAsprintf(&tmp, "--share-%s", - nsInfoLocal[i]) < 0) - goto error; + virAsprintf(&tmp, "--share-%s", nsInfoLocal[i]); virCommandAddArg(cmd, tmp); virCommandAddArgFormat(cmd, "%d", nsInheritFDs[i]); virCommandPassFD(cmd, nsInheritFDs[i], 0); @@ -1269,9 +1257,7 @@ int virLXCProcessStart(virConnectPtr conn, vm->def->resource =3D res; } =20 - if (virAsprintf(&logfile, "%s/%s.log", - cfg->logDir, vm->def->name) < 0) - goto cleanup; + virAsprintf(&logfile, "%s/%s.log", cfg->logDir, vm->def->name); =20 if (!(pidfile =3D virPidFileBuildPath(cfg->stateDir, vm->def->name))) goto cleanup; @@ -1358,8 +1344,7 @@ int virLXCProcessStart(virConnectPtr conn, vm->def->consoles[i]->source->data.file.path =3D ttyPath; =20 VIR_FREE(vm->def->consoles[i]->info.alias); - if (virAsprintf(&vm->def->consoles[i]->info.alias, "console%zu", i= ) < 0) - goto cleanup; + virAsprintf(&vm->def->consoles[i]->info.alias, "console%zu", i); } =20 VIR_DEBUG("Setting up Interfaces"); --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752733; cv=none; d=zoho.com; s=zohoarc; b=e2WoZxqPd6aA4OlWs745gs8xra+NOaqvAqMArZnHOcbFrKLXONDgJZ3PQ/a22RSXIgOHMyyHi2Mm6ETUtjOFYrbrhoRW0L7A8URi10fRppnWeV7wLOWa99qU2p1kcZxkBFEdkQR0dPYcK/4AIp6+VyB1zMu3LJbABPuC6L+Mh8Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752733; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=BQFHmdIiOkJRz1f30vx7d7am9vDhi7dKbjHNK5CvZec=; b=LLnTM1Wxo6/X3pGeCy/ZacfQMqfSu9ok+YcZKb5gkM/fAIZe9tUkfUDuP7c6N7aLzuBg6WPRy6fUq4T3eKovaoYLy3uGpq4Nm03L52n+qRsbuUgDsjsixUgxxZa7mybru73TiItgnd3Q3I/oQNmjhA2kFCQMpWznNh+i9RT+pU0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1571752733654791.76954193522; Tue, 22 Oct 2019 06:58:53 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-357-ro6xFKA4OuWywLwxmnkzlg-1; Tue, 22 Oct 2019 09:58:50 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DEDE9800D56; Tue, 22 Oct 2019 13:58:44 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B94FF5C219; Tue, 22 Oct 2019 13:58:44 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 769194EEB9; Tue, 22 Oct 2019 13:58:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9MDwf14001655 for ; Tue, 22 Oct 2019 09:58:41 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3122E60161; Tue, 22 Oct 2019 13:58:41 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id AEA606012C for ; Tue, 22 Oct 2019 13:58:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752732; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=BQFHmdIiOkJRz1f30vx7d7am9vDhi7dKbjHNK5CvZec=; b=TdCRpUXCan0q/s+RW5u74VL+IZX1KDXgkhGWSwShhJk5aD2YkiABcIP+GKISyVnVEjJAw8 ZxrzwPMc/SvDb2IxGLiA7LB1QIh/HwY70hvoHubadcTnYeAIzFzfD5HvAXsJVNWNinN1mf etSWNGjnrnXU2imdM2XLum9LS+Tg8jg= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:18 +0200 Message-Id: <73cacb252408f25333cb50cfae5465aa3bcbc722.1571752582.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 14/75] network: Drop virAsprintf() and virAsprintfQuiet() retval checking X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: ro6xFKA4OuWywLwxmnkzlg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" These functions can't fail really. Drop checking of their retval then. Signed-off-by: Michal Privoznik --- src/network/bridge_driver.c | 69 ++++++++++++++++--------------------- src/network/leaseshelper.c | 6 ++-- 2 files changed, 31 insertions(+), 44 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index fcaa6a48ae..b82a371fe4 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -371,8 +371,7 @@ networkDnsmasqLeaseFileNameDefault(virNetworkDriverStat= ePtr driver, { char *leasefile; =20 - ignore_value(virAsprintf(&leasefile, "%s/%s.leases", - driver->dnsmasqStateDir, netname)); + virAsprintf(&leasefile, "%s/%s.leases", driver->dnsmasqStateDir, netna= me); return leasefile; } =20 @@ -383,8 +382,7 @@ networkDnsmasqLeaseFileNameCustom(virNetworkDriverState= Ptr driver, { char *leasefile; =20 - ignore_value(virAsprintf(&leasefile, "%s/%s.status", - driver->dnsmasqStateDir, bridge)); + virAsprintf(&leasefile, "%s/%s.status", driver->dnsmasqStateDir, bridg= e); return leasefile; } =20 @@ -395,8 +393,7 @@ networkDnsmasqConfigFileName(virNetworkDriverStatePtr d= river, { char *conffile; =20 - ignore_value(virAsprintf(&conffile, "%s/%s.conf", - driver->dnsmasqStateDir, netname)); + virAsprintf(&conffile, "%s/%s.conf", driver->dnsmasqStateDir, netname); return conffile; } =20 @@ -407,7 +404,7 @@ networkRadvdPidfileBasename(const char *netname) /* this is simple but we want to be sure it's consistently done */ char *pidfilebase; =20 - ignore_value(virAsprintf(&pidfilebase, "%s-radvd", netname)); + virAsprintf(&pidfilebase, "%s-radvd", netname); return pidfilebase; } =20 @@ -418,8 +415,7 @@ networkRadvdConfigFileName(virNetworkDriverStatePtr dri= ver, { char *configfile; =20 - ignore_value(virAsprintf(&configfile, "%s/%s-radvd.conf", - driver->radvdStateDir, netname)); + virAsprintf(&configfile, "%s/%s-radvd.conf", driver->radvdStateDir, ne= tname); return configfile; } =20 @@ -515,13 +511,13 @@ networkBridgeDummyNicName(const char *brname) * a possible numeric ending (eg virbr0, virbr1, etc), we grab * the first 8 and last 3 characters of the string. */ - ignore_value(virAsprintf(&nicname, "%.*s%s%s", - /* space for last 3 chars + "-nic" + NULL= */ - (int)(IFNAMSIZ - (3 + sizeof(dummyNicSuff= ix))), - brname, brname + strlen(brname) - 3, - dummyNicSuffix)); + virAsprintf(&nicname, "%.*s%s%s", + /* space for last 3 chars + "-nic" + NULL */ + (int)(IFNAMSIZ - (3 + sizeof(dummyNicSuffix))), + brname, brname + strlen(brname) - 3, + dummyNicSuffix); } else { - ignore_value(virAsprintf(&nicname, "%s%s", brname, dummyNicSuffix)= ); + virAsprintf(&nicname, "%s%s", brname, dummyNicSuffix); } return nicname; } @@ -751,20 +747,18 @@ networkStateInitialize(bool privileged, if (!(configdir && rundir)) goto error; =20 - if ((virAsprintf(&network_driver->networkConfigDir, - "%s/qemu/networks", configdir) < 0) || - (virAsprintf(&network_driver->networkAutostartDir, - "%s/qemu/networks/autostart", configdir) < 0) || - (virAsprintf(&network_driver->stateDir, - "%s/network/lib", rundir) < 0) || - (virAsprintf(&network_driver->pidDir, - "%s/network/run", rundir) < 0) || - (virAsprintf(&network_driver->dnsmasqStateDir, - "%s/dnsmasq/lib", rundir) < 0) || - (virAsprintf(&network_driver->radvdStateDir, - "%s/radvd/lib", rundir) < 0)) { - goto error; - } + virAsprintf(&network_driver->networkConfigDir, + "%s/qemu/networks", configdir); + virAsprintf(&network_driver->networkAutostartDir, + "%s/qemu/networks/autostart", configdir); + virAsprintf(&network_driver->stateDir, + "%s/network/lib", rundir); + virAsprintf(&network_driver->pidDir, + "%s/network/run", rundir); + virAsprintf(&network_driver->dnsmasqStateDir, + "%s/dnsmasq/lib", rundir); + virAsprintf(&network_driver->radvdStateDir, + "%s/radvd/lib", rundir); } =20 if (virFileMakePath(network_driver->stateDir) < 0) { @@ -2300,9 +2294,8 @@ networkSetIPv6Sysctls(virNetworkObjPtr obj) * network. But also unset it if there *are* ipv6 addresses, as we * can't be sure of its default value. */ - if (virAsprintf(&field, SYSCTL_PATH "/net/ipv6/conf/%s/disable_ipv6", - def->bridge) < 0) - goto cleanup; + virAsprintf(&field, SYSCTL_PATH "/net/ipv6/conf/%s/disable_ipv6", + def->bridge); =20 if (access(field, W_OK) < 0 && errno =3D=3D ENOENT) { if (!enableIPv6) @@ -2327,9 +2320,8 @@ networkSetIPv6Sysctls(virNetworkObjPtr obj) /* Prevent guests from hijacking the host network by sending out * their own router advertisements. */ - if (virAsprintf(&field, SYSCTL_PATH "/net/ipv6/conf/%s/accept_ra", - def->bridge) < 0) - goto cleanup; + virAsprintf(&field, SYSCTL_PATH "/net/ipv6/conf/%s/accept_ra", + def->bridge); =20 if (virFileWriteStr(field, "0", 0) < 0) { virReportSystemError(errno, @@ -2341,9 +2333,7 @@ networkSetIPv6Sysctls(virNetworkObjPtr obj) /* All interfaces used as a gateway (which is what this is, by * definition), must always have autoconf=3D0. */ - if (virAsprintf(&field, SYSCTL_PATH "/net/ipv6/conf/%s/autoconf", - def->bridge) < 0) - goto cleanup; + virAsprintf(&field, SYSCTL_PATH "/net/ipv6/conf/%s/autoconf", def->bri= dge); =20 if (virFileWriteStr(field, "0", 0) < 0) { virReportSystemError(errno, @@ -3328,8 +3318,7 @@ networkFindUnusedBridgeName(virNetworkObjListPtr nets, templ =3D def->bridge; =20 do { - if (virAsprintf(&newname, templ, id) < 0) - goto cleanup; + virAsprintf(&newname, templ, id); /* check if this name is used in another libvirt network or * there is an existing device with that name. ignore errors * from virNetDevExists(), just in case it isn't implemented diff --git a/src/network/leaseshelper.c b/src/network/leaseshelper.c index 93dd2ca48a..008a2d668d 100644 --- a/src/network/leaseshelper.c +++ b/src/network/leaseshelper.c @@ -153,10 +153,8 @@ main(int argc, char **argv) =20 server_duid =3D g_strdup(getenv("DNSMASQ_SERVER_DUID")); =20 - if (virAsprintf(&custom_lease_file, - LOCALSTATEDIR "/lib/libvirt/dnsmasq/%s.status", - interface) < 0) - goto cleanup; + virAsprintf(&custom_lease_file, + LOCALSTATEDIR "/lib/libvirt/dnsmasq/%s.status", interface); =20 pid_file =3D g_strdup(RUNSTATEDIR "/leaseshelper.pid"); =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752747; cv=none; d=zoho.com; s=zohoarc; b=ors8O/Yy8AhdMCVXQS1eF6HXtM+deKzInxLNpd4jOorMbm9ErIHrM7H1TVHbCy/Sw31niV3FWC+6OD33299JikLFSV4ZrN358HgmF7TPhpNLw3g3DQt//owV1LsgEwhMdl9xlcLfDlw0dnd0JGvr2zBayq+kUQS7BkJd8ZmDo7A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752747; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=3gag8RaptN81qH4+5MGFfGL3sDgh1jY8kVIok3pKMs4=; b=AxktsicYgoYuzW9+uYkqIy29hROaBPx4JcuvnE9PK1ghSyc3B9uCWT+BysVIVzE3LodzIiqO96WklS17GCWWtxZwCjaM49XquM74RfjP1GjGxocTb8975WnszOC4sFOhxVR4XGLE09bQOYL4drhSaFqDbJ10bEikDVjp2TcXfFU= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1571752747497611.0553148685071; Tue, 22 Oct 2019 06:59:07 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-129-CFY46QWIN0KFb0z-Prh2mQ-1; Tue, 22 Oct 2019 09:59:03 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5C3DB801E77; Tue, 22 Oct 2019 13:58:57 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 29A626012C; Tue, 22 Oct 2019 13:58:57 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id DF5BF180BAA7; Tue, 22 Oct 2019 13:58:56 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9MDwgIU001663 for ; Tue, 22 Oct 2019 09:58:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id 011C06012C; Tue, 22 Oct 2019 13:58:42 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7E0AD60161 for ; Tue, 22 Oct 2019 13:58:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752745; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=3gag8RaptN81qH4+5MGFfGL3sDgh1jY8kVIok3pKMs4=; b=VphabyX5A1Knupo9MozUJBNspwdNEIVYOj2OAnN72IU690NEaELVmxs539sdxE+SBE8eU/ yAS9zezbqSncLbYnX8WYjwYrs+zrKD9anGbbVGno5pUClNg0Gw7wGu5FC1FnceD1aKtfJL arifUDlYcNiYmqcUtpe2H+DGuKqq4C8= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:19 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 15/75] node_device: Drop virAsprintf() and virAsprintfQuiet() retval checking X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: CFY46QWIN0KFb0z-Prh2mQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" These functions can't fail really. Drop checking of their retval then. Signed-off-by: Michal Privoznik --- src/node_device/node_device_driver.c | 3 +-- src/node_device/node_device_hal.c | 7 ++----- src/node_device/node_device_udev.c | 11 +++-------- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_de= vice_driver.c index 7ef55f45e9..53373140be 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -113,8 +113,7 @@ nodeDeviceUpdateDriverName(virNodeDeviceDefPtr def) =20 VIR_FREE(def->driver); =20 - if (virAsprintf(&driver_link, "%s/driver", def->sysfs_path) < 0) - goto cleanup; + virAsprintf(&driver_link, "%s/driver", def->sysfs_path); =20 /* Some devices don't have an explicit driver, so just return without a name */ diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_devic= e_hal.c index 688a0e0f06..a6042e6bfc 100644 --- a/src/node_device/node_device_hal.c +++ b/src/node_device/node_device_hal.c @@ -614,16 +614,13 @@ nodeStateInitialize(bool privileged G_GNUC_UNUSED, nodeDeviceLock(); =20 if (privileged) { - if (virAsprintf(&driver->stateDir, - "%s/libvirt/nodedev", RUNSTATEDIR) < 0) - goto failure; + virAsprintf(&driver->stateDir, "%s/libvirt/nodedev", RUNSTATEDIR); } else { g_autofree char *rundir =3D NULL; =20 if (!(rundir =3D virGetUserRuntimeDirectory())) goto failure; - if (virAsprintf(&driver->stateDir, "%s/nodedev/run", rundir) < 0) - goto failure; + virAsprintf(&driver->stateDir, "%s/nodedev/run", rundir); } =20 if (virFileMakePathWithMode(driver->stateDir, S_IRWXU) < 0) { diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_devi= ce_udev.c index 525e71f80c..92d7048ece 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1028,9 +1028,7 @@ udevProcessMediatedDevice(struct udev_device *dev, * it by waiting for the attributes to become available. */ =20 - if (virAsprintf(&linkpath, "%s/mdev_type", - udev_device_get_syspath(dev)) < 0) - goto cleanup; + virAsprintf(&linkpath, "%s/mdev_type", udev_device_get_syspath(dev)); =20 if (virFileWaitForExists(linkpath, 1, 100) < 0) { virReportSystemError(errno, @@ -1812,16 +1810,13 @@ nodeStateInitialize(bool privileged, driver->privileged =3D privileged; =20 if (privileged) { - if (virAsprintf(&driver->stateDir, - "%s/libvirt/nodedev", RUNSTATEDIR) < 0) - goto cleanup; + virAsprintf(&driver->stateDir, "%s/libvirt/nodedev", RUNSTATEDIR); } else { g_autofree char *rundir =3D NULL; =20 if (!(rundir =3D virGetUserRuntimeDirectory())) goto cleanup; - if (virAsprintf(&driver->stateDir, "%s/nodedev/run", rundir) < 0) - goto cleanup; + virAsprintf(&driver->stateDir, "%s/nodedev/run", rundir); } =20 if (virFileMakePathWithMode(driver->stateDir, S_IRWXU) < 0) { --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571753107; cv=none; d=zoho.com; s=zohoarc; b=i3noszdM0+nOuTc5K7LeJo5zj+M356E1D0nExfLMDYeFtokthyskQCEtWoDnoUCvH6A5BU5rNjclSoIQpa9rf1id4+mhxYcAfjukZH5ILVaMDw55K1WrWm95oC2QjRv44YrhORGe/Etc/CPAlbhDhoMJ4vlr7mk2vlWylhiY9IQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571753107; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YVFvNXRnsQWog03qRJroykFFom8t55Q9jQp4nYitgkQ=; b=LU5/Fk1l2Vm5cjJctgBVjKc81SgsAz1nfVoIkpl/0Ko49J0R0Sc1bIBZlam/R1Wa73vctST3pHnT1KG40u5ebFdRzBAlNgPyfBXhKl1rWWSFI1e/MkpoDTKiU3PvDM0EhEEaB6GlCDjQ1QJcmuJrwSC3WFia6TELtl9AzJo+aKI= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1571753107266751.899363679478; Tue, 22 Oct 2019 07:05:07 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-42-MYymQce8NH6vANCAOsrFww-1; Tue, 22 Oct 2019 09:58:53 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B2FFA603; Tue, 22 Oct 2019 13:58:48 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 46CB452C6; Tue, 22 Oct 2019 13:58:48 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 01F62180BA9F; Tue, 22 Oct 2019 13:58:48 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9MDwgSc001668 for ; Tue, 22 Oct 2019 09:58:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id C3B1960161; Tue, 22 Oct 2019 13:58:42 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4D7FB6012C for ; Tue, 22 Oct 2019 13:58:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571753106; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=YVFvNXRnsQWog03qRJroykFFom8t55Q9jQp4nYitgkQ=; b=EtMZqeTOejraQmC5H83H5a/nOCrw7E/bGsXzZBb79YC/tXYqLrIyOYFNCMv5lMlFceprTt PGQVOCR19hqv4nNuk8Q1mYEKELA6aEZx3mqr53V/i7fY6S+llisC8WLs16ju6c6Qaib+2p zGNrIjRetLqiAoqe6cDPXqlz9SxjgGk= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:20 +0200 Message-Id: <3961e88c53ce1cf38135ca7b5769e3beef320276.1571752582.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 16/75] nwfilter: Drop virAsprintf() and virAsprintfQuiet() retval checking X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: MYymQce8NH6vANCAOsrFww-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" These functions can't fail really. Drop checking of their retval then. Signed-off-by: Michal Privoznik --- src/nwfilter/nwfilter_dhcpsnoop.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcp= snoop.c index 665e7bff9c..b4ce8a0613 100644 --- a/src/nwfilter/nwfilter_dhcpsnoop.c +++ b/src/nwfilter/nwfilter_dhcpsnoop.c @@ -315,8 +315,7 @@ virNWFilterSnoopActivate(virNWFilterSnoopReqPtr req) { char *key; =20 - if (virAsprintf(&key, "%p-%d", req, req->ifindex) < 0) - return NULL; + virAsprintf(&key, "%p-%d", req, req->ifindex); =20 virNWFilterSnoopActiveLock(); =20 @@ -1081,9 +1080,7 @@ virNWFilterSnoopDHCPOpen(const char *ifname, virMacAd= dr *mac, * extend the filter with the macaddr of the VM; filter the * more unlikely parameters first, then go for the MAC */ - if (virAsprintf(&ext_filter, - "%s and ether src %s", filter, macaddr) < 0) - return NULL; + virAsprintf(&ext_filter, "%s and ether src %s", filter, macaddr); } else { /* * Some DHCP servers respond via MAC broadcast; we rely on later @@ -1766,11 +1763,7 @@ virNWFilterSnoopLeaseFileWrite(int lfd, const char *= ifkey, } =20 /* time intf ip dhcpserver */ - if (virAsprintf(&lbuf, "%u %s %s %s\n", ipl->timeout, - ifkey, ipstr, dhcpstr) < 0) { - ret =3D -1; - goto cleanup; - } + virAsprintf(&lbuf, "%u %s %s %s\n", ipl->timeout, ifkey, ipstr, dhcpst= r); len =3D strlen(lbuf); =20 if (safewrite(lfd, lbuf, len) !=3D len) { --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752735; cv=none; d=zoho.com; s=zohoarc; b=HVcz8BI3xLCATNFlmLUI6RfmAou6PhMHbbxc3yWENY2lE3wVbBJAip5kWPM0kAcsXHFNXzcaZGW5CJed697txtg6K5z4N1vLXRoGLKXZ/3QxbPuOvoMvNt/AHe5w7cBvjFvv2yMDME5O1gxgTd2pL8g+A/Z+vig+Ea6PbWeKK+I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752735; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ScFue3VBVi1YN23YUpbap+T0zFv0mb3EBIAFMj2UHIk=; b=TbgcBVF286CrIPrmBN/p+kUiDw1/hGQjHcbcFaqD5dOAD75rQJrwkEzwzraWw+ByGnRimUPzqNUgZvxbCeU38I0l6L4zfzzWOz3gMT+G8VQV11wCQxcxnGVrLPYfU2x4s9QFl0+PBsMnAXU4AtmaYPBJIhURpY9Hv/pZauwIc/k= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1571752735180909.6554299580057; Tue, 22 Oct 2019 06:58:55 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-204-I-B0l3xbOByD8_95iBdOHg-1; Tue, 22 Oct 2019 09:58:52 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 892A25F5; Tue, 22 Oct 2019 13:58:47 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5F1A2194BB; Tue, 22 Oct 2019 13:58:47 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 1B109180BA9B; Tue, 22 Oct 2019 13:58:47 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9MDwhT2001676 for ; Tue, 22 Oct 2019 09:58:43 -0400 Received: by smtp.corp.redhat.com (Postfix) id 940966012C; Tue, 22 Oct 2019 13:58:43 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1BFD060161 for ; Tue, 22 Oct 2019 13:58:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752734; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=ScFue3VBVi1YN23YUpbap+T0zFv0mb3EBIAFMj2UHIk=; b=eh8y+slRpXYQeL0G314LTT5YUUq/ET/6MG6aMZBznKrMZcDc3LIthOFhTe6IFJz3IZcuWx 1QHW/pqwLQu8wSbkAW5zxMbZvTF1GilAMDtwNEjYamq+6jS2YwO+m83WyZa2foRkATXGmJ WliyWkzrEMSNghEPw/2mTQ6SxDoNNVE= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:21 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 17/75] openvz: Drop virAsprintf() and virAsprintfQuiet() retval checking X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: I-B0l3xbOByD8_95iBdOHg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" These functions can't fail really. Drop checking of their retval then. Signed-off-by: Michal Privoznik --- src/openvz/openvz_conf.c | 18 ++++++------------ src/openvz/openvz_driver.c | 7 +++---- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index 4646308c48..cb64ed57f0 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -362,8 +362,7 @@ openvzReadFSConf(virDomainDefPtr def, if (VIR_ALLOC(fs) < 0) goto error; =20 - if (virAsprintf(&veid_str, "%d", veid) < 0) - goto error; + virAsprintf(&veid_str, "%d", veid); =20 fs->type =3D VIR_DOMAIN_FS_TYPE_MOUNT; if (!(fs->src->path =3D virStringReplace(temp, "$VEID", veid_str))) @@ -534,8 +533,7 @@ int openvzLoadDomains(struct openvz_driver *driver) def->id =3D -1; else def->id =3D veid; - if (virAsprintf(&def->name, "%i", veid) < 0) - goto cleanup; + virAsprintf(&def->name, "%i", veid); =20 openvzGetVPSUUID(veid, uuidstr, sizeof(uuidstr)); ret =3D virUUIDParse(uuidstr, def->uuid); @@ -626,8 +624,7 @@ openvzWriteConfigParam(const char * conf_file, const ch= ar *param, const char *va char *line =3D NULL; size_t line_size =3D 0; =20 - if (virAsprintf(&temp_file, "%s.tmp", conf_file)<0) - return -1; + virAsprintf(&temp_file, "%s.tmp", conf_file); =20 fp =3D fopen(conf_file, "r"); if (fp =3D=3D NULL) @@ -823,9 +820,8 @@ openvzCopyDefaultConfig(int vpsid) if (confdir =3D=3D NULL) goto cleanup; =20 - if (virAsprintf(&default_conf_file, "%s/ve-%s.conf-sample", confdir, - configfile_value) < 0) - goto cleanup; + virAsprintf(&default_conf_file, "%s/ve-%s.conf-sample", confdir, + configfile_value); =20 if (openvzLocateConfFile(vpsid, &conf_file, "conf") < 0) goto cleanup; @@ -855,9 +851,7 @@ openvzLocateConfFileDefault(int vpsid, char **conffile,= const char *ext) if (confdir =3D=3D NULL) return -1; =20 - if (virAsprintf(conffile, "%s/%d.%s", confdir, vpsid, - ext ? ext : "conf") < 0) - ret =3D -1; + virAsprintf(conffile, "%s/%d.%s", confdir, vpsid, ext ? ext : "conf"); =20 VIR_FREE(confdir); return ret; diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 017eec3081..463751ec86 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -702,7 +702,7 @@ openvzGenerateVethName(int veid, char *dev_name_ve) =20 if (sscanf(dev_name_ve, "%*[^0-9]%d", &ifNo) !=3D 1) return NULL; - ignore_value(virAsprintf(&ret, "veth%d.%d.", veid, ifNo)); + virAsprintf(&ret, "veth%d.%d.", veid, ifNo); return ret; } =20 @@ -729,7 +729,7 @@ openvzGenerateContainerVethName(int veid) } =20 /* set new name */ - ignore_value(virAsprintf(&name, "eth%d", max + 1)); + virAsprintf(&name, "eth%d", max + 1); } =20 VIR_FREE(temp); @@ -2207,8 +2207,7 @@ openvzDomainMigratePrepare3Params(virConnectPtr dconn, } } =20 - if (virAsprintf(uri_out, "ssh://%s", hostname) < 0) - goto error; + virAsprintf(uri_out, "ssh://%s", hostname); =20 ret =3D 0; goto done; --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752753; cv=none; d=zoho.com; s=zohoarc; b=ZdiZqWWUKUzKVhs/zHYZ0DGx3HORS9GdzsTwGJdNFWE0imIqq1XdunSAulma4uCskjR8uSYtS6+DiZUr16I+Txr3mBxxqL0Jzb/gbhczVWZQKxfdU7ykZ3kRoZ2k0yFTryEuoU/PbFMDK0eeumUBFjRYY9s3RO14yJGAMBzn9eE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752753; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ICLad+tL/dsA18G2/bVjq4FyyfZmbrcDb6VhznF3mc8=; b=cSa1C+Mdw/y1+qtEL16WccpNzjTUlWPOiUILSD1jS0cnMHKxRFhWANOu/agoSowFDXkNvruH4SMruLHcfNRFiQ/UFS7HkDBZX4Hy0Vwo+Gsky9jOYPkEgSMeil+6ae5cRkKFJiuuCAhOYFHGlFBF11h9EoIRFEvmW+uuDBylejU= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1571752753046371.2560733509282; Tue, 22 Oct 2019 06:59:13 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-29-uuqyDk3kOyqaiCWW29RxmQ-1; Tue, 22 Oct 2019 09:59:09 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A470D800D56; Tue, 22 Oct 2019 13:59:01 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 740086012D; Tue, 22 Oct 2019 13:59:01 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 115661806B00; Tue, 22 Oct 2019 13:59:01 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9MDwiOd001686 for ; Tue, 22 Oct 2019 09:58:44 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6228160167; Tue, 22 Oct 2019 13:58:44 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id E05E26012C for ; Tue, 22 Oct 2019 13:58:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752752; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=ICLad+tL/dsA18G2/bVjq4FyyfZmbrcDb6VhznF3mc8=; b=O/iV+NNIPk3lVY+Swf1JYGq56lUR83YZ0s5llOxRelXzmBF4qeerIqiZcjnrgbkSFYb1Z1 2UqIomFzfpz4mdq6jK5bDB7Fl2v/4DoHU6GudoDP/u4Y4BI5zn0TvnXTV9vxAcO03XAclt 5XuSAobSyW4Jpz5pl1qjeWeN9v2DonU= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:22 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 18/75] phyp: Drop virAsprintf() and virAsprintfQuiet() retval checking X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: uuqyDk3kOyqaiCWW29RxmQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" These functions can't fail really. Drop checking of their retval then. Signed-off-by: Michal Privoznik --- src/phyp/phyp_driver.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index 8b1d804233..6aa47ac511 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -504,9 +504,8 @@ phypUUIDTable_Push(virConnectPtr conn) char *remote_file =3D NULL; int ret =3D -1; =20 - if (virAsprintf(&remote_file, "/home/%s/libvirt_uuid_table", - NULLSTR(conn->uri->user)) < 0) - goto cleanup; + virAsprintf(&remote_file, "/home/%s/libvirt_uuid_table", + NULLSTR(conn->uri->user)); =20 if (stat(local_file, &local_fileinfo) =3D=3D -1) { VIR_WARN("Unable to stat local file."); @@ -692,9 +691,8 @@ phypUUIDTable_Pull(virConnectPtr conn) char *remote_file =3D NULL; int ret =3D -1; =20 - if (virAsprintf(&remote_file, "/home/%s/libvirt_uuid_table", - NULLSTR(conn->uri->user)) < 0) - goto cleanup; + virAsprintf(&remote_file, "/home/%s/libvirt_uuid_table", + NULLSTR(conn->uri->user)); =20 /* Trying to stat the remote file. */ do { @@ -939,11 +937,9 @@ openSSHSession(virConnectPtr conn, virConnectAuthPtr a= uth, if (userhome =3D=3D NULL) goto err; =20 - if (virAsprintf(&pubkey, "%s/.ssh/id_rsa.pub", userhome) < 0) - goto err; + virAsprintf(&pubkey, "%s/.ssh/id_rsa.pub", userhome); =20 - if (virAsprintf(&pvtkey, "%s/.ssh/id_rsa", userhome) < 0) - goto err; + virAsprintf(&pvtkey, "%s/.ssh/id_rsa", userhome); =20 if (conn->uri->user !=3D NULL) { username =3D g_strdup(conn->uri->user); @@ -2281,8 +2277,7 @@ phypStorageVolGetPath(virStorageVolPtr vol) if (!pv) goto cleanup; =20 - if (virAsprintf(&path, "/%s/%s/%s", pv, ret, vol->name) < 0) - goto cleanup; + virAsprintf(&path, "/%s/%s/%s", pv, ret, vol->name); =20 cleanup: VIR_FREE(ret); --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752740; cv=none; d=zoho.com; s=zohoarc; b=DyKYegtGLbCJhb1bc9aoqH4LAQpl5JecUQu/eBVxNDibk9Q0JNkJPoAl7RytYL6GAQ86E5gI2KawCd2gud4r7m6P5f+uPKzr56S6Tr5o7D7ydMidwZb71WcCk6CxzFMfmxdSSs0DZuWqb6Rtt2/ySDJDJajtIg6sDHaFm/1qN8M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752740; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Xke16hEqPrQSC1vSOK3ZnEKGukdeduN4kvNvugEzEPU=; b=h9JG2PEnclTPdXDM5RLIdN5EbzG9iGJ6wsAUEden0ab4RqEpHNPcCQz+Bp5c7cNzeu2uOP3TCs8XRNREo+ilkW6a+9bAVXFlNd66bkE8Yw16IKTUnqHv8ipiPhNvP5dSgKN0WaYb5/BODiFAWgzZW/fJEEM/++CfZsH5HfP3Fic= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 157175274075777.00804276986582; Tue, 22 Oct 2019 06:59:00 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-306-C4qzlf_lMx2AfpfwY3QyPA-1; Tue, 22 Oct 2019 09:58:57 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F12FB107AD3C; Tue, 22 Oct 2019 13:58:50 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C2A7F1001E91; Tue, 22 Oct 2019 13:58:50 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 77B4C180BAA2; Tue, 22 Oct 2019 13:58:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9MDwj2o001700 for ; Tue, 22 Oct 2019 09:58:45 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8031C60167; Tue, 22 Oct 2019 13:58:45 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id AFDC060161 for ; Tue, 22 Oct 2019 13:58:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752739; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Xke16hEqPrQSC1vSOK3ZnEKGukdeduN4kvNvugEzEPU=; b=dxXG162/51P37qZ60l+Dk/Z5qhVrxnQBcS4HkkIgwPdyN4i4yJ/9TfkaA/e5zIyE4hU9Ft DZUd9F1bx33D1TYiIgzPJxPDPnCopcd0sGWt4N0ieUNA8WwY6jWX0NHfiZrlZSqvL0LCye wABdKVGAU9wrw+AB8/GxGCX44Y2pu/0= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:23 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 19/75] qemu: Drop virAsprintf() and virAsprintfQuiet() retval checking X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: C4qzlf_lMx2AfpfwY3QyPA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" These functions can't fail really. Drop checking of their retval then. Signed-off-by: Michal Privoznik --- src/qemu/qemu_agent.c | 9 +- src/qemu/qemu_alias.c | 114 +++++++++++----------- src/qemu/qemu_block.c | 41 +++----- src/qemu/qemu_blockjob.c | 12 +-- src/qemu/qemu_capabilities.c | 14 +-- src/qemu/qemu_checkpoint.c | 11 +-- src/qemu/qemu_command.c | 104 ++++++++------------ src/qemu/qemu_conf.c | 141 ++++++++++----------------- src/qemu/qemu_conf.h | 4 +- src/qemu/qemu_domain.c | 158 ++++++++++++------------------- src/qemu/qemu_domain.h | 6 +- src/qemu/qemu_driver.c | 6 +- src/qemu/qemu_firmware.c | 3 +- src/qemu/qemu_hotplug.c | 80 ++++++---------- src/qemu/qemu_interface.c | 5 +- src/qemu/qemu_interop_config.c | 9 +- src/qemu/qemu_migration.c | 33 +++---- src/qemu/qemu_migration_cookie.c | 3 +- src/qemu/qemu_monitor.c | 33 +++---- src/qemu/qemu_monitor_json.c | 26 ++--- src/qemu/qemu_monitor_text.c | 15 +-- src/qemu/qemu_process.c | 74 +++++---------- src/qemu/qemu_slirp.c | 18 ++-- src/qemu/qemu_tpm.c | 19 ++-- src/qemu/qemu_vhost_user_gpu.c | 3 +- 25 files changed, 357 insertions(+), 584 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 4b914e6d3b..d1b590d842 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -916,10 +916,8 @@ qemuAgentGuestSync(qemuAgentPtr mon) if (virTimeMillisNow(&id) < 0) return -1; =20 - if (virAsprintf(&sync_msg.txBuffer, - "{\"execute\":\"guest-sync\", " - "\"arguments\":{\"id\":%llu}}\n", id) < 0) - return -1; + virAsprintf(&sync_msg.txBuffer, "{\"execute\":\"guest-sync\", " + "\"arguments\":{\"id\":%llu}}\n", id); =20 sync_msg.txLength =3D strlen(sync_msg.txBuffer); sync_msg.sync =3D true; @@ -1120,8 +1118,7 @@ qemuAgentCommand(qemuAgentPtr mon, =20 if (!(cmdstr =3D virJSONValueToString(cmd, false))) goto cleanup; - if (virAsprintf(&msg.txBuffer, "%s" LINE_ENDING, cmdstr) < 0) - goto cleanup; + virAsprintf(&msg.txBuffer, "%s" LINE_ENDING, cmdstr); msg.txLength =3D strlen(msg.txBuffer); =20 VIR_DEBUG("Send command '%s' for write, seconds =3D %d", cmdstr, secon= ds); diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c index f11099ce90..60ab5735a4 100644 --- a/src/qemu/qemu_alias.c +++ b/src/qemu/qemu_alias.c @@ -114,7 +114,8 @@ qemuAssignDeviceChrAlias(virDomainDefPtr def, if (idx =3D=3D -1 && (idx =3D qemuGetNextChrDevIndex(def, chr, prefix)= ) < 0) return -1; =20 - return virAsprintf(&chr->info.alias, "%s%zd", prefix, idx); + virAsprintf(&chr->info.alias, "%s%zd", prefix, idx); + return 0; } =20 =20 @@ -141,13 +142,15 @@ qemuAssignDeviceControllerAlias(virDomainDefPtr domai= nDef, * different naming convention ("pcie.0"), because it is * hardcoded that way in qemu. */ - return virAsprintf(&controller->info.alias, "pcie.%d", control= ler->idx); + virAsprintf(&controller->info.alias, "pcie.%d", controller->id= x); + return 0; } /* All other PCI controllers use the consistent "pci.%u" * (including the hardcoded pci-root controller on * multibus-capable qemus). */ - return virAsprintf(&controller->info.alias, "pci.%d", controller->= idx); + virAsprintf(&controller->info.alias, "pci.%d", controller->idx); + return 0; } else if (controller->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_IDE) { /* for any machine based on e.g. I440FX or G3Beige, the * first (and currently only) IDE controller is an integrated @@ -176,7 +179,8 @@ qemuAssignDeviceControllerAlias(virDomainDefPtr domainD= ef, /* all other controllers use the default ${type}${index} naming * scheme for alias/id. */ - return virAsprintf(&controller->info.alias, "%s%d", prefix, controller= ->idx); + virAsprintf(&controller->info.alias, "%s%d", prefix, controller->idx); + return 0; } =20 =20 @@ -200,23 +204,20 @@ qemuAssignDeviceDiskAlias(virDomainDefPtr def, =20 if (disk->bus !=3D VIR_DOMAIN_DISK_BUS_SCSI || controllerModel =3D=3D VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LS= ILOGIC) { - if (virAsprintf(&disk->info.alias, "%s%d-%d-%d", prefix, - disk->info.addr.drive.controller, - disk->info.addr.drive.bus, - disk->info.addr.drive.unit) < 0) - return -1; + virAsprintf(&disk->info.alias, "%s%d-%d-%d", prefix, + disk->info.addr.drive.controller, + disk->info.addr.drive.bus, + disk->info.addr.drive.unit); } else { - if (virAsprintf(&disk->info.alias, "%s%d-%d-%d-%d", prefix, - disk->info.addr.drive.controller, - disk->info.addr.drive.bus, - disk->info.addr.drive.target, - disk->info.addr.drive.unit) < 0) - return -1; + virAsprintf(&disk->info.alias, "%s%d-%d-%d-%d", prefix, + disk->info.addr.drive.controller, + disk->info.addr.drive.bus, + disk->info.addr.drive.target, + disk->info.addr.drive.unit); } } else { int idx =3D virDiskNameToIndex(disk->dst); - if (virAsprintf(&disk->info.alias, "%s-disk%d", prefix, idx) <= 0) - return -1; + virAsprintf(&disk->info.alias, "%s-disk%d", prefix, idx); } } =20 @@ -235,17 +236,15 @@ qemuAssignDeviceDiskAlias(virDomainDefPtr def, break; =20 case VIR_DOMAIN_DISK_BUS_VIRTIO: - if (virAsprintf(&diskPriv->qomName, - "/machine/peripheral/%s/virtio-backend", - disk->info.alias) < 0) - return -1; + virAsprintf(&diskPriv->qomName, + "/machine/peripheral/%s/virtio-backend", + disk->info.alias); break; =20 case VIR_DOMAIN_DISK_BUS_USB: - if (virAsprintf(&diskPriv->qomName, - "/machine/peripheral/%s/%s.0/legacy[0]", - disk->info.alias, disk->info.alias) < 0) - return -1; + virAsprintf(&diskPriv->qomName, + "/machine/peripheral/%s/%s.0/legacy[0]", + disk->info.alias, disk->info.alias); break; =20 case VIR_DOMAIN_DISK_BUS_XEN: @@ -291,8 +290,7 @@ qemuAssignDeviceHostdevAlias(virDomainDefPtr def, } } =20 - if (virAsprintf(alias, "hostdev%d", idx) < 0) - return -1; + virAsprintf(alias, "hostdev%d", idx); =20 return 0; } @@ -327,8 +325,7 @@ qemuAssignDeviceNetAlias(virDomainDefPtr def, } } =20 - if (virAsprintf(&net->info.alias, "net%d", idx) < 0) - return -1; + virAsprintf(&net->info.alias, "net%d", idx); return 0; } =20 @@ -340,7 +337,8 @@ qemuAssignDeviceFSAlias(virDomainFSDefPtr fss, if (fss->info.alias) return 0; =20 - return virAsprintf(&fss->info.alias, "fs%d", idx); + virAsprintf(&fss->info.alias, "fs%d", idx); + return 0; } =20 =20 @@ -351,7 +349,8 @@ qemuAssignDeviceSoundAlias(virDomainSoundDefPtr sound, if (sound->info.alias) return 0; =20 - return virAsprintf(&sound->info.alias, "sound%d", idx); + virAsprintf(&sound->info.alias, "sound%d", idx); + return 0; } =20 =20 @@ -362,7 +361,8 @@ qemuAssignDeviceVideoAlias(virDomainVideoDefPtr video, if (video->info.alias) return 0; =20 - return virAsprintf(&video->info.alias, "video%d", idx); + virAsprintf(&video->info.alias, "video%d", idx); + return 0; } =20 =20 @@ -373,7 +373,8 @@ qemuAssignDeviceHubAlias(virDomainHubDefPtr hub, if (hub->info.alias) return 0; =20 - return virAsprintf(&hub->info.alias, "hub%d", idx); + virAsprintf(&hub->info.alias, "hub%d", idx); + return 0; } =20 =20 @@ -384,7 +385,8 @@ qemuAssignDeviceSmartcardAlias(virDomainSmartcardDefPtr= smartcard, if (smartcard->info.alias) return 0; =20 - return virAsprintf(&smartcard->info.alias, "smartcard%d", idx); + virAsprintf(&smartcard->info.alias, "smartcard%d", idx); + return 0; } =20 =20 @@ -395,7 +397,8 @@ qemuAssingDeviceMemballoonAlias(virDomainMemballoonDefP= tr memballoon, if (memballoon->info.alias) return 0; =20 - return virAsprintf(&memballoon->info.alias, "balloon%d", idx); + virAsprintf(&memballoon->info.alias, "balloon%d", idx); + return 0; } =20 =20 @@ -406,7 +409,8 @@ qemuAssignDeviceTPMAlias(virDomainTPMDefPtr tpm, if (tpm->info.alias) return 0; =20 - return virAsprintf(&tpm->info.alias, "tpm%d", idx); + virAsprintf(&tpm->info.alias, "tpm%d", idx); + return 0; } =20 =20 @@ -430,8 +434,7 @@ qemuAssignDeviceRedirdevAlias(virDomainDefPtr def, } } =20 - if (virAsprintf(&redirdev->info.alias, "redir%d", idx) < 0) - return -1; + virAsprintf(&redirdev->info.alias, "redir%d", idx); return 0; } =20 @@ -452,8 +455,7 @@ qemuAssignDeviceRNGAlias(virDomainDefPtr def, maxidx =3D idx + 1; } =20 - if (virAsprintf(&rng->info.alias, "rng%d", maxidx) < 0) - return -1; + virAsprintf(&rng->info.alias, "rng%d", maxidx); =20 return 0; } @@ -498,8 +500,7 @@ qemuAssignDeviceMemoryAlias(virDomainDefPtr def, maxidx =3D mem->info.addr.dimm.slot; } =20 - if (virAsprintf(&mem->info.alias, "%s%d", prefix, maxidx) < 0) - return -1; + virAsprintf(&mem->info.alias, "%s%d", prefix, maxidx); =20 return 0; } @@ -528,8 +529,7 @@ qemuAssignDeviceShmemAlias(virDomainDefPtr def, } } =20 - if (virAsprintf(&shmem->info.alias, "shmem%d", idx) < 0) - return -1; + virAsprintf(&shmem->info.alias, "shmem%d", idx); return 0; } =20 @@ -565,8 +565,7 @@ qemuAssignDeviceInputAlias(virDomainDefPtr def, } } =20 - if (virAsprintf(&input->info.alias, "input%d", idx) < 0) - return -1; + virAsprintf(&input->info.alias, "input%d", idx); =20 return 0; } @@ -706,9 +705,7 @@ qemuAliasDiskDriveFromDisk(const virDomainDiskDef *disk) return NULL; } =20 - ignore_value(virAsprintf(&ret, "%s%s", QEMU_DRIVE_HOST_PREFIX, - disk->info.alias)); - + virAsprintf(&ret, "%s%s", QEMU_DRIVE_HOST_PREFIX, disk->info.alias); return ret; } =20 @@ -744,9 +741,9 @@ qemuAliasFromHostdev(const virDomainHostdevDef *hostdev) return NULL; } =20 - ignore_value(virAsprintf(&ret, "%s-%s", - virDomainDeviceAddressTypeToString(hostdev->info->type), - hostdev->info->alias)); + virAsprintf(&ret, "%s-%s", + virDomainDeviceAddressTypeToString(hostdev->info->type), + hostdev->info->alias); return ret; } =20 @@ -789,9 +786,9 @@ qemuDomainGetSecretAESAlias(const char *srcalias, } =20 if (isLuks) - ignore_value(virAsprintf(&alias, "%s-luks-secret0", srcalias)); + virAsprintf(&alias, "%s-luks-secret0", srcalias); else - ignore_value(virAsprintf(&alias, "%s-secret0", srcalias)); + virAsprintf(&alias, "%s-secret0", srcalias); =20 return alias; } @@ -807,7 +804,7 @@ qemuAliasTLSObjFromSrcAlias(const char *srcAlias) { char *ret; =20 - ignore_value(virAsprintf(&ret, "obj%s_tls0", srcAlias)); + virAsprintf(&ret, "obj%s_tls0", srcAlias); =20 return ret; } @@ -823,7 +820,7 @@ qemuAliasChardevFromDevAlias(const char *devAlias) { char *ret; =20 - ignore_value(virAsprintf(&ret, "char%s", devAlias)); + virAsprintf(&ret, "char%s", devAlias); =20 return ret; } @@ -841,7 +838,7 @@ qemuDomainGetUnmanagedPRAlias(const char *parentalias) { char *ret; =20 - ignore_value(virAsprintf(&ret, "pr-helper-%s", parentalias)); + virAsprintf(&ret, "pr-helper-%s", parentalias); =20 return ret; } @@ -852,8 +849,7 @@ qemuAliasDBusVMStateFromId(const char *id) char *ret; size_t i; =20 - if (virAsprintf(&ret, "dbus-vms-%s", id) < 0) - return NULL; + virAsprintf(&ret, "dbus-vms-%s", id); =20 for (i =3D 0; ret[i]; i++) { if (ret[i] =3D=3D ':') diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 4416bda6d2..f40915fe23 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -423,22 +423,17 @@ qemuBlockStorageSourceGetURI(virStorageSourcePtr src) =20 uri->scheme =3D g_strdup(virStorageNetProtocolTypeToString(src->pr= otocol)); } else { - if (virAsprintf(&uri->scheme, "%s+%s", - virStorageNetProtocolTypeToString(src->protocol), - virStorageNetHostTransportTypeToString(src->hosts-= >transport)) < 0) - return NULL; + virAsprintf(&uri->scheme, "%s+%s", + virStorageNetProtocolTypeToString(src->protocol), + virStorageNetHostTransportTypeToString(src->hosts->tra= nsport)); } =20 if (src->path) { if (src->volume) { - if (virAsprintf(&uri->path, "/%s/%s", - src->volume, src->path) < 0) - return NULL; + virAsprintf(&uri->path, "/%s/%s", src->volume, src->path); } else { - if (virAsprintf(&uri->path, "%s%s", - src->path[0] =3D=3D '/' ? "" : "/", - src->path) < 0) - return NULL; + virAsprintf(&uri->path, "%s%s", src->path[0] =3D=3D '/' ? "" := "/", + src->path); } } =20 @@ -477,8 +472,7 @@ qemuBlockStorageSourceBuildJSONSocketAddress(virStorage= NetHostDefPtr host, else transport =3D "inet"; =20 - if (virAsprintf(&port, "%u", host->port) < 0) - return NULL; + virAsprintf(&port, "%u", host->port); =20 if (virJSONValueObjectCreate(&server, "s:type", transport, @@ -570,8 +564,7 @@ qemuBlockStorageSourceBuildJSONInetSocketAddress(virSto= rageNetHostDefPtr host) return NULL; } =20 - if (virAsprintf(&port, "%u", host->port) < 0) - return NULL; + virAsprintf(&port, "%u", host->port); =20 ignore_value(virJSONValueObjectCreate(&ret, "s:host", host->name, @@ -767,13 +760,10 @@ qemuBlockStorageSourceGetISCSIProps(virStorageSourceP= tr src, =20 /* combine host and port into portal */ if (virSocketAddrNumericFamily(src->hosts[0].name) =3D=3D AF_INET6) { - if (virAsprintf(&portal, "[%s]:%u", - src->hosts[0].name, src->hosts[0].port) < 0) - return NULL; + virAsprintf(&portal, "[%s]:%u", src->hosts[0].name, + src->hosts[0].port); } else { - if (virAsprintf(&portal, "%s:%u", - src->hosts[0].name, src->hosts[0].port) < 0) - return NULL; + virAsprintf(&portal, "%s:%u", src->hosts[0].name, src->hosts[0].po= rt); } =20 if (!onlytarget && src->auth) { @@ -1965,8 +1955,7 @@ qemuBlockGetBackingStoreString(virStorageSourcePtr sr= c) if (!(backingJSON =3D virJSONValueToString(backingProps, false))) return NULL; =20 - if (virAsprintf(&ret, "json:%s", backingJSON) < 0) - return NULL; + virAsprintf(&ret, "json:%s", backingJSON); =20 return ret; } @@ -2048,11 +2037,11 @@ qemuBlockStorageSourceCreateGetEncryptionLUKS(virSt= orageSourcePtr src, return -1; =20 if (src->encryption) { - if (src->encryption->encinfo.cipher_name && + if (src->encryption->encinfo.cipher_name) { virAsprintf(&cipheralg, "%s-%u", src->encryption->encinfo.cipher_name, - src->encryption->encinfo.cipher_size) < 0) - return -1; + src->encryption->encinfo.cipher_size); + } =20 if (virJSONValueObjectAdd(props, "S:cipher-alg", cipheralg, diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index 8c418ecf6c..e59cab3478 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -227,8 +227,7 @@ qemuBlockJobDiskNewPull(virDomainObjPtr vm, g_autofree char *jobname =3D NULL; =20 if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) { - if (virAsprintf(&jobname, "pull-%s-%s", disk->dst, disk->src->node= format) < 0) - return NULL; + virAsprintf(&jobname, "pull-%s-%s", disk->dst, disk->src->nodeform= at); } else { if (!(jobname =3D qemuAliasDiskDriveFromDisk(disk))) return NULL; @@ -262,8 +261,7 @@ qemuBlockJobDiskNewCommit(virDomainObjPtr vm, jobtype =3D QEMU_BLOCKJOB_TYPE_ACTIVE_COMMIT; =20 if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) { - if (virAsprintf(&jobname, "commit-%s-%s", disk->dst, top->nodeform= at) < 0) - return NULL; + virAsprintf(&jobname, "commit-%s-%s", disk->dst, top->nodeformat); } else { if (!(jobname =3D qemuAliasDiskDriveFromDisk(disk))) return NULL; @@ -296,8 +294,7 @@ qemuBlockJobNewCreate(virDomainObjPtr vm, if (storage) nodename =3D src->nodestorage; =20 - if (virAsprintf(&jobname, "create-%s", nodename) < 0) - return NULL; + virAsprintf(&jobname, "create-%s", nodename); =20 if (!(job =3D qemuBlockJobDataNew(QEMU_BLOCKJOB_TYPE_CREATE, jobname))) return NULL; @@ -326,8 +323,7 @@ qemuBlockJobDiskNewCopy(virDomainObjPtr vm, g_autofree char *jobname =3D NULL; =20 if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) { - if (virAsprintf(&jobname, "copy-%s-%s", disk->dst, disk->src->node= format) < 0) - return NULL; + virAsprintf(&jobname, "copy-%s-%s", disk->dst, disk->src->nodeform= at); } else { if (!(jobname =3D qemuAliasDiskDriveFromDisk(disk))) return NULL; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index c78ad56edf..b2ea7ec373 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -734,8 +734,7 @@ virQEMUCapsFindBinary(const char *format, char *ret =3D NULL; char *binary =3D NULL; =20 - if (virAsprintf(&binary, format, archstr) < 0) - return NULL; + virAsprintf(&binary, format, archstr); =20 ret =3D virFindFileInPath(binary); VIR_FREE(binary); @@ -2412,8 +2411,7 @@ virQEMUCapsProbeQMPMachineProps(virQEMUCapsPtr qemuCa= ps, =20 /* The QOM type for machine types is the machine type name * followed by the -machine suffix */ - if (virAsprintf(&type, "%s-machine", canon) < 0) - return -1; + virAsprintf(&type, "%s-machine", canon); =20 if ((nvalues =3D qemuMonitorGetObjectProps(mon, type, &values)) < = 0) return -1; @@ -4849,8 +4847,7 @@ virQEMUCapsCacheNew(const char *libDir, virQEMUCapsCachePrivPtr priv =3D NULL; struct utsname uts; =20 - if (virAsprintf(&capsCacheDir, "%s/capabilities", cacheDir) < 0) - goto error; + virAsprintf(&capsCacheDir, "%s/capabilities", cacheDir); =20 if (!(cache =3D virFileCacheNew(capsCacheDir, "xml", &qemuCapsCacheHan= dlers))) goto error; @@ -4867,9 +4864,8 @@ virQEMUCapsCacheNew(const char *libDir, priv->runGid =3D runGid; priv->kvmUsable =3D VIR_TRISTATE_BOOL_ABSENT; =20 - if (uname(&uts) =3D=3D 0 && - virAsprintf(&priv->kernelVersion, "%s %s", uts.release, uts.versio= n) < 0) - goto error; + if (uname(&uts) =3D=3D 0) + virAsprintf(&priv->kernelVersion, "%s %s", uts.release, uts.versio= n); =20 cleanup: VIR_FREE(capsCacheDir); diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c index 4a618f5236..4c224d6f40 100644 --- a/src/qemu/qemu_checkpoint.c +++ b/src/qemu/qemu_checkpoint.c @@ -92,16 +92,14 @@ qemuCheckpointWriteMetadata(virDomainObjPtr vm, if (newxml =3D=3D NULL) return -1; =20 - if (virAsprintf(&chkDir, "%s/%s", checkpointDir, vm->def->name) < 0) - return -1; + virAsprintf(&chkDir, "%s/%s", checkpointDir, vm->def->name); if (virFileMakePath(chkDir) < 0) { virReportSystemError(errno, _("cannot create checkpoint directory = '%s'"), chkDir); return -1; } =20 - if (virAsprintf(&chkFile, "%s/%s.xml", chkDir, def->parent.name) < 0) - return -1; + virAsprintf(&chkFile, "%s/%s.xml", chkDir, def->parent.name); =20 return virXMLSaveFile(chkFile, NULL, "checkpoint-edit", newxml); } @@ -127,9 +125,8 @@ qemuCheckpointDiscard(virQEMUDriverPtr driver, return -1; } =20 - if (virAsprintf(&chkFile, "%s/%s/%s.xml", cfg->checkpointDir, - vm->def->name, chk->def->name) < 0) - return -1; + virAsprintf(&chkFile, "%s/%s/%s.xml", cfg->checkpointDir, vm->def->nam= e, + chk->def->name); =20 if (!metadata_only) { qemuDomainObjPrivatePtr priv =3D vm->privateData; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 0160507737..a55a5826a7 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -262,7 +262,7 @@ qemuVirCommandGetFDSet(virCommandPtr cmd, int fd) return NULL; } =20 - ignore_value(virAsprintf(&result, "set=3D%d,fd=3D%d", idx, fd)); + virAsprintf(&result, "set=3D%d,fd=3D%d", idx, fd); return result; } =20 @@ -289,7 +289,7 @@ qemuVirCommandGetDevSet(virCommandPtr cmd, int fd) return NULL; } =20 - ignore_value(virAsprintf(&result, "/dev/fdset/%d", idx)); + virAsprintf(&result, "/dev/fdset/%d", idx); return result; } =20 @@ -795,10 +795,8 @@ qemuBuildGeneralSecinfoURI(virURIPtr uri, _("found non printable characters in secret= ")); return -1; } - if (virAsprintf(&uri->user, "%s:%s", - secinfo->s.plain.username, - secinfo->s.plain.secret) < 0) - return -1; + virAsprintf(&uri->user, "%s:%s", secinfo->s.plain.username, + secinfo->s.plain.secret); } else { uri->user =3D g_strdup(secinfo->s.plain.username); } @@ -947,9 +945,8 @@ qemuBuildNetworkDriveURI(virStorageSourcePtr src, if (!(uri =3D qemuBlockStorageSourceGetURI(src))) return NULL; =20 - if (src->hosts->socket && - virAsprintf(&uri->query, "socket=3D%s", src->hosts->socket) < 0) - return NULL; + if (src->hosts->socket) + virAsprintf(&uri->query, "socket=3D%s", src->hosts->socket); =20 if (qemuBuildGeneralSecinfoURI(uri, secinfo) < 0) return NULL; @@ -1038,13 +1035,10 @@ qemuBuildNetworkDriveStr(virStorageSourcePtr src, } =20 if (src->nhosts =3D=3D 0) { - if (virAsprintf(&ret, "sheepdog:%s", src->path) < 0) - return NULL; + virAsprintf(&ret, "sheepdog:%s", src->path); } else if (src->nhosts =3D=3D 1) { - if (virAsprintf(&ret, "sheepdog:%s:%u:%s", - src->hosts->name, src->hosts->port, - src->path) < 0) - return NULL; + virAsprintf(&ret, "sheepdog:%s:%u:%s", src->hosts->name, + src->hosts->port, src->path); } else { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("protocol 'sheepdog' accepts up to one ho= st")); @@ -2375,18 +2369,16 @@ qemuBuildFloppyCommandLineControllerOptions(virComm= andPtr cmd, else driveLetter =3D 'A'; =20 - if (bootindex && - virAsprintf(&bootindexStr, "bootindex%c=3D%u", driveLetter, bo= otindex) < 0) - return -1; + if (bootindex) + virAsprintf(&bootindexStr, "bootindex%c=3D%u", driveLetter, bo= otindex); =20 /* with -blockdev we setup the floppy device and it's backend with= -device */ if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV)) { if (qemuDomainDiskGetBackendAlias(disk, qemuCaps, &backendAlia= s) < 0) return -1; =20 - if (backendAlias && - virAsprintf(&backendStr, "drive%c=3D%s", driveLetter, back= endAlias) < 0) - return -1; + if (backendAlias) + virAsprintf(&backendStr, "drive%c=3D%s", driveLetter, back= endAlias); } =20 if (!explicitfdc) { @@ -3588,8 +3580,7 @@ qemuBuildMemoryCellBackendStr(virDomainDefPtr def, unsigned long long memsize =3D virDomainNumaGetNodeMemorySize(def->num= a, cell); =20 - if (virAsprintf(&alias, "ram-node%zu", cell) < 0) - return -1; + virAsprintf(&alias, "ram-node%zu", cell); =20 mem.size =3D memsize; mem.targetNode =3D cell; @@ -3622,8 +3613,7 @@ qemuBuildMemoryDimmBackendStr(virBufferPtr buf, return -1; } =20 - if (virAsprintf(&alias, "mem%s", mem->info.alias) < 0) - return -1; + virAsprintf(&alias, "mem%s", mem->info.alias); =20 if (qemuBuildMemoryBackendProps(&props, alias, cfg, priv, def, mem, true) < 0) @@ -3707,14 +3697,14 @@ qemuBuildLegacyNicStr(virDomainNetDefPtr net) char macaddr[VIR_MAC_STRING_BUFLEN]; const char *netmodel =3D virDomainNetGetModelString(net); =20 - ignore_value(virAsprintf(&str, - "nic,macaddr=3D%s,netdev=3Dhost%s%s%s%s%s", - virMacAddrFormat(&net->mac, macaddr), - net->info.alias, - netmodel ? ",model=3D" : "", - NULLSTR_EMPTY(netmodel), - (net->info.alias ? ",id=3D" : ""), - NULLSTR_EMPTY(net->info.alias))); + virAsprintf(&str, + "nic,macaddr=3D%s,netdev=3Dhost%s%s%s%s%s", + virMacAddrFormat(&net->mac, macaddr), + net->info.alias, + netmodel ? ",model=3D" : "", + NULLSTR_EMPTY(netmodel), + (net->info.alias ? ",id=3D" : ""), + NULLSTR_EMPTY(net->info.alias)); return str; } =20 @@ -4708,8 +4698,7 @@ qemuBuildVhostUserChardevStr(const char *alias, return NULL; } =20 - if (virAsprintf(&chardev, "socket,id=3Dchr-vu-%s,fd=3D%d", alias, *fd)= < 0) - return NULL; + virAsprintf(&chardev, "socket,id=3Dchr-vu-%s,fd=3D%d", alias, *fd); =20 virCommandPassFD(cmd, *fd, VIR_COMMAND_PASS_FD_CLOSE_PARENT); *fd =3D -1; @@ -5554,10 +5543,7 @@ qemuBuildHostdevCommandLine(virCommandPtr cmd, if (virSCSIVHostOpenVhostSCSI(&vhostfd) < 0) return -1; =20 - if (virAsprintf(&vhostfdName, "%d", vhostfd) < 0) { - VIR_FORCE_CLOSE(vhostfd); - return -1; - } + virAsprintf(&vhostfdName, "%d", vhostfd); =20 virCommandPassFD(cmd, vhostfd, VIR_COMMAND_PASS_FD_CLOSE_PARENT); @@ -5791,8 +5777,7 @@ qemuBuildRNGBackendProps(virDomainRNGDefPtr rng, g_autofree char *objAlias =3D NULL; g_autofree char *charBackendAlias =3D NULL; =20 - if (virAsprintf(&objAlias, "obj%s", rng->info.alias) < 0) - return -1; + virAsprintf(&objAlias, "obj%s", rng->info.alias); =20 switch ((virDomainRNGBackend) rng->backend) { case VIR_DOMAIN_RNG_BACKEND_RANDOM: @@ -8581,8 +8566,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, int slirpfd =3D qemuSlirpGetFD(slirp); virCommandPassFD(cmd, slirpfd, VIR_COMMAND_PASS_FD_CLOSE_PARENT); - if (virAsprintf(&slirpfdName, "%d", slirpfd) < 0) - goto cleanup; + virAsprintf(&slirpfdName, "%d", slirpfd); } =20 =20 @@ -8590,16 +8574,14 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driv= er, if (qemuSecuritySetTapFDLabel(driver->securityManager, def, tapfd[i]) < 0) goto cleanup; - if (virAsprintf(&tapfdName[i], "%d", tapfd[i]) < 0) - goto cleanup; + virAsprintf(&tapfdName[i], "%d", tapfd[i]); virCommandPassFD(cmd, tapfd[i], VIR_COMMAND_PASS_FD_CLOSE_PARENT); tapfd[i] =3D -1; } =20 for (i =3D 0; i < vhostfdSize; i++) { - if (virAsprintf(&vhostfdName[i], "%d", vhostfd[i]) < 0) - goto cleanup; + virAsprintf(&vhostfdName[i], "%d", vhostfd[i]); virCommandPassFD(cmd, vhostfd[i], VIR_COMMAND_PASS_FD_CLOSE_PARENT); vhostfd[i] =3D -1; @@ -8975,11 +8957,9 @@ qemuBuildShmemBackendMemProps(virDomainShmemDefPtr s= hmem) g_autofree char *mem_path =3D NULL; virJSONValuePtr ret =3D NULL; =20 - if (virAsprintf(&mem_path, "/dev/shm/%s", shmem->name) < 0) - return NULL; + virAsprintf(&mem_path, "/dev/shm/%s", shmem->name); =20 - if (virAsprintf(&mem_alias, "shmmem-%s", shmem->info.alias) < 0) - return NULL; + virAsprintf(&mem_alias, "shmmem-%s", shmem->info.alias); =20 qemuMonitorCreateObjectProps(&ret, "memory-backend-file", mem_alias, "s:mem-path", mem_path, @@ -9709,9 +9689,8 @@ qemuBuildTPMBackendStr(const virDomainDef *def, case VIR_DOMAIN_TPM_TYPE_EMULATOR: virBufferAddLit(&buf, ",chardev=3Dchrtpm"); =20 - if (virAsprintf(chardev, "socket,id=3Dchrtpm,path=3D%s", - tpm->data.emulator.source.data.nix.path) < 0) - return NULL; + virAsprintf(chardev, "socket,id=3Dchrtpm,path=3D%s", + tpm->data.emulator.source.data.nix.path); =20 break; case VIR_DOMAIN_TPM_TYPE_LAST: @@ -9796,15 +9775,13 @@ qemuBuildSEVCommandLine(virDomainObjPtr vm, virComm= andPtr cmd, virBufferAsprintf(&buf, ",policy=3D0x%x", sev->policy); =20 if (sev->dh_cert) { - if (virAsprintf(&path, "%s/dh_cert.base64", priv->libDir) < 0) - return -1; + virAsprintf(&path, "%s/dh_cert.base64", priv->libDir); virBufferAsprintf(&buf, ",dh-cert-file=3D%s", path); VIR_FREE(path); } =20 if (sev->session) { - if (virAsprintf(&path, "%s/session.base64", priv->libDir) < 0) - return -1; + virAsprintf(&path, "%s/session.base64", priv->libDir); virBufferAsprintf(&buf, ",session-file=3D%s", path); VIR_FREE(path); } @@ -10601,9 +10578,8 @@ static int qemuBuildParallelChrDeviceStr(char **deviceStr, virDomainChrDefPtr chr) { - if (virAsprintf(deviceStr, "isa-parallel,chardev=3Dchar%s,id=3D%s", - chr->info.alias, chr->info.alias) < 0) - return -1; + virAsprintf(deviceStr, "isa-parallel,chardev=3Dchar%s,id=3D%s", + chr->info.alias, chr->info.alias); return 0; } =20 @@ -10624,10 +10600,8 @@ qemuBuildChannelChrDeviceStr(char **deviceStr, return ret; port =3D virSocketAddrGetPort(chr->target.addr); =20 - if (virAsprintf(deviceStr, - "user,guestfwd=3Dtcp:%s:%i-chardev:char%s,id=3D%s", - addr, port, chr->info.alias, chr->info.alias) < 0) - return -1; + virAsprintf(deviceStr, "user,guestfwd=3Dtcp:%s:%i-chardev:char%s,i= d=3D%s", + addr, port, chr->info.alias, chr->info.alias); break; =20 case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO: diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index fae697a2ef..41fd134afc 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -130,49 +130,29 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool pr= ivileged) cfg->cgroupControllers =3D -1; /* -1 =3D=3D auto-detect */ =20 if (privileged) { - if (virAsprintf(&cfg->logDir, - "%s/log/libvirt/qemu", LOCALSTATEDIR) < 0) - return NULL; + virAsprintf(&cfg->logDir, "%s/log/libvirt/qemu", LOCALSTATEDIR); =20 - if (virAsprintf(&cfg->swtpmLogDir, - "%s/log/swtpm/libvirt/qemu", LOCALSTATEDIR) < 0) - return NULL; + virAsprintf(&cfg->swtpmLogDir, "%s/log/swtpm/libvirt/qemu", + LOCALSTATEDIR); =20 cfg->configBaseDir =3D g_strdup(SYSCONFDIR "/libvirt"); =20 - if (virAsprintf(&cfg->stateDir, - "%s/libvirt/qemu", RUNSTATEDIR) < 0) - return NULL; + virAsprintf(&cfg->stateDir, "%s/libvirt/qemu", RUNSTATEDIR); =20 - if (virAsprintf(&cfg->swtpmStateDir, - "%s/libvirt/qemu/swtpm", RUNSTATEDIR) < 0) - return NULL; + virAsprintf(&cfg->swtpmStateDir, "%s/libvirt/qemu/swtpm", RUNSTATE= DIR); =20 - if (virAsprintf(&cfg->cacheDir, - "%s/cache/libvirt/qemu", LOCALSTATEDIR) < 0) - return NULL; + virAsprintf(&cfg->cacheDir, "%s/cache/libvirt/qemu", LOCALSTATEDIR= ); =20 - if (virAsprintf(&cfg->libDir, - "%s/lib/libvirt/qemu", LOCALSTATEDIR) < 0) - return NULL; - if (virAsprintf(&cfg->saveDir, "%s/save", cfg->libDir) < 0) - return NULL; - if (virAsprintf(&cfg->snapshotDir, "%s/snapshot", cfg->libDir) < 0) - return NULL; - if (virAsprintf(&cfg->checkpointDir, "%s/checkpoint", cfg->libDir)= < 0) - return NULL; - if (virAsprintf(&cfg->autoDumpPath, "%s/dump", cfg->libDir) < 0) - return NULL; - if (virAsprintf(&cfg->channelTargetDir, - "%s/channel/target", cfg->libDir) < 0) - return NULL; - if (virAsprintf(&cfg->nvramDir, "%s/nvram", cfg->libDir) < 0) - return NULL; - if (virAsprintf(&cfg->memoryBackingDir, "%s/ram", cfg->libDir) < 0) - return NULL; - if (virAsprintf(&cfg->swtpmStorageDir, "%s/lib/libvirt/swtpm", - LOCALSTATEDIR) < 0) - return NULL; + virAsprintf(&cfg->libDir, "%s/lib/libvirt/qemu", LOCALSTATEDIR); + virAsprintf(&cfg->saveDir, "%s/save", cfg->libDir); + virAsprintf(&cfg->snapshotDir, "%s/snapshot", cfg->libDir); + virAsprintf(&cfg->checkpointDir, "%s/checkpoint", cfg->libDir); + virAsprintf(&cfg->autoDumpPath, "%s/dump", cfg->libDir); + virAsprintf(&cfg->channelTargetDir, "%s/channel/target", cfg->libD= ir); + virAsprintf(&cfg->nvramDir, "%s/nvram", cfg->libDir); + virAsprintf(&cfg->memoryBackingDir, "%s/ram", cfg->libDir); + virAsprintf(&cfg->swtpmStorageDir, "%s/lib/libvirt/swtpm", + LOCALSTATEDIR); if (!virDoesUserExist("tss") || virGetUserID("tss", &cfg->swtpm_user) < 0) cfg->swtpm_user =3D 0; /* fall back to root */ @@ -187,55 +167,39 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool pr= ivileged) if (!cachedir) return NULL; =20 - if (virAsprintf(&cfg->logDir, "%s/qemu/log", cachedir) < 0) - return NULL; - if (virAsprintf(&cfg->swtpmLogDir, "%s/qemu/log", cachedir) < 0) - return NULL; - if (virAsprintf(&cfg->cacheDir, "%s/qemu/cache", cachedir) < 0) - return NULL; + virAsprintf(&cfg->logDir, "%s/qemu/log", cachedir); + virAsprintf(&cfg->swtpmLogDir, "%s/qemu/log", cachedir); + virAsprintf(&cfg->cacheDir, "%s/qemu/cache", cachedir); =20 rundir =3D virGetUserRuntimeDirectory(); if (!rundir) return NULL; - if (virAsprintf(&cfg->stateDir, "%s/qemu/run", rundir) < 0) - return NULL; + virAsprintf(&cfg->stateDir, "%s/qemu/run", rundir); =20 - if (virAsprintf(&cfg->swtpmStateDir, "%s/swtpm", cfg->stateDir) < = 0) - return NULL; + virAsprintf(&cfg->swtpmStateDir, "%s/swtpm", cfg->stateDir); =20 if (!(cfg->configBaseDir =3D virGetUserConfigDirectory())) return NULL; =20 - if (virAsprintf(&cfg->libDir, "%s/qemu/lib", cfg->configBaseDir) <= 0) - return NULL; - if (virAsprintf(&cfg->saveDir, "%s/qemu/save", cfg->configBaseDir)= < 0) - return NULL; - if (virAsprintf(&cfg->snapshotDir, "%s/qemu/snapshot", cfg->config= BaseDir) < 0) - return NULL; - if (virAsprintf(&cfg->checkpointDir, "%s/qemu/checkpoint", cfg->co= nfigBaseDir) < 0) - return NULL; - if (virAsprintf(&cfg->autoDumpPath, "%s/qemu/dump", cfg->configBas= eDir) < 0) - return NULL; - if (virAsprintf(&cfg->channelTargetDir, - "%s/qemu/channel/target", cfg->configBaseDir) < 0) - return NULL; - if (virAsprintf(&cfg->nvramDir, - "%s/qemu/nvram", cfg->configBaseDir) < 0) - return NULL; - if (virAsprintf(&cfg->memoryBackingDir, "%s/qemu/ram", cfg->config= BaseDir) < 0) - return NULL; - if (virAsprintf(&cfg->swtpmStorageDir, "%s/qemu/swtpm", cfg->confi= gBaseDir) < 0) - return NULL; + virAsprintf(&cfg->libDir, "%s/qemu/lib", cfg->configBaseDir); + virAsprintf(&cfg->saveDir, "%s/qemu/save", cfg->configBaseDir); + virAsprintf(&cfg->snapshotDir, "%s/qemu/snapshot", cfg->configBase= Dir); + virAsprintf(&cfg->checkpointDir, "%s/qemu/checkpoint", + cfg->configBaseDir); + virAsprintf(&cfg->autoDumpPath, "%s/qemu/dump", cfg->configBaseDir= ); + virAsprintf(&cfg->channelTargetDir, "%s/qemu/channel/target", + cfg->configBaseDir); + virAsprintf(&cfg->nvramDir, "%s/qemu/nvram", cfg->configBaseDir); + virAsprintf(&cfg->memoryBackingDir, "%s/qemu/ram", cfg->configBase= Dir); + virAsprintf(&cfg->swtpmStorageDir, "%s/qemu/swtpm", + cfg->configBaseDir); cfg->swtpm_user =3D (uid_t)-1; cfg->swtpm_group =3D (gid_t)-1; } =20 - if (virAsprintf(&cfg->configDir, "%s/qemu", cfg->configBaseDir) < 0) - return NULL; - if (virAsprintf(&cfg->autostartDir, "%s/qemu/autostart", cfg->configBa= seDir) < 0) - return NULL; - if (virAsprintf(&cfg->slirpStateDir, "%s/slirp", cfg->stateDir) < 0) - return NULL; + virAsprintf(&cfg->configDir, "%s/qemu", cfg->configBaseDir); + virAsprintf(&cfg->autostartDir, "%s/qemu/autostart", cfg->configBaseDi= r); + virAsprintf(&cfg->slirpStateDir, "%s/slirp", cfg->stateDir); =20 /* Set the default directory to find TLS X.509 certificates. * This will then be used as a fallback if the service specific @@ -1390,12 +1354,8 @@ virQEMUDriverGetDomainCapabilities(virQEMUDriverPtr = driver, cfg->firmwares, cfg->nfirmwares) < 0) return NULL; =20 - if (virAsprintf(&key, "%d:%d:%s:%s", - data.arch, - data.virttype, - NULLSTR(data.machine), - NULLSTR(data.path)) < 0) - return NULL; + virAsprintf(&key, "%d:%d:%s:%s", data.arch, data.virttype, + NULLSTR(data.machine), NULLSTR(data.path)); =20 if (virHashAddEntry(domCapsCache, key, domCaps) < 0) return NULL; @@ -1426,8 +1386,7 @@ qemuGetSharedDeviceKey(const char *device_path) return NULL; } =20 - if (virAsprintf(&key, "%d:%d", maj, min) < 0) - return NULL; + virAsprintf(&key, "%d:%d", maj, min); =20 return key; } @@ -1703,7 +1662,7 @@ qemuGetHostdevPath(virDomainHostdevDefPtr hostdev) scsihostsrc->unit))) return NULL; =20 - ignore_value(virAsprintf(&dev_path, "/dev/%s", dev_name)); + virAsprintf(&dev_path, "/dev/%s", dev_name); return dev_path; } =20 @@ -1880,8 +1839,7 @@ qemuGetBaseHugepagePath(virHugeTLBFSPtr hugepage) { char *ret; =20 - if (virAsprintf(&ret, "%s/libvirt/qemu", hugepage->mnt_dir) < 0) - return NULL; + virAsprintf(&ret, "%s/libvirt/qemu", hugepage->mnt_dir); =20 return ret; } @@ -1896,7 +1854,7 @@ qemuGetDomainHugepagePath(const virDomainDef *def, char *ret =3D NULL; =20 if (base && domPath) - ignore_value(virAsprintf(&ret, "%s/%s", base, domPath)); + virAsprintf(&ret, "%s/%s", base, domPath); return ret; } =20 @@ -1944,11 +1902,11 @@ qemuGetDomainHupageMemPath(const virDomainDef *def, } =20 =20 -int +void qemuGetMemoryBackingBasePath(virQEMUDriverConfigPtr cfg, char **path) { - return virAsprintf(path, "%s/libvirt/qemu", cfg->memoryBackingDir); + virAsprintf(path, "%s/libvirt/qemu", cfg->memoryBackingDir); } =20 =20 @@ -1960,11 +1918,12 @@ qemuGetMemoryBackingDomainPath(const virDomainDef *= def, g_autofree char *shortName =3D NULL; g_autofree char *base =3D NULL; =20 - if (!(shortName =3D virDomainDefGetShortName(def)) || - qemuGetMemoryBackingBasePath(cfg, &base) < 0 || - virAsprintf(path, "%s/%s", base, shortName) < 0) + if (!(shortName =3D virDomainDefGetShortName(def))) return -1; =20 + qemuGetMemoryBackingBasePath(cfg, &base); + virAsprintf(path, "%s/%s", base, shortName); + return 0; } =20 @@ -1996,9 +1955,9 @@ qemuGetMemoryBackingPath(const virDomainDef *def, return -1; } =20 - if (qemuGetMemoryBackingDomainPath(def, cfg, &domainPath) < 0 || - virAsprintf(memPath, "%s/%s", domainPath, alias) < 0) + if (qemuGetMemoryBackingDomainPath(def, cfg, &domainPath) < 0) return -1; =20 + virAsprintf(memPath, "%s/%s", domainPath, alias); return 0; } diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 7247199d3e..7334a440f8 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -376,8 +376,8 @@ int qemuGetDomainHupageMemPath(const virDomainDef *def, unsigned long long pagesize, char **memPath); =20 -int qemuGetMemoryBackingBasePath(virQEMUDriverConfigPtr cfg, - char **path); +void qemuGetMemoryBackingBasePath(virQEMUDriverConfigPtr cfg, + char **path); int qemuGetMemoryBackingDomainPath(const virDomainDef *def, virQEMUDriverConfigPtr cfg, char **path); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 3e8da13794..25d4a0eb07 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2017,28 +2017,21 @@ qemuDomainSecretPrepare(virQEMUDriverPtr driver, =20 =20 /* This is the old way of setting up per-domain directories */ -static int +static void qemuDomainSetPrivatePathsOld(virQEMUDriverPtr driver, virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv =3D vm->privateData; virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); - int ret =3D -1; =20 - if (!priv->libDir && - virAsprintf(&priv->libDir, "%s/domain-%s", - cfg->libDir, vm->def->name) < 0) - goto cleanup; + if (!priv->libDir) + virAsprintf(&priv->libDir, "%s/domain-%s", cfg->libDir, vm->def->n= ame); =20 - if (!priv->channelTargetDir && + if (!priv->channelTargetDir) virAsprintf(&priv->channelTargetDir, "%s/domain-%s", - cfg->channelTargetDir, vm->def->name) < 0) - goto cleanup; + cfg->channelTargetDir, vm->def->name); =20 - ret =3D 0; - cleanup: virObjectUnref(cfg); - return ret; } =20 =20 @@ -2054,14 +2047,12 @@ qemuDomainSetPrivatePaths(virQEMUDriverPtr driver, if (!domname) goto cleanup; =20 - if (!priv->libDir && - virAsprintf(&priv->libDir, "%s/domain-%s", cfg->libDir, domname) <= 0) - goto cleanup; + if (!priv->libDir) + virAsprintf(&priv->libDir, "%s/domain-%s", cfg->libDir, domname); =20 - if (!priv->channelTargetDir && + if (!priv->channelTargetDir) virAsprintf(&priv->channelTargetDir, "%s/domain-%s", - cfg->channelTargetDir, domname) < 0) - goto cleanup; + cfg->channelTargetDir, domname); =20 ret =3D 0; cleanup: @@ -3675,8 +3666,7 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, priv->channelTargetDir =3D tmp; tmp =3D NULL; =20 - if (qemuDomainSetPrivatePathsOld(driver, vm) < 0) - goto error; + qemuDomainSetPrivatePathsOld(driver, vm); =20 if (virCPUDefParseXML(ctxt, "./cpu", VIR_CPU_TYPE_GUEST, &priv->origCP= U) < 0) goto error; @@ -4632,8 +4622,7 @@ qemuDomainDefPostParse(virDomainDefPtr def, goto cleanup; } =20 - if (qemuDomainNVRAMPathGenerate(cfg, def) < 0) - goto cleanup; + qemuDomainNVRAMPathGenerate(cfg, def); =20 if (qemuDomainDefAddDefaultDevices(def, qemuCaps) < 0) goto cleanup; @@ -9327,8 +9316,7 @@ qemuDomainLogContextPtr qemuDomainLogContextNew(virQE= MUDriverPtr driver, ctxt->writefd =3D -1; ctxt->readfd =3D -1; =20 - if (virAsprintf(&ctxt->path, "%s/%s.log", cfg->logDir, vm->def->name) = < 0) - goto error; + virAsprintf(&ctxt->path, "%s/%s.log", cfg->logDir, vm->def->name); =20 if (cfg->stdioLogD) { ctxt->manager =3D virLogManagerNew(virQEMUDriverIsPrivileged(drive= r)); @@ -9508,8 +9496,7 @@ qemuDomainLogAppendMessage(virQEMUDriverPtr driver, VIR_DEBUG("Append log message (vm=3D'%s' message=3D'%s) stdioLogD=3D%d= ", vm->def->name, message, cfg->stdioLogD); =20 - if (virAsprintf(&path, "%s/%s.log", cfg->logDir, vm->def->name) < 0) - goto cleanup; + virAsprintf(&path, "%s/%s.log", cfg->logDir, vm->def->name); =20 if (cfg->stdioLogD) { if (!(manager =3D virLogManagerNew(virQEMUDriverIsPrivileged(drive= r)))) @@ -9602,16 +9589,14 @@ qemuDomainSnapshotWriteMetadata(virDomainObjPtr vm, if (newxml =3D=3D NULL) return -1; =20 - if (virAsprintf(&snapDir, "%s/%s", snapshotDir, vm->def->name) < 0) - goto cleanup; + virAsprintf(&snapDir, "%s/%s", snapshotDir, vm->def->name); if (virFileMakePath(snapDir) < 0) { virReportSystemError(errno, _("cannot create snapshot directory '%= s'"), snapDir); goto cleanup; } =20 - if (virAsprintf(&snapFile, "%s/%s.xml", snapDir, def->parent.name) < 0) - goto cleanup; + virAsprintf(&snapFile, "%s/%s.xml", snapDir, def->parent.name); =20 ret =3D virXMLSaveFile(snapFile, NULL, "snapshot-edit", newxml); =20 @@ -9744,9 +9729,8 @@ qemuDomainSnapshotDiscard(virQEMUDriverPtr driver, } } =20 - if (virAsprintf(&snapFile, "%s/%s/%s.xml", cfg->snapshotDir, - vm->def->name, snap->def->name) < 0) - goto cleanup; + virAsprintf(&snapFile, "%s/%s/%s.xml", cfg->snapshotDir, vm->def->name, + snap->def->name); =20 if (snap =3D=3D virDomainSnapshotGetCurrent(vm->snapshots)) { virDomainSnapshotSetCurrent(vm->snapshots, NULL); @@ -9833,23 +9817,21 @@ qemuDomainRemoveInactiveCommon(virQEMUDriverPtr dri= ver, if (qemuDomainSnapshotDiscardAllMetadata(driver, vm) < 0) { VIR_WARN("unable to remove all snapshots for domain %s", vm->def->name); - } else if (virAsprintf(&snapDir, "%s/%s", cfg->snapshotDir, - vm->def->name) < 0) { - VIR_WARN("unable to remove snapshot directory %s/%s", - cfg->snapshotDir, vm->def->name); - } else if (rmdir(snapDir) < 0 && errno !=3D ENOENT) { - VIR_WARN("unable to remove snapshot directory %s", snapDir); + } else { + virAsprintf(&snapDir, "%s/%s", cfg->snapshotDir, vm->def->name); + + if (rmdir(snapDir) < 0 && errno !=3D ENOENT) + VIR_WARN("unable to remove snapshot directory %s", snapDir); } /* Remove any checkpoint metadata prior to removing the domain */ if (qemuCheckpointDiscardAllMetadata(driver, vm) < 0) { VIR_WARN("unable to remove all checkpoints for domain %s", vm->def->name); - } else if (virAsprintf(&chkDir, "%s/%s", cfg->checkpointDir, - vm->def->name) < 0) { - VIR_WARN("unable to remove checkpoint directory %s/%s", - cfg->checkpointDir, vm->def->name); - } else if (rmdir(chkDir) < 0 && errno !=3D ENOENT) { - VIR_WARN("unable to remove checkpoint directory %s", chkDir); + } else { + virAsprintf(&chkDir, "%s/%s", cfg->checkpointDir, + vm->def->name); + if (rmdir(chkDir) < 0 && errno !=3D ENOENT) + VIR_WARN("unable to remove checkpoint directory %s", chkDir); } qemuExtDevicesCleanupHost(driver, vm->def); =20 @@ -10195,7 +10177,7 @@ qemuDomainStorageAlias(const char *device, int dept= h) if (!depth) alias =3D g_strdup(device); else - ignore_value(virAsprintf(&alias, "%s.%d", device, depth)); + virAsprintf(&alias, "%s.%d", device, depth); return alias; } =20 @@ -11744,9 +11726,8 @@ ppc64VFIODeviceIsNV2Bridge(const char *device) for (i =3D 0; i < G_N_ELEMENTS(nvlink2Files); i++) { g_autofree char *file =3D NULL; =20 - if ((virAsprintf(&file, "/sys/bus/pci/devices/%s/of_node/%s", - device, nvlink2Files[i])) < 0) - return false; + virAsprintf(&file, "/sys/bus/pci/devices/%s/of_node/%s", + device, nvlink2Files[i]); =20 if (!virFileExists(file)) return false; @@ -12425,19 +12406,15 @@ qemuDomainPrepareChannel(virDomainChrDefPtr chann= el, return 0; =20 if (channel->target.name) { - if (virAsprintf(&channel->source->data.nix.path, - "%s/%s", domainChannelTargetDir, - channel->target.name) < 0) - return -1; + virAsprintf(&channel->source->data.nix.path, "%s/%s", + domainChannelTargetDir, channel->target.name); } else { /* Generate a unique name */ - if (virAsprintf(&channel->source->data.nix.path, - "%s/vioser-%02d-%02d-%02d.sock", - domainChannelTargetDir, - channel->info.addr.vioserial.controller, - channel->info.addr.vioserial.bus, - channel->info.addr.vioserial.port) < 0) - return -1; + virAsprintf(&channel->source->data.nix.path, + "%s/vioser-%02d-%02d-%02d.sock", domainChannelTargetDi= r, + channel->info.addr.vioserial.controller, + channel->info.addr.vioserial.bus, + channel->info.addr.vioserial.port); } =20 return 0; @@ -12620,16 +12597,16 @@ qemuDomainPrepareStorageSourceTLS(virStorageSourc= ePtr src, } =20 =20 -int +void qemuDomainPrepareShmemChardev(virDomainShmemDefPtr shmem) { if (!shmem->server.enabled || shmem->server.chr.data.nix.path) - return 0; + return; =20 - return virAsprintf(&shmem->server.chr.data.nix.path, - "/var/lib/libvirt/shmem-%s-sock", - shmem->name); + virAsprintf(&shmem->server.chr.data.nix.path, + "/var/lib/libvirt/shmem-%s-sock", + shmem->name); } =20 =20 @@ -12955,9 +12932,7 @@ qemuDomainGetPreservedMountPath(virQEMUDriverConfig= Ptr cfg, if (STREQ(mountpoint, "/dev")) suffix =3D "dev"; =20 - if (virAsprintf(&path, "%s/%s.%s", - cfg->stateDir, domname, suffix) < 0) - goto cleanup; + virAsprintf(&path, "%s/%s.%s", cfg->stateDir, domname, suffix); =20 /* Now consider that @mountpoint is "/dev/blah/blah2". * @suffix then points to "blah/blah2". However, caller @@ -12973,7 +12948,6 @@ qemuDomainGetPreservedMountPath(virQEMUDriverConfig= Ptr cfg, tmp++; } =20 - cleanup: VIR_FREE(domname); return path; } @@ -13138,9 +13112,8 @@ qemuDomainCreateDeviceRecursive(const char *device, if (i =3D=3D data->ndevMountsPath) { /* Okay, @device is in /dev but not in any mount point under /= dev. * Create it. */ - if (virAsprintf(&devicePath, "%s/%s", - data->path, device + strlen(QEMU_DEVPREFIX)) <= 0) - goto cleanup; + virAsprintf(&devicePath, "%s/%s", data->path, + device + strlen(QEMU_DEVPREFIX)); =20 if (virFileMakeParentPath(devicePath) < 0) { virReportSystemError(errno, @@ -13194,10 +13167,7 @@ qemuDomainCreateDeviceRecursive(const char *device, if ((c =3D strrchr(devTmp, '/'))) *(c + 1) =3D '\0'; =20 - if (virAsprintf(&tmp, "%s%s", devTmp, target) < 0) { - VIR_FREE(devTmp); - goto cleanup; - } + virAsprintf(&tmp, "%s%s", devTmp, target); VIR_FREE(devTmp); VIR_FREE(target); target =3D g_steal_pointer(&tmp); @@ -13360,9 +13330,7 @@ qemuDomainSetupDev(virQEMUDriverConfigPtr cfg, * tmpfs is limited to 64kb, since we only have device nodes in there * and don't want to DOS the entire OS RAM usage */ - if (virAsprintf(&opts, - "mode=3D755,size=3D65536%s", mount_options) < 0) - goto cleanup; + virAsprintf(&opts, "mode=3D755,size=3D65536%s", mount_options); =20 if (virFileSetupDev(data->path, opts) < 0) goto cleanup; @@ -14171,10 +14139,7 @@ qemuDomainAttachDeviceMknodRecursive(virQEMUDriver= Ptr driver, if ((c =3D strrchr(fileTmp, '/'))) *(c + 1) =3D '\0'; =20 - if (virAsprintf(&tmp, "%s%s", fileTmp, target) < 0) { - VIR_FREE(fileTmp); - goto cleanup; - } + virAsprintf(&tmp, "%s%s", fileTmp, target); VIR_FREE(fileTmp); VIR_FREE(target); target =3D g_steal_pointer(&tmp); @@ -14730,7 +14695,7 @@ qemuDomainDiskBackingStoreGetName(virDomainDiskDefP= tr disk, char *ret =3D NULL; =20 if (idx) - ignore_value(virAsprintf(&ret, "%s[%d]", disk->dst, idx)); + virAsprintf(&ret, "%s[%d]", disk->dst, idx); else ret =3D g_strdup(disk->dst); =20 @@ -15173,9 +15138,8 @@ qemuDomainPrepareStorageSourceBlockdev(virDomainDis= kDefPtr disk, { src->id =3D qemuDomainStorageIdNew(priv); =20 - if (virAsprintf(&src->nodestorage, "libvirt-%u-storage", src->id) < 0 = || - virAsprintf(&src->nodeformat, "libvirt-%u-format", src->id) < 0) - return -1; + virAsprintf(&src->nodestorage, "libvirt-%u-storage", src->id); + virAsprintf(&src->nodeformat, "libvirt-%u-format", src->id); =20 if (qemuDomainValidateStorageSource(src, priv->qemuCaps) < 0) return -1; @@ -15208,9 +15172,8 @@ qemuDomainPrepareDiskSourceBlockdev(virDomainDiskDe= fPtr disk, virStorageSourcePtr n; =20 if (disk->copy_on_read =3D=3D VIR_TRISTATE_SWITCH_ON && - !diskPriv->nodeCopyOnRead && - virAsprintf(&diskPriv->nodeCopyOnRead, "libvirt-CoR-%s", disk->dst= ) < 0) - return -1; + !diskPriv->nodeCopyOnRead) + virAsprintf(&diskPriv->nodeCopyOnRead, "libvirt-CoR-%s", disk->dst= ); =20 for (n =3D disk->src; virStorageSourceIsBacking(n); n =3D n->backingSt= ore) { if (qemuDomainPrepareStorageSourceBlockdev(disk, n, priv, cfg) < 0) @@ -15363,8 +15326,7 @@ qemuDomainGetManagedPRSocketPath(qemuDomainObjPriva= tePtr priv) { char *ret =3D NULL; =20 - ignore_value(virAsprintf(&ret, "%s/%s.sock", priv->libDir, - qemuDomainGetManagedPRAlias())); + virAsprintf(&ret, "%s/%s.sock", priv->libDir, qemuDomainGetManagedPRAl= ias()); =20 return ret; } @@ -15451,27 +15413,25 @@ qemuDomainDiskIsMissingLocalOptional(virDomainDis= kDefPtr disk) } =20 =20 -int +void qemuDomainNVRAMPathFormat(virQEMUDriverConfigPtr cfg, virDomainDefPtr def, char **path) { - return virAsprintf(path, "%s/%s_VARS.fd", cfg->nvramDir, def->name); + virAsprintf(path, "%s/%s_VARS.fd", cfg->nvramDir, def->name); } =20 =20 -int +void qemuDomainNVRAMPathGenerate(virQEMUDriverConfigPtr cfg, virDomainDefPtr def) { if (def->os.loader && def->os.loader->type =3D=3D VIR_DOMAIN_LOADER_TYPE_PFLASH && def->os.loader->readonly =3D=3D VIR_TRISTATE_BOOL_YES && - !def->os.loader->nvram) { - return qemuDomainNVRAMPathFormat(cfg, def, &def->os.loader->nvram); - } + !def->os.loader->nvram) + qemuDomainNVRAMPathFormat(cfg, def, &def->os.loader->nvram); =20 - return 0; } =20 =20 diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index b23912ee98..88d1acb64f 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -1054,7 +1054,7 @@ void qemuDomainPrepareChardevSource(virDomainDefPtr d= ef, virQEMUDriverConfigPtr cfg) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); =20 -int qemuDomainPrepareShmemChardev(virDomainShmemDefPtr shmem) +void qemuDomainPrepareShmemChardev(virDomainShmemDefPtr shmem) ATTRIBUTE_NONNULL(1); =20 bool qemuDomainVcpuHotplugIsInOrder(virDomainDefPtr def) @@ -1206,12 +1206,12 @@ qemuDomainIsUsingNoShutdown(qemuDomainObjPrivatePtr= priv); bool qemuDomainDiskIsMissingLocalOptional(virDomainDiskDefPtr disk); =20 -int +void qemuDomainNVRAMPathFormat(virQEMUDriverConfigPtr cfg, virDomainDefPtr def, char **path); =20 -int +void qemuDomainNVRAMPathGenerate(virQEMUDriverConfigPtr cfg, virDomainDefPtr def); =20 diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index af8cbf40f4..0c94261ba8 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -942,8 +942,7 @@ qemuStateInitialize(bool privileged, goto error; } =20 - if (qemuGetMemoryBackingBasePath(cfg, &memoryBackingPath) < 0) - goto error; + qemuGetMemoryBackingBasePath(cfg, &memoryBackingPath); =20 if (virFileMakePath(memoryBackingPath) < 0) { virReportSystemError(errno, @@ -7756,8 +7755,7 @@ qemuDomainUndefineFlags(virDomainPtr dom, } =20 if (vm->def->os.firmware =3D=3D VIR_DOMAIN_OS_DEF_FIRMWARE_EFI) { - if (qemuDomainNVRAMPathFormat(cfg, vm->def, &nvram_path) < 0) - goto endjob; + qemuDomainNVRAMPathFormat(cfg, vm->def, &nvram_path); } else { if (vm->def->os.loader) nvram_path =3D g_strdup(vm->def->os.loader->nvram); diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index 670662fd4b..c6462c723e 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -1058,8 +1058,7 @@ qemuFirmwareEnableFeatures(virQEMUDriverPtr driver, VIR_FREE(def->os.loader->templt); def->os.loader->templt =3D g_strdup(flash->nvram_template.filename= ); =20 - if (qemuDomainNVRAMPathGenerate(cfg, def) < 0) - return -1; + qemuDomainNVRAMPathGenerate(cfg, def); =20 VIR_DEBUG("decided on firmware '%s' varstore template '%s'", def->os.loader->path, diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index fd4bafef0c..1bf0c63eb1 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -154,8 +154,7 @@ qemuDomainDetachZPCIDevice(qemuMonitorPtr mon, { g_autofree char *zpciAlias =3D NULL; =20 - if (virAsprintf(&zpciAlias, "zpci%d", info->addr.pci.zpci.uid) < 0) - return -1; + virAsprintf(&zpciAlias, "zpci%d", info->addr.pci.zpci.uid); =20 if (qemuMonitorDelDevice(mon, zpciAlias) < 0) return -1; @@ -1308,8 +1307,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, } =20 slirpfd =3D qemuSlirpGetFD(slirp); - if (virAsprintf(&slirpfdName, "slirpfd-%s", net->info.alias) <= 0) - goto cleanup; + virAsprintf(&slirpfdName, "slirpfd-%s", net->info.alias); } break; =20 @@ -1357,15 +1355,11 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, VIR_ALLOC_N(vhostfdName, vhostfdSize) < 0) goto cleanup; =20 - for (i =3D 0; i < tapfdSize; i++) { - if (virAsprintf(&tapfdName[i], "fd-%s%zu", net->info.alias, i) < 0) - goto cleanup; - } + for (i =3D 0; i < tapfdSize; i++) + virAsprintf(&tapfdName[i], "fd-%s%zu", net->info.alias, i); =20 - for (i =3D 0; i < vhostfdSize; i++) { - if (virAsprintf(&vhostfdName[i], "vhostfd-%s%zu", net->info.alias,= i) < 0) - goto cleanup; - } + for (i =3D 0; i < vhostfdSize; i++) + virAsprintf(&vhostfdName[i], "vhostfd-%s%zu", net->info.alias, i); =20 if (!(netstr =3D qemuBuildHostNetStr(net, tapfdName, tapfdSize, @@ -1508,19 +1502,18 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, goto cleanup; =20 virErrorPreserveLast(&originalError); - if (virAsprintf(&netdev_name, "host%s", net->info.alias) >=3D 0) { - if (QEMU_DOMAIN_NETWORK_PRIVATE(net)->slirp) - qemuSlirpStop(QEMU_DOMAIN_NETWORK_PRIVATE(net)->slirp, vm, dri= ver, net, true); - qemuDomainObjEnterMonitor(driver, vm); - if (charDevPlugged && - qemuMonitorDetachCharDev(priv->mon, charDevAlias) < 0) - VIR_WARN("Failed to remove associated chardev %s", charDevAlia= s); - if (netdevPlugged && - qemuMonitorRemoveNetdev(priv->mon, netdev_name) < 0) - VIR_WARN("Failed to remove network backend for netdev %s", - netdev_name); - ignore_value(qemuDomainObjExitMonitor(driver, vm)); - } + virAsprintf(&netdev_name, "host%s", net->info.alias); + if (QEMU_DOMAIN_NETWORK_PRIVATE(net)->slirp) + qemuSlirpStop(QEMU_DOMAIN_NETWORK_PRIVATE(net)->slirp, vm, driver,= net, true); + qemuDomainObjEnterMonitor(driver, vm); + if (charDevPlugged && + qemuMonitorDetachCharDev(priv->mon, charDevAlias) < 0) + VIR_WARN("Failed to remove associated chardev %s", charDevAlias); + if (netdevPlugged && + qemuMonitorRemoveNetdev(priv->mon, netdev_name) < 0) + VIR_WARN("Failed to remove network backend for netdev %s", + netdev_name); + ignore_value(qemuDomainObjExitMonitor(driver, vm)); virErrorRestore(&originalError); goto cleanup; } @@ -2360,8 +2353,7 @@ qemuDomainAttachMemory(virQEMUDriverPtr driver, if (qemuAssignDeviceMemoryAlias(vm->def, mem, priv->memAliasOrderMisma= tch) < 0) goto cleanup; =20 - if (virAsprintf(&objalias, "mem%s", mem->info.alias) < 0) - goto cleanup; + virAsprintf(&objalias, "mem%s", mem->info.alias); =20 if (!(devstr =3D qemuBuildMemoryDeviceStr(mem, priv))) goto cleanup; @@ -2707,8 +2699,7 @@ qemuDomainAttachSCSIVHostDevice(virQEMUDriverPtr driv= er, if (virSCSIVHostOpenVhostSCSI(&vhostfd) < 0) goto cleanup; =20 - if (virAsprintf(&vhostfdName, "vhostfd-%d", vhostfd) < 0) - goto cleanup; + virAsprintf(&vhostfdName, "vhostfd-%d", vhostfd); =20 if (hostdev->info->type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { if (qemuDomainIsS390CCW(vm->def) && @@ -2965,8 +2956,7 @@ qemuDomainAttachShmemDevice(virQEMUDriverPtr driver, if (qemuAssignDeviceShmemAlias(vm->def, shmem, -1) < 0) return -1; =20 - if (qemuDomainPrepareShmemChardev(shmem) < 0) - return -1; + qemuDomainPrepareShmemChardev(shmem); =20 if (VIR_REALLOC_N(vm->def->shmems, vm->def->nshmems + 1) < 0) return -1; @@ -2980,8 +2970,7 @@ qemuDomainAttachShmemDevice(virQEMUDriverPtr driver, goto cleanup; =20 if (shmem->server.enabled) { - if (virAsprintf(&charAlias, "char%s", shmem->info.alias) < 0) - goto cleanup; + virAsprintf(&charAlias, "char%s", shmem->info.alias); } else { if (!(props =3D qemuBuildShmemBackendMemProps(shmem))) goto cleanup; @@ -3253,8 +3242,7 @@ qemuDomainAttachVsockDevice(virQEMUDriverPtr driver, if (qemuProcessOpenVhostVsock(vsock) < 0) goto cleanup; =20 - if (virAsprintf(&fdname, "%s%u", fdprefix, vsockPriv->vhostfd) < 0) - goto cleanup; + virAsprintf(&fdname, "%s%u", fdprefix, vsockPriv->vhostfd); =20 if (!(devstr =3D qemuBuildVsockDevStr(vm->def, vsock, priv->qemuCaps, = fdprefix))) goto cleanup; @@ -3987,8 +3975,7 @@ qemuDomainChangeGraphicsPasswords(virQEMUDriverPtr dr= iver, (auth->expires && auth->validTo <=3D now)) { expire =3D "now"; } else if (auth->expires) { - if (virAsprintf(&validTo, "%lu", (unsigned long)auth->validTo) < 0) - goto end_job; + virAsprintf(&validTo, "%lu", (unsigned long)auth->validTo); expire =3D validTo; } else { expire =3D "never"; @@ -4343,8 +4330,7 @@ qemuDomainRemoveMemoryDevice(virQEMUDriverPtr driver, VIR_DEBUG("Removing memory device %s from domain %p %s", mem->info.alias, vm, vm->def->name); =20 - if (virAsprintf(&backendAlias, "mem%s", mem->info.alias) < 0) - return -1; + virAsprintf(&backendAlias, "mem%s", mem->info.alias); =20 qemuDomainObjEnterMonitor(driver, vm); rc =3D qemuMonitorDelObject(priv->mon, backendAlias); @@ -4562,8 +4548,8 @@ qemuDomainRemoveNetDevice(virQEMUDriverPtr driver, VIR_DEBUG("Removing network interface %s from domain %p %s", net->info.alias, vm, vm->def->name); =20 - if (virAsprintf(&hostnet_name, "host%s", net->info.alias) < 0 || - !(charDevAlias =3D qemuAliasChardevFromDevAlias(net->info.alias))) + virAsprintf(&hostnet_name, "host%s", net->info.alias); + if (!(charDevAlias =3D qemuAliasChardevFromDevAlias(net->info.alias))) return -1; =20 if (virDomainNetGetActualBandwidth(net) && @@ -4717,8 +4703,7 @@ qemuDomainRemoveRNGDevice(virQEMUDriverPtr driver, rng->info.alias, vm, vm->def->name); =20 =20 - if (virAsprintf(&objAlias, "obj%s", rng->info.alias) < 0) - return -1; + virAsprintf(&objAlias, "obj%s", rng->info.alias); =20 if (!(charAlias =3D qemuAliasChardevFromDevAlias(rng->info.alias))) return -1; @@ -4777,11 +4762,9 @@ qemuDomainRemoveShmemDevice(virQEMUDriverPtr driver, shmem->info.alias, vm, vm->def->name); =20 if (shmem->server.enabled) { - if (virAsprintf(&charAlias, "char%s", shmem->info.alias) < 0) - return -1; + virAsprintf(&charAlias, "char%s", shmem->info.alias); } else { - if (virAsprintf(&memAlias, "shmmem-%s", shmem->info.alias) < 0) - return -1; + virAsprintf(&memAlias, "shmmem-%s", shmem->info.alias); } =20 qemuDomainObjEnterMonitor(driver, vm); @@ -6022,8 +6005,7 @@ qemuDomainHotplugAddVcpu(virQEMUDriverPtr driver, size_t i; =20 if (newhotplug) { - if (virAsprintf(&vcpupriv->alias, "vcpu%u", vcpu) < 0) - goto cleanup; + virAsprintf(&vcpupriv->alias, "vcpu%u", vcpu); =20 if (!(vcpuprops =3D qemuBuildHotpluggableCPUProps(vcpuinfo))) goto cleanup; diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c index 70832e0c9a..8377b4d01d 100644 --- a/src/qemu/qemu_interface.c +++ b/src/qemu/qemu_interface.c @@ -364,9 +364,8 @@ qemuCreateInBridgePortWithHelper(virQEMUDriverConfigPtr= cfg, goto cleanup; virCommandAbort(cmd); =20 - if (errbuf && *errbuf && - virAsprintf(&errstr, "\nstderr=3D%s", errbuf) < 0) - goto cleanup; + if (errbuf && *errbuf) + virAsprintf(&errstr, "\nstderr=3D%s", errbuf); =20 virReportError(VIR_ERR_INTERNAL_ERROR, _("%s: failed to communicate with bridge helper: %s%s"), diff --git a/src/qemu/qemu_interop_config.c b/src/qemu/qemu_interop_config.c index d05ff56221..00b86fde83 100644 --- a/src/qemu/qemu_interop_config.c +++ b/src/qemu/qemu_interop_config.c @@ -57,8 +57,7 @@ qemuBuildFileList(virHashTablePtr files, const char *dir) =20 filename =3D g_strdup(ent->d_name); =20 - if (virAsprintf(&path, "%s/%s", dir, filename) < 0) - goto cleanup; + virAsprintf(&path, "%s/%s", dir, filename); =20 if (stat(path, &sb) < 0) { virReportSystemError(errno, _("Unable to access %s"), path); @@ -122,12 +121,10 @@ qemuInteropFetchConfigs(const char *name, if (!home) return -1; =20 - if (virAsprintf(&xdgConfig, "%s/.config", home) < 0) - return -1; + virAsprintf(&xdgConfig, "%s/.config", home); } =20 - if (virAsprintf(&homeConfig, "%s/qemu/%s", xdgConfig, name) < 0) - return -1; + virAsprintf(&homeConfig, "%s/qemu/%s", xdgConfig, name); } =20 if (!(files =3D virHashCreate(10, virHashValueFree))) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 3f90536339..aad2f77cb7 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -818,9 +818,8 @@ qemuMigrationSrcNBDStorageCopyBlockdev(virQEMUDriverPtr= driver, =20 copysrc->tlsAlias =3D g_strdup(tlsAlias); =20 - if (virAsprintf(©src->nodestorage, "migration-%s-storage", disk->d= st) < 0 || - virAsprintf(©src->nodeformat, "migration-%s-format", disk->dst= ) < 0) - return -1; + virAsprintf(©src->nodestorage, "migration-%s-storage", disk->dst); + virAsprintf(©src->nodeformat, "migration-%s-format", disk->dst); =20 /* Migration via blockdev-mirror was supported sooner than the auto-re= ad-only * feature was added to qemu */ @@ -865,13 +864,11 @@ qemuMigrationSrcNBDStorageCopyDriveMirror(virQEMUDriv= erPtr driver, int mon_ret; =20 if (strchr(host, ':')) { - if (virAsprintf(&nbd_dest, "nbd:[%s]:%d:exportname=3D%s", - host, port, diskAlias) < 0) - return -1; + virAsprintf(&nbd_dest, "nbd:[%s]:%d:exportname=3D%s", host, port, + diskAlias); } else { - if (virAsprintf(&nbd_dest, "nbd:%s:%d:exportname=3D%s", - host, port, diskAlias) < 0) - return -1; + virAsprintf(&nbd_dest, "nbd:%s:%d:exportname=3D%s", host, port, + diskAlias); } =20 if (qemuDomainObjEnterMonitorAsync(driver, vm, @@ -1834,7 +1831,7 @@ qemuMigrationDstGetURI(const char *migrateFrom, char *uri =3D NULL; =20 if (STREQ(migrateFrom, "stdio")) - ignore_value(virAsprintf(&uri, "fd:%d", migrateFd)); + virAsprintf(&uri, "fd:%d", migrateFd); else uri =3D g_strdup(migrateFrom); =20 @@ -2258,9 +2255,7 @@ qemuMigrationDstPrepare(virDomainObjPtr vm, incFormat =3D "%s:[%s]:%d"; else incFormat =3D "%s:%s:%d"; - if (virAsprintf(&migrateFrom, incFormat, - protocol, listenAddress, port) < 0) - goto cleanup; + virAsprintf(&migrateFrom, incFormat, protocol, listenAddress, port= ); } =20 inc =3D qemuProcessIncomingDefNew(priv->qemuCaps, listenAddress, @@ -2700,8 +2695,7 @@ qemuMigrationAnyParseURI(const char *uri, bool *wellF= ormed) /* For compatibility reasons tcp://... URIs are sent as tcp:... * We need to transform them to a well-formed URI before parsing. */ if (STRPREFIX(uri, "tcp:") && !STRPREFIX(uri + 4, "//")) { - if (virAsprintf(&tmp, "tcp://%s", uri + 4) < 0) - return NULL; + virAsprintf(&tmp, "tcp://%s", uri + 4); uri =3D tmp; } =20 @@ -2796,8 +2790,7 @@ qemuMigrationDstPrepareDirect(virQEMUDriverPtr driver, else incFormat =3D "%s:%s:%d"; =20 - if (virAsprintf(uri_out, incFormat, "tcp", hostname, port) < 0) - goto cleanup; + virAsprintf(uri_out, incFormat, "tcp", hostname, port); } else { bool well_formed_uri; =20 @@ -2835,8 +2828,7 @@ qemuMigrationDstPrepareDirect(virQEMUDriverPtr driver, if (!(*uri_out =3D virURIFormat(uri))) goto cleanup; } else { - if (virAsprintf(uri_out, "%s:%d", uri_in, port) < 0) - goto cleanup; + virAsprintf(uri_out, "%s:%d", uri_in, port); } } else { port =3D uri->port; @@ -3302,8 +3294,7 @@ qemuMigrationSrcConnect(virQEMUDriverPtr driver, int ret =3D -1; =20 host =3D spec->dest.host.name; - if (virAsprintf(&port, "%d", spec->dest.host.port) < 0) - return -1; + virAsprintf(&port, "%d", spec->dest.host.port); =20 spec->destType =3D MIGRATION_DEST_FD; spec->dest.fd.qemu =3D -1; diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_coo= kie.c index f625c7086b..990f2b06d0 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -141,8 +141,7 @@ qemuDomainExtractTLSSubject(const char *certdir) int ret; size_t subjectlen; =20 - if (virAsprintf(&certfile, "%s/server-cert.pem", certdir) < 0) - goto error; + virAsprintf(&certfile, "%s/server-cert.pem", certdir); =20 if (virFileReadAll(certfile, 8192, &pemdata) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index db27b0e796..6495447188 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -961,7 +961,7 @@ qemuMonitorNextCommandID(qemuMonitorPtr mon) { char *id; =20 - ignore_value(virAsprintf(&id, "libvirt-%d", ++mon->nextSerial)); + virAsprintf(&id, "libvirt-%d", ++mon->nextSerial); return id; } =20 @@ -2560,11 +2560,8 @@ qemuMonitorMigrateToHost(qemuMonitorPtr mon, QEMU_CHECK_MONITOR(mon); =20 if (strchr(hostname, ':')) { - if (virAsprintf(&uri, "%s:[%s]:%d", protocol, hostname, port) < 0) - return -1; - } else if (virAsprintf(&uri, "%s:%s:%d", protocol, hostname, port) < 0= ) { - return -1; - } + virAsprintf(&uri, "%s:[%s]:%d", protocol, hostname, port); + } else virAsprintf(&uri, "%s:%s:%d", protocol, hostname, port); =20 ret =3D qemuMonitorJSONMigrate(mon, flags, uri); =20 @@ -4249,20 +4246,20 @@ qemuMonitorGuestPanicEventInfoFormatMsg(qemuMonitor= EventPanicInfoPtr info) =20 switch (info->type) { case QEMU_MONITOR_EVENT_PANIC_INFO_TYPE_HYPERV: - ignore_value(virAsprintf(&ret, - "hyper-v: arg1=3D'0x%llx', arg2=3D'0x%llx= ', " - "arg3=3D'0x%llx', arg4=3D'0x%llx', arg5= =3D'0x%llx'", - info->data.hyperv.arg1, info->data.hyperv= .arg2, - info->data.hyperv.arg3, info->data.hyperv= .arg4, - info->data.hyperv.arg5)); + virAsprintf(&ret, + "hyper-v: arg1=3D'0x%llx', arg2=3D'0x%llx', " + "arg3=3D'0x%llx', arg4=3D'0x%llx', arg5=3D'0x%llx'", + info->data.hyperv.arg1, info->data.hyperv.arg2, + info->data.hyperv.arg3, info->data.hyperv.arg4, + info->data.hyperv.arg5); break; case QEMU_MONITOR_EVENT_PANIC_INFO_TYPE_S390: - ignore_value(virAsprintf(&ret, "s390: core=3D'%d' psw-mask=3D'0x%0= 16llx' " - "psw-addr=3D'0x%016llx' reason=3D'%s'", - info->data.s390.core, - info->data.s390.psw_mask, - info->data.s390.psw_addr, - info->data.s390.reason)); + virAsprintf(&ret, "s390: core=3D'%d' psw-mask=3D'0x%016llx' " + "psw-addr=3D'0x%016llx' reason=3D'%s'", + info->data.s390.core, + info->data.s390.psw_mask, + info->data.s390.psw_addr, + info->data.s390.reason); break; case QEMU_MONITOR_EVENT_PANIC_INFO_TYPE_NONE: case QEMU_MONITOR_EVENT_PANIC_INFO_TYPE_LAST: diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 99f55c420a..697b302a7c 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -7120,8 +7120,7 @@ qemuMonitorJSONNBDServerStart(qemuMonitorPtr mon, =20 switch ((virStorageNetHostTransport)server->transport) { case VIR_STORAGE_NET_HOST_TRANS_TCP: - if (virAsprintf(&port_str, "%u", server->port) < 0) - return ret; + virAsprintf(&port_str, "%u", server->port); addr =3D qemuMonitorJSONBuildInetSocketAddress(server->name, port_= str); break; case VIR_STORAGE_NET_HOST_TRANS_UNIX: @@ -8052,9 +8051,7 @@ qemuMonitorJSONSetIOThread(qemuMonitorPtr mon, char *path =3D NULL; qemuMonitorJSONObjectProperty prop; =20 - if (virAsprintf(&path, "/objects/iothread%u", - iothreadInfo->iothread_id) < 0) - goto cleanup; + virAsprintf(&path, "/objects/iothread%u", iothreadInfo->iothread_id); =20 #define VIR_IOTHREAD_SET_PROP(propName, propVal) \ if (iothreadInfo->set_##propVal) { \ @@ -8212,13 +8209,11 @@ qemuMonitorJSONFindObjectPathByAlias(qemuMonitorPtr= mon, if (npaths < 0) return -1; =20 - if (virAsprintf(&child, "child<%s>", name) < 0) - goto cleanup; + virAsprintf(&child, "child<%s>", name); =20 for (i =3D 0; i < npaths; i++) { if (STREQ(paths[i]->name, alias) && STREQ(paths[i]->type, child)) { - if (virAsprintf(path, "/machine/peripheral/%s", alias) < 0) - goto cleanup; + virAsprintf(path, "/machine/peripheral/%s", alias); =20 ret =3D 0; goto cleanup; @@ -8270,10 +8265,7 @@ qemuMonitorJSONFindObjectPathByName(qemuMonitorPtr m= on, if (STREQ_NULLABLE(paths[i]->type, name)) { VIR_DEBUG("Path to '%s' is '%s/%s'", name, curpath, paths[i]->= name); ret =3D 0; - if (virAsprintf(path, "%s/%s", curpath, paths[i]->name) < 0) { - *path =3D NULL; - ret =3D -1; - } + virAsprintf(path, "%s/%s", curpath, paths[i]->name); goto cleanup; } =20 @@ -8281,10 +8273,7 @@ qemuMonitorJSONFindObjectPathByName(qemuMonitorPtr m= on, * traversed looking for more entries */ if (paths[i]->type && STRPREFIX(paths[i]->type, "child<")) { - if (virAsprintf(&nextpath, "%s/%s", curpath, paths[i]->name) <= 0) { - ret =3D -1; - goto cleanup; - } + virAsprintf(&nextpath, "%s/%s", curpath, paths[i]->name); =20 ret =3D qemuMonitorJSONFindObjectPathByName(mon, nextpath, nam= e, path); VIR_FREE(nextpath); @@ -8327,8 +8316,7 @@ qemuMonitorJSONFindLinkPath(qemuMonitorPtr mon, return ret; } =20 - if (virAsprintf(&linkname, "link<%s>", name) < 0) - return -1; + virAsprintf(&linkname, "link<%s>", name); =20 ret =3D qemuMonitorJSONFindObjectPathByName(mon, "/", linkname, path); VIR_FREE(linkname); diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index b1abcacdd0..a5b2d2ccfd 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -42,8 +42,7 @@ int qemuMonitorTextAddDrive(qemuMonitorPtr mon, =20 /* 'dummy' here is just a placeholder since there is no PCI * address required when attaching drives to a controller */ - if (virAsprintf(&cmd, "drive_add dummy %s", drivestr) < 0) - goto cleanup; + virAsprintf(&cmd, "drive_add dummy %s", drivestr); =20 if (qemuMonitorJSONHumanCommand(mon, cmd, &reply) < 0) goto cleanup; @@ -92,8 +91,7 @@ int qemuMonitorTextDriveDel(qemuMonitorPtr mon, char *reply =3D NULL; int ret =3D -1; =20 - if (virAsprintf(&cmd, "drive_del %s", drivestr) < 0) - goto cleanup; + virAsprintf(&cmd, "drive_del %s", drivestr); =20 if (qemuMonitorJSONHumanCommand(mon, cmd, &reply) < 0) goto cleanup; @@ -131,8 +129,7 @@ qemuMonitorTextCreateSnapshot(qemuMonitorPtr mon, char *reply =3D NULL; int ret =3D -1; =20 - if (virAsprintf(&cmd, "savevm \"%s\"", name) < 0) - goto cleanup; + virAsprintf(&cmd, "savevm \"%s\"", name); =20 if (qemuMonitorJSONHumanCommand(mon, cmd, &reply)) goto cleanup; @@ -166,8 +163,7 @@ int qemuMonitorTextLoadSnapshot(qemuMonitorPtr mon, con= st char *name) int ret =3D -1; char *safename; =20 - if (virAsprintf(&cmd, "loadvm \"%s\"", name) < 0) - goto cleanup; + virAsprintf(&cmd, "loadvm \"%s\"", name); =20 if (qemuMonitorJSONHumanCommand(mon, cmd, &reply)) goto cleanup; @@ -210,8 +206,7 @@ int qemuMonitorTextDeleteSnapshot(qemuMonitorPtr mon, c= onst char *name) char *reply =3D NULL; int ret =3D -1; =20 - if (virAsprintf(&cmd, "delvm \"%s\"", name) < 0) - goto cleanup; + virAsprintf(&cmd, "delvm \"%s\"", name); if (qemuMonitorJSONHumanCommand(mon, cmd, &reply)) goto cleanup; =20 diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 7e0dc26658..925fc44a70 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -98,10 +98,8 @@ VIR_LOG_INIT("qemu.qemu_process"); * qemuProcessRemoveDomainStatus * * remove all state files of a domain from statedir - * - * Returns 0 on success */ -static int +static void qemuProcessRemoveDomainStatus(virQEMUDriverPtr driver, virDomainObjPtr vm) { @@ -109,10 +107,8 @@ qemuProcessRemoveDomainStatus(virQEMUDriverPtr driver, char *file =3D NULL; qemuDomainObjPrivatePtr priv =3D vm->privateData; virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); - int ret =3D -1; =20 - if (virAsprintf(&file, "%s/%s.xml", cfg->stateDir, vm->def->name) < 0) - goto cleanup; + virAsprintf(&file, "%s/%s.xml", cfg->stateDir, vm->def->name); =20 if (unlink(file) < 0 && errno !=3D ENOENT && errno !=3D ENOTDIR) VIR_WARN("Failed to remove domain XML for %s: %s", @@ -125,10 +121,7 @@ qemuProcessRemoveDomainStatus(virQEMUDriverPtr driver, VIR_WARN("Failed to remove PID file for %s: %s", vm->def->name, virStrerror(errno, ebuf, sizeof(ebuf))); =20 - ret =3D 0; - cleanup: virObjectUnref(cfg); - return ret; } =20 =20 @@ -2105,8 +2098,7 @@ qemuProcessLookupPTYs(virDomainChrDefPtr *devices, qemuMonitorChardevInfoPtr entry; =20 VIR_FREE(id); - if (virAsprintf(&id, "char%s", chr->info.alias) < 0) - return -1; + virAsprintf(&id, "char%s", chr->info.alias); =20 entry =3D virHashLookup(info, id); if (!entry || !entry->ptyPath) { @@ -2175,7 +2167,7 @@ qemuProcessFindCharDevicePTYsMonitor(virDomainObjPtr = vm, } =20 =20 -static int +static void qemuProcessRefreshChannelVirtioState(virQEMUDriverPtr driver, virDomainObjPtr vm, virHashTablePtr info, @@ -2186,7 +2178,6 @@ qemuProcessRefreshChannelVirtioState(virQEMUDriverPtr= driver, qemuMonitorChardevInfoPtr entry; virObjectEventPtr event =3D NULL; char *id =3D NULL; - int ret =3D -1; =20 if (booted) agentReason =3D VIR_CONNECT_DOMAIN_EVENT_AGENT_LIFECYCLE_REASON_DO= MAIN_STARTED; @@ -2196,8 +2187,7 @@ qemuProcessRefreshChannelVirtioState(virQEMUDriverPtr= driver, if (chr->targetType =3D=3D VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRT= IO) { =20 VIR_FREE(id); - if (virAsprintf(&id, "char%s", chr->info.alias) < 0) - goto cleanup; + virAsprintf(&id, "char%s", chr->info.alias); =20 /* port state not reported */ if (!(entry =3D virHashLookup(info, id)) || @@ -2214,10 +2204,7 @@ qemuProcessRefreshChannelVirtioState(virQEMUDriverPt= r driver, } } =20 - ret =3D 0; - cleanup: VIR_FREE(id); - return ret; } =20 =20 @@ -2240,7 +2227,8 @@ qemuRefreshVirtioChannelState(virQEMUDriverPtr driver, if (ret < 0) goto cleanup; =20 - ret =3D qemuProcessRefreshChannelVirtioState(driver, vm, info, false); + qemuProcessRefreshChannelVirtioState(driver, vm, info, false); + ret =3D 0; =20 cleanup: virHashFree(info); @@ -2405,9 +2393,7 @@ qemuProcessWaitForMonitor(virQEMUDriverPtr driver, if ((ret =3D qemuProcessFindCharDevicePTYsMonitor(vm, info)) < 0) goto cleanup; =20 - if ((ret =3D qemuProcessRefreshChannelVirtioState(driver, vm, info, - true)) < 0) - goto cleanup; + qemuProcessRefreshChannelVirtioState(driver, vm, info, true); } =20 cleanup: @@ -3208,9 +3194,7 @@ qemuProcessPrepareMonitorChr(virDomainChrSourceDefPtr= monConfig, monConfig->type =3D VIR_DOMAIN_CHR_TYPE_UNIX; monConfig->data.nix.listen =3D true; =20 - if (virAsprintf(&monConfig->data.nix.path, "%s/monitor.sock", - domainDir) < 0) - return -1; + virAsprintf(&monConfig->data.nix.path, "%s/monitor.sock", domainDir); return 0; } =20 @@ -3416,8 +3400,8 @@ qemuProcessUpdateState(virQEMUDriverPtr driver, virDo= mainObjPtr vm) } else { newState =3D VIR_DOMAIN_PAUSED; newReason =3D reason; - ignore_value(virAsprintf(&msg, "was paused (%s)", - virDomainPausedReasonTypeToString(reason)= )); + virAsprintf(&msg, "was paused (%s)", + virDomainPausedReasonTypeToString(reason)); } } =20 @@ -4082,9 +4066,7 @@ qemuProcessVerifyHypervFeatures(virDomainDefPtr def, if (def->hyperv_features[i] !=3D VIR_TRISTATE_SWITCH_ON) continue; =20 - if (virAsprintf(&cpuFeature, "hv-%s", - virDomainHypervTypeToString(i)) < 0) - return -1; + virAsprintf(&cpuFeature, "hv-%s", virDomainHypervTypeToString(i)); =20 rc =3D virCPUDataCheckFeature(cpu, cpuFeature); VIR_FREE(cpuFeature); @@ -4916,9 +4898,8 @@ qemuProcessGraphicsSetupListen(virQEMUDriverPtr drive= r, * default instead of tcp listen. */ if (useSocket) { memset(glisten, 0, sizeof(virDomainGraphicsListenDef)); - if (virAsprintf(&glisten->socket, "%s/%s.sock", - priv->libDir, type) < 0) - goto cleanup; + virAsprintf(&glisten->socket, "%s/%s.sock", priv->libD= ir, + type); glisten->fromConfig =3D true; glisten->type =3D VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCK= ET; } else if (listenAddr) { @@ -4939,9 +4920,8 @@ qemuProcessGraphicsSetupListen(virQEMUDriverPtr drive= r, =20 case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET: if (!glisten->socket) { - if (virAsprintf(&glisten->socket, "%s/%s.sock", - priv->libDir, type) < 0) - goto cleanup; + virAsprintf(&glisten->socket, "%s/%s.sock", priv->libDir, + type); glisten->autoGenerated =3D true; } break; @@ -6018,8 +5998,7 @@ qemuProcessSetupHotpluggableVcpus(virQEMUDriverPtr dr= iver, =20 if (vcpu->hotpluggable =3D=3D VIR_TRISTATE_BOOL_YES && vcpu->onlin= e && vcpupriv->vcpus !=3D 0) { - if (virAsprintf(&vcpupriv->alias, "vcpu%zu", i) < 0) - goto cleanup; + virAsprintf(&vcpupriv->alias, "vcpu%zu", i); =20 if (VIR_APPEND_ELEMENT(bootHotplug, nbootHotplug, vcpu) < 0) goto cleanup; @@ -6370,10 +6349,8 @@ qemuProcessPrepareDomain(virQEMUDriverPtr driver, if (qemuProcessUpdateGuestCPU(vm->def, priv->qemuCaps, caps, flags) < = 0) goto cleanup; =20 - for (i =3D 0; i < vm->def->nshmems; i++) { - if (qemuDomainPrepareShmemChardev(vm->def->shmems[i]) < 0) - goto cleanup; - } + for (i =3D 0; i < vm->def->nshmems; i++) + qemuDomainPrepareShmemChardev(vm->def->shmems[i]); =20 ret =3D 0; cleanup: @@ -8503,8 +8480,7 @@ qemuProcessQMPInit(qemuProcessQMPPtr proc) =20 VIR_DEBUG("proc=3D%p, emulator=3D%s", proc, proc->binary); =20 - if (virAsprintf(&template, "%s/qmp-XXXXXX", proc->libDir) < 0) - goto cleanup; + virAsprintf(&template, "%s/qmp-XXXXXX", proc->libDir); =20 if (!(proc->uniqDir =3D mkdtemp(template))) { virReportSystemError(errno, @@ -8517,20 +8493,16 @@ qemuProcessQMPInit(qemuProcessQMPPtr proc) if (qemuProcessQEMULabelUniqPath(proc) < 0) goto cleanup; =20 - if (virAsprintf(&proc->monpath, "%s/%s", proc->uniqDir, - "qmp.monitor") < 0) - goto cleanup; + virAsprintf(&proc->monpath, "%s/%s", proc->uniqDir, "qmp.monitor"); =20 - if (virAsprintf(&proc->monarg, "unix:%s,server,nowait", proc->monpath)= < 0) - goto cleanup; + virAsprintf(&proc->monarg, "unix:%s,server,nowait", proc->monpath); =20 /* * Normally we'd use runDir for pid files, but because we're using * -daemonize we need QEMU to be allowed to create them, rather * than libvirtd. So we're using libDir which QEMU can write to */ - if (virAsprintf(&proc->pidfile, "%s/%s", proc->uniqDir, "qmp.pid") < 0) - goto cleanup; + virAsprintf(&proc->pidfile, "%s/%s", proc->uniqDir, "qmp.pid"); =20 ret =3D 0; =20 diff --git a/src/qemu/qemu_slirp.c b/src/qemu/qemu_slirp.c index 0b45315a0b..c08a365548 100644 --- a/src/qemu/qemu_slirp.c +++ b/src/qemu/qemu_slirp.c @@ -153,10 +153,11 @@ qemuSlirpCreatePidFilename(virQEMUDriverConfigPtr cfg, g_autofree char *shortName =3D NULL; g_autofree char *name =3D NULL; =20 - if (!(shortName =3D virDomainDefGetShortName(def)) || - virAsprintf(&name, "%s-%s-slirp", shortName, alias) < 0) + if (!(shortName =3D virDomainDefGetShortName(def))) return NULL; =20 + virAsprintf(&name, "%s-%s-slirp", shortName, alias); + return virPidFileBuildPath(cfg->slirpStateDir, name); } =20 @@ -209,8 +210,7 @@ qemuSlirpGetDBusVMStateId(virDomainNetDefPtr net) char *id =3D NULL; =20 /* can't use alias, because it's not stable across restarts */ - if (virAsprintf(&id, "slirp-%s", virMacAddrFormat(&net->mac, macstr)) = < 0) - return NULL; + virAsprintf(&id, "slirp-%s", virMacAddrFormat(&net->mac, macstr)); =20 return id; } @@ -224,11 +224,12 @@ qemuSlirpGetDBusPath(virQEMUDriverConfigPtr cfg, g_autofree char *shortName =3D NULL; char *path =3D NULL; =20 - if (!(shortName =3D virDomainDefGetShortName(def)) || - virAsprintf(&path, "%s/%s-%s-slirp", - cfg->slirpStateDir, shortName, alias) < 0) + if (!(shortName =3D virDomainDefGetShortName(def))) return NULL; =20 + virAsprintf(&path, "%s/%s-%s-slirp", + cfg->slirpStateDir, shortName, alias); + return path; } =20 @@ -379,8 +380,7 @@ qemuSlirpStart(qemuSlirpPtr slirp, return -1; } =20 - if (virAsprintf(&dbus_addr, "unix:path=3D%s", dbus_path) < 0) - return -1; + virAsprintf(&dbus_addr, "unix:path=3D%s", dbus_path); =20 virCommandAddArgFormat(cmd, "--dbus-id=3D%s", id); =20 diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index f21dbf9727..d6d418533c 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -78,9 +78,7 @@ qemuTPMCreateEmulatorStoragePath(const char *swtpmStorage= Dir, return NULL; } =20 - ignore_value(virAsprintf(&path, "%s/%s/%s", swtpmStorageDir, uuidstr, - dir)); - + virAsprintf(&path, "%s/%s/%s", swtpmStorageDir, uuidstr, dir); return path; } =20 @@ -208,8 +206,7 @@ qemuTPMCreateEmulatorSocket(const char *swtpmStateDir, { char *path =3D NULL; =20 - ignore_value(virAsprintf(&path, "%s/%s-swtpm.sock", swtpmStateDir, - shortName)); + virAsprintf(&path, "%s/%s-swtpm.sock", swtpmStateDir, shortName); =20 return path; } @@ -252,8 +249,7 @@ qemuTPMEmulatorCreatePidFilename(const char *swtpmState= Dir, char *pidfile =3D NULL; char *devicename =3D NULL; =20 - if (virAsprintf(&devicename, "%s-swtpm", shortName) < 0) - return NULL; + virAsprintf(&devicename, "%s-swtpm", shortName); =20 pidfile =3D virPidFileBuildPath(swtpmStateDir, devicename); =20 @@ -335,10 +331,8 @@ qemuTPMEmulatorPrepareHost(virDomainTPMDefPtr tpm, goto cleanup; =20 /* create logfile name ... */ - if (!tpm->data.emulator.logfile && - virAsprintf(&tpm->data.emulator.logfile, "%s/%s-swtpm.log", - logDir, vmname) < 0) - goto cleanup; + if (!tpm->data.emulator.logfile) + virAsprintf(&tpm->data.emulator.logfile, "%s/%s-swtpm.log", logDir= , vmname); =20 if (!virFileExists(tpm->data.emulator.logfile) && virFileTouch(tpm->data.emulator.logfile, 0644) < 0) { @@ -492,8 +486,7 @@ qemuTPMEmulatorRunSetup(const char *storagepath, goto cleanup; =20 virUUIDFormat(vmuuid, uuid); - if (virAsprintf(&vmid, "%s:%s", vmname, uuid) < 0) - goto cleanup; + virAsprintf(&vmid, "%s:%s", vmname, uuid); =20 virCommandSetUID(cmd, swtpm_user); virCommandSetGID(cmd, swtpm_group); diff --git a/src/qemu/qemu_vhost_user_gpu.c b/src/qemu/qemu_vhost_user_gpu.c index 49f48c6d08..7355ae70f8 100644 --- a/src/qemu/qemu_vhost_user_gpu.c +++ b/src/qemu/qemu_vhost_user_gpu.c @@ -47,8 +47,7 @@ qemuVhostUserGPUCreatePidFilename(const char *stateDir, { g_autofree char *devicename =3D NULL; =20 - if (virAsprintf(&devicename, "%s-%s-vhost-user-gpu", shortName, alias)= < 0) - return NULL; + virAsprintf(&devicename, "%s-%s-vhost-user-gpu", shortName, alias); =20 return virPidFileBuildPath(stateDir, devicename); } --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752833; cv=none; d=zoho.com; s=zohoarc; b=TO0dciFpwLjRhZCJ7QucPEi9Lln5m+WQrCUXGu1VeGOxKN7qIZSlff2TAjvAT7OK4il2CBd/3i+V1l0gzoxPUSwnKwghS8GJ4DbvkeYDWKmrvj287081Y4i0gktfZB4OPkIn/ojJDDqqxAcvY3fP6Pa+73X4tVd1xYNmGW8rCm4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752833; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0E2dt5n5sqyElrkYbAEAvjrYuF6KiRYGcOT3wwlPQE4=; b=lcBuQoSDHyyWqcgXCKbkzuUSZ0Dz9kL7B+mTFkyjbwMW/fthk29ib4VbruFOlJMAcprs+GLKKx7Bdbc17zEEPEIv8MoW+2OlzfxYuB+OIuI8O6gE5Xc9iosgsW4lpZVMSXNMLzM8obVg0dDyPANnwr0LLJOX7GvtLSqMaC1qjdw= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1571752833020428.78728353940494; Tue, 22 Oct 2019 07:00:33 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-142-0k7w_uoBN5m7xKjdU9qeIA-1; Tue, 22 Oct 2019 09:59:12 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 73ACD800D53; Tue, 22 Oct 2019 13:59:05 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4260C60167; Tue, 22 Oct 2019 13:59:05 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 00D371806B14; Tue, 22 Oct 2019 13:59:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9MDwkM7001707 for ; Tue, 22 Oct 2019 09:58:46 -0400 Received: by smtp.corp.redhat.com (Postfix) id 569D76012C; Tue, 22 Oct 2019 13:58:46 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id CD0DF60167 for ; Tue, 22 Oct 2019 13:58:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752831; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=0E2dt5n5sqyElrkYbAEAvjrYuF6KiRYGcOT3wwlPQE4=; b=M2BgHPXk4fFpdnRPcEGZaKk96kJMlIFuHiEebp0D11DPmlRLqRsAVgnEIUm+AoL3F5UGrV 0W32Nf1RIfCuHF5Rw9aAp/QYIqUVgWZAkuYDyXbgdxKYlrtOFmjW9xyyDdMwrPRj4PVYFH n1761YnEaRWNb6TK78idDOJcnxmRZ7o= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:24 +0200 Message-Id: <9d283103c9add428500efab9d8d659e99ff15d1f.1571752582.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 20/75] remote: Drop virAsprintf() and virAsprintfQuiet() retval checking X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: 0k7w_uoBN5m7xKjdU9qeIA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" These functions can't fail really. Drop checking of their retval then. Signed-off-by: Michal Privoznik --- src/remote/remote_daemon.c | 37 ++++++++++++----------------- src/remote/remote_daemon_config.c | 5 +--- src/remote/remote_daemon_dispatch.c | 20 ++++++---------- src/remote/remote_driver.c | 20 ++++++---------- 4 files changed, 30 insertions(+), 52 deletions(-) diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c index 7e63e18034..6977cc36e0 100644 --- a/src/remote/remote_daemon.c +++ b/src/remote/remote_daemon.c @@ -225,26 +225,23 @@ daemonUnixSocketPaths(struct daemonConfig *config, char *rundir =3D NULL; =20 if (config->unix_sock_dir) { - if (virAsprintf(sockfile, "%s/%s-sock", - config->unix_sock_dir, SOCK_PREFIX) < 0) - goto cleanup; + virAsprintf(sockfile, "%s/%s-sock", config->unix_sock_dir, + SOCK_PREFIX); =20 if (privileged) { - if (virAsprintf(rosockfile, "%s/%s-sock-ro", - config->unix_sock_dir, SOCK_PREFIX) < 0 || - virAsprintf(admsockfile, "%s/%s-admin-sock", - config->unix_sock_dir, SOCK_PREFIX) < 0) - goto cleanup; + virAsprintf(rosockfile, "%s/%s-sock-ro", + config->unix_sock_dir, SOCK_PREFIX); + virAsprintf(admsockfile, "%s/%s-admin-sock", + config->unix_sock_dir, SOCK_PREFIX); } } else { if (privileged) { - if (virAsprintf(sockfile, "%s/libvirt/%s-sock", - RUNSTATEDIR, SOCK_PREFIX) < 0 || - virAsprintf(rosockfile, "%s/libvirt/%s-sock-ro", - RUNSTATEDIR, SOCK_PREFIX) < 0 || - virAsprintf(admsockfile, "%s/libvirt/%s-admin-sock", - RUNSTATEDIR, SOCK_PREFIX) < 0) - goto cleanup; + virAsprintf(sockfile, "%s/libvirt/%s-sock", + RUNSTATEDIR, SOCK_PREFIX); + virAsprintf(rosockfile, "%s/libvirt/%s-sock-ro", + RUNSTATEDIR, SOCK_PREFIX); + virAsprintf(admsockfile, "%s/libvirt/%s-admin-sock", + RUNSTATEDIR, SOCK_PREFIX); } else { mode_t old_umask; =20 @@ -258,11 +255,8 @@ daemonUnixSocketPaths(struct daemonConfig *config, } umask(old_umask); =20 - if (virAsprintf(sockfile, "%s/%s-sock", - rundir, SOCK_PREFIX) < 0 || - virAsprintf(admsockfile, "%s/%s-admin-sock", - rundir, SOCK_PREFIX) < 0) - goto cleanup; + virAsprintf(sockfile, "%s/%s-sock", rundir, SOCK_PREFIX); + virAsprintf(admsockfile, "%s/%s-admin-sock", rundir, SOCK_PREF= IX); } } =20 @@ -659,8 +653,7 @@ daemonSetupLogging(struct daemonConfig *config, /* Define the default output. This is only applied if there was no set= ting * from either the config or the environment. */ - if (virLogSetDefaultOutput(DAEMON_NAME, godaemon, privileged) < 0) - return -1; + virLogSetDefaultOutput(DAEMON_NAME, godaemon, privileged); =20 if (virLogGetNbOutputs() =3D=3D 0) virLogSetOutputs(virLogGetDefaultOutput()); diff --git a/src/remote/remote_daemon_config.c b/src/remote/remote_daemon_c= onfig.c index 3187c9acb1..cfc0869747 100644 --- a/src/remote/remote_daemon_config.c +++ b/src/remote/remote_daemon_config.c @@ -84,10 +84,7 @@ daemonConfigFilePath(bool privileged, char **configfile) if (!(configdir =3D virGetUserConfigDirectory())) goto error; =20 - if (virAsprintf(configfile, "%s/%s.conf", configdir, DAEMON_NAME) = < 0) { - VIR_FREE(configdir); - goto error; - } + virAsprintf(configfile, "%s/%s.conf", configdir, DAEMON_NAME); VIR_FREE(configdir); } =20 diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon= _dispatch.c index 203aeff8c3..d12c3c1ed9 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -2174,8 +2174,7 @@ remoteDispatchProbeURI(bool readonly, g_autofree char *daemonname =3D NULL; g_autofree char *daemonpath =3D NULL; =20 - if (virAsprintf(&daemonname, "virt%sd", drivers[i]) < 0) - return -1; + virAsprintf(&daemonname, "virt%sd", drivers[i]); =20 if (!(daemonpath =3D virFileFindResource(daemonname, "src", SB= INDIR))) return -1; @@ -2185,8 +2184,7 @@ remoteDispatchProbeURI(bool readonly, continue; } =20 - if (virAsprintf(probeduri, "%s:///session", drivers[i]) < 0) - return -1; + virAsprintf(probeduri, "%s:///session", drivers[i]); =20 VIR_DEBUG("Probed URI %s via daemon %s", *probeduri, daemonpat= h); return 0; @@ -2219,18 +2217,15 @@ remoteDispatchProbeURI(bool readonly, for (i =3D 0; i < (ssize_t) G_N_ELEMENTS(drivers) && !*probeduri; = i++) { g_autofree char *sockname =3D NULL; =20 - if (virAsprintf(&sockname, "%s/libvirt/virt%sd-%s", - RUNSTATEDIR, drivers[i], - readonly ? "sock-ro" : "sock") < 0) - return -1; + virAsprintf(&sockname, "%s/libvirt/virt%sd-%s", RUNSTATEDIR, + drivers[i], readonly ? "sock-ro" : "sock"); =20 if (!virFileExists(sockname)) { VIR_DEBUG("Missing sock %s for driver %s", sockname, drive= rs[i]); continue; } =20 - if (virAsprintf(probeduri, "%s:///system", drivers[i]) < 0) - return -1; + virAsprintf(probeduri, "%s:///system", drivers[i]); =20 VIR_DEBUG("Probed URI %s via sock %s", *probeduri, sockname); return 0; @@ -3844,9 +3839,8 @@ remoteDispatchAuthList(virNetServerPtr server, virResetLastError(); } else if (callerUid =3D=3D 0) { char *ident; - if (virAsprintf(&ident, "pid:%lld,uid:%d", - (long long) callerPid, (int) callerUid) < 0) - goto cleanup; + virAsprintf(&ident, "pid:%lld,uid:%d", (long long)callerPid, + (int)callerUid); VIR_INFO("Bypass polkit auth for privileged client %s", ident); virNetServerSetClientAuthenticated(server, client); auth =3D VIR_NET_SERVER_SERVICE_AUTH_NONE; diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 83477243fc..4fcf13161c 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -781,9 +781,7 @@ remoteGetUNIXSocketHelper(remoteDriverTransport transpo= rt, if (!(userdir =3D virGetUserRuntimeDirectory())) return NULL; =20 - if (virAsprintf(&sockname, "%s/%s-sock", - userdir, sock_prefix) < 0) - return NULL; + virAsprintf(&sockname, "%s/%s-sock", userdir, sock_prefix); } else { /* Intentionally do *NOT* use RUNSTATEDIR here. We might * be connecting to a remote machine, and cannot assume @@ -791,11 +789,9 @@ remoteGetUNIXSocketHelper(remoteDriverTransport transp= ort, * any machine with /run will have a /var/run symlink. * The portable option is to thus use $LOCALSTATEDIR/run */ - if (virAsprintf(&sockname, "%s/run/libvirt/%s-%s", - LOCALSTATEDIR, sock_prefix, - flags & VIR_DRV_OPEN_REMOTE_RO ? - "sock-ro" : "sock") < 0) - return NULL; + virAsprintf(&sockname, "%s/run/libvirt/%s-%s", LOCALSTATEDIR, + sock_prefix, + flags & VIR_DRV_OPEN_REMOTE_RO ? "sock-ro" : "sock"); } =20 VIR_DEBUG("Built UNIX sockname %s for transport %s prefix %s flags=3D0= x%x", @@ -818,9 +814,8 @@ remoteGetUNIXSocket(remoteDriverTransport transport, g_autofree char *direct_sock_name =3D NULL; g_autofree char *legacy_sock_name =3D NULL; =20 - if (driver && - virAsprintf(&direct_daemon, "virt%sd", driver) < 0) - return NULL; + if (driver) + virAsprintf(&direct_daemon, "virt%sd", driver); =20 legacy_daemon =3D g_strdup("libvirtd"); =20 @@ -1003,8 +998,7 @@ doRemoteOpen(virConnectPtr conn, =20 /* Remote server defaults to "localhost" if not specified. */ if (conn->uri && conn->uri->port !=3D 0) { - if (virAsprintf(&port, "%d", conn->uri->port) < 0) - goto failed; + virAsprintf(&port, "%d", conn->uri->port); } else if (transport =3D=3D REMOTE_DRIVER_TRANSPORT_TLS) { port =3D g_strdup(LIBVIRTD_TLS_PORT); } else if (transport =3D=3D REMOTE_DRIVER_TRANSPORT_TCP) { --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571753169; cv=none; d=zoho.com; s=zohoarc; b=egX6o68S4EE1TlOc06+PwkaKvguyDuj0n4BHO3i193wU2EFiLI7hks6e7nNcYKRXWreAAvBUwiTD4LCCHF6+E+uwnWMuM0m+BE77eNqAbFa2F2J+cy42mfhUczgcBgEHIG+WVTjB4/CaOfBtX2JQV7xVf90yQ8qnu8QXaGCN1cw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571753169; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=rTKf5/rLphyOhogrBEsl4cTdQWfEPaVT1xbbKbUgFUM=; b=njhiXQtkjdSEwQ+Gvvo4Q1gKMxg6cY6dL6/0yBBjqC6Qw3SxkETSyxTaWQThqNs91uR6IHlnCidqfB+0xyQ6H4hCrbHnTU46EZwY/ODbLOpfkZH1u3IOfh09bKknDenG7Xp0Ynln8b7A5v2eg1OL+XEatzDESryxHUbl75oJtVA= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1571753169578666.5721428966472; Tue, 22 Oct 2019 07:06:09 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-14-plMimZSBPMiotz2tzG4VsA-1; Tue, 22 Oct 2019 09:59:01 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2855480183E; Tue, 22 Oct 2019 13:58:55 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 052B45D6A9; Tue, 22 Oct 2019 13:58:55 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id B3CD03FB42; Tue, 22 Oct 2019 13:58:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9MDwnVo001737 for ; Tue, 22 Oct 2019 09:58:49 -0400 Received: by smtp.corp.redhat.com (Postfix) id DACEF6012D; Tue, 22 Oct 2019 13:58:49 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 64B606017E for ; Tue, 22 Oct 2019 13:58:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571753168; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=rTKf5/rLphyOhogrBEsl4cTdQWfEPaVT1xbbKbUgFUM=; b=My5new8kRDwQmXbgTLZxPkkGricyHNzQjRO3bIXkygqCMYGr51D5xDlAcIH8sXJzH0IV0w kPRQacTHUHJYCr1227696+ObOFfKJFDnoOp1yJvzHasb4HVQriU+Rsmxo053LBcHP5NQTj H4sbpRBu33zMBNOdu1RUgaEOhEQLsCM= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:25 +0200 Message-Id: <4062de7e9d363f9b1216386c393d12d11e3d6b0e.1571752582.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 21/75] rpc: Drop virAsprintf() and virAsprintfQuiet() retval checking X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: plMimZSBPMiotz2tzG4VsA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" These functions can't fail really. Drop checking of their retval then. Signed-off-by: Michal Privoznik --- src/rpc/virnetclient.c | 23 +++++++-------------- src/rpc/virnetlibsshsession.c | 17 ++++----------- src/rpc/virnetsocket.c | 3 +-- src/rpc/virnetsshsession.c | 18 +++++----------- src/rpc/virnettlscontext.c | 39 ++++++++++++----------------------- 5 files changed, 30 insertions(+), 70 deletions(-) diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 678e6f7815..a423f4db2f 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -343,8 +343,7 @@ virNetClientCheckKeyExists(const char *homedir, { char *path; =20 - if (virAsprintf(&path, "%s/.ssh/%s", homedir, name) < 0) - return -1; + virAsprintf(&path, "%s/.ssh/%s", homedir, name); =20 if (!(virFileExists(path))) { VIR_FREE(path); @@ -565,10 +564,8 @@ virNetClientPtr virNetClientNewLibssh(const char *host, knownhosts =3D g_strdup(knownHostsPath); } else { confdir =3D virGetUserConfigDirectory(); - if (confdir) { - if (virAsprintf(&knownhosts, "%s/known_hosts", confdir) < 0) - goto cleanup; - } + if (confdir) + virAsprintf(&knownhosts, "%s/known_hosts", confdir); } =20 if (privkeyPath) { @@ -602,16 +599,10 @@ virNetClientPtr virNetClientNewLibssh(const char *hos= t, if (!(nc =3D virBufferContentAndReset(&buf))) goto no_memory; =20 - if (virAsprintf(&command, - "sh -c " - "'if '%s' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1= ; then " - "ARG=3D-q0;" - "else " - "ARG=3D;" - "fi;" - "'%s' $ARG -U %s'", - nc, nc, socketPath) < 0) - goto cleanup; + virAsprintf(&command, "sh -c " + "'if '%s' -q 2>&1 | grep \"requires an argument\" >/dev/nu= ll 2>&1; then " + "ARG=3D-q0;" "else " "ARG=3D;" "fi;" "'%s' $ARG -U %s'", n= c, nc, + socketPath); =20 if (virNetSocketNewConnectLibssh(host, port, family, diff --git a/src/rpc/virnetlibsshsession.c b/src/rpc/virnetlibsshsession.c index 0b98236f38..4a9f976914 100644 --- a/src/rpc/virnetlibsshsession.c +++ b/src/rpc/virnetlibsshsession.c @@ -341,15 +341,9 @@ virNetLibsshCheckHostKey(virNetLibsshSessionPtr sess) if (!keyhashstr) return -1; =20 - if (virAsprintf(&tmp, - _("Accept SSH host key with hash '%s' for " - "host '%s:%d' (%s/%s)?"), - keyhashstr, - sess->hostname, sess->port, - "y", "n") < 0) { - ssh_string_free_char(keyhashstr); - return -1; - } + virAsprintf(&tmp, + _("Accept SSH host key with hash '%s' for " "host = '%s:%d' (%s/%s)?"), + keyhashstr, sess->hostname, sess->port, "y", "n"); askKey.prompt =3D tmp; =20 if (sess->cred->cb(&askKey, 1, sess->cred->cbdata)) { @@ -530,10 +524,7 @@ virNetLibsshAuthenticatePrivkey(virNetLibsshSessionPtr= sess, =20 VIR_DEBUG("sess=3D%p", sess); =20 - if (virAsprintf(&tmp, "%s.pub", priv->filename) < 0) { - err =3D SSH_AUTH_ERROR; - goto error; - } + virAsprintf(&tmp, "%s.pub", priv->filename); =20 /* try to open the public part of the private key */ ret =3D ssh_pki_import_pubkey_file(tmp, &public_key); diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 6574ee0d16..2b66bc609b 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -698,8 +698,7 @@ int virNetSocketNewConnectUNIX(const char *path, goto cleanup; } =20 - if (virAsprintf(&lockpath, "%s/%s.lock", rundir, binname) < 0) - goto cleanup; + virAsprintf(&lockpath, "%s/%s.lock", rundir, binname); =20 if ((lockfd =3D open(lockpath, O_RDWR | O_CREAT, 0600)) < 0 || virSetCloseExec(lockfd) < 0) { diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c index 931c7091cc..384bedfc34 100644 --- a/src/rpc/virnetsshsession.c +++ b/src/rpc/virnetsshsession.c @@ -365,15 +365,9 @@ virNetSSHCheckHostKey(virNetSSHSessionPtr sess) keyhashstr =3D virBufferContentAndReset(&buff); =20 askKey.type =3D VIR_CRED_ECHOPROMPT; - if (virAsprintf((char **)&askKey.prompt, - _("Accept SSH host key with hash '%s' for " - "host '%s:%d' (%s/%s)?"), - keyhashstr, - sess->hostname, sess->port, - "y", "n") < 0) { - VIR_FREE(keyhashstr); - return -1; - } + virAsprintf((char **)&askKey.prompt, + _("Accept SSH host key with hash '%s' for " "host = '%s:%d' (%s/%s)?"), + keyhashstr, sess->hostname, sess->port, "y", "n"); =20 if (sess->cred->cb(&askKey, 1, sess->cred->cbdata)) { virReportError(VIR_ERR_SSH, "%s", @@ -634,10 +628,8 @@ virNetSSHAuthenticatePrivkey(virNetSSHSessionPtr sess, return -1; } =20 - if (virAsprintf((char **)&retr_passphrase.prompt, - _("Passphrase for key '%s'"), - priv->filename) < 0) - return -1; + virAsprintf((char **)&retr_passphrase.prompt, + _("Passphrase for key '%s'"), priv->filename); =20 if (sess->cred->cb(&retr_passphrase, 1, sess->cred->cbdata)) { virReportError(VIR_ERR_SSH, "%s", diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c index 2420ad8681..af6d29b376 100644 --- a/src/rpc/virnettlscontext.c +++ b/src/rpc/virnettlscontext.c @@ -796,19 +796,13 @@ static int virNetTLSContextLocateCredentials(const ch= ar *pkipath, */ if (pkipath) { VIR_DEBUG("Told to use TLS credentials in %s", pkipath); - if ((virAsprintf(cacert, "%s/%s", pkipath, - "cacert.pem")) < 0) - goto error; - if ((virAsprintf(cacrl, "%s/%s", pkipath, - "cacrl.pem")) < 0) - goto error; - if ((virAsprintf(key, "%s/%s", pkipath, - isServer ? "serverkey.pem" : "clientkey.pem")) < = 0) - goto error; + virAsprintf(cacert, "%s/%s", pkipath, "cacert.pem"); + virAsprintf(cacrl, "%s/%s", pkipath, "cacrl.pem"); + virAsprintf(key, "%s/%s", pkipath, + isServer ? "serverkey.pem" : "clientkey.pem"); =20 - if ((virAsprintf(cert, "%s/%s", pkipath, - isServer ? "servercert.pem" : "clientcert.pem")) = < 0) - goto error; + virAsprintf(cert, "%s/%s", pkipath, + isServer ? "servercert.pem" : "clientcert.pem"); } else if (tryUserPkiPath) { /* Check to see if $HOME/.pki contains at least one of the * files and if so, use that @@ -818,26 +812,19 @@ static int virNetTLSContextLocateCredentials(const ch= ar *pkipath, if (!userdir) goto error; =20 - if (virAsprintf(&user_pki_path, "%s/.pki/libvirt", userdir) < 0) - goto error; + virAsprintf(&user_pki_path, "%s/.pki/libvirt", userdir); =20 VIR_DEBUG("Trying to find TLS user credentials in %s", user_pki_pa= th); =20 - if ((virAsprintf(cacert, "%s/%s", user_pki_path, - "cacert.pem")) < 0) - goto error; + virAsprintf(cacert, "%s/%s", user_pki_path, "cacert.pem"); =20 - if ((virAsprintf(cacrl, "%s/%s", user_pki_path, - "cacrl.pem")) < 0) - goto error; + virAsprintf(cacrl, "%s/%s", user_pki_path, "cacrl.pem"); =20 - if ((virAsprintf(key, "%s/%s", user_pki_path, - isServer ? "serverkey.pem" : "clientkey.pem")) < = 0) - goto error; + virAsprintf(key, "%s/%s", user_pki_path, + isServer ? "serverkey.pem" : "clientkey.pem"); =20 - if ((virAsprintf(cert, "%s/%s", user_pki_path, - isServer ? "servercert.pem" : "clientcert.pem")) = < 0) - goto error; + virAsprintf(cert, "%s/%s", user_pki_path, + isServer ? "servercert.pem" : "clientcert.pem"); =20 /* * If some of the files can't be found, fallback --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752926; cv=none; d=zoho.com; s=zohoarc; b=Dw9P6P78FvWwaNNMK23JHCKkYZOWYl4wOIkM3pGDyZzdH8HhhdRR4B5uarrQAzxMwNbRr2nhyaGu/EPvDV3INPAgi4Gc28mCxXQza28myVnYoLFJhNBHKCUl70PULPNYkQYuuoHKsUuj+0sZRiRx+8FgCpy3pUGjWkXGOs5IFXs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752926; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=JOZPlxaKEyOFj4a727R/AuNZ7ig83ZSX65CyRN9VVfI=; b=eeQ0Q3NJl1czlotSju1oTsTnU16ai4JzINIKXH4Hcf1Ci+ZuS8wkcWAGWqSBExCbTlIU62FkZOiRXmCqy++QuK6C3BSVjUyu5NOVF/e/QeYFQI4JGh7vlUC+4+y1RP00SCkkAqvQZY9dM0y4hzDBPKxA6addEthC/HBfEW7TGq4= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1571752926259658.6029722880206; Tue, 22 Oct 2019 07:02:06 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-21-lJX7X2HJP5Stdxr2uaB3Jw-1; Tue, 22 Oct 2019 09:59:03 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0BE051800E03; Tue, 22 Oct 2019 13:58:56 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D500860623; Tue, 22 Oct 2019 13:58:55 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 920123FB46; Tue, 22 Oct 2019 13:58:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9MDwqPU001757 for ; Tue, 22 Oct 2019 09:58:52 -0400 Received: by smtp.corp.redhat.com (Postfix) id C1C046012D; Tue, 22 Oct 2019 13:58:52 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 498396012C for ; Tue, 22 Oct 2019 13:58:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752925; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=JOZPlxaKEyOFj4a727R/AuNZ7ig83ZSX65CyRN9VVfI=; b=a9ZicfPnT8V4ga/g9fxwIhgPeGwcsXMXFNwfYC8hfav20T/9uxV5RsUeV6fSL6whtqyYi1 RypSlxnpcXX0kbQsQzwbvLN7lx6UU+ISGOzEaUQY8RuTyRNsVOBk4e/fjcClRDFWhjWctq icHY43ttx2cz142ptAl9NTSBylc/Sn4= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:26 +0200 Message-Id: <2b0c16b791c751338e4025bb7d7328e45e167a94.1571752582.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 22/75] security: Drop virAsprintf() and virAsprintfQuiet() retval checking X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: lJX7X2HJP5Stdxr2uaB3Jw-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" These functions can't fail really. Drop checking of their retval then. Signed-off-by: Michal Privoznik --- src/security/security_apparmor.c | 38 +++++----------- src/security/security_dac.c | 30 +++++-------- src/security/security_selinux.c | 55 +++++++++--------------- src/security/security_util.c | 14 +++--- src/security/virt-aa-helper.c | 74 ++++++++------------------------ 5 files changed, 64 insertions(+), 147 deletions(-) diff --git a/src/security/security_apparmor.c b/src/security/security_appar= mor.c index 9ad218b383..7263c2face 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -76,15 +76,11 @@ profile_status(const char *str, const int check_enforci= ng) int rc =3D -2; =20 /* create string that is ' \0' for accurate matching */ - if (virAsprintf(&tmp, "%s ", str) =3D=3D -1) - return rc; + virAsprintf(&tmp, "%s ", str); =20 if (check_enforcing !=3D 0) { /* create string that is ' (enforce)\0' for accurate matching= */ - if (virAsprintf(&etmp, "%s (enforce)", str) =3D=3D -1) { - VIR_FREE(tmp); - return rc; - } + virAsprintf(&etmp, "%s (enforce)", str); } =20 if (virFileReadAll(APPARMOR_PROFILES_PATH, MAX_FILE_LEN, &content) < 0= ) { @@ -130,8 +126,7 @@ profile_status_file(const char *str) int rc =3D -1; int len; =20 - if (virAsprintf(&profile, "%s/%s", APPARMOR_DIR "/libvirt", str) =3D= =3D -1) - return rc; + virAsprintf(&profile, "%s/%s", APPARMOR_DIR "/libvirt", str); =20 if (!virFileExists(profile)) goto failed; @@ -143,8 +138,7 @@ profile_status_file(const char *str) } =20 /* create string that is ' flags=3D(complain)\0' */ - if (virAsprintf(&tmp, " %s flags=3D(complain)", str) =3D=3D -1) - goto failed; + virAsprintf(&tmp, " %s flags=3D(complain)", str); =20 if (strstr(content, tmp) !=3D NULL) rc =3D 0; @@ -227,8 +221,7 @@ get_profile_name(virDomainDefPtr def) char *name =3D NULL; =20 virUUIDFormat(def->uuid, uuidstr); - if (virAsprintf(&name, "%s%s", AA_PREFIX, uuidstr) < 0) - return NULL; + virAsprintf(&name, "%s%s", AA_PREFIX, uuidstr); =20 return name; } @@ -360,13 +353,8 @@ AppArmorSecurityManagerProbe(const char *virtDriver G_= GNUC_UNUSED) return rc; =20 /* see if template file exists */ - if (virAsprintf(&template_qemu, "%s/TEMPLATE.qemu", - APPARMOR_DIR "/libvirt") =3D=3D -1) - return rc; - - if (virAsprintf(&template_lxc, "%s/TEMPLATE.lxc", - APPARMOR_DIR "/libvirt") =3D=3D -1) - goto cleanup; + virAsprintf(&template_qemu, "%s/TEMPLATE.qemu", APPARMOR_DIR "/libvirt= "); + virAsprintf(&template_lxc, "%s/TEMPLATE.lxc", APPARMOR_DIR "/libvirt"); =20 if (!virFileExists(template_qemu)) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -1038,9 +1026,8 @@ AppArmorSetChardevLabel(virSecurityManagerPtr mgr, break; =20 case VIR_DOMAIN_CHR_TYPE_PIPE: - if (virAsprintf(&in, "%s.in", dev_source->data.file.path) < 0 || - virAsprintf(&out, "%s.out", dev_source->data.file.path) < 0) - goto done; + virAsprintf(&in, "%s.in", dev_source->data.file.path); + virAsprintf(&out, "%s.out", dev_source->data.file.path); if (virFileExists(in)) { if (reload_profile(mgr, def, in, true) < 0) goto done; @@ -1104,8 +1091,7 @@ AppArmorSetPathLabel(virSecurityManagerPtr mgr, char *full_path =3D NULL; =20 if (allowSubtree) { - if (virAsprintf(&full_path, "%s/{,**}", path) < 0) - return -1; + virAsprintf(&full_path, "%s/{,**}", path); rc =3D reload_profile(mgr, def, full_path, true); VIR_FREE(full_path); } else { @@ -1128,7 +1114,6 @@ AppArmorSetFDLabel(virSecurityManagerPtr mgr, virDomainDefPtr def, int fd) { - int rc =3D -1; char *proc =3D NULL; char *fd_path =3D NULL; =20 @@ -1138,8 +1123,7 @@ AppArmorSetFDLabel(virSecurityManagerPtr mgr, if (!secdef || !secdef->imagelabel) return 0; =20 - if (virAsprintf(&proc, "/proc/self/fd/%d", fd) =3D=3D -1) - return rc; + virAsprintf(&proc, "/proc/self/fd/%d", fd); =20 if (virFileResolveLink(proc, &fd_path) < 0) { /* it's a deleted file, presumably. Ignore? */ diff --git a/src/security/security_dac.c b/src/security/security_dac.c index 4f646bc3b7..dfa402d544 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -302,10 +302,8 @@ virSecurityDACSetUserAndGroup(virSecurityManagerPtr mg= r, priv->user =3D user; priv->group =3D group; =20 - if (virAsprintf(&priv->baselabel, "+%u:+%u", - (unsigned int)user, - (unsigned int)group) < 0) - return -1; + virAsprintf(&priv->baselabel, "+%u:+%u", (unsigned int)user, + (unsigned int)group); =20 return 0; } @@ -439,10 +437,7 @@ virSecurityDACRememberLabel(virSecurityDACDataPtr priv= G_GNUC_UNUSED, char *label =3D NULL; int ret =3D -1; =20 - if (virAsprintf(&label, "+%u:+%u", - (unsigned int)uid, - (unsigned int)gid) < 0) - return -1; + virAsprintf(&label, "+%u:+%u", (unsigned int)uid, (unsigned int)gid); =20 ret =3D virSecuritySetRememberedLabel(SECURITY_DAC_NAME, path, label); VIR_FREE(label); @@ -1512,9 +1507,8 @@ virSecurityDACSetChardevLabelHelper(virSecurityManage= rPtr mgr, break; =20 case VIR_DOMAIN_CHR_TYPE_PIPE: - if (virAsprintf(&in, "%s.in", dev_source->data.file.path) < 0 || - virAsprintf(&out, "%s.out", dev_source->data.file.path) < 0) - goto done; + virAsprintf(&in, "%s.in", dev_source->data.file.path); + virAsprintf(&out, "%s.out", dev_source->data.file.path); if (virFileExists(in) && virFileExists(out)) { if (virSecurityDACSetOwnership(mgr, NULL, in, user, group, rem= ember) < 0 || virSecurityDACSetOwnership(mgr, NULL, out, user, group, re= member) < 0) @@ -1605,9 +1599,8 @@ virSecurityDACRestoreChardevLabelHelper(virSecurityMa= nagerPtr mgr, break; =20 case VIR_DOMAIN_CHR_TYPE_PIPE: - if (virAsprintf(&out, "%s.out", dev_source->data.file.path) < 0 || - virAsprintf(&in, "%s.in", dev_source->data.file.path) < 0) - goto done; + virAsprintf(&out, "%s.out", dev_source->data.file.path); + virAsprintf(&in, "%s.in", dev_source->data.file.path); if (virFileExists(in) && virFileExists(out)) { if (virSecurityDACRestoreFileLabelInternal(mgr, NULL, out, rec= all) < 0 || virSecurityDACRestoreFileLabelInternal(mgr, NULL, in, reca= ll) < 0) @@ -2288,10 +2281,8 @@ virSecurityDACGenLabel(virSecurityManagerPtr mgr, } break; case VIR_DOMAIN_SECLABEL_DYNAMIC: - if (virAsprintf(&seclabel->label, "+%u:+%u", - (unsigned int)priv->user, - (unsigned int)priv->group) < 0) - return rc; + virAsprintf(&seclabel->label, "+%u:+%u", (unsigned int)priv->user, + (unsigned int)priv->group); if (seclabel->label =3D=3D NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, _("cannot generate dac user and group id " @@ -2342,8 +2333,7 @@ virSecurityDACGetProcessLabelInternal(pid_t pid, =20 VIR_DEBUG("Getting DAC user and group on process '%d'", pid); =20 - if (virAsprintf(&path, "/proc/%d", (int)pid) < 0) - goto cleanup; + virAsprintf(&path, "/proc/%d", (int)pid); =20 if (lstat(path, &sb) < 0) { virReportSystemError(errno, diff --git a/src/security/security_selinux.c b/src/security/security_selinu= x.c index d80ec01c5d..47fc95351f 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -381,16 +381,14 @@ virSecuritySELinuxMCSFind(virSecurityManagerPtr mgr, VIR_DEBUG("Try cat %s:c%d,c%d", sens, c1 + catMin, c2 + catMin); =20 if (c1 =3D=3D c2) { - if (virAsprintf(&mcs, "%s:c%d", sens, catMin + c1) < 0) - return NULL; + virAsprintf(&mcs, "%s:c%d", sens, catMin + c1); } else { if (c1 > c2) { int t =3D c1; c1 =3D c2; c2 =3D t; } - if (virAsprintf(&mcs, "%s:c%d,c%d", sens, catMin + c1, catMin = + c2) < 0) - return NULL; + virAsprintf(&mcs, "%s:c%d,c%d", sens, catMin + c1, catMin + c2= ); } =20 if (virHashLookup(data->mcs, mcs) =3D=3D NULL) @@ -2204,9 +2202,8 @@ virSecuritySELinuxSetHostdevCapsLabel(virSecurityMana= gerPtr mgr, switch (dev->source.caps.type) { case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_STORAGE: { if (vroot) { - if (virAsprintf(&path, "%s/%s", vroot, - dev->source.caps.u.storage.block) < 0) - return -1; + virAsprintf(&path, "%s/%s", vroot, + dev->source.caps.u.storage.block); } else { path =3D g_strdup(dev->source.caps.u.storage.block); } @@ -2217,9 +2214,8 @@ virSecuritySELinuxSetHostdevCapsLabel(virSecurityMana= gerPtr mgr, =20 case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_MISC: { if (vroot) { - if (virAsprintf(&path, "%s/%s", vroot, - dev->source.caps.u.misc.chardev) < 0) - return -1; + virAsprintf(&path, "%s/%s", vroot, + dev->source.caps.u.misc.chardev); } else { path =3D g_strdup(dev->source.caps.u.misc.chardev); } @@ -2437,9 +2433,8 @@ virSecuritySELinuxRestoreHostdevCapsLabel(virSecurity= ManagerPtr mgr, switch (dev->source.caps.type) { case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_STORAGE: { if (vroot) { - if (virAsprintf(&path, "%s/%s", vroot, - dev->source.caps.u.storage.block) < 0) - return -1; + virAsprintf(&path, "%s/%s", vroot, + dev->source.caps.u.storage.block); } else { path =3D g_strdup(dev->source.caps.u.storage.block); } @@ -2450,9 +2445,8 @@ virSecuritySELinuxRestoreHostdevCapsLabel(virSecurity= ManagerPtr mgr, =20 case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_MISC: { if (vroot) { - if (virAsprintf(&path, "%s/%s", vroot, - dev->source.caps.u.misc.chardev) < 0) - return -1; + virAsprintf(&path, "%s/%s", vroot, + dev->source.caps.u.misc.chardev); } else { path =3D g_strdup(dev->source.caps.u.misc.chardev); } @@ -2550,9 +2544,8 @@ virSecuritySELinuxSetChardevLabel(virSecurityManagerP= tr mgr, break; =20 case VIR_DOMAIN_CHR_TYPE_PIPE: - if ((virAsprintf(&in, "%s.in", dev_source->data.file.path) < 0) || - (virAsprintf(&out, "%s.out", dev_source->data.file.path) < 0)) - goto done; + virAsprintf(&in, "%s.in", dev_source->data.file.path); + virAsprintf(&out, "%s.out", dev_source->data.file.path); if (virFileExists(in) && virFileExists(out)) { if ((virSecuritySELinuxSetFilecon(mgr, in, imagelabel, true) <= 0) || (virSecuritySELinuxSetFilecon(mgr, out, imagelabel, true) = < 0)) { @@ -2625,9 +2618,8 @@ virSecuritySELinuxRestoreChardevLabel(virSecurityMana= gerPtr mgr, break; =20 case VIR_DOMAIN_CHR_TYPE_PIPE: - if ((virAsprintf(&out, "%s.out", dev_source->data.file.path) < 0) = || - (virAsprintf(&in, "%s.in", dev_source->data.file.path) < 0)) - goto done; + virAsprintf(&out, "%s.out", dev_source->data.file.path); + virAsprintf(&in, "%s.in", dev_source->data.file.path); if (virFileExists(in) && virFileExists(out)) { if ((virSecuritySELinuxRestoreFileLabel(mgr, out, true) < 0) || (virSecuritySELinuxRestoreFileLabel(mgr, in, true) < 0)) { @@ -3265,8 +3257,7 @@ virSecuritySELinuxSetTapFDLabel(virSecurityManagerPtr= mgr, } =20 /* Label /dev/tap.* devices only. Leave /dev/net/tun alone! */ - if (virAsprintf(&proc, "/proc/self/fd/%d", fd) =3D=3D -1) - goto cleanup; + virAsprintf(&proc, "/proc/self/fd/%d", fd); =20 if (virFileResolveLink(proc, &fd_path) < 0) { virReportSystemError(errno, @@ -3349,11 +3340,11 @@ virSecuritySELinuxGetSecurityMountOptions(virSecuri= tyManagerPtr mgr, if (!secdef->imagelabel) secdef->imagelabel =3D virSecuritySELinuxGenImageLabel(mgr, de= f); =20 - if (secdef->imagelabel && + if (secdef->imagelabel) { virAsprintf(&opts, ",context=3D\"%s\"", - (const char*) secdef->imagelabel) < 0) - return NULL; + (const char*) secdef->imagelabel); + } } =20 if (!opts) @@ -3411,10 +3402,7 @@ virSecuritySELinuxSetFileLabels(virSecurityManagerPt= r mgr, return -1; =20 while ((ret =3D virDirRead(dir, &ent, path)) > 0) { - if (virAsprintf(&filename, "%s/%s", path, ent->d_name) < 0) { - ret =3D -1; - break; - } + virAsprintf(&filename, "%s/%s", path, ent->d_name); ret =3D virSecuritySELinuxSetFilecon(mgr, filename, seclabel->imagelabel, true); VIR_FREE(filename); @@ -3460,10 +3448,7 @@ virSecuritySELinuxRestoreFileLabels(virSecurityManag= erPtr mgr, return -1; =20 while ((ret =3D virDirRead(dir, &ent, path)) > 0) { - if (virAsprintf(&filename, "%s/%s", path, ent->d_name) < 0) { - ret =3D -1; - break; - } + virAsprintf(&filename, "%s/%s", path, ent->d_name); ret =3D virSecuritySELinuxRestoreFileLabel(mgr, filename, true); VIR_FREE(filename); if (ret < 0) diff --git a/src/security/security_util.c b/src/security/security_util.c index e6fbae7e34..5fb0a3aae5 100644 --- a/src/security/security_util.c +++ b/src/security/security_util.c @@ -63,7 +63,7 @@ virSecurityGetAttrName(const char *name G_GNUC_UNUSED) { char *ret =3D NULL; #ifdef XATTR_NAMESPACE - ignore_value(virAsprintf(&ret, XATTR_NAMESPACE".libvirt.security.%s", = name)); + virAsprintf(&ret, XATTR_NAMESPACE".libvirt.security.%s", name); #else errno =3D ENOSYS; virReportSystemError(errno, "%s", @@ -78,7 +78,7 @@ virSecurityGetRefCountAttrName(const char *name G_GNUC_UN= USED) { char *ret =3D NULL; #ifdef XATTR_NAMESPACE - ignore_value(virAsprintf(&ret, XATTR_NAMESPACE".libvirt.security.ref_%= s", name)); + virAsprintf(&ret, XATTR_NAMESPACE".libvirt.security.ref_%s", name); #else errno =3D ENOSYS; virReportSystemError(errno, "%s", @@ -93,7 +93,7 @@ static char * virSecurityGetTimestampAttrName(const char *name) { char *ret =3D NULL; - ignore_value(virAsprintf(&ret, XATTR_NAMESPACE ".libvirt.security.time= stamp_%s", name)); + virAsprintf(&ret, XATTR_NAMESPACE ".libvirt.security.timestamp_%s", na= me); return ret; } #else /* !XATTR_NAMESPACE */ @@ -120,7 +120,7 @@ virSecurityGetTimestamp(void) return NULL; } =20 - ignore_value(virAsprintf(&ret, "%llu", boottime)); + virAsprintf(&ret, "%llu", boottime); return ret; } =20 @@ -312,8 +312,7 @@ virSecurityGetRememberedLabel(const char *name, refcount--; =20 if (refcount > 0) { - if (virAsprintf(&value, "%u", refcount) < 0) - return -1; + virAsprintf(&value, "%u", refcount); =20 if (virFileSetXAttr(path, ref_name, value) < 0) return -1; @@ -420,8 +419,7 @@ virSecuritySetRememberedLabel(const char *name, return -1; } =20 - if (virAsprintf(&value, "%u", refcount) < 0) - return -1; + virAsprintf(&value, "%u", refcount); =20 if (virFileSetXAttr(path, ref_name, value) < 0) return -1; diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 7d7262ca39..3fe2da22ef 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -157,11 +157,7 @@ parserCommand(const char *profile_name, const char cmd) =20 snprintf(flag, 3, "-%c", cmd); =20 - if (virAsprintfQuiet(&profile, "%s/%s", - APPARMOR_DIR "/libvirt", profile_name) < 0) { - vah_error(NULL, 0, _("profile name exceeds maximum length")); - return -1; - } + virAsprintfQuiet(&profile, "%s/%s", APPARMOR_DIR "/libvirt", profile_n= ame); =20 if (!virFileExists(profile)) { vah_error(NULL, 0, _("profile does not exist")); @@ -217,17 +213,10 @@ update_include_file(const char *include_file, const c= har *included_files, return rc; } =20 - if (append && virFileExists(include_file)) { - if (virAsprintfQuiet(&pcontent, "%s%s", existing, included_files) = =3D=3D -1) { - vah_error(NULL, 0, _("could not allocate memory for profile")); - goto cleanup; - } - } else { - if (virAsprintfQuiet(&pcontent, "%s%s", warning, included_files) = =3D=3D -1) { - vah_error(NULL, 0, _("could not allocate memory for profile")); - goto cleanup; - } - } + if (append && virFileExists(include_file)) + virAsprintfQuiet(&pcontent, "%s%s", existing, included_files); + else + virAsprintfQuiet(&pcontent, "%s%s", warning, included_files); =20 plen =3D strlen(pcontent); if (plen > MAX_FILE_LEN) { @@ -301,11 +290,8 @@ create_profile(const char *profile, const char *profil= e_name, driver_name =3D virDomainVirtTypeToString(virtType); } =20 - if (virAsprintfQuiet(&template, "%s/TEMPLATE.%s", APPARMOR_DIR "/libvi= rt", - driver_name) < 0) { - vah_error(NULL, 0, _("template name exceeds maximum length")); - goto end; - } + virAsprintfQuiet(&template, "%s/TEMPLATE.%s", APPARMOR_DIR "/libvirt", + driver_name); =20 if (!virFileExists(template)) { vah_error(NULL, 0, _("template does not exist")); @@ -328,18 +314,11 @@ create_profile(const char *profile, const char *profi= le_name, } =20 /* '\nprofile \0' */ - if (virAsprintfQuiet(&replace_name, "\nprofile %s", profile_name) =3D= =3D -1) { - vah_error(NULL, 0, _("could not allocate memory for profile name")= ); - goto clean_tcontent; - } + virAsprintfQuiet(&replace_name, "\nprofile %s", profile_name); =20 /* '\n\n}\0' */ - if ((virtType !=3D VIR_DOMAIN_VIRT_LXC) && - virAsprintfQuiet(&replace_files, "\n%s\n}", profile_files) =3D= =3D -1) { - vah_error(NULL, 0, _("could not allocate memory for profile files"= )); - VIR_FREE(replace_name); - goto clean_tcontent; - } + if (virtType !=3D VIR_DOMAIN_VIRT_LXC) + virAsprintfQuiet(&replace_files, "\n%s\n}", profile_files); =20 plen =3D tlen + strlen(replace_name) - strlen(template_name) + 1; =20 @@ -790,8 +769,7 @@ vah_add_path(virBufferPtr buf, const char *path, const = char *perms, bool recursi vah_error(NULL, 0, _("could not find realpath")); goto cleanup; } - if (virAsprintfQuiet(&tmp, "%s%s", pathreal, pathtmp) < 0) - goto cleanup; + virAsprintfQuiet(&tmp, "%s%s", pathreal, pathtmp); } =20 perms_new =3D g_strdup(perms); @@ -858,19 +836,13 @@ vah_add_file_chardev(virBufferPtr buf, =20 if (type =3D=3D VIR_DOMAIN_CHR_TYPE_PIPE) { /* add the pipe input */ - if (virAsprintfQuiet(&pipe_in, "%s.in", path) =3D=3D -1) { - vah_error(NULL, 0, _("could not allocate memory")); - goto cleanup; - } + virAsprintfQuiet(&pipe_in, "%s.in", path); =20 if (vah_add_file(buf, pipe_in, perms) !=3D 0) goto clean_pipe_in; =20 /* add the pipe output */ - if (virAsprintfQuiet(&pipe_out, "%s.out", path) =3D=3D -1) { - vah_error(NULL, 0, _("could not allocate memory")); - goto clean_pipe_in; - } + virAsprintfQuiet(&pipe_out, "%s.out", path); =20 if (vah_add_file(buf, pipe_out, perms) !=3D 0) goto clean_pipe_out; @@ -963,10 +935,7 @@ get_files(vahControl * ctl) =20 /* verify uuid is same as what we were given on the command line */ virUUIDFormat(ctl->def->uuid, uuidstr); - if (virAsprintfQuiet(&uuid, "%s%s", AA_PREFIX, uuidstr) =3D=3D -1) { - vah_error(ctl, 0, _("could not allocate memory")); - return rc; - } + virAsprintfQuiet(&uuid, "%s%s", AA_PREFIX, uuidstr); =20 if (STRNEQ(uuid, ctl->uuid)) { vah_error(ctl, 0, _("given uuid does not match XML uuid")); @@ -1463,13 +1432,8 @@ main(int argc, char **argv) if (vahParseArgv(ctl, argc, argv) !=3D 0) vah_error(ctl, 1, _("could not parse arguments")); =20 - if (virAsprintfQuiet(&profile, "%s/%s", - APPARMOR_DIR "/libvirt", ctl->uuid) < 0) - vah_error(ctl, 0, _("could not allocate memory")); - - if (virAsprintfQuiet(&include_file, "%s/%s.files", - APPARMOR_DIR "/libvirt", ctl->uuid) < 0) - vah_error(ctl, 0, _("could not allocate memory")); + virAsprintfQuiet(&profile, "%s/%s", APPARMOR_DIR "/libvirt", ctl->uuid= ); + virAsprintfQuiet(&include_file, "%s/%s.files", APPARMOR_DIR "/libvirt"= , ctl->uuid); =20 if (ctl->cmd =3D=3D 'a') { rc =3D parserLoad(ctl->uuid); @@ -1531,11 +1495,7 @@ main(int argc, char **argv) /* create the profile from TEMPLATE */ if (ctl->cmd =3D=3D 'c') { char *tmp =3D NULL; - if (virAsprintfQuiet(&tmp, " #include \n", - ctl->uuid) =3D=3D -1) { - vah_error(ctl, 0, _("could not allocate memory")); - goto cleanup; - } + virAsprintfQuiet(&tmp, " #include \n", ctl-= >uuid); =20 if (ctl->dryrun) { vah_info(profile); --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752750; cv=none; d=zoho.com; s=zohoarc; b=XRchw3gjlI/bzlwCsdVgW7YAyecLtz4F+6i9eMefFFuFGtP8fbIQ6DNnlYq2U7EBSn2TuOCIJoSuKzE8wCxPqTBgvJCICqbizj4ezQb9w4/Ap2RU+j0zGwxq5OUQhh97yM7oTKx/gJw9TOX6yVuTJv1JRavD5NVQpMbfEaltnLA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752750; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UtA9fz/0EVTeqA2+WJrYcvxCkWs3U6QwH6eack7jv04=; b=DhYea7B8PwszodxREXQNy4lWVl5YzNg8AwiG/C8i/QzKaS56yUFhFP0JaFupnUIGutXgBR54IfWx9sQ5gZXB5jQLHM72d+/Y6cFdSILlucZwWMp8AnXlKAGcVtTsFTcZw/7/VU0PHMFNTq9BPTD7vy6oMD0Mki/4dpBCic103VE= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1571752750749700.595389704118; Tue, 22 Oct 2019 06:59:10 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-373-ihEvGZmSNdauZZ3w1P1m-A-1; Tue, 22 Oct 2019 09:59:07 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 73188608; Tue, 22 Oct 2019 13:59:00 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 462FE60C63; Tue, 22 Oct 2019 13:59:00 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id BB1ED180BAA9; Tue, 22 Oct 2019 13:58:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9MDwwwa001783 for ; Tue, 22 Oct 2019 09:58:58 -0400 Received: by smtp.corp.redhat.com (Postfix) id 76029601AC; Tue, 22 Oct 2019 13:58:58 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id F21206012D for ; Tue, 22 Oct 2019 13:58:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752749; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=UtA9fz/0EVTeqA2+WJrYcvxCkWs3U6QwH6eack7jv04=; b=TBJkFoh6xLQKOB/fM2XdhdmkObSzCjDNxCQx/znjDM/Qmxkj1/YuYpa2ZjcWX25xn3dobk Vne1n9UFGsEWS0/JKLzCuaS56q49wXLrQPeFrX5w3RiQuyevxEhppNjQz12/ctXAVxY+qq UvB47SNHYQaEulrFfOWA/AuMwYTuyOU= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:27 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 23/75] storage: Drop virAsprintf() and virAsprintfQuiet() retval checking X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: ihEvGZmSNdauZZ3w1P1m-A-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" These functions can't fail really. Drop checking of their retval then. Signed-off-by: Michal Privoznik --- src/storage/storage_backend_disk.c | 7 +- src/storage/storage_backend_gluster.c | 16 +--- src/storage/storage_backend_iscsi.c | 17 ++--- src/storage/storage_backend_iscsi_direct.c | 31 ++++---- src/storage/storage_backend_logical.c | 16 ++-- src/storage/storage_backend_mpath.c | 9 +-- src/storage/storage_backend_rbd.c | 16 +--- src/storage/storage_backend_scsi.c | 11 +-- src/storage/storage_backend_sheepdog.c | 7 +- src/storage/storage_backend_vstorage.c | 6 +- src/storage/storage_backend_zfs.c | 13 +--- src/storage/storage_driver.c | 17 ++--- src/storage/storage_file_gluster.c | 10 +-- src/storage/storage_util.c | 87 +++++++--------------- 14 files changed, 90 insertions(+), 173 deletions(-) diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backe= nd_disk.c index f37bcd2b15..d4bd526c14 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -605,17 +605,14 @@ virStorageBackendDiskPartFormat(virStoragePoolObjPtr = pool, /* XXX Only support one extended partition */ switch (virStorageBackendDiskPartTypeToCreate(pool)) { case VIR_STORAGE_VOL_DISK_TYPE_PRIMARY: - if (virAsprintf(partFormat, "primary %s", partedFormat) < = 0) - return -1; + virAsprintf(partFormat, "primary %s", partedFormat); break; case VIR_STORAGE_VOL_DISK_TYPE_LOGICAL: /* make sure we have an extended partition */ if (virStoragePoolObjSearchVolume(pool, virStorageVolPartFindExt= ended, NULL)) { - if (virAsprintf(partFormat, "logical %s", - partedFormat) < 0) - return -1; + virAsprintf(partFormat, "logical %s", partedFormat); } else { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("no extended partition found and no " diff --git a/src/storage/storage_backend_gluster.c b/src/storage/storage_ba= ckend_gluster.c index 69de95a9ed..0022ed2f21 100644 --- a/src/storage/storage_backend_gluster.c +++ b/src/storage/storage_backend_gluster.c @@ -101,9 +101,7 @@ virStorageBackendGlusterOpen(virStoragePoolObjPtr pool) return NULL; =20 ret->volname =3D g_strdup(name); - if (virAsprintf(&ret->dir, "%s%s", dir ? dir : "/", - trailing_slash ? "" : "/") < 0) - goto error; + virAsprintf(&ret->dir, "%s%s", dir ? dir : "/", trailing_slash ? "" : = "/"); =20 /* FIXME: Currently hard-coded to tcp transport; XML needs to be * extended to allow alternate transport */ @@ -111,8 +109,7 @@ virStorageBackendGlusterOpen(virStoragePoolObjPtr pool) goto error; ret->uri->scheme =3D g_strdup("gluster"); ret->uri->server =3D g_strdup(def->source.hosts[0].name); - if (virAsprintf(&ret->uri->path, "/%s%s", ret->volname, ret->dir) < 0) - goto error; + virAsprintf(&ret->uri->path, "/%s%s", ret->volname, ret->dir); ret->uri->port =3D def->source.hosts[0].port; =20 /* Actually connect to glfs */ @@ -196,15 +193,10 @@ virStorageBackendGlusterSetMetadata(virStorageBackend= GlusterStatePtr state, vol->name =3D g_strdup(name); } =20 - if (virAsprintf(&path, "%s%s%s", state->volname, state->dir, - vol->name) < 0) - return -1; + virAsprintf(&path, "%s%s%s", state->volname, state->dir, vol->name); =20 tmp =3D state->uri->path; - if (virAsprintf(&state->uri->path, "/%s", path) < 0) { - state->uri->path =3D tmp; - return -1; - } + virAsprintf(&state->uri->path, "/%s", path); if (!(vol->target.path =3D virURIFormat(state->uri))) { VIR_FREE(state->uri->path); state->uri->path =3D tmp; diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_back= end_iscsi.c index b11d1d6622..b61abb7cbd 100644 --- a/src/storage/storage_backend_iscsi.c +++ b/src/storage/storage_backend_iscsi.c @@ -63,13 +63,13 @@ virStorageBackendISCSIPortal(virStoragePoolSourcePtr so= urce) source->hosts[0].port =3D ISCSI_DEFAULT_TARGET_PORT; =20 if (strchr(source->hosts[0].name, ':')) { - ignore_value(virAsprintf(&portal, "[%s]:%d,1", - source->hosts[0].name, - source->hosts[0].port)); + virAsprintf(&portal, "[%s]:%d,1", + source->hosts[0].name, + source->hosts[0].port); } else { - ignore_value(virAsprintf(&portal, "%s:%d,1", - source->hosts[0].name, - source->hosts[0].port)); + virAsprintf(&portal, "%s:%d,1", + source->hosts[0].name, + source->hosts[0].port); } =20 return portal; @@ -133,9 +133,8 @@ virStorageBackendISCSIFindLUs(virStoragePoolObjPtr pool, uint32_t host; g_autofree char *sysfs_path =3D NULL; =20 - if (virAsprintf(&sysfs_path, - "/sys/class/iscsi_session/session%s/device", session) = < 0) - return -1; + virAsprintf(&sysfs_path, "/sys/class/iscsi_session/session%s/device", + session); =20 if (virStorageBackendISCSIGetHostNumber(sysfs_path, &host) < 0) return -1; diff --git a/src/storage/storage_backend_iscsi_direct.c b/src/storage/stora= ge_backend_iscsi_direct.c index e8bf42d0d0..f0b27451f0 100644 --- a/src/storage/storage_backend_iscsi_direct.c +++ b/src/storage/storage_backend_iscsi_direct.c @@ -68,17 +68,17 @@ virStorageBackendISCSIDirectPortal(virStoragePoolSource= Ptr source) return NULL; } if (source->hosts[0].port =3D=3D 0) { - ignore_value(virAsprintf(&portal, "%s:%d", - source->hosts[0].name, - ISCSI_DEFAULT_TARGET_PORT)); + virAsprintf(&portal, "%s:%d", + source->hosts[0].name, + ISCSI_DEFAULT_TARGET_PORT); } else if (strchr(source->hosts[0].name, ':')) { - ignore_value(virAsprintf(&portal, "[%s]:%d", - source->hosts[0].name, - source->hosts[0].port)); + virAsprintf(&portal, "[%s]:%d", + source->hosts[0].name, + source->hosts[0].port); } else { - ignore_value(virAsprintf(&portal, "%s:%d", - source->hosts[0].name, - source->hosts[0].port)); + virAsprintf(&portal, "%s:%d", + source->hosts[0].name, + source->hosts[0].port); } return portal; } @@ -230,14 +230,11 @@ virISCSIDirectSetVolumeAttributes(virStoragePoolObjPt= r pool, { virStoragePoolDefPtr def =3D virStoragePoolObjGetDef(pool); =20 - if (virAsprintf(&vol->name, "%s%u", VOL_NAME_PREFIX, lun) < 0) - return -1; - if (virAsprintf(&vol->key, "ip-%s-iscsi-%s-lun-%u", portal, - def->source.devices[0].path, lun) < 0) - return -1; - if (virAsprintf(&vol->target.path, "ip-%s-iscsi-%s-lun-%u", portal, - def->source.devices[0].path, lun) < 0) - return -1; + virAsprintf(&vol->name, "%s%u", VOL_NAME_PREFIX, lun); + virAsprintf(&vol->key, "ip-%s-iscsi-%s-lun-%u", portal, + def->source.devices[0].path, lun); + virAsprintf(&vol->target.path, "ip-%s-iscsi-%s-lun-%u", portal, + def->source.devices[0].path, lun); return 0; } =20 diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_ba= ckend_logical.c index 208ca0792f..4a5d61e57d 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -290,11 +290,8 @@ virStorageBackendLogicalMakeVol(char **const groups, =20 } =20 - if (vol->target.path =3D=3D NULL) { - if (virAsprintf(&vol->target.path, "%s/%s", - def->target.path, vol->name) < 0) - goto cleanup; - } + if (vol->target.path =3D=3D NULL) + virAsprintf(&vol->target.path, "%s/%s", def->target.path, vol->nam= e); =20 /* Mark the (s) sparse/snapshot lv, e.g. the lv created using * the --virtualsize/-V option. We've already ignored the (t)hin @@ -316,9 +313,8 @@ virStorageBackendLogicalMakeVol(char **const groups, if (!(vol->target.backingStore =3D virStorageSourceNew())) goto cleanup; =20 - if (virAsprintf(&vol->target.backingStore->path, "%s/%s", - def->target.path, groups[1]) < 0) - goto cleanup; + virAsprintf(&vol->target.backingStore->path, "%s/%s", + def->target.path, groups[1]); =20 vol->target.backingStore->format =3D VIR_STORAGE_POOL_LOGICAL_LVM2; vol->target.backingStore->type =3D VIR_STORAGE_TYPE_BLOCK; @@ -916,9 +912,7 @@ virStorageBackendLogicalCreateVol(virStoragePoolObjPtr = pool, vol->type =3D VIR_STORAGE_VOL_BLOCK; =20 VIR_FREE(vol->target.path); - if (virAsprintf(&vol->target.path, "%s/%s", - def->target.path, vol->name) < 0) - return -1; + virAsprintf(&vol->target.path, "%s/%s", def->target.path, vol->name); =20 if (virStorageBackendLogicalLVCreate(vol, def) < 0) return -1; diff --git a/src/storage/storage_backend_mpath.c b/src/storage/storage_back= end_mpath.c index fd3ee76371..6912977657 100644 --- a/src/storage/storage_backend_mpath.c +++ b/src/storage/storage_backend_mpath.c @@ -53,11 +53,9 @@ virStorageBackendMpathNewVol(virStoragePoolObjPtr pool, =20 vol->type =3D VIR_STORAGE_VOL_BLOCK; =20 - if (virAsprintf(&(vol->name), "dm-%u", devnum) < 0) - return -1; + virAsprintf(&(vol->name), "dm-%u", devnum); =20 - if (virAsprintf(&vol->target.path, "/dev/%s", dev) < 0) - return -1; + virAsprintf(&vol->target.path, "/dev/%s", dev); =20 if (virStorageBackendUpdateVolInfo(vol, true, VIR_STORAGE_VOL_OPEN_DEFAULT, 0) < = 0) { @@ -165,8 +163,7 @@ virStorageBackendCreateVols(virStoragePoolObjPtr pool, =20 if (is_mpath =3D=3D 1) { =20 - if (virAsprintf(&map_device, "mapper/%s", names->name) < 0) - return -1; + virAsprintf(&map_device, "mapper/%s", names->name); =20 if (virStorageBackendGetMinorNumber(names->name, &minor) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backen= d_rbd.c index 1c59c18b0d..491b85e0e0 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -570,14 +570,10 @@ volStorageBackendRBDRefreshVolInfo(virStorageVolDefPt= r vol, vol->target.allocation, info.obj_size, info.num_objs); =20 VIR_FREE(vol->target.path); - if (virAsprintf(&vol->target.path, "%s/%s", - def->source.name, vol->name) < 0) - goto cleanup; + virAsprintf(&vol->target.path, "%s/%s", def->source.name, vol->name); =20 VIR_FREE(vol->key); - if (virAsprintf(&vol->key, "%s/%s", - def->source.name, vol->name) < 0) - goto cleanup; + virAsprintf(&vol->key, "%s/%s", def->source.name, vol->name); =20 ret =3D 0; =20 @@ -895,14 +891,10 @@ virStorageBackendRBDCreateVol(virStoragePoolObjPtr po= ol, } =20 VIR_FREE(vol->target.path); - if (virAsprintf(&vol->target.path, "%s/%s", - def->source.name, vol->name) < 0) - return -1; + virAsprintf(&vol->target.path, "%s/%s", def->source.name, vol->name); =20 VIR_FREE(vol->key); - if (virAsprintf(&vol->key, "%s/%s", - def->source.name, vol->name) < 0) - return -1; + virAsprintf(&vol->key, "%s/%s", def->source.name, vol->name); =20 return 0; } diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backe= nd_scsi.c index 98d9d92ac5..80965bc349 100644 --- a/src/storage/storage_backend_scsi.c +++ b/src/storage/storage_backend_scsi.c @@ -60,9 +60,7 @@ virStorageBackendSCSITriggerRescan(uint32_t host) =20 VIR_DEBUG("Triggering rescan of host %d", host); =20 - if (virAsprintf(&path, "%s/host%u/scan", - LINUX_SYSFS_SCSI_HOST_PREFIX, host) < 0) - return -1; + virAsprintf(&path, "%s/host%u/scan", LINUX_SYSFS_SCSI_HOST_PREFIX, hos= t); =20 VIR_DEBUG("Scan trigger path is '%s'", path); =20 @@ -261,8 +259,7 @@ checkParent(const char *name, goto cleanup; } =20 - if (virAsprintf(&scsi_host_name, "scsi_%s", name) < 0) - goto cleanup; + virAsprintf(&scsi_host_name, "scsi_%s", name); =20 if (!(vhba_parent =3D virNodeDeviceGetParentName(conn, scsi_host_name)= )) goto cleanup; @@ -376,9 +373,7 @@ virStorageBackendSCSICheckPool(virStoragePoolObjPtr poo= l, if (virSCSIHostGetNumber(name, &host) < 0) return -1; =20 - if (virAsprintf(&path, "%s/host%d", - LINUX_SYSFS_SCSI_HOST_PREFIX, host) < 0) - return -1; + virAsprintf(&path, "%s/host%d", LINUX_SYSFS_SCSI_HOST_PREFIX, host); =20 *isActive =3D virFileExists(path); =20 diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_b= ackend_sheepdog.c index e481eea816..ff13d2d9bd 100644 --- a/src/storage/storage_backend_sheepdog.c +++ b/src/storage/storage_backend_sheepdog.c @@ -226,9 +226,7 @@ virStorageBackendSheepdogCreateVol(virStoragePoolObjPtr= pool, vol->type =3D VIR_STORAGE_VOL_NETWORK; =20 VIR_FREE(vol->key); - if (virAsprintf(&vol->key, "%s/%s", - def->source.name, vol->name) < 0) - return -1; + virAsprintf(&vol->key, "%s/%s", def->source.name, vol->name); =20 VIR_FREE(vol->target.path); vol->target.path =3D g_strdup(vol->name); @@ -340,8 +338,7 @@ virStorageBackendSheepdogRefreshVol(virStoragePoolObjPt= r pool, vol->type =3D VIR_STORAGE_VOL_NETWORK; =20 VIR_FREE(vol->key); - if (virAsprintf(&vol->key, "%s/%s", def->source.name, vol->name) < 0) - return -1; + virAsprintf(&vol->key, "%s/%s", def->source.name, vol->name); =20 VIR_FREE(vol->target.path); vol->target.path =3D g_strdup(vol->name); diff --git a/src/storage/storage_backend_vstorage.c b/src/storage/storage_b= ackend_vstorage.c index 8a4023014d..9a34d87ec3 100644 --- a/src/storage/storage_backend_vstorage.c +++ b/src/storage/storage_backend_vstorage.c @@ -61,8 +61,7 @@ virStorageBackendVzPoolStart(virStoragePoolObjPtr pool) if (!(usr_name =3D virGetUserName(def->target.perms.uid))) return -1; =20 - if (virAsprintf(&mode, "%o", def->target.perms.mode) < 0) - return -1; + virAsprintf(&mode, "%o", def->target.perms.mode); =20 cmd =3D virCommandNewArgList(VSTORAGE_MOUNT, "-c", def->source.name, @@ -91,8 +90,7 @@ virStorageBackendVzIsMounted(virStoragePoolObjPtr pool) char buf[1024]; g_autofree char *cluster =3D NULL; =20 - if (virAsprintf(&cluster, "vstorage://%s", def->source.name) < 0) - return -1; + virAsprintf(&cluster, "vstorage://%s", def->source.name); =20 if ((mtab =3D fopen(_PATH_MOUNTED, "r")) =3D=3D NULL) { virReportSystemError(errno, diff --git a/src/storage/storage_backend_zfs.c b/src/storage/storage_backen= d_zfs.c index c3057fede6..793eb06f5c 100644 --- a/src/storage/storage_backend_zfs.c +++ b/src/storage/storage_backend_zfs.c @@ -87,9 +87,7 @@ virStorageBackendZFSCheckPool(virStoragePoolObjPtr pool G= _GNUC_UNUSED, virStoragePoolDefPtr def =3D virStoragePoolObjGetDef(pool); g_autofree char *devpath =3D NULL; =20 - if (virAsprintf(&devpath, "/dev/zvol/%s", - def->source.name) < 0) - return -1; + virAsprintf(&devpath, "/dev/zvol/%s", def->source.name); *isActive =3D virFileIsDir(devpath); =20 return 0; @@ -139,9 +137,8 @@ virStorageBackendZFSParseVol(virStoragePoolObjPtr pool, volume->key =3D g_strdup(tokens[0]); =20 if (volume->target.path =3D=3D NULL) { - if (virAsprintf(&volume->target.path, "%s/%s", - def->target.path, volume->name) < 0) - goto cleanup; + virAsprintf(&volume->target.path, "%s/%s", def->target.path, + volume->name); } =20 if (virStrToLong_ull(tokens[1], NULL, 10, &volume->target.capacity) < = 0) { @@ -308,9 +305,7 @@ virStorageBackendZFSCreateVol(virStoragePoolObjPtr pool, vol->type =3D VIR_STORAGE_VOL_BLOCK; =20 VIR_FREE(vol->target.path); - if (virAsprintf(&vol->target.path, "%s/%s", - def->target.path, vol->name) < 0) - return -1; + virAsprintf(&vol->target.path, "%s/%s", def->target.path, vol->name); =20 vol->key =3D g_strdup(vol->target.path); =20 diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 3b8332af01..dfe3dd1354 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -281,13 +281,9 @@ storageStateInitialize(bool privileged, if (!(configdir && rundir)) goto error; =20 - if ((virAsprintf(&driver->configDir, - "%s/storage", configdir) < 0) || - (virAsprintf(&driver->autostartDir, - "%s/storage/autostart", configdir) < 0) || - (virAsprintf(&driver->stateDir, - "%s/storage/run", rundir) < 0)) - goto error; + virAsprintf(&driver->configDir, "%s/storage", configdir); + virAsprintf(&driver->autostartDir, "%s/storage/autostart", configd= ir); + virAsprintf(&driver->stateDir, "%s/storage/run", rundir); } driver->privileged =3D privileged; =20 @@ -2293,8 +2289,7 @@ virStorageBackendPloopRestoreDesc(char *path) g_autofree char *refresh_tool =3D NULL; g_autofree char *desc =3D NULL; =20 - if (virAsprintf(&desc, "%s/DiskDescriptor.xml", path) < 0) - return -1; + virAsprintf(&desc, "%s/DiskDescriptor.xml", path); =20 if (virFileRemove(desc, 0, 0) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -2856,8 +2851,8 @@ virStoragePoolObjBuildTempFilePath(virStoragePoolObjP= tr obj, virStoragePoolDefPtr def =3D virStoragePoolObjGetDef(obj); char *tmp =3D NULL; =20 - ignore_value(virAsprintf(&tmp, "%s/%s.%s.secret.XXXXXX", - driver->stateDir, def->name, voldef->name)); + virAsprintf(&tmp, "%s/%s.%s.secret.XXXXXX", + driver->stateDir, def->name, voldef->name); return tmp; } =20 diff --git a/src/storage/storage_file_gluster.c b/src/storage/storage_file_= gluster.c index 28f9962c0c..1577239431 100644 --- a/src/storage/storage_file_gluster.c +++ b/src/storage/storage_file_gluster.c @@ -311,11 +311,11 @@ virStorageFileBackendGlusterGetUniqueIdentifier(virSt= orageSourcePtr src) priv))) return NULL; =20 - ignore_value(virAsprintf(&priv->canonpath, "gluster://%s:%u/%s/%s", - src->hosts->name, - src->hosts->port, - src->volume, - filePath)); + virAsprintf(&priv->canonpath, "gluster://%s:%u/%s/%s", + src->hosts->name, + src->hosts->port, + src->volume, + filePath); =20 return priv->canonpath; } diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index 7b934b61e0..88fb8b5223 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -897,10 +897,8 @@ storageBackendCreateQemuImgSetBacking(virStoragePoolOb= jPtr pool, /* Convert relative backing store paths to absolute paths for access * validation. */ - if ('/' !=3D *(info->backingPath) && - virAsprintf(&absolutePath, "%s/%s", def->target.path, - info->backingPath) < 0) - return -1; + if (*(info->backingPath) !=3D '/') + virAsprintf(&absolutePath, "%s/%s", def->target.path, info->backin= gPath); accessRetCode =3D access(absolutePath ? absolutePath : info->backingPath, R_OK); if (accessRetCode !=3D 0) { @@ -1142,8 +1140,7 @@ virStorageBackendCreateQemuImgCmdFromVol(virStoragePo= olObjPtr pool, _("path to secret data file is required")); goto error; } - if (virAsprintf(&info.secretAlias, "%s_encrypt0", vol->name) < 0) - goto error; + virAsprintf(&info.secretAlias, "%s_encrypt0", vol->name); if (storageBackendCreateQemuImgSecretObject(cmd, secretPath, info.secretAlias) < 0) goto error; @@ -1156,9 +1153,7 @@ virStorageBackendCreateQemuImgCmdFromVol(virStoragePo= olObjPtr pool, _("path to inputvol secret data file is require= d")); goto error; } - if (virAsprintf(&inputSecretAlias, "%s_encrypt0", - inputvol->name) < 0) - goto error; + virAsprintf(&inputSecretAlias, "%s_encrypt0", inputvol->name); if (storageBackendCreateQemuImgSecretObject(cmd, inputSecretPath, inputSecretAlias) < 0) goto error; @@ -1683,12 +1678,10 @@ storageBackendIsPloopDir(char *path) g_autofree char *root =3D NULL; g_autofree char *desc =3D NULL; =20 - if (virAsprintf(&root, "%s/root.hds", path) < 0) - return false; + virAsprintf(&root, "%s/root.hds", path); if (!virFileExists(root)) return false; - if (virAsprintf(&desc, "%s/DiskDescriptor.xml", path) < 0) - return false; + virAsprintf(&desc, "%s/DiskDescriptor.xml", path); if (!virFileExists(desc)) return false; =20 @@ -1706,8 +1699,7 @@ storageBackendRedoPloopUpdate(virStorageSourcePtr tar= get, struct stat *sb, { g_autofree char *path =3D NULL; =20 - if (virAsprintf(&path, "%s/root.hds", target->path) < 0) - return -1; + virAsprintf(&path, "%s/root.hds", target->path); VIR_FORCE_CLOSE(*fd); if ((*fd =3D virStorageBackendVolOpen(path, sb, flags)) < 0) return -1; @@ -1957,11 +1949,7 @@ virStorageBackendStablePath(virStoragePoolObjPtr poo= l, */ retry: while ((direrr =3D virDirRead(dh, &dent, NULL)) > 0) { - if (virAsprintf(&stablepath, "%s/%s", - def->target.path, dent->d_name) < 0) { - VIR_DIR_CLOSE(dh); - return NULL; - } + virAsprintf(&stablepath, "%s/%s", def->target.path, dent->d_name); =20 if (virFileLinkPointsTo(stablepath, devpath)) { VIR_DIR_CLOSE(dh); @@ -2057,9 +2045,7 @@ virStorageBackendVolCreateLocal(virStoragePoolObjPtr = pool, } =20 VIR_FREE(vol->target.path); - if (virAsprintf(&vol->target.path, "%s/%s", - def->target.path, vol->name) < 0) - return -1; + virAsprintf(&vol->target.path, "%s/%s", def->target.path, vol->name); =20 if (virFileExists(vol->target.path)) { virReportError(VIR_ERR_OPERATION_INVALID, @@ -2296,8 +2282,7 @@ storageBackendResizeQemuImg(virStoragePoolObjPtr pool, storageBackendCreateQemuImgSecretPath(pool, vol))) goto cleanup; =20 - if (virAsprintf(&secretAlias, "%s_encrypt0", vol->name) < 0) - goto cleanup; + virAsprintf(&secretAlias, "%s_encrypt0", vol->name); } =20 /* Round capacity as qemu-img resize errors out on sizes which are not @@ -2434,8 +2419,7 @@ virStorageBackendVolUploadLocal(virStoragePoolObjPtr = pool G_GNUC_UNUSED, return -1; } =20 - if (virAsprintf(&path, "%s/root.hds", vol->target.path) < 0) - return -1; + virAsprintf(&path, "%s/root.hds", vol->target.path); target_path =3D path; } =20 @@ -2469,8 +2453,7 @@ virStorageBackendVolDownloadLocal(virStoragePoolObjPt= r pool G_GNUC_UNUSED, " will be lost")); return -1; } - if (virAsprintf(&path, "%s/root.hds", vol->target.path) < 0) - return -1; + virAsprintf(&path, "%s/root.hds", vol->target.path); target_path =3D path; } =20 @@ -2682,11 +2665,9 @@ storageBackendVolWipePloop(virStorageVolDefPtr vol, return -1; } =20 - if (virAsprintf(&target_path, "%s/root.hds", vol->target.path) < 0) - return -1; + virAsprintf(&target_path, "%s/root.hds", vol->target.path); =20 - if (virAsprintf(&disk_desc, "%s/DiskDescriptor.xml", vol->target.path)= < 0) - return -1; + virAsprintf(&disk_desc, "%s/DiskDescriptor.xml", vol->target.path); =20 if (storageBackendVolWipeLocalFile(target_path, algorithm, vol->target.allocation, false) < 0) @@ -3544,9 +3525,7 @@ virStorageBackendRefreshLocal(virStoragePoolObjPtr po= ol) vol->name =3D g_strdup(ent->d_name); =20 vol->type =3D VIR_STORAGE_VOL_FILE; - if (virAsprintf(&vol->target.path, "%s/%s", - def->target.path, vol->name) < 0) - goto cleanup; + virAsprintf(&vol->target.path, "%s/%s", def->target.path, vol->nam= e); =20 vol->key =3D g_strdup(vol->target.path); =20 @@ -3687,11 +3666,9 @@ virStorageBackendSCSINewLun(virStoragePoolObjPtr poo= l, * in the volume name. We only need uniqueness per-pool, so * just leave 'host' out */ - if (virAsprintf(&(vol->name), "unit:%u:%u:%u", bus, target, lun) < 0) - return -1; + virAsprintf(&(vol->name), "unit:%u:%u:%u", bus, target, lun); =20 - if (virAsprintf(&devpath, "/dev/%s", dev) < 0) - return -1; + virAsprintf(&devpath, "/dev/%s", dev); =20 VIR_DEBUG("Trying to create volume for '%s'", devpath); =20 @@ -3751,8 +3728,7 @@ getNewStyleBlockDevice(const char *lun_path, int direrr; g_autofree char *block_path =3D NULL; =20 - if (virAsprintf(&block_path, "%s/block", lun_path) < 0) - goto cleanup; + virAsprintf(&block_path, "%s/block", lun_path); =20 VIR_DEBUG("Looking for block device in '%s'", block_path); =20 @@ -3830,9 +3806,8 @@ getBlockDevice(uint32_t host, =20 *block_device =3D NULL; =20 - if (virAsprintf(&lun_path, "/sys/bus/scsi/devices/%u:%u:%u:%u", - host, bus, target, lun) < 0) - goto cleanup; + virAsprintf(&lun_path, "/sys/bus/scsi/devices/%u:%u:%u:%u", host, bus, + target, lun); =20 if (virDirOpen(&lun_dir, lun_path) < 0) goto cleanup; @@ -3884,9 +3859,8 @@ getDeviceType(uint32_t host, FILE *typefile; g_autofree char *type_path =3D NULL; =20 - if (virAsprintf(&type_path, "/sys/bus/scsi/devices/%u:%u:%u:%u/type", - host, bus, target, lun) < 0) - return -1; + virAsprintf(&type_path, "/sys/bus/scsi/devices/%u:%u:%u:%u/type", host, + bus, target, lun); =20 typefile =3D fopen(type_path, "r"); if (typefile =3D=3D NULL) { @@ -4074,15 +4048,11 @@ virStorageBackendFileSystemGetPoolSource(virStorage= PoolObjPtr pool) =20 if (def->type =3D=3D VIR_STORAGE_POOL_NETFS) { if (def->source.format =3D=3D VIR_STORAGE_POOL_NETFS_CIFS) { - if (virAsprintf(&src, "//%s/%s", - def->source.hosts[0].name, - def->source.dir) < 0) - return NULL; + virAsprintf(&src, "//%s/%s", def->source.hosts[0].name, + def->source.dir); } else { - if (virAsprintf(&src, "%s:%s", - def->source.hosts[0].name, - def->source.dir) < 0) - return NULL; + virAsprintf(&src, "%s:%s", def->source.hosts[0].name, + def->source.dir); } } else { src =3D g_strdup(def->source.devices[0].path); @@ -4197,9 +4167,8 @@ virStorageBackendFileSystemMountCmd(const char *cmdst= r, virCommandPtr cmd =3D NULL; g_autofree char *nfsVers =3D NULL; =20 - if (def->type =3D=3D VIR_STORAGE_POOL_NETFS && def->source.protocolVer= > 0 && - virAsprintf(&nfsVers, "nfsvers=3D%u", def->source.protocolVer) < 0) - return NULL; + if (def->type =3D=3D VIR_STORAGE_POOL_NETFS && def->source.protocolVer= > 0) + virAsprintf(&nfsVers, "nfsvers=3D%u", def->source.protocolVer); =20 cmd =3D virCommandNew(cmdstr); if (netauto) --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571753056; cv=none; d=zoho.com; s=zohoarc; b=ic5RuYpgeuAjkzQJZv/1GOebfViNpRpV62zYlGBTrkTV8SiLeLPfS9moSDce07Fk94lK19Sak4RjOhcPQsP3zvVB1rBQIVLYj5WmY0glyuKA5kHoaaEGfmAqy8tal1G1HHD6bpLVaGsM1xGA3SA6D4xQlIdWKL271F+tgckDyvA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571753056; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ToJ6Kwk1btNIvK2tqHGYv9NgN9n3RGkl+IvDVOMY81Q=; b=BobLefR6QZ4y17UrNy3sbD0jB78sp4m4zZ9hqn30lRBDLq9c24ac9GbUe6xIoeloQahsyloINr2s5uFWnsAnHewayC4LDUgyFGgR/iy1yXrbx6IUlXwx2hPy+E1Z7zinxhFVKrKmAp95MapMuyA4FsEf0jAZ0ukS2kCNlWesOFo= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1571753056422232.53328326957785; Tue, 22 Oct 2019 07:04:16 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-332-UzL3MvkkPQOQ-4i61mTG5g-1; Tue, 22 Oct 2019 09:59:10 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8F4DB1800E05; Tue, 22 Oct 2019 13:59:02 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 685305DC18; Tue, 22 Oct 2019 13:59:02 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 2412A3FB4B; Tue, 22 Oct 2019 13:59:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9MDx1ZQ001803 for ; Tue, 22 Oct 2019 09:59:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id 16F756012D; Tue, 22 Oct 2019 13:59:01 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 930AB6012E for ; Tue, 22 Oct 2019 13:58:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571753055; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=ToJ6Kwk1btNIvK2tqHGYv9NgN9n3RGkl+IvDVOMY81Q=; b=USz4SrtQOy7C7sacEF5Nkp9SG05kQadCAuFTE0lfpcRlM7pyy/EGNOWZy0eWZB2j5WxxwT j/8VKVDm1T2HTEgrEAdJJ3+UQKfFdwN+uyrsaB/t4QW0kx8THS7f87hKZRKnZHyHaY0dj8 CteerlVD9YgsSejOoWOA1nZBZ8RbGAw= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:28 +0200 Message-Id: <1d6a2e9e5e624ba5f31dc67979b53c0e45d6be6f.1571752582.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 24/75] test: Drop virAsprintf() and virAsprintfQuiet() retval checking X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: UzL3MvkkPQOQ-4i61mTG5g-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" These functions can't fail really. Drop checking of their retval then. Signed-off-by: Michal Privoznik --- src/test/test_driver.c | 35 +++++++++++++---------------------- 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index e00a65d8bb..96607c04eb 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -640,8 +640,7 @@ testDomainGenerateIfname(virDomainDefPtr domdef) virDomainNetDefPtr net =3D NULL; char *ifname; =20 - if (virAsprintf(&ifname, "testnet%d", ifctr) < 0) - return NULL; + virAsprintf(&ifname, "testnet%d", ifctr); =20 /* Generate network interface names */ if (!(net =3D virDomainNetFindByName(domdef, ifname))) @@ -1076,8 +1075,7 @@ testOpenVolumesForPool(const char *file, g_autoptr(virStorageVolDef) volDef =3D NULL; =20 /* Find storage volumes */ - if (virAsprintf(&vol_xpath, "/node/pool[%d]/volume", objidx) < 0) - return -1; + virAsprintf(&vol_xpath, "/node/pool[%d]/volume", objidx); =20 num =3D virXPathNodeSet(vol_xpath, ctxt, &nodes); if (num < 0) @@ -1093,9 +1091,8 @@ testOpenVolumesForPool(const char *file, return -1; =20 if (!volDef->target.path) { - if (virAsprintf(&volDef->target.path, "%s/%s", - def->target.path, volDef->name) < 0) - return -1; + virAsprintf(&volDef->target.path, "%s/%s", def->target.path, + volDef->name); } =20 if (!volDef->key) @@ -2046,7 +2043,7 @@ testDomainGetHostname(virDomainPtr domain, if (virDomainObjCheckActive(vm) < 0) goto cleanup; =20 - ignore_value(virAsprintf(&ret, "%shost", domain->name)); + virAsprintf(&ret, "%shost", domain->name); =20 cleanup: virDomainObjEndAPI(&vm); @@ -4735,8 +4732,7 @@ testDomainGetFSInfo(virDomainPtr dom, info_ret[0]->mountpoint =3D g_strdup("/"); info_ret[0]->fstype =3D g_strdup("ext4"); info_ret[0]->devAlias[0] =3D g_strdup(name); - if (virAsprintf(&info_ret[0]->name, "%s1", name) < 0) - goto cleanup; + virAsprintf(&info_ret[0]->name, "%s1", name); =20 if (VIR_ALLOC(info_ret[1]) < 0 || VIR_ALLOC(info_ret[1]->devAlias) < 0) @@ -4745,8 +4741,7 @@ testDomainGetFSInfo(virDomainPtr dom, info_ret[1]->mountpoint =3D g_strdup("/boot"); info_ret[1]->fstype =3D g_strdup("ext4"); info_ret[1]->devAlias[0] =3D g_strdup(name); - if (virAsprintf(&info_ret[1]->name, "%s2", name) < 0) - goto cleanup; + virAsprintf(&info_ret[1]->name, "%s2", name); =20 info_ret[0]->ndevAlias =3D info_ret[1]->ndevAlias =3D 1; =20 @@ -5116,8 +5111,7 @@ testDomainInterfaceAddresses(virDomainPtr dom, } else { iface->addrs[0].type =3D VIR_IP_ADDR_TYPE_IPV4; iface->addrs[0].prefix =3D 24; - if (virAsprintf(&iface->addrs[0].addr, "192.168.0.%zu", 1 + i)= < 0) - goto cleanup; + virAsprintf(&iface->addrs[0].addr, "192.168.0.%zu", 1 + i); =20 } =20 @@ -6370,8 +6364,7 @@ testConnectFindStoragePoolSources(virConnectPtr conn = G_GNUC_UNUSED, return NULL; } =20 - ignore_value(virAsprintf(&ret, defaultPoolSourcesNetFSXML, - source->hosts[0].name)); + virAsprintf(&ret, defaultPoolSourcesNetFSXML, source->hosts[0].nam= e); return ret; =20 default: @@ -7014,9 +7007,8 @@ testStorageVolCreateXML(virStoragePoolPtr pool, goto cleanup; } =20 - if (virAsprintf(&privvol->target.path, "%s/%s", - def->target.path, privvol->name) < 0) - goto cleanup; + virAsprintf(&privvol->target.path, "%s/%s", def->target.path, + privvol->name); =20 privvol->key =3D g_strdup(privvol->target.path); if (virStoragePoolObjAddVol(obj, privvol) < 0) @@ -7082,9 +7074,8 @@ testStorageVolCreateXMLFrom(virStoragePoolPtr pool, } def->available =3D (def->capacity - def->allocation); =20 - if (virAsprintf(&privvol->target.path, "%s/%s", - def->target.path, privvol->name) < 0) - goto cleanup; + virAsprintf(&privvol->target.path, "%s/%s", def->target.path, + privvol->name); =20 privvol->key =3D g_strdup(privvol->target.path); if (virStoragePoolObjAddVol(obj, privvol) < 0) --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752805; cv=none; d=zoho.com; s=zohoarc; b=lkyw0snlAfPnvFgexMykywqyhDQDrRyHLXUaOG3s6WwDN7jnFdQyvKjxqxFhzt3584UIMPWxCO86c+4RJxyeTEgllIuyU/dWJAvTb4sOQHa3wWA3UC/zGRSZP6EW03JzEoJR2weW+7dHpv5gEX0WNd9XizkqZeFwD8SSgSXTc7E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752805; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=NlIPB/3ml6Y5Hu8AJ5zLkAh603sFDoq/vs2b3n1j5BY=; b=fYzzxC5CPooHwSg/izLM2CAH0nUL1abHBi72yAb+6or1WPkaFm2weOG9fVYNGUvR/PVa1rr5nshy78aOJQIuX+gF7/y8rG291+rX9nJ3MlJPrfnvVJpb4u+G1MqQ1PJKDqfk1zLucgu1LwwdYT+b6MZvScxHZTIbVBJJ1OfzUN0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1571752805070291.51665555866646; Tue, 22 Oct 2019 07:00:05 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-377-CPUUyXN_NOm6WjAQFQq6Kg-1; Tue, 22 Oct 2019 09:59:13 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 38CBA107AD41; Tue, 22 Oct 2019 13:59:06 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0EBF06012E; Tue, 22 Oct 2019 13:59:06 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id BE60C180597F; Tue, 22 Oct 2019 13:59:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9MDx4Xp001820 for ; Tue, 22 Oct 2019 09:59:04 -0400 Received: by smtp.corp.redhat.com (Postfix) id B11B66012E; Tue, 22 Oct 2019 13:59:04 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id DF0DE6017E for ; Tue, 22 Oct 2019 13:59:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752803; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=NlIPB/3ml6Y5Hu8AJ5zLkAh603sFDoq/vs2b3n1j5BY=; b=YmTWQ/NeNKFXCYGZigNeMI0aMpBjSOgiuySWRhVLvPUZL93FGFfNIthDHXHAaxlpDjymB3 68bmNYiI6/R8MMwbMuBMDgenTSf6yAhNPkD6+Fw/47JJRK8Sif2Z+tP2uIkhbF2E1fsTpG msprFz/NksmTkGiOBtQo1rG0qCPynWA= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:29 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 25/75] util: Drop virAsprintf() and virAsprintfQuiet() retval checking X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: CPUUyXN_NOm6WjAQFQq6Kg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" These functions can't fail really. Drop checking of their retval then. Signed-off-by: Michal Privoznik --- src/util/viraudit.c | 3 +- src/util/virauth.c | 17 ++--- src/util/virauthconfig.c | 9 +-- src/util/vircgroup.c | 39 ++++------- src/util/vircgroupv1.c | 102 ++++++++++----------------- src/util/vircgroupv2.c | 97 +++++++++----------------- src/util/virconf.c | 10 +-- src/util/virdevmapper.c | 7 +- src/util/virdnsmasq.c | 39 ++++------- src/util/virebtables.c | 5 +- src/util/virerror.c | 3 +- src/util/virfile.c | 39 ++++------- src/util/virhostcpu.c | 11 ++- src/util/virhostdev.c | 3 +- src/util/virhostmem.c | 21 ++---- src/util/viriptables.c | 16 ++--- src/util/viriscsi.c | 6 +- src/util/virjson.c | 12 ++-- src/util/virkmod.c | 3 +- src/util/virlockspace.c | 2 +- src/util/virlog.c | 120 ++++++++++++++------------------ src/util/virlog.h | 2 +- src/util/virmacmap.c | 2 +- src/util/virmdev.c | 11 ++- src/util/virnetdev.c | 40 ++++------- src/util/virnetdevbandwidth.c | 61 +++++++--------- src/util/virnetdevbridge.c | 16 ++--- src/util/virnetdevip.c | 5 +- src/util/virnetdevmacvlan.c | 6 +- src/util/virnetdevopenvswitch.c | 18 ++--- src/util/virnetdevtap.c | 6 +- src/util/virnetdevveth.c | 9 +-- src/util/virnuma.c | 32 ++++----- src/util/virpci.c | 86 +++++++++-------------- src/util/virpidfile.c | 9 +-- src/util/virprocess.c | 24 +++---- src/util/virqemu.c | 6 +- src/util/virrandom.c | 5 +- src/util/virresctrl.c | 21 ++---- src/util/virrotatingfile.c | 12 ++-- src/util/virscsi.c | 31 +++------ src/util/virscsihost.c | 18 ++--- src/util/virscsivhost.c | 4 +- src/util/virsocketaddr.c | 19 ++--- src/util/virstoragefile.c | 14 ++-- src/util/virstring.c | 5 +- src/util/virstring.h | 2 +- src/util/virsystemd.c | 3 +- src/util/virtpm.c | 44 ++++++------ src/util/virtypedparam.c | 12 ++-- src/util/viruri.c | 3 +- src/util/virusb.c | 19 ++--- src/util/virutil.c | 18 +++-- src/util/virvhba.c | 52 +++++--------- 54 files changed, 436 insertions(+), 743 deletions(-) diff --git a/src/util/viraudit.c b/src/util/viraudit.c index 9bf42824f6..9d423e8f53 100644 --- a/src/util/viraudit.c +++ b/src/util/viraudit.c @@ -158,8 +158,7 @@ char *virAuditEncode(const char *key, const char *value) return audit_encode_nv_string(key, value, 0); #else char *str; - if (virAsprintf(&str, "%s=3D%s", key, value) < 0) - return NULL; + virAsprintf(&str, "%s=3D%s", key, value); return str; #endif } diff --git a/src/util/virauth.c b/src/util/virauth.c index ddb46cc498..9ff639ffa8 100644 --- a/src/util/virauth.c +++ b/src/util/virauth.c @@ -69,8 +69,7 @@ virAuthGetConfigFilePathURI(virURIPtr uri, if (!(userdir =3D virGetUserConfigDirectory())) return -1; =20 - if (virAsprintf(path, "%s/auth.conf", userdir) < 0) - return -1; + virAsprintf(path, "%s/auth.conf", userdir); =20 VIR_DEBUG("Checking for readability of '%s'", *path); if (access(*path, R_OK) =3D=3D 0) @@ -158,13 +157,10 @@ virAuthGetUsernamePath(const char *path, memset(&cred, 0, sizeof(virConnectCredential)); =20 if (defaultUsername !=3D NULL) { - if (virAsprintf(&prompt, _("Enter username for %s [%s]"), hostname, - defaultUsername) < 0) { - return NULL; - } + virAsprintf(&prompt, _("Enter username for %s [%s]"), hostname, + defaultUsername); } else { - if (virAsprintf(&prompt, _("Enter username for %s"), hostname) < 0) - return NULL; + virAsprintf(&prompt, _("Enter username for %s"), hostname); } =20 for (ncred =3D 0; ncred < auth->ncredtype; ncred++) { @@ -241,10 +237,7 @@ virAuthGetPasswordPath(const char *path, =20 memset(&cred, 0, sizeof(virConnectCredential)); =20 - if (virAsprintf(&prompt, _("Enter %s's password for %s"), username, - hostname) < 0) { - return NULL; - } + virAsprintf(&prompt, _("Enter %s's password for %s"), username, hostna= me); =20 for (ncred =3D 0; ncred < auth->ncredtype; ncred++) { if (auth->credtype[ncred] !=3D VIR_CRED_PASSPHRASE && diff --git a/src/util/virauthconfig.c b/src/util/virauthconfig.c index 6a9001f2d8..b7263ebccb 100644 --- a/src/util/virauthconfig.c +++ b/src/util/virauthconfig.c @@ -113,13 +113,11 @@ int virAuthConfigLookup(virAuthConfigPtr auth, if (!hostname) hostname =3D "localhost"; =20 - if (virAsprintf(&authgroup, "auth-%s-%s", service, hostname) < 0) - return -1; + virAsprintf(&authgroup, "auth-%s-%s", service, hostname); =20 if (!virKeyFileHasGroup(auth->keyfile, authgroup)) { VIR_FREE(authgroup); - if (virAsprintf(&authgroup, "auth-%s-%s", service, "default") < 0) - return -1; + virAsprintf(&authgroup, "auth-%s-%s", service, "default"); } =20 if (!virKeyFileHasGroup(auth->keyfile, authgroup)) @@ -132,8 +130,7 @@ int virAuthConfigLookup(virAuthConfigPtr auth, return -1; } =20 - if (virAsprintf(&credgroup, "credentials-%s", authcred) < 0) - return -1; + virAsprintf(&credgroup, "credentials-%s", authcred); =20 if (!virKeyFileHasGroup(auth->keyfile, credgroup)) { virReportError(VIR_ERR_CONF_SYNTAX, diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index b46f20abfd..8545cd3049 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -206,8 +206,7 @@ virCgroupPartitionEscape(char **path) if ((rc =3D virCgroupPartitionNeedsEscaping(*path)) <=3D 0) return rc; =20 - if (virAsprintf(&newstr, "_%s", *path) < 0) - return -1; + virAsprintf(&newstr, "_%s", *path); =20 VIR_FREE(*path); *path =3D newstr; @@ -291,9 +290,7 @@ virCgroupDetectPlacement(virCgroupPtr group, if (pid =3D=3D -1) { procfile =3D g_strdup("/proc/self/cgroup"); } else { - if (virAsprintf(&procfile, "/proc/%lld/cgroup", - (long long) pid) < 0) - goto cleanup; + virAsprintf(&procfile, "/proc/%lld/cgroup", (long long)pid); } =20 mapping =3D fopen(procfile, "r"); @@ -446,8 +443,7 @@ virCgroupGetBlockDevString(const char *path) =20 /* Automatically append space after the string since all callers * use it anyway */ - if (virAsprintf(&ret, "%d:%d ", major(sb.st_rdev), minor(sb.st_rdev)) = < 0) - return NULL; + virAsprintf(&ret, "%d:%d ", major(sb.st_rdev), minor(sb.st_rdev)); =20 return ret; } @@ -563,8 +559,7 @@ virCgroupSetValueU64(virCgroupPtr group, { g_autofree char *strval =3D NULL; =20 - if (virAsprintf(&strval, "%llu", value) < 0) - return -1; + virAsprintf(&strval, "%llu", value); =20 return virCgroupSetValueStr(group, controller, key, strval); } @@ -578,8 +573,7 @@ virCgroupSetValueI64(virCgroupPtr group, { g_autofree char *strval =3D NULL; =20 - if (virAsprintf(&strval, "%lld", value) < 0) - return -1; + virAsprintf(&strval, "%lld", value); =20 return virCgroupSetValueStr(group, controller, key, strval); } @@ -682,11 +676,8 @@ virCgroupNew(pid_t pid, if (path[0] =3D=3D '/' || !parent) { (*group)->path =3D g_strdup(path); } else { - if (virAsprintf(&(*group)->path, "%s%s%s", - parent->path, - STREQ(parent->path, "") ? "" : "/", - path) < 0) - goto error; + virAsprintf(&(*group)->path, "%s%s%s", parent->path, + STREQ(parent->path, "") ? "" : "/", path); } =20 if (virCgroupDetect(*group, pid, controllers, path, parent) < 0) @@ -918,9 +909,7 @@ virCgroupNewDomainPartition(virCgroupPtr partition, { g_autofree char *grpname =3D NULL; =20 - if (virAsprintf(&grpname, "%s.libvirt-%s", - name, driver) < 0) - return -1; + virAsprintf(&grpname, "%s.libvirt-%s", name, driver); =20 if (virCgroupPartitionEscape(&grpname) < 0) return -1; @@ -971,15 +960,13 @@ virCgroupNewThread(virCgroupPtr domain, =20 switch (nameval) { case VIR_CGROUP_THREAD_VCPU: - if (virAsprintf(&name, "vcpu%d", id) < 0) - return -1; + virAsprintf(&name, "vcpu%d", id); break; case VIR_CGROUP_THREAD_EMULATOR: name =3D g_strdup("emulator"); break; case VIR_CGROUP_THREAD_IOTHREAD: - if (virAsprintf(&name, "iothread%d", id) < 0) - return -1; + virAsprintf(&name, "iothread%d", id); break; case VIR_CGROUP_THREAD_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, @@ -2356,10 +2343,8 @@ virCgroupRemoveRecursively(char *grppath) =20 if (ent->d_type !=3D DT_DIR) continue; =20 - if (virAsprintf(&path, "%s/%s", grppath, ent->d_name) =3D=3D -1) { - rc =3D -ENOMEM; - break; - } + virAsprintf(&path, "%s/%s", grppath, ent->d_name); + rc =3D virCgroupRemoveRecursively(path); if (rc !=3D 0) break; diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c index 0820c5d638..d04fa521fc 100644 --- a/src/util/vircgroupv1.c +++ b/src/util/vircgroupv1.c @@ -97,16 +97,15 @@ virCgroupV1ValidateMachineGroup(virCgroupPtr group, g_autofree char *scopename_new =3D NULL; g_autofree char *partmachinename =3D NULL; =20 - if (virAsprintf(&partname, "%s.libvirt-%s", - name, drivername) < 0) - return false; + virAsprintf(&partname, "%s.libvirt-%s", name, drivername); =20 if (virCgroupPartitionEscape(&partname) < 0) return false; =20 - if (virAsprintf(&partmachinename, "%s.libvirt-%s", - machinename, drivername) < 0 || - virCgroupPartitionEscape(&partmachinename) < 0) + virAsprintf(&partmachinename, "%s.libvirt-%s", + machinename, drivername); + + if (virCgroupPartitionEscape(&partmachinename) < 0) return false; =20 if (!(scopename_old =3D virSystemdMakeScopeName(name, drivername, true= ))) @@ -204,13 +203,10 @@ virCgroupV1CopyPlacement(virCgroupPtr group, * parent =3D=3D "/libvirt.service" + path =3D=3D "" =3D> "/li= bvirt.service" * parent =3D=3D "/libvirt.service" + path =3D=3D "foo" =3D> "= /libvirt.service/foo" */ - if (virAsprintf(&group->legacy[i].placement, - "%s%s%s", - parent->legacy[i].placement, - (STREQ(parent->legacy[i].placement, "/") || - STREQ(path, "") ? "" : "/"), - path) < 0) - return -1; + virAsprintf(&group->legacy[i].placement, "%s%s%s", + parent->legacy[i].placement, + (STREQ(parent->legacy[i].placement, "/") || STREQ(= path, "") ? "" : "/"), + path); } } =20 @@ -241,8 +237,7 @@ virCgroupV1ResolveMountLink(const char *mntDir, return 0; =20 *dirName =3D '\0'; - if (virAsprintf(&linkSrc, "%s/%s", tmp, typeStr) < 0) - return -1; + virAsprintf(&linkSrc, "%s/%s", tmp, typeStr); *dirName =3D '/'; =20 if (lstat(linkSrc, &sb) < 0) { @@ -354,12 +349,9 @@ virCgroupV1DetectPlacement(virCgroupPtr group, if (i =3D=3D VIR_CGROUP_CONTROLLER_SYSTEMD) { group->legacy[i].placement =3D g_strdup(selfpath); } else { - if (virAsprintf(&group->legacy[i].placement, - "%s%s%s", selfpath, - (STREQ(selfpath, "/") || - STREQ(path, "") ? "" : "/"), - path) < 0) - return -1; + virAsprintf(&group->legacy[i].placement, "%s%s%s", selfpat= h, + (STREQ(selfpath, "/") || STREQ(path, "") ? "" = : "/"), + path); } } } @@ -524,11 +516,8 @@ virCgroupV1PathOfController(virCgroupPtr group, return -1; } =20 - if (virAsprintf(path, "%s%s/%s", - group->legacy[controller].mountPoint, - group->legacy[controller].placement, - NULLSTR_EMPTY(key)) < 0) - return -1; + virAsprintf(path, "%s%s/%s", group->legacy[controller].mountPoint, + group->legacy[controller].placement, NULLSTR_EMPTY(key)); =20 return 0; } @@ -817,9 +806,7 @@ virCgroupV1BindMount(virCgroupPtr group, return -1; } =20 - if (virAsprintf(&opts, - "mode=3D755,size=3D65536%s", mountopts) < 0) - return -1; + virAsprintf(&opts, "mode=3D755,size=3D65536%s", mountopts); =20 if (mount("tmpfs", root, "tmpfs", MS_NOSUID|MS_NODEV|MS_NOEXEC, opts) = < 0) { virReportSystemError(errno, @@ -834,10 +821,7 @@ virCgroupV1BindMount(virCgroupPtr group, =20 if (!virFileExists(group->legacy[i].mountPoint)) { g_autofree char *src =3D NULL; - if (virAsprintf(&src, "%s%s", - oldroot, - group->legacy[i].mountPoint) < 0) - return -1; + virAsprintf(&src, "%s%s", oldroot, group->legacy[i].mountPoint= ); =20 VIR_DEBUG("Create mount point '%s'", group->legacy[i].mountPoint); @@ -897,9 +881,8 @@ virCgroupV1SetOwner(virCgroupPtr cgroup, if (!cgroup->legacy[i].mountPoint) continue; =20 - if (virAsprintf(&base, "%s%s", cgroup->legacy[i].mountPoint, - cgroup->legacy[i].placement) < 0) - goto cleanup; + virAsprintf(&base, "%s%s", cgroup->legacy[i].mountPoint, + cgroup->legacy[i].placement); =20 if (virDirOpen(&dh, base) < 0) goto cleanup; @@ -907,8 +890,7 @@ virCgroupV1SetOwner(virCgroupPtr cgroup, while ((direrr =3D virDirRead(dh, &de, base)) > 0) { g_autofree char *entry =3D NULL; =20 - if (virAsprintf(&entry, "%s/%s", base, de->d_name) < 0) - goto cleanup; + virAsprintf(&entry, "%s/%s", base, de->d_name); =20 if (chown(entry, uid, gid) < 0) { virReportSystemError(errno, @@ -965,8 +947,7 @@ virCgroupV1SetBlkioWeight(virCgroupPtr group, return -1; } =20 - if (virAsprintf(&value, "%u", weight) < 0) - return -1; + virAsprintf(&value, "%u", weight); =20 return virCgroupSetValueRaw(path, value); } @@ -1208,8 +1189,7 @@ virCgroupV1SetBlkioDeviceWeight(virCgroupPtr group, if (!(blkstr =3D virCgroupGetBlockDevString(devPath))) return -1; =20 - if (virAsprintf(&str, "%s%d", blkstr, weight) < 0) - return -1; + virAsprintf(&str, "%s%d", blkstr, weight); =20 if (virCgroupV1PathOfController(group, VIR_CGROUP_CONTROLLER_BLKIO, "blkio.weight_device", &path) < 0) { @@ -1276,8 +1256,7 @@ virCgroupV1SetBlkioDeviceReadIops(virCgroupPtr group, if (!(blkstr =3D virCgroupGetBlockDevString(path))) return -1; =20 - if (virAsprintf(&str, "%s%u", blkstr, riops) < 0) - return -1; + virAsprintf(&str, "%s%u", blkstr, riops); =20 return virCgroupSetValueStr(group, VIR_CGROUP_CONTROLLER_BLKIO, @@ -1328,8 +1307,7 @@ virCgroupV1SetBlkioDeviceWriteIops(virCgroupPtr group, if (!(blkstr =3D virCgroupGetBlockDevString(path))) return -1; =20 - if (virAsprintf(&str, "%s%u", blkstr, wiops) < 0) - return -1; + virAsprintf(&str, "%s%u", blkstr, wiops); =20 return virCgroupSetValueStr(group, VIR_CGROUP_CONTROLLER_BLKIO, @@ -1380,8 +1358,7 @@ virCgroupV1SetBlkioDeviceReadBps(virCgroupPtr group, if (!(blkstr =3D virCgroupGetBlockDevString(path))) return -1; =20 - if (virAsprintf(&str, "%s%llu", blkstr, rbps) < 0) - return -1; + virAsprintf(&str, "%s%llu", blkstr, rbps); =20 return virCgroupSetValueStr(group, VIR_CGROUP_CONTROLLER_BLKIO, @@ -1432,8 +1409,7 @@ virCgroupV1SetBlkioDeviceWriteBps(virCgroupPtr group, if (!(blkstr =3D virCgroupGetBlockDevString(path))) return -1; =20 - if (virAsprintf(&str, "%s%llu", blkstr, wbps) < 0) - return -1; + virAsprintf(&str, "%s%llu", blkstr, wbps); =20 return virCgroupSetValueStr(group, VIR_CGROUP_CONTROLLER_BLKIO, @@ -1784,17 +1760,16 @@ virCgroupV1AllowDevice(virCgroupPtr group, =20 if (major < 0) majorstr =3D g_strdup("*"); - if (major >=3D 0 && virAsprintf(&majorstr, "%i", major) < 0) - return -1; + else + virAsprintf(&majorstr, "%i", major); =20 if (minor < 0) minorstr =3D g_strdup("*"); - if (minor >=3D 0 && virAsprintf(&minorstr, "%i", minor) < 0) - return -1; + else + virAsprintf(&minorstr, "%i", minor); =20 - if (virAsprintf(&devstr, "%c %s:%s %s", type, majorstr, minorstr, - virCgroupGetDevicePermsString(perms)) < 0) - return -1; + virAsprintf(&devstr, "%c %s:%s %s", type, majorstr, minorstr, + virCgroupGetDevicePermsString(perms)); =20 if (virCgroupSetValueStr(group, VIR_CGROUP_CONTROLLER_DEVICES, @@ -1819,17 +1794,16 @@ virCgroupV1DenyDevice(virCgroupPtr group, =20 if (major < 0) majorstr =3D g_strdup("*"); - if (major >=3D 0 && virAsprintf(&majorstr, "%i", major) < 0) - return -1; + else + virAsprintf(&majorstr, "%i", major); =20 if (minor < 0) minorstr =3D g_strdup("*"); - if (minor >=3D 0 && virAsprintf(&minorstr, "%i", minor) < 0) - return -1; + else + virAsprintf(&minorstr, "%i", minor); =20 - if (virAsprintf(&devstr, "%c %s:%s %s", type, majorstr, minorstr, - virCgroupGetDevicePermsString(perms)) < 0) - return -1; + virAsprintf(&devstr, "%c %s:%s %s", type, majorstr, minorstr, + virCgroupGetDevicePermsString(perms)); =20 if (virCgroupSetValueStr(group, VIR_CGROUP_CONTROLLER_DEVICES, diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c index e976a8d241..f0ce4a48bc 100644 --- a/src/util/vircgroupv2.c +++ b/src/util/vircgroupv2.c @@ -75,8 +75,7 @@ virCgroupV2Available(void) /* Systemd uses cgroup v2 for process tracking but no controller is * available. We should consider this configuration as cgroup v2 is * not available. */ - if (virAsprintf(&contFile, "%s/cgroup.controllers", entry.mnt_dir)= < 0) - goto cleanup; + virAsprintf(&contFile, "%s/cgroup.controllers", entry.mnt_dir); =20 if (virFileReadAll(contFile, 1024 * 1024, &contStr) < 0) goto cleanup; @@ -104,10 +103,7 @@ virCgroupV2ValidateMachineGroup(virCgroupPtr group, g_autofree char *scopename =3D NULL; char *tmp; =20 - if (virAsprintf(&partmachinename, "%s.libvirt-%s", machinename, - drivername) < 0) { - return false; - } + virAsprintf(&partmachinename, "%s.libvirt-%s", machinename, drivername= ); =20 if (virCgroupPartitionEscape(&partmachinename) < 0) return false; @@ -166,12 +162,10 @@ virCgroupV2CopyPlacement(virCgroupPtr group, * parent =3D=3D "/libvirt.service" + path =3D=3D "" =3D> "/libvir= t.service" * parent =3D=3D "/libvirt.service" + path =3D=3D "foo" =3D> "/lib= virt.service/foo" */ - if (virAsprintf(&group->unified.placement, "%s%s%s", - parent->unified.placement, - (STREQ(parent->unified.placement, "/") || - STREQ(path, "") ? "" : "/"), - path) < 0) - return -1; + virAsprintf(&group->unified.placement, "%s%s%s", + parent->unified.placement, + (STREQ(parent->unified.placement, "/") || STREQ(path, = "") ? "" : "/"), + path); } =20 return 0; @@ -215,12 +209,8 @@ virCgroupV2DetectPlacement(virCgroupPtr group, * selfpath =3D=3D "/libvirt.service" + path =3D=3D "" -> "/libvirt.se= rvice" * selfpath =3D=3D "/libvirt.service" + path =3D=3D "foo" -> "/libvirt= .service/foo" */ - if (virAsprintf(&group->unified.placement, - "%s%s%s", selfpath, - (STREQ(selfpath, "/") || - STREQ(path, "") ? "" : "/"), - path) < 0) - return -1; + virAsprintf(&group->unified.placement, "%s%s%s", selfpath, + (STREQ(selfpath, "/") || STREQ(path, "") ? "" : "/"), path= ); =20 return 0; } @@ -262,15 +252,13 @@ virCgroupV2ParseControllersFile(virCgroupPtr group, char **tmp; =20 if (parent) { - if (virAsprintf(&contFile, "%s%s/cgroup.subtree_control", - parent->unified.mountPoint, - NULLSTR_EMPTY(parent->unified.placement)) < 0) - return -1; + virAsprintf(&contFile, "%s%s/cgroup.subtree_control", + parent->unified.mountPoint, + NULLSTR_EMPTY(parent->unified.placement)); } else { - if (virAsprintf(&contFile, "%s%s/cgroup.controllers", - group->unified.mountPoint, - NULLSTR_EMPTY(group->unified.placement)) < 0) - return -1; + virAsprintf(&contFile, "%s%s/cgroup.controllers", + group->unified.mountPoint, + NULLSTR_EMPTY(group->unified.placement)); } =20 rc =3D virFileReadAll(contFile, 1024 * 1024, &contStr); @@ -357,11 +345,8 @@ virCgroupV2PathOfController(virCgroupPtr group, return -1; } =20 - if (virAsprintf(path, "%s%s/%s", - group->unified.mountPoint, - group->unified.placement, - NULLSTR_EMPTY(key)) < 0) - return -1; + virAsprintf(path, "%s%s/%s", group->unified.mountPoint, + group->unified.placement, NULLSTR_EMPTY(key)); =20 return 0; } @@ -383,10 +368,7 @@ virCgroupV2EnableController(virCgroupPtr group, g_autofree char *val =3D NULL; g_autofree char *path =3D NULL; =20 - if (virAsprintf(&val, "+%s", - virCgroupV2ControllerTypeToString(controller)) < 0) { - return -1; - } + virAsprintf(&val, "+%s", virCgroupV2ControllerTypeToString(controller)= ); =20 if (virCgroupPathOfController(parent, controller, "cgroup.subtree_control", &path) < 0) { @@ -568,11 +550,9 @@ virCgroupV2BindMount(virCgroupPtr group, return -1; } =20 - if (virAsprintf(&opts, "mode=3D755,size=3D65536%s", mountopts) < 0) - return -1; + virAsprintf(&opts, "mode=3D755,size=3D65536%s", mountopts); =20 - if (virAsprintf(&src, "%s%s", oldroot, group->unified.mountPoint) < 0) - return -1; + virAsprintf(&src, "%s%s", oldroot, group->unified.mountPoint); =20 if (mount(src, group->unified.mountPoint, "none", MS_BIND, NULL) < 0) { virReportSystemError(errno, _("Failed to bind cgroup '%s' on '%s'"= ), @@ -592,10 +572,8 @@ virCgroupV2SetOwner(virCgroupPtr cgroup, { g_autofree char *base =3D NULL; =20 - if (virAsprintf(&base, "%s%s", cgroup->unified.mountPoint, - cgroup->unified.placement) < 0) { - return -1; - } + virAsprintf(&base, "%s%s", cgroup->unified.mountPoint, + cgroup->unified.placement); =20 if (virFileChownFiles(base, uid, gid) < 0) return -1; @@ -639,8 +617,7 @@ virCgroupV2SetBlkioWeight(virCgroupPtr group, return -1; } =20 - if (virAsprintf(&value, format, weight) < 0) - return -1; + virAsprintf(&value, format, weight); =20 return virCgroupSetValueRaw(path, value); } @@ -833,8 +810,7 @@ virCgroupV2SetBlkioDeviceWeight(virCgroupPtr group, if (!(blkstr =3D virCgroupGetBlockDevString(devPath))) return -1; =20 - if (virAsprintf(&str, "%s%d", blkstr, weight) < 0) - return -1; + virAsprintf(&str, "%s%d", blkstr, weight); =20 if (virCgroupV2PathOfController(group, VIR_CGROUP_CONTROLLER_BLKIO, "io.weight", &path) < 0) { @@ -903,11 +879,9 @@ virCgroupV2SetBlkioDeviceReadIops(virCgroupPtr group, return -1; =20 if (riops =3D=3D 0) { - if (virAsprintf(&str, "%sriops=3Dmax", blkstr) < 0) - return -1; + virAsprintf(&str, "%sriops=3Dmax", blkstr); } else { - if (virAsprintf(&str, "%sriops=3D%u", blkstr, riops) < 0) - return -1; + virAsprintf(&str, "%sriops=3D%u", blkstr, riops); } =20 return virCgroupSetValueStr(group, @@ -974,11 +948,9 @@ virCgroupV2SetBlkioDeviceWriteIops(virCgroupPtr group, return -1; =20 if (wiops =3D=3D 0) { - if (virAsprintf(&str, "%swiops=3Dmax", blkstr) < 0) - return -1; + virAsprintf(&str, "%swiops=3Dmax", blkstr); } else { - if (virAsprintf(&str, "%swiops=3D%u", blkstr, wiops) < 0) - return -1; + virAsprintf(&str, "%swiops=3D%u", blkstr, wiops); } =20 return virCgroupSetValueStr(group, @@ -1045,11 +1017,9 @@ virCgroupV2SetBlkioDeviceReadBps(virCgroupPtr group, return -1; =20 if (rbps =3D=3D 0) { - if (virAsprintf(&str, "%srbps=3Dmax", blkstr) < 0) - return -1; + virAsprintf(&str, "%srbps=3Dmax", blkstr); } else { - if (virAsprintf(&str, "%srbps=3D%llu", blkstr, rbps) < 0) - return -1; + virAsprintf(&str, "%srbps=3D%llu", blkstr, rbps); } =20 return virCgroupSetValueStr(group, @@ -1116,11 +1086,9 @@ virCgroupV2SetBlkioDeviceWriteBps(virCgroupPtr group, return -1; =20 if (wbps =3D=3D 0) { - if (virAsprintf(&str, "%swbps=3Dmax", blkstr) < 0) - return -1; + virAsprintf(&str, "%swbps=3Dmax", blkstr); } else { - if (virAsprintf(&str, "%swbps=3D%llu", blkstr, wbps) < 0) - return -1; + virAsprintf(&str, "%swbps=3D%llu", blkstr, wbps); } =20 return virCgroupSetValueStr(group, @@ -1520,8 +1488,7 @@ virCgroupV2SetCpuCfsPeriod(virCgroupPtr group, } *tmp =3D '\0'; =20 - if (virAsprintf(&value, "%s %llu", str, cfs_period) < 0) - return -1; + virAsprintf(&value, "%s %llu", str, cfs_period); =20 return virCgroupSetValueStr(group, VIR_CGROUP_CONTROLLER_CPU, "cpu.max", value); diff --git a/src/util/virconf.c b/src/util/virconf.c index 3b678015f5..d4071d1945 100644 --- a/src/util/virconf.c +++ b/src/util/virconf.c @@ -1520,19 +1520,13 @@ virConfLoadConfigPath(const char *name) { char *path; if (geteuid() =3D=3D 0) { - if (virAsprintf(&path, "%s/libvirt/%s", - SYSCONFDIR, name) < 0) - return NULL; + virAsprintf(&path, "%s/libvirt/%s", SYSCONFDIR, name); } else { char *userdir =3D virGetUserConfigDirectory(); if (!userdir) return NULL; =20 - if (virAsprintf(&path, "%s/%s", - userdir, name) < 0) { - VIR_FREE(userdir); - return NULL; - } + virAsprintf(&path, "%s/%s", userdir, name); VIR_FREE(userdir); } =20 diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c index a9996b067c..1c8f356387 100644 --- a/src/util/virdevmapper.c +++ b/src/util/virdevmapper.c @@ -127,10 +127,9 @@ virDevMapperGetTargetsImpl(const char *path, goto cleanup; =20 for (i =3D 0; i < deps->count; i++) { - if (virAsprintfQuiet(&devPaths[i], "/dev/block/%u:%u", - major(deps->device[i]), - minor(deps->device[i])) < 0) - goto cleanup; + virAsprintfQuiet(&devPaths[i], "/dev/block/%u:%u", + major(deps->device[i]), + minor(deps->device[i])); } =20 recursiveDevPaths =3D NULL; diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c index f22250a07e..a93c851f7d 100644 --- a/src/util/virdnsmasq.c +++ b/src/util/virdnsmasq.c @@ -180,8 +180,7 @@ addnhostsWrite(const char *path, * for runtime addition. */ =20 - if (virAsprintf(&tmp, "%s.new", path) < 0) - return -ENOMEM; + virAsprintf(&tmp, "%s.new", path); =20 if (!(f =3D fopen(tmp, "w"))) { istmp =3D false; @@ -312,30 +311,24 @@ hostsfileAdd(dnsmasqHostsfile *hostsfile, /* the first test determines if it is a dhcpv6 host */ if (ipv6) { if (name && id) { - if (virAsprintf(&hostsfile->hosts[hostsfile->nhosts].host, - "id:%s,%s,[%s]", id, name, ipstr) < 0) - goto error; + virAsprintf(&hostsfile->hosts[hostsfile->nhosts].host, + "id:%s,%s,[%s]", id, name, ipstr); } else if (name && !id) { - if (virAsprintf(&hostsfile->hosts[hostsfile->nhosts].host, - "%s,[%s]", name, ipstr) < 0) - goto error; + virAsprintf(&hostsfile->hosts[hostsfile->nhosts].host, "%s,[%s= ]", + name, ipstr); } else if (!name && id) { - if (virAsprintf(&hostsfile->hosts[hostsfile->nhosts].host, - "id:%s,[%s]", id, ipstr) < 0) - goto error; + virAsprintf(&hostsfile->hosts[hostsfile->nhosts].host, + "id:%s,[%s]", id, ipstr); } } else if (name && mac) { - if (virAsprintf(&hostsfile->hosts[hostsfile->nhosts].host, "%s,%s,= %s", - mac, ipstr, name) < 0) - goto error; + virAsprintf(&hostsfile->hosts[hostsfile->nhosts].host, "%s,%s,%s", + mac, ipstr, name); } else if (name && !mac) { - if (virAsprintf(&hostsfile->hosts[hostsfile->nhosts].host, "%s,%s", - name, ipstr) < 0) - goto error; + virAsprintf(&hostsfile->hosts[hostsfile->nhosts].host, "%s,%s", na= me, + ipstr); } else { - if (virAsprintf(&hostsfile->hosts[hostsfile->nhosts].host, "%s,%s", - mac, ipstr) < 0) - goto error; + virAsprintf(&hostsfile->hosts[hostsfile->nhosts].host, "%s,%s", ma= c, + ipstr); } VIR_FREE(ipstr); =20 @@ -393,8 +386,7 @@ hostsfileWrite(const char *path, * for runtime addition. */ =20 - if (virAsprintf(&tmp, "%s.new", path) < 0) - return -ENOMEM; + virAsprintf(&tmp, "%s.new", path); =20 if (!(f =3D fopen(tmp, "w"))) { istmp =3D false; @@ -758,8 +750,7 @@ dnsmasqCapsRefreshInternal(dnsmasqCapsPtr caps, bool fo= rce) if (virCommandRun(cmd, NULL) < 0) goto cleanup; =20 - if (virAsprintf(&complete, "%s\n%s", version, help) < 0) - goto cleanup; + virAsprintf(&complete, "%s\n%s", version, help); =20 ret =3D dnsmasqCapsSetFromBuffer(caps, complete); =20 diff --git a/src/util/virebtables.c b/src/util/virebtables.c index 3fda362a13..9f4ba9013e 100644 --- a/src/util/virebtables.c +++ b/src/util/virebtables.c @@ -58,10 +58,7 @@ ebtablesContextNew(const char *driver) if (VIR_ALLOC(ctx) < 0) return NULL; =20 - if (virAsprintf(&ctx->chain, "libvirt_%s_FORWARD", driver) < 0) { - VIR_FREE(ctx); - return NULL; - } + virAsprintf(&ctx->chain, "libvirt_%s_FORWARD", driver); =20 return ctx; } diff --git a/src/util/virerror.c b/src/util/virerror.c index f0ef7e337c..c31103c3b7 100644 --- a/src/util/virerror.c +++ b/src/util/virerror.c @@ -1488,8 +1488,7 @@ virLastErrorPrefixMessage(const char *fmt, ...) if (virVasprintfQuiet(&fmtmsg, fmt, args) < 0) goto cleanup; =20 - if (virAsprintfQuiet(&newmsg, "%s: %s", fmtmsg, err->message) < 0) - goto cleanup; + virAsprintfQuiet(&newmsg, "%s: %s", fmtmsg, err->message); =20 VIR_FREE(err->message); err->message =3D g_steal_pointer(&newmsg); diff --git a/src/util/virfile.c b/src/util/virfile.c index 7c97317994..0636fb8f08 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -508,8 +508,7 @@ virFileRewrite(const char *path, int fd =3D -1; int ret =3D -1; =20 - if (virAsprintf(&newfile, "%s.new", path) < 0) - goto cleanup; + virAsprintf(&newfile, "%s.new", path); =20 if ((fd =3D open(newfile, O_WRONLY | O_CREAT | O_TRUNC, mode)) < 0) { virReportSystemError(errno, _("cannot create file '%s'"), @@ -666,8 +665,7 @@ static int virFileLoopDeviceOpenLoopCtl(char **dev_name= , int *fd) =20 VIR_DEBUG("Found free loop device number %i", devnr); =20 - if (virAsprintf(&looppath, "/dev/loop%i", devnr) < 0) - return -1; + virAsprintf(&looppath, "/dev/loop%i", devnr); =20 if ((*fd =3D open(looppath, O_RDWR)) < 0) { virReportSystemError(errno, @@ -703,8 +701,7 @@ static int virFileLoopDeviceOpenSearch(char **dev_name) !c_isdigit(de->d_name[4])) continue; =20 - if (virAsprintf(&looppath, "/dev/%s", de->d_name) < 0) - goto cleanup; + virAsprintf(&looppath, "/dev/%s", de->d_name); =20 VIR_DEBUG("Checking up on device %s", looppath); if ((fd =3D open(looppath, O_RDWR)) < 0) { @@ -834,9 +831,7 @@ virFileNBDDeviceIsBusy(const char *dev_name) { g_autofree char *path =3D NULL; =20 - if (virAsprintf(&path, SYSFS_BLOCK_DIR "/%s/pid", - dev_name) < 0) - return -1; + virAsprintf(&path, SYSFS_BLOCK_DIR "/%s/pid", dev_name); =20 if (!virFileExists(path)) { if (errno =3D=3D ENOENT) @@ -868,7 +863,7 @@ virFileNBDDeviceFindUnused(void) if (rv < 0) goto cleanup; if (rv =3D=3D 0) { - ignore_value(virAsprintf(&ret, "/dev/%s", de->d_name)); + virAsprintf(&ret, "/dev/%s", de->d_name); goto cleanup; } } @@ -1013,9 +1008,7 @@ int virFileDeleteTree(const char *dir) g_autofree char *filepath =3D NULL; struct stat sb; =20 - if (virAsprintf(&filepath, "%s/%s", - dir, de->d_name) < 0) - goto cleanup; + virAsprintf(&filepath, "%s/%s", dir, de->d_name); =20 if (lstat(filepath, &sb) < 0) { virReportSystemError(errno, _("Cannot access '%s'"), @@ -1556,8 +1549,7 @@ virFileRelLinkPointsTo(const char *directory, checkLink); return -1; } - if (virAsprintf(&candidate, "%s/%s", directory, checkLink) < 0) - return -1; + virAsprintf(&candidate, "%s/%s", directory, checkLink); return virFileLinkPointsTo(candidate, checkDest); } =20 @@ -1693,8 +1685,8 @@ virFindFileInPath(const char *file) */ pathiter =3D path; while ((pathseg =3D strsep(&pathiter, ":")) !=3D NULL) { - if (virAsprintf(&fullpath, "%s/%s", pathseg, file) < 0 || - virFileIsExecutable(fullpath)) + virAsprintf(&fullpath, "%s/%s", pathseg, file); + if (virFileIsExecutable(fullpath)) break; VIR_FREE(fullpath); } @@ -1757,8 +1749,7 @@ virFileFindResourceFull(const char *filename, else path =3D installdir; =20 - if (virAsprintf(&ret, "%s/%s%s%s", path, prefix, filename, suffix) < 0) - return NULL; + virAsprintf(&ret, "%s/%s%s%s", path, prefix, filename, suffix); =20 VIR_DEBUG("Resolved '%s' to '%s'", filename, ret); return ret; @@ -2985,8 +2976,7 @@ int virFileChownFiles(const char *name, while ((direrr =3D virDirRead(dir, &ent, name)) > 0) { g_autofree char *path =3D NULL; =20 - if (virAsprintf(&path, "%s/%s", name, ent->d_name) < 0) - goto cleanup; + virAsprintf(&path, "%s/%s", name, ent->d_name); =20 if (!virFileIsRegular(path)) continue; @@ -3103,9 +3093,9 @@ virFileBuildPath(const char *dir, const char *name, c= onst char *ext) char *path; =20 if (ext =3D=3D NULL) { - ignore_value(virAsprintf(&path, "%s/%s", dir, name)); + virAsprintf(&path, "%s/%s", dir, name); } else { - ignore_value(virAsprintf(&path, "%s/%s%s", dir, name, ext)); + virAsprintf(&path, "%s/%s%s", dir, name, ext); } =20 return path; @@ -3293,8 +3283,7 @@ virFileAbsPath(const char *path, char **abspath) if (buf =3D=3D NULL) return -1; =20 - if (virAsprintf(abspath, "%s/%s", buf, path) < 0) - return -1; + virAsprintf(abspath, "%s/%s", buf, path); } =20 return 0; diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index d544d36c61..26b2fdc17f 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -627,8 +627,7 @@ virHostCPUGetInfoPopulateLinux(FILE *cpuinfo, /* OK, we've parsed clock speed out of /proc/cpuinfo. Get the * core, node, socket, thread and topology information from /sys */ - if (virAsprintf(&sysfs_nodedir, "%s/node", SYSFS_SYSTEM_PATH) < 0) - goto cleanup; + virAsprintf(&sysfs_nodedir, "%s/node", SYSFS_SYSTEM_PATH); =20 if (virDirOpenQuiet(&nodedir, sysfs_nodedir) < 0) { /* the host isn't probably running a NUMA architecture */ @@ -671,9 +670,8 @@ virHostCPUGetInfoPopulateLinux(FILE *cpuinfo, =20 (*nodes)++; =20 - if (virAsprintf(&sysfs_cpudir, "%s/node/%s", SYSFS_SYSTEM_PATH, - nodedirent->d_name) < 0) - goto cleanup; + virAsprintf(&sysfs_cpudir, "%s/node/%s", SYSFS_SYSTEM_PATH, + nodedirent->d_name); =20 if ((nodecpus =3D virHostCPUParseNode(sysfs_cpudir, arch, present_cpus_map, @@ -706,8 +704,7 @@ virHostCPUGetInfoPopulateLinux(FILE *cpuinfo, fallback: VIR_FREE(sysfs_cpudir); =20 - if (virAsprintf(&sysfs_cpudir, "%s/cpu", SYSFS_SYSTEM_PATH) < 0) - goto cleanup; + virAsprintf(&sysfs_cpudir, "%s/cpu", SYSFS_SYSTEM_PATH); =20 if ((nodecpus =3D virHostCPUParseNode(sysfs_cpudir, arch, present_cpus_map, diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c index 010eb551a9..ab40c5faaa 100644 --- a/src/util/virhostdev.c +++ b/src/util/virhostdev.c @@ -184,8 +184,7 @@ virHostdevManagerNew(void) if (!(rundir =3D virGetUserRuntimeDirectory())) return NULL; =20 - if (virAsprintf(&hostdevMgr->stateDir, "%s/hostdevmgr", rundir) < = 0) - return NULL; + virAsprintf(&hostdevMgr->stateDir, "%s/hostdevmgr", rundir); =20 old_umask =3D umask(077); =20 diff --git a/src/util/virhostmem.c b/src/util/virhostmem.c index c1dfc1225c..0d57d47529 100644 --- a/src/util/virhostmem.c +++ b/src/util/virhostmem.c @@ -280,10 +280,8 @@ virHostMemGetStats(int cellNum G_GNUC_UNUSED, return -1; } =20 - if (virAsprintf(&meminfo_path, - SYSFS_SYSTEM_PATH "/node/node%d/meminfo", - cellNum) < 0) - return -1; + virAsprintf(&meminfo_path, + SYSFS_SYSTEM_PATH "/node/node%d/meminfo", cellNum); } meminfo =3D fopen(meminfo_path, "r"); =20 @@ -318,12 +316,9 @@ virHostMemSetParameterValue(virTypedParameterPtr param) char *field =3D strchr(param->field, '_'); sa_assert(field); field++; - if (virAsprintf(&path, "%s/%s", - SYSFS_MEMORY_SHARED_PATH, field) < 0) - return -2; + virAsprintf(&path, "%s/%s", SYSFS_MEMORY_SHARED_PATH, field); =20 - if (virAsprintf(&strval, "%u", param->value.ui) =3D=3D -1) - return -2; + virAsprintf(&strval, "%u", param->value.ui); =20 if ((rc =3D virFileWriteStr(path, strval, 0)) < 0) { virReportSystemError(-rc, _("failed to set %s"), param->field); @@ -346,9 +341,7 @@ virHostMemParametersAreAllSupported(virTypedParameterPt= r params, char *field =3D strchr(param->field, '_'); sa_assert(field); field++; - if (virAsprintf(&path, "%s/%s", - SYSFS_MEMORY_SHARED_PATH, field) < 0) - return false; + virAsprintf(&path, "%s/%s", SYSFS_MEMORY_SHARED_PATH, field); =20 if (!virFileExists(path)) { virReportError(VIR_ERR_OPERATION_INVALID, @@ -412,9 +405,7 @@ virHostMemGetParameterValue(const char *field, char *tmp =3D NULL; int rc =3D -1; =20 - if (virAsprintf(&path, "%s/%s", - SYSFS_MEMORY_SHARED_PATH, field) < 0) - return -1; + virAsprintf(&path, "%s/%s", SYSFS_MEMORY_SHARED_PATH, field); =20 if (!virFileExists(path)) return -2; diff --git a/src/util/viriptables.c b/src/util/viriptables.c index e95aaa4773..e339368040 100644 --- a/src/util/viriptables.c +++ b/src/util/viriptables.c @@ -401,7 +401,7 @@ static char *iptablesFormatNetwork(virSocketAddr *netad= dr, if (!netstr) return NULL; =20 - ignore_value(virAsprintf(&ret, "%s/%d", netstr, prefix)); + virAsprintf(&ret, "%s/%d", netstr, prefix); =20 return ret; } @@ -905,31 +905,25 @@ iptablesForwardMasquerade(virFirewallPtr fw, } =20 if (port->start < port->end && port->end < 65536) { - if (virAsprintf(&portRangeStr, ":%u-%u", - port->start, port->end) < 0) - return -1; + virAsprintf(&portRangeStr, ":%u-%u", port->start, port->end); } else { virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid port range '%u-%u'."), port->start, port->end); + return -1; } } =20 /* Use --jump SNAT if public addr is specified */ if (addrStartStr && addrStartStr[0]) { - int r =3D 0; - if (addrEndStr && addrEndStr[0]) { - r =3D virAsprintf(&natRangeStr, "%s-%s%s", addrStartStr, addrE= ndStr, + virAsprintf(&natRangeStr, "%s-%s%s", addrStartStr, addrEndStr, portRangeStr ? portRangeStr : ""); } else { - r =3D virAsprintf(&natRangeStr, "%s%s", addrStartStr, + virAsprintf(&natRangeStr, "%s%s", addrStartStr, portRangeStr ? portRangeStr : ""); } =20 - if (r < 0) - return -1; - virFirewallRuleAddArgList(fw, rule, "--jump", "SNAT", "--to-source", natRangeStr, NULL); diff --git a/src/util/viriscsi.c b/src/util/viriscsi.c index ba90c41763..55a30470d6 100644 --- a/src/util/viriscsi.c +++ b/src/util/viriscsi.c @@ -213,10 +213,8 @@ virStorageBackendCreateIfaceIQN(const char *initiatori= qn, g_autofree char *temp_ifacename =3D NULL; g_autoptr(virCommand) cmd =3D NULL; =20 - if (virAsprintf(&temp_ifacename, - "libvirt-iface-%08llx", - (unsigned long long)virRandomBits(32)) < 0) - return -1; + virAsprintf(&temp_ifacename, "libvirt-iface-%08llx", + (unsigned long long)virRandomBits(32)); =20 VIR_DEBUG("Attempting to create interface '%s' with IQN '%s'", temp_ifacename, initiatoriqn); diff --git a/src/util/virjson.c b/src/util/virjson.c index eb6207f13f..ec8d706edd 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -497,8 +497,7 @@ virJSONValuePtr virJSONValueNewNumberInt(int data) { g_autofree char *str =3D NULL; - if (virAsprintf(&str, "%i", data) < 0) - return NULL; + virAsprintf(&str, "%i", data); return virJSONValueNewNumber(str); } =20 @@ -507,8 +506,7 @@ virJSONValuePtr virJSONValueNewNumberUint(unsigned int data) { g_autofree char *str =3D NULL; - if (virAsprintf(&str, "%u", data) < 0) - return NULL; + virAsprintf(&str, "%u", data); return virJSONValueNewNumber(str); } =20 @@ -517,8 +515,7 @@ virJSONValuePtr virJSONValueNewNumberLong(long long data) { g_autofree char *str =3D NULL; - if (virAsprintf(&str, "%lld", data) < 0) - return NULL; + virAsprintf(&str, "%lld", data); return virJSONValueNewNumber(str); } =20 @@ -527,8 +524,7 @@ virJSONValuePtr virJSONValueNewNumberUlong(unsigned long long data) { g_autofree char *str =3D NULL; - if (virAsprintf(&str, "%llu", data) < 0) - return NULL; + virAsprintf(&str, "%llu", data); return virJSONValueNewNumber(str); } =20 diff --git a/src/util/virkmod.c b/src/util/virkmod.c index 2f6ab90ded..962b132d31 100644 --- a/src/util/virkmod.c +++ b/src/util/virkmod.c @@ -149,8 +149,7 @@ virKModIsBlacklisted(const char *module) g_autofree char *drvblklst =3D NULL; g_autofree char *outbuf =3D NULL; =20 - if (virAsprintfQuiet(&drvblklst, "blacklist %s\n", module) < 0) - return false; + virAsprintfQuiet(&drvblklst, "blacklist %s\n", module); =20 /* modprobe will convert all '-' into '_', so we need to as well */ for (i =3D 0; i < drvblklst[i]; i++) diff --git a/src/util/virlockspace.c b/src/util/virlockspace.c index b0f73c2a8a..30868035a9 100644 --- a/src/util/virlockspace.c +++ b/src/util/virlockspace.c @@ -67,7 +67,7 @@ static char *virLockSpaceGetResourcePath(virLockSpacePtr = lockspace, { char *ret; if (lockspace->dir) - ignore_value(virAsprintf(&ret, "%s/%s", lockspace->dir, resname)); + virAsprintf(&ret, "%s/%s", lockspace->dir, resname); else ret =3D g_strdup(resname); return ret; diff --git a/src/util/virlog.c b/src/util/virlog.c index 27843363e7..bfb2430ed3 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -149,15 +149,15 @@ virLogUnlock(void) } =20 =20 -static int +static void virLogSetDefaultOutputToStderr(void) { - return virAsprintf(&virLogDefaultOutput, "%d:stderr", - virLogDefaultPriority); + virAsprintf(&virLogDefaultOutput, "%d:stderr", + virLogDefaultPriority); } =20 =20 -static int +static void virLogSetDefaultOutputToJournald(void) { virLogPriority priority =3D virLogDefaultPriority; @@ -167,7 +167,7 @@ virLogSetDefaultOutputToJournald(void) if (priority =3D=3D VIR_LOG_DEBUG) priority =3D VIR_LOG_INFO; =20 - return virAsprintf(&virLogDefaultOutput, "%d:journald", priority); + virAsprintf(&virLogDefaultOutput, "%d:journald", priority); } =20 =20 @@ -179,10 +179,8 @@ virLogSetDefaultOutputToFile(const char *binary, bool = privileged) mode_t old_umask; =20 if (privileged) { - if (virAsprintf(&virLogDefaultOutput, - "%d:file:%s/log/libvirt/%s.log", virLogDefaultPrio= rity, - LOCALSTATEDIR, binary) < 0) - goto cleanup; + virAsprintf(&virLogDefaultOutput, "%d:file:%s/log/libvirt/%s.log", + virLogDefaultPriority, LOCALSTATEDIR, binary); } else { if (!(logdir =3D virGetUserCacheDirectory())) goto cleanup; @@ -194,9 +192,8 @@ virLogSetDefaultOutputToFile(const char *binary, bool p= rivileged) } umask(old_umask); =20 - if (virAsprintf(&virLogDefaultOutput, "%d:file:%s/%s.log", - virLogDefaultPriority, logdir, binary) < 0) - goto cleanup; + virAsprintf(&virLogDefaultOutput, "%d:file:%s/%s.log", + virLogDefaultPriority, logdir, binary); } =20 ret =3D 0; @@ -216,25 +213,23 @@ virLogSetDefaultOutputToFile(const char *binary, bool= privileged) * Decides on what the default output (journald, file, stderr) should be * according to @binary, @godaemon, @privileged. This function should be r= un * exactly once at daemon startup, so no locks are used. - * - * Returns 0 on success, -1 in case of a failure. */ -int +void virLogSetDefaultOutput(const char *binary, bool godaemon, bool privileged) { bool have_journald =3D access("/run/systemd/journal/socket", W_OK) >= =3D 0; =20 if (godaemon) { if (have_journald) - return virLogSetDefaultOutputToJournald(); + virLogSetDefaultOutputToJournald(); + else + virLogSetDefaultOutputToFile(binary, privileged); } else { if (!isatty(STDIN_FILENO) && have_journald) - return virLogSetDefaultOutputToJournald(); - - return virLogSetDefaultOutputToStderr(); + virLogSetDefaultOutputToJournald(); + else + virLogSetDefaultOutputToStderr(); } - - return virLogSetDefaultOutputToFile(binary, privileged); } =20 =20 @@ -443,15 +438,13 @@ virLogOutputListFree(virLogOutputPtr *list, int count) } =20 =20 -static int +static void virLogFormatString(char **msg, int linenr, const char *funcname, virLogPriority priority, const char *str) { - int ret; - /* * Be careful when changing the following log message formatting, we r= ely * on it when stripping libvirt debug messages from qemu log files. So= when @@ -460,44 +453,38 @@ virLogFormatString(char **msg, * to just grep for it to find the right place. */ if ((funcname !=3D NULL)) { - ret =3D virAsprintfQuiet(msg, "%llu: %s : %s:%d : %s\n", - virThreadSelfID(), virLogPriorityString(pri= ority), - funcname, linenr, str); + virAsprintfQuiet(msg, "%llu: %s : %s:%d : %s\n", + virThreadSelfID(), virLogPriorityString(priority), + funcname, linenr, str); } else { - ret =3D virAsprintfQuiet(msg, "%llu: %s : %s\n", - virThreadSelfID(), virLogPriorityString(pri= ority), - str); + virAsprintfQuiet(msg, "%llu: %s : %s\n", + virThreadSelfID(), virLogPriorityString(priority), + str); } - return ret; } =20 =20 -static int +static void virLogVersionString(const char **rawmsg, char **msg) { *rawmsg =3D VIR_LOG_VERSION_STRING; - return virLogFormatString(msg, 0, NULL, VIR_LOG_INFO, VIR_LOG_VERSION_= STRING); + virLogFormatString(msg, 0, NULL, VIR_LOG_INFO, VIR_LOG_VERSION_STRING); } =20 /* Similar to virGetHostname() but avoids use of error * reporting APIs or logging APIs, to prevent recursion */ -static int +static void virLogHostnameString(char **rawmsg, char **msg) { char *hoststr; =20 - if (virAsprintfQuiet(&hoststr, "hostname: %s", virLogHostname) < 0) - return -1; + virAsprintfQuiet(&hoststr, "hostname: %s", virLogHostname); =20 - if (virLogFormatString(msg, 0, NULL, VIR_LOG_INFO, hoststr) < 0) { - VIR_FREE(hoststr); - return -1; - } + virLogFormatString(msg, 0, NULL, VIR_LOG_INFO, hoststr); *rawmsg =3D hoststr; - return 0; } =20 =20 @@ -582,7 +569,6 @@ virLogVMessage(virLogSourcePtr source, char *str =3D NULL; char *msg =3D NULL; char timestamp[VIR_TIME_STRING_BUFLEN]; - int ret; size_t i; int saved_errno =3D errno; =20 @@ -611,9 +597,7 @@ virLogVMessage(virLogSourcePtr source, if (virVasprintfQuiet(&str, fmt, vargs) < 0) goto cleanup; =20 - ret =3D virLogFormatString(&msg, linenr, funcname, priority, str); - if (ret < 0) - goto cleanup; + virLogFormatString(&msg, linenr, funcname, priority, str); =20 if (virTimeStringNowRaw(timestamp) < 0) timestamp[0] =3D '\0'; @@ -630,17 +614,18 @@ virLogVMessage(virLogSourcePtr source, const char *rawinitmsg; char *hoststr =3D NULL; char *initmsg =3D NULL; - if (virLogVersionString(&rawinitmsg, &initmsg) >=3D 0) - virLogOutputs[i]->f(&virLogSelf, VIR_LOG_INFO, - __FILE__, __LINE__, __func__, - timestamp, NULL, rawinitmsg, initm= sg, - virLogOutputs[i]->data); + virLogVersionString(&rawinitmsg, &initmsg); + virLogOutputs[i]->f(&virLogSelf, VIR_LOG_INFO, + __FILE__, __LINE__, __func__, + timestamp, NULL, rawinitmsg, initmsg, + virLogOutputs[i]->data); VIR_FREE(initmsg); - if (virLogHostnameString(&hoststr, &initmsg) >=3D 0) - virLogOutputs[i]->f(&virLogSelf, VIR_LOG_INFO, - __FILE__, __LINE__, __func__, - timestamp, NULL, hoststr, initmsg, - virLogOutputs[i]->data); + + virLogHostnameString(&hoststr, &initmsg); + virLogOutputs[i]->f(&virLogSelf, VIR_LOG_INFO, + __FILE__, __LINE__, __func__, + timestamp, NULL, hoststr, initmsg, + virLogOutputs[i]->data); VIR_FREE(hoststr); VIR_FREE(initmsg); virLogOutputs[i]->logInitMessage =3D false; @@ -656,17 +641,18 @@ virLogVMessage(virLogSourcePtr source, const char *rawinitmsg; char *hoststr =3D NULL; char *initmsg =3D NULL; - if (virLogVersionString(&rawinitmsg, &initmsg) >=3D 0) - virLogOutputToFd(&virLogSelf, VIR_LOG_INFO, - __FILE__, __LINE__, __func__, - timestamp, NULL, rawinitmsg, initmsg, - (void *) STDERR_FILENO); + virLogVersionString(&rawinitmsg, &initmsg); + virLogOutputToFd(&virLogSelf, VIR_LOG_INFO, + __FILE__, __LINE__, __func__, + timestamp, NULL, rawinitmsg, initmsg, + (void *) STDERR_FILENO); VIR_FREE(initmsg); - if (virLogHostnameString(&hoststr, &initmsg) >=3D 0) - virLogOutputToFd(&virLogSelf, VIR_LOG_INFO, - __FILE__, __LINE__, __func__, - timestamp, NULL, hoststr, initmsg, - (void *) STDERR_FILENO); + + virLogHostnameString(&hoststr, &initmsg); + virLogOutputToFd(&virLogSelf, VIR_LOG_INFO, + __FILE__, __LINE__, __func__, + timestamp, NULL, hoststr, initmsg, + (void *) STDERR_FILENO); VIR_FREE(hoststr); VIR_FREE(initmsg); logInitMessageStderr =3D false; @@ -703,9 +689,7 @@ virLogOutputToFd(virLogSourcePtr source G_GNUC_UNUSED, if (fd < 0) return; =20 - if (virAsprintfQuiet(&msg, "%s: %s", timestamp, str) < 0) - return; - + virAsprintfQuiet(&msg, "%s: %s", timestamp, str); ignore_value(safewrite(fd, msg, strlen(msg))); VIR_FREE(msg); } diff --git a/src/util/virlog.h b/src/util/virlog.h index 8846fae9aa..feb2f85904 100644 --- a/src/util/virlog.h +++ b/src/util/virlog.h @@ -181,7 +181,7 @@ void virLogFilterListFree(virLogFilterPtr *list, int co= unt); int virLogSetOutputs(const char *outputs); int virLogSetFilters(const char *filters); char *virLogGetDefaultOutput(void); -int virLogSetDefaultOutput(const char *fname, bool godaemon, bool privileg= ed); +void virLogSetDefaultOutput(const char *fname, bool godaemon, bool privile= ged); =20 /* * Internal logging API diff --git a/src/util/virmacmap.c b/src/util/virmacmap.c index 43cefc1e8e..c515e3e7b0 100644 --- a/src/util/virmacmap.c +++ b/src/util/virmacmap.c @@ -290,7 +290,7 @@ virMacMapFileName(const char *dnsmasqStateDir, { char *filename; =20 - ignore_value(virAsprintf(&filename, "%s/%s.macs", dnsmasqStateDir, bri= dge)); + virAsprintf(&filename, "%s/%s.macs", dnsmasqStateDir, bridge); =20 return filename; } diff --git a/src/util/virmdev.c b/src/util/virmdev.c index 9f8cb95423..c5fd4ad42f 100644 --- a/src/util/virmdev.c +++ b/src/util/virmdev.c @@ -80,8 +80,7 @@ virMediatedDeviceGetSysfsDeviceAPI(virMediatedDevicePtr d= ev, g_autofree char *file =3D NULL; char *tmp =3D NULL; =20 - if (virAsprintf(&file, "%s/mdev_type/device_api", dev->path) < 0) - return -1; + virAsprintf(&file, "%s/mdev_type/device_api", dev->path); =20 /* TODO - make this a generic method to access sysfs files for various * kinds of devices @@ -218,8 +217,7 @@ virMediatedDeviceGetIOMMUGroupDev(const char *uuidstr) if (!dev_path) return NULL; =20 - if (virAsprintf(&iommu_path, "%s/iommu_group", dev_path) < 0) - return NULL; + virAsprintf(&iommu_path, "%s/iommu_group", dev_path); =20 if (!virFileExists(iommu_path)) { virReportSystemError(errno, _("failed to access '%s'"), iommu_path= ); @@ -231,8 +229,7 @@ virMediatedDeviceGetIOMMUGroupDev(const char *uuidstr) return NULL; } =20 - if (virAsprintf(&vfio_path, "/dev/vfio/%s", last_component(result_path= )) < 0) - return NULL; + virAsprintf(&vfio_path, "/dev/vfio/%s", last_component(result_path)); =20 return vfio_path; } @@ -428,7 +425,7 @@ virMediatedDeviceGetSysfsPath(const char *uuidstr) { char *ret =3D NULL; =20 - ignore_value(virAsprintf(&ret, MDEV_SYSFS_DEVICES "%s", uuidstr)); + virAsprintf(&ret, MDEV_SYSFS_DEVICES "%s", uuidstr); return ret; } =20 diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 5391f0030b..20f7ef5428 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -511,8 +511,7 @@ int virNetDevSetNamespace(const char *ifname, pid_t pid= InNs) char *phy_path =3D NULL; int len; =20 - if (virAsprintf(&pid, "%lld", (long long) pidInNs) =3D=3D -1) - return -1; + virAsprintf(&pid, "%lld", (long long) pidInNs); =20 /* The 802.11 wireless devices only move together with their PHY. */ if (virNetDevSysfsFile(&phy_path, ifname, "phy80211/name") < 0) @@ -1069,8 +1068,7 @@ int virNetDevSysfsFile(char **pf_sysfs_device_link, const char *ifname, const char *file) { - if (virAsprintf(pf_sysfs_device_link, SYSFS_NET_DIR "%s/%s", ifname, f= ile) < 0) - return -1; + virAsprintf(pf_sysfs_device_link, SYSFS_NET_DIR "%s/%s", ifname, file); return 0; } =20 @@ -1078,9 +1076,8 @@ static int virNetDevSysfsDeviceFile(char **pf_sysfs_device_link, const char *ifname, const char *file) { - if (virAsprintf(pf_sysfs_device_link, SYSFS_NET_DIR "%s/device/%s", if= name, - file) < 0) - return -1; + virAsprintf(pf_sysfs_device_link, SYSFS_NET_DIR "%s/device/%s", ifname, + file); return 0; } =20 @@ -1102,8 +1099,7 @@ virNetDevIsPCIDevice(const char *devpath) char *subsys =3D NULL; bool ret =3D false; =20 - if (virAsprintf(&subsys_link, "%s/subsystem", devpath) < 0) - return false; + virAsprintf(&subsys_link, "%s/subsystem", devpath); =20 if (!virFileExists(subsys_link)) goto cleanup; @@ -1404,8 +1400,7 @@ virNetDevPFGetVF(const char *pfname, int vf, char **v= fname) if (virNetDevGetPhysPortID(pfname, &pfPhysPortID) < 0) goto cleanup; =20 - if (virAsprintf(&virtfnName, "virtfn%d", vf) < 0) - goto cleanup; + virAsprintf(&virtfnName, "virtfn%d", vf); =20 /* this provides the path to the VF's directory in sysfs, * e.g. "/sys/class/net/enp2s0f0/virtfn3" @@ -1893,8 +1888,7 @@ virNetDevSaveNetConfig(const char *linkdev, int vf, */ =20 if (pfDevName && saveVlan) { - if (virAsprintf(&filePath, "%s/%s_vf%d", stateDir, pfDevName, vf) = < 0) - goto cleanup; + virAsprintf(&filePath, "%s/%s_vf%d", stateDir, pfDevName, vf); =20 /* get admin MAC and vlan tag */ if (virNetDevGetVfConfig(pfDevName, vf, &oldMAC, &oldVlanTag) < 0) @@ -1910,8 +1904,7 @@ virNetDevSaveNetConfig(const char *linkdev, int vf, } =20 } else { - if (virAsprintf(&filePath, "%s/%s", stateDir, linkdev) < 0) - goto cleanup; + virAsprintf(&filePath, "%s/%s", stateDir, linkdev); } =20 if (linkdev) { @@ -2016,8 +2009,7 @@ virNetDevReadNetConfig(const char *linkdev, int vf, */ =20 if (pfDevName) { - if (virAsprintf(&filePath, "%s/%s_vf%d", stateDir, pfDevName, vf) = < 0) - goto cleanup; + virAsprintf(&filePath, "%s/%s_vf%d", stateDir, pfDevName, vf); =20 if (linkdev && !virFileExists(filePath)) { /* the device may have been stored in a file named for the @@ -2030,10 +2022,8 @@ virNetDevReadNetConfig(const char *linkdev, int vf, } } =20 - if (!pfDevName) { - if (virAsprintf(&filePath, "%s/%s", stateDir, linkdev) < 0) - goto cleanup; - } + if (!pfDevName) + virAsprintf(&filePath, "%s/%s", stateDir, linkdev); =20 if (!virFileExists(filePath)) { /* having no file to read is not necessarily an error, so we @@ -2913,8 +2903,7 @@ virNetDevRDMAFeature(const char *ifname, if (virDirOpen(&dirp, SYSFS_INFINIBAND_DIR) < 0) return -1; =20 - if (virAsprintf(ð_devpath, SYSFS_NET_DIR "%s/device/resource", ifna= me) < 0) - goto cleanup; + virAsprintf(ð_devpath, SYSFS_NET_DIR "%s/device/resource", ifname); =20 /* If /sys/class/net//device/resource doesn't exist it is not = a PCI * device and therefore it will not have RDMA. */ @@ -2927,9 +2916,8 @@ virNetDevRDMAFeature(const char *ifname, goto cleanup; =20 while (virDirRead(dirp, &dp, SYSFS_INFINIBAND_DIR) > 0) { - if (virAsprintf(&ib_devpath, SYSFS_INFINIBAND_DIR "%s/device/resou= rce", - dp->d_name) < 0) - continue; + virAsprintf(&ib_devpath, SYSFS_INFINIBAND_DIR "%s/device/resource", + dp->d_name); if (virFileReadAll(ib_devpath, RESOURCE_FILE_LEN, &ib_res_buf) > 0= && STREQ(eth_res_buf, ib_res_buf)) { ignore_value(virBitmapSetBit(*out, VIR_NET_DEV_FEAT_RDMA)); diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c index b90bd55d32..b7e0c0c7c1 100644 --- a/src/util/virnetdevbandwidth.c +++ b/src/util/virnetdevbandwidth.c @@ -114,8 +114,7 @@ virNetDevBandwidthManipulateFilter(const char *ifname, } =20 /* u32 filters must have 800:: prefix. Don't ask. */ - if (virAsprintf(&filter_id, "800::%u", id) < 0) - goto cleanup; + virAsprintf(&filter_id, "800::%u", id); =20 if (remove_old) { int cmd_ret =3D 0; @@ -132,10 +131,9 @@ virNetDevBandwidthManipulateFilter(const char *ifname, if (create_new) { virMacAddrGetRaw(ifmac_ptr, ifmac); =20 - if (virAsprintf(&mac[0], "0x%02x%02x%02x%02x", ifmac[2], - ifmac[3], ifmac[4], ifmac[5]) < 0 || - virAsprintf(&mac[1], "0x%02x%02x", ifmac[0], ifmac[1]) < 0) - goto cleanup; + virAsprintf(&mac[0], "0x%02x%02x%02x%02x", ifmac[2], + ifmac[3], ifmac[4], ifmac[5]); + virAsprintf(&mac[1], "0x%02x%02x", ifmac[0], ifmac[1]); =20 virCommandFree(cmd); cmd =3D virCommandNew(TC); @@ -232,14 +230,11 @@ virNetDevBandwidthSet(const char *ifname, virNetDevBandwidthClear(ifname); =20 if (tx && tx->average) { - if (virAsprintf(&average, "%llukbps", tx->average) < 0) - goto cleanup; - if (tx->peak && - (virAsprintf(&peak, "%llukbps", tx->peak) < 0)) - goto cleanup; - if (tx->burst && - (virAsprintf(&burst, "%llukb", tx->burst) < 0)) - goto cleanup; + virAsprintf(&average, "%llukbps", tx->average); + if (tx->peak) + virAsprintf(&peak, "%llukbps", tx->peak); + if (tx->burst) + virAsprintf(&burst, "%llukb", tx->burst); =20 cmd =3D virCommandNew(TC); virCommandAddArgList(cmd, "qdisc", "add", "dev", ifname, "root", @@ -362,10 +357,8 @@ virNetDevBandwidthSet(const char *ifname, } =20 if (rx) { - if (virAsprintf(&average, "%llukbps", rx->average) < 0) - goto cleanup; - if (virAsprintf(&burst, "%llukb", rx->burst ? rx->burst : rx->aver= age) < 0) - goto cleanup; + virAsprintf(&average, "%llukbps", rx->average); + virAsprintf(&burst, "%llukb", rx->burst ? rx->burst : rx->average); =20 virCommandFree(cmd); cmd =3D virCommandNew(TC); @@ -575,13 +568,12 @@ virNetDevBandwidthPlug(const char *brname, return -1; } =20 - if (virAsprintf(&class_id, "1:%x", id) < 0 || - virAsprintf(&qdisc_id, "%x:", id) < 0 || - virAsprintf(&floor, "%llukbps", bandwidth->in->floor) < 0 || - virAsprintf(&ceil, "%llukbps", net_bandwidth->in->peak ? - net_bandwidth->in->peak : - net_bandwidth->in->average) < 0) - goto cleanup; + virAsprintf(&class_id, "1:%x", id); + virAsprintf(&qdisc_id, "%x:", id); + virAsprintf(&floor, "%llukbps", bandwidth->in->floor); + virAsprintf(&ceil, "%llukbps", net_bandwidth->in->peak ? + net_bandwidth->in->peak : + net_bandwidth->in->average); =20 cmd =3D virCommandNew(TC); virCommandAddArgList(cmd, "class", "add", "dev", brname, "parent", "1:= 1", @@ -640,9 +632,8 @@ virNetDevBandwidthUnplug(const char *brname, return -1; } =20 - if (virAsprintf(&class_id, "1:%x", id) < 0 || - virAsprintf(&qdisc_id, "%x:", id) < 0) - goto cleanup; + virAsprintf(&class_id, "1:%x", id); + virAsprintf(&qdisc_id, "%x:", id); =20 cmd =3D virCommandNew(TC); virCommandAddArgList(cmd, "qdisc", "del", "dev", brname, @@ -700,12 +691,11 @@ virNetDevBandwidthUpdateRate(const char *ifname, char *rate =3D NULL; char *ceil =3D NULL; =20 - if (virAsprintf(&class_id, "1:%x", id) < 0 || - virAsprintf(&rate, "%llukbps", new_rate) < 0 || - virAsprintf(&ceil, "%llukbps", bandwidth->in->peak ? - bandwidth->in->peak : - bandwidth->in->average) < 0) - goto cleanup; + virAsprintf(&class_id, "1:%x", id); + virAsprintf(&rate, "%llukbps", new_rate); + virAsprintf(&ceil, "%llukbps", bandwidth->in->peak ? + bandwidth->in->peak : + bandwidth->in->average); =20 cmd =3D virCommandNew(TC); virCommandAddArgList(cmd, "class", "change", "dev", ifname, @@ -751,8 +741,7 @@ virNetDevBandwidthUpdateFilter(const char *ifname, int ret =3D -1; char *class_id =3D NULL; =20 - if (virAsprintf(&class_id, "1:%x", id) < 0) - goto cleanup; + virAsprintf(&class_id, "1:%x", id); =20 if (virNetDevBandwidthManipulateFilter(ifname, ifmac_ptr, id, class_id, true, true) < 0) diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c index edf4cc6236..0a0834be69 100644 --- a/src/util/virnetdevbridge.c +++ b/src/util/virnetdevbridge.c @@ -122,8 +122,7 @@ static int virNetDevBridgeSet(const char *brname, { g_autofree char *path =3D NULL; =20 - if (virAsprintf(&path, SYSFS_NET_DIR "%s/bridge/%s", brname, paramname= ) < 0) - return -1; + virAsprintf(&path, SYSFS_NET_DIR "%s/bridge/%s", brname, paramname); =20 if (virFileExists(path)) { char valuestr[INT_BUFSIZE_BOUND(value)]; @@ -165,8 +164,7 @@ static int virNetDevBridgeGet(const char *brname, g_autofree char *path =3D NULL; VIR_AUTOCLOSE fd =3D -1; =20 - if (virAsprintf(&path, SYSFS_NET_DIR "%s/bridge/%s", brname, paramname= ) < 0) - return -1; + virAsprintf(&path, SYSFS_NET_DIR "%s/bridge/%s", brname, paramname); =20 if (virFileExists(path)) { g_autofree char *valuestr =3D NULL; @@ -223,9 +221,8 @@ virNetDevBridgePortSet(const char *brname, =20 snprintf(valuestr, sizeof(valuestr), "%lu", value); =20 - if (virAsprintf(&path, SYSFS_NET_DIR "%s/brif/%s/%s", - brname, ifname, paramname) < 0) - return -1; + virAsprintf(&path, SYSFS_NET_DIR "%s/brif/%s/%s", brname, ifname, + paramname); =20 if (!virFileExists(path)) errno =3D EINVAL; @@ -251,9 +248,8 @@ virNetDevBridgePortGet(const char *brname, g_autofree char *path =3D NULL; g_autofree char *valuestr =3D NULL; =20 - if (virAsprintf(&path, SYSFS_NET_DIR "%s/brif/%s/%s", - brname, ifname, paramname) < 0) - return -1; + virAsprintf(&path, SYSFS_NET_DIR "%s/brif/%s/%s", brname, ifname, + paramname); =20 if (virFileReadAll(path, INT_BUFSIZE_BOUND(unsigned long), &valuestr) = < 0) return -1; diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c index 1bd18ea30a..057e75e5e1 100644 --- a/src/util/virnetdevip.c +++ b/src/util/virnetdevip.c @@ -487,9 +487,8 @@ virNetDevIPGetAcceptRA(const char *ifname) char *suffix; int accept_ra =3D -1; =20 - if (virAsprintf(&path, "/proc/sys/net/ipv6/conf/%s/accept_ra", - ifname ? ifname : "all") < 0) - return -1; + virAsprintf(&path, "/proc/sys/net/ipv6/conf/%s/accept_ra", + ifname ? ifname : "all"); =20 if ((virFileReadAll(path, 512, &buf) < 0) || (virStrToLong_i(buf, &suffix, 10, &accept_ra) < 0)) diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index 2ccd83d1bb..11fcb96400 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -294,8 +294,7 @@ virNetDevMacVLanIsMacvtap(const char *ifname) if (virNetDevGetIndex(ifname, &ifindex) < 0) return false; =20 - if (virAsprintf(&tapname, "/dev/tap%d", ifindex) < 0) - return false; + virAsprintf(&tapname, "/dev/tap%d", ifindex); =20 return virFileExists(tapname); } @@ -393,8 +392,7 @@ virNetDevMacVLanTapOpen(const char *ifname, if (virNetDevGetIndex(ifname, &ifindex) < 0) return -1; =20 - if (virAsprintf(&tapname, "/dev/tap%d", ifindex) < 0) - goto cleanup; + virAsprintf(&tapname, "/dev/tap%d", ifindex); =20 for (i =3D 0; i < tapfdSize; i++) { int fd =3D -1; diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitc= h.c index 1d2bbf9dd7..9862e550b7 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -151,19 +151,13 @@ int virNetDevOpenvswitchAddPort(const char *brname, c= onst char *ifname, virUUIDFormat(ovsport->interfaceID, ifuuidstr); virUUIDFormat(vmuuid, vmuuidstr); =20 - if (virAsprintf(&attachedmac_ex_id, "external-ids:attached-mac=3D\"%s\= "", - macaddrstr) < 0) - return -1; - if (virAsprintf(&ifaceid_ex_id, "external-ids:iface-id=3D\"%s\"", - ifuuidstr) < 0) - return -1; - if (virAsprintf(&vmid_ex_id, "external-ids:vm-id=3D\"%s\"", - vmuuidstr) < 0) - return -1; + virAsprintf(&attachedmac_ex_id, "external-ids:attached-mac=3D\"%s\"", + macaddrstr); + virAsprintf(&ifaceid_ex_id, "external-ids:iface-id=3D\"%s\"", ifuuidst= r); + virAsprintf(&vmid_ex_id, "external-ids:vm-id=3D\"%s\"", vmuuidstr); if (ovsport->profileID[0] !=3D '\0') { - if (virAsprintf(&profile_ex_id, "external-ids:port-profile=3D\"%s\= "", - ovsport->profileID) < 0) - return -1; + virAsprintf(&profile_ex_id, "external-ids:port-profile=3D\"%s\"", + ovsport->profileID); } =20 cmd =3D virCommandNew(OVSVSCTL); diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index fe4f55f8fc..23f2882bc3 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -395,8 +395,7 @@ int virNetDevTapCreate(char **ifname, for (i =3D 0; i <=3D IF_MAXUNIT; i++) { g_autofree char *newname =3D NULL; =20 - if (virAsprintf(&newname, *ifname, i) < 0) - goto cleanup; + virAsprintf(&newname, *ifname, i); =20 if (virNetDevExists(newname) =3D=3D 0) { newifname =3D g_steal_pointer(&newname); @@ -416,8 +415,7 @@ int virNetDevTapCreate(char **ifname, =20 if (tapfd) { g_autofree char *dev_path =3D NULL; - if (virAsprintf(&dev_path, "/dev/%s", ifr.ifr_name) < 0) - goto cleanup; + virAsprintf(&dev_path, "/dev/%s", ifr.ifr_name); =20 if ((*tapfd =3D open(dev_path, O_RDWR)) < 0) { virReportSystemError(errno, diff --git a/src/util/virnetdevveth.c b/src/util/virnetdevveth.c index 4e10cdf12b..5e5074dd68 100644 --- a/src/util/virnetdevveth.c +++ b/src/util/virnetdevveth.c @@ -44,8 +44,7 @@ static int virNetDevVethExists(int devNum) int ret; g_autofree char *path =3D NULL; =20 - if (virAsprintf(&path, SYSFS_NET_DIR "vnet%d/", devNum) < 0) - return -1; + virAsprintf(&path, SYSFS_NET_DIR "vnet%d/", devNum); ret =3D virFileExists(path) ? 1 : 0; VIR_DEBUG("Checked dev vnet%d usage: %d", devNum, ret); return ret; @@ -128,8 +127,7 @@ int virNetDevVethCreate(char** veth1, char** veth2) if ((veth1num =3D virNetDevVethGetFreeNum(vethNum)) < 0) goto cleanup; =20 - if (virAsprintf(&veth1auto, "vnet%d", veth1num) < 0) - goto cleanup; + virAsprintf(&veth1auto, "vnet%d", veth1num); vethNum =3D veth1num + 1; } if (!*veth2) { @@ -137,8 +135,7 @@ int virNetDevVethCreate(char** veth1, char** veth2) if ((veth2num =3D virNetDevVethGetFreeNum(vethNum)) < 0) goto cleanup; =20 - if (virAsprintf(&veth2auto, "vnet%d", veth2num) < 0) - goto cleanup; + virAsprintf(&veth2auto, "vnet%d", veth2num); vethNum =3D veth2num + 1; } =20 diff --git a/src/util/virnuma.c b/src/util/virnuma.c index 448833d8d1..e6213df6da 100644 --- a/src/util/virnuma.c +++ b/src/util/virnuma.c @@ -538,23 +538,20 @@ virNumaGetHugePageInfoPath(char **path, unsigned int page_size, const char *suffix) { - int ret; - if (node =3D=3D -1) { /* We are aiming at overall system info */ - ret =3D virAsprintf(path, - HUGEPAGES_SYSTEM_PREFIX HUGEPAGES_PREFIX "%ukB/%= s", - page_size, NULLSTR_EMPTY(suffix)); + virAsprintf(path, + HUGEPAGES_SYSTEM_PREFIX HUGEPAGES_PREFIX "%ukB/%s", + page_size, NULLSTR_EMPTY(suffix)); } else { /* We are aiming on specific NUMA node */ - ret =3D virAsprintf(path, - HUGEPAGES_NUMA_PREFIX "node%d/hugepages/" - HUGEPAGES_PREFIX "%ukB/%s", - node, page_size, NULLSTR_EMPTY(suffix)); + virAsprintf(path, + HUGEPAGES_NUMA_PREFIX "node%d/hugepages/" + HUGEPAGES_PREFIX "%ukB/%s", + node, page_size, NULLSTR_EMPTY(suffix)); } =20 - if (ret >=3D 0 && !virFileExists(*path)) { - ret =3D -1; + if (!virFileExists(*path)) { if (node !=3D -1) { if (!virNumaNodeIsAvailable(node)) { virReportError(VIR_ERR_OPERATION_FAILED, @@ -570,9 +567,10 @@ virNumaGetHugePageInfoPath(char **path, _("page size %u is not available"), page_size); } + return -1; } =20 - return ret; + return 0; } =20 static int @@ -582,9 +580,10 @@ virNumaGetHugePageInfoDir(char **path, int node) *path =3D g_strdup(HUGEPAGES_SYSTEM_PREFIX); return 0; } else { - return virAsprintf(path, - HUGEPAGES_NUMA_PREFIX "node%d/hugepages/", - node); + virAsprintf(path, + HUGEPAGES_NUMA_PREFIX "node%d/hugepages/", + node); + return 0; } } =20 @@ -930,8 +929,7 @@ virNumaSetPagePoolSize(int node, * all the pages we wanted. So do the second read to check. */ VIR_FREE(nr_buf); - if (virAsprintf(&nr_buf, "%llu", page_count) < 0) - return -1; + virAsprintf(&nr_buf, "%llu", page_count); =20 if (virFileWriteStr(nr_path, nr_buf, 0) < 0) { virReportSystemError(errno, diff --git a/src/util/virpci.c b/src/util/virpci.c index f9e39e79d8..3ae13469bd 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -213,7 +213,7 @@ virPCIDriverDir(const char *driver) { char *buffer; =20 - ignore_value(virAsprintf(&buffer, PCI_SYSFS "drivers/%s", driver)); + virAsprintf(&buffer, PCI_SYSFS "drivers/%s", driver); return buffer; } =20 @@ -223,7 +223,7 @@ virPCIFile(const char *device, const char *file) { char *buffer; =20 - ignore_value(virAsprintf(&buffer, PCI_SYSFS "devices/%s/%s", device, f= ile)); + virAsprintf(&buffer, PCI_SYSFS "devices/%s/%s", device, file); return buffer; } =20 @@ -604,8 +604,7 @@ virPCIDeviceDetectFunctionLevelReset(virPCIDevicePtr de= v, int cfgfd) * device is a VF, we just assume FLR works */ =20 - if (virAsprintf(&path, PCI_SYSFS "devices/%s/physfn", dev->name) < 0) - return -1; + virAsprintf(&path, PCI_SYSFS "devices/%s/physfn", dev->name); =20 found =3D virFileExists(path); if (found) { @@ -1354,12 +1353,12 @@ virPCIDeviceAddressAsString(const virPCIDeviceAddre= ss *addr) { char *str; =20 - ignore_value(virAsprintf(&str, - VIR_PCI_DEVICE_ADDRESS_FMT, - addr->domain, - addr->bus, - addr->slot, - addr->function)); + virAsprintf(&str, + VIR_PCI_DEVICE_ADDRESS_FMT, + addr->domain, + addr->bus, + addr->slot, + addr->function); return str; } =20 @@ -1381,14 +1380,10 @@ virPCIDeviceNew(unsigned int domain, dev->address.slot =3D slot; dev->address.function =3D function; =20 - if (virAsprintf(&dev->name, - VIR_PCI_DEVICE_ADDRESS_FMT, - domain, bus, slot, function) < 0) - return NULL; + virAsprintf(&dev->name, VIR_PCI_DEVICE_ADDRESS_FMT, domain, bus, slot, + function); =20 - if (virAsprintf(&dev->path, PCI_SYSFS "devices/%s/config", - dev->name) < 0) - return NULL; + virAsprintf(&dev->path, PCI_SYSFS "devices/%s/config", dev->name); =20 if (!virFileExists(dev->path)) { virReportSystemError(errno, @@ -1733,10 +1728,9 @@ int virPCIDeviceFileIterate(virPCIDevicePtr dev, struct dirent *ent; int direrr; =20 - if (virAsprintf(&pcidir, "/sys/bus/pci/devices/" VIR_PCI_DEVICE_ADDRES= S_FMT, - dev->address.domain, dev->address.bus, - dev->address.slot, dev->address.function) < 0) - goto cleanup; + virAsprintf(&pcidir, "/sys/bus/pci/devices/" VIR_PCI_DEVICE_ADDRESS_FM= T, + dev->address.domain, dev->address.bus, dev->address.slot, + dev->address.function); =20 if (virDirOpen(&dir, pcidir) < 0) goto cleanup; @@ -1753,8 +1747,7 @@ int virPCIDeviceFileIterate(virPCIDevicePtr dev, STREQ(ent->d_name, "vendor") || STREQ(ent->d_name, "device") || STREQ(ent->d_name, "reset")) { - if (virAsprintf(&file, "%s/%s", pcidir, ent->d_name) < 0) - goto cleanup; + virAsprintf(&file, "%s/%s", pcidir, ent->d_name); if ((actor)(dev, file, opaque) < 0) goto cleanup; } @@ -1786,10 +1779,9 @@ virPCIDeviceAddressIOMMUGroupIterate(virPCIDeviceAdd= ressPtr orig, struct dirent *ent; int direrr; =20 - if (virAsprintf(&groupPath, - PCI_SYSFS "devices/" VIR_PCI_DEVICE_ADDRESS_FMT "/iomm= u_group/devices", - orig->domain, orig->bus, orig->slot, orig->function) <= 0) - goto cleanup; + virAsprintf(&groupPath, + PCI_SYSFS "devices/" VIR_PCI_DEVICE_ADDRESS_FMT "/iommu_gr= oup/devices", + orig->domain, orig->bus, orig->slot, orig->function); =20 if (virDirOpenQuiet(&groupDir, groupPath) < 0) { /* just process the original device, nothing more */ @@ -1936,10 +1928,8 @@ virPCIDeviceAddressGetIOMMUGroupNum(virPCIDeviceAddr= essPtr addr) const char *groupNumStr; unsigned int groupNum; =20 - if (virAsprintf(&devName, - VIR_PCI_DEVICE_ADDRESS_FMT, - addr->domain, addr->bus, addr->slot, addr->function) <= 0) - return -1; + virAsprintf(&devName, VIR_PCI_DEVICE_ADDRESS_FMT, addr->domain, addr->= bus, + addr->slot, addr->function); =20 if (!(devPath =3D virPCIFile(devName, "iommu_group"))) return -1; @@ -1989,9 +1979,7 @@ virPCIDeviceGetIOMMUGroupDev(virPCIDevicePtr dev) dev->name, devPath); return NULL; } - if (virAsprintf(&groupDev, "/dev/vfio/%s", - last_component(groupPath)) < 0) - return NULL; + virAsprintf(&groupDev, "/dev/vfio/%s", last_component(groupPath)); =20 return groupDev; } @@ -2290,8 +2278,7 @@ virPCIGetVirtualFunctions(const char *sysfs_path, *num_virtual_functions =3D 0; *max_virtual_functions =3D 0; =20 - if (virAsprintf(&totalvfs_file, "%s/sriov_totalvfs", sysfs_path) < 0) - goto error; + virAsprintf(&totalvfs_file, "%s/sriov_totalvfs", sysfs_path); if (virFileExists(totalvfs_file)) { char *end =3D NULL; /* so that terminating \n doesn't create error= */ =20 @@ -2308,8 +2295,8 @@ virPCIGetVirtualFunctions(const char *sysfs_path, do { g_autofree char *device_link =3D NULL; /* look for virtfn%d links until one isn't found */ - if (virAsprintf(&device_link, "%s/virtfn%zu", sysfs_path, *num_vir= tual_functions) < 0) - goto error; + virAsprintf(&device_link, "%s/virtfn%zu", sysfs_path, + *num_virtual_functions); =20 if (!virFileExists(device_link)) break; @@ -2350,9 +2337,7 @@ virPCIIsVirtualFunction(const char *vf_sysfs_device_l= ink) { g_autofree char *vf_sysfs_physfn_link =3D NULL; =20 - if (virAsprintf(&vf_sysfs_physfn_link, "%s/physfn", - vf_sysfs_device_link) < 0) - return -1; + virAsprintf(&vf_sysfs_physfn_link, "%s/physfn", vf_sysfs_device_link); =20 return virFileExists(vf_sysfs_physfn_link); } @@ -2410,9 +2395,8 @@ virPCIGetVirtualFunctionIndex(const char *pf_sysfs_de= vice_link, int virPCIGetSysfsFile(char *virPCIDeviceName, char **pci_sysfs_device_link) { - if (virAsprintf(pci_sysfs_device_link, PCI_SYSFS "devices/%s", - virPCIDeviceName) < 0) - return -1; + virAsprintf(pci_sysfs_device_link, PCI_SYSFS "devices/%s", + virPCIDeviceName); return 0; } =20 @@ -2420,11 +2404,9 @@ int virPCIDeviceAddressGetSysfsFile(virPCIDeviceAddressPtr addr, char **pci_sysfs_device_link) { - if (virAsprintf(pci_sysfs_device_link, - PCI_SYSFS "devices/" VIR_PCI_DEVICE_ADDRESS_FMT, - addr->domain, addr->bus, - addr->slot, addr->function) < 0) - return -1; + virAsprintf(pci_sysfs_device_link, + PCI_SYSFS "devices/" VIR_PCI_DEVICE_ADDRESS_FMT, addr->dom= ain, + addr->bus, addr->slot, addr->function); return 0; } =20 @@ -2609,8 +2591,7 @@ virPCIGetMdevTypes(const char *sysfspath, size_t ntypes =3D 0; size_t i; =20 - if (virAsprintf(&types_path, "%s/mdev_supported_types", sysfspath) < 0) - return -1; + virAsprintf(&types_path, "%s/mdev_supported_types", sysfspath); =20 if ((dirret =3D virDirOpenIfExists(&dir, types_path)) < 0) goto cleanup; @@ -2623,8 +2604,7 @@ virPCIGetMdevTypes(const char *sysfspath, while ((dirret =3D virDirRead(dir, &entry, types_path)) > 0) { g_autofree char *tmppath =3D NULL; /* append the type id to the path and read the attributes from the= re */ - if (virAsprintf(&tmppath, "%s/%s", types_path, entry->d_name) < 0) - goto cleanup; + virAsprintf(&tmppath, "%s/%s", types_path, entry->d_name); =20 if (virMediatedDeviceTypeReadAttrs(tmppath, &mdev_type) < 0) goto cleanup; diff --git a/src/util/virpidfile.c b/src/util/virpidfile.c index f7849d91a6..2faa6215e4 100644 --- a/src/util/virpidfile.c +++ b/src/util/virpidfile.c @@ -233,8 +233,7 @@ int virPidFileReadPathIfAlive(const char *path, goto cleanup; } =20 - if (virAsprintf(&procPath, "/proc/%lld/exe", (long long)retPid) < 0) - return -ENOMEM; + virAsprintf(&procPath, "/proc/%lld/exe", (long long)retPid); =20 if ((ret =3D virFileIsLink(procPath)) < 0) return ret; @@ -495,8 +494,7 @@ virPidFileConstructPath(bool privileged, "%s", _("No runstatedir specified")); return -1; } - if (virAsprintf(pidfile, "%s/%s.pid", runstatedir, progname) < 0) - return -1; + virAsprintf(pidfile, "%s/%s.pid", runstatedir, progname); } else { if (!(rundir =3D virGetUserRuntimeDirectory())) return -1; @@ -508,8 +506,7 @@ virPidFileConstructPath(bool privileged, return -1; } =20 - if (virAsprintf(pidfile, "%s/%s.pid", rundir, progname) < 0) - return -1; + virAsprintf(pidfile, "%s/%s.pid", rundir, progname); } =20 return 0; diff --git a/src/util/virprocess.c b/src/util/virprocess.c index b5fda05e0c..032d09e904 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -129,13 +129,13 @@ virProcessTranslateStatus(int status) { char *buf; if (WIFEXITED(status)) { - ignore_value(virAsprintfQuiet(&buf, _("exit status %d"), - WEXITSTATUS(status))); + virAsprintfQuiet(&buf, _("exit status %d"), + WEXITSTATUS(status)); } else if (WIFSIGNALED(status)) { - ignore_value(virAsprintfQuiet(&buf, _("fatal signal %d"), - WTERMSIG(status))); + virAsprintfQuiet(&buf, _("fatal signal %d"), + WTERMSIG(status)); } else { - ignore_value(virAsprintfQuiet(&buf, _("invalid value %d"), status)= ); + virAsprintfQuiet(&buf, _("invalid value %d"), status); } return buf; } @@ -586,8 +586,7 @@ int virProcessGetPids(pid_t pid, size_t *npids, pid_t *= *pids) *npids =3D 0; *pids =3D NULL; =20 - if (virAsprintf(&taskPath, "/proc/%llu/task", (long long) pid) < 0) - goto cleanup; + virAsprintf(&taskPath, "/proc/%llu/task", (long long)pid); =20 if (virDirOpen(&dir, taskPath) < 0) goto cleanup; @@ -632,10 +631,7 @@ int virProcessGetNamespaces(pid_t pid, int fd; g_autofree char *nsfile =3D NULL; =20 - if (virAsprintf(&nsfile, "/proc/%llu/ns/%s", - (long long) pid, - ns[i]) < 0) - goto cleanup; + virAsprintf(&nsfile, "/proc/%llu/ns/%s", (long long)pid, ns[i]); =20 if ((fd =3D open(nsfile, O_RDONLY)) >=3D 0) { if (VIR_EXPAND_N(*fdlist, *nfdlist, 1) < 0) { @@ -954,8 +950,7 @@ int virProcessGetStartTime(pid_t pid, g_autofree char *buf =3D NULL; VIR_AUTOSTRINGLIST tokens =3D NULL; =20 - if (virAsprintf(&filename, "/proc/%llu/stat", (long long) pid) < 0) - return -1; + virAsprintf(&filename, "/proc/%llu/stat", (long long)pid); =20 if ((len =3D virFileReadAll(filename, 1024, &buf)) < 0) return -1; @@ -1054,8 +1049,7 @@ static int virProcessNamespaceHelper(pid_t pid G_GNUC= _UNUSED, int ret =3D -1; g_autofree char *path =3D NULL; =20 - if (virAsprintf(&path, "/proc/%lld/ns/mnt", (long long) data->pid) < 0) - goto cleanup; + virAsprintf(&path, "/proc/%lld/ns/mnt", (long long)data->pid); =20 if ((fd =3D open(path, O_RDONLY)) < 0) { virReportSystemError(errno, "%s", diff --git a/src/util/virqemu.c b/src/util/virqemu.c index 162c3c603f..1eee238771 100644 --- a/src/util/virqemu.c +++ b/src/util/virqemu.c @@ -89,8 +89,7 @@ virQEMUBuildCommandLineJSONArrayNumbered(const char *key, member =3D virJSONValueArrayGet((virJSONValuePtr) array, i); g_autofree char *prefix =3D NULL; =20 - if (virAsprintf(&prefix, "%s.%zu", key, i) < 0) - return 0; + virAsprintf(&prefix, "%s.%zu", key, i); =20 if (virQEMUBuildCommandLineJSONRecurse(prefix, member, buf, virQEMUBuildCommandLineJSON= ArrayNumbered, @@ -113,8 +112,7 @@ virQEMUBuildCommandLineJSONIterate(const char *key, if (data->prefix) { g_autofree char *tmpkey =3D NULL; =20 - if (virAsprintf(&tmpkey, "%s.%s", data->prefix, key) < 0) - return -1; + virAsprintf(&tmpkey, "%s.%s", data->prefix, key); =20 return virQEMUBuildCommandLineJSONRecurse(tmpkey, value, data->buf, data->arrayFunc, false); diff --git a/src/util/virrandom.c b/src/util/virrandom.c index 8dcab1ac47..12ea9bbbdc 100644 --- a/src/util/virrandom.c +++ b/src/util/virrandom.c @@ -194,8 +194,7 @@ virRandomGenerateWWN(char **wwn, return -1; } =20 - if (virAsprintf(wwn, "5" "%s%09llx", oui, - (unsigned long long)virRandomBits(36)) < 0) - return -1; + virAsprintf(wwn, "5" "%s%09llx", oui, + (unsigned long long)virRandomBits(36)); return 0; } diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c index 29ea52a16f..55c15d04a4 100644 --- a/src/util/virresctrl.c +++ b/src/util/virresctrl.c @@ -2319,8 +2319,7 @@ virResctrlDeterminePath(const char *parentpath, return NULL; } =20 - if (virAsprintf(&path, "%s/%s-%s", parentpath, prefix, id) < 0) - return NULL; + virAsprintf(&path, "%s/%s-%s", parentpath, prefix, id); =20 return path; } @@ -2416,8 +2415,7 @@ virResctrlAllocCreate(virResctrlInfoPtr resctrl, if (!alloc_str) goto cleanup; =20 - if (virAsprintf(&schemata_path, "%s/schemata", alloc->path) < 0) - goto cleanup; + virAsprintf(&schemata_path, "%s/schemata", alloc->path); =20 VIR_DEBUG("Writing resctrl schemata '%s' into '%s'", alloc_str, schema= ta_path); if (virFileWriteStr(schemata_path, alloc_str, 0) < 0) { @@ -2451,11 +2449,9 @@ virResctrlAddPID(const char *path, return -1; } =20 - if (virAsprintf(&tasks, "%s/tasks", path) < 0) - return -1; + virAsprintf(&tasks, "%s/tasks", path); =20 - if (virAsprintf(&pidstr, "%lld", (long long int) pid) < 0) - goto cleanup; + virAsprintf(&pidstr, "%lld", (long long int)pid); =20 if (virFileWriteStr(tasks, pidstr, 0) < 0) { virReportSystemError(errno, @@ -2566,8 +2562,7 @@ virResctrlMonitorDeterminePath(virResctrlMonitorPtr m= onitor, return 0; } =20 - if (virAsprintf(&parentpath, "%s/mon_groups", monitor->alloc->path) < = 0) - return -1; + virAsprintf(&parentpath, "%s/mon_groups", monitor->alloc->path); =20 monitor->path =3D virResctrlDeterminePath(parentpath, machinename, monitor->id); @@ -2699,8 +2694,7 @@ virResctrlMonitorGetStats(virResctrlMonitorPtr monito= r, return -1; } =20 - if (virAsprintf(&datapath, "%s/mon_data", monitor->path) < 0) - return -1; + virAsprintf(&datapath, "%s/mon_data", monitor->path); =20 if (virDirOpen(&dirp, datapath) < 0) goto cleanup; @@ -2717,8 +2711,7 @@ virResctrlMonitorGetStats(virResctrlMonitorPtr monito= r, * "mon_L3_01" are two target directories for a two nodes system * with resource utilization data file for each node respectively. */ - if (virAsprintf(&filepath, "%s/%s", datapath, ent->d_name) < 0) - goto cleanup; + virAsprintf(&filepath, "%s/%s", datapath, ent->d_name); =20 if (!virFileIsDir(filepath)) continue; diff --git a/src/util/virrotatingfile.c b/src/util/virrotatingfile.c index 82a677b743..826a3db2c2 100644 --- a/src/util/virrotatingfile.c +++ b/src/util/virrotatingfile.c @@ -195,8 +195,7 @@ virRotatingFileWriterDelete(virRotatingFileWriterPtr fi= le) =20 for (i =3D 0; i < file->maxbackup; i++) { char *oldpath; - if (virAsprintf(&oldpath, "%s.%zu", file->basepath, i) < 0) - return -1; + virAsprintf(&oldpath, "%s.%zu", file->basepath, i); =20 if (unlink(oldpath) < 0 && errno !=3D ENOENT) { @@ -308,8 +307,7 @@ virRotatingFileReaderNew(const char *path, =20 for (i =3D 0; i < maxbackup; i++) { char *tmppath; - if (virAsprintf(&tmppath, "%s.%zu", path, i) < 0) - goto error; + virAsprintf(&tmppath, "%s.%zu", path, i); =20 file->entries[file->nentries - (i + 2)] =3D virRotatingFileReaderE= ntryNew(tmppath); VIR_FREE(tmppath); @@ -382,15 +380,13 @@ virRotatingFileWriterRollover(virRotatingFileWriterPt= r file) goto cleanup; } } else { - if (virAsprintf(&nextpath, "%s.%zu", file->basepath, file->maxback= up - 1) < 0) - return -1; + virAsprintf(&nextpath, "%s.%zu", file->basepath, file->maxbackup -= 1); =20 for (i =3D file->maxbackup; i > 0; i--) { if (i =3D=3D 1) { thispath =3D g_strdup(file->basepath); } else { - if (virAsprintf(&thispath, "%s.%zu", file->basepath, i - 2= ) < 0) - goto cleanup; + virAsprintf(&thispath, "%s.%zu", file->basepath, i - 2); } VIR_DEBUG("Rollover %s -> %s", thispath, nextpath); =20 diff --git a/src/util/virscsi.c b/src/util/virscsi.c index 705571f8ec..0f28c617b0 100644 --- a/src/util/virscsi.c +++ b/src/util/virscsi.c @@ -117,10 +117,8 @@ virSCSIDeviceGetSgName(const char *sysfs_prefix, if (virSCSIDeviceGetAdapterId(adapter, &adapter_id) < 0) return NULL; =20 - if (virAsprintf(&path, - "%s/%d:%u:%u:%llu/scsi_generic", - prefix, adapter_id, bus, target, unit) < 0) - return NULL; + virAsprintf(&path, "%s/%d:%u:%u:%llu/scsi_generic", prefix, adapter_id, + bus, target, unit); =20 if (virDirOpen(&dir, path) < 0) goto cleanup; @@ -156,10 +154,8 @@ virSCSIDeviceGetDevName(const char *sysfs_prefix, if (virSCSIDeviceGetAdapterId(adapter, &adapter_id) < 0) return NULL; =20 - if (virAsprintf(&path, - "%s/%d:%u:%u:%llu/block", - prefix, adapter_id, bus, target, unit) < 0) - return NULL; + virAsprintf(&path, "%s/%d:%u:%u:%llu/block", prefix, adapter_id, bus, + target, unit); =20 if (virDirOpen(&dir, path) < 0) goto cleanup; @@ -207,11 +203,10 @@ virSCSIDeviceNew(const char *sysfs_prefix, if (virSCSIDeviceGetAdapterId(adapter, &dev->adapter) < 0) return NULL; =20 - if (virAsprintf(&dev->name, "%d:%u:%u:%llu", dev->adapter, - dev->bus, dev->target, dev->unit) < 0 || - virAsprintf(&dev->sg_path, "%s/%s", - sysfs_prefix ? sysfs_prefix : "/dev", sg) < 0) - return NULL; + virAsprintf(&dev->name, "%d:%u:%u:%llu", dev->adapter, + dev->bus, dev->target, dev->unit); + virAsprintf(&dev->sg_path, "%s/%s", + sysfs_prefix ? sysfs_prefix : "/dev", sg); =20 if (!virFileExists(dev->sg_path)) { virReportSystemError(errno, @@ -220,11 +215,8 @@ virSCSIDeviceNew(const char *sysfs_prefix, return NULL; } =20 - if (virAsprintf(&vendor_path, - "%s/%s/vendor", prefix, dev->name) < 0 || - virAsprintf(&model_path, - "%s/%s/model", prefix, dev->name) < 0) - return NULL; + virAsprintf(&vendor_path, "%s/%s/vendor", prefix, dev->name); + virAsprintf(&model_path, "%s/%s/model", prefix, dev->name); =20 if (virFileReadAll(vendor_path, 1024, &vendor) < 0) return NULL; @@ -235,8 +227,7 @@ virSCSIDeviceNew(const char *sysfs_prefix, virTrimSpaces(vendor, NULL); virTrimSpaces(model, NULL); =20 - if (virAsprintf(&dev->id, "%s:%s", vendor, model) < 0) - return NULL; + virAsprintf(&dev->id, "%s:%s", vendor, model); =20 ret =3D g_steal_pointer(&dev); return ret; diff --git a/src/util/virscsihost.c b/src/util/virscsihost.c index 10524f49fa..53da460fdf 100644 --- a/src/util/virscsihost.c +++ b/src/util/virscsihost.c @@ -52,10 +52,8 @@ virSCSIHostGetUniqueId(const char *sysfs_prefix, char *buf =3D NULL; int unique_id; =20 - if (virAsprintf(&sysfs_path, "%s/host%d/unique_id", - sysfs_prefix ? sysfs_prefix : SYSFS_SCSI_HOST_PATH, - host) < 0) - return -1; + virAsprintf(&sysfs_path, "%s/host%d/unique_id", + sysfs_prefix ? sysfs_prefix : SYSFS_SCSI_HOST_PATH, host); =20 if (virFileReadAll(sysfs_path, 1024, &buf) < 0) goto cleanup; @@ -118,8 +116,7 @@ virSCSIHostFindByPCI(const char *sysfs_prefix, if (!virFileIsLink(entry->d_name)) continue; =20 - if (virAsprintf(&host_link, "%s/%s", prefix, entry->d_name) < 0) - goto cleanup; + virAsprintf(&host_link, "%s/%s", prefix, entry->d_name); =20 if (virFileResolveLink(host_link, &host_path) < 0) goto cleanup; @@ -132,9 +129,7 @@ virSCSIHostFindByPCI(const char *sysfs_prefix, VIR_FREE(host_link); VIR_FREE(host_path); =20 - if (virAsprintf(&unique_path, "%s/%s/unique_id", prefix, - entry->d_name) < 0) - goto cleanup; + virAsprintf(&unique_path, "%s/%s/unique_id", prefix, entry->d_name= ); =20 if (!virFileExists(unique_path)) { VIR_FREE(unique_path); @@ -240,9 +235,8 @@ virSCSIHostGetNameByParentaddr(unsigned int domain, char *name =3D NULL; char *parentaddr =3D NULL; =20 - if (virAsprintf(&parentaddr, "%04x:%02x:%02x.%01x", - domain, bus, slot, function) < 0) - goto cleanup; + virAsprintf(&parentaddr, "%04x:%02x:%02x.%01x", domain, bus, slot, + function); if (!(name =3D virSCSIHostFindByPCI(NULL, parentaddr, unique_id))) { virReportError(VIR_ERR_XML_ERROR, _("Failed to find scsi_host using PCI '%s' " diff --git a/src/util/virscsivhost.c b/src/util/virscsivhost.c index 5f523636be..4687c30f97 100644 --- a/src/util/virscsivhost.c +++ b/src/util/virscsivhost.c @@ -256,9 +256,7 @@ virSCSIVHostDeviceNew(const char *name) =20 dev->name =3D g_strdup(name); =20 - if (virAsprintf(&dev->path, "%s/%s", - SYSFS_VHOST_SCSI_DEVICES, name) < 0) - return NULL; + virAsprintf(&dev->path, "%s/%s", SYSFS_VHOST_SCSI_DEVICES, name); =20 VIR_DEBUG("%s: initialized", dev->name); =20 diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c index efe942b44c..ba1cde05cd 100644 --- a/src/util/virsocketaddr.c +++ b/src/util/virsocketaddr.c @@ -477,9 +477,8 @@ virSocketAddrFormatFull(const virSocketAddr *addr, * nicely for UNIX sockets */ if (addr->data.sa.sa_family =3D=3D AF_UNIX) { if (withService) { - if (virAsprintf(&addrstr, VIR_LOOPBACK_IPV4_ADDR"%s0", - separator ? separator : ":") < 0) - return NULL; + virAsprintf(&addrstr, VIR_LOOPBACK_IPV4_ADDR "%s0", + separator ? separator : ":"); } else { addrstr =3D g_strdup(VIR_LOOPBACK_IPV4_ADDR); } @@ -503,16 +502,12 @@ virSocketAddrFormatFull(const virSocketAddr *addr, * a.b.c.d;port or e:f:g:h:i:j:k:l;port, so use square brackets for * IPv6 only if no separator is passed to the function */ - if (!separator && VIR_SOCKET_ADDR_FAMILY(addr) =3D=3D AF_INET6) { - if (virAsprintf(&ipv6_host, "[%s]", host) < 0) - return NULL; - } + if (!separator && VIR_SOCKET_ADDR_FAMILY(addr) =3D=3D AF_INET6) + virAsprintf(&ipv6_host, "[%s]", host); =20 - if (virAsprintf(&addrstr, "%s%s%s", - ipv6_host ? ipv6_host : host, - separator ? separator : ":", port) =3D=3D -1) { - return NULL; - } + virAsprintf(&addrstr, "%s%s%s", + ipv6_host ? ipv6_host : host, + separator ? separator : ":", port); } else { addrstr =3D g_strdup(host); } diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index be2b5479bb..f3b388a7bc 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1541,7 +1541,7 @@ virStorageFileGetNPIVKey(const char *path, *tmp =3D '\0'; =20 if (*serial !=3D '\0' && *port !=3D '\0') - ignore_value(virAsprintf(key, "%s_PORT%s", serial, port)); + virAsprintf(key, "%s_PORT%s", serial, port); } =20 return 0; @@ -2620,11 +2620,9 @@ virStorageSourceNewFromBackingRelative(virStorageSou= rcePtr parent, } =20 if (STRNEQ(dirname, "/")) { - if (virAsprintf(&def->path, "%s/%s", dirname, rel) < 0) - return NULL; + virAsprintf(&def->path, "%s/%s", dirname, rel); } else { - if (virAsprintf(&def->path, "/%s", rel) < 0) - return NULL; + virAsprintf(&def->path, "/%s", rel); } =20 if (virStorageSourceGetActualType(parent) =3D=3D VIR_STORAGE_TYPE_NETW= ORK) { @@ -3283,8 +3281,7 @@ virStorageSourceParseBackingJSONiSCSI(virStorageSourc= ePtr src, *port =3D '\0'; } =20 - if (virAsprintf(&src->path, "%s/%s", target, lun) < 0) - return -1; + virAsprintf(&src->path, "%s/%s", target, lun); =20 /* Libvirt doesn't handle inline authentication. Make the caller aware= . */ if (virJSONValueObjectGetString(json, "user") || @@ -4196,8 +4193,7 @@ virStorageFileGetRelativeBackingPath(virStorageSource= Ptr top, =20 VIR_FREE(path); =20 - if (virAsprintf(&path, "%s%s", tmp, next->relPath) < 0) - return -1; + virAsprintf(&path, "%s%s", tmp, next->relPath); =20 VIR_FREE(tmp); =20 diff --git a/src/util/virstring.c b/src/util/virstring.c index 4294b7456e..24a9e41493 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -709,18 +709,15 @@ int virDoubleToStr(char **strp, double number) { virLocale oldlocale; - int rc =3D -1; =20 if (virLocaleSetRaw(&oldlocale) < 0) return -1; =20 - rc =3D virAsprintf(strp, "%lf", number); + virAsprintf(strp, "%lf", number); =20 virLocaleRevert(&oldlocale); virLocaleFixupRadix(strp); =20 - if (rc < 0) - return -1; return 0; } =20 diff --git a/src/util/virstring.h b/src/util/virstring.h index f5e2302b8b..d7881be2d1 100644 --- a/src/util/virstring.h +++ b/src/util/virstring.h @@ -111,7 +111,7 @@ int virStrToDouble(char const *s, G_GNUC_WARN_UNUSED_RESULT; =20 int virDoubleToStr(char **strp, double number) - ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; + ATTRIBUTE_NONNULL(1); =20 void virSkipSpaces(const char **str) ATTRIBUTE_NONNULL(1); void virSkipSpacesAndBackslash(const char **str) ATTRIBUTE_NONNULL(1); diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index 2ff0341b11..bb6ee24f4e 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -301,8 +301,7 @@ int virSystemdCreateMachine(const char *name, =20 ret =3D -1; =20 - if (virAsprintf(&creatorname, "libvirt-%s", drivername) < 0) - goto cleanup; + virAsprintf(&creatorname, "libvirt-%s", drivername); =20 if (partition) { if (!(slicename =3D virSystemdMakeSliceName(partition))) diff --git a/src/util/virtpm.c b/src/util/virtpm.c index 9244697902..149a82310d 100644 --- a/src/util/virtpm.c +++ b/src/util/virtpm.c @@ -59,33 +59,31 @@ virTPMCreateCancelPath(const char *devpath) const char *dev; const char *prefix[] =3D {"misc/", "tpm/"}; size_t i; - - if (devpath) { - dev =3D strrchr(devpath, '/'); - if (dev) { - dev++; - for (i =3D 0; i < G_N_ELEMENTS(prefix); i++) { - if (virAsprintf(&path, "/sys/class/%s%s/device/cancel", - prefix[i], dev) < 0) - goto cleanup; - - if (virFileExists(path)) - break; - - VIR_FREE(path); - } - if (!path) - path =3D g_strdup("/dev/null"); - } else { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("TPM device path %s is invalid"), devpath); - } - } else { + if (!devpath) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Missing TPM device path")); + return NULL; } =20 - cleanup: + if (!(dev =3D strrchr(devpath, '/'))) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("TPM device path %s is invalid"), devpath); + return NULL; + } + + dev++; + for (i =3D 0; i < G_N_ELEMENTS(prefix); i++) { + virAsprintf(&path, "/sys/class/%s%s/device/cancel", prefix[i], + dev); + + if (virFileExists(path)) + break; + + VIR_FREE(path); + } + if (!path) + path =3D g_strdup("/dev/null"); + return path; } =20 diff --git a/src/util/virtypedparam.c b/src/util/virtypedparam.c index f50d926860..d8c296c138 100644 --- a/src/util/virtypedparam.c +++ b/src/util/virtypedparam.c @@ -176,22 +176,22 @@ virTypedParameterToString(virTypedParameterPtr param) =20 switch (param->type) { case VIR_TYPED_PARAM_INT: - ignore_value(virAsprintf(&value, "%d", param->value.i)); + virAsprintf(&value, "%d", param->value.i); break; case VIR_TYPED_PARAM_UINT: - ignore_value(virAsprintf(&value, "%u", param->value.ui)); + virAsprintf(&value, "%u", param->value.ui); break; case VIR_TYPED_PARAM_LLONG: - ignore_value(virAsprintf(&value, "%lld", param->value.l)); + virAsprintf(&value, "%lld", param->value.l); break; case VIR_TYPED_PARAM_ULLONG: - ignore_value(virAsprintf(&value, "%llu", param->value.ul)); + virAsprintf(&value, "%llu", param->value.ul); break; case VIR_TYPED_PARAM_DOUBLE: - ignore_value(virAsprintf(&value, "%g", param->value.d)); + virAsprintf(&value, "%g", param->value.d); break; case VIR_TYPED_PARAM_BOOLEAN: - ignore_value(virAsprintf(&value, "%d", param->value.b)); + virAsprintf(&value, "%d", param->value.b); break; case VIR_TYPED_PARAM_STRING: value =3D g_strdup(param->value.s); diff --git a/src/util/viruri.c b/src/util/viruri.c index 3532fa5576..241e4ea102 100644 --- a/src/util/viruri.c +++ b/src/util/viruri.c @@ -234,8 +234,7 @@ virURIFormat(virURIPtr uri) if (xmluri.server !=3D NULL && strchr(xmluri.server, ':') !=3D NULL) { =20 - if (virAsprintf(&tmpserver, "[%s]", xmluri.server) < 0) - return NULL; + virAsprintf(&tmpserver, "[%s]", xmluri.server); =20 xmluri.server =3D tmpserver; } diff --git a/src/util/virusb.c b/src/util/virusb.c index 5a9f369ac1..3e97480b1a 100644 --- a/src/util/virusb.c +++ b/src/util/virusb.c @@ -85,14 +85,11 @@ VIR_ONCE_GLOBAL_INIT(virUSB); static int virUSBSysReadFile(const char *f_name, const char *d_name, int base, unsigned int *value) { - int tmp; g_autofree char *buf =3D NULL; g_autofree char *filename =3D NULL; char *ignore =3D NULL; =20 - tmp =3D virAsprintf(&filename, USB_SYSFS "/devices/%s/%s", d_name, f_n= ame); - if (tmp < 0) - return -1; + virAsprintf(&filename, USB_SYSFS "/devices/%s/%s", d_name, f_name); =20 if (virFileReadAll(filename, 1024, &buf) < 0) return -1; @@ -315,7 +312,6 @@ virUSBDeviceNew(unsigned int bus, const char *vroot) { virUSBDevicePtr dev; - int rc; =20 if (VIR_ALLOC(dev) < 0) return NULL; @@ -333,16 +329,11 @@ virUSBDeviceNew(unsigned int bus, } =20 if (vroot) { - rc =3D virAsprintf(&dev->path, "%s/%03d/%03d", - vroot, dev->bus, dev->dev); + virAsprintf(&dev->path, "%s/%03d/%03d", + vroot, dev->bus, dev->dev); } else { - rc =3D virAsprintf(&dev->path, USB_DEVFS "%03d/%03d", - dev->bus, dev->dev); - } - - if (rc < 0) { - virUSBDeviceFree(dev); - return NULL; + virAsprintf(&dev->path, USB_DEVFS "%03d/%03d", + dev->bus, dev->dev); } =20 /* XXX fixme. this should be product/vendor */ diff --git a/src/util/virutil.c b/src/util/virutil.c index f2528e257c..705fb6bd74 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -744,11 +744,11 @@ static char *virGetXDGDirectory(const char *xdgenvnam= e, const char *xdgdefdir) char *home =3D NULL; =20 if (path && path[0]) { - ignore_value(virAsprintf(&ret, "%s/libvirt", path)); + virAsprintf(&ret, "%s/libvirt", path); } else { home =3D virGetUserDirectory(); if (home) - ignore_value(virAsprintf(&ret, "%s/%s/libvirt", home, xdgdefdi= r)); + virAsprintf(&ret, "%s/%s/libvirt", home, xdgdefdir); } =20 VIR_FREE(home); @@ -774,7 +774,7 @@ char *virGetUserRuntimeDirectory(void) } else { char *ret; =20 - ignore_value(virAsprintf(&ret, "%s/libvirt", path)); + virAsprintf(&ret, "%s/libvirt", path); return ret; } } @@ -1587,9 +1587,9 @@ virGetUnprivSGIOSysfsPath(const char *path, return NULL; } =20 - ignore_value(virAsprintf(&sysfs_path, "%s/%d:%d/queue/unpriv_sgio", - sysfs_dir ? sysfs_dir : SYSFS_DEV_BLOCK_PATH, - maj, min)); + virAsprintf(&sysfs_path, "%s/%d:%d/queue/unpriv_sgio", + sysfs_dir ? sysfs_dir : SYSFS_DEV_BLOCK_PATH, + maj, min); return sysfs_path; } =20 @@ -1612,8 +1612,7 @@ virSetDeviceUnprivSGIO(const char *path, goto cleanup; } =20 - if (virAsprintf(&val, "%d", unpriv_sgio) < 0) - goto cleanup; + virAsprintf(&val, "%d", unpriv_sgio); =20 if ((rc =3D virFileWriteStr(sysfs_path, val, 0)) < 0) { virReportSystemError(-rc, _("failed to set %s"), sysfs_path); @@ -1878,8 +1877,7 @@ virHostGetDRMRenderNode(void) goto cleanup; } =20 - if (virAsprintf(&ret, "%s/%s", driPath, ent->d_name) < 0) - goto cleanup; + virAsprintf(&ret, "%s/%s", driPath, ent->d_name); =20 cleanup: VIR_DIR_CLOSE(driDir); diff --git a/src/util/virvhba.c b/src/util/virvhba.c index dbbd8d0f52..c78d5e2cd9 100644 --- a/src/util/virvhba.c +++ b/src/util/virvhba.c @@ -52,10 +52,8 @@ virVHBAPathExists(const char *sysfs_prefix, char *sysfs_path =3D NULL; bool ret =3D false; =20 - if (virAsprintf(&sysfs_path, "%s/host%d", - sysfs_prefix ? sysfs_prefix : SYSFS_FC_HOST_PATH, - host) < 0) - return false; + virAsprintf(&sysfs_path, "%s/host%d", + sysfs_prefix ? sysfs_prefix : SYSFS_FC_HOST_PATH, host); =20 if (virFileExists(sysfs_path)) ret =3D true; @@ -85,24 +83,17 @@ virVHBAIsVportCapable(const char *sysfs_prefix, char *fc_host_path =3D NULL; bool ret =3D false; =20 - if (virAsprintf(&fc_host_path, - "%s/host%d/%s", - sysfs_prefix ? sysfs_prefix : SYSFS_FC_HOST_PATH, - host, - "vport_create") < 0) - return false; + virAsprintf(&fc_host_path, "%s/host%d/%s", + sysfs_prefix ? sysfs_prefix : SYSFS_FC_HOST_PATH, host, + "vport_create"); =20 - if (virAsprintf(&scsi_host_path, - "%s/host%d/%s", - sysfs_prefix ? sysfs_prefix : SYSFS_SCSI_HOST_PATH, - host, - "vport_create") < 0) - goto cleanup; + virAsprintf(&scsi_host_path, "%s/host%d/%s", + sysfs_prefix ? sysfs_prefix : SYSFS_SCSI_HOST_PATH, host, + "vport_create"); =20 if (virFileExists(fc_host_path) || virFileExists(scsi_host_path)) ret =3D true; =20 - cleanup: VIR_FREE(fc_host_path); VIR_FREE(scsi_host_path); return ret; @@ -129,10 +120,8 @@ virVHBAGetConfig(const char *sysfs_prefix, char *buf =3D NULL; char *result =3D NULL; =20 - if (virAsprintf(&sysfs_path, "%s/host%d/%s", - sysfs_prefix ? sysfs_prefix : SYSFS_FC_HOST_PATH, - host, entry) < 0) - goto cleanup; + virAsprintf(&sysfs_path, "%s/host%d/%s", + sysfs_prefix ? sysfs_prefix : SYSFS_FC_HOST_PATH, host, en= try); =20 if (!virFileExists(sysfs_path)) goto cleanup; @@ -269,15 +258,13 @@ virVHBAManageVport(const int parent_host, goto cleanup; } =20 - if (virAsprintf(&operation_path, "%s/host%d/%s", - SYSFS_FC_HOST_PATH, parent_host, operation_file) < 0) - goto cleanup; + virAsprintf(&operation_path, "%s/host%d/%s", SYSFS_FC_HOST_PATH, + parent_host, operation_file); =20 if (!virFileExists(operation_path)) { VIR_FREE(operation_path); - if (virAsprintf(&operation_path, "%s/host%d/%s", - SYSFS_SCSI_HOST_PATH, parent_host, operation_file)= < 0) - goto cleanup; + virAsprintf(&operation_path, "%s/host%d/%s", SYSFS_SCSI_HOST_PATH, + parent_host, operation_file); =20 if (!virFileExists(operation_path)) { virReportError(VIR_ERR_OPERATION_INVALID, @@ -294,8 +281,7 @@ virVHBAManageVport(const int parent_host, * in calling either the Add or Remove device functions. This translat= es * into either adding or removing a node device object and a node devi= ce * lifecycle event for applications to consume. */ - if (virAsprintf(&vport_name, "%s:%s", wwpn, wwnn) < 0) - goto cleanup; + virAsprintf(&vport_name, "%s:%s", wwpn, wwnn); =20 if (virFileWriteStr(operation_path, vport_name, 0) =3D=3D 0) ret =3D 0; @@ -335,8 +321,7 @@ vhbaReadCompareWWN(const char *prefix, char *p; int ret =3D -1; =20 - if (virAsprintf(&path, "%s/%s/%s", prefix, d_name, f_name) < 0) - return -1; + virAsprintf(&path, "%s/%s/%s", prefix, d_name, f_name); =20 if (!virFileExists(path)) { ret =3D 0; @@ -440,9 +425,8 @@ virVHBAGetHostByFabricWWN(const char *sysfs_prefix, =20 /* Existing vHBA's will have the same fabric_name, but won't * have the vport_create file - so we check for both */ - if (virAsprintf(&vport_create_path, "%s/%s/vport_create", prefix, - entry->d_name) < 0) - goto cleanup; + virAsprintf(&vport_create_path, "%s/%s/vport_create", prefix, + entry->d_name); =20 if (!virFileExists(vport_create_path)) continue; --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752758; cv=none; d=zoho.com; s=zohoarc; b=nuCPxlLt+Qr0+i2/vTZsar7ojbWFXEttfrW0EmoqdVUbwm1h5f//R4w4prTceJMHzkRt4FooN700yTGe+y4Z2G2dLfV48f8t6pQgz8j2bPZ7qZZT08obKQKgWbnGZPJZr1k1NthDBRnmQ1sDbu6VYNfEVg7v/HSWVsTKZ8EJEnE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752758; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZVU8XSXaLBvAamtAkJfiD55ADAhMYYrWM+uJHYDUujQ=; b=KdP68xjQxkcRAEosXHwVmYGJ5oJA4ROtLhmdiW0/h4ZqkQqW9x+rYfv4QOU8n9ZKxu4LSMInhb67iVGdruh7Ttq7B+pYRhQ3XP3djBY5pRbzqOvy3OJ9mLQ+kfG+tpuYsA/r/QDvwLlf58LUuA93ez69Pb3s82Wvs7fHx694cEI= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 157175275876122.72375123128245; Tue, 22 Oct 2019 06:59:18 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-257-3mG6zHsZMRei4VdZDWuxhQ-1; Tue, 22 Oct 2019 09:59:15 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 274DF107AD34; Tue, 22 Oct 2019 13:59:10 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id ECC1760167; Tue, 22 Oct 2019 13:59:09 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id A6CEF3FB4F; Tue, 22 Oct 2019 13:59:09 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9MDx8qw001847 for ; Tue, 22 Oct 2019 09:59:08 -0400 Received: by smtp.corp.redhat.com (Postfix) id 778F56012E; Tue, 22 Oct 2019 13:59:08 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 00F5D60467 for ; Tue, 22 Oct 2019 13:59:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752757; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=ZVU8XSXaLBvAamtAkJfiD55ADAhMYYrWM+uJHYDUujQ=; b=EiYHAOUer882KhqIXzY1Vztx+4iUvN959l8aEvVELm9pTgljYXMGp3PHFo3TgtL5EkuA5l 4QTbWagftOEhZTgFYgvB2AWCy12NZWeImx/zWb1+j9Lar6/E6Hwz/NpGsU9n1UaKAt6x+F T+U9CNKD0FPSf1l7T8scGRCkWGCKFrg= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:30 +0200 Message-Id: <84678527b7e0aebcbc9b9bb2dd37f37583b0ab0a.1571752582.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 26/75] secret: Drop virAsprintf() and virAsprintfQuiet() retval checking X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: 3mG6zHsZMRei4VdZDWuxhQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" These functions can't fail really. Drop checking of their retval then. Signed-off-by: Michal Privoznik --- src/secret/secret_driver.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c index 6d2844f3b7..064a02dfdd 100644 --- a/src/secret/secret_driver.c +++ b/src/secret/secret_driver.c @@ -469,25 +469,19 @@ secretStateInitialize(bool privileged, driver->privileged =3D privileged; =20 if (privileged) { - if (virAsprintf(&driver->configDir, - "%s/libvirt/secrets", SYSCONFDIR) < 0) - goto error; - if (virAsprintf(&driver->stateDir, - "%s/libvirt/secrets", RUNSTATEDIR) < 0) - goto error; + virAsprintf(&driver->configDir, "%s/libvirt/secrets", SYSCONFDIR); + virAsprintf(&driver->stateDir, "%s/libvirt/secrets", RUNSTATEDIR); } else { g_autofree char *rundir =3D NULL; g_autofree char *cfgdir =3D NULL; =20 if (!(cfgdir =3D virGetUserConfigDirectory())) goto error; - if (virAsprintf(&driver->configDir, "%s/secrets/", cfgdir) < 0) - goto error; + virAsprintf(&driver->configDir, "%s/secrets/", cfgdir); =20 if (!(rundir =3D virGetUserRuntimeDirectory())) goto error; - if (virAsprintf(&driver->stateDir, "%s/secrets/run", rundir) < 0) - goto error; + virAsprintf(&driver->stateDir, "%s/secrets/run", rundir); } =20 if (virFileMakePathWithMode(driver->configDir, S_IRWXU) < 0) { --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752761; cv=none; d=zoho.com; s=zohoarc; b=RdHRP5FoIQB1ecj3VwiyRPCI1lMgmi1fb3ZPMbWH73pry3kuaU3nhdLxRjmsd+4ASd8bdz9fkfGbjNlrTtDhS0jj3gHKaRNDSaG/HtR8fgHLxovzSwfT2PANKlZDf0p0zdhGy3NwyWn2To26kQe4oU2NQWsTYfs3VBSupixhmOI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752761; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0gZfrdlAOxFy5Pf702OoLRlu1kvYMSNddsenmML9Xq8=; b=LNvYsLGJwxPftRRv9uZZlEOFRVll4jD2rD3+pmmbI5SoiDqL222RJcvuGs+/zOvxTfPHefvwD/n9eIX6PWLrdZQ+MGNoxS/VTY3zxGJNF6PST0jT6b4LZT0hjLpcy22TebmDngmJdv0Dz8cZfUoBKqdeKeS/SD61QeEc6QlKK48= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1571752761632903.8957662136738; Tue, 22 Oct 2019 06:59:21 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-233-j6ExWGCSOzm0Jnro2gtaWQ-1; Tue, 22 Oct 2019 09:59:18 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CBB605EF; Tue, 22 Oct 2019 13:59:12 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A37BC60166; Tue, 22 Oct 2019 13:59:12 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 5F5C81800B74; Tue, 22 Oct 2019 13:59:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9MDxB2l001888 for ; Tue, 22 Oct 2019 09:59:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7BE766012E; Tue, 22 Oct 2019 13:59:11 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 04B1E60466 for ; Tue, 22 Oct 2019 13:59:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752760; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=0gZfrdlAOxFy5Pf702OoLRlu1kvYMSNddsenmML9Xq8=; b=L2cnLKp1oxdoRcebHlcvDZasc1PR3iVnpwLX6wpSI0C9rrfYCK9YLOkRDnfmQVBF1I/kb5 cD1pS4tY37CrW3UYFC9BwUiBpu1w04RLIbFDCg+aVv/hfQynrlgABkGMMbeitDzOl5owMa IDWywJrXZfgGOXqnJugLzrbxOYicIkw= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:31 +0200 Message-Id: <019421e919497aad3bfc3a863be9d8f8d8ce9b3a.1571752582.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 27/75] vbox: Drop virAsprintf() and virAsprintfQuiet() retval checking X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: j6ExWGCSOzm0Jnro2gtaWQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" These functions can't fail really. Drop checking of their retval then. Signed-off-by: Michal Privoznik --- src/vbox/vbox_XPCOMCGlue.c | 3 +- src/vbox/vbox_common.c | 62 +++++++++++++++-------------------- src/vbox/vbox_network.c | 13 +++----- src/vbox/vbox_snapshot_conf.c | 18 ++++------ src/vbox/vbox_storage.c | 5 ++- src/vbox/vbox_tmpl.c | 32 ++++++++---------- 6 files changed, 53 insertions(+), 80 deletions(-) diff --git a/src/vbox/vbox_XPCOMCGlue.c b/src/vbox/vbox_XPCOMCGlue.c index a20b1c2a36..09768d5d38 100644 --- a/src/vbox/vbox_XPCOMCGlue.c +++ b/src/vbox/vbox_XPCOMCGlue.c @@ -85,8 +85,7 @@ tryLoadOne(const char *dir, bool setAppHome, bool ignoreM= issing, PFNVBOXGETXPCOMCFUNCTIONS pfnGetFunctions; =20 if (dir !=3D NULL) { - if (virAsprintf(&name, "%s/%s", dir, DYNLIB_NAME) < 0) - return -1; + virAsprintf(&name, "%s/%s", dir, DYNLIB_NAME); =20 if (!virFileExists(name)) { if (!ignoreMissing) diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 475b3a3147..6ffa43addc 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -1770,13 +1770,12 @@ vboxAttachUSB(virDomainDefPtr def, vboxDriverPtr da= ta, IMachine *machine) /* Zero pad for nice alignment when fewer than 9999 * devices. */ - if (virAsprintf(&filtername, "filter%04zu", i) >=3D 0) { - VBOX_UTF8_TO_UTF16(filtername, &filternameUtf16); - VIR_FREE(filtername); - gVBoxAPI.UIUSBCommon.CreateDeviceFilter(USBCommon, - filternameUtf16, - &filter); - } + virAsprintf(&filtername, "filter%04zu", i); + VBOX_UTF8_TO_UTF16(filtername, &filternameUtf16); + VIR_FREE(filtername); + gVBoxAPI.UIUSBCommon.CreateDeviceFilter(USBCommon, + filternameUtf16, + &filter); VBOX_UTF16_FREE(filternameUtf16); =20 if (!filter) @@ -2127,10 +2126,9 @@ vboxStartMachine(virDomainPtr dom, int maxDomID, IMa= chine *machine, vboxIID *iid if (guiPresent) { if (guiDisplay) { char *displayutf8; - if (virAsprintf(&displayutf8, "DISPLAY=3D%s", guiDisplay) >=3D= 0) { - VBOX_UTF8_TO_UTF16(displayutf8, &env); - VIR_FREE(displayutf8); - } + virAsprintf(&displayutf8, "DISPLAY=3D%s", guiDisplay); + VBOX_UTF8_TO_UTF16(displayutf8, &env); + VIR_FREE(displayutf8); VIR_FREE(guiDisplay); } =20 @@ -2140,10 +2138,9 @@ vboxStartMachine(virDomainPtr dom, int maxDomID, IMa= chine *machine, vboxIID *iid if (sdlPresent) { if (sdlDisplay) { char *displayutf8; - if (virAsprintf(&displayutf8, "DISPLAY=3D%s", sdlDisplay) >=3D= 0) { - VBOX_UTF8_TO_UTF16(displayutf8, &env); - VIR_FREE(displayutf8); - } + virAsprintf(&displayutf8, "DISPLAY=3D%s", sdlDisplay); + VBOX_UTF8_TO_UTF16(displayutf8, &env); + VIR_FREE(displayutf8); VIR_FREE(sdlDisplay); } =20 @@ -4619,8 +4616,7 @@ vboxSnapshotRedefine(virDomainPtr dom, } VBOX_UTF16_TO_UTF8(machineNameUtf16, &machineName); =20 - if (virAsprintf(&nameTmpUse, "%s.vbox", machineName) < 0) - goto cleanup; + virAsprintf(&nameTmpUse, "%s.vbox", machineName); machineLocationPath =3D virStringReplace(settingsFilePath_Utf8, nameTm= pUse, ""); if (machineLocationPath =3D=3D NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -4636,9 +4632,8 @@ vboxSnapshotRedefine(virDomainPtr dom, goto cleanup; } if (snapshotMachineDesc->currentSnapshot !=3D NULL) { - if (virAsprintf(¤tSnapshotXmlFilePath, "%s%s.xml", machineLo= cationPath, - snapshotMachineDesc->currentSnapshot) < 0) - goto cleanup; + virAsprintf(¤tSnapshotXmlFilePath, "%s%s.xml", + machineLocationPath, snapshotMachineDesc->currentSnaps= hot); snapshotFileExists =3D virFileExists(currentSnapshotXmlFilePath); } =20 @@ -5206,8 +5201,8 @@ vboxSnapshotRedefine(virDomainPtr dom, vboxIIDUnalloc(&parentiid); VBOX_UTF8_TO_UTF16("VDI", &formatUtf16); =20 - if (virAsprintf(&newLocationUtf8, "%sfakedisk-%d.vdi", machine= LocationPath, it) < 0) - goto cleanup; + virAsprintf(&newLocationUtf8, "%sfakedisk-%d.vdi", + machineLocationPath, it); VBOX_UTF8_TO_UTF16(newLocationUtf8, &newLocation); rc =3D gVBoxAPI.UIVirtualBox.CreateHardDisk(data->vboxObj, formatUtf16, @@ -5305,8 +5300,8 @@ vboxSnapshotRedefine(virDomainPtr dom, * next define. This file is saved as "'machineLocation'/snapshot-= 'uuid'.xml" */ VIR_FREE(currentSnapshotXmlFilePath); - if (virAsprintf(¤tSnapshotXmlFilePath, "%s%s.xml", machineLo= cationPath, snapshotMachineDesc->currentSnapshot) < 0) - goto cleanup; + virAsprintf(¤tSnapshotXmlFilePath, "%s%s.xml", + machineLocationPath, snapshotMachineDesc->currentSnaps= hot); char *snapshotContent =3D virDomainSnapshotDefFormat(NULL, def, data->caps, data->xmlopt, @@ -6893,8 +6888,7 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapsho= tPtr snapshot) goto cleanup; } VBOX_UTF16_TO_UTF8(machineNameUtf16, &machineName); - if (virAsprintf(&nameTmpUse, "%s.vbox", machineName) < 0) - goto cleanup; + virAsprintf(&nameTmpUse, "%s.vbox", machineName); machineLocationPath =3D virStringReplace(settingsFilepath, nameTmpUse,= ""); if (machineLocationPath =3D=3D NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -6978,9 +6972,8 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapsho= tPtr snapshot) VBOX_UTF16_FREE(locationUtf16); VBOX_UTF8_TO_UTF16("VDI", &formatUtf16); =20 - if (virAsprintf(&newLocationUtf8, "%sfakedisk-%s-%d.vdi", - machineLocationPath, def->parent.parent_na= me, it) < 0) - goto cleanup; + virAsprintf(&newLocationUtf8, "%sfakedisk-%s-%d.vdi", + machineLocationPath, def->parent.parent_name, = it); VBOX_UTF8_TO_UTF16(newLocationUtf8, &newLocation); rc =3D gVBoxAPI.UIVirtualBox.CreateHardDisk(data->vboxObj, formatUtf16, @@ -7383,17 +7376,14 @@ vboxDomainScreenshot(virDomainPtr dom, return NULL; } =20 - if ((privileged && virAsprintf(&cacheDir, "%s/cache/libvirt", LOCALSTA= TEDIR) < 0) || - (!privileged && !(cacheDir =3D virGetUserCacheDirectory()))) { + if (privileged) { + virAsprintf(&cacheDir, "%s/cache/libvirt", LOCALSTATEDIR); + } else if (!(cacheDir =3D virGetUserCacheDirectory())) { VBOX_RELEASE(machine); return NULL; } =20 - if (virAsprintf(&tmp, "%s/vbox.screendump.XXXXXX", cacheDir) < 0) { - VBOX_RELEASE(machine); - VIR_FREE(cacheDir); - return NULL; - } + virAsprintf(&tmp, "%s/vbox.screendump.XXXXXX", cacheDir); =20 if ((tmp_fd =3D mkostemp(tmp, O_CLOEXEC)) =3D=3D -1) { virReportSystemError(errno, _("mkostemp(\"%s\") failed"), tmp); diff --git a/src/vbox/vbox_network.c b/src/vbox/vbox_network.c index 9e632ab709..a942587bcb 100644 --- a/src/vbox/vbox_network.c +++ b/src/vbox/vbox_network.c @@ -432,8 +432,8 @@ vboxNetworkDefineCreateXML(virConnectPtr conn, const ch= ar *xml, bool start) =20 VBOX_UTF16_TO_UTF8(networkInterfaceNameUtf16, &networkInterfaceNameUtf= 8); =20 - if (virAsprintf(&networkNameUtf8, "HostInterfaceNetworking-%s", networ= kInterfaceNameUtf8) < 0) - goto cleanup; + virAsprintf(&networkNameUtf8, "HostInterfaceNetworking-%s", + networkInterfaceNameUtf8); =20 VBOX_UTF8_TO_UTF16(networkNameUtf8, &networkNameUtf16); =20 @@ -588,8 +588,7 @@ vboxNetworkUndefineDestroy(virNetworkPtr network, bool = removeinterface) * show up in the net-list in virsh */ =20 - if (virAsprintf(&networkNameUtf8, "HostInterfaceNetworking-%s", networ= k->name) < 0) - goto cleanup; + virAsprintf(&networkNameUtf8, "HostInterfaceNetworking-%s", network->n= ame); =20 VBOX_UTF8_TO_UTF16(network->name, &networkInterfaceNameUtf16); =20 @@ -693,8 +692,7 @@ static int vboxNetworkCreate(virNetworkPtr network) * server by giving the machine static IP */ =20 - if (virAsprintf(&networkNameUtf8, "HostInterfaceNetworking-%s", networ= k->name) < 0) - goto cleanup; + virAsprintf(&networkNameUtf8, "HostInterfaceNetworking-%s", network->n= ame); =20 VBOX_UTF8_TO_UTF16(network->name, &networkInterfaceNameUtf16); =20 @@ -791,8 +789,7 @@ static char *vboxNetworkGetXMLDesc(virNetworkPtr networ= k, unsigned int flags) def->ips =3D ipdef; def->nips =3D 1; =20 - if (virAsprintf(&networkNameUtf8, "HostInterfaceNetworking-%s", networ= k->name) < 0) - goto cleanup; + virAsprintf(&networkNameUtf8, "HostInterfaceNetworking-%s", network->n= ame); =20 VBOX_UTF8_TO_UTF16(network->name, &networkInterfaceNameUtf16); =20 diff --git a/src/vbox/vbox_snapshot_conf.c b/src/vbox/vbox_snapshot_conf.c index 8cdfb35357..8c92d8797b 100644 --- a/src/vbox/vbox_snapshot_conf.c +++ b/src/vbox/vbox_snapshot_conf.c @@ -84,8 +84,7 @@ virVBoxSnapshotConfCreateVBoxSnapshotConfHardDiskPtr(xmlN= odePtr diskNode, } if (location[0] !=3D '/') { /*The location is a relative path, so we must change it into an ab= solute one. */ - if (virAsprintf(&tmp, "%s%s", machineLocation, location) < 0) - goto cleanup; + virAsprintf(&tmp, "%s%s", machineLocation, location); hardDisk->location =3D g_strdup(tmp); } else { hardDisk->location =3D g_strdup(location); @@ -331,8 +330,7 @@ virVBoxSnapshotConfCreateHardDiskNode(virVBoxSnapshotCo= nfHardDiskPtr hardDisk) size_t i =3D 0; char *uuid =3D NULL; xmlNodePtr ret =3D xmlNewNode(NULL, BAD_CAST "HardDisk"); - if (virAsprintf(&uuid, "{%s}", hardDisk->uuid) < 0) - goto cleanup; + virAsprintf(&uuid, "{%s}", hardDisk->uuid); =20 if (xmlNewProp(ret, BAD_CAST "uuid", BAD_CAST uuid) =3D=3D NULL) goto cleanup; @@ -378,8 +376,7 @@ virVBoxSnapshotConfSerializeSnapshot(xmlNodePtr node, char **secondRegex =3D NULL; int secondRegexResult =3D 0; =20 - if (virAsprintf(&uuid, "{%s}", snapshot->uuid) < 0) - goto cleanup; + virAsprintf(&uuid, "{%s}", snapshot->uuid); =20 if (xmlNewProp(node, BAD_CAST "uuid", BAD_CAST uuid) =3D=3D NULL) goto cleanup; @@ -400,8 +397,7 @@ virVBoxSnapshotConfSerializeSnapshot(xmlNodePtr node, goto cleanup; if (secondRegexResult < 1) goto cleanup; - if (virAsprintf(&timeStamp, "%sT%sZ", firstRegex[0], secondRegex[0]) <= 0) - goto cleanup; + virAsprintf(&timeStamp, "%sT%sZ", firstRegex[0], secondRegex[0]); =20 if (xmlNewProp(node, BAD_CAST "timeStamp", BAD_CAST timeStamp) =3D=3D = NULL) goto cleanup; @@ -1073,8 +1069,7 @@ virVBoxSnapshotConfSaveVboxFile(virVBoxSnapshotConfMa= chinePtr machine, } =20 if (machine->currentSnapshot !=3D NULL) { - if (virAsprintf(¤tSnapshot, "{%s}", machine->currentSnapshot= ) < 0) - goto cleanup; + virAsprintf(¤tSnapshot, "{%s}", machine->currentSnapshot); if (!xmlNewProp(machineNode, BAD_CAST "currentSnapshot", BAD_CAST = currentSnapshot)) { virReportError(VIR_ERR_XML_ERROR, "%s", _("Error in xmlNewProp")); @@ -1111,8 +1106,7 @@ virVBoxSnapshotConfSaveVboxFile(virVBoxSnapshotConfMa= chinePtr machine, if (secondRegexResult < 1) goto cleanup; =20 - if (virAsprintf(&timeStamp, "%sT%sZ", firstRegex[0], secondRegex[0]) <= 0) - goto cleanup; + virAsprintf(&timeStamp, "%sT%sZ", firstRegex[0], secondRegex[0]); if (!xmlNewProp(machineNode, BAD_CAST "lastStateChange", BAD_CAST time= Stamp)) { virReportError(VIR_ERR_XML_ERROR, "%s", _("Error in xmlNewProp")); diff --git a/src/vbox/vbox_storage.c b/src/vbox/vbox_storage.c index c7bea2c219..8cd1b20628 100644 --- a/src/vbox/vbox_storage.c +++ b/src/vbox/vbox_storage.c @@ -448,9 +448,8 @@ vboxStorageVolCreateXML(virStoragePoolPtr pool, } =20 /* If target.path isn't given, use default path ~/.VirtualBox/image_na= me */ - if (def->target.path =3D=3D NULL && - virAsprintf(&def->target.path, "%s/.VirtualBox/%s", virGetUserDire= ctory(), def->name) < 0) - goto cleanup; + if (!def->target.path) + virAsprintf(&def->target.path, "%s/.VirtualBox/%s", virGetUserDire= ctory(), def->name); VBOX_UTF8_TO_UTF16(def->target.path, &hddNameUtf16); =20 if (!hddFormatUtf16 || !hddNameUtf16) diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 72011199cf..88e7deaea0 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -613,29 +613,23 @@ _virtualboxCreateMachine(vboxDriverPtr data, virDomai= nDefPtr def, IMachine **mac { vboxIID iid =3D VBOX_IID_INITIALIZER; PRUnichar *machineNameUtf16 =3D NULL; + char *createFlags =3D NULL; + PRUnichar *createFlagsUtf16 =3D NULL; nsresult rc =3D -1; =20 VBOX_UTF8_TO_UTF16(def->name, &machineNameUtf16); vboxIIDFromUUID(&iid, def->uuid); - { - char *createFlags =3D NULL; - PRUnichar *createFlagsUtf16 =3D NULL; - - if (virAsprintf(&createFlags, - "UUID=3D%s,forceOverwrite=3D0", uuidstr) < 0) - goto cleanup; - VBOX_UTF8_TO_UTF16(createFlags, &createFlagsUtf16); - rc =3D data->vboxObj->vtbl->CreateMachine(data->vboxObj, - NULL, - machineNameUtf16, - 0, - nsnull, - nsnull, - createFlagsUtf16, - machine); - cleanup: - VIR_FREE(createFlags); - } + virAsprintf(&createFlags, "UUID=3D%s,forceOverwrite=3D0", uuidstr); + VBOX_UTF8_TO_UTF16(createFlags, &createFlagsUtf16); + rc =3D data->vboxObj->vtbl->CreateMachine(data->vboxObj, + NULL, + machineNameUtf16, + 0, + nsnull, + nsnull, + createFlagsUtf16, + machine); + VIR_FREE(createFlags); VBOX_UTF16_FREE(machineNameUtf16); vboxIIDUnalloc(&iid); return rc; --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752771; cv=none; d=zoho.com; s=zohoarc; b=jpGcKW3ZlQVgxAXZffjJqUnaphV6dCJY1i4QYx85Z67LLrfecG3H1/dbfSQbu1wrqf1BDyLjNV1JxHgmDFjMwVmDmPmhkCNoJ6UiEcK2DosKMvrlrVwsSFXPjA+AzWz20PK75p/b9tSYedR3pOzIP5vNqKgd6ATYsnZMONunuZw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752771; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=z3cqFSBUSdCvsBFzJ9CGpdHr/UurnSmdE2RVTLiScL8=; b=aJH2u9Yc53x1t6cgM4TocLirIDYlTrsdgfZm0aMnTqPvBe5x/7AGdNNGiv7PpdnlJLXvYL8JCdXJcB5z3oUrgIZylKuxpeK9FL5JqLKSQFbNRKWAcPe7NbjwMTSrI3K+o4ZEUHgTT+vyh+tlLNV9277kktbvxZJ6B6CLPPX/cXo= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1571752771636907.4966775572427; Tue, 22 Oct 2019 06:59:31 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-156-Y4izShtzOXaXENtLjiSi2A-1; Tue, 22 Oct 2019 09:59:28 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C36ED1800D6A; Tue, 22 Oct 2019 13:59:23 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 863636CE66; Tue, 22 Oct 2019 13:59:23 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 441E0180BAAB; Tue, 22 Oct 2019 13:59:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9MDxMmB002024 for ; Tue, 22 Oct 2019 09:59:22 -0400 Received: by smtp.corp.redhat.com (Postfix) id A58386012D; Tue, 22 Oct 2019 13:59:22 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2DA416012C for ; Tue, 22 Oct 2019 13:59:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752770; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=z3cqFSBUSdCvsBFzJ9CGpdHr/UurnSmdE2RVTLiScL8=; b=fGXiIIt2KcLvoFE5O0pdrpM/yuft74j7CEMfFSmIP/CUX4oCRtpoHOTEb+xP1CpdDJ52j7 z2EEaXSyC8SqMwayjbMMUqlTC+hdmJbZ6O4YHDVEZEipGTSaTnhexqcN157gAxRqWdywnk acBNHOQFNvG5nhVjDyJcgOhqAgtxqi0= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:32 +0200 Message-Id: <6a557f3300724eb1e3e30d7b2445f086f8e4fcea.1571752582.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 28/75] vmware: Drop virAsprintf() and virAsprintfQuiet() retval checking X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: Y4izShtzOXaXENtLjiSi2A-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" These functions can't fail really. Drop checking of their retval then. Signed-off-by: Michal Privoznik --- src/vmware/vmware_conf.c | 31 +++++++++---------------------- src/vmware/vmware_conf.h | 4 ++-- 2 files changed, 11 insertions(+), 24 deletions(-) diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c index 8707f842ad..1e836ec7ed 100644 --- a/src/vmware/vmware_conf.c +++ b/src/vmware/vmware_conf.c @@ -275,18 +275,15 @@ vmwareExtractVersion(struct vmware_driver *driver) =20 switch (driver->type) { case VMWARE_DRIVER_PLAYER: - if (virAsprintf(&bin, "%s/%s", vmwarePath, "vmplayer") < 0) - goto cleanup; + virAsprintf(&bin, "%s/%s", vmwarePath, "vmplayer"); break; =20 case VMWARE_DRIVER_WORKSTATION: - if (virAsprintf(&bin, "%s/%s", vmwarePath, "vmware") < 0) - goto cleanup; + virAsprintf(&bin, "%s/%s", vmwarePath, "vmware"); break; =20 case VMWARE_DRIVER_FUSION: - if (virAsprintf(&bin, "%s/%s", vmwarePath, "vmware-vmx") < 0) - goto cleanup; + virAsprintf(&bin, "%s/%s", vmwarePath, "vmware-vmx"); break; =20 default: @@ -365,19 +362,13 @@ vmwareParsePath(const char *path, char **directory, c= har **filename) return -1; } =20 -int +void vmwareConstructVmxPath(char *directoryName, char *name, char **vmxPath) { - int ret; - if (directoryName !=3D NULL) - ret =3D virAsprintf(vmxPath, "%s/%s.vmx", directoryName, name); + virAsprintf(vmxPath, "%s/%s.vmx", directoryName, name); else - ret =3D virAsprintf(vmxPath, "%s.vmx", name); - - if (ret < 0) - return -1; - return 0; + virAsprintf(vmxPath, "%s.vmx", name); } =20 int @@ -437,8 +428,7 @@ vmwareVmxPath(virDomainDefPtr vmdef, char **vmxPath) goto cleanup; } =20 - if (vmwareConstructVmxPath(directoryName, vmdef->name, vmxPath) < 0) - goto cleanup; + vmwareConstructVmxPath(directoryName, vmdef->name, vmxPath); =20 ret =3D 0; =20 @@ -477,8 +467,7 @@ vmwareMoveFile(char *srcFile, char *dstFile) int vmwareMakePath(char *srcDir, char *srcName, char *srcExt, char **outpath) { - if (virAsprintf(outpath, "%s/%s.%s", srcDir, srcName, srcExt) < 0) - return -1; + virAsprintf(outpath, "%s/%s.%s", srcDir, srcName, srcExt); return 0; } =20 @@ -495,9 +484,7 @@ vmwareExtractPid(const char * vmxPath) if ((vmxDir =3D mdir_name(vmxPath)) =3D=3D NULL) goto cleanup; =20 - if (virAsprintf(&logFilePath, "%s/vmware.log", - vmxDir) < 0) - goto cleanup; + virAsprintf(&logFilePath, "%s/vmware.log", vmxDir); =20 if ((logFile =3D fopen(logFilePath, "r")) =3D=3D NULL) goto cleanup; diff --git a/src/vmware/vmware_conf.h b/src/vmware/vmware_conf.h index deeed22300..5e0ef3744f 100644 --- a/src/vmware/vmware_conf.h +++ b/src/vmware/vmware_conf.h @@ -71,8 +71,8 @@ int vmwareParseVersionStr(int type, const char *buf, unsi= gned long *version); =20 int vmwareDomainConfigDisplay(vmwareDomainPtr domain, virDomainDefPtr vmde= f); =20 -int vmwareConstructVmxPath(char *directoryName, char *name, - char **vmxPath); +void vmwareConstructVmxPath(char *directoryName, char *name, + char **vmxPath); =20 int vmwareVmxPath(virDomainDefPtr vmdef, char **vmxPath); =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571753075; cv=none; d=zoho.com; s=zohoarc; b=g/UNDtMro1BZv+3IwHMJg//MWGs0aRNOnlC27FQhz++4ApGBHC5UYBXPyTyUoLcTZV8IzEK/757tlhpiJjc0nvPtUnbXHXlZjBoLv0eLMyN4Cmn3vkGN+Uy4BSe3b+B56d+kk3lMucLviJohoBBzzeH8ADTVgNY8WdYNatrdin0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571753075; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7RkUsq/32rdZbjQReh1b4jqw0qupeoyrWWvCyYYa9DI=; b=dTbgGofV/efFbAP6wWcxUvXO7/eJGD5hyavYtW8yDFhrv1vS70kxeBd3Hc6JDBk5msjEo3QSGEDsVbZZMV5r8jzZGun0dCGLqJGg2Kq1KY3Su0BRriNktfD2UJ+SLlrNSd1QCAy01XAYOwuIcpo6s9G5T36sRo5x5xBrYJVDY9s= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 157175307499147.93677491243125; Tue, 22 Oct 2019 07:04:34 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-329-ZIrIhmetN4-Zx7gJ643aHA-1; Tue, 22 Oct 2019 09:59:32 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5C8D71800D79; Tue, 22 Oct 2019 13:59:27 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 362316012D; Tue, 22 Oct 2019 13:59:27 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id E91F61803C30; Tue, 22 Oct 2019 13:59:26 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9MDxO6g002037 for ; Tue, 22 Oct 2019 09:59:24 -0400 Received: by smtp.corp.redhat.com (Postfix) id EB82C6012D; Tue, 22 Oct 2019 13:59:24 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7530D6012C for ; Tue, 22 Oct 2019 13:59:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571753073; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=7RkUsq/32rdZbjQReh1b4jqw0qupeoyrWWvCyYYa9DI=; b=Y9lq9tsc6N2BJIl6eiBE6bt4vNzTO/HD5QmKiOB7tGo0XNFhv6IPS2iwobz23W0uxvey2U CGayvL39tmZcYoecd7QoRWQR+76UqhUZ+G9StDF/S8oBnlv8wNpk0kjui10R4eGjG5LsUm JDmeP/4OW44G5Sq9wI9QVqZn8l6emng= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:33 +0200 Message-Id: <29805bd3aa865d7877ad9a37eb7fc9766d8b4567.1571752582.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 29/75] vmx: Drop virAsprintf() and virAsprintfQuiet() retval checking X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: ZIrIhmetN4-Zx7gJ643aHA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" These functions can't fail really. Drop checking of their retval then. Signed-off-by: Michal Privoznik --- src/vmx/vmx.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 0d1d87bac6..6f47546edf 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -2081,8 +2081,7 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptio= nPtr xmlopt, virConfPtr con goto cleanup; } =20 - if (virAsprintf(&prefix, "scsi%d:%d", controllerOrBus, unit) <= 0) - goto cleanup; + virAsprintf(&prefix, "scsi%d:%d", controllerOrBus, unit); =20 (*def)->dst =3D virIndexToDiskName @@ -2104,8 +2103,7 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptio= nPtr xmlopt, virConfPtr con goto cleanup; } =20 - if (virAsprintf(&prefix, "ide%d:%d", controllerOrBus, unit) < = 0) - goto cleanup; + virAsprintf(&prefix, "ide%d:%d", controllerOrBus, unit); =20 (*def)->dst =3D virIndexToDiskName(controllerOrBus * 2 + unit,= "hd"); =20 @@ -2134,8 +2132,7 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptio= nPtr xmlopt, virConfPtr con goto cleanup; } =20 - if (virAsprintf(&prefix, "floppy%d", unit) < 0) - goto cleanup; + virAsprintf(&prefix, "floppy%d", unit); =20 (*def)->dst =3D virIndexToDiskName(unit, "fd"); =20 @@ -2842,9 +2839,7 @@ virVMXParseSerial(virVMXContext *ctx, virConfPtr conf= , int port, =20 (*def)->source->data.tcp.host =3D g_strdup(parsedUri->server); =20 - if (virAsprintf(&(*def)->source->data.tcp.service, "%d", - parsedUri->port) < 0) - goto cleanup; + virAsprintf(&(*def)->source->data.tcp.service, "%d", parsedUri->po= rt); =20 /* See vSphere API documentation about VirtualSerialPortURIBacking= Info */ if (parsedUri->scheme =3D=3D NULL || --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752776; cv=none; d=zoho.com; s=zohoarc; b=iH0+mdJ0eC3LVfZSJxrAeRkFIZaHeXA94Dk3ocy7rchI8wpedOPKClhgTRR4VW+zBZh3cAsfmMimVYDhofYqEOhEqmlZa2REkED0cCMj/ZcLG5FQTtpnlT1kPAWa+RYFg7McZjk6v0iA3c+AW2FfrQkeNtKm3hSU2N7N8ljTGIM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752776; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=lQ/Xzth4gdlyTAdf/5abWDkfRmukrNfp/0Bw56b3CUo=; b=V2VG1e+cGvt0dZI9cPpiznau99L74jePbr/h8oYuIT8S8QSQcH4RgXc41TK6Xt0NIxRmzJhRMPhH2VZwILRYU6MSX/RrBoldXU7baxV5GMuoaX4WsmTe7XVGxknowze2cpERyQQfUew8b3Y0dWXKu7HJX+yJdH94WStQW+OGDOQ= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1571752776789503.83568498856596; Tue, 22 Oct 2019 06:59:36 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-257-LJ9W91_ONuyBr78_qUWBMQ-1; Tue, 22 Oct 2019 09:59:34 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 18F1A107AD33; Tue, 22 Oct 2019 13:59:29 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EBF9D10027C3; Tue, 22 Oct 2019 13:59:28 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id B01EE1803B4D; Tue, 22 Oct 2019 13:59:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9MDxRj8002053 for ; Tue, 22 Oct 2019 09:59:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6573F60166; Tue, 22 Oct 2019 13:59:27 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id E231F6012E for ; Tue, 22 Oct 2019 13:59:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752775; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=lQ/Xzth4gdlyTAdf/5abWDkfRmukrNfp/0Bw56b3CUo=; b=S0xlY9R0Xf3rqLcEEQhRJhTuBqst1ayXTScWMHSI0WGsXcVGEdl16EAiVaBVOURc+F4aYg HygUVFE1WvuRh6DXI5QKqmq589qVEM/YuAM4FggkkeQZ+CMa22VEValY2OlgUyHSUrSo6g QqglQu4QpWhmHMKxzdiCWRAyMUSFhKA= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:34 +0200 Message-Id: <526d8def6054b2f5f42b42fe3d88b4d53a0a179f.1571752582.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 30/75] vz: Drop virAsprintf() and virAsprintfQuiet() retval checking X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: LJ9W91_ONuyBr78_qUWBMQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" These functions can't fail really. Drop checking of their retval then. Signed-off-by: Michal Privoznik --- src/vz/vz_driver.c | 3 +-- src/vz/vz_sdk.c | 40 +++++++++++++--------------------------- 2 files changed, 14 insertions(+), 29 deletions(-) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 5b54f83b22..adde179951 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -2955,8 +2955,7 @@ vzMigrationCreateURI(void) goto cleanup; } =20 - if (virAsprintf(&uri, "vzmigr://%s", hostname) < 0) - goto cleanup; + virAsprintf(&uri, "vzmigr://%s", hostname); =20 cleanup: VIR_FREE(hostname); diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index e7c1676df9..9e2bddf6df 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -1213,27 +1213,22 @@ prlsdkGetSerialInfo(PRL_HANDLE serialPort, virDomai= nChrDefPtr chr) break; case PDT_USE_TCP: chr->source->type =3D VIR_DOMAIN_CHR_TYPE_TCP; - if (virAsprintf(&uristr, "tcp://%s", friendlyName) < 0) - goto cleanup; + virAsprintf(&uristr, "tcp://%s", friendlyName); if (!(uri =3D virURIParse(uristr))) goto cleanup; chr->source->data.tcp.host =3D g_strdup(uri->server); - if (virAsprintf(&chr->source->data.tcp.service, "%d", uri->port) <= 0) - goto cleanup; + virAsprintf(&chr->source->data.tcp.service, "%d", uri->port); chr->source->data.tcp.listen =3D socket_mode =3D=3D PSP_SERIAL_SOC= KET_SERVER; break; case PDT_USE_UDP: chr->source->type =3D VIR_DOMAIN_CHR_TYPE_UDP; - if (virAsprintf(&uristr, "udp://%s", friendlyName) < 0) - goto cleanup; + virAsprintf(&uristr, "udp://%s", friendlyName); if (!(uri =3D virURIParse(uristr))) goto cleanup; chr->source->data.udp.bindHost =3D g_strdup(uri->server); - if (virAsprintf(&chr->source->data.udp.bindService, "%d", uri->por= t) < 0) - goto cleanup; + virAsprintf(&chr->source->data.udp.bindService, "%d", uri->port); chr->source->data.udp.connectHost =3D g_strdup(uri->server); - if (virAsprintf(&chr->source->data.udp.connectService, "%d", uri->= port) < 0) - goto cleanup; + virAsprintf(&chr->source->data.udp.connectService, "%d", uri->port= ); break; default: virReportError(VIR_ERR_INTERNAL_ERROR, @@ -3128,20 +3123,16 @@ static int prlsdkAddSerial(PRL_HANDLE sdkdom, virDo= mainChrDefPtr chr) break; case VIR_DOMAIN_CHR_TYPE_TCP: emutype =3D PDT_USE_TCP; - if (virAsprintf(&url, "%s:%s", - chr->source->data.tcp.host, - chr->source->data.tcp.service) < 0) - goto cleanup; + virAsprintf(&url, "%s:%s", chr->source->data.tcp.host, + chr->source->data.tcp.service); if (!chr->source->data.tcp.listen) socket_mode =3D PSP_SERIAL_SOCKET_CLIENT; path =3D url; break; case VIR_DOMAIN_CHR_TYPE_UDP: emutype =3D PDT_USE_UDP; - if (virAsprintf(&url, "%s:%s", - chr->source->data.udp.bindHost, - chr->source->data.udp.bindService) < 0) - goto cleanup; + virAsprintf(&url, "%s:%s", chr->source->data.udp.bindHost, + chr->source->data.udp.bindService); path =3D url; break; default: @@ -3333,10 +3324,7 @@ static int prlsdkConfigureNet(vzDriverPtr driver G_G= NUC_UNUSED, if (!(tmpstr =3D virSocketAddrFormat(&net->guestIP.ips[i]->address= ))) goto cleanup; =20 - if (virAsprintf(&addrstr, "%s/%d", tmpstr, net->guestIP.ips[i]->pr= efix) < 0) { - VIR_FREE(tmpstr); - goto cleanup; - } + virAsprintf(&addrstr, "%s/%d", tmpstr, net->guestIP.ips[i]->prefix= ); =20 VIR_FREE(tmpstr); pret =3D PrlStrList_AddItem(addrlist, addrstr); @@ -3791,9 +3779,8 @@ prlsdkAddFS(PRL_HANDLE sdkdom, virDomainFSDefPtr fs) prlsdkCheckRetGoto(pret, cleanup); =20 if (fs->type =3D=3D VIR_DOMAIN_FS_TYPE_VOLUME) { - if (virAsprintf(&storage, "libvirt://localhost/%s/%s", fs->src->sr= cpool->pool, - fs->src->srcpool->volume) < 0) - goto cleanup; + virAsprintf(&storage, "libvirt://localhost/%s/%s", + fs->src->srcpool->pool, fs->src->srcpool->volume); pret =3D PrlVmDevHd_SetStorageURL(sdkdisk, storage); prlsdkCheckRetGoto(pret, cleanup); } @@ -4519,8 +4506,7 @@ prlsdkGetVcpuStats(PRL_HANDLE sdkstats, int idx, unsi= gned long long *vtime) long long ptime =3D 0; int ret =3D -1; =20 - if (virAsprintf(&name, "guest.vcpu%u.time", (unsigned int)idx) < 0) - goto cleanup; + virAsprintf(&name, "guest.vcpu%u.time", (unsigned int)idx); if (prlsdkExtractStatsParam(sdkstats, name, &ptime) < 0) goto cleanup; *vtime =3D ptime =3D=3D -1 ? 0 : ptime; --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752783; cv=none; d=zoho.com; s=zohoarc; b=myYfiKDVwbu7IiRuIFsyI2NUcKvAChUibGXiGVwKB3sxi/dcqkvdXoW4MnlyKfLGD8OzPTZZX9JnVXsAGg0ub1TF9/VYiVHTh1U/Hz5/zrHKdfp0srb5olnoY9xsqGAOzGYKr0+FAtJuQ3XvIaaNa0OVNbw7t020PeQLBvd0jCE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752783; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=CH5wG+4DpUfFcaPbs+DsvhwvucsEaWVrMoAE0tqFZdI=; b=iKDTr9S60q2Jb8jNbJqDWuD3XCEKTp1+zkS3La7LDaQQnRfDLwpmBwmW41k52BL4zxFCqWiEVQdE14/CO+c4+hn57gXj8WWtum38wGvLaUtU6fWTeO56JCVnqW1PFoWGtZFcgTZdxLNV3pXJTm9nd+1yiou1xXTFHwSCWs09eUo= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1571752783610229.35016427153732; Tue, 22 Oct 2019 06:59:43 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-146-4DJGSZYEMbGDFfLMaTWTwg-1; Tue, 22 Oct 2019 09:59:37 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 42333801E5C; Tue, 22 Oct 2019 13:59:32 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1A9855D784; Tue, 22 Oct 2019 13:59:32 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id CC2F43FB59; Tue, 22 Oct 2019 13:59:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9MDxUnF002075 for ; Tue, 22 Oct 2019 09:59:30 -0400 Received: by smtp.corp.redhat.com (Postfix) id 33DE56012E; Tue, 22 Oct 2019 13:59:30 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 606ED6012D for ; Tue, 22 Oct 2019 13:59:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752782; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=CH5wG+4DpUfFcaPbs+DsvhwvucsEaWVrMoAE0tqFZdI=; b=V3RfCVfvbCDtTQnT9/EFBYNPoNBKzHo839oOeWX6qJIHGlBwkARrOHNiPwtQ+uJoApM/GF yf266g9QiInqK+eC7pE1wc/v6qz7kzVDnCTFbxX9yajHUxhmYPkn2Yl+bWuyiYj18TKNdj hjMw6JHBHjoMFCR2F7vswjqr3uaxjBA= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:35 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 31/75] tests: Drop virAsprintf() and virAsprintfQuiet() retval checking X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: 4DJGSZYEMbGDFfLMaTWTwg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" These functions can't fail really. Drop checking of their retval then. Signed-off-by: Michal Privoznik --- tests/commandtest.c | 27 +++---- tests/cputest.c | 95 +++++++++--------------- tests/domaincapstest.c | 26 +++---- tests/domainconftest.c | 5 +- tests/fchosttest.c | 7 +- tests/fdstreamtest.c | 6 +- tests/genericxml2xmltest.c | 10 +-- tests/interfacexml2xmltest.c | 5 +- tests/libxlxml2domconfigtest.c | 8 +- tests/lxcconf2xmltest.c | 20 ++--- tests/lxcxml2xmltest.c | 10 +-- tests/networkxml2conftest.c | 9 +-- tests/networkxml2firewalltest.c | 16 ++-- tests/networkxml2xmltest.c | 9 +-- tests/networkxml2xmlupdatetest.c | 15 ++-- tests/nodedevxml2xmltest.c | 5 +- tests/nssmock.c | 9 +-- tests/nwfilterxml2firewalltest.c | 15 ++-- tests/nwfilterxml2xmltest.c | 9 +-- tests/openvzutilstest.c | 6 +- tests/qemuagenttest.c | 4 +- tests/qemublocktest.c | 34 +++------ tests/qemucapabilitiestest.c | 20 ++--- tests/qemucaps2xmltest.c | 15 ++-- tests/qemudomaincheckpointxml2xmltest.c | 5 +- tests/qemudomainsnapshotxml2xmltest.c | 5 +- tests/qemufirmwaretest.c | 4 +- tests/qemuhotplugtest.c | 29 ++++---- tests/qemumemlocktest.c | 5 +- tests/qemumigparamstest.c | 23 +++--- tests/qemumonitorjsontest.c | 56 +++++++------- tests/qemumonitortestutils.c | 38 +++------- tests/qemusecuritymock.c | 5 +- tests/qemusecuritytest.c | 3 +- tests/qemuvhostusertest.c | 4 +- tests/qemuxml2argvtest.c | 35 +++------ tests/qemuxml2xmltest.c | 41 +++-------- tests/scsihosttest.c | 26 ++----- tests/secretxml2xmltest.c | 14 ++-- tests/securityselinuxlabeltest.c | 23 ++---- tests/storagebackendsheepdogtest.c | 11 +-- tests/storagepoolcapstest.c | 6 +- tests/storagepoolxml2argvtest.c | 11 +-- tests/storagepoolxml2xmltest.c | 9 +-- tests/storagevolxml2argvtest.c | 31 +++----- tests/storagevolxml2xmltest.c | 13 ++-- tests/sysinfotest.c | 18 ++--- tests/testutils.c | 17 ++--- tests/testutils.h | 5 +- tests/testutilsqemu.c | 11 +-- tests/vboxsnapshotxmltest.c | 5 +- tests/virbuftest.c | 7 +- tests/vircaps2xmltest.c | 15 ++-- tests/vircgroupmock.c | 11 +-- tests/vircgrouptest.c | 5 +- tests/virconftest.c | 7 +- tests/virfilemock.c | 2 +- tests/virfiletest.c | 3 +- tests/virfilewrapper.c | 4 +- tests/virhostcputest.c | 38 ++++------ tests/virjsontest.c | 27 +++---- tests/virmacmaptest.c | 12 +-- tests/virnetdaemontest.c | 10 +-- tests/virnetdevmock.c | 8 +- tests/virnetdevopenvswitchtest.c | 5 +- tests/virnetsockettest.c | 6 +- tests/virnetworkportxml2xmltest.c | 6 +- tests/virnumamock.c | 3 +- tests/virnwfilterbindingxml2xmltest.c | 7 +- tests/virpcimock.c | 97 ++++++++++--------------- tests/virpcitest.c | 16 ++-- tests/virrandommock.c | 5 +- tests/virresctrltest.c | 15 ++-- tests/virschematest.c | 19 ++--- tests/virscsitest.c | 11 +-- tests/virshtest.c | 5 +- tests/virstoragetest.c | 63 ++++++++-------- tests/virtestmock.c | 8 +- tests/virusbmock.c | 9 +-- tests/virusbtest.c | 6 +- tests/vmwarevertest.c | 4 +- tests/vmx2xmltest.c | 18 ++--- tests/xlconfigtest.c | 8 +- tests/xmconfigtest.c | 8 +- tests/xml2vmxtest.c | 16 ++-- 85 files changed, 480 insertions(+), 842 deletions(-) diff --git a/tests/commandtest.c b/tests/commandtest.c index 6ff2039ab1..9ee23add4c 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -67,11 +67,8 @@ static int checkoutput(const char *testname, char *actualname =3D NULL; char *actuallog =3D NULL; =20 - if (virAsprintf(&expectname, "%s/commanddata/%s.log", abs_srcdir, - testname) < 0) - goto cleanup; - if (virAsprintf(&actualname, "%s/commandhelper.log", abs_builddir) < 0) - goto cleanup; + virAsprintf(&expectname, "%s/commanddata/%s.log", abs_srcdir, testname= ); + virAsprintf(&actualname, "%s/commandhelper.log", abs_builddir); =20 if (virFileReadAll(expectname, 1024*64, &expectlog) < 0) { fprintf(stderr, "cannot read %s\n", expectname); @@ -86,8 +83,7 @@ static int checkoutput(const char *testname, if (prefix) { char *tmp =3D NULL; =20 - if (virAsprintf(&tmp, "%s%s", prefix, expectlog) < 0) - goto cleanup; + virAsprintf(&tmp, "%s%s", prefix, expectlog); =20 VIR_FREE(expectlog); expectlog =3D tmp; @@ -595,8 +591,7 @@ static int test15(const void *unused G_GNUC_UNUSED) char *cwd =3D NULL; int ret =3D -1; =20 - if (virAsprintf(&cwd, "%s/commanddata", abs_srcdir) < 0) - goto cleanup; + virAsprintf(&cwd, "%s/commanddata", abs_srcdir); virCommandSetWorkingDirectory(cmd, cwd); virCommandSetUmask(cmd, 002); =20 @@ -815,8 +810,7 @@ static int test20(const void *unused G_GNUC_UNUSED) =20 sigaction(SIGPIPE, &sig_action, NULL); =20 - if (virAsprintf(&buf, "1\n%100000d\n", 2) < 0) - goto cleanup; + virAsprintf(&buf, "1\n%100000d\n", 2); virCommandSetInputBuffer(cmd, buf); =20 if (virCommandRun(cmd, NULL) < 0) { @@ -1174,13 +1168,10 @@ static int test27(const void *unused G_GNUC_UNUSED) buffer2[buflen - 2] =3D '\n'; buffer2[buflen - 1] =3D 0; =20 - if (virAsprintf(&outexpect, TEST27_OUTEXPECT_TEMP, - buffer0, buffer1, buffer2) < 0 || - virAsprintf(&errexpect, TEST27_ERREXPECT_TEMP, - buffer0, buffer1, buffer2) < 0) { - printf("Could not virAsprintf expected output\n"); - goto cleanup; - } + virAsprintf(&outexpect, TEST27_OUTEXPECT_TEMP, + buffer0, buffer1, buffer2); + virAsprintf(&errexpect, TEST27_ERREXPECT_TEMP, + buffer0, buffer1, buffer2); =20 if (pipe(pipe1) < 0 || pipe(pipe2) < 0) { printf("Could not create pipe: %s\n", g_strerror(errno)); diff --git a/tests/cputest.c b/tests/cputest.c index 83b494857f..e1b609ef73 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -75,9 +75,8 @@ cpuTestLoadXML(virArch arch, const char *name) xmlXPathContextPtr ctxt =3D NULL; virCPUDefPtr cpu =3D NULL; =20 - if (virAsprintf(&xml, "%s/cputestdata/%s-%s.xml", - abs_srcdir, virArchToString(arch), name) < 0) - goto cleanup; + virAsprintf(&xml, "%s/cputestdata/%s-%s.xml", abs_srcdir, + virArchToString(arch), name); =20 if (!(doc =3D virXMLParseFileCtxt(xml, &ctxt))) goto cleanup; @@ -105,9 +104,8 @@ cpuTestLoadMultiXML(virArch arch, int n; size_t i; =20 - if (virAsprintf(&xml, "%s/cputestdata/%s-%s.xml", - abs_srcdir, virArchToString(arch), name) < 0) - goto cleanup; + virAsprintf(&xml, "%s/cputestdata/%s-%s.xml", abs_srcdir, + virArchToString(arch), name); =20 if (!(doc =3D virXMLParseFileCtxt(xml, &ctxt))) goto cleanup; @@ -150,9 +148,8 @@ cpuTestCompareXML(virArch arch, char *actual =3D NULL; int ret =3D -1; =20 - if (virAsprintf(&xml, "%s/cputestdata/%s-%s.xml", - abs_srcdir, virArchToString(arch), name) < 0) - goto cleanup; + virAsprintf(&xml, "%s/cputestdata/%s-%s.xml", abs_srcdir, + virArchToString(arch), name); =20 if (!(actual =3D virCPUDefFormat(cpu, NULL))) goto cleanup; @@ -345,8 +342,7 @@ cpuTestBaseline(const void *arg) suffix =3D "migratable"; else suffix =3D "result"; - if (virAsprintf(&result, "%s-%s", data->name, suffix) < 0) - goto cleanup; + virAsprintf(&result, "%s-%s", data->name, suffix); =20 if (cpuTestCompareXML(data->arch, baseline, result) < 0) goto cleanup; @@ -399,8 +395,7 @@ cpuTestUpdate(const void *arg) if (virCPUUpdate(host->arch, cpu, migHost) < 0) goto cleanup; =20 - if (virAsprintf(&result, "%s+%s", data->host, data->name) < 0) - goto cleanup; + virAsprintf(&result, "%s+%s", data->host, data->name); =20 ret =3D cpuTestCompareXML(data->arch, cpu, result); =20 @@ -485,9 +480,8 @@ cpuTestMakeQEMUCaps(const struct data *data) bool fail_no_props =3D true; char *json =3D NULL; =20 - if (virAsprintf(&json, "%s/cputestdata/%s-cpuid-%s.json", - abs_srcdir, virArchToString(data->arch), data->host) <= 0) - goto error; + virAsprintf(&json, "%s/cputestdata/%s-cpuid-%s.json", abs_srcdir, + virArchToString(data->arch), data->host); =20 if (!(testMon =3D qemuMonitorTestNewFromFile(json, driver.xmlopt, true= ))) goto error; @@ -589,9 +583,8 @@ cpuTestCPUID(bool guest, const void *arg) char *result =3D NULL; virDomainCapsCPUModelsPtr models =3D NULL; =20 - if (virAsprintf(&hostFile, "%s/cputestdata/%s-cpuid-%s.xml", - abs_srcdir, virArchToString(data->arch), data->host) <= 0) - goto cleanup; + virAsprintf(&hostFile, "%s/cputestdata/%s-cpuid-%s.xml", abs_srcdir, + virArchToString(data->arch), data->host); =20 if (virTestLoadFile(hostFile, &host) < 0 || !(hostData =3D virCPUDataParse(host))) @@ -622,10 +615,7 @@ cpuTestCPUID(bool guest, const void *arg) if (cpuDecode(cpu, hostData, models) < 0) goto cleanup; =20 - if (virAsprintf(&result, "cpuid-%s-%s", - data->host, - guest ? "guest" : "host") < 0) - goto cleanup; + virAsprintf(&result, "cpuid-%s-%s", data->host, guest ? "guest" : "hos= t"); =20 ret =3D cpuTestCompareXML(data->arch, cpu, result); =20 @@ -667,17 +657,12 @@ cpuTestCompareSignature(const struct data *data, =20 signature =3D virCPUx86DataGetSignature(hostData, &family, &model, &st= epping); =20 - if (virAsprintf(&result, "%s/cputestdata/%s-cpuid-%s.sig", - abs_srcdir, virArchToString(data->arch), data->host) <= 0) - return -1; + virAsprintf(&result, "%s/cputestdata/%s-cpuid-%s.sig", abs_srcdir, + virArchToString(data->arch), data->host); =20 - if (virAsprintf(&sigStr, - "%1$06lx\n" - "family: %2$3u (0x%2$02x)\n" - "model: %3$3u (0x%3$02x)\n" - "stepping: %4$3u (0x%4$02x)\n", - signature, family, model, stepping) < 0) - return -1; + virAsprintf(&sigStr, "%1$06lx\n" "family: %2$3u (0x%2$02x)\n" + "model: %3$3u (0x%3$02x)\n" "stepping: %4$3u (0x%4$02x)= \n", + signature, family, model, stepping); =20 return virTestCompareToFile(sigStr, result); } @@ -692,9 +677,8 @@ cpuTestCPUIDSignature(const void *arg) char *host =3D NULL; int ret =3D -1; =20 - if (virAsprintf(&hostFile, "%s/cputestdata/%s-cpuid-%s.xml", - abs_srcdir, virArchToString(data->arch), data->host) <= 0) - goto cleanup; + virAsprintf(&hostFile, "%s/cputestdata/%s-cpuid-%s.xml", abs_srcdir, + virArchToString(data->arch), data->host); =20 if (virTestLoadFile(hostFile, &host) < 0 || !(hostData =3D virCPUDataParse(host))) @@ -817,24 +801,24 @@ cpuTestUpdateLive(const void *arg) virDomainCapsCPUModelsPtr models =3D NULL; int ret =3D -1; =20 - if (virAsprintf(&cpuFile, "cpuid-%s-guest", data->host) < 0 || - !(cpu =3D cpuTestLoadXML(data->arch, cpuFile))) + virAsprintf(&cpuFile, "cpuid-%s-guest", data->host); + if (!(cpu =3D cpuTestLoadXML(data->arch, cpuFile))) goto cleanup; =20 - if (virAsprintf(&enabledFile, "%s/cputestdata/%s-cpuid-%s-enabled.xml", - abs_srcdir, virArchToString(data->arch), data->host) <= 0 || - virTestLoadFile(enabledFile, &enabled) < 0 || + virAsprintf(&enabledFile, "%s/cputestdata/%s-cpuid-%s-enabled.xml", + abs_srcdir, virArchToString(data->arch), data->host); + if (virTestLoadFile(enabledFile, &enabled) < 0 || !(enabledData =3D virCPUDataParse(enabled))) goto cleanup; =20 - if (virAsprintf(&disabledFile, "%s/cputestdata/%s-cpuid-%s-disabled.xm= l", - abs_srcdir, virArchToString(data->arch), data->host) <= 0 || - virTestLoadFile(disabledFile, &disabled) < 0 || + virAsprintf(&disabledFile, "%s/cputestdata/%s-cpuid-%s-disabled.xml", + abs_srcdir, virArchToString(data->arch), data->host); + if (virTestLoadFile(disabledFile, &disabled) < 0 || !(disabledData =3D virCPUDataParse(disabled))) goto cleanup; =20 - if (virAsprintf(&expectedFile, "cpuid-%s-json", data->host) < 0 || - !(expected =3D cpuTestLoadXML(data->arch, expectedFile))) + virAsprintf(&expectedFile, "cpuid-%s-json", data->host); + if (!(expected =3D cpuTestLoadXML(data->arch, expectedFile))) goto cleanup; =20 /* In case the host CPU signature does not exactly match any CPU model= from @@ -906,8 +890,7 @@ cpuTestJSONCPUID(const void *arg) char *result =3D NULL; int ret =3D -1; =20 - if (virAsprintf(&result, "cpuid-%s-json", data->host) < 0) - goto cleanup; + virAsprintf(&result, "cpuid-%s-json", data->host); =20 if (!(qemuCaps =3D cpuTestMakeQEMUCaps(data))) goto cleanup; @@ -1028,11 +1011,8 @@ mymain(void) tmp =3D virTestLogContentAndReset(); \ VIR_FREE(tmp); \ \ - if (virAsprintf(&testLabel, "%s(%s): %s", \ - #api, virArchToString(arch), name) < 0) { \ - ret =3D -1; \ - break; \ - } \ + virAsprintf(&testLabel, "%s(%s): %s", \ + #api, virArchToString(arch), name); \ \ if (virTestRun(testLabel, api, &data) < 0) { \ if (virTestGetDebug()) { \ @@ -1072,12 +1052,9 @@ mymain(void) suffix =3D " (expanded)"; \ if ((flags) & VIR_CONNECT_BASELINE_CPU_MIGRATABLE) \ suffix =3D " (migratable)"; \ - if (virAsprintf(&label, "%s%s", name, suffix) < 0) { \ - ret =3D -1; \ - } else { \ - DO_TEST(arch, cpuTestBaseline, label, NULL, \ - "baseline-" name, NULL, flags, result); \ - } \ + virAsprintf(&label, "%s%s", name, suffix); \ + DO_TEST(arch, cpuTestBaseline, label, NULL, \ + "baseline-" name, NULL, flags, result); \ VIR_FREE(label); \ } while (0) =20 diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index 61bc019671..3289eb3ef7 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -88,9 +88,8 @@ fillQemuCaps(virDomainCapsPtr domCaps, fakeHostCPU(caps, domCaps->arch) < 0) goto cleanup; =20 - if (virAsprintf(&path, "%s/%s.%s.xml", - TEST_QEMU_CAPS_PATH, name, arch) < 0 || - !(qemuCaps =3D qemuTestParseCapabilities(caps, path))) + virAsprintf(&path, "%s/%s.%s.xml", TEST_QEMU_CAPS_PATH, name, arch); + if (!(qemuCaps =3D qemuTestParseCapabilities(caps, path))) goto cleanup; =20 if (machine) { @@ -217,9 +216,8 @@ test_virDomainCapsFormat(const void *opaque) char *domCapsXML =3D NULL; int ret =3D -1; =20 - if (virAsprintf(&path, "%s/domaincapsschemadata/%s.xml", - abs_srcdir, data->name) < 0) - goto cleanup; + virAsprintf(&path, "%s/domaincapsschemadata/%s.xml", abs_srcdir, + data->name); =20 if (!(domCaps =3D virDomainCapsNew(data->emulator, data->machine, virArchFromString(data->arch), @@ -299,13 +297,10 @@ mymain(void) #define DO_TEST_QEMU(Name, CapsName, Emulator, Machine, Arch, Type) \ do { \ char *name =3D NULL; \ - if (virAsprintf(&name, "qemu_%s%s%s.%s", \ - Name, \ - Machine ? "-" : "", Machine ? Machine : "", \ - Arch) < 0) { \ - ret =3D -1; \ - break; \ - } \ + virAsprintf(&name, "qemu_%s%s%s.%s", \ + Name, \ + Machine ? "-" : "", Machine ? Machine : "", \ + Arch); \ struct testData data =3D { \ .name =3D name, \ .emulator =3D Emulator, \ @@ -338,10 +333,7 @@ mymain(void) #define DO_TEST_BHYVE(Name, Emulator, BhyveCaps, Type) \ do { \ char *name =3D NULL; \ - if (virAsprintf(&name, "bhyve_%s.x86_64", Name) < 0) { \ - ret =3D -1; \ - break; \ - } \ + virAsprintf(&name, "bhyve_%s.x86_64", Name); \ struct testData data =3D { \ .name =3D name, \ .emulator =3D Emulator, \ diff --git a/tests/domainconftest.c b/tests/domainconftest.c index e7bdc99438..3de6e7740e 100644 --- a/tests/domainconftest.c +++ b/tests/domainconftest.c @@ -46,9 +46,8 @@ static int testGetFilesystem(const void *opaque) const struct testGetFilesystemData *data =3D opaque; virDomainFSDefPtr fsdef; =20 - if (virAsprintf(&filename, "%s/domainconfdata/%s.xml", - abs_srcdir, data->filename) < 0) - goto cleanup; + virAsprintf(&filename, "%s/domainconfdata/%s.xml", abs_srcdir, + data->filename); =20 if (!(def =3D virDomainDefParseFile(filename, caps, xmlopt, NULL, 0))) goto cleanup; diff --git a/tests/fchosttest.c b/tests/fchosttest.c index 4e37656576..fe4f255fe1 100644 --- a/tests/fchosttest.c +++ b/tests/fchosttest.c @@ -343,11 +343,7 @@ mymain(void) { int ret =3D 0; =20 - if (virAsprintf(&fchost_prefix, "%s/%s", abs_srcdir, - "fchostdata/fc_host/") < 0) { - ret =3D -1; - goto cleanup; - } + virAsprintf(&fchost_prefix, "%s/%s", abs_srcdir, "fchostdata/fc_host/"= ); =20 if (virTestRun("virVHBAPathExists", test1, NULL) < 0) ret =3D -1; @@ -377,7 +373,6 @@ mymain(void) test11_xml) < 0) ret =3D -1; =20 - cleanup: VIR_FREE(fchost_prefix); return ret; } diff --git a/tests/fdstreamtest.c b/tests/fdstreamtest.c index 98519e6266..4acc97967e 100644 --- a/tests/fdstreamtest.c +++ b/tests/fdstreamtest.c @@ -62,8 +62,7 @@ static int testFDStreamReadCommon(const char *scratchdir,= bool blocking) for (i =3D 0; i < PATTERN_LEN; i++) pattern[i] =3D i; =20 - if (virAsprintf(&file, "%s/input.data", scratchdir) < 0) - goto cleanup; + virAsprintf(&file, "%s/input.data", scratchdir); =20 if ((fd =3D open(file, O_CREAT|O_WRONLY|O_EXCL, 0600)) < 0) goto cleanup; @@ -194,8 +193,7 @@ static int testFDStreamWriteCommon(const char *scratchd= ir, bool blocking) for (i =3D 0; i < PATTERN_LEN; i++) pattern[i] =3D i; =20 - if (virAsprintf(&file, "%s/input.data", scratchdir) < 0) - goto cleanup; + virAsprintf(&file, "%s/input.data", scratchdir); =20 if (!(st =3D virStreamNew(conn, flags))) goto cleanup; diff --git a/tests/genericxml2xmltest.c b/tests/genericxml2xmltest.c index 1840d6e6a8..7b59749d01 100644 --- a/tests/genericxml2xmltest.c +++ b/tests/genericxml2xmltest.c @@ -29,17 +29,15 @@ testCompareXMLToXMLHelper(const void *data) char *xml_out =3D NULL; int ret =3D -1; =20 - if (virAsprintf(&xml_in, "%s/genericxml2xmlindata/%s.xml", - abs_srcdir, info->name) < 0 || - virAsprintf(&xml_out, "%s/genericxml2xmloutdata/%s.xml", - abs_srcdir, info->name) < 0) - goto cleanup; + virAsprintf(&xml_in, "%s/genericxml2xmlindata/%s.xml", + abs_srcdir, info->name); + virAsprintf(&xml_out, "%s/genericxml2xmloutdata/%s.xml", + abs_srcdir, info->name); =20 ret =3D testCompareDomXML2XMLFiles(caps, xmlopt, xml_in, info->different ? xml_out : xml_in, !info->inactive_only, 0, info->expectResult); - cleanup: VIR_FREE(xml_in); VIR_FREE(xml_out); return ret; diff --git a/tests/interfacexml2xmltest.c b/tests/interfacexml2xmltest.c index 1fc61e3853..c7de2e4bd0 100644 --- a/tests/interfacexml2xmltest.c +++ b/tests/interfacexml2xmltest.c @@ -50,9 +50,8 @@ testCompareXMLToXMLHelper(const void *data) int result =3D -1; char *xml =3D NULL; =20 - if (virAsprintf(&xml, "%s/interfaceschemadata/%s.xml", - abs_srcdir, (const char*)data) < 0) - return -1; + virAsprintf(&xml, "%s/interfaceschemadata/%s.xml", abs_srcdir, + (const char *)data); =20 result =3D testCompareXMLToXMLFiles(xml); =20 diff --git a/tests/libxlxml2domconfigtest.c b/tests/libxlxml2domconfigtest.c index 120796b110..efd003eb58 100644 --- a/tests/libxlxml2domconfigtest.c +++ b/tests/libxlxml2domconfigtest.c @@ -151,15 +151,11 @@ testCompareXMLToDomConfigHelper(const void *data) char *xmlfile =3D NULL; char *jsonfile =3D NULL; =20 - if (virAsprintf(&xmlfile, "%s/libxlxml2domconfigdata/%s.xml", - abs_srcdir, info->name) < 0 || - virAsprintf(&jsonfile, "%s/libxlxml2domconfigdata/%s.json", - abs_srcdir, info->name) < 0) - goto cleanup; + virAsprintf(&xmlfile, "%s/libxlxml2domconfigdata/%s.xml", abs_srcdir, = info->name); + virAsprintf(&jsonfile, "%s/libxlxml2domconfigdata/%s.json", abs_srcdir= , info->name); =20 ret =3D testCompareXMLToDomConfig(xmlfile, jsonfile); =20 - cleanup: VIR_FREE(xmlfile); VIR_FREE(jsonfile); return ret; diff --git a/tests/lxcconf2xmltest.c b/tests/lxcconf2xmltest.c index 2a277042ce..f2d884dc15 100644 --- a/tests/lxcconf2xmltest.c +++ b/tests/lxcconf2xmltest.c @@ -71,15 +71,13 @@ testCompareXMLToConfigHelperLegacy(const void *data) char *xml =3D NULL; char *config =3D NULL; =20 - if (virAsprintf(&xml, "%s/lxcconf2xmldata/lxcconf2xml-%s.xml", - abs_srcdir, info->name) < 0 || - virAsprintf(&config, "%s/lxcconf2xmldata/lxcconf2xml-%s.config", - abs_srcdir, info->name) < 0) - goto cleanup; + virAsprintf(&xml, "%s/lxcconf2xmldata/lxcconf2xml-%s.xml", + abs_srcdir, info->name); + virAsprintf(&config, "%s/lxcconf2xmldata/lxcconf2xml-%s.config", + abs_srcdir, info->name); =20 result =3D testCompareXMLToConfigFiles(xml, config, info->expectError); =20 - cleanup: VIR_FREE(xml); VIR_FREE(config); return result; @@ -93,15 +91,13 @@ testCompareXMLToConfigHelperV3(const void *data) char *xml =3D NULL; char *config =3D NULL; =20 - if (virAsprintf(&xml, "%s/lxcconf2xmldata/lxcconf2xml-%s.xml", - abs_srcdir, info->name) < 0 || - virAsprintf(&config, "%s/lxcconf2xmldata/lxcconf2xml-%s-v3.config", - abs_srcdir, info->name) < 0) - goto cleanup; + virAsprintf(&xml, "%s/lxcconf2xmldata/lxcconf2xml-%s.xml", + abs_srcdir, info->name); + virAsprintf(&config, "%s/lxcconf2xmldata/lxcconf2xml-%s-v3.config", + abs_srcdir, info->name); =20 result =3D testCompareXMLToConfigFiles(xml, config, info->expectError); =20 - cleanup: VIR_FREE(xml); VIR_FREE(config); return result; diff --git a/tests/lxcxml2xmltest.c b/tests/lxcxml2xmltest.c index e871700d1d..ded35f8d4b 100644 --- a/tests/lxcxml2xmltest.c +++ b/tests/lxcxml2xmltest.c @@ -34,18 +34,16 @@ testCompareXMLToXMLHelper(const void *data) char *xml_out =3D NULL; int ret =3D -1; =20 - if (virAsprintf(&xml_in, "%s/lxcxml2xmldata/lxc-%s.xml", - abs_srcdir, info->name) < 0 || - virAsprintf(&xml_out, "%s/lxcxml2xmloutdata/lxc-%s.xml", - abs_srcdir, info->name) < 0) - goto cleanup; + virAsprintf(&xml_in, "%s/lxcxml2xmldata/lxc-%s.xml", + abs_srcdir, info->name); + virAsprintf(&xml_out, "%s/lxcxml2xmloutdata/lxc-%s.xml", + abs_srcdir, info->name); =20 ret =3D testCompareDomXML2XMLFiles(caps, xmlopt, xml_in, info->different ? xml_out : xml_in, !info->inactive_only, info->parse_flags, TEST_COMPARE_DOM_XML2XML_RESULT_SUCCE= SS); - cleanup: VIR_FREE(xml_in); VIR_FREE(xml_out); return ret; diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c index 098b5eff09..9992afaf62 100644 --- a/tests/networkxml2conftest.c +++ b/tests/networkxml2conftest.c @@ -86,16 +86,11 @@ testCompareXMLToConfHelper(const void *data) char *inxml =3D NULL; char *outconf =3D NULL; =20 - if (virAsprintf(&inxml, "%s/networkxml2confdata/%s.xml", - abs_srcdir, info->name) < 0 || - virAsprintf(&outconf, "%s/networkxml2confdata/%s.conf", - abs_srcdir, info->name) < 0) { - goto cleanup; - } + virAsprintf(&inxml, "%s/networkxml2confdata/%s.xml", abs_srcdir, info-= >name); + virAsprintf(&outconf, "%s/networkxml2confdata/%s.conf", abs_srcdir, in= fo->name); =20 result =3D testCompareXMLToConfFiles(inxml, outconf, info->caps); =20 - cleanup: VIR_FREE(inxml); VIR_FREE(outconf); =20 diff --git a/tests/networkxml2firewalltest.c b/tests/networkxml2firewalltes= t.c index b8e974971a..0aaebf5bc6 100644 --- a/tests/networkxml2firewalltest.c +++ b/tests/networkxml2firewalltest.c @@ -117,15 +117,13 @@ testCompareXMLToIPTablesHelper(const void *data) char *xml =3D NULL; char *args =3D NULL; =20 - if (virAsprintf(&xml, "%s/networkxml2firewalldata/%s.xml", - abs_srcdir, info->name) < 0 || - virAsprintf(&args, "%s/networkxml2firewalldata/%s-%s.args", - abs_srcdir, info->name, RULESTYPE) < 0) - goto cleanup; + virAsprintf(&xml, "%s/networkxml2firewalldata/%s.xml", + abs_srcdir, info->name); + virAsprintf(&args, "%s/networkxml2firewalldata/%s-%s.args", + abs_srcdir, info->name, RULESTYPE); =20 result =3D testCompareXMLToArgvFiles(xml, args, info->baseargs); =20 - cleanup: VIR_FREE(xml); VIR_FREE(args); return result; @@ -169,11 +167,7 @@ mymain(void) goto cleanup; } =20 - if (virAsprintf(&basefile, "%s/networkxml2firewalldata/base.args", - abs_srcdir) < 0) { - ret =3D -1; - goto cleanup; - } + virAsprintf(&basefile, "%s/networkxml2firewalldata/base.args", abs_src= dir); =20 if (virTestLoadFile(basefile, &baseargs) < 0) { ret =3D -1; diff --git a/tests/networkxml2xmltest.c b/tests/networkxml2xmltest.c index 3d90023445..64aada5f34 100644 --- a/tests/networkxml2xmltest.c +++ b/tests/networkxml2xmltest.c @@ -90,17 +90,12 @@ testCompareXMLToXMLHelper(const void *data) char *inxml =3D NULL; char *outxml =3D NULL; =20 - if (virAsprintf(&inxml, "%s/networkxml2xmlin/%s.xml", - abs_srcdir, info->name) < 0 || - virAsprintf(&outxml, "%s/networkxml2xmlout/%s.xml", - abs_srcdir, info->name) < 0) { - goto cleanup; - } + virAsprintf(&inxml, "%s/networkxml2xmlin/%s.xml", abs_srcdir, info->na= me); + virAsprintf(&outxml, "%s/networkxml2xmlout/%s.xml", abs_srcdir, info->= name); =20 result =3D testCompareXMLToXMLFiles(inxml, outxml, info->flags, info->expectResult); =20 - cleanup: VIR_FREE(inxml); VIR_FREE(outxml); =20 diff --git a/tests/networkxml2xmlupdatetest.c b/tests/networkxml2xmlupdatet= est.c index 69c19e800d..a76498c085 100644 --- a/tests/networkxml2xmlupdatetest.c +++ b/tests/networkxml2xmlupdatetest.c @@ -82,20 +82,17 @@ testCompareXMLToXMLHelper(const void *data) char *updatexml =3D NULL; char *outxml =3D NULL; =20 - if (virAsprintf(&netxml, "%s/networkxml2xmlin/%s.xml", - abs_srcdir, info->netxml) < 0 || - virAsprintf(&updatexml, "%s/networkxml2xmlupdatein/%s.xml", - abs_srcdir, info->updatexml) < 0 || - virAsprintf(&outxml, "%s/networkxml2xmlupdateout/%s.xml", - abs_srcdir, info->outxml) < 0) { - goto cleanup; - } + virAsprintf(&netxml, "%s/networkxml2xmlin/%s.xml", + abs_srcdir, info->netxml); + virAsprintf(&updatexml, "%s/networkxml2xmlupdatein/%s.xml", + abs_srcdir, info->updatexml); + virAsprintf(&outxml, "%s/networkxml2xmlupdateout/%s.xml", + abs_srcdir, info->outxml); =20 result =3D testCompareXMLToXMLFiles(netxml, updatexml, outxml, info->f= lags, info->command, info->section, info->parentIndex, info->expectFailu= re); =20 - cleanup: VIR_FREE(netxml); VIR_FREE(updatexml); VIR_FREE(outxml); diff --git a/tests/nodedevxml2xmltest.c b/tests/nodedevxml2xmltest.c index 9248a60fbf..e8b869526d 100644 --- a/tests/nodedevxml2xmltest.c +++ b/tests/nodedevxml2xmltest.c @@ -72,9 +72,8 @@ testCompareXMLToXMLHelper(const void *data) int result =3D -1; char *xml =3D NULL; =20 - if (virAsprintf(&xml, "%s/nodedevschemadata/%s.xml", - abs_srcdir, (const char*)data) < 0) - return -1; + virAsprintf(&xml, "%s/nodedevschemadata/%s.xml", abs_srcdir, + (const char *)data); =20 result =3D testCompareXMLToXMLFiles(xml); =20 diff --git a/tests/nssmock.c b/tests/nssmock.c index ea4b26ffab..be70a60790 100644 --- a/tests/nssmock.c +++ b/tests/nssmock.c @@ -55,12 +55,9 @@ getrealpath(char **newpath, const char *path) { if (STRPREFIX(path, LEASEDIR)) { - if (virAsprintfQuiet(newpath, "%s/nssdata/%s", - abs_srcdir, - path + strlen(LEASEDIR)) < 0) { - errno =3D ENOMEM; - return -1; - } + virAsprintfQuiet(newpath, "%s/nssdata/%s", + abs_srcdir, + path + strlen(LEASEDIR)); } else { *newpath =3D g_strdup(path); } diff --git a/tests/nwfilterxml2firewalltest.c b/tests/nwfilterxml2firewallt= est.c index bef3790da2..95b6b24014 100644 --- a/tests/nwfilterxml2firewalltest.c +++ b/tests/nwfilterxml2firewalltest.c @@ -243,9 +243,8 @@ virNWFilterIncludeDefToRuleInst(virNWFilterIncludeDefPt= r inc, int ret =3D -1; char *xml; =20 - if (virAsprintf(&xml, "%s/nwfilterxml2firewalldata/%s.xml", - abs_srcdir, inc->filterref) < 0) - return -1; + virAsprintf(&xml, "%s/nwfilterxml2firewalldata/%s.xml", abs_srcdir, + inc->filterref); =20 /* create a temporary hashmap for depth-first tree traversal */ if (!(tmpvars =3D virNWFilterCreateVarsFrom(inc->params, @@ -429,15 +428,13 @@ testCompareXMLToIPTablesHelper(const void *data) char *xml =3D NULL; char *args =3D NULL; =20 - if (virAsprintf(&xml, "%s/nwfilterxml2firewalldata/%s.xml", - abs_srcdir, info->name) < 0 || - virAsprintf(&args, "%s/nwfilterxml2firewalldata/%s-%s.args", - abs_srcdir, info->name, RULESTYPE) < 0) - goto cleanup; + virAsprintf(&xml, "%s/nwfilterxml2firewalldata/%s.xml", + abs_srcdir, info->name); + virAsprintf(&args, "%s/nwfilterxml2firewalldata/%s-%s.args", + abs_srcdir, info->name, RULESTYPE); =20 result =3D testCompareXMLToArgvFiles(xml, args); =20 - cleanup: VIR_FREE(xml); VIR_FREE(args); return result; diff --git a/tests/nwfilterxml2xmltest.c b/tests/nwfilterxml2xmltest.c index 5fc9d19d47..344dd68bc5 100644 --- a/tests/nwfilterxml2xmltest.c +++ b/tests/nwfilterxml2xmltest.c @@ -62,16 +62,11 @@ testCompareXMLToXMLHelper(const void *data) char *inxml =3D NULL; char *outxml =3D NULL; =20 - if (virAsprintf(&inxml, "%s/nwfilterxml2xmlin/%s.xml", - abs_srcdir, tp->name) < 0 || - virAsprintf(&outxml, "%s/nwfilterxml2xmlout/%s.xml", - abs_srcdir, tp->name) < 0) { - goto cleanup; - } + virAsprintf(&inxml, "%s/nwfilterxml2xmlin/%s.xml", abs_srcdir, tp->nam= e); + virAsprintf(&outxml, "%s/nwfilterxml2xmlout/%s.xml", abs_srcdir, tp->n= ame); =20 result =3D testCompareXMLToXMLFiles(inxml, outxml, tp->expect_warning); =20 - cleanup: VIR_FREE(inxml); VIR_FREE(outxml); =20 diff --git a/tests/openvzutilstest.c b/tests/openvzutilstest.c index c15ce9a47b..9287dc3c79 100644 --- a/tests/openvzutilstest.c +++ b/tests/openvzutilstest.c @@ -17,7 +17,8 @@ static int testLocateConfFile(int vpsid G_GNUC_UNUSED, char **conffile, const char *ext G_GNUC_UNUSED) { - return virAsprintf(conffile, "%s/openvzutilstest.conf", abs_srcdir); + virAsprintf(conffile, "%s/openvzutilstest.conf", abs_srcdir); + return 0; } =20 struct testConfigParam { @@ -40,8 +41,7 @@ testReadConfigParam(const void *data G_GNUC_UNUSED) char *conf =3D NULL; char *value =3D NULL; =20 - if (virAsprintf(&conf, "%s/openvzutilstest.conf", abs_srcdir) < 0) - return -1; + virAsprintf(&conf, "%s/openvzutilstest.conf", abs_srcdir); =20 for (i =3D 0; i < G_N_ELEMENTS(configParams); ++i) { if (openvzReadConfigParam(conf, configParams[i].param, diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c index cef9ae5fee..65fb937901 100644 --- a/tests/qemuagenttest.c +++ b/tests/qemuagenttest.c @@ -183,9 +183,7 @@ testQemuAgentGetFSInfoCommon(virDomainXMLOptionPtr xmlo= pt, if (!(ret_test =3D qemuMonitorTestNewAgent(xmlopt))) return -1; =20 - if (virAsprintf(&domain_filename, "%s/qemuagentdata/fsinfo.xml", - abs_srcdir) < 0) - goto cleanup; + virAsprintf(&domain_filename, "%s/qemuagentdata/fsinfo.xml", abs_srcdi= r); =20 if (!(ret_def =3D virDomainDefParseFile(domain_filename, driver.caps, = xmlopt, NULL, VIR_DOMAIN_DEF_PARSE_INACT= IVE))) diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c index 5f89d73c72..0c7c6ed4fa 100644 --- a/tests/qemublocktest.c +++ b/tests/qemublocktest.c @@ -82,8 +82,7 @@ testBackingXMLjsonXML(const void *args) if (!(propsstr =3D virJSONValueToString(wrapper, false))) return -1; =20 - if (virAsprintf(&protocolwrapper, "json:%s", propsstr) < 0) - return -1; + virAsprintf(&protocolwrapper, "json:%s", propsstr); =20 if (virStorageSourceNewFromBackingAbsolute(protocolwrapper, &jsonsrc) < 0) { @@ -163,9 +162,8 @@ testQemuDiskXMLToJSONFakeSecrets(virStorageSourcePtr sr= c) srcpriv->secinfo->type =3D VIR_DOMAIN_SECRET_INFO_TYPE_AES; srcpriv->secinfo->s.aes.username =3D g_strdup(src->auth->username); =20 - if (virAsprintf(&srcpriv->secinfo->s.aes.alias, "%s-secalias", - NULLSTR(src->nodestorage)) < 0) - return -1; + virAsprintf(&srcpriv->secinfo->s.aes.alias, "%s-secalias", + NULLSTR(src->nodestorage)); } =20 if (src->encryption) { @@ -173,9 +171,8 @@ testQemuDiskXMLToJSONFakeSecrets(virStorageSourcePtr sr= c) return -1; =20 srcpriv->encinfo->type =3D VIR_DOMAIN_SECRET_INFO_TYPE_AES; - if (virAsprintf(&srcpriv->encinfo->s.aes.alias, "%s-encalias", - NULLSTR(src->nodeformat)) < 0) - return -1; + virAsprintf(&srcpriv->encinfo->s.aes.alias, "%s-encalias", + NULLSTR(src->nodeformat)); } =20 return 0; @@ -197,9 +194,7 @@ testQemuDiskXMLToProps(const void *opaque) char *xmlstr =3D NULL; int ret =3D -1; =20 - if (virAsprintf(&xmlpath, "%s%s.xml", - testQemuDiskXMLToJSONPath, data->name) < 0) - goto cleanup; + virAsprintf(&xmlpath, "%s%s.xml", testQemuDiskXMLToJSONPath, data->nam= e); =20 if (virTestLoadFile(xmlpath, &xmlstr) < 0) goto cleanup; @@ -316,9 +311,7 @@ testQemuDiskXMLToPropsValidateFile(const void *opaque) if (data->fail) return EXIT_AM_SKIP; =20 - if (virAsprintf(&jsonpath, "%s%s.json", - testQemuDiskXMLToJSONPath, data->name) < 0) - goto cleanup; + virAsprintf(&jsonpath, "%s%s.json", testQemuDiskXMLToJSONPath, data->n= ame); =20 for (i =3D 0; i < data->nprops; i++) { char *jsonstr; @@ -367,9 +360,7 @@ testQemuImageCreateLoadDiskXML(const char *name, g_autofree char *xmlpath =3D NULL; virStorageSourcePtr ret =3D NULL; =20 - if (virAsprintf(&xmlpath, "%s%s.xml", - testQemuImageCreatePath, name) < 0) - return NULL; + virAsprintf(&xmlpath, "%s%s.xml", testQemuImageCreatePath, name); =20 if (!(doc =3D virXMLParseFileCtxt(xmlpath, &ctxt))) return NULL; @@ -465,9 +456,7 @@ testQemuImageCreate(const void *opaque) virBufferTrim(&actualbuf, "\n", -1); virBufferAddLit(&actualbuf, "\n"); =20 - if (virAsprintf(&jsonpath, "%s%s.json", - testQemuImageCreatePath, data->name) < 0) - return -1; + virAsprintf(&jsonpath, "%s%s.json", testQemuImageCreatePath, data->nam= e); =20 if (!(actual =3D virBufferContentAndReset(&actualbuf))) return -1; @@ -488,9 +477,8 @@ testQemuDiskXMLToPropsValidateFileSrcOnly(const void *o= paque) if (data->fail) return EXIT_AM_SKIP; =20 - if (virAsprintf(&jsonpath, "%s%s-srconly.json", - testQemuDiskXMLToJSONPath, data->name) < 0) - return -1; + virAsprintf(&jsonpath, "%s%s-srconly.json", testQemuDiskXMLToJSONPath, + data->name); =20 for (i =3D 0; i < data->npropssrc; i++) { g_autofree char *jsonstr =3D NULL; diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index a9a1e75587..cf1e86c893 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -76,11 +76,10 @@ testQemuCaps(const void *opaque) unsigned int fakeMicrocodeVersion =3D 0; const char *p; =20 - if (virAsprintf(&repliesFile, "%s/%s.%s.replies", - data->dataDir, data->base, data->archName) < 0 || - virAsprintf(&capsFile, "%s/%s.%s.xml", - data->dataDir, data->base, data->archName) < 0) - goto cleanup; + virAsprintf(&repliesFile, "%s/%s.%s.replies", + data->dataDir, data->base, data->archName); + virAsprintf(&capsFile, "%s/%s.%s.xml", + data->dataDir, data->base, data->archName); =20 if (!(mon =3D qemuMonitorTestNewFromFileFull(repliesFile, &data->drive= r, NULL, NULL))) @@ -145,9 +144,8 @@ testQemuCapsCopy(const void *opaque) virQEMUCapsPtr copy =3D NULL; char *actual =3D NULL; =20 - if (virAsprintf(&capsFile, "%s/%s.%s.xml", - data->dataDir, data->base, data->archName) < 0) - goto cleanup; + virAsprintf(&capsFile, "%s/%s.%s.xml", data->dataDir, data->base, + data->archName); =20 if (!(caps =3D virCapabilitiesNew(virArchFromString(data->archName), false, false))) @@ -186,10 +184,8 @@ doCapsTest(const char *base, g_autofree char *title =3D NULL; g_autofree char *copyTitle =3D NULL; =20 - if (virAsprintf(&title, "%s (%s)", base, archName) < 0 || - virAsprintf(©Title, "copy %s (%s)", base, archName) < 0) { - return -1; - } + virAsprintf(&title, "%s (%s)", base, archName); + virAsprintf(©Title, "copy %s (%s)", base, archName); =20 data->base =3D base; data->archName =3D archName; diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c index f5aecaa391..f46b056c18 100644 --- a/tests/qemucaps2xmltest.c +++ b/tests/qemucaps2xmltest.c @@ -102,8 +102,7 @@ testGetCaps(char *capsData, const testQemuData *data) virArch arch =3D virArchFromString(data->archName); g_autofree char *binary =3D NULL; =20 - if (virAsprintf(&binary, "/usr/bin/qemu-system-%s", data->archName) < = 0) - goto error; + virAsprintf(&binary, "/usr/bin/qemu-system-%s", data->archName); =20 if ((qemuCaps =3D testQemuGetCaps(capsData)) =3D=3D NULL) { fprintf(stderr, "failed to parse qemu capabilities flags"); @@ -142,13 +141,10 @@ testQemuCapsXML(const void *opaque) char *capsXml =3D NULL; virCapsPtr capsProvided =3D NULL; =20 - if (virAsprintf(&xmlFile, "%s/caps.%s.xml", - data->outputDir, data->archName) < 0) - goto cleanup; + virAsprintf(&xmlFile, "%s/caps.%s.xml", data->outputDir, data->archNam= e); =20 - if (virAsprintf(&capsFile, "%s/%s.%s.xml", - data->inputDir, data->base, data->archName) < 0) - goto cleanup; + virAsprintf(&capsFile, "%s/%s.%s.xml", data->inputDir, data->base, + data->archName); =20 if (virTestLoadFile(capsFile, &capsData) < 0) goto cleanup; @@ -181,8 +177,7 @@ doCapsTest(const char *base, testQemuDataPtr data =3D (testQemuDataPtr) opaque; g_autofree char *title =3D NULL; =20 - if (virAsprintf(&title, "%s (%s)", base, archName) < 0) - return -1; + virAsprintf(&title, "%s (%s)", base, archName); =20 data->base =3D base; data->archName =3D archName; diff --git a/tests/qemudomaincheckpointxml2xmltest.c b/tests/qemudomainchec= kpointxml2xmltest.c index 4540f15ddd..7f393d68a8 100644 --- a/tests/qemudomaincheckpointxml2xmltest.c +++ b/tests/qemudomaincheckpointxml2xmltest.c @@ -120,9 +120,8 @@ testCheckpointPostParse(virDomainMomentDefPtr def) if (def->creationTime) return -1; def->creationTime =3D mocktime; - if (!def->name && - virAsprintf(&def->name, "%lld", def->creationTime) < 0) - return -1; + if (!def->name) + virAsprintf(&def->name, "%lld", def->creationTime); return 0; } =20 diff --git a/tests/qemudomainsnapshotxml2xmltest.c b/tests/qemudomainsnapsh= otxml2xmltest.c index 66cb124f09..0a3aaac6cf 100644 --- a/tests/qemudomainsnapshotxml2xmltest.c +++ b/tests/qemudomainsnapshotxml2xmltest.c @@ -105,9 +105,8 @@ testSnapshotPostParse(virDomainMomentDefPtr def) if (def->creationTime) return -1; def->creationTime =3D mocktime; - if (!def->name && - virAsprintf(&def->name, "%lld", def->creationTime) < 0) - return -1; + if (!def->name) + virAsprintf(&def->name, "%lld", def->creationTime); return 0; } =20 diff --git a/tests/qemufirmwaretest.c b/tests/qemufirmwaretest.c index ad7ed7a384..01d4ebc26f 100644 --- a/tests/qemufirmwaretest.c +++ b/tests/qemufirmwaretest.c @@ -24,9 +24,7 @@ testParseFormatFW(const void *opaque) g_autofree char *expected =3D NULL; g_autofree char *actual =3D NULL; =20 - if (virAsprintf(&path, "%s/qemufirmwaredata/%s", - abs_srcdir, filename) < 0) - return -1; + virAsprintf(&path, "%s/qemufirmwaredata/%s", abs_srcdir, filename); =20 if (!(fw =3D qemuFirmwareParse(path))) return -1; diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index 4ff2b38c83..04dc347fd8 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -245,15 +245,14 @@ testQemuHotplug(const void *data) qemuMonitorTestPtr test_mon =3D NULL; qemuDomainObjPrivatePtr priv =3D NULL; =20 - if (virAsprintf(&domain_filename, "%s/qemuhotplugtestdomains/qemuhotpl= ug-%s.xml", - abs_srcdir, test->domain_filename) < 0 || - virAsprintf(&device_filename, "%s/qemuhotplugtestdevices/qemuhotpl= ug-%s.xml", - abs_srcdir, test->device_filename) < 0 || - virAsprintf(&result_filename, - "%s/qemuhotplugtestdomains/qemuhotplug-%s+%s.xml", - abs_srcdir, test->domain_filename, - test->device_filename) < 0) - goto cleanup; + virAsprintf(&domain_filename, "%s/qemuhotplugtestdomains/qemuhotplug-%= s.xml", + abs_srcdir, test->domain_filename); + virAsprintf(&device_filename, "%s/qemuhotplugtestdevices/qemuhotplug-%= s.xml", + abs_srcdir, test->device_filename); + virAsprintf(&result_filename, + "%s/qemuhotplugtestdomains/qemuhotplug-%s+%s.xml", + abs_srcdir, test->domain_filename, + test->device_filename); =20 if (virTestLoadFile(domain_filename, &domain_xml) < 0 || virTestLoadFile(device_filename, &device_xml) < 0) @@ -409,19 +408,17 @@ testQemuHotplugCpuPrepare(const char *test, char *prefix =3D NULL; struct testQemuHotplugCpuData *data =3D NULL; =20 - if (virAsprintf(&prefix, "%s/qemuhotplugtestcpus/%s", abs_srcdir, test= ) < 0) - return NULL; + virAsprintf(&prefix, "%s/qemuhotplugtestcpus/%s", abs_srcdir, test); =20 if (VIR_ALLOC(data) < 0) goto error; =20 data->modern =3D modern; =20 - if (virAsprintf(&data->file_xml_dom, "%s-domain.xml", prefix) < 0 || - virAsprintf(&data->file_xml_res_live, "%s-result-live.xml", prefix= ) < 0 || - virAsprintf(&data->file_xml_res_conf, "%s-result-conf.xml", prefix= ) < 0 || - virAsprintf(&data->file_json_monitor, "%s-monitor.json", prefix) <= 0) - goto error; + virAsprintf(&data->file_xml_dom, "%s-domain.xml", prefix); + virAsprintf(&data->file_xml_res_live, "%s-result-live.xml", prefix); + virAsprintf(&data->file_xml_res_conf, "%s-result-conf.xml", prefix); + virAsprintf(&data->file_json_monitor, "%s-monitor.json", prefix); =20 if (virTestLoadFile(data->file_xml_dom, &data->xml_dom) < 0) goto error; diff --git a/tests/qemumemlocktest.c b/tests/qemumemlocktest.c index 490e2ef11f..8e395759e1 100644 --- a/tests/qemumemlocktest.c +++ b/tests/qemumemlocktest.c @@ -34,9 +34,8 @@ testCompareMemLock(const void *data) char *xml =3D NULL; int ret =3D -1; =20 - if (virAsprintf(&xml, "%s/qemumemlockdata/qemumemlock-%s.xml", - abs_srcdir, info->name) < 0) - goto cleanup; + virAsprintf(&xml, "%s/qemumemlockdata/qemumemlock-%s.xml", abs_srcdir, + info->name); =20 if (!(def =3D virDomainDefParseFile(xml, driver.caps, driver.xmlopt, N= ULL, VIR_DOMAIN_DEF_PARSE_INACTIVE))) { diff --git a/tests/qemumigparamstest.c b/tests/qemumigparamstest.c index aacb905639..ded3a8ef64 100644 --- a/tests/qemumigparamstest.c +++ b/tests/qemumigparamstest.c @@ -66,9 +66,8 @@ qemuMigParamsTestXML2XML(const void *opaque) char *actualXML =3D NULL; int ret =3D -1; =20 - if (virAsprintf(&xmlFile, "%s/qemumigparamsdata/%s.xml", - abs_srcdir, data->name) < 0) - goto cleanup; + virAsprintf(&xmlFile, "%s/qemumigparamsdata/%s.xml", abs_srcdir, + data->name); =20 if (!(doc =3D virXMLParseFileCtxt(xmlFile, &ctxt))) goto cleanup; @@ -110,11 +109,10 @@ qemuMigParamsTestXML(const void *opaque) char *actualXML =3D NULL; int ret =3D -1; =20 - if (virAsprintf(&replyFile, "%s/qemumigparamsdata/%s.reply", - abs_srcdir, data->name) < 0 || - virAsprintf(&xmlFile, "%s/qemumigparamsdata/%s.xml", - abs_srcdir, data->name) < 0) - goto cleanup; + virAsprintf(&replyFile, "%s/qemumigparamsdata/%s.reply", + abs_srcdir, data->name); + virAsprintf(&xmlFile, "%s/qemumigparamsdata/%s.xml", + abs_srcdir, data->name); =20 if (!(mon =3D qemuMonitorTestNewFromFile(replyFile, data->xmlopt, true= ))) goto cleanup; @@ -161,11 +159,10 @@ qemuMigParamsTestJSON(const void *opaque) char *actualJSON =3D NULL; int ret =3D -1; =20 - if (virAsprintf(&replyFile, "%s/qemumigparamsdata/%s.reply", - abs_srcdir, data->name) < 0 || - virAsprintf(&jsonFile, "%s/qemumigparamsdata/%s.json", - abs_srcdir, data->name) < 0) - goto cleanup; + virAsprintf(&replyFile, "%s/qemumigparamsdata/%s.reply", + abs_srcdir, data->name); + virAsprintf(&jsonFile, "%s/qemumigparamsdata/%s.json", + abs_srcdir, data->name); =20 if (!(mon =3D qemuMonitorTestNewFromFile(replyFile, data->xmlopt, true= ))) goto cleanup; diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index c0eee921cf..c87f7db2e0 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -796,11 +796,9 @@ qemuMonitorJSONTestAttachOneChardev(virDomainXMLOption= Ptr xmlopt, if (!reply) reply =3D ""; =20 - if (virAsprintf(&jsonreply, "{\"return\": {%s}}", reply) < 0) - goto cleanup; + virAsprintf(&jsonreply, "{\"return\": {%s}}", reply); =20 - if (virAsprintf(&fulllabel, "qemuMonitorJSONTestAttachChardev(%s)", la= bel) < 0) - goto cleanup; + virAsprintf(&fulllabel, "qemuMonitorJSONTestAttachChardev(%s)", label); =20 data.chr =3D chr; data.fail =3D fail; @@ -2459,13 +2457,12 @@ testQemuMonitorJSONGetCPUData(const void *opaque) if (!(test =3D qemuMonitorTestNewSchema(data->xmlopt, data->schema))) return -1; =20 - if (virAsprintf(&jsonFile, - "%s/qemumonitorjsondata/qemumonitorjson-getcpu-%s.json= ", - abs_srcdir, data->name) < 0 || - virAsprintf(&dataFile, - "%s/qemumonitorjsondata/qemumonitorjson-getcpu-%s.data= ", - abs_srcdir, data->name) < 0) - goto cleanup; + virAsprintf(&jsonFile, + "%s/qemumonitorjsondata/qemumonitorjson-getcpu-%s.json", + abs_srcdir, data->name); + virAsprintf(&dataFile, + "%s/qemumonitorjsondata/qemumonitorjson-getcpu-%s.data", + abs_srcdir, data->name); =20 if (virTestLoadFile(jsonFile, &jsonStr) < 0) goto cleanup; @@ -2712,16 +2709,15 @@ testQemuMonitorCPUInfo(const void *opaque) if (!(test =3D qemuMonitorTestNewSchema(data->xmlopt, data->schema))) return -1; =20 - if (virAsprintf(&queryCpusFile, - "%s/qemumonitorjsondata/qemumonitorjson-cpuinfo-%s-cpu= s.json", - abs_srcdir, data->name) < 0 || - virAsprintf(&queryHotpluggableFile, - "%s/qemumonitorjsondata/qemumonitorjson-cpuinfo-%s-hot= plug.json", - abs_srcdir, data->name) < 0 || - virAsprintf(&dataFile, - "%s/qemumonitorjsondata/qemumonitorjson-cpuinfo-%s.dat= a", - abs_srcdir, data->name) < 0) - goto cleanup; + virAsprintf(&queryCpusFile, + "%s/qemumonitorjsondata/qemumonitorjson-cpuinfo-%s-cpus.js= on", + abs_srcdir, data->name); + virAsprintf(&queryHotpluggableFile, + "%s/qemumonitorjsondata/qemumonitorjson-cpuinfo-%s-hotplug= .json", + abs_srcdir, data->name); + virAsprintf(&dataFile, + "%s/qemumonitorjsondata/qemumonitorjson-cpuinfo-%s.data", + abs_srcdir, data->name); =20 if (virTestLoadFile(queryCpusFile, &queryCpusStr) < 0) goto cleanup; @@ -2816,9 +2812,8 @@ testBlockNodeNameDetect(const void *opaque) virBuffer buf =3D VIR_BUFFER_INITIALIZER; int ret =3D -1; =20 - if (virAsprintf(&resultFile, "%s/%s%s.result", - abs_srcdir, pathprefix, testname) < 0) - goto cleanup; + virAsprintf(&resultFile, "%s/%s%s.result", abs_srcdir, pathprefix, + testname); =20 if (!(namedNodesJson =3D virTestLoadFileJSON(pathprefix, testname, "-named-nodes.json", NULL))) @@ -2961,13 +2956,12 @@ testQueryJobs(const void *opaque) if (!test) return -1; =20 - if (virAsprintf(&filenameJSON, - abs_srcdir "/qemumonitorjsondata/query-jobs-%s.json", - data->name) < 0 || - virAsprintf(&filenameResult, - abs_srcdir "/qemumonitorjsondata/query-jobs-%s.result", - data->name) < 0) - goto cleanup; + virAsprintf(&filenameJSON, + abs_srcdir "/qemumonitorjsondata/query-jobs-%s.json", + data->name); + virAsprintf(&filenameResult, + abs_srcdir "/qemumonitorjsondata/query-jobs-%s.result", + data->name); =20 if (virTestLoadFile(filenameJSON, &fileJSON) < 0) goto cleanup; diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index fb76bf185d..b7625bb157 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -145,11 +145,8 @@ qemuMonitorTestAddErrorResponse(qemuMonitorTestPtr tes= t, } =20 /* format the JSON error message */ - if (virAsprintf(&jsonmsg, "{ \"error\": " - " { \"desc\": \"%s\", " - " \"class\": \"UnexpectedCommand\" } }", - escapemsg) < 0) - return -1; + virAsprintf(&jsonmsg, "{ \"error\": " " { \"desc\": \"%s\", " + " \"class\": \"UnexpectedCommand\" } }", escapemsg); =20 return qemuMonitorTestAddResponse(test, jsonmsg); } @@ -161,8 +158,7 @@ qemuMonitorTestAddUnexpectedErrorResponse(qemuMonitorTe= stPtr test, { g_autofree char *msg =3D NULL; =20 - if (virAsprintf(&msg, "unexpected command: '%s'", command) < 0) - return -1; + virAsprintf(&msg, "unexpected command: '%s'", command); =20 return qemuMonitorTestAddErrorResponse(test, msg); } @@ -175,9 +171,8 @@ qemuMonitorTestAddInvalidCommandResponse(qemuMonitorTes= tPtr test, { g_autofree char *msg =3D NULL; =20 - if (virAsprintf(&msg, "expected command '%s' got '%s'", - expectedcommand, actualcommand) < 0) - return -1; + virAsprintf(&msg, "expected command '%s' got '%s'", expectedcommand, + actualcommand); =20 return qemuMonitorTestAddErrorResponse(test, msg); } @@ -196,11 +191,8 @@ qemuMonitorReportError(qemuMonitorTestPtr test, const = char *errmsg, ...) if (virVasprintf(&msg, errmsg, msgargs) < 0) goto cleanup; =20 - if (virAsprintf(&jsonmsg, "{ \"error\": " - " { \"desc\": \"%s\", " - " \"class\": \"UnexpectedCommand\" } }", - msg) < 0) - goto cleanup; + virAsprintf(&jsonmsg, "{ \"error\": " " { \"desc\": \"%s\", " + " \"class\": \"UnexpectedCommand\" } }", msg); =20 ret =3D qemuMonitorTestAddResponse(test, jsonmsg); =20 @@ -530,8 +522,7 @@ qemuMonitorTestProcessCommandDefaultValidate(qemuMonito= rTestPtr test, if (STREQ(cmdname, "device_add")) return 0; =20 - if (virAsprintf(&schemapath, "%s/arg-type", cmdname) < 0) - return -1; + virAsprintf(&schemapath, "%s/arg-type", cmdname); =20 if (virQEMUQAPISchemaPathGet(schemapath, test->qapischema, &schemaroot= ) < 0 || !schemaroot) { @@ -649,8 +640,7 @@ qemuMonitorTestProcessCommandVerbatim(qemuMonitorTestPt= r test, ret =3D qemuMonitorTestAddResponse(test, data->response); } else { if (data->cmderr) { - if (virAsprintf(&errmsg, "%s: %s", data->cmderr, cmdstr) < 0) - return -1; + virAsprintf(&errmsg, "%s: %s", data->cmderr, cmdstr); =20 ret =3D qemuMonitorTestAddErrorResponse(test, errmsg); } else { @@ -741,8 +731,7 @@ qemuMonitorTestProcessGuestAgentSync(qemuMonitorTestPtr= test, goto cleanup; } =20 - if (virAsprintf(&retmsg, "{\"return\":%llu}", id) < 0) - goto cleanup; + virAsprintf(&retmsg, "{\"return\":%llu}", id); =20 =20 ret =3D qemuMonitorTestAddResponse(test, retmsg); @@ -1068,8 +1057,7 @@ qemuMonitorCommonTestNew(virDomainXMLOptionPtr xmlopt, =20 tmpdir_template =3D NULL; =20 - if (virAsprintf(&path, "%s/qemumonitorjsontest.sock", test->tmpdir) < = 0) - goto error; + virAsprintf(&path, "%s/qemumonitorjsontest.sock", test->tmpdir); =20 if (vm) { test->vm =3D virObjectRef(vm); @@ -1297,9 +1285,7 @@ qemuMonitorTestFullAddItem(qemuMonitorTestPtr test, char *cmderr; int ret; =20 - if (virAsprintf(&cmderr, "wrong expected command in %s:%zu: ", - filename, line) < 0) - return -1; + virAsprintf(&cmderr, "wrong expected command in %s:%zu: ", filename, l= ine); =20 ret =3D qemuMonitorTestAddItemVerbatim(test, command, cmderr, response= ); =20 diff --git a/tests/qemusecuritymock.c b/tests/qemusecuritymock.c index 50435bbd02..63bcae0f27 100644 --- a/tests/qemusecuritymock.c +++ b/tests/qemusecuritymock.c @@ -117,10 +117,7 @@ get_key(const char *path, { char *ret; =20 - if (virAsprintf(&ret, "%s:%s", path, name) < 0) { - fprintf(stderr, "Unable to create hash table key\n"); - abort(); - } + virAsprintf(&ret, "%s:%s", path, name); =20 return ret; } diff --git a/tests/qemusecuritytest.c b/tests/qemusecuritytest.c index 1c6cefd705..e8ebbf36d8 100644 --- a/tests/qemusecuritytest.c +++ b/tests/qemusecuritytest.c @@ -45,8 +45,7 @@ prepareObjects(virQEMUDriverPtr driver, g_autofree char *domxml =3D NULL; g_autofree char *latestCapsFile =3D NULL; =20 - if (virAsprintf(&filename, "%s/qemuxml2argvdata/%s.xml", abs_srcdir, x= mlname) < 0) - return -1; + virAsprintf(&filename, "%s/qemuxml2argvdata/%s.xml", abs_srcdir, xmlna= me); =20 if (virTestLoadFile(filename, &domxml) < 0) return -1; diff --git a/tests/qemuvhostusertest.c b/tests/qemuvhostusertest.c index 3e1890a88f..903e6631dc 100644 --- a/tests/qemuvhostusertest.c +++ b/tests/qemuvhostusertest.c @@ -24,9 +24,7 @@ testParseFormatVU(const void *opaque) g_autofree char *expected =3D NULL; g_autofree char *actual =3D NULL; =20 - if (virAsprintf(&path, "%s/qemuvhostuserdata/%s", - abs_srcdir, filename) < 0) - return -1; + virAsprintf(&path, "%s/qemuvhostuserdata/%s", abs_srcdir, filename); =20 if (!(vu =3D qemuVhostUserParse(path))) return -1; diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index fd330df3e0..39bc3b0aef 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -106,11 +106,8 @@ fakeStoragePoolLookupByName(virConnectPtr conn, virStoragePoolPtr ret =3D NULL; =20 if (STRNEQ(name, "inactive")) { - if (virAsprintf(&xmlpath, "%s/%s%s.xml", - abs_srcdir, - STORAGE_POOL_XML_PATH, - name) < 0) - return NULL; + virAsprintf(&xmlpath, "%s/%s%s.xml", abs_srcdir, + STORAGE_POOL_XML_PATH, name); =20 if (!virFileExists(xmlpath)) { virReportError(VIR_ERR_NO_STORAGE_POOL, @@ -190,7 +187,7 @@ fakeStorageVolGetPath(virStorageVolPtr vol) { char *ret =3D NULL; =20 - ignore_value(virAsprintf(&ret, "/some/%s/device/%s", vol->key, vol->na= me)); + virAsprintf(&ret, "/some/%s/device/%s", vol->key, vol->name); =20 return ret; } @@ -208,11 +205,8 @@ fakeStoragePoolGetXMLDesc(virStoragePoolPtr pool, return NULL; } =20 - if (virAsprintf(&xmlpath, "%s/%s%s.xml", - abs_srcdir, - STORAGE_POOL_XML_PATH, - pool->name) < 0) - return NULL; + virAsprintf(&xmlpath, "%s/%s%s.xml", abs_srcdir, STORAGE_POOL_XML_PATH, + pool->name); =20 if (virTestLoadFile(xmlpath, &xmlbuf) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -594,18 +588,14 @@ testCompareXMLToArgv(const void *data) return ret; } =20 -static int +static void testInfoSetPaths(struct testQemuInfo *info, const char *suffix) { - if (virAsprintf(&info->infile, "%s/qemuxml2argvdata/%s.xml", - abs_srcdir, info->name) < 0 || - virAsprintf(&info->outfile, "%s/qemuxml2argvdata/%s%s.args", - abs_srcdir, info->name, suffix ? suffix : "") < 0) { - return -1; - } - - return 0; + virAsprintf(&info->infile, "%s/qemuxml2argvdata/%s.xml", + abs_srcdir, info->name); + virAsprintf(&info->outfile, "%s/qemuxml2argvdata/%s%s.args", + abs_srcdir, info->name, suffix ? suffix : ""); } =20 # define FAKEROOTDIRTEMPLATE abs_builddir "/fakerootdir-XXXXXX" @@ -713,10 +703,7 @@ mymain(void) if (testQemuInfoSetArgs(&info, capslatest, \ __VA_ARGS__, ARG_END) < 0) \ return EXIT_FAILURE; \ - if (testInfoSetPaths(&info, _suffix) < 0) { \ - VIR_TEST_DEBUG("Failed to generate paths for '%s'", _name); \ - return EXIT_FAILURE; \ - } \ + testInfoSetPaths(&info, _suffix); \ if (virTestRun("QEMU XML-2-ARGV " _name _suffix, \ testCompareXMLToArgv, &info) < 0) \ ret =3D -1; \ diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 89c9494e6c..679b882704 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -98,48 +98,31 @@ testInfoSetPaths(struct testQemuInfo *info, VIR_FREE(info->infile); VIR_FREE(info->outfile); =20 - if (virAsprintf(&info->infile, "%s/qemuxml2argvdata/%s.xml", - abs_srcdir, info->name) < 0) - goto error; + virAsprintf(&info->infile, "%s/qemuxml2argvdata/%s.xml", abs_srcdir, + info->name); =20 - if (virAsprintf(&info->outfile, - "%s/qemuxml2xmloutdata/%s-%s%s.xml", - abs_srcdir, info->name, - when =3D=3D WHEN_ACTIVE ? "active" : "inactive", - suffix) < 0) - goto error; + virAsprintf(&info->outfile, "%s/qemuxml2xmloutdata/%s-%s%s.xml", + abs_srcdir, info->name, + when =3D=3D WHEN_ACTIVE ? "active" : "inactive", suffix); =20 if (!virFileExists(info->outfile)) { VIR_FREE(info->outfile); =20 - if (virAsprintf(&info->outfile, - "%s/qemuxml2xmloutdata/%s%s.xml", - abs_srcdir, info->name, suffix) < 0) - goto error; + virAsprintf(&info->outfile, "%s/qemuxml2xmloutdata/%s%s.xml", + abs_srcdir, info->name, suffix); } =20 return 0; - - error: - testQemuInfoClear(info); - return -1; } =20 =20 static const char *statusPath =3D abs_srcdir "/qemustatusxml2xmldata/"; =20 -static int +static void testInfoSetStatusPaths(struct testQemuInfo *info) { - if (virAsprintf(&info->infile, "%s%s-in.xml", statusPath, info->name) = < 0 || - virAsprintf(&info->outfile, "%s%s-out.xml", statusPath, info->name= ) < 0) - goto error; - - return 0; - - error: - testQemuInfoClear(info); - return -1; + virAsprintf(&info->infile, "%s%s-in.xml", statusPath, info->name); + virAsprintf(&info->outfile, "%s%s-out.xml", statusPath, info->name); } =20 =20 @@ -1283,11 +1266,11 @@ mymain(void) if (testQemuInfoSetArgs(&info, capslatest, \ ARG_QEMU_CAPS, QEMU_CAPS_LAST, \ ARG_END) < 0 || \ - qemuTestCapsCacheInsert(driver.qemuCapsCache, info.qemuCaps) <= 0 || \ - testInfoSetStatusPaths(&info) < 0) { \ + qemuTestCapsCacheInsert(driver.qemuCapsCache, info.qemuCaps) <= 0) { \ VIR_TEST_DEBUG("Failed to generate status test data for '%s'",= _name); \ return -1; \ } \ + testInfoSetStatusPaths(&info); \ \ if (virTestRun("QEMU status XML-2-XML " _name, \ testCompareStatusXMLToXMLFiles, &info) < 0) \ diff --git a/tests/scsihosttest.c b/tests/scsihosttest.c index 35c7d93376..f86c99df86 100644 --- a/tests/scsihosttest.c +++ b/tests/scsihosttest.c @@ -72,13 +72,10 @@ create_scsihost(const char *fakesysfsdir, const char *d= evicepath, int ret =3D -1; int fd =3D -1; =20 - if (virAsprintfQuiet(&unique_id_path, "%s/devices/pci0000:00/%s/unique= _id", - fakesysfsdir, devicepath) < 0 || - virAsprintfQuiet(&link_path, "%s/class/scsi_host/%s", - fakesysfsdir, hostname) < 0) { - fprintf(stderr, "Out of memory\n"); - goto cleanup; - } + virAsprintfQuiet(&unique_id_path, "%s/devices/pci0000:00/%s/unique_id", + fakesysfsdir, devicepath); + virAsprintfQuiet(&link_path, "%s/class/scsi_host/%s", + fakesysfsdir, hostname); =20 /* Rather than create path & file, temporarily snip off the file to * create the path @@ -208,9 +205,7 @@ testVirFindSCSIHostByPCI(const void *data G_GNUC_UNUSED) char *ret_host =3D NULL; int ret =3D -1; =20 - if (virAsprintf(&path_addr, "%s/%s", abs_srcdir, - "sysfs/class/scsi_host") < 0) - goto cleanup; + virAsprintf(&path_addr, "%s/%s", abs_srcdir, "sysfs/class/scsi_host"); =20 if (!(ret_host =3D virSCSIHostFindByPCI(TEST_SCSIHOST_CLASS_PATH, pci_addr1, unique_id1)) || @@ -260,21 +255,14 @@ mymain(void) goto cleanup; } =20 - if (virAsprintfQuiet(&fakesysfsdir, "%s/sys", fakerootdir) < 0) { - fprintf(stderr, "Out of memory\n"); - goto cleanup; - } + virAsprintfQuiet(&fakesysfsdir, "%s/sys", fakerootdir); =20 if (init_scsihost_sysfs(fakesysfsdir) < 0) { fprintf(stderr, "Failed to create fakesysfs=3D'%s'\n", fakesysfsdi= r); goto cleanup; } =20 - if (virAsprintfQuiet(&scsihost_class_path, "%s/class/scsi_host", - fakesysfsdir) < 0) { - fprintf(stderr, "Out of memory\n"); - goto cleanup; - } + virAsprintfQuiet(&scsihost_class_path, "%s/class/scsi_host", fakesysfs= dir); VIR_DEBUG("Reading from '%s'", scsihost_class_path); =20 if (virTestRun("testVirReadSCSIUniqueId", diff --git a/tests/secretxml2xmltest.c b/tests/secretxml2xmltest.c index 595583346a..44f4615be8 100644 --- a/tests/secretxml2xmltest.c +++ b/tests/secretxml2xmltest.c @@ -44,18 +44,14 @@ testCompareXMLToXMLHelper(const void *data) char *outxml =3D NULL; const struct testInfo *info =3D data; =20 - if (virAsprintf(&inxml, "%s/secretxml2xmlin/%s.xml", - abs_srcdir, info->name) < 0 || - virAsprintf(&outxml, "%s/secretxml2xml%s/%s.xml", - abs_srcdir, - info->different ? "out" : "in", - info->name) < 0) { - goto cleanup; - } + virAsprintf(&inxml, "%s/secretxml2xmlin/%s.xml", abs_srcdir, info->nam= e); + virAsprintf(&outxml, "%s/secretxml2xml%s/%s.xml", + abs_srcdir, + info->different ? "out" : "in", + info->name); =20 result =3D testCompareXMLToXMLFiles(inxml, outxml); =20 - cleanup: VIR_FREE(inxml); VIR_FREE(outxml); =20 diff --git a/tests/securityselinuxlabeltest.c b/tests/securityselinuxlabelt= est.c index 9156403c51..cc0de456cd 100644 --- a/tests/securityselinuxlabeltest.c +++ b/tests/securityselinuxlabeltest.c @@ -60,9 +60,7 @@ testUserXattrEnabled(void) ssize_t len; const char *con_value =3D "system_u:object_r:svirt_image_t:s0:c41,c264= "; char *path =3D NULL; - if (virAsprintf(&path, "%s/securityselinuxlabeldata/testxattr", - abs_builddir) < 0) - goto cleanup; + virAsprintf(&path, "%s/securityselinuxlabeldata/testxattr", abs_buildd= ir); =20 if (virFileMakePath(abs_builddir "/securityselinuxlabeldata") < 0 || virFileTouch(path, 0600) < 0) @@ -90,9 +88,7 @@ testSELinuxMungePath(char **path) { char *tmp; =20 - if (virAsprintf(&tmp, "%s/securityselinuxlabeldata%s", - abs_builddir, *path) < 0) - return -1; + virAsprintf(&tmp, "%s/securityselinuxlabeldata%s", abs_builddir, *path= ); =20 VIR_FREE(*path); *path =3D tmp; @@ -112,9 +108,8 @@ testSELinuxLoadFileList(const char *testname, *files =3D NULL; *nfiles =3D 0; =20 - if (virAsprintf(&path, "%s/securityselinuxlabeldata/%s.txt", - abs_srcdir, testname) < 0) - goto cleanup; + virAsprintf(&path, "%s/securityselinuxlabeldata/%s.txt", abs_srcdir, + testname); =20 if (!(fp =3D fopen(path, "r"))) goto cleanup; @@ -140,9 +135,8 @@ testSELinuxLoadFileList(const char *testname, *tmp =3D '\0'; tmp++; =20 - if (virAsprintf(&file, "%s/securityselinuxlabeldata%s", - abs_builddir, line) < 0) - goto cleanup; + virAsprintf(&file, "%s/securityselinuxlabeldata%s", abs_builddir, + line); if (*tmp !=3D '\0' && *tmp !=3D '\n') { context =3D g_strdup(tmp); =20 @@ -178,9 +172,8 @@ testSELinuxLoadDef(const char *testname) virDomainDefPtr def =3D NULL; size_t i; =20 - if (virAsprintf(&xmlfile, "%s/securityselinuxlabeldata/%s.xml", - abs_srcdir, testname) < 0) - goto cleanup; + virAsprintf(&xmlfile, "%s/securityselinuxlabeldata/%s.xml", abs_srcdir, + testname); =20 if (!(def =3D virDomainDefParseFile(xmlfile, driver.caps, driver.xmlop= t, NULL, 0))) diff --git a/tests/storagebackendsheepdogtest.c b/tests/storagebackendsheep= dogtest.c index a5403e7136..7d50b1a303 100644 --- a/tests/storagebackendsheepdogtest.c +++ b/tests/storagebackendsheepdogtest.c @@ -158,13 +158,11 @@ mymain(void) =20 collie_test *test =3D node_info_tests; =20 - if (virAsprintf(&poolxml, "%s/storagepoolxml2xmlin/pool-sheepdog.xml", - abs_srcdir) < 0) - goto cleanup; + virAsprintf(&poolxml, "%s/storagepoolxml2xmlin/pool-sheepdog.xml", + abs_srcdir); =20 - if (virAsprintf(&volxml, "%s/storagevolxml2xmlin/vol-sheepdog.xml", - abs_srcdir) < 0) - goto cleanup; + virAsprintf(&volxml, "%s/storagevolxml2xmlin/vol-sheepdog.xml", + abs_srcdir); =20 #define DO_TEST_NODE(collie) \ do { \ @@ -202,7 +200,6 @@ mymain(void) ++test; } =20 - cleanup: return ret =3D=3D 0 ? EXIT_SUCCESS : EXIT_FAILURE; } =20 diff --git a/tests/storagepoolcapstest.c b/tests/storagepoolcapstest.c index 6b0680291e..5f66a67da6 100644 --- a/tests/storagepoolcapstest.c +++ b/tests/storagepoolcapstest.c @@ -62,10 +62,8 @@ test_virStoragePoolCapsFormat(const void *opaque) if (!(poolCaps =3D virStoragePoolCapsNew(driverCaps))) return -1; =20 - if (virAsprintf(&path, "%s/storagepoolcapsschemadata/poolcaps-%s.xml", - abs_srcdir, data->filename) < 0) { - return -1; - } + virAsprintf(&path, "%s/storagepoolcapsschemadata/poolcaps-%s.xml", + abs_srcdir, data->filename); =20 if (!(poolCapsXML =3D virStoragePoolCapsFormat(poolCaps))) return -1; diff --git a/tests/storagepoolxml2argvtest.c b/tests/storagepoolxml2argvtes= t.c index 2ec7cbef66..50b79b4625 100644 --- a/tests/storagepoolxml2argvtest.c +++ b/tests/storagepoolxml2argvtest.c @@ -108,14 +108,11 @@ testCompareXMLToArgvHelper(const void *data) g_autofree char *poolxml =3D NULL; g_autofree char *cmdline =3D NULL; =20 - if (virAsprintf(&poolxml, "%s/storagepoolxml2xmlin/%s.xml", - abs_srcdir, info->pool) < 0) - return -1; + virAsprintf(&poolxml, "%s/storagepoolxml2xmlin/%s.xml", abs_srcdir, + info->pool); =20 - if (virAsprintf(&cmdline, "%s/storagepoolxml2argvdata/%s%s.argv", - abs_srcdir, info->pool, info->platformSuffix) < 0 && - !info->shouldFail) - return -1; + virAsprintf(&cmdline, "%s/storagepoolxml2argvdata/%s%s.argv", + abs_srcdir, info->pool, info->platformSuffix); =20 return testCompareXMLToArgvFiles(info->shouldFail, poolxml, cmdline); } diff --git a/tests/storagepoolxml2xmltest.c b/tests/storagepoolxml2xmltest.c index 0f7bc27293..e4c78d3fd5 100644 --- a/tests/storagepoolxml2xmltest.c +++ b/tests/storagepoolxml2xmltest.c @@ -39,11 +39,10 @@ testCompareXMLToXMLHelper(const void *data) g_autofree char *inxml =3D NULL; g_autofree char *outxml =3D NULL; =20 - if (virAsprintf(&inxml, "%s/storagepoolxml2xmlin/%s.xml", - abs_srcdir, (const char*)data) < 0 || - virAsprintf(&outxml, "%s/storagepoolxml2xmlout/%s.xml", - abs_srcdir, (const char*)data) < 0) - return -1; + virAsprintf(&inxml, "%s/storagepoolxml2xmlin/%s.xml", + abs_srcdir, (const char*)data); + virAsprintf(&outxml, "%s/storagepoolxml2xmlout/%s.xml", + abs_srcdir, (const char*)data); =20 return testCompareXMLToXMLFiles(inxml, outxml); } diff --git a/tests/storagevolxml2argvtest.c b/tests/storagevolxml2argvtest.c index af90aa6953..833000a636 100644 --- a/tests/storagevolxml2argvtest.c +++ b/tests/storagevolxml2argvtest.c @@ -109,17 +109,13 @@ testCompareXMLToArgvFiles(bool shouldFail, } else { char *createCmdline =3D actualCmdline; g_autofree char *cvtCmdline =3D NULL; - int rc; =20 if (!(cvtCmdline =3D virCommandToString(cmd, false))) goto cleanup; =20 - rc =3D virAsprintf(&actualCmdline, "%s\n%s", - createCmdline, cvtCmdline); + virAsprintf(&actualCmdline, "%s\n%s", createCmdline, cvtCmdlin= e); =20 VIR_FREE(createCmdline); - if (rc < 0) - goto cleanup; } =20 if (convertStep =3D=3D VIR_STORAGE_VOL_ENCRYPT_NONE) @@ -162,23 +158,18 @@ testCompareXMLToArgvHelper(const void *data) g_autofree char *inputvolxml =3D NULL; g_autofree char *cmdline =3D NULL; =20 - if (info->inputvol && + if (info->inputvol) virAsprintf(&inputvolxml, "%s/storagevolxml2xmlin/%s.xml", - abs_srcdir, info->inputvol) < 0) - return -1; - if (info->inputpool && + abs_srcdir, info->inputvol); + if (info->inputpool) virAsprintf(&inputpoolxml, "%s/storagepoolxml2xmlin/%s.xml", - abs_srcdir, info->inputpool) < 0) - return -1; - if (virAsprintf(&poolxml, "%s/storagepoolxml2xmlin/%s.xml", - abs_srcdir, info->pool) < 0 || - virAsprintf(&volxml, "%s/storagevolxml2xmlin/%s.xml", - abs_srcdir, info->vol) < 0) { - return -1; - } - if (virAsprintf(&cmdline, "%s/storagevolxml2argvdata/%s.argv", - abs_srcdir, info->cmdline) < 0 && !info->shouldFail) - return -1; + abs_srcdir, info->inputpool); + virAsprintf(&poolxml, "%s/storagepoolxml2xmlin/%s.xml", + abs_srcdir, info->pool); + virAsprintf(&volxml, "%s/storagevolxml2xmlin/%s.xml", + abs_srcdir, info->vol); + virAsprintf(&cmdline, "%s/storagevolxml2argvdata/%s.argv", + abs_srcdir, info->cmdline); =20 return testCompareXMLToArgvFiles(info->shouldFail, poolxml, volxml, inputpoolxml, inputvolxml, diff --git a/tests/storagevolxml2xmltest.c b/tests/storagevolxml2xmltest.c index 0c8cecc10d..4e92d2818c 100644 --- a/tests/storagevolxml2xmltest.c +++ b/tests/storagevolxml2xmltest.c @@ -50,13 +50,12 @@ testCompareXMLToXMLHelper(const void *data) g_autofree char *inxml =3D NULL; g_autofree char *outxml =3D NULL; =20 - if (virAsprintf(&poolxml, "%s/storagepoolxml2xmlin/%s.xml", - abs_srcdir, info->pool) < 0 || - virAsprintf(&inxml, "%s/storagevolxml2xmlin/%s.xml", - abs_srcdir, info->name) < 0 || - virAsprintf(&outxml, "%s/storagevolxml2xmlout/%s.xml", - abs_srcdir, info->name) < 0) - return -1; + virAsprintf(&poolxml, "%s/storagepoolxml2xmlin/%s.xml", + abs_srcdir, info->pool); + virAsprintf(&inxml, "%s/storagevolxml2xmlin/%s.xml", + abs_srcdir, info->name); + virAsprintf(&outxml, "%s/storagevolxml2xmlout/%s.xml", + abs_srcdir, info->name); =20 return testCompareXMLToXMLFiles(poolxml, inxml, outxml, info->flags); } diff --git a/tests/sysinfotest.c b/tests/sysinfotest.c index 6c84582110..4167d4baee 100644 --- a/tests/sysinfotest.c +++ b/tests/sysinfotest.c @@ -90,16 +90,14 @@ sysinfotest_run(const char *test, =20 testdata.func =3D func; =20 - if ((decoder && - virAsprintf(&testdata.decoder, "%s/%s", abs_srcdir, decoder) < 0)= || - (sysinfo && - virAsprintf(&testdata.sysinfo, "%s/%s", abs_srcdir, sysinfo) < 0)= || - (cpuinfo && - virAsprintf(&testdata.cpuinfo, "%s/%s", abs_srcdir, cpuinfo) < 0)= || - (expected && - virAsprintf(&testdata.expected, "%s/%s", abs_srcdir, expected) < = 0)) { - goto error; - } + if (decoder) + virAsprintf(&testdata.decoder, "%s/%s", abs_srcdir, decoder); + if (sysinfo) + virAsprintf(&testdata.sysinfo, "%s/%s", abs_srcdir, sysinfo); + if (cpuinfo) + virAsprintf(&testdata.cpuinfo, "%s/%s", abs_srcdir, cpuinfo); + if (expected) + virAsprintf(&testdata.expected, "%s/%s", abs_srcdir, expected); =20 if (virTestRun(test, testSysinfo, &testdata) < 0) goto error; diff --git a/tests/testutils.c b/tests/testutils.c index a141abc91b..3ae66d3007 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -404,8 +404,7 @@ virTestRewrapFile(const char *filename) return -1; } =20 - if (virAsprintf(&script, "%s/test-wrap-argv.pl", abs_srcdir) < 0) - goto cleanup; + virAsprintf(&script, "%s/test-wrap-argv.pl", abs_srcdir); =20 cmd =3D virCommandNewArgList(perl, script, "--in-place", filename, NUL= L); if (virCommandRun(cmd, NULL) < 0) @@ -664,8 +663,7 @@ virTestCompareToFile(const char *actual, if (filecontentLen > 0 && filecontent[filecontentLen - 1] =3D=3D '\n' && (cmpcontentLen =3D=3D 0 || cmpcontent[cmpcontentLen - 1] !=3D = '\n')) { - if (virAsprintf(&fixedcontent, "%s\n", cmpcontent) < 0) - goto failure; + virAsprintf(&fixedcontent, "%s\n", cmpcontent); cmpcontent =3D fixedcontent; } } @@ -691,11 +689,9 @@ virTestCompareToULL(unsigned long long expect, g_autofree char *expectStr =3D NULL; g_autofree char *actualStr =3D NULL; =20 - if (virAsprintf(&expectStr, "%llu", expect) < 0) - return -1; + virAsprintf(&expectStr, "%llu", expect); =20 - if (virAsprintf(&actualStr, "%llu", actual) < 0) - return -1; + virAsprintf(&actualStr, "%llu", actual); =20 return virTestCompareToString(expectStr, actualStr); } @@ -812,9 +808,8 @@ virTestSetEnvPath(void) char *new_path =3D NULL; =20 if (path) { - if (strstr(path, abs_builddir) !=3D path && - virAsprintf(&new_path, "%s:%s", abs_builddir, path) < 0) - goto cleanup; + if (strstr(path, abs_builddir) !=3D path) + virAsprintf(&new_path, "%s:%s", abs_builddir, path); } else { new_path =3D g_strdup(abs_builddir); } diff --git a/tests/testutils.h b/tests/testutils.h index 9099a77664..36d2d5ba04 100644 --- a/tests/testutils.h +++ b/tests/testutils.h @@ -137,9 +137,8 @@ int virTestMain(int argc, } \ if (!preload) { \ newenv =3D (char *) lib; \ - } else if (virAsprintf(&newenv, "%s:%s", lib, preload) < 0) { \ - perror("virAsprintf"); \ - return EXIT_FAILURE; \ + } else { \ + virAsprintf(&newenv, "%s:%s", lib, preload); \ } \ setenv(PRELOAD_VAR, newenv, 1); \ FORCE_FLAT_NAMESPACE \ diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 0faa9cb84a..3b656cdd1e 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -809,8 +809,7 @@ testQemuGetLatestCapsForArch(const char *arch, const char *maxname =3D NULL; char *ret =3D NULL; =20 - if (virAsprintf(&fullsuffix, "%s.%s", arch, suffix) < 0) - goto cleanup; + virAsprintf(&fullsuffix, "%s.%s", arch, suffix); =20 if (virDirOpen(&dir, TEST_QEMU_CAPS_PATH) < 0) goto cleanup; @@ -846,7 +845,7 @@ testQemuGetLatestCapsForArch(const char *arch, goto cleanup; } =20 - ignore_value(virAsprintf(&ret, "%s/%s", TEST_QEMU_CAPS_PATH, maxname)); + virAsprintf(&ret, "%s/%s", TEST_QEMU_CAPS_PATH, maxname); =20 cleanup: VIR_FREE(tmp); @@ -1043,10 +1042,8 @@ testQemuInfoSetArgs(struct testQemuInfo *info, if (STREQ(capsver, "latest")) { capsfile =3D g_strdup(virHashLookup(capslatest, capsarch)); stripmachinealiases =3D true; - } else if (virAsprintf(&capsfile, "%s/caps_%s.%s.xml", - TEST_QEMU_CAPS_PATH, capsver, capsarch) < 0= ) { - goto cleanup; - } + } else virAsprintf(&capsfile, "%s/caps_%s.%s.xml", + TEST_QEMU_CAPS_PATH, capsver, capsarch); =20 if (!(qemuCaps =3D qemuTestParseCapabilitiesArch(virArchFromString= (capsarch), capsfile))) { diff --git a/tests/vboxsnapshotxmltest.c b/tests/vboxsnapshotxmltest.c index 3d6171e266..fdc2c92719 100644 --- a/tests/vboxsnapshotxmltest.c +++ b/tests/vboxsnapshotxmltest.c @@ -104,9 +104,8 @@ testCompareXMLToXMLHelper(const void *data) int result =3D -1; char *xml =3D NULL; =20 - if (virAsprintf(&xml, "%s/vboxsnapshotxmldata/%s.vbox", - abs_srcdir, (const char*)data) < 0) - return -1; + virAsprintf(&xml, "%s/vboxsnapshotxmldata/%s.vbox", abs_srcdir, + (const char *)data); =20 result =3D testCompareXMLtoXMLFiles(xml); =20 diff --git a/tests/virbuftest.c b/tests/virbuftest.c index 385f016174..6bbd6545ac 100644 --- a/tests/virbuftest.c +++ b/tests/virbuftest.c @@ -31,20 +31,19 @@ static int testBufInfiniteLoop(const void *data) * This test is a bit fragile, since it relies on virBuffer internals. */ len =3D buf->size - buf->use - 1; - if (virAsprintf(&addstr, "%*s", len, "a") < 0) - goto out; + virAsprintf(&addstr, "%*s", len, "a"); =20 if (info->doEscape) virBufferEscapeString(buf, "%s", addstr); else virBufferAsprintf(buf, "%s", addstr); =20 - ret =3D 0; - out: bufret =3D virBufferContentAndReset(buf); if (!bufret) { VIR_TEST_DEBUG("Buffer had error set"); ret =3D -1; + } else { + ret =3D 0; } =20 VIR_FREE(addstr); diff --git a/tests/vircaps2xmltest.c b/tests/vircaps2xmltest.c index 41e84a3b25..c0a1ef2e2b 100644 --- a/tests/vircaps2xmltest.c +++ b/tests/vircaps2xmltest.c @@ -45,13 +45,11 @@ test_virCapabilities(const void *opaque) char *resctrl =3D NULL; int ret =3D -1; =20 - if (virAsprintf(&system, "%s/vircaps2xmldata/linux-%s/system", - abs_srcdir, data->filename) < 0) - goto cleanup; + virAsprintf(&system, "%s/vircaps2xmldata/linux-%s/system", abs_srcdir, + data->filename); =20 - if (virAsprintf(&resctrl, "%s/vircaps2xmldata/linux-%s/resctrl", - abs_srcdir, data->filename) < 0) - goto cleanup; + virAsprintf(&resctrl, "%s/vircaps2xmldata/linux-%s/resctrl", abs_srcdi= r, + data->filename); =20 virFileWrapperAddPrefix("/sys/devices/system", system); virFileWrapperAddPrefix("/sys/fs/resctrl", resctrl); @@ -69,9 +67,8 @@ test_virCapabilities(const void *opaque) if (!(capsXML =3D virCapabilitiesFormatXML(caps))) goto cleanup; =20 - if (virAsprintf(&path, "%s/vircaps2xmldata/vircaps-%s-%s.xml", - abs_srcdir, archStr, data->filename) < 0) - goto cleanup; + virAsprintf(&path, "%s/vircaps2xmldata/vircaps-%s-%s.xml", abs_srcdir, + archStr, data->filename); =20 if (virTestCompareToFile(capsXML, path) < 0) goto cleanup; diff --git a/tests/vircgroupmock.c b/tests/vircgroupmock.c index 7bbaa6dd0f..4c67b9ad4e 100644 --- a/tests/vircgroupmock.c +++ b/tests/vircgroupmock.c @@ -376,9 +376,8 @@ static void init_sysfs(void) =20 VIR_FREE(fakesysfscgroupdir); =20 - if (virAsprintfQuiet(&fakesysfscgroupdir, "%s%s", - fakerootdir, SYSFS_CGROUP_PREFIX) < 0) - abort(); + virAsprintfQuiet(&fakesysfscgroupdir, "%s%s", + fakerootdir, SYSFS_CGROUP_PREFIX); =20 if (virFileMakePath(fakesysfscgroupdir) < 0) { fprintf(stderr, "Cannot create %s\n", fakesysfscgroupdir); @@ -459,10 +458,8 @@ FILE *fopen(const char *path, const char *mode) errno =3D EACCES; return NULL; } - if (virAsprintfQuiet(&filepath, "%s/vircgroupdata/%s.%s", - abs_srcdir, filename, type) < 0) { - abort(); - } + virAsprintfQuiet(&filepath, "%s/vircgroupdata/%s.%s", + abs_srcdir, filename, type); rc =3D real_fopen(filepath, mode); free(filepath); return rc; diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c index cec07580ac..224e8116dd 100644 --- a/tests/vircgrouptest.c +++ b/tests/vircgrouptest.c @@ -189,10 +189,7 @@ testCgroupDetectMounts(const void *args) =20 setenv("VIR_CGROUP_MOCK_FILENAME", data->file, 1); =20 - if (virAsprintf(&parsed, "%s/vircgroupdata/%s.parsed", - abs_srcdir, data->file) < 0) { - goto cleanup; - } + virAsprintf(&parsed, "%s/vircgroupdata/%s.parsed", abs_srcdir, data->f= ile); =20 if (virCgroupNewSelf(&group) < 0) { if (data->fail) diff --git a/tests/virconftest.c b/tests/virconftest.c index 1ad34caec6..c6d8ff2272 100644 --- a/tests/virconftest.c +++ b/tests/virconftest.c @@ -39,11 +39,8 @@ static int testConfRoundTrip(const void *opaque) char *srcfile =3D NULL; char *dstfile =3D NULL; =20 - if (virAsprintf(&srcfile, "%s/virconfdata/%s.conf", - abs_srcdir, name) < 0 || - virAsprintf(&dstfile, "%s/virconfdata/%s.out", - abs_srcdir, name) < 0) - goto cleanup; + virAsprintf(&srcfile, "%s/virconfdata/%s.conf", abs_srcdir, name); + virAsprintf(&dstfile, "%s/virconfdata/%s.out", abs_srcdir, name); =20 if (VIR_ALLOC_N_QUIET(buffer, len) < 0) { fprintf(stderr, "out of memory\n"); diff --git a/tests/virfilemock.c b/tests/virfilemock.c index 00efb820ad..e32d749d52 100644 --- a/tests/virfilemock.c +++ b/tests/virfilemock.c @@ -188,7 +188,7 @@ canonicalize_file_name(const char *path) char *ret; =20 if ((p =3D STRSKIP(path, "/some/symlink"))) - ignore_value(virAsprintfQuiet(&ret, "/gluster%s", p)); + virAsprintfQuiet(&ret, "/gluster%s", p); else ret =3D g_strdup(path); =20 diff --git a/tests/virfiletest.c b/tests/virfiletest.c index ed0daf8478..ba947129be 100644 --- a/tests/virfiletest.c +++ b/tests/virfiletest.c @@ -325,8 +325,7 @@ testFileIsSharedFSType(const void *opaque G_GNUC_UNUSED) bool actual; int ret =3D -1; =20 - if (virAsprintf(&mtabFile, abs_srcdir "/virfiledata/%s", data->mtabFil= e) < 0) - return -1; + virAsprintf(&mtabFile, abs_srcdir "/virfiledata/%s", data->mtabFile); =20 if (setenv("LIBVIRT_MTAB", mtabFile, 1) < 0) { fprintf(stderr, "Unable to set env variable\n"); diff --git a/tests/virfilewrapper.c b/tests/virfilewrapper.c index b6032f88fd..765b3b31d9 100644 --- a/tests/virfilewrapper.c +++ b/tests/virfilewrapper.c @@ -124,9 +124,7 @@ virMockStatRedirect(const char *path, char **newpath) if (!tmp) continue; =20 - if (virAsprintfQuiet(newpath, "%s%s", overrides[i], tmp) < 0) - return -1; - + virAsprintfQuiet(newpath, "%s%s", overrides[i], tmp); break; } =20 diff --git a/tests/virhostcputest.c b/tests/virhostcputest.c index 81a126ff73..7b1b1a6d89 100644 --- a/tests/virhostcputest.c +++ b/tests/virhostcputest.c @@ -55,13 +55,12 @@ linuxTestCompareFiles(const char *cpuinfofile, } VIR_FORCE_FCLOSE(cpuinfo); =20 - if (virAsprintf(&actualData, - "CPUs: %u/%u, MHz: %u, Nodes: %u, Sockets: %u, " - "Cores: %u, Threads: %u\n", - nodeinfo.cpus, VIR_NODEINFO_MAXCPUS(nodeinfo), - nodeinfo.mhz, nodeinfo.nodes, nodeinfo.sockets, - nodeinfo.cores, nodeinfo.threads) < 0) - goto fail; + virAsprintf(&actualData, + "CPUs: %u/%u, MHz: %u, Nodes: %u, Sockets: %u, " + "Cores: %u, Threads: %u\n", + nodeinfo.cpus, VIR_NODEINFO_MAXCPUS(nodeinfo), + nodeinfo.mhz, nodeinfo.nodes, nodeinfo.sockets, + nodeinfo.cores, nodeinfo.threads); =20 if (virTestCompareToFile(actualData, outputfile) < 0) goto fail; @@ -177,20 +176,17 @@ linuxTestHostCPU(const void *opaque) struct linuxTestHostCPUData *data =3D (struct linuxTestHostCPUData *) = opaque; const char *archStr =3D virArchToString(data->arch); =20 - if (virAsprintf(&sysfs_prefix, "%s/virhostcpudata/linux-%s", - abs_srcdir, data->testName) < 0 || - virAsprintf(&cpuinfo, "%s/virhostcpudata/linux-%s-%s.cpuinfo", - abs_srcdir, archStr, data->testName) < 0 || - virAsprintf(&output, "%s/virhostcpudata/linux-%s-%s.expected", - abs_srcdir, archStr, data->testName) < 0) { - goto cleanup; - } + virAsprintf(&sysfs_prefix, "%s/virhostcpudata/linux-%s", + abs_srcdir, data->testName); + virAsprintf(&cpuinfo, "%s/virhostcpudata/linux-%s-%s.cpuinfo", + abs_srcdir, archStr, data->testName); + virAsprintf(&output, "%s/virhostcpudata/linux-%s-%s.expected", + abs_srcdir, archStr, data->testName); =20 virFileWrapperAddPrefix(SYSFS_SYSTEM_PATH, sysfs_prefix); result =3D linuxTestCompareFiles(cpuinfo, data->arch, output); virFileWrapperRemovePrefix(SYSFS_SYSTEM_PATH); =20 - cleanup: VIR_FREE(cpuinfo); VIR_FREE(output); VIR_FREE(sysfs_prefix); @@ -211,16 +207,14 @@ linuxTestNodeCPUStats(const void *data) char *cpustatfile =3D NULL; char *outfile =3D NULL; =20 - if (virAsprintf(&cpustatfile, "%s/virhostcpudata/linux-cpustat-%s.stat= ", - abs_srcdir, testData->name) < 0 || - virAsprintf(&outfile, "%s/virhostcpudata/linux-cpustat-%s.out", - abs_srcdir, testData->name) < 0) - goto fail; + virAsprintf(&cpustatfile, "%s/virhostcpudata/linux-cpustat-%s.stat", + abs_srcdir, testData->name); + virAsprintf(&outfile, "%s/virhostcpudata/linux-cpustat-%s.out", + abs_srcdir, testData->name); =20 result =3D linuxCPUStatsCompareFiles(cpustatfile, testData->ncpus, outfile); - fail: VIR_FREE(cpustatfile); VIR_FREE(outfile); return result; diff --git a/tests/virjsontest.c b/tests/virjsontest.c index f72e70879b..75c70a49c9 100644 --- a/tests/virjsontest.c +++ b/tests/virjsontest.c @@ -26,11 +26,10 @@ testJSONFromFile(const void *data) g_autofree char *outfile =3D NULL; g_autofree char *actual =3D NULL; =20 - if (virAsprintf(&infile, "%s/virjsondata/parse-%s-in.json", - abs_srcdir, info->name) < 0 || - virAsprintf(&outfile, "%s/virjsondata/parse-%s-out.json", - abs_srcdir, info->name) < 0) - return -1; + virAsprintf(&infile, "%s/virjsondata/parse-%s-in.json", + abs_srcdir, info->name); + virAsprintf(&outfile, "%s/virjsondata/parse-%s-out.json", + abs_srcdir, info->name); =20 if (virTestLoadFile(infile, &indata) < 0) return -1; @@ -114,11 +113,10 @@ testJSONAddRemove(const void *data) g_autofree char *outfile =3D NULL; g_autofree char *actual =3D NULL; =20 - if (virAsprintf(&infile, "%s/virjsondata/add-remove-%s-in.json", - abs_srcdir, info->name) < 0 || - virAsprintf(&outfile, "%s/virjsondata/add-remove-%s-out.json", - abs_srcdir, info->name) < 0) - return -1; + virAsprintf(&infile, "%s/virjsondata/add-remove-%s-in.json", + abs_srcdir, info->name); + virAsprintf(&outfile, "%s/virjsondata/add-remove-%s-out.json", + abs_srcdir, info->name); =20 if (virTestLoadFile(infile, &indata) < 0) return -1; @@ -350,11 +348,10 @@ testJSONDeflatten(const void *data) g_autofree char *outfile =3D NULL; g_autofree char *actual =3D NULL; =20 - if (virAsprintf(&infile, "%s/virjsondata/deflatten-%s-in.json", - abs_srcdir, info->name) < 0 || - virAsprintf(&outfile, "%s/virjsondata/deflatten-%s-out.json", - abs_srcdir, info->name) < 0) - return -1; + virAsprintf(&infile, "%s/virjsondata/deflatten-%s-in.json", + abs_srcdir, info->name); + virAsprintf(&outfile, "%s/virjsondata/deflatten-%s-out.json", + abs_srcdir, info->name); =20 if (virTestLoadFile(infile, &indata) < 0) return -1; diff --git a/tests/virmacmaptest.c b/tests/virmacmaptest.c index 995aff1178..17880728e7 100644 --- a/tests/virmacmaptest.c +++ b/tests/virmacmaptest.c @@ -41,9 +41,7 @@ testMACLookup(const void *opaque) char *file =3D NULL; int ret =3D -1; =20 - if (virAsprintf(&file, "%s/virmacmaptestdata/%s.json", - abs_srcdir, data->file) < 0) - goto cleanup; + virAsprintf(&file, "%s/virmacmaptestdata/%s.json", abs_srcdir, data->f= ile); =20 if (!(mgr =3D virMacMapNew(file))) goto cleanup; @@ -94,9 +92,7 @@ testMACRemove(const void *opaque) char *file =3D NULL; int ret =3D -1; =20 - if (virAsprintf(&file, "%s/virmacmaptestdata/%s.json", - abs_srcdir, data->file) < 0) - goto cleanup; + virAsprintf(&file, "%s/virmacmaptestdata/%s.json", abs_srcdir, data->f= ile); =20 if (!(mgr =3D virMacMapNew(file))) goto cleanup; @@ -131,9 +127,7 @@ testMACFlush(const void *opaque) char *str =3D NULL; int ret =3D -1; =20 - if (virAsprintf(&file, "%s/virmacmaptestdata/%s.json", - abs_srcdir, data->file) < 0) - goto cleanup; + virAsprintf(&file, "%s/virmacmaptestdata/%s.json", abs_srcdir, data->f= ile); =20 if (virMacMapDumpStr(data->mgr, &str) < 0) goto cleanup; diff --git a/tests/virnetdaemontest.c b/tests/virnetdaemontest.c index f0e91763b8..2dfa04e83f 100644 --- a/tests/virnetdaemontest.c +++ b/tests/virnetdaemontest.c @@ -295,13 +295,11 @@ static int testExecRestart(const void *opaque) goto cleanup; } =20 - if (virAsprintf(&infile, "%s/virnetdaemondata/input-data-%s.json", - abs_srcdir, data->jsonfile) < 0) - goto cleanup; + virAsprintf(&infile, "%s/virnetdaemondata/input-data-%s.json", abs_src= dir, + data->jsonfile); =20 - if (virAsprintf(&outfile, "%s/virnetdaemondata/output-data-%s.json", - abs_srcdir, data->jsonfile) < 0) - goto cleanup; + virAsprintf(&outfile, "%s/virnetdaemondata/output-data-%s.json", + abs_srcdir, data->jsonfile); =20 if (virFileReadAll(infile, 8192, &injsonstr) < 0) goto cleanup; diff --git a/tests/virnetdevmock.c b/tests/virnetdevmock.c index 9724a1bc1f..574a26af2d 100644 --- a/tests/virnetdevmock.c +++ b/tests/virnetdevmock.c @@ -30,12 +30,8 @@ virNetDevSysfsFile(char **pf_sysfs_device_link, const char *ifname, const char *file) { - if (virAsprintfQuiet(pf_sysfs_device_link, "%s/%s/%s", - NET_DEV_TEST_DATA_PREFIX, ifname, file) < 0) { - fprintf(stderr, "Out of memory\n"); - abort(); - } - + virAsprintfQuiet(pf_sysfs_device_link, "%s/%s/%s", + NET_DEV_TEST_DATA_PREFIX, ifname, file); return 0; } #else diff --git a/tests/virnetdevopenvswitchtest.c b/tests/virnetdevopenvswitcht= est.c index 3beb4af149..7b814474b7 100644 --- a/tests/virnetdevopenvswitchtest.c +++ b/tests/virnetdevopenvswitchtest.c @@ -38,9 +38,8 @@ testInterfaceParseStats(const void *opaque) g_autofree char *buf =3D NULL; virDomainInterfaceStatsStruct actual; =20 - if (virAsprintf(&filename, "%s/virnetdevopenvswitchdata/%s", - abs_srcdir, data->filename) < 0) - return -1; + virAsprintf(&filename, "%s/virnetdevopenvswitchdata/%s", abs_srcdir, + data->filename); =20 if (virFileReadAll(filename, 1024, &buf) < 0) return -1; diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c index 0934842252..29568eea1a 100644 --- a/tests/virnetsockettest.c +++ b/tests/virnetsockettest.c @@ -196,8 +196,7 @@ testSocketAccept(const void *opaque) VIR_WARN("Failed to create temporary directory"); goto cleanup; } - if (virAsprintf(&path, "%s/test.sock", tmpdir) < 0) - goto cleanup; + virAsprintf(&path, "%s/test.sock", tmpdir); =20 if (virNetSocketNewListenUNIX(path, 0700, -1, getegid(), &usock) <= 0) goto cleanup; @@ -321,8 +320,7 @@ static int testSocketUNIXAddrs(const void *data G_GNUC_= UNUSED) VIR_WARN("Failed to create temporary directory"); goto cleanup; } - if (virAsprintf(&path, "%s/test.sock", tmpdir) < 0) - goto cleanup; + virAsprintf(&path, "%s/test.sock", tmpdir); =20 if (virNetSocketNewListenUNIX(path, 0700, -1, getegid(), &lsock) < 0) goto cleanup; diff --git a/tests/virnetworkportxml2xmltest.c b/tests/virnetworkportxml2xm= ltest.c index 973fee5747..89f9de0c17 100644 --- a/tests/virnetworkportxml2xmltest.c +++ b/tests/virnetworkportxml2xmltest.c @@ -66,13 +66,11 @@ testCompareXMLToXMLHelper(const void *data) int ret =3D -1; char *xml =3D NULL; =20 - if (virAsprintf(&xml, "%s/virnetworkportxml2xmldata/%s.xml", - abs_srcdir, info->name) < 0) - goto cleanup; + virAsprintf(&xml, "%s/virnetworkportxml2xmldata/%s.xml", abs_srcdir, + info->name); =20 ret =3D testCompareXMLToXMLFiles(xml); =20 - cleanup: VIR_FREE(xml); =20 return ret; diff --git a/tests/virnumamock.c b/tests/virnumamock.c index 3eefb7ccee..faff8bb4a2 100644 --- a/tests/virnumamock.c +++ b/tests/virnumamock.c @@ -43,8 +43,7 @@ virNumaIsAvailable(void) if (numa_avail < 0) { char *sysfs_node_path =3D NULL; =20 - if (virAsprintfQuiet(&sysfs_node_path, "%s/node", SYSFS_SYSTEM_PAT= H) < 0) - return false; + virAsprintfQuiet(&sysfs_node_path, "%s/node", SYSFS_SYSTEM_PATH); =20 numa_avail =3D virFileExists(sysfs_node_path); =20 diff --git a/tests/virnwfilterbindingxml2xmltest.c b/tests/virnwfilterbindi= ngxml2xmltest.c index bba63e9564..d5ace8f89f 100644 --- a/tests/virnwfilterbindingxml2xmltest.c +++ b/tests/virnwfilterbindingxml2xmltest.c @@ -72,14 +72,11 @@ testCompareXMLToXMLHelper(const void *data) const test_parms *tp =3D data; char *xml =3D NULL; =20 - if (virAsprintf(&xml, "%s/virnwfilterbindingxml2xmldata/%s.xml", - abs_srcdir, tp->name) < 0) { - goto cleanup; - } + virAsprintf(&xml, "%s/virnwfilterbindingxml2xmldata/%s.xml", abs_srcdi= r, + tp->name); =20 result =3D testCompareXMLToXMLFiles(xml); =20 - cleanup: VIR_FREE(xml); =20 return result; diff --git a/tests/virpcimock.c b/tests/virpcimock.c index d7dc0b00f0..a6bdad7a75 100644 --- a/tests/virpcimock.c +++ b/tests/virpcimock.c @@ -186,8 +186,7 @@ make_file(const char *path, if (value && len =3D=3D -1) len =3D strlen(value); =20 - if (virAsprintfQuiet(&filepath, "%s/%s", path, name) < 0) - ABORT_OOM(); + virAsprintfQuiet(&filepath, "%s/%s", path, name); =20 if ((fd =3D real_open(filepath, O_CREAT|O_WRONLY, 0666)) < 0) ABORT("Unable to open: %s", filepath); @@ -204,8 +203,7 @@ make_dir(const char *path, { g_autofree char *dirpath =3D NULL; =20 - if (virAsprintfQuiet(&dirpath, "%s/%s", path, name) < 0) - ABORT_OOM(); + virAsprintfQuiet(&dirpath, "%s/%s", path, name); =20 if (virFileMakePath(dirpath) < 0) ABORT("Unable to create: %s", dirpath); @@ -218,8 +216,7 @@ make_symlink(const char *path, { g_autofree char *filepath =3D NULL; =20 - if (virAsprintfQuiet(&filepath, "%s/%s", path, name) < 0) - ABORT_OOM(); + virAsprintfQuiet(&filepath, "%s/%s", path, name); =20 if (symlink(target, filepath) < 0) ABORT("Unable to create symlink filepath -> target"); @@ -235,10 +232,7 @@ pci_read_file(const char *path, int fd =3D -1; g_autofree char *newpath =3D NULL; =20 - if (virAsprintfQuiet(&newpath, "%s/%s", fakerootdir, path) < 0) { - errno =3D ENOMEM; - goto cleanup; - } + virAsprintfQuiet(&newpath, "%s/%s", fakerootdir, path); =20 if ((fd =3D real_open(newpath, O_RDWR)) < 0) goto cleanup; @@ -275,19 +269,13 @@ getrealpath(char **newpath, init_env(); =20 if (STRPREFIX(path, SYSFS_PCI_PREFIX)) { - if (virAsprintfQuiet(newpath, "%s/sys/bus/pci/%s", - fakerootdir, - path + strlen(SYSFS_PCI_PREFIX)) < 0) { - errno =3D ENOMEM; - return -1; - } + virAsprintfQuiet(newpath, "%s/sys/bus/pci/%s", + fakerootdir, + path + strlen(SYSFS_PCI_PREFIX)); } else if (pathPrefixIsMocked(path)) { - if (virAsprintfQuiet(newpath, "%s/%s", - fakerootdir, - path) < 0) { - errno =3D ENOMEM; - return -1; - } + virAsprintfQuiet(newpath, "%s/%s", + fakerootdir, + path); } else { *newpath =3D g_strdup(path); } @@ -368,9 +356,9 @@ pci_address_format(struct pciDeviceAddress const *addr) { char *ret; =20 - ignore_value(virAsprintfQuiet(&ret, ADDR_STR_FMT, - addr->domain, addr->bus, - addr->device, addr->function)); + virAsprintfQuiet(&ret, ADDR_STR_FMT, + addr->domain, addr->bus, + addr->device, addr->function); return ret; } =20 @@ -405,13 +393,13 @@ pci_device_get_path(const struct pciDevice *dev, * and then they are just symlinked to /sys/bus/pci/devices/ */ if (file) { - ignore_value(virAsprintfQuiet(&ret, "%s/sys/devices/pci%04x:%02x/%= s/%s", - prefix, dev->addr.domain, dev->addr.= bus, - devid, file)); + virAsprintfQuiet(&ret, "%s/sys/devices/pci%04x:%02x/%s/%s", + prefix, dev->addr.domain, dev->addr.bus, + devid, file); } else { - ignore_value(virAsprintfQuiet(&ret, "%s/sys/devices/pci%04x:%02x/%= s", - prefix, dev->addr.domain, dev->addr.= bus, - devid)); + virAsprintfQuiet(&ret, "%s/sys/devices/pci%04x:%02x/%s", + prefix, dev->addr.domain, dev->addr.bus, + devid); } =20 return ret; @@ -427,9 +415,8 @@ pci_device_create_iommu(const struct pciDevice *dev, char tmp[256]; size_t i; =20 - if (virAsprintfQuiet(&iommuPath, "%s/sys/kernel/iommu_groups/%d/device= s/", - fakerootdir, dev->iommuGroup) < 0) - ABORT_OOM(); + virAsprintfQuiet(&iommuPath, "%s/sys/kernel/iommu_groups/%d/devices/", + fakerootdir, dev->iommuGroup); =20 if (virFileMakePath(iommuPath) < 0) ABORT("Unable to create: %s", iommuPath); @@ -492,11 +479,11 @@ pci_device_new_from_stub(const struct pciDevice *data) c =3D strchr(c, ':'); } =20 - if (VIR_ALLOC_QUIET(dev) < 0 || - virAsprintfQuiet(&configSrc, "%s/virpcitestdata/%s.config", - abs_srcdir, id) < 0) + if (VIR_ALLOC_QUIET(dev) < 0) ABORT_OOM(); =20 + virAsprintfQuiet(&configSrc, "%s/virpcitestdata/%s.config", abs_srcdir= , id); + memcpy(dev, data, sizeof(*dev)); =20 if (!(devpath =3D pci_device_get_path(dev, NULL, true))) @@ -557,8 +544,7 @@ pci_device_new_from_stub(const struct pciDevice *data) ABORT("@tmp overflow"); } =20 - if (virAsprintfQuiet(&devsympath, "%s" SYSFS_PCI_PREFIX "devices", fak= erootdir) < 0) - ABORT_OOM(); + virAsprintfQuiet(&devsympath, "%s" SYSFS_PCI_PREFIX "devices", fakeroo= tdir); =20 make_symlink(devsympath, devid, tmp); =20 @@ -639,12 +625,9 @@ pci_vfio_release_iommu(struct pciDevice *device) pciIommuGroups[i]->nDevicesBoundToVFIO--; =20 if (!pciIommuGroups[i]->nDevicesBoundToVFIO) { - if (virAsprintfQuiet(&vfiopath, "%s/dev/vfio/%d", - fakerootdir, - device->iommuGroup) < 0) { - errno =3D ENOMEM; - return -1; - } + virAsprintfQuiet(&vfiopath, "%s/dev/vfio/%d", + fakerootdir, + device->iommuGroup); =20 if (unlink(vfiopath) < 0) return -1; @@ -668,12 +651,9 @@ pci_vfio_lock_iommu(struct pciDevice *device) continue; =20 if (pciIommuGroups[i]->nDevicesBoundToVFIO =3D=3D 0) { - if (virAsprintfQuiet(&vfiopath, "%s/dev/vfio/%d", - fakerootdir, - device->iommuGroup) < 0) { - errno =3D ENOMEM; - goto cleanup; - } + virAsprintfQuiet(&vfiopath, "%s/dev/vfio/%d", + fakerootdir, + device->iommuGroup); if ((fd =3D real_open(vfiopath, O_CREAT)) < 0) goto cleanup; =20 @@ -705,11 +685,11 @@ pci_driver_get_path(const struct pciDriver *driver, prefix =3D fakerootdir; =20 if (file) { - ignore_value(virAsprintfQuiet(&ret, "%s" SYSFS_PCI_PREFIX "drivers= /%s/%s", - prefix, driver->name, file)); + virAsprintfQuiet(&ret, "%s" SYSFS_PCI_PREFIX "drivers/%s/%s", + prefix, driver->name, file); } else { - ignore_value(virAsprintfQuiet(&ret, "%s" SYSFS_PCI_PREFIX "drivers= /%s", - prefix, driver->name)); + virAsprintfQuiet(&ret, "%s" SYSFS_PCI_PREFIX "drivers/%s", + prefix, driver->name); } =20 return ret; @@ -991,9 +971,7 @@ init_env(void) if (!(fakerootdir =3D getenv("LIBVIRT_FAKE_ROOT_DIR"))) ABORT("Missing LIBVIRT_FAKE_ROOT_DIR env variable\n"); =20 - if (virAsprintfQuiet(&tmp, "%s%s", - fakerootdir, SYSFS_PCI_PREFIX) < 0) - ABORT_OOM(); + virAsprintfQuiet(&tmp, "%s%s", fakerootdir, SYSFS_PCI_PREFIX); =20 if (virFileMakePath(tmp) < 0) ABORT("Unable to create: %s", tmp); @@ -1004,8 +982,7 @@ init_env(void) =20 /* Create /dev/vfio/ dir and /dev/vfio/vfio file */ VIR_FREE(tmp); - if (virAsprintfQuiet(&tmp, "%s/dev/vfio", fakerootdir) < 0) - ABORT_OOM(); + virAsprintfQuiet(&tmp, "%s/dev/vfio", fakerootdir); =20 if (virFileMakePath(tmp) < 0) ABORT("Unable to create: %s", tmp); diff --git a/tests/virpcitest.c b/tests/virpcitest.c index de2ffc7d41..20eb2caea9 100644 --- a/tests/virpcitest.c +++ b/tests/virpcitest.c @@ -349,11 +349,8 @@ mymain(void) domain, bus, slot, function, NULL \ }; \ char *label =3D NULL; \ - if (virAsprintf(&label, "%s(%04x:%02x:%02x.%x)", \ - #fnc, domain, bus, slot, function) < 0) { \ - ret =3D -1; \ - break; \ - } \ + virAsprintf(&label, "%s(%04x:%02x:%02x.%x)", \ + #fnc, domain, bus, slot, function); \ if (virTestRun(label, fnc, &data) < 0) \ ret =3D -1; \ VIR_FREE(label); \ @@ -365,12 +362,9 @@ mymain(void) domain, bus, slot, function, driver \ }; \ char *label =3D NULL; \ - if (virAsprintf(&label, "PCI driver %04x:%02x:%02x.%x is %s", \ - domain, bus, slot, function, \ - NULLSTR(driver)) < 0) { \ - ret =3D -1; \ - break; \ - } \ + virAsprintf(&label, "PCI driver %04x:%02x:%02x.%x is %s", \ + domain, bus, slot, function, \ + NULLSTR(driver)); \ if (virTestRun(label, testVirPCIDeviceCheckDriverTest, \ &data) < 0) \ ret =3D -1; \ diff --git a/tests/virrandommock.c b/tests/virrandommock.c index a74776efa3..eff72a8aa7 100644 --- a/tests/virrandommock.c +++ b/tests/virrandommock.c @@ -53,8 +53,9 @@ uint64_t virRandomBits(int nbits) int virRandomGenerateWWN(char **wwn, const char *virt_type G_GNUC_UNUSED) { - return virAsprintf(wwn, "5100000%09llx", - (unsigned long long)virRandomBits(36)); + virAsprintf(wwn, "5100000%09llx", + (unsigned long long)virRandomBits(36)); + return 0; } =20 =20 diff --git a/tests/virresctrltest.c b/tests/virresctrltest.c index 34882ac127..71870e9f3f 100644 --- a/tests/virresctrltest.c +++ b/tests/virresctrltest.c @@ -26,17 +26,14 @@ test_virResctrlGetUnused(const void *opaque) char *schemata_file; virCapsPtr caps =3D NULL; =20 - if (virAsprintf(&system_dir, "%s/vircaps2xmldata/linux-%s/system", - abs_srcdir, data->filename) < 0) - goto cleanup; + virAsprintf(&system_dir, "%s/vircaps2xmldata/linux-%s/system", abs_src= dir, + data->filename); =20 - if (virAsprintf(&resctrl_dir, "%s/vircaps2xmldata/linux-%s/resctrl", - abs_srcdir, data->filename) < 0) - goto cleanup; + virAsprintf(&resctrl_dir, "%s/vircaps2xmldata/linux-%s/resctrl", + abs_srcdir, data->filename); =20 - if (virAsprintf(&schemata_file, "%s/virresctrldata/%s.schemata", - abs_srcdir, data->filename) < 0) - goto cleanup; + virAsprintf(&schemata_file, "%s/virresctrldata/%s.schemata", abs_srcdi= r, + data->filename); =20 virFileWrapperAddPrefix("/sys/devices/system", system_dir); virFileWrapperAddPrefix("/sys/fs/resctrl", resctrl_dir); diff --git a/tests/virschematest.c b/tests/virschematest.c index dabbc02163..1370068601 100644 --- a/tests/virschematest.c +++ b/tests/virschematest.c @@ -87,12 +87,9 @@ testSchemaDir(const char *schema, if (ent->d_name[0] =3D=3D '.') continue; =20 - if (virAsprintf(&xml_path, "%s/%s", dir_path, ent->d_name) < 0) - goto cleanup; + virAsprintf(&xml_path, "%s/%s", dir_path, ent->d_name); =20 - if (virAsprintf(&test_name, "Checking %s against %s", - ent->d_name, schema) < 0) - goto cleanup; + virAsprintf(&test_name, "Checking %s against %s", ent->d_name, sch= ema); =20 data.xml_path =3D xml_path; if (virTestRun(test_name, testSchemaFile, &data) < 0) @@ -105,7 +102,6 @@ testSchemaDir(const char *schema, if (rc < 0) ret =3D -1; =20 - cleanup: VIR_FREE(test_name); VIR_FREE(xml_path); VIR_DIR_CLOSE(dir); @@ -124,16 +120,12 @@ testSchemaDirs(const char *schema, virXMLValidatorPtr= validator, ...) va_start(args, validator); =20 while ((dir =3D va_arg(args, char *))) { - if (virAsprintf(&dir_path, "%s/%s", abs_srcdir, dir) < 0) { - ret =3D -1; - goto cleanup; - } + virAsprintf(&dir_path, "%s/%s", abs_srcdir, dir); if (testSchemaDir(schema, validator, dir_path) < 0) ret =3D -1; VIR_FREE(dir_path); } =20 - cleanup: VIR_FREE(dir_path); va_end(args); return ret; @@ -147,9 +139,8 @@ testSchemaGrammar(const void *opaque) char *schema_path; int ret =3D -1; =20 - if (virAsprintf(&schema_path, "%s/docs/schemas/%s", - abs_top_srcdir, data->schema) < 0) - return -1; + virAsprintf(&schema_path, "%s/docs/schemas/%s", abs_top_srcdir, + data->schema); =20 if (!(data->validator =3D virXMLValidatorInit(schema_path))) goto cleanup; diff --git a/tests/virscsitest.c b/tests/virscsitest.c index 99374cc80c..0d2ddd3b6a 100644 --- a/tests/virscsitest.c +++ b/tests/virscsitest.c @@ -167,11 +167,9 @@ create_symlink(const char *tmpdir, const char *src_nam= e, const char *dst_name) char *src_path =3D NULL; char *dst_path =3D NULL; =20 - if (virAsprintf(&src_path, "%s/%s", virscsi_prefix, src_name) < 0) - goto cleanup; + virAsprintf(&src_path, "%s/%s", virscsi_prefix, src_name); =20 - if (virAsprintf(&dst_path, "%s/%s", tmpdir, dst_name) < 0) - goto cleanup; + virAsprintf(&dst_path, "%s/%s", tmpdir, dst_name); =20 if (symlink(src_path, dst_path) < 0) { VIR_WARN("Failed to create symlink '%s' to '%s'", src_path, dst_pa= th); @@ -194,10 +192,7 @@ mymain(void) char *tmpdir =3D NULL; char template[] =3D "/tmp/libvirt_XXXXXX"; =20 - if (virAsprintf(&virscsi_prefix, "%s" VIR_SCSI_DATA, abs_srcdir) < 0) { - ret =3D -1; - goto cleanup; - } + virAsprintf(&virscsi_prefix, "%s" VIR_SCSI_DATA, abs_srcdir); =20 tmpdir =3D mkdtemp(template); =20 diff --git a/tests/virshtest.c b/tests/virshtest.c index fee6833c9b..475933a93c 100644 --- a/tests/virshtest.c +++ b/tests/virshtest.c @@ -252,9 +252,8 @@ mymain(void) { int ret =3D 0; =20 - if (virAsprintf(&custom_uri, "test://%s/../examples/xml/test/testnode.= xml", - abs_srcdir) < 0) - return EXIT_FAILURE; + virAsprintf(&custom_uri, "test://%s/../examples/xml/test/testnode.xml", + abs_srcdir); =20 if (virTestRun("virsh list (default)", testCompareListDefault, NULL) !=3D 0) diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index 8f1d93fa5a..af1b4fc43f 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -138,13 +138,12 @@ testPrepImages(void) compat =3D true; VIR_FREE(buf); =20 - if (virAsprintf(&absraw, "%s/raw", datadir) < 0 || - virAsprintf(&absqcow2, "%s/qcow2", datadir) < 0 || - virAsprintf(&abswrap, "%s/wrap", datadir) < 0 || - virAsprintf(&absqed, "%s/qed", datadir) < 0 || - virAsprintf(&absdir, "%s/dir", datadir) < 0 || - virAsprintf(&abslink2, "%s/sub/link2", datadir) < 0) - goto cleanup; + virAsprintf(&absraw, "%s/raw", datadir); + virAsprintf(&absqcow2, "%s/qcow2", datadir); + virAsprintf(&abswrap, "%s/wrap", datadir); + virAsprintf(&absqed, "%s/qed", datadir); + virAsprintf(&absdir, "%s/dir", datadir); + virAsprintf(&abslink2, "%s/sub/link2", datadir); =20 if (virFileMakePath(datadir "/sub") < 0) { fprintf(stderr, "unable to create directory %s\n", datadir "/sub"); @@ -160,8 +159,8 @@ testPrepImages(void) goto cleanup; } =20 - if (virAsprintf(&buf, "%1024d", 0) < 0 || - virFileWriteStr("raw", buf, 0600) < 0) { + virAsprintf(&buf, "%1024d", 0); + if (virFileWriteStr("raw", buf, 0600) < 0) { fprintf(stderr, "unable to create raw file\n"); goto cleanup; } @@ -322,30 +321,28 @@ testStorageChain(const void *args) return -1; } =20 - if (virAsprintf(&expect, - testStorageChainFormat, i, - NULLSTR(data->files[i]->path), - NULLSTR(data->files[i]->expBackingStoreRaw), - data->files[i]->expCapacity, - data->files[i]->expEncrypted, - NULLSTR(data->files[i]->pathRel), - data->files[i]->type, - data->files[i]->format, - virStorageNetProtocolTypeToString(data->files[i]->= protocol), - NULLSTR(data->files[i]->hostname)) < 0 || - virAsprintf(&actual, - testStorageChainFormat, i, - NULLSTR(elt->path), - NULLSTR(elt->backingStoreRaw), - elt->capacity, - !!elt->encryption, - NULLSTR(elt->relPath), - elt->type, - elt->format, - virStorageNetProtocolTypeToString(elt->protocol), - NULLSTR(elt->nhosts ? elt->hosts[0].name : NULL)) = < 0) { - return -1; - } + virAsprintf(&expect, + testStorageChainFormat, i, + NULLSTR(data->files[i]->path), + NULLSTR(data->files[i]->expBackingStoreRaw), + data->files[i]->expCapacity, + data->files[i]->expEncrypted, + NULLSTR(data->files[i]->pathRel), + data->files[i]->type, + data->files[i]->format, + virStorageNetProtocolTypeToString(data->files[i]->prot= ocol), + NULLSTR(data->files[i]->hostname)); + virAsprintf(&actual, + testStorageChainFormat, i, + NULLSTR(elt->path), + NULLSTR(elt->backingStoreRaw), + elt->capacity, + !!elt->encryption, + NULLSTR(elt->relPath), + elt->type, + elt->format, + virStorageNetProtocolTypeToString(elt->protocol), + NULLSTR(elt->nhosts ? elt->hosts[0].name : NULL)); if (STRNEQ(expect, actual)) { virTestDifference(stderr, expect, actual); return -1; diff --git a/tests/virtestmock.c b/tests/virtestmock.c index e0f9c6c2a1..7c10a045b3 100644 --- a/tests/virtestmock.c +++ b/tests/virtestmock.c @@ -109,9 +109,8 @@ checkPath(const char *path, char *relPath =3D NULL; char *crippledPath =3D NULL; =20 - if (path[0] !=3D '/' && - virAsprintfQuiet(&relPath, "./%s", path) < 0) - goto error; + if (path[0] !=3D '/') + virAsprintfQuiet(&relPath, "./%s", path); =20 /* Le sigh. virFileCanonicalizePath() expects @path to exist, otherwise * it will return an error. So if we are called over an non-existent @@ -141,9 +140,6 @@ checkPath(const char *path, VIR_FREE(fullPath); =20 return; - error: - fprintf(stderr, "Out of memory\n"); - abort(); } =20 =20 diff --git a/tests/virusbmock.c b/tests/virusbmock.c index cace140725..7b7d24ac77 100644 --- a/tests/virusbmock.c +++ b/tests/virusbmock.c @@ -53,17 +53,12 @@ static char *get_fake_path(const char *real_path) const char *p =3D NULL; char *path =3D NULL; =20 - if ((p =3D STRSKIP(real_path, USB_SYSFS)) && - virAsprintfQuiet(&path, "%s/%s/%s", abs_srcdir, FAKE_USB_SYSFS, p)= < 0) - goto error; + if ((p =3D STRSKIP(real_path, USB_SYSFS))) + virAsprintfQuiet(&path, "%s/%s/%s", abs_srcdir, FAKE_USB_SYSFS, p); else if (!p) path =3D g_strdup(real_path); =20 return path; - - error: - errno =3D ENOMEM; - return NULL; } =20 DIR *opendir(const char *name) diff --git a/tests/virusbtest.c b/tests/virusbtest.c index b26173248b..94c55e1fb8 100644 --- a/tests/virusbtest.c +++ b/tests/virusbtest.c @@ -52,10 +52,8 @@ static int testDeviceFileActor(virUSBDevicePtr dev, char *str =3D NULL; int ret =3D 0; =20 - if (virAsprintf(&str, USB_DEVFS "%03d/%03d", - virUSBDeviceGetBus(dev), - virUSBDeviceGetDevno(dev)) < 0) - return -1; + virAsprintf(&str, USB_DEVFS "%03d/%03d", virUSBDeviceGetBus(dev), + virUSBDeviceGetDevno(dev)); =20 if (STRNEQ(path, str)) { virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/tests/vmwarevertest.c b/tests/vmwarevertest.c index c19c6cc302..b482873103 100644 --- a/tests/vmwarevertest.c +++ b/tests/vmwarevertest.c @@ -43,9 +43,7 @@ testVerStrParse(const void *data) unsigned long version; int vmware_type; =20 - if (virAsprintf(&path, "%s/vmwareverdata/%s.txt", abs_srcdir, - info->name) < 0) - return -1; + virAsprintf(&path, "%s/vmwareverdata/%s.txt", abs_srcdir, info->name); =20 if (virTestLoadFile(path, &databuf) < 0) goto cleanup; diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c index 706fec7bac..7e05052744 100644 --- a/tests/vmx2xmltest.c +++ b/tests/vmx2xmltest.c @@ -114,16 +114,13 @@ testCompareHelper(const void *data) char *vmx =3D NULL; char *xml =3D NULL; =20 - if (virAsprintf(&vmx, "%s/vmx2xmldata/vmx2xml-%s.vmx", abs_srcdir, - info->input) < 0 || - virAsprintf(&xml, "%s/vmx2xmldata/vmx2xml-%s.xml", abs_srcdir, - info->output) < 0) { - goto cleanup; - } + virAsprintf(&vmx, "%s/vmx2xmldata/vmx2xml-%s.vmx", abs_srcdir, + info->input); + virAsprintf(&xml, "%s/vmx2xmldata/vmx2xml-%s.xml", abs_srcdir, + info->output); =20 ret =3D testCompareFiles(vmx, xml); =20 - cleanup: VIR_FREE(vmx); VIR_FREE(xml); =20 @@ -151,9 +148,7 @@ testParseVMXFileName(const char *fileName, void *opaque= G_GNUC_UNUSED) goto cleanup; } =20 - if (virAsprintf(&src, "[%s] %s", datastoreName, - directoryAndFileName) < 0) - goto cleanup; + virAsprintf(&src, "[%s] %s", datastoreName, directoryAndFileName); } else if (STRPREFIX(fileName, "/")) { /* Found absolute path referencing a file outside a datastore */ src =3D g_strdup(fileName); @@ -162,8 +157,7 @@ testParseVMXFileName(const char *fileName, void *opaque= G_GNUC_UNUSED) src =3D NULL; } else { /* Found single file name referencing a file inside a datastore */ - if (virAsprintf(&src, "[datastore] directory/%s", fileName) < 0) - goto cleanup; + virAsprintf(&src, "[datastore] directory/%s", fileName); } =20 cleanup: diff --git a/tests/xlconfigtest.c b/tests/xlconfigtest.c index 8e84c84887..25988b1ae8 100644 --- a/tests/xlconfigtest.c +++ b/tests/xlconfigtest.c @@ -187,18 +187,14 @@ testCompareHelper(const void *data) char *xml =3D NULL; char *cfg =3D NULL; =20 - if (virAsprintf(&xml, "%s/xlconfigdata/test-%s.xml", - abs_srcdir, info->name) < 0 || - virAsprintf(&cfg, "%s/xlconfigdata/test-%s.cfg", - abs_srcdir, info->name) < 0) - goto cleanup; + virAsprintf(&xml, "%s/xlconfigdata/test-%s.xml", abs_srcdir, info->nam= e); + virAsprintf(&cfg, "%s/xlconfigdata/test-%s.cfg", abs_srcdir, info->nam= e); =20 if (info->mode =3D=3D 0) result =3D testCompareParseXML(cfg, xml, info->replaceVars); else result =3D testCompareFormatXML(cfg, xml, info->replaceVars); =20 - cleanup: VIR_FREE(xml); VIR_FREE(cfg); =20 diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c index b67b14ea9d..55fcd95081 100644 --- a/tests/xmconfigtest.c +++ b/tests/xmconfigtest.c @@ -131,18 +131,14 @@ testCompareHelper(const void *data) char *cfg =3D NULL; char *cfgout =3D NULL; =20 - if (virAsprintf(&xml, "%s/xmconfigdata/test-%s.xml", - abs_srcdir, info->name) < 0 || - virAsprintf(&cfg, "%s/xmconfigdata/test-%s.cfg", - abs_srcdir, info->name) < 0) - goto cleanup; + virAsprintf(&xml, "%s/xmconfigdata/test-%s.xml", abs_srcdir, info->nam= e); + virAsprintf(&cfg, "%s/xmconfigdata/test-%s.cfg", abs_srcdir, info->nam= e); =20 if (info->mode =3D=3D 0) result =3D testCompareParseXML(cfg, xml); else result =3D testCompareFormatXML(cfg, xml); =20 - cleanup: VIR_FREE(xml); VIR_FREE(cfg); VIR_FREE(cfgout); diff --git a/tests/xml2vmxtest.c b/tests/xml2vmxtest.c index 42ab4ed929..b39862b4bb 100644 --- a/tests/xml2vmxtest.c +++ b/tests/xml2vmxtest.c @@ -115,16 +115,13 @@ testCompareHelper(const void *data) char *xml =3D NULL; char *vmx =3D NULL; =20 - if (virAsprintf(&xml, "%s/xml2vmxdata/xml2vmx-%s.xml", abs_srcdir, - info->input) < 0 || - virAsprintf(&vmx, "%s/xml2vmxdata/xml2vmx-%s.vmx", abs_srcdir, - info->output) < 0) { - goto cleanup; - } + virAsprintf(&xml, "%s/xml2vmxdata/xml2vmx-%s.xml", abs_srcdir, + info->input); + virAsprintf(&vmx, "%s/xml2vmxdata/xml2vmx-%s.vmx", abs_srcdir, + info->output); =20 result =3D testCompareFiles(xml, vmx, info->virtualHW_version); =20 - cleanup: VIR_FREE(xml); VIR_FREE(vmx); =20 @@ -169,9 +166,8 @@ testFormatVMXFileName(const char *src, void *opaque G_G= NUC_UNUSED) directoryAndFileName +=3D strspn(directoryAndFileName, " "); } =20 - if (virAsprintf(&absolutePath, "/vmfs/volumes/%s/%s", datastoreNam= e, - directoryAndFileName) < 0) - goto cleanup; + virAsprintf(&absolutePath, "/vmfs/volumes/%s/%s", datastoreName, + directoryAndFileName); } else if (STRPREFIX(src, "/")) { /* Found absolute path */ absolutePath =3D g_strdup(src); --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752783; cv=none; d=zoho.com; s=zohoarc; b=UhjeeorRayejas31TyYfLHILTAxgWRlIhTSSRyYYOq79fGqwbFBop1UJwGcrz9inJ1PLYSpVnVPLUfxhf/JzqSpuQeYCwh7TOBqNfeH4EGV+5YbAOzagF/FvhMtiPRvhkUAJSUwhGx9YHR4PSVHUUXqONluTFR7MVneTGK9wPzQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752783; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Rfnqb0N5IJ2zErPvXE6aavh5getNk4kvDygaCh0RYwo=; b=LOpuDHHHbC6Fpj1vxHR7TxaZVbdrdMrIyGc4W9kNLBcCqTs0twTGvbGWrQ8MqemDkShwPCfRXoH5tcm2mbnjCD7RskMjCud5sMfCjYc4TsoN4fqwiAskyWy4xD1JH3CU3RsyRosYhqWIi+InwfIaELO4N//QiNIQHVBLmusuRvE= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1571752783374317.9718554358657; Tue, 22 Oct 2019 06:59:43 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-208-cCZKZMdnMjaPYJxUGRM46g-1; Tue, 22 Oct 2019 09:59:40 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BE33D1005526; Tue, 22 Oct 2019 13:59:35 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 96F7B5D6A9; Tue, 22 Oct 2019 13:59:35 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 556D11803B50; Tue, 22 Oct 2019 13:59:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9MDxWiC002101 for ; Tue, 22 Oct 2019 09:59:32 -0400 Received: by smtp.corp.redhat.com (Postfix) id 48D056012E; Tue, 22 Oct 2019 13:59:32 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id C55A0601AC for ; Tue, 22 Oct 2019 13:59:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752782; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Rfnqb0N5IJ2zErPvXE6aavh5getNk4kvDygaCh0RYwo=; b=jOYoQrtRu6+uYFK8VBdaGGA7iXbBOA24csOtV7keLLv7GHfd0MbcVK4152sjL8kfd2U99p NUtIHvPDPNJKNm+ouesR+r9+IxynoGRVsM8TKjVz+fqivYpgXG/CMTEn0X5tLoPgpl8tca khQRBX3zo9pbIiQ1eo9gCMQVdDWd0RY= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:36 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 32/75] tools: Drop virAsprintf() and virAsprintfQuiet() retval checking X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: cCZKZMdnMjaPYJxUGRM46g-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" These functions can't fail really. Drop checking of their retval then. Signed-off-by: Michal Privoznik --- tools/virsh-completer-domain.c | 7 +++---- tools/virsh-completer-host.c | 13 +++++------- tools/virsh-completer.c | 6 +++--- tools/virsh-domain-monitor.c | 21 +++++++++---------- tools/virsh-domain.c | 34 ++++++++++--------------------- tools/virsh-host.c | 3 +-- tools/virsh-interface.c | 11 +++++----- tools/virsh-network.c | 3 +-- tools/virsh-pool.c | 15 ++++++-------- tools/virsh-volume.c | 9 +++------ tools/virt-admin.c | 6 ++---- tools/vsh.c | 37 +++++++++++----------------------- 12 files changed, 62 insertions(+), 103 deletions(-) diff --git a/tools/virsh-completer-domain.c b/tools/virsh-completer-domain.c index 6bfa3ab58c..0bf6202c0a 100644 --- a/tools/virsh-completer-domain.c +++ b/tools/virsh-completer-domain.c @@ -221,10 +221,9 @@ virshDomainInterfaceStateCompleter(vshControl *ctl, if (virMacAddrParse(iface, &macaddr) =3D=3D 0) virMacAddrFormat(&macaddr, macstr); =20 - if (virAsprintf(&xpath, "/domain/devices/interface[(mac/@address =3D '= %s') or " - " (target/@dev =3D '%= s')]", - macstr, iface) < 0) - return NULL; + virAsprintf(&xpath, "/domain/devices/interface[(mac/@address =3D '%s')= or " + " (target/@dev =3D '%s')]", macst= r, + iface); =20 if ((ninterfaces =3D virXPathNodeSet(xpath, ctxt, &interfaces)) < 0) return NULL; diff --git a/tools/virsh-completer-host.c b/tools/virsh-completer-host.c index 42e59a6656..8cb98ad88d 100644 --- a/tools/virsh-completer-host.c +++ b/tools/virsh-completer-host.c @@ -44,8 +44,7 @@ virshPagesizeNodeToString(xmlNodePtr node) if (virScaleInteger(&byteval, unit, 1024, UINT_MAX) < 0) return NULL; size =3D vshPrettyCapacity(byteval, &suffix); - if (virAsprintf(&ret, "%.0f%s", size, suffix) < 0) - return NULL; + virAsprintf(&ret, "%.0f%s", size, suffix); return ret; } =20 @@ -79,13 +78,11 @@ virshAllocpagesPagesizeCompleter(vshControl *ctl, return NULL; =20 if (cellno && vshCommandOptStringQuiet(ctl, cmd, "cellno", &cellnum) >= 0) { - if (virAsprintf(&path, - "/capabilities/host/topology/cells/cell[@id=3D\"%s= \"]/pages", - cellnum) < 0) - return NULL; + virAsprintf(&path, + "/capabilities/host/topology/cells/cell[@id=3D\"%s\"]/= pages", + cellnum); } else { - if (virAsprintf(&path, "/capabilities/host/cpu/pages") < 0) - return NULL; + virAsprintf(&path, "/capabilities/host/cpu/pages"); } =20 npages =3D virXPathNodeSet(path, ctxt, &pages); diff --git a/tools/virsh-completer.c b/tools/virsh-completer.c index 7e4bd895e5..8bd7be888f 100644 --- a/tools/virsh-completer.c +++ b/tools/virsh-completer.c @@ -118,9 +118,9 @@ virshCommaStringListComplete(const char *input, if (virStringListHasString((const char **)inputList, options[i])) continue; =20 - if (inputCopy && virAsprintf(&ret[nret], "%s,%s", inputCopy, optio= ns[i]) < 0) - return NULL; - if (!inputCopy) + if (inputCopy) + virAsprintf(&ret[nret], "%s,%s", inputCopy, options[i]); + else ret[nret] =3D g_strdup(options[i]); =20 nret++; diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index bfff08b0f6..9178e534d6 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -431,10 +431,9 @@ cmdDomblkinfoGet(const virDomainBlockInfo *info, *alloc =3D g_strdup("-"); *phy =3D g_strdup("-"); } else if (!human) { - if (virAsprintf(cap, "%llu", info->capacity) < 0 || - virAsprintf(alloc, "%llu", info->allocation) < 0 || - virAsprintf(phy, "%llu", info->physical) < 0) - return false; + virAsprintf(cap, "%llu", info->capacity); + virAsprintf(alloc, "%llu", info->allocation); + virAsprintf(phy, "%llu", info->physical); } else { double val_cap, val_alloc, val_phy; const char *unit_cap, *unit_alloc, *unit_phy; @@ -443,10 +442,9 @@ cmdDomblkinfoGet(const virDomainBlockInfo *info, val_alloc =3D vshPrettyCapacity(info->allocation, &unit_alloc); val_phy =3D vshPrettyCapacity(info->physical, &unit_phy); =20 - if (virAsprintf(cap, "%.3lf %s", val_cap, unit_cap) < 0 || - virAsprintf(alloc, "%.3lf %s", val_alloc, unit_alloc) < 0 || - virAsprintf(phy, "%.3lf %s", val_phy, unit_phy) < 0) - return false; + virAsprintf(cap, "%.3lf %s", val_cap, unit_cap); + virAsprintf(alloc, "%.3lf %s", val_alloc, unit_alloc); + virAsprintf(phy, "%.3lf %s", val_phy, unit_phy); } =20 return true; @@ -828,10 +826,9 @@ cmdDomIfGetLink(vshControl *ctl, const vshCmd *cmd) if (virMacAddrParse(iface, &macaddr) =3D=3D 0) virMacAddrFormat(&macaddr, macstr); =20 - if (virAsprintf(&xpath, "/domain/devices/interface[(mac/@address =3D '= %s') or " - " (target/@dev =3D '%= s')]", - macstr, iface) < 0) - goto cleanup; + virAsprintf(&xpath, "/domain/devices/interface[(mac/@address =3D '%s')= or " + " (target/@dev =3D '%s')]", macst= r, + iface); =20 if ((ninterfaces =3D virXPathNodeSet(xpath, ctxt, &interfaces)) < 0) { vshError(ctl, _("Failed to extract interface information")); diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 2f3ac2d430..7a03c1fb6e 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -5535,11 +5535,8 @@ virshGenFileName(vshControl *ctl, virDomainPtr dom, = const char *mime) localtime_r(&cur_time, &time_info); strftime(timestr, sizeof(timestr), "%Y-%m-%d-%H:%M:%S", &time_info); =20 - if (virAsprintf(&ret, "%s-%s%s", virDomainGetName(dom), - timestr, NULLSTR_EMPTY(ext)) < 0) { - vshError(ctl, "%s", _("Out of memory")); - return NULL; - } + virAsprintf(&ret, "%s-%s%s", virDomainGetName(dom), timestr, + NULLSTR_EMPTY(ext)); =20 return ret; } @@ -6969,8 +6966,7 @@ virshVcpuPinQuery(vshControl *ctl, cpumaplen))) goto cleanup; =20 - if (virAsprintf(&vcpuStr, "%zu", i) < 0) - goto cleanup; + virAsprintf(&vcpuStr, "%zu", i); =20 if (vshTableRowAppend(table, vcpuStr, pinInfo, NULL) < 0) goto cleanup; @@ -7586,8 +7582,7 @@ cmdIOThreadInfo(vshControl *ctl, const vshCmd *cmd) g_autofree char *pinInfo =3D NULL; g_autofree char *iothreadIdStr =3D NULL; =20 - if (virAsprintf(&iothreadIdStr, "%u", info[i]->iothread_id) < 0) - goto cleanup; + virAsprintf(&iothreadIdStr, "%u", info[i]->iothread_id); =20 ignore_value(pinInfo =3D virBitmapDataFormat(info[i]->cpumap, info= [i]->cpumaplen)); =20 @@ -11391,8 +11386,7 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) =20 /* Create our XPATH lookup for the current display's port */ VIR_FREE(xpath); - if (virAsprintf(&xpath, xpath_fmt, scheme[iter], "@port") < 0) - goto cleanup; + virAsprintf(&xpath, xpath_fmt, scheme[iter], "@port"); =20 /* Attempt to get the port number for the current graphics scheme = */ tmp =3D virXPathInt(xpath, ctxt, &port); @@ -11405,8 +11399,7 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) =20 /* Create our XPATH lookup for TLS Port (automatically skipped * for unsupported schemes */ - if (virAsprintf(&xpath, xpath_fmt, scheme[iter], "@tlsPort") < 0) - goto cleanup; + virAsprintf(&xpath, xpath_fmt, scheme[iter], "@tlsPort"); =20 /* Attempt to get the TLS port number */ tmp =3D virXPathInt(xpath, ctxt, &tls_port); @@ -11415,8 +11408,7 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) tls_port =3D 0; =20 /* Create our XPATH lookup for the current display's address */ - if (virAsprintf(&xpath, xpath_fmt, scheme[iter], "@listen") < 0) - goto cleanup; + virAsprintf(&xpath, xpath_fmt, scheme[iter], "@listen"); =20 /* Attempt to get the listening addr if set for the current * graphics scheme */ @@ -11425,8 +11417,7 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) VIR_FREE(xpath); =20 /* Create our XPATH lookup for the current spice type. */ - if (virAsprintf(&xpath, xpath_fmt, scheme[iter], "listen/@type") <= 0) - goto cleanup; + virAsprintf(&xpath, xpath_fmt, scheme[iter], "listen/@type"); =20 /* Attempt to get the type of spice connection */ VIR_FREE(type_conn); @@ -11435,8 +11426,7 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) =20 if (STREQ_NULLABLE(type_conn, "socket")) { if (!sockpath) { - if (virAsprintf(&xpath, xpath_fmt, scheme[iter], "listen/@= socket") < 0) - goto cleanup; + virAsprintf(&xpath, xpath_fmt, scheme[iter], "listen/@sock= et"); =20 sockpath =3D virXPathString(xpath, ctxt); =20 @@ -11456,8 +11446,7 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) * subelement (which, by the way, doesn't exist on libvirt * < 0.9.4, so we really do need to check both places) */ - if (virAsprintf(&xpath, xpath_fmt, scheme[iter], "listen/@addr= ess") < 0) - goto cleanup; + virAsprintf(&xpath, xpath_fmt, scheme[iter], "listen/@address"= ); =20 listen_addr =3D virXPathString(xpath, ctxt); VIR_FREE(xpath); @@ -11493,8 +11482,7 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) * care of when getting the XML */ =20 /* Create our XPATH lookup for the password */ - if (virAsprintf(&xpath, xpath_fmt, scheme[iter], "@passwd") < 0) - goto cleanup; + virAsprintf(&xpath, xpath_fmt, scheme[iter], "@passwd"); =20 /* Attempt to get the password */ VIR_FREE(passwd); diff --git a/tools/virsh-host.c b/tools/virsh-host.c index 9ecbdb5af6..fe172d2c29 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -1140,8 +1140,7 @@ vshExtractCPUDefXMLs(vshControl *ctl, else doc =3D buffer; =20 - if (virAsprintf(&xmlStr, "%s", doc) < 0) - goto error; + virAsprintf(&xmlStr, "%s", doc); =20 if (!(xml =3D virXMLParseStringCtxt(xmlStr, xmlFile, &ctxt))) goto error; diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c index b83e385d00..fbeb40fc6a 100644 --- a/tools/virsh-interface.c +++ b/tools/virsh-interface.c @@ -893,11 +893,12 @@ cmdInterfaceBridge(vshControl *ctl, const vshCmd *cmd) goto cleanup; } =20 - if (stp && - ((virAsprintf(&delay_str, "%d", delay) < 0) || - !xmlSetProp(br_node, BAD_CAST "delay", BAD_CAST delay_str))) { - vshError(ctl, _("Failed to set bridge delay %d in xml document"), = delay); - goto cleanup; + if (stp) { + virAsprintf(&delay_str, "%d", delay); + if (!xmlSetProp(br_node, BAD_CAST "delay", BAD_CAST delay_str)) { + vshError(ctl, _("Failed to set bridge delay %d in xml document= "), delay); + goto cleanup; + } } =20 /* Change the type of the outer/master interface to "bridge" and the diff --git a/tools/virsh-network.c b/tools/virsh-network.c index 64b733adcc..662ca00e1c 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -1447,8 +1447,7 @@ cmdNetworkDHCPLeases(vshControl *ctl, const vshCmd *c= md) else if (lease->type =3D=3D VIR_IP_ADDR_TYPE_IPV6) typestr =3D "ipv6"; =20 - ignore_value(virAsprintf(&cidr_format, "%s/%d", - lease->ipaddr, lease->prefix)); + virAsprintf(&cidr_format, "%s/%d", lease->ipaddr, lease->prefix); =20 if (vshTableRowAppend(table, expirytime, diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c index bd876aefda..5138a5946c 100644 --- a/tools/virsh-pool.c +++ b/tools/virsh-pool.c @@ -1286,19 +1286,16 @@ cmdPoolList(vshControl *ctl, const vshCmd *cmd G_GN= UC_UNUSED) const char *unit; =20 val =3D vshPrettyCapacity(info.capacity, &unit); - if (virAsprintf(&poolInfoTexts[i].capacity, - "%.2lf %s", val, unit) < 0) - goto cleanup; + virAsprintf(&poolInfoTexts[i].capacity, "%.2lf %s", va= l, + unit); =20 val =3D vshPrettyCapacity(info.allocation, &unit); - if (virAsprintf(&poolInfoTexts[i].allocation, - "%.2lf %s", val, unit) < 0) - goto cleanup; + virAsprintf(&poolInfoTexts[i].allocation, "%.2lf %s", = val, + unit); =20 val =3D vshPrettyCapacity(info.available, &unit); - if (virAsprintf(&poolInfoTexts[i].available, - "%.2lf %s", val, unit) < 0) - goto cleanup; + virAsprintf(&poolInfoTexts[i].available, "%.2lf %s", v= al, + unit); } else { /* Capacity related information isn't available */ poolInfoTexts[i].capacity =3D g_strdup(_("-")); diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index d09d4435ad..bd57fd695d 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -1430,14 +1430,11 @@ cmdVolList(vshControl *ctl, const vshCmd *cmd G_GNU= C_UNUSED) volInfoTexts[i].type =3D g_strdup(virshVolumeTypeToString(= volumeInfo.type)); =20 val =3D vshPrettyCapacity(volumeInfo.capacity, &unit); - if (virAsprintf(&volInfoTexts[i].capacity, - "%.2lf %s", val, unit) < 0) - goto cleanup; + virAsprintf(&volInfoTexts[i].capacity, "%.2lf %s", val, un= it); =20 val =3D vshPrettyCapacity(volumeInfo.allocation, &unit); - if (virAsprintf(&volInfoTexts[i].allocation, - "%.2lf %s", val, unit) < 0) - goto cleanup; + virAsprintf(&volInfoTexts[i].allocation, "%.2lf %s", val, + unit); } } } diff --git a/tools/virt-admin.c b/tools/virt-admin.c index f3ae011cf4..da28d760db 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -394,8 +394,7 @@ cmdSrvList(vshControl *ctl, const vshCmd *cmd G_GNUC_UN= USED) =20 for (i =3D 0; i < nsrvs; i++) { g_autofree char *idStr =3D NULL; - if (virAsprintf(&idStr, "%zu", i) < 0) - goto cleanup; + virAsprintf(&idStr, "%zu", i); =20 if (vshTableRowAppend(table, idStr, @@ -656,8 +655,7 @@ cmdSrvClientsList(vshControl *ctl, const vshCmd *cmd) ×tr) < 0) goto cleanup; =20 - if (virAsprintf(&idStr, "%llu", id) < 0) - goto cleanup; + virAsprintf(&idStr, "%llu", id); if (vshTableRowAppend(table, idStr, vshAdmClientTransportToString(transport), timestr, NULL) < 0) diff --git a/tools/vsh.c b/tools/vsh.c index 3f8b7f2186..8cd613bbbd 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -1795,28 +1795,27 @@ vshCommandOptTimeoutToMs(vshControl *ctl, const vsh= Cmd *cmd, int *timeout) char * vshGetTypedParamValue(vshControl *ctl, virTypedParameterPtr item) { - int ret =3D 0; char *str =3D NULL; =20 switch (item->type) { case VIR_TYPED_PARAM_INT: - ret =3D virAsprintf(&str, "%d", item->value.i); + virAsprintf(&str, "%d", item->value.i); break; =20 case VIR_TYPED_PARAM_UINT: - ret =3D virAsprintf(&str, "%u", item->value.ui); + virAsprintf(&str, "%u", item->value.ui); break; =20 case VIR_TYPED_PARAM_LLONG: - ret =3D virAsprintf(&str, "%lld", item->value.l); + virAsprintf(&str, "%lld", item->value.l); break; =20 case VIR_TYPED_PARAM_ULLONG: - ret =3D virAsprintf(&str, "%llu", item->value.ul); + virAsprintf(&str, "%llu", item->value.ul); break; =20 case VIR_TYPED_PARAM_DOUBLE: - ret =3D virAsprintf(&str, "%f", item->value.d); + virAsprintf(&str, "%f", item->value.d); break; =20 case VIR_TYPED_PARAM_BOOLEAN: @@ -1831,7 +1830,7 @@ vshGetTypedParamValue(vshControl *ctl, virTypedParame= terPtr item) vshError(ctl, _("unimplemented parameter type %d"), item->type); } =20 - if (ret < 0) { + if (!str) { vshError(ctl, "%s", _("Out of memory")); exit(EXIT_FAILURE); } @@ -2419,10 +2418,7 @@ vshEditWriteToTempFile(vshControl *ctl, const char *= doc) =20 tmpdir =3D getenv("TMPDIR"); if (!tmpdir) tmpdir =3D "/tmp"; - if (virAsprintf(&ret, "%s/virshXXXXXX.xml", tmpdir) < 0) { - vshError(ctl, "%s", _("out of memory")); - return NULL; - } + virAsprintf(&ret, "%s/virshXXXXXX.xml", tmpdir); fd =3D mkostemps(ret, 4, O_CLOEXEC); if (fd =3D=3D -1) { vshError(ctl, _("mkostemps: failed to create temporary file: %s"), @@ -2940,8 +2936,7 @@ vshReadlineInit(vshControl *ctl) rl_completer_quote_characters =3D quote_characters; rl_char_is_quoted_p =3D vshReadlineCharIsQuoted; =20 - if (virAsprintf(&histsize_env, "%s_HISTSIZE", ctl->env_prefix) < 0) - goto cleanup; + virAsprintf(&histsize_env, "%s_HISTSIZE", ctl->env_prefix); =20 /* Limit the total size of the history buffer */ if ((histsize_str =3D getenv(histsize_env))) { @@ -2967,15 +2962,9 @@ vshReadlineInit(vshControl *ctl) goto cleanup; } =20 - if (virAsprintf(&ctl->historydir, "%s/%s", userdir, ctl->name) < 0) { - vshError(ctl, "%s", _("Out of memory")); - goto cleanup; - } + virAsprintf(&ctl->historydir, "%s/%s", userdir, ctl->name); =20 - if (virAsprintf(&ctl->historyfile, "%s/history", ctl->historydir) < 0)= { - vshError(ctl, "%s", _("Out of memory")); - goto cleanup; - } + virAsprintf(&ctl->historyfile, "%s/history", ctl->historydir); =20 read_history(ctl->historyfile); ret =3D 0; @@ -3057,8 +3046,7 @@ vshInitDebug(vshControl *ctl) char *env =3D NULL; =20 if (ctl->debug =3D=3D VSH_DEBUG_DEFAULT) { - if (virAsprintf(&env, "%s_DEBUG", ctl->env_prefix) < 0) - return -1; + virAsprintf(&env, "%s_DEBUG", ctl->env_prefix); =20 /* log level not set from commandline, check env variable */ debugEnv =3D getenv(env); @@ -3076,8 +3064,7 @@ vshInitDebug(vshControl *ctl) } =20 if (ctl->logfile =3D=3D NULL) { - if (virAsprintf(&env, "%s_LOG_FILE", ctl->env_prefix) < 0) - return -1; + virAsprintf(&env, "%s_LOG_FILE", ctl->env_prefix); =20 /* log file not set from cmdline */ debugEnv =3D getenv(env); --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752790; cv=none; d=zoho.com; s=zohoarc; b=HVBkPzEwhW5xywfPlUHPGDpulGLzpWWfoAoaIJdZTbO3K0dwv9Lj/vl3BihfVn7JtciVRInovisgr9Pz4f/TL90phPG8m+EfBSNx2P41F0NXXcWbQUz7icp70p8GI0XQkvhsR2+O04aP2Qr4honpUekTVOIFySHeCJDWC9/UR8U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752790; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=AwkHS8TQHJpOXlYGum9nq1ceP+jbq8M+W76GoQ5XZBc=; b=Lf6HqEt5h/QlajhHqUZEKMZzSN86g4or3tURxGemfUWFBmHTMAbWHpQ4im9Q1FHUAy5l+CXejPw5uqA8kazduANMS71XlZ830oJKbMcQik+TOVu3ZVBSVhE1usASa3Zi5ALpNrB5rHLlT4FG7OdIviLDg4ipZ43B3kWkWOTsDRI= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 15717527905561001.7104222571501; Tue, 22 Oct 2019 06:59:50 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-293-oaMdDpYSPD2QR0ms8CYx9A-1; Tue, 22 Oct 2019 09:59:47 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C2F6880183E; Tue, 22 Oct 2019 13:59:42 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9B6AE10027B8; Tue, 22 Oct 2019 13:59:42 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 5A4393FB5C; Tue, 22 Oct 2019 13:59:42 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9MDxfAG002193 for ; Tue, 22 Oct 2019 09:59:41 -0400 Received: by smtp.corp.redhat.com (Postfix) id BDFDA6012C; Tue, 22 Oct 2019 13:59:41 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 460686017E for ; Tue, 22 Oct 2019 13:59:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752789; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=AwkHS8TQHJpOXlYGum9nq1ceP+jbq8M+W76GoQ5XZBc=; b=UTYW+BCojBpFBM++fbiw5BKf3suY3TJr6+AFoBdvJi5vR3DK+bfhHis+xsMcZAgOOHX+8s ee/eZwtVVnHr4d/8c3XODTu9f0WAvMzP2sguABxwdNeYoO3zR7zUXAuq4arSeC8+KHWW8Y UPvksck2I1G8Y8YYynQpO0wlpQ3X/i0= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:37 +0200 Message-Id: <1f3f2c3339f9959013ea19515a750b40e7c6390d.1571752582.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 33/75] Drop virAsprintf() and virAsprintfQuiet() retval checking X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: oaMdDpYSPD2QR0ms8CYx9A-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" These functions can't fail really. Drop checking of their retval then. Signed-off-by: Michal Privoznik --- src/driver.c | 6 ++---- src/libvirt-admin.c | 12 +++++------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/driver.c b/src/driver.c index 125cf02890..89851cb629 100644 --- a/src/driver.c +++ b/src/driver.c @@ -90,8 +90,7 @@ virDriverShouldAutostart(const char *dir, =20 *autostart =3D false; =20 - if (virAsprintf(&path, "%s/autostarted", dir) < 0) - return -1; + virAsprintf(&path, "%s/autostarted", dir); =20 if (virFileExists(path)) { VIR_DEBUG("Autostart file %s exists, skipping autostart", path); @@ -152,8 +151,7 @@ virGetConnectGeneric(virThreadLocalPtr threadPtr, const= char *name) g_autofree char *uri =3D NULL; const char *uriPath =3D geteuid() =3D=3D 0 ? "/system" : "/session= "; =20 - if (virAsprintf(&uri, "%s://%s", name, uriPath) < 0) - return NULL; + virAsprintf(&uri, "%s://%s", name, uriPath); =20 conn =3D virConnectOpen(uri); VIR_DEBUG("Opened new %s connection %p", name, conn); diff --git a/src/libvirt-admin.c b/src/libvirt-admin.c index 9a18ea0f8b..7ff549bca4 100644 --- a/src/libvirt-admin.c +++ b/src/libvirt-admin.c @@ -141,18 +141,16 @@ getSocketPath(virURIPtr uri) if (legacy) { sockbase =3D g_strdup("libvirt-admin-sock"); } else { - if (virAsprintf(&sockbase, "%s-admin-sock", uri->scheme) < 0) - goto error; + virAsprintf(&sockbase, "%s-admin-sock", uri->scheme); } =20 if (STREQ_NULLABLE(uri->path, "/system")) { - if (virAsprintf(&sock_path, RUNSTATEDIR "/libvirt/%s", - sockbase) < 0) - goto error; + virAsprintf(&sock_path, RUNSTATEDIR "/libvirt/%s", sockbase); } else if (STREQ_NULLABLE(uri->path, "/session")) { - if (!rundir || virAsprintf(&sock_path, "%s/%s", rundir, - sockbase) < 0) + if (!rundir) goto error; + + virAsprintf(&sock_path, "%s/%s", rundir, sockbase); } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Invalid URI path '%s', try '/system'"), --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752795; cv=none; d=zoho.com; s=zohoarc; b=QmJDyABv6qSTJgIecGIusV0FlTbB1VPk5z7JKGbSp95EKTb8Hjxlt/JkdsLosDGmcRvum7Sq3AoWQHUnTQ+oDOKtE3AdLbbmypOYqnUXZ3zofVExmoTVxEErDrMYB/ARA/dnQo4phRgKpNoVfzWHvUHBrlTpXr/VJ4eKUz05Tao= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752795; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=gECWNlkZNCPvxl7fEp7eB32Ela4/hRhyL5hVgNzO3JY=; b=CTONLSIkM0BXvLexS+q2NoBXIz1qO/ve9/6dlTijpZh/BV+kYvHQzOLx6KUmlYeKBGgslRC20qAOekbp6UyLnRwK8ztrKrawe0rY3kVUkXYey5zIG6aSYhHzkHbYPWaZkaIGTKha+Z5XPBXc2s5WUr+dHkqZUC4GN/YHPBu/fGo= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 157175279525616.594721682285467; Tue, 22 Oct 2019 06:59:55 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-74-kSC5-HmYMCemou8irdBZfQ-1; Tue, 22 Oct 2019 09:59:52 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3D6851005525; Tue, 22 Oct 2019 13:59:46 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0F60560C63; Tue, 22 Oct 2019 13:59:46 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id BBC911803518; Tue, 22 Oct 2019 13:59:45 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9MDxi09002218 for ; Tue, 22 Oct 2019 09:59:44 -0400 Received: by smtp.corp.redhat.com (Postfix) id D302A60167; Tue, 22 Oct 2019 13:59:44 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3B8AD60166 for ; Tue, 22 Oct 2019 13:59:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752794; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=gECWNlkZNCPvxl7fEp7eB32Ela4/hRhyL5hVgNzO3JY=; b=H6ZbsLVoQf0jkdCRP71fLlps+7wMU6O1AECdqeqqXhm12607Mk+KjD6Jd+LlfJSPu4D/GB 3sXawJ3UWgD7qBxcuNp4TV1Nb8iLF+qbDC3CwRV7YLh0L1USXwCKjr1WnFj4be4hRZHcDp zYgPScGUEnwU+2BC/6qyn3hoFiFJ6LE= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:38 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 34/75] virstring: Make virAsprintf() return no value X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: kSC5-HmYMCemou8irdBZfQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Michal Privoznik --- src/util/virstring.c | 11 +++-------- src/util/virstring.h | 5 ++--- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/util/virstring.c b/src/util/virstring.c index 24a9e41493..91b237f358 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -746,23 +746,18 @@ virVasprintfInternal(char **strp, return ret; } =20 -int +void virAsprintfInternal(char **strp, const char *fmt, ...) { va_list ap; - char *str =3D NULL; - int ret; =20 va_start(ap, fmt); - ret =3D g_vasprintf(&str, fmt, ap); + g_vasprintf(strp, fmt, ap); va_end(ap); =20 - if (!*str) + if (!*strp) abort(); - *strp =3D str; - - return ret; } =20 /** diff --git a/src/util/virstring.h b/src/util/virstring.h index d7881be2d1..f595d0ad4c 100644 --- a/src/util/virstring.h +++ b/src/util/virstring.h @@ -133,9 +133,8 @@ int virStrdup(char **dest, const char *src) =20 int virStrndup(char **dest, const char *src, ssize_t n) G_GNUC_WARN_UNUSED_RESULT ATTRIBUTE_NONNULL(1); -int virAsprintfInternal(char **strp, const char *fmt, ...) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_PRINTF(2, 3) - G_GNUC_WARN_UNUSED_RESULT; +void virAsprintfInternal(char **strp, const char *fmt, ...) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_PRINTF(2, 3); int virVasprintfInternal(char **strp, const char *fmt, va_list list) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_PRINTF(2, 0) G_GNUC_WARN_UNUSED_RESULT; --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752799; cv=none; d=zoho.com; s=zohoarc; b=aA6D45GytXyckJXuGNbyAyDvCEL8nBauefNVgLx7Npwe6P2W+HG5q9Uh+HvkyQJywN73xbi/SPDYUjOBqcmPkCDNFTvxU+o2ePM5EdlcvWdIYlGqCJvnKxzuduPjTuKjZr3Xa2yvbH4PwZvuwmdhTluLlD2+R7ZAhZ8GzD8mmFI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752799; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=u1McgFfaHKZZFymmT9p/ipCtnsx06tlrPoWYTL73EIY=; b=ohikHPZHdC9SRCWnLLl4Kmtl4vCZG3ZkHHOclcR8Osr2qzUuL2ERK2eWyhjEq0apS1icZy66c+eymXg9kVZp67qRaek7PPTBw2mnVCf+nyshRch8U5J2hotHL2kzdc1e6JT1R93R0XK6FbQk1lJ9HQuSbGFAwtZvbQbXl90e/oQ= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1571752799007243.74046262525462; Tue, 22 Oct 2019 06:59:59 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-231-bsHL0nmpMMyXUbOLr9TK-A-1; Tue, 22 Oct 2019 09:59:55 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9FA1C1005528; Tue, 22 Oct 2019 13:59:50 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 745E25D6B0; Tue, 22 Oct 2019 13:59:50 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 2DC8C180BA9A; Tue, 22 Oct 2019 13:59:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9MDxmVX002267 for ; Tue, 22 Oct 2019 09:59:48 -0400 Received: by smtp.corp.redhat.com (Postfix) id 877996012E; Tue, 22 Oct 2019 13:59:48 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 100C66012C for ; Tue, 22 Oct 2019 13:59:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752797; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=u1McgFfaHKZZFymmT9p/ipCtnsx06tlrPoWYTL73EIY=; b=OSNURdfbRmPPquefZY+0tiMwiM6CY7g16MTIaP3lOQbezg6r7A6simc/xv3DI6XnLRB1lH FLO1UV1AAaBFY+oldDhtP6xyHbSpx/WEtsazr2BeKbx7EhMJAuZ7LbFuOkqxx4EyD8q8zX OfEHwm2OPzmd/udcEJs8zVwYggkV0Xg= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:39 +0200 Message-Id: <3eed978f60b2c329cce611e3985c018a4ae39d02.1571752582.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 35/75] Rename virAsprintfQuiet() to virAsprintf() X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: bsHL0nmpMMyXUbOLr9TK-A-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" There's no difference between virAsprintf() and virAsprintfQuiet(). Fix places where the latter is used to use the former. Signed-off-by: Michal Privoznik --- src/conf/domain_audit.c | 38 ++++++++--------- src/locking/lock_driver_sanlock.c | 2 +- src/security/virt-aa-helper.c | 27 ++++++------ src/util/virdevmapper.c | 6 +-- src/util/virerror.c | 2 +- src/util/viriptables.c | 4 +- src/util/virkmod.c | 2 +- src/util/virlog.c | 16 +++---- src/util/virprocess.c | 6 +-- tests/nssmock.c | 6 +-- tests/scsihosttest.c | 12 +++--- tests/vircgroupmock.c | 8 ++-- tests/virfilemock.c | 2 +- tests/virfilewrapper.c | 2 +- tests/virnetdevmock.c | 4 +- tests/virnumamock.c | 2 +- tests/virpcimock.c | 70 +++++++++++++++---------------- tests/virtestmock.c | 2 +- tests/virusbmock.c | 2 +- 19 files changed, 106 insertions(+), 107 deletions(-) diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c index 98b80e5bec..2a52e7dc7f 100644 --- a/src/conf/domain_audit.c +++ b/src/conf/domain_audit.c @@ -53,7 +53,7 @@ virDomainAuditGetRdev(const char *path) (S_ISCHR(sb.st_mode) || S_ISBLK(sb.st_mode))) { int maj =3D major(sb.st_rdev); int min =3D minor(sb.st_rdev); - virAsprintfQuiet(&ret, "%02X:%02X", maj, min); + virAsprintf(&ret, "%02X:%02X", maj, min); } return ret; } @@ -101,8 +101,8 @@ virDomainAuditGenericDev(virDomainObjPtr vm, if (!newsrcpath && !oldsrcpath) return; =20 - virAsprintfQuiet(&newdev, "new-%s", type); - virAsprintfQuiet(&olddev, "old-%s", type); + virAsprintf(&newdev, "new-%s", type); + virAsprintf(&olddev, "old-%s", type); =20 virUUIDFormat(vm->def->uuid, uuidstr); =20 @@ -373,15 +373,15 @@ virDomainAuditHostdev(virDomainObjPtr vm, virDomainHo= stdevDefPtr hostdev, case VIR_DOMAIN_HOSTDEV_MODE_SUBSYS: switch ((virDomainHostdevSubsysType) hostdev->source.subsys.type) { case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: - virAsprintfQuiet(&address, - VIR_PCI_DEVICE_ADDRESS_FMT, - pcisrc->addr.domain, - pcisrc->addr.bus, - pcisrc->addr.slot, - pcisrc->addr.function); + virAsprintf(&address, + VIR_PCI_DEVICE_ADDRESS_FMT, + pcisrc->addr.domain, + pcisrc->addr.bus, + pcisrc->addr.slot, + pcisrc->addr.function); break; case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: - virAsprintfQuiet(&address, "%.3d.%.3d", usbsrc->bus, usbsrc->d= evice); + virAsprintf(&address, "%.3d.%.3d", usbsrc->bus, usbsrc->device= ); break; case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI: { if (scsisrc->protocol =3D=3D @@ -393,10 +393,10 @@ virDomainAuditHostdev(virDomainObjPtr vm, virDomainHo= stdevDefPtr hostdev, } else { virDomainHostdevSubsysSCSIHostPtr scsihostsrc =3D &scsisrc->u.host; - virAsprintfQuiet(&address, "%s:%u:%u:%llu", - scsihostsrc->adapter, scsihostsrc->bus, - scsihostsrc->target, - scsihostsrc->unit); + virAsprintf(&address, "%s:%u:%u:%llu", + scsihostsrc->adapter, scsihostsrc->bus, + scsihostsrc->target, + scsihostsrc->unit); } break; } @@ -648,8 +648,8 @@ virDomainAuditCgroupMajor(virDomainObjPtr vm, virCgroup= Ptr cgroup, { char *extra; =20 - virAsprintfQuiet(&extra, "major category=3D%s maj=3D%02X acl=3D%s", - name, maj, perms); + virAsprintf(&extra, "major category=3D%s maj=3D%02X acl=3D%s", + name, maj, perms); =20 virDomainAuditCgroup(vm, cgroup, reason, extra, success); =20 @@ -688,8 +688,8 @@ virDomainAuditCgroupPath(virDomainObjPtr vm, virCgroupP= tr cgroup, goto cleanup; } =20 - virAsprintfQuiet(&extra, "path %s rdev=3D%s acl=3D%s", - detail, VIR_AUDIT_STR(rdev), perms); + virAsprintf(&extra, "path %s rdev=3D%s acl=3D%s", + detail, VIR_AUDIT_STR(rdev), perms); =20 virDomainAuditCgroup(vm, cgroup, reason, extra, rc =3D=3D 0); =20 @@ -926,7 +926,7 @@ virDomainAuditShmem(virDomainObjPtr vm, goto cleanup; } =20 - virAsprintfQuiet(&shmpath, "/dev/shm/%s", def->name); + virAsprintf(&shmpath, "/dev/shm/%s", def->name); =20 if (!virt) { VIR_WARN("Unexpected virt type %d while encoding audit message", diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sa= nlock.c index 0aee93c195..55f0a3621d 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -103,7 +103,7 @@ virLockManagerSanlockError(int err, #if HAVE_SANLOCK_STRERROR *message =3D g_strdup(sanlock_strerror(err)); #else - virAsprintfQuiet(message, _("sanlock error %d"), err); + virAsprintf(message, _("sanlock error %d"), err); #endif return true; } else { diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 3fe2da22ef..c2679cdad2 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -157,7 +157,7 @@ parserCommand(const char *profile_name, const char cmd) =20 snprintf(flag, 3, "-%c", cmd); =20 - virAsprintfQuiet(&profile, "%s/%s", APPARMOR_DIR "/libvirt", profile_n= ame); + virAsprintf(&profile, "%s/%s", APPARMOR_DIR "/libvirt", profile_name); =20 if (!virFileExists(profile)) { vah_error(NULL, 0, _("profile does not exist")); @@ -214,9 +214,9 @@ update_include_file(const char *include_file, const cha= r *included_files, } =20 if (append && virFileExists(include_file)) - virAsprintfQuiet(&pcontent, "%s%s", existing, included_files); + virAsprintf(&pcontent, "%s%s", existing, included_files); else - virAsprintfQuiet(&pcontent, "%s%s", warning, included_files); + virAsprintf(&pcontent, "%s%s", warning, included_files); =20 plen =3D strlen(pcontent); if (plen > MAX_FILE_LEN) { @@ -290,8 +290,7 @@ create_profile(const char *profile, const char *profile= _name, driver_name =3D virDomainVirtTypeToString(virtType); } =20 - virAsprintfQuiet(&template, "%s/TEMPLATE.%s", APPARMOR_DIR "/libvirt", - driver_name); + virAsprintf(&template, "%s/TEMPLATE.%s", APPARMOR_DIR "/libvirt", driv= er_name); =20 if (!virFileExists(template)) { vah_error(NULL, 0, _("template does not exist")); @@ -314,11 +313,11 @@ create_profile(const char *profile, const char *profi= le_name, } =20 /* '\nprofile \0' */ - virAsprintfQuiet(&replace_name, "\nprofile %s", profile_name); + virAsprintf(&replace_name, "\nprofile %s", profile_name); =20 /* '\n\n}\0' */ if (virtType !=3D VIR_DOMAIN_VIRT_LXC) - virAsprintfQuiet(&replace_files, "\n%s\n}", profile_files); + virAsprintf(&replace_files, "\n%s\n}", profile_files); =20 plen =3D tlen + strlen(replace_name) - strlen(template_name) + 1; =20 @@ -769,7 +768,7 @@ vah_add_path(virBufferPtr buf, const char *path, const = char *perms, bool recursi vah_error(NULL, 0, _("could not find realpath")); goto cleanup; } - virAsprintfQuiet(&tmp, "%s%s", pathreal, pathtmp); + virAsprintf(&tmp, "%s%s", pathreal, pathtmp); } =20 perms_new =3D g_strdup(perms); @@ -836,13 +835,13 @@ vah_add_file_chardev(virBufferPtr buf, =20 if (type =3D=3D VIR_DOMAIN_CHR_TYPE_PIPE) { /* add the pipe input */ - virAsprintfQuiet(&pipe_in, "%s.in", path); + virAsprintf(&pipe_in, "%s.in", path); =20 if (vah_add_file(buf, pipe_in, perms) !=3D 0) goto clean_pipe_in; =20 /* add the pipe output */ - virAsprintfQuiet(&pipe_out, "%s.out", path); + virAsprintf(&pipe_out, "%s.out", path); =20 if (vah_add_file(buf, pipe_out, perms) !=3D 0) goto clean_pipe_out; @@ -935,7 +934,7 @@ get_files(vahControl * ctl) =20 /* verify uuid is same as what we were given on the command line */ virUUIDFormat(ctl->def->uuid, uuidstr); - virAsprintfQuiet(&uuid, "%s%s", AA_PREFIX, uuidstr); + virAsprintf(&uuid, "%s%s", AA_PREFIX, uuidstr); =20 if (STRNEQ(uuid, ctl->uuid)) { vah_error(ctl, 0, _("given uuid does not match XML uuid")); @@ -1432,8 +1431,8 @@ main(int argc, char **argv) if (vahParseArgv(ctl, argc, argv) !=3D 0) vah_error(ctl, 1, _("could not parse arguments")); =20 - virAsprintfQuiet(&profile, "%s/%s", APPARMOR_DIR "/libvirt", ctl->uuid= ); - virAsprintfQuiet(&include_file, "%s/%s.files", APPARMOR_DIR "/libvirt"= , ctl->uuid); + virAsprintf(&profile, "%s/%s", APPARMOR_DIR "/libvirt", ctl->uuid); + virAsprintf(&include_file, "%s/%s.files", APPARMOR_DIR "/libvirt", ctl= ->uuid); =20 if (ctl->cmd =3D=3D 'a') { rc =3D parserLoad(ctl->uuid); @@ -1495,7 +1494,7 @@ main(int argc, char **argv) /* create the profile from TEMPLATE */ if (ctl->cmd =3D=3D 'c') { char *tmp =3D NULL; - virAsprintfQuiet(&tmp, " #include \n", ctl-= >uuid); + virAsprintf(&tmp, " #include \n", ctl->uuid= ); =20 if (ctl->dryrun) { vah_info(profile); diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c index 1c8f356387..4f29f74c77 100644 --- a/src/util/virdevmapper.c +++ b/src/util/virdevmapper.c @@ -127,9 +127,9 @@ virDevMapperGetTargetsImpl(const char *path, goto cleanup; =20 for (i =3D 0; i < deps->count; i++) { - virAsprintfQuiet(&devPaths[i], "/dev/block/%u:%u", - major(deps->device[i]), - minor(deps->device[i])); + virAsprintf(&devPaths[i], "/dev/block/%u:%u", + major(deps->device[i]), + minor(deps->device[i])); } =20 recursiveDevPaths =3D NULL; diff --git a/src/util/virerror.c b/src/util/virerror.c index c31103c3b7..ee0ec1cffc 100644 --- a/src/util/virerror.c +++ b/src/util/virerror.c @@ -1488,7 +1488,7 @@ virLastErrorPrefixMessage(const char *fmt, ...) if (virVasprintfQuiet(&fmtmsg, fmt, args) < 0) goto cleanup; =20 - virAsprintfQuiet(&newmsg, "%s: %s", fmtmsg, err->message); + virAsprintf(&newmsg, "%s: %s", fmtmsg, err->message); =20 VIR_FREE(err->message); err->message =3D g_steal_pointer(&newmsg); diff --git a/src/util/viriptables.c b/src/util/viriptables.c index e339368040..c8c4d98f30 100644 --- a/src/util/viriptables.c +++ b/src/util/viriptables.c @@ -918,10 +918,10 @@ iptablesForwardMasquerade(virFirewallPtr fw, if (addrStartStr && addrStartStr[0]) { if (addrEndStr && addrEndStr[0]) { virAsprintf(&natRangeStr, "%s-%s%s", addrStartStr, addrEndStr, - portRangeStr ? portRangeStr : ""); + portRangeStr ? portRangeStr : ""); } else { virAsprintf(&natRangeStr, "%s%s", addrStartStr, - portRangeStr ? portRangeStr : ""); + portRangeStr ? portRangeStr : ""); } =20 virFirewallRuleAddArgList(fw, rule, diff --git a/src/util/virkmod.c b/src/util/virkmod.c index 962b132d31..12e6e5676c 100644 --- a/src/util/virkmod.c +++ b/src/util/virkmod.c @@ -149,7 +149,7 @@ virKModIsBlacklisted(const char *module) g_autofree char *drvblklst =3D NULL; g_autofree char *outbuf =3D NULL; =20 - virAsprintfQuiet(&drvblklst, "blacklist %s\n", module); + virAsprintf(&drvblklst, "blacklist %s\n", module); =20 /* modprobe will convert all '-' into '_', so we need to as well */ for (i =3D 0; i < drvblklst[i]; i++) diff --git a/src/util/virlog.c b/src/util/virlog.c index bfb2430ed3..880539e5c0 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -453,13 +453,13 @@ virLogFormatString(char **msg, * to just grep for it to find the right place. */ if ((funcname !=3D NULL)) { - virAsprintfQuiet(msg, "%llu: %s : %s:%d : %s\n", - virThreadSelfID(), virLogPriorityString(priority), - funcname, linenr, str); + virAsprintf(msg, "%llu: %s : %s:%d : %s\n", + virThreadSelfID(), virLogPriorityString(priority), + funcname, linenr, str); } else { - virAsprintfQuiet(msg, "%llu: %s : %s\n", - virThreadSelfID(), virLogPriorityString(priority), - str); + virAsprintf(msg, "%llu: %s : %s\n", + virThreadSelfID(), virLogPriorityString(priority), + str); } } =20 @@ -481,7 +481,7 @@ virLogHostnameString(char **rawmsg, { char *hoststr; =20 - virAsprintfQuiet(&hoststr, "hostname: %s", virLogHostname); + virAsprintf(&hoststr, "hostname: %s", virLogHostname); =20 virLogFormatString(msg, 0, NULL, VIR_LOG_INFO, hoststr); *rawmsg =3D hoststr; @@ -689,7 +689,7 @@ virLogOutputToFd(virLogSourcePtr source G_GNUC_UNUSED, if (fd < 0) return; =20 - virAsprintfQuiet(&msg, "%s: %s", timestamp, str); + virAsprintf(&msg, "%s: %s", timestamp, str); ignore_value(safewrite(fd, msg, strlen(msg))); VIR_FREE(msg); } diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 032d09e904..107a0fb9c9 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -129,13 +129,13 @@ virProcessTranslateStatus(int status) { char *buf; if (WIFEXITED(status)) { - virAsprintfQuiet(&buf, _("exit status %d"), + virAsprintf(&buf, _("exit status %d"), WEXITSTATUS(status)); } else if (WIFSIGNALED(status)) { - virAsprintfQuiet(&buf, _("fatal signal %d"), + virAsprintf(&buf, _("fatal signal %d"), WTERMSIG(status)); } else { - virAsprintfQuiet(&buf, _("invalid value %d"), status); + virAsprintf(&buf, _("invalid value %d"), status); } return buf; } diff --git a/tests/nssmock.c b/tests/nssmock.c index be70a60790..8d707a64a5 100644 --- a/tests/nssmock.c +++ b/tests/nssmock.c @@ -55,9 +55,9 @@ getrealpath(char **newpath, const char *path) { if (STRPREFIX(path, LEASEDIR)) { - virAsprintfQuiet(newpath, "%s/nssdata/%s", - abs_srcdir, - path + strlen(LEASEDIR)); + virAsprintf(newpath, "%s/nssdata/%s", + abs_srcdir, + path + strlen(LEASEDIR)); } else { *newpath =3D g_strdup(path); } diff --git a/tests/scsihosttest.c b/tests/scsihosttest.c index f86c99df86..947a81560a 100644 --- a/tests/scsihosttest.c +++ b/tests/scsihosttest.c @@ -72,10 +72,10 @@ create_scsihost(const char *fakesysfsdir, const char *d= evicepath, int ret =3D -1; int fd =3D -1; =20 - virAsprintfQuiet(&unique_id_path, "%s/devices/pci0000:00/%s/unique_id", - fakesysfsdir, devicepath); - virAsprintfQuiet(&link_path, "%s/class/scsi_host/%s", - fakesysfsdir, hostname); + virAsprintf(&unique_id_path, "%s/devices/pci0000:00/%s/unique_id", + fakesysfsdir, devicepath); + virAsprintf(&link_path, "%s/class/scsi_host/%s", + fakesysfsdir, hostname); =20 /* Rather than create path & file, temporarily snip off the file to * create the path @@ -255,14 +255,14 @@ mymain(void) goto cleanup; } =20 - virAsprintfQuiet(&fakesysfsdir, "%s/sys", fakerootdir); + virAsprintf(&fakesysfsdir, "%s/sys", fakerootdir); =20 if (init_scsihost_sysfs(fakesysfsdir) < 0) { fprintf(stderr, "Failed to create fakesysfs=3D'%s'\n", fakesysfsdi= r); goto cleanup; } =20 - virAsprintfQuiet(&scsihost_class_path, "%s/class/scsi_host", fakesysfs= dir); + virAsprintf(&scsihost_class_path, "%s/class/scsi_host", fakesysfsdir); VIR_DEBUG("Reading from '%s'", scsihost_class_path); =20 if (virTestRun("testVirReadSCSIUniqueId", diff --git a/tests/vircgroupmock.c b/tests/vircgroupmock.c index 4c67b9ad4e..1735852f39 100644 --- a/tests/vircgroupmock.c +++ b/tests/vircgroupmock.c @@ -376,8 +376,8 @@ static void init_sysfs(void) =20 VIR_FREE(fakesysfscgroupdir); =20 - virAsprintfQuiet(&fakesysfscgroupdir, "%s%s", - fakerootdir, SYSFS_CGROUP_PREFIX); + virAsprintf(&fakesysfscgroupdir, "%s%s", + fakerootdir, SYSFS_CGROUP_PREFIX); =20 if (virFileMakePath(fakesysfscgroupdir) < 0) { fprintf(stderr, "Cannot create %s\n", fakesysfscgroupdir); @@ -458,8 +458,8 @@ FILE *fopen(const char *path, const char *mode) errno =3D EACCES; return NULL; } - virAsprintfQuiet(&filepath, "%s/vircgroupdata/%s.%s", - abs_srcdir, filename, type); + virAsprintf(&filepath, "%s/vircgroupdata/%s.%s", + abs_srcdir, filename, type); rc =3D real_fopen(filepath, mode); free(filepath); return rc; diff --git a/tests/virfilemock.c b/tests/virfilemock.c index e32d749d52..bb5fcc2ed8 100644 --- a/tests/virfilemock.c +++ b/tests/virfilemock.c @@ -188,7 +188,7 @@ canonicalize_file_name(const char *path) char *ret; =20 if ((p =3D STRSKIP(path, "/some/symlink"))) - virAsprintfQuiet(&ret, "/gluster%s", p); + virAsprintf(&ret, "/gluster%s", p); else ret =3D g_strdup(path); =20 diff --git a/tests/virfilewrapper.c b/tests/virfilewrapper.c index 765b3b31d9..e3d3c225ad 100644 --- a/tests/virfilewrapper.c +++ b/tests/virfilewrapper.c @@ -124,7 +124,7 @@ virMockStatRedirect(const char *path, char **newpath) if (!tmp) continue; =20 - virAsprintfQuiet(newpath, "%s%s", overrides[i], tmp); + virAsprintf(newpath, "%s%s", overrides[i], tmp); break; } =20 diff --git a/tests/virnetdevmock.c b/tests/virnetdevmock.c index 574a26af2d..8834b2ca6a 100644 --- a/tests/virnetdevmock.c +++ b/tests/virnetdevmock.c @@ -30,8 +30,8 @@ virNetDevSysfsFile(char **pf_sysfs_device_link, const char *ifname, const char *file) { - virAsprintfQuiet(pf_sysfs_device_link, "%s/%s/%s", - NET_DEV_TEST_DATA_PREFIX, ifname, file); + virAsprintf(pf_sysfs_device_link, "%s/%s/%s", + NET_DEV_TEST_DATA_PREFIX, ifname, file); return 0; } #else diff --git a/tests/virnumamock.c b/tests/virnumamock.c index faff8bb4a2..4a52483a7f 100644 --- a/tests/virnumamock.c +++ b/tests/virnumamock.c @@ -43,7 +43,7 @@ virNumaIsAvailable(void) if (numa_avail < 0) { char *sysfs_node_path =3D NULL; =20 - virAsprintfQuiet(&sysfs_node_path, "%s/node", SYSFS_SYSTEM_PATH); + virAsprintf(&sysfs_node_path, "%s/node", SYSFS_SYSTEM_PATH); =20 numa_avail =3D virFileExists(sysfs_node_path); =20 diff --git a/tests/virpcimock.c b/tests/virpcimock.c index a6bdad7a75..67107450e6 100644 --- a/tests/virpcimock.c +++ b/tests/virpcimock.c @@ -186,7 +186,7 @@ make_file(const char *path, if (value && len =3D=3D -1) len =3D strlen(value); =20 - virAsprintfQuiet(&filepath, "%s/%s", path, name); + virAsprintf(&filepath, "%s/%s", path, name); =20 if ((fd =3D real_open(filepath, O_CREAT|O_WRONLY, 0666)) < 0) ABORT("Unable to open: %s", filepath); @@ -203,7 +203,7 @@ make_dir(const char *path, { g_autofree char *dirpath =3D NULL; =20 - virAsprintfQuiet(&dirpath, "%s/%s", path, name); + virAsprintf(&dirpath, "%s/%s", path, name); =20 if (virFileMakePath(dirpath) < 0) ABORT("Unable to create: %s", dirpath); @@ -216,7 +216,7 @@ make_symlink(const char *path, { g_autofree char *filepath =3D NULL; =20 - virAsprintfQuiet(&filepath, "%s/%s", path, name); + virAsprintf(&filepath, "%s/%s", path, name); =20 if (symlink(target, filepath) < 0) ABORT("Unable to create symlink filepath -> target"); @@ -232,7 +232,7 @@ pci_read_file(const char *path, int fd =3D -1; g_autofree char *newpath =3D NULL; =20 - virAsprintfQuiet(&newpath, "%s/%s", fakerootdir, path); + virAsprintf(&newpath, "%s/%s", fakerootdir, path); =20 if ((fd =3D real_open(newpath, O_RDWR)) < 0) goto cleanup; @@ -269,13 +269,13 @@ getrealpath(char **newpath, init_env(); =20 if (STRPREFIX(path, SYSFS_PCI_PREFIX)) { - virAsprintfQuiet(newpath, "%s/sys/bus/pci/%s", - fakerootdir, - path + strlen(SYSFS_PCI_PREFIX)); + virAsprintf(newpath, "%s/sys/bus/pci/%s", + fakerootdir, + path + strlen(SYSFS_PCI_PREFIX)); } else if (pathPrefixIsMocked(path)) { - virAsprintfQuiet(newpath, "%s/%s", - fakerootdir, - path); + virAsprintf(newpath, "%s/%s", + fakerootdir, + path); } else { *newpath =3D g_strdup(path); } @@ -356,9 +356,9 @@ pci_address_format(struct pciDeviceAddress const *addr) { char *ret; =20 - virAsprintfQuiet(&ret, ADDR_STR_FMT, - addr->domain, addr->bus, - addr->device, addr->function); + virAsprintf(&ret, ADDR_STR_FMT, + addr->domain, addr->bus, + addr->device, addr->function); return ret; } =20 @@ -393,13 +393,13 @@ pci_device_get_path(const struct pciDevice *dev, * and then they are just symlinked to /sys/bus/pci/devices/ */ if (file) { - virAsprintfQuiet(&ret, "%s/sys/devices/pci%04x:%02x/%s/%s", - prefix, dev->addr.domain, dev->addr.bus, - devid, file); + virAsprintf(&ret, "%s/sys/devices/pci%04x:%02x/%s/%s", + prefix, dev->addr.domain, dev->addr.bus, + devid, file); } else { - virAsprintfQuiet(&ret, "%s/sys/devices/pci%04x:%02x/%s", - prefix, dev->addr.domain, dev->addr.bus, - devid); + virAsprintf(&ret, "%s/sys/devices/pci%04x:%02x/%s", + prefix, dev->addr.domain, dev->addr.bus, + devid); } =20 return ret; @@ -415,8 +415,8 @@ pci_device_create_iommu(const struct pciDevice *dev, char tmp[256]; size_t i; =20 - virAsprintfQuiet(&iommuPath, "%s/sys/kernel/iommu_groups/%d/devices/", - fakerootdir, dev->iommuGroup); + virAsprintf(&iommuPath, "%s/sys/kernel/iommu_groups/%d/devices/", + fakerootdir, dev->iommuGroup); =20 if (virFileMakePath(iommuPath) < 0) ABORT("Unable to create: %s", iommuPath); @@ -482,7 +482,7 @@ pci_device_new_from_stub(const struct pciDevice *data) if (VIR_ALLOC_QUIET(dev) < 0) ABORT_OOM(); =20 - virAsprintfQuiet(&configSrc, "%s/virpcitestdata/%s.config", abs_srcdir= , id); + virAsprintf(&configSrc, "%s/virpcitestdata/%s.config", abs_srcdir, id); =20 memcpy(dev, data, sizeof(*dev)); =20 @@ -544,7 +544,7 @@ pci_device_new_from_stub(const struct pciDevice *data) ABORT("@tmp overflow"); } =20 - virAsprintfQuiet(&devsympath, "%s" SYSFS_PCI_PREFIX "devices", fakeroo= tdir); + virAsprintf(&devsympath, "%s" SYSFS_PCI_PREFIX "devices", fakerootdir); =20 make_symlink(devsympath, devid, tmp); =20 @@ -625,9 +625,9 @@ pci_vfio_release_iommu(struct pciDevice *device) pciIommuGroups[i]->nDevicesBoundToVFIO--; =20 if (!pciIommuGroups[i]->nDevicesBoundToVFIO) { - virAsprintfQuiet(&vfiopath, "%s/dev/vfio/%d", - fakerootdir, - device->iommuGroup); + virAsprintf(&vfiopath, "%s/dev/vfio/%d", + fakerootdir, + device->iommuGroup); =20 if (unlink(vfiopath) < 0) return -1; @@ -651,9 +651,9 @@ pci_vfio_lock_iommu(struct pciDevice *device) continue; =20 if (pciIommuGroups[i]->nDevicesBoundToVFIO =3D=3D 0) { - virAsprintfQuiet(&vfiopath, "%s/dev/vfio/%d", - fakerootdir, - device->iommuGroup); + virAsprintf(&vfiopath, "%s/dev/vfio/%d", + fakerootdir, + device->iommuGroup); if ((fd =3D real_open(vfiopath, O_CREAT)) < 0) goto cleanup; =20 @@ -685,11 +685,11 @@ pci_driver_get_path(const struct pciDriver *driver, prefix =3D fakerootdir; =20 if (file) { - virAsprintfQuiet(&ret, "%s" SYSFS_PCI_PREFIX "drivers/%s/%s", - prefix, driver->name, file); + virAsprintf(&ret, "%s" SYSFS_PCI_PREFIX "drivers/%s/%s", + prefix, driver->name, file); } else { - virAsprintfQuiet(&ret, "%s" SYSFS_PCI_PREFIX "drivers/%s", - prefix, driver->name); + virAsprintf(&ret, "%s" SYSFS_PCI_PREFIX "drivers/%s", + prefix, driver->name); } =20 return ret; @@ -971,7 +971,7 @@ init_env(void) if (!(fakerootdir =3D getenv("LIBVIRT_FAKE_ROOT_DIR"))) ABORT("Missing LIBVIRT_FAKE_ROOT_DIR env variable\n"); =20 - virAsprintfQuiet(&tmp, "%s%s", fakerootdir, SYSFS_PCI_PREFIX); + virAsprintf(&tmp, "%s%s", fakerootdir, SYSFS_PCI_PREFIX); =20 if (virFileMakePath(tmp) < 0) ABORT("Unable to create: %s", tmp); @@ -982,7 +982,7 @@ init_env(void) =20 /* Create /dev/vfio/ dir and /dev/vfio/vfio file */ VIR_FREE(tmp); - virAsprintfQuiet(&tmp, "%s/dev/vfio", fakerootdir); + virAsprintf(&tmp, "%s/dev/vfio", fakerootdir); =20 if (virFileMakePath(tmp) < 0) ABORT("Unable to create: %s", tmp); diff --git a/tests/virtestmock.c b/tests/virtestmock.c index 7c10a045b3..116a6ad400 100644 --- a/tests/virtestmock.c +++ b/tests/virtestmock.c @@ -110,7 +110,7 @@ checkPath(const char *path, char *crippledPath =3D NULL; =20 if (path[0] !=3D '/') - virAsprintfQuiet(&relPath, "./%s", path); + virAsprintf(&relPath, "./%s", path); =20 /* Le sigh. virFileCanonicalizePath() expects @path to exist, otherwise * it will return an error. So if we are called over an non-existent diff --git a/tests/virusbmock.c b/tests/virusbmock.c index 7b7d24ac77..1b0beb81cb 100644 --- a/tests/virusbmock.c +++ b/tests/virusbmock.c @@ -54,7 +54,7 @@ static char *get_fake_path(const char *real_path) char *path =3D NULL; =20 if ((p =3D STRSKIP(real_path, USB_SYSFS))) - virAsprintfQuiet(&path, "%s/%s/%s", abs_srcdir, FAKE_USB_SYSFS, p); + virAsprintf(&path, "%s/%s/%s", abs_srcdir, FAKE_USB_SYSFS, p); else if (!p) path =3D g_strdup(real_path); =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752805; cv=none; d=zoho.com; s=zohoarc; b=IinFyNkZsqUPl60IUWK2PIwjZdy2yEiTVjGNpqJ21GF9vqDwxDRj9+LN2KHgJJJg3B/gDm06SG2QRU/aa/v8sHXAiDIXntHJG4vMwpE8BQO7SpoXOV0NJrvG94IsGj8KZN5kLXS3AEc8NihSB7dBkHdbaMHeJbV2z0zlRw7cZDU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752805; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UZncqj0xzz6YodXAKBSGSpcIWvxWDZQCQVDxjl+2iEc=; b=IFsFcrq0oE8tc3cmD4MoN+ob2619uugiSNK5pJiHaRDlnl//mt1lR0jtU0fBhnDmJJmaokW4x2pxVAyzdLWYHBSGa8uK8hxDumuND3xocS7HBLWBHAKWaUydJ7O/2QNQ2l5Z0oY0LJI5su6vn0pII8Pvk9LNgC/sWw4GAtq8w54= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1571752805523568.7267419151776; Tue, 22 Oct 2019 07:00:05 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-309-Le-PeWKtOhahraXPZ_mNIA-1; Tue, 22 Oct 2019 10:00:01 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A71EA5F3; Tue, 22 Oct 2019 13:59:56 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 81A2F60166; Tue, 22 Oct 2019 13:59:56 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 3BC973FB60; Tue, 22 Oct 2019 13:59:56 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9MDxsGK002305 for ; Tue, 22 Oct 2019 09:59:54 -0400 Received: by smtp.corp.redhat.com (Postfix) id AEA776012C; Tue, 22 Oct 2019 13:59:54 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 37B286012E for ; Tue, 22 Oct 2019 13:59:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752804; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=UZncqj0xzz6YodXAKBSGSpcIWvxWDZQCQVDxjl+2iEc=; b=ZT/mCcn5HO681Fg20hhzMLvt0FfsmoD/6SDxVMZLxRpWB+kgNrGvWTLeJw7OJ23amo7MJe AOKywdCCgnnucs4uafPnPiehjLL2w8phOEOAr7p/5KnwjdtLWrdlhWuWgf5elv4O+KOKzY cMoqI7jwiQqrdLX/4Umkb+BKKcQ5+RE= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:40 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 36/75] virstring: Drop virAsprintfQuiet() X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: Le-PeWKtOhahraXPZ_mNIA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" This macro is no longer used, Signed-off-by: Michal Privoznik --- src/util/virstring.h | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/util/virstring.h b/src/util/virstring.h index f595d0ad4c..318b64a136 100644 --- a/src/util/virstring.h +++ b/src/util/virstring.h @@ -240,18 +240,6 @@ size_t virStringListLength(const char * const *strings= ); =20 #define virAsprintf(strp, ...) virAsprintfInternal(strp, __VA_ARGS__) =20 -/** - * virAsprintfQuiet: - * @strp: variable to hold result (char **) - * @fmt: printf format - * - * Like glibc's asprintf but makes sure *strp =3D=3D NULL on failure. - * - * Returns number of bytes printed on success, aborts on OOM - */ - -#define virAsprintfQuiet(strp, ...) virAsprintf(strp, __VA_ARGS__) - int virStringSortCompare(const void *a, const void *b); int virStringSortRevCompare(const void *a, const void *b); int virStringToUpper(char **dst, const char *src); --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752837; cv=none; d=zoho.com; s=zohoarc; b=NV6odWBZUADxWC/bVyGnqr8OZ7njJgcpaDXEXGErh1GUiObbgIbauiuNqvAoLDH492Y+WsCE1gJyfXgTFrQLBTgLwxEqSmYPBFoI6YaYj8v653UpWGY9kw6lmLSegMfEu/8ANkCI8Yo/dc539my2ypYdrJVDLPdEPV/OtfnwC2k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752837; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=zFFKjEhrDiBHw9bdccT/1Wsx/dKpXWSQCCip+R2pEq4=; b=WewOkX05f2BZP08FDJxKvbrXRzDywoz67KEYS8u6fmXHwfFoX1DPZz9AATk1ooMhJiflYW56YIj3PCqKodJ3AFfpxnXhGQNyTWiuQLwXFGEH+pi6aSWqsQB4r8srmberoxZhfJU0FPk5RgxItQkCL21dMd8THiI+NZropyfzxQg= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1571752837901686.7393601314628; Tue, 22 Oct 2019 07:00:37 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-23-uwP9ojwpMGiBwN1MzbwdEQ-1; Tue, 22 Oct 2019 10:00:34 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 85BBA5ED; Tue, 22 Oct 2019 14:00:29 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4CD0360C5E; Tue, 22 Oct 2019 14:00:29 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id D2DAD1803B56; Tue, 22 Oct 2019 14:00:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9ME0RBW002472 for ; Tue, 22 Oct 2019 10:00:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id E3AA560167; Tue, 22 Oct 2019 14:00:27 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6873C6031D for ; Tue, 22 Oct 2019 13:59:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752836; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=zFFKjEhrDiBHw9bdccT/1Wsx/dKpXWSQCCip+R2pEq4=; b=QtF+8FZjBeqKn6DkkLD5AeMVJEqxi2gKaGibcZH4C2+TZqx2ztNw0sALxGCgPGOkL7Mcdp 28VZqGMSy6IDQaC0kprieonhD5yIrXcUsBmamm4dZf3jkGcIHa/3Ss8VCb6RqybjDeUcPi visNyhuOFIZTI9UI0DpUpTp1Iw/x/KM= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:41 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 37/75] access: Use g_strdup_printf() instead of virAsprintf() X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: uwP9ojwpMGiBwN1MzbwdEQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- src/access/viraccessdriverpolkit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/access/viraccessdriverpolkit.c b/src/access/viraccessdrive= rpolkit.c index 5d6c4204ff..1d6ff81391 100644 --- a/src/access/viraccessdriverpolkit.c +++ b/src/access/viraccessdriverpolkit.c @@ -59,8 +59,8 @@ virAccessDriverPolkitFormatAction(const char *typename, char *actionid =3D NULL; size_t i; =20 - virAsprintf(&actionid, "%s.%s.%s", VIR_ACCESS_DRIVER_POLKIT_ACTION_PRE= FIX, - typename, permname); + actionid =3D g_strdup_printf("%s.%s.%s", VIR_ACCESS_DRIVER_POLKIT_ACTI= ON_PREFIX, + typename, permname); =20 for (i =3D 0; actionid[i]; i++) if (actionid[i] =3D=3D '_') --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752847; cv=none; d=zoho.com; s=zohoarc; b=a+W9VS1b9MPTwdyPjRntJTqOm+L/nKAGlm72O56YIMYw1wPm/ODOviXfHzUmCs7l+P8JFUDB6g5+PeIIB1Q7S4znnAf6Ica4N78C/lFJMw3Cu09ixc9akTDkzEzeUOmVGm1KiODZXVFFTRHdFeN+f5pOhJjEGA7bb1OaNYuli14= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752847; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=uU1WtPolbfkW6A7dU3laIuaIJwAoJg7NzIoJrExLhUE=; b=anOFaC0DdteUQXE7/bXLv9ncF/24DhRwQ1YaKkPkijSLeAaNIgwaLxS+a0K/Om0OVKX8Ud5QNHkdq1svSVcjl5zFKV82Y2QYtVlBKczirQIWL1+meLUPY7Jfo/84iyM2r66sGz+7QGZfvoAVcxjH7rKlq6QtjC6vCfeF2qGxdeM= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1571752847782395.20074828447207; Tue, 22 Oct 2019 07:00:47 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-319-Cmi9NOCJOo-ihybTPJ39yA-1; Tue, 22 Oct 2019 10:00:43 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8C923107AD36; Tue, 22 Oct 2019 14:00:38 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4F6CF5DC18; Tue, 22 Oct 2019 14:00:38 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id CD5DC3FB4E; Tue, 22 Oct 2019 14:00:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9ME0bjA002523 for ; Tue, 22 Oct 2019 10:00:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1AB0A8E7F0; Tue, 22 Oct 2019 14:00:37 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2371660167 for ; Tue, 22 Oct 2019 14:00:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752846; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=uU1WtPolbfkW6A7dU3laIuaIJwAoJg7NzIoJrExLhUE=; b=PqLODdemFIRG30o6LnCKuSrnsSvijnOMbMOERT6uWG9Y0UjzT4BtqB9oz3jvq9WEwM8XPi lVAIu6FKlRqgTlXXA/nSUKFZ4fhCHdWwBE/Qtla8mBqReVJwBKZCeip8HjuteTJH/db61s s+zSak2AeJ/PtM5Q7rz3+PX7DXWhr2I= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:42 +0200 Message-Id: <283d67ea3203d5e13b1202545b67fe59b14fe9fb.1571752582.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 38/75] bhyve: Use g_strdup_printf() instead of virAsprintf() X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: Cmi9NOCJOo-ihybTPJ39yA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- src/bhyve/bhyve_capabilities.c | 4 ++-- src/bhyve/bhyve_process.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/bhyve/bhyve_capabilities.c b/src/bhyve/bhyve_capabilities.c index 2f03bd6131..a533692517 100644 --- a/src/bhyve/bhyve_capabilities.c +++ b/src/bhyve/bhyve_capabilities.c @@ -159,8 +159,8 @@ virBhyveDomainCapsBuild(bhyveConnPtr conn, firmwares_alloc, firmwares->nvalues, 1) < 0) goto cleanup; =20 - virAsprintf(&firmwares->values[firmwares->nvalues], "%s/%s", - firmware_dir, entry->d_name); + firmwares->values[firmwares->nvalues] =3D g_strdup_printf("%s/= %s", + firmwa= re_dir, entry->d_name); =20 firmwares->nvalues++; } diff --git a/src/bhyve/bhyve_process.c b/src/bhyve/bhyve_process.c index 17e32176d9..7e2631f6ea 100644 --- a/src/bhyve/bhyve_process.c +++ b/src/bhyve/bhyve_process.c @@ -89,7 +89,7 @@ bhyveNetCleanup(virDomainObjPtr vm) static void virBhyveFormatDevMapFile(const char *vm_name, char **fn_out) { - virAsprintf(fn_out, "%s/grub_bhyve-%s-device.map", BHYVE_STATE_DIR, vm= _name); + *fn_out, =3D g_strdup_printf("%s/grub_bhyve-%s-device.map", BHYVE_STAT= E_DIR, vm_name); } =20 int @@ -112,7 +112,7 @@ virBhyveProcessStart(virConnectPtr conn, int ret =3D -1, rc; virCapsPtr caps =3D NULL; =20 - virAsprintf(&logfile, "%s/%s.log", BHYVE_LOG_DIR, vm->def->name); + logfile =3D g_strdup_printf("%s/%s.log", BHYVE_LOG_DIR, vm->def->name); =20 caps =3D bhyveDriverGetCapabilities(privconn); if (!caps) @@ -403,7 +403,7 @@ virBhyveProcessReconnect(virDomainObjPtr vm, if (kp =3D=3D NULL || nprocs !=3D 1) goto cleanup; =20 - virAsprintf(&expected_proctitle, "bhyve: %s", vm->def->name); + expected_proctitle =3D g_strdup_printf("bhyve: %s", vm->def->name); =20 proc_argv =3D kvm_getargv(data->kd, kp, 0); if (proc_argv && proc_argv[0]) { --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752849; cv=none; d=zoho.com; s=zohoarc; b=Qv4XpYBczX6TEXiJ8NWZEGc0UYS3a1XbuV7JkpUnKhvIjBtanDD1zIRhkflDW4aPn1ymwd9P1PzG36qSwlzJOBH/KmYp7EqJis4E3fr80LArWx/M+4iVPADJdfAjdw1djamEOdLPE3KdGNidj61PtDmhg+YAbfvkMHoOQWPLuQc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752849; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=i4DWFeabi/STrQmLxI90wx1C/NwfIWAc6xaNs5q1pVo=; b=N4TLvr0p075116TJuyh0zV7Ae3g5IBtyj8SUUhKKXfBFITBAu+dkHpO/lmkz7XIkNMoJyze6lntIRaKp2zkPDuJ44nZEO/dj2B30IBlyNn7jJf6jxGLGEhhBhAYn+NSJec2zv03crxPMs3G68IUXgiaXYg33TV503TKbfILUmBA= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 157175284928565.7186178785646; Tue, 22 Oct 2019 07:00:49 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-4-lMj7-UbNN9yRIhVPmoX-Zg-1; Tue, 22 Oct 2019 10:00:46 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2D0662B7; Tue, 22 Oct 2019 14:00:41 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8C52E52C4; Tue, 22 Oct 2019 14:00:40 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 107F01803B4C; Tue, 22 Oct 2019 14:00:40 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9ME0btp002553 for ; Tue, 22 Oct 2019 10:00:38 -0400 Received: by smtp.corp.redhat.com (Postfix) id C64EB620D5; Tue, 22 Oct 2019 14:00:37 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 290F760466 for ; Tue, 22 Oct 2019 14:00:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752848; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=i4DWFeabi/STrQmLxI90wx1C/NwfIWAc6xaNs5q1pVo=; b=Y0EDTYYSmFvLk+PjbCBsqwrsUmIlbaMEnDOyX57345Eg/lk5AJyIy0DLzjF2HaVkh9hR9G 7hnwiP0zIrdzv7kw8adLntjmMBxXhhkj9IZ51WGzXXAlud5V94XY/JlvhMWz7pq0zXfVgr GaK2SIx2GTXR7kbgqiaDx/oGNKVm9eo= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:43 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 39/75] conf: Use g_strdup_printf() instead of virAsprintf() X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: lMj7-UbNN9yRIhVPmoX-Zg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Michal Privoznik --- src/conf/capabilities.c | 2 +- src/conf/domain_addr.c | 8 +++---- src/conf/domain_audit.c | 38 ++++++++++++++++---------------- src/conf/domain_conf.c | 30 ++++++++++++------------- src/conf/moment_conf.c | 2 +- src/conf/network_conf.c | 2 +- src/conf/node_device_util.c | 2 +- src/conf/snapshot_conf.c | 2 +- src/conf/storage_conf.c | 4 ++-- src/conf/virchrdev.c | 4 ++-- src/conf/virnetworkobj.c | 6 ++--- src/conf/virnetworkportdef.c | 2 +- src/conf/virnwfilterbindingobj.c | 2 +- src/conf/virstorageobj.c | 2 +- 14 files changed, 53 insertions(+), 53 deletions(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index b93b6ff451..0bc955230f 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -1869,7 +1869,7 @@ virCapabilitiesInitCaches(virCapsPtr caps) int rv =3D -1; =20 VIR_FREE(path); - virAsprintf(&path, "%s/cpu/cpu%zd/cache/", SYSFS_SYSTEM_PATH, pos); + path =3D g_strdup_printf("%s/cpu/cpu%zd/cache/", SYSFS_SYSTEM_PATH= , pos); =20 VIR_DIR_CLOSE(dirp); =20 diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 9cc098a025..34fabcded9 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -1388,10 +1388,10 @@ virDomainCCWAddressAsString(virDomainDeviceCCWAddre= ssPtr addr) { char *addrstr =3D NULL; =20 - virAsprintf(&addrstr, "%x.%x.%04x", - addr->cssid, - addr->ssid, - addr->devno); + addrstr =3D g_strdup_printf("%x.%x.%04x", + addr->cssid, + addr->ssid, + addr->devno); return addrstr; } =20 diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c index 2a52e7dc7f..761796e956 100644 --- a/src/conf/domain_audit.c +++ b/src/conf/domain_audit.c @@ -53,7 +53,7 @@ virDomainAuditGetRdev(const char *path) (S_ISCHR(sb.st_mode) || S_ISBLK(sb.st_mode))) { int maj =3D major(sb.st_rdev); int min =3D minor(sb.st_rdev); - virAsprintf(&ret, "%02X:%02X", maj, min); + ret =3D g_strdup_printf("%02X:%02X", maj, min); } return ret; } @@ -101,8 +101,8 @@ virDomainAuditGenericDev(virDomainObjPtr vm, if (!newsrcpath && !oldsrcpath) return; =20 - virAsprintf(&newdev, "new-%s", type); - virAsprintf(&olddev, "old-%s", type); + newdev =3D g_strdup_printf("new-%s", type); + olddev =3D g_strdup_printf("old-%s", type); =20 virUUIDFormat(vm->def->uuid, uuidstr); =20 @@ -373,15 +373,15 @@ virDomainAuditHostdev(virDomainObjPtr vm, virDomainHo= stdevDefPtr hostdev, case VIR_DOMAIN_HOSTDEV_MODE_SUBSYS: switch ((virDomainHostdevSubsysType) hostdev->source.subsys.type) { case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: - virAsprintf(&address, - VIR_PCI_DEVICE_ADDRESS_FMT, - pcisrc->addr.domain, - pcisrc->addr.bus, - pcisrc->addr.slot, - pcisrc->addr.function); + address =3D g_strdup_printf( + VIR_PCI_DEVICE_ADDRESS_FMT, + pcisrc->addr.domain, + pcisrc->addr.bus, + pcisrc->addr.slot, + pcisrc->addr.function); break; case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: - virAsprintf(&address, "%.3d.%.3d", usbsrc->bus, usbsrc->device= ); + address =3D g_strdup_printf("%.3d.%.3d", usbsrc->bus, usbsrc->= device); break; case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI: { if (scsisrc->protocol =3D=3D @@ -393,10 +393,10 @@ virDomainAuditHostdev(virDomainObjPtr vm, virDomainHo= stdevDefPtr hostdev, } else { virDomainHostdevSubsysSCSIHostPtr scsihostsrc =3D &scsisrc->u.host; - virAsprintf(&address, "%s:%u:%u:%llu", - scsihostsrc->adapter, scsihostsrc->bus, - scsihostsrc->target, - scsihostsrc->unit); + address =3D g_strdup_printf("%s:%u:%u:%llu", + scsihostsrc->adapter, scsihostsr= c->bus, + scsihostsrc->target, + scsihostsrc->unit); } break; } @@ -648,8 +648,8 @@ virDomainAuditCgroupMajor(virDomainObjPtr vm, virCgroup= Ptr cgroup, { char *extra; =20 - virAsprintf(&extra, "major category=3D%s maj=3D%02X acl=3D%s", - name, maj, perms); + extra =3D g_strdup_printf("major category=3D%s maj=3D%02X acl=3D%s", + name, maj, perms); =20 virDomainAuditCgroup(vm, cgroup, reason, extra, success); =20 @@ -688,8 +688,8 @@ virDomainAuditCgroupPath(virDomainObjPtr vm, virCgroupP= tr cgroup, goto cleanup; } =20 - virAsprintf(&extra, "path %s rdev=3D%s acl=3D%s", - detail, VIR_AUDIT_STR(rdev), perms); + extra =3D g_strdup_printf("path %s rdev=3D%s acl=3D%s", + detail, VIR_AUDIT_STR(rdev), perms); =20 virDomainAuditCgroup(vm, cgroup, reason, extra, rc =3D=3D 0); =20 @@ -926,7 +926,7 @@ virDomainAuditShmem(virDomainObjPtr vm, goto cleanup; } =20 - virAsprintf(&shmpath, "/dev/shm/%s", def->name); + shmpath =3D g_strdup_printf("/dev/shm/%s", def->name); =20 if (!virt) { VIR_WARN("Unexpected virt type %d while encoding audit message", diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 5674032b30..0697000d9f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4911,7 +4911,7 @@ virDomainPostParseCheckISCSIPath(char **srcpath) if (strchr(*srcpath, '/')) return 0; =20 - virAsprintf(&path, "%s/0", *srcpath); + path =3D g_strdup_printf("%s/0", *srcpath); VIR_FREE(*srcpath); *srcpath =3D g_steal_pointer(&path); return 0; @@ -5572,7 +5572,7 @@ virDomainDefCollectBootOrder(virDomainDefPtr def G_GN= UC_UNUSED, */ return 0; } - virAsprintf(&order, "%u", info->bootIndex); + order =3D g_strdup_printf("%u", info->bootIndex); =20 if (virHashLookup(bootHash, order)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -10120,8 +10120,8 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlo= pt, =20 if (!target && !(flags & VIR_DOMAIN_DEF_PARSE_DISK_SOURCE)) { if (def->src->srcpool) { - virAsprintf(&tmp, "pool =3D '%s', volume =3D '%s'", - def->src->srcpool->pool, def->src->srcpool->volume= ); + tmp =3D g_strdup_printf("pool =3D '%s', volume =3D '%s'", + def->src->srcpool->pool, def->src->srcpo= ol->volume); =20 virReportError(VIR_ERR_NO_TARGET, "%s", tmp); VIR_FREE(tmp); @@ -10318,7 +10318,7 @@ virDomainParseScaledValue(const char *xpath, g_autofree char *bytes_str =3D NULL; =20 *val =3D 0; - virAsprintf(&xpath_full, "string(%s)", xpath); + xpath_full =3D g_strdup_printf("string(%s)", xpath); =20 bytes_str =3D virXPathString(xpath_full, ctxt); if (!bytes_str) { @@ -10339,9 +10339,9 @@ virDomainParseScaledValue(const char *xpath, } =20 if (units_xpath) - virAsprintf(&xpath_full, "string(%s)", units_xpath); + xpath_full =3D g_strdup_printf("string(%s)", units_xpath); else - virAsprintf(&xpath_full, "string(%s/@unit)", xpath); + xpath_full =3D g_strdup_printf("string(%s/@unit)", xpath); unit =3D virXPathString(xpath_full, ctxt); =20 if (virScaleInteger(&bytes, unit, scale, max) < 0) @@ -19370,7 +19370,7 @@ virDomainResctrlMonDefParse(virDomainDefPtr def, if (!(tmp =3D virBitmapFormat(domresmon->vcpus))) goto cleanup; =20 - virAsprintf(&id, "vcpus_%s", tmp); + id =3D g_strdup_printf("vcpus_%s", tmp); } =20 virResctrlMonitorSetAlloc(domresmon->instance, resctrl->alloc); @@ -19420,7 +19420,7 @@ virDomainResctrlNew(xmlNodePtr node, * directory, so it's nice to have it named appropriately. For no= w it's * 'vcpus_...' but it's designed in order for it to be changeable = in the * future (it's part of the status XML). */ - virAsprintf(&alloc_id, "vcpus_%s", vcpus_str); + alloc_id =3D g_strdup_printf("vcpus_%s", vcpus_str); } =20 if (virResctrlAllocSetID(alloc, alloc_id) < 0) @@ -24022,7 +24022,7 @@ virDomainDiskSourceFormatNetwork(virBufferPtr attrB= uf, virStorageNetProtocolTypeToString(src->protocol)); =20 if (src->volume) - virAsprintf(&path, "%s/%s", src->volume, src->path); + path =3D g_strdup_printf("%s/%s", src->volume, src->path); =20 virBufferEscapeString(attrBuf, " name=3D'%s'", path ? path : src->path= ); =20 @@ -29189,7 +29189,7 @@ char { char *ret; =20 - virAsprintf(&ret, "%s/%s.xml", dir, name); + ret =3D g_strdup_printf("%s/%s.xml", dir, name); return ret; } =20 @@ -30339,7 +30339,7 @@ virDomainDefGetShortName(const virDomainDef *def) len =3D mbstowcs(NULL, def->name, 0); if ((len =3D=3D (size_t) -1 && errno =3D=3D EILSEQ) || len =3D=3D strlen(def->name)) { - virAsprintf(&ret, "%d-%.*s", def->id, VIR_DOMAIN_SHORT_NAME_MAX, d= ef->name); + ret =3D g_strdup_printf("%d-%.*s", def->id, VIR_DOMAIN_SHORT_NAME_= MAX, def->name); return ret; } =20 @@ -30375,7 +30375,7 @@ virDomainDefGetShortName(const virDomainDef *def) return NULL; } =20 - virAsprintf(&ret, "%d-%s", def->id, shortname); + ret =3D g_strdup_printf("%d-%s", def->id, shortname); return ret; } =20 @@ -31181,8 +31181,8 @@ virDomainDiskAddISCSIPoolSourceHost(virDomainDiskDe= fPtr def, } =20 /* iscsi pool has only one source device path */ - virAsprintf(&def->src->path, "%s/%s", pooldef->source.devices[0].path, - tokens[3]); + def->src->path =3D g_strdup_printf("%s/%s", pooldef->source.devices[0]= .path, + tokens[3]); =20 /* Storage pool have not supported these 2 attributes yet, * use the defaults. diff --git a/src/conf/moment_conf.c b/src/conf/moment_conf.c index f11ba76dd4..d02fcb89e2 100644 --- a/src/conf/moment_conf.c +++ b/src/conf/moment_conf.c @@ -78,7 +78,7 @@ virDomainMomentDefPostParse(virDomainMomentDefPtr def) gettimeofday(&tv, NULL); =20 if (!def->name) - virAsprintf(&def->name, "%lld", (long long)tv.tv_sec); + def->name =3D g_strdup_printf("%lld", (long long)tv.tv_sec); =20 def->creationTime =3D tv.tv_sec; return 0; diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 8d2bef439b..61778f561a 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -2756,7 +2756,7 @@ virNetworkConfigFile(const char *dir, { char *ret =3D NULL; =20 - virAsprintf(&ret, "%s/%s.xml", dir, name); + ret =3D g_strdup_printf("%s/%s.xml", dir, name); return ret; } =20 diff --git a/src/conf/node_device_util.c b/src/conf/node_device_util.c index 6c7b73384f..d8f4a48225 100644 --- a/src/conf/node_device_util.c +++ b/src/conf/node_device_util.c @@ -182,7 +182,7 @@ virNodeDeviceDeleteVport(virConnectPtr conn, goto cleanup; } =20 - virAsprintf(&scsi_host_name, "scsi_%s", name); + scsi_host_name =3D g_strdup_printf("scsi_%s", name); =20 /* If at startup time we provided a parent, then use that to * get the parent_host value; otherwise, we have to determine diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index 2c53e9d764..43a4ae0173 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -618,7 +618,7 @@ virDomainSnapshotDefAssignExternalNames(virDomainSnapsh= otDefPtr def) if ((tmp =3D strrchr(tmppath, '.')) && !strchr(tmp, '/')) *tmp =3D '\0'; =20 - virAsprintf(&disk->src->path, "%s.%s", tmppath, def->parent.name); + disk->src->path =3D g_strdup_printf("%s.%s", tmppath, def->parent.= name); =20 VIR_FREE(tmppath); =20 diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index ec9db7edb0..e03a9460fe 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -953,9 +953,9 @@ virStoragePoolDefParseXML(xmlXPathContextPtr ctxt) * path and permissions */ if (!(options->flags & VIR_STORAGE_POOL_SOURCE_NETWORK)) { if (def->type =3D=3D VIR_STORAGE_POOL_LOGICAL) { - virAsprintf(&target_path, "/dev/%s", def->source.name); + target_path =3D g_strdup_printf("/dev/%s", def->source.name); } else if (def->type =3D=3D VIR_STORAGE_POOL_ZFS) { - virAsprintf(&target_path, "/dev/zvol/%s", def->source.name); + target_path =3D g_strdup_printf("/dev/zvol/%s", def->source.na= me); } else { target_path =3D virXPathString("string(./target/path)", ctxt); if (!target_path) { diff --git a/src/conf/virchrdev.c b/src/conf/virchrdev.c index 204813c5fd..4b8f526d35 100644 --- a/src/conf/virchrdev.c +++ b/src/conf/virchrdev.c @@ -88,7 +88,7 @@ static char *virChrdevLockFilePath(const char *dev) ++p; } =20 - virAsprintf(&path, "%s/LCK..%s", VIR_CHRDEV_LOCK_FILE_PATH, filename); + path =3D g_strdup_printf("%s/LCK..%s", VIR_CHRDEV_LOCK_FILE_PATH, file= name); =20 sanitizedPath =3D virFileSanitizePath(path); =20 @@ -133,7 +133,7 @@ static int virChrdevLockFileCreate(const char *dev) =20 /* ensure correct format according to filesystem hierarchy standard */ /* http://www.pathname.com/fhs/pub/fhs-2.3.html#VARLOCKLOCKFILES */ - virAsprintf(&pidStr, "%10lld\n", (long long)getpid()); + pidStr =3D g_strdup_printf("%10lld\n", (long long)getpid()); =20 /* create the lock file */ if ((lockfd =3D open(path, O_WRONLY | O_CREAT | O_EXCL, 00644)) < 0) { diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index 852c0a5e43..8fa4de8203 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -1627,7 +1627,7 @@ virNetworkObjGetPortStatusDir(virNetworkObjPtr net, const char *stateDir) { char *ret; - virAsprintf(&ret, "%s/%s/ports", stateDir, net->def->name); + ret =3D g_strdup_printf("%s/%s/ports", stateDir, net->def->name); return ret; } =20 @@ -1739,7 +1739,7 @@ virNetworkObjDeleteAllPorts(virNetworkObjPtr net, if (!virStringStripSuffix(de->d_name, ".xml")) continue; =20 - virAsprintf(&file, "%s/%s.xml", dir, de->d_name); + file =3D g_strdup_printf("%s/%s.xml", dir, de->d_name); =20 if (unlink(file) < 0 && errno !=3D ENOENT) VIR_WARN("Unable to delete %s", file); @@ -1899,7 +1899,7 @@ virNetworkObjLoadAllPorts(virNetworkObjPtr net, if (!virStringStripSuffix(de->d_name, ".xml")) continue; =20 - virAsprintf(&file, "%s/%s.xml", dir, de->d_name); + file =3D g_strdup_printf("%s/%s.xml", dir, de->d_name); =20 portdef =3D virNetworkPortDefParseFile(file); VIR_FREE(file); diff --git a/src/conf/virnetworkportdef.c b/src/conf/virnetworkportdef.c index 09bd25a9ef..e511bb483f 100644 --- a/src/conf/virnetworkportdef.c +++ b/src/conf/virnetworkportdef.c @@ -428,7 +428,7 @@ virNetworkPortDefConfigFile(const char *dir, { char *ret =3D NULL; =20 - virAsprintf(&ret, "%s/%s.xml", dir, name); + ret =3D g_strdup_printf("%s/%s.xml", dir, name); return ret; } =20 diff --git a/src/conf/virnwfilterbindingobj.c b/src/conf/virnwfilterbinding= obj.c index 0066faadd8..646e1e5782 100644 --- a/src/conf/virnwfilterbindingobj.c +++ b/src/conf/virnwfilterbindingobj.c @@ -142,7 +142,7 @@ virNWFilterBindingObjConfigFile(const char *dir, { char *ret; =20 - virAsprintf(&ret, "%s/%s.xml", dir, name); + ret =3D g_strdup_printf("%s/%s.xml", dir, name); return ret; } =20 diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c index 15c5f2624d..5cbd30f93c 100644 --- a/src/conf/virstorageobj.c +++ b/src/conf/virstorageobj.c @@ -1229,7 +1229,7 @@ matchFCHostToSCSIHost(virStorageAdapterFCHostPtr fcho= st, */ if (!fchost->parent && (conn =3D virGetConnectNodeDev())) { - virAsprintf(&scsi_host_name, "scsi_%s", name); + scsi_host_name =3D g_strdup_printf("scsi_%s", name); if ((parent_name =3D virNodeDeviceGetParentName(conn, scsi_host_name))= ) { if (virStorageIsSameHostnum(parent_name, scsi_hostnum)) { --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752855; cv=none; d=zoho.com; s=zohoarc; b=VetUgAAVxcuyypodQY/ENJrpArBEWtPd9peDgk9WUehdtCiFKhJlODZEMo5rarqRcQaTkVi5QYKJUFrsH1MGqKjTaqU9Ud5V39kXFYaxV+s2/pXCJYZNhUw2eHGeaAOInGOprgV0GDVtjMx3pYbKvrr3pPMY4uVlyegi7Aj46C4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752855; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+hnrZ6LAaZSwtbxWPua5WoXtsoxwjYVj03TfzpQJs6M=; b=HjXdudsojRxNpMukvhMHAonnnXFe4xhAJ3z5JD7CXSNKGJiUSw0BSIqJzzFNOy8QuqslcwXZwZsjsmpN9bkgT1MG+0DpZ9ImrQ/pLMyFuPnDXURBuP5IjU4q/vzwqLqQ2uNGb1H3gEts2Wv7qTGqf1w7kHtLcD3tfr1wGODequ8= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1571752855857918.044252500529; Tue, 22 Oct 2019 07:00:55 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-108-t_j6-WYJMJKGXPtF2tvkGw-1; Tue, 22 Oct 2019 10:00:52 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0E9B380183E; Tue, 22 Oct 2019 14:00:45 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 568C86012E; Tue, 22 Oct 2019 14:00:44 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id A58F93FB52; Tue, 22 Oct 2019 14:00:43 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9ME0c0v002566 for ; Tue, 22 Oct 2019 10:00:38 -0400 Received: by smtp.corp.redhat.com (Postfix) id 959A76017E; Tue, 22 Oct 2019 14:00:38 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0ACBB60471 for ; Tue, 22 Oct 2019 14:00:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752854; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=+hnrZ6LAaZSwtbxWPua5WoXtsoxwjYVj03TfzpQJs6M=; b=BxpnEZ2uY99dJO067yIPRMNo7s4hFuUUk5bBbIwA+4ZmUCxXK38JraN6k+FaR943VB6iiA E620DN0Ip2PYxmHSY78soIkHhhEKu+upmUprauO3E2EB9QpZi+KFnZ18UGdpBe7fAs6lD7 HJyLml5iGQlcseX+BtbuAm3nOBJ0y54= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:44 +0200 Message-Id: <3ee38321c6da334b9f7962e19ea10eb6cd2ec013.1571752582.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 40/75] cpu: Use g_strdup_printf() instead of virAsprintf() X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: t_j6-WYJMJKGXPtF2tvkGw-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- src/cpu/cpu_ppc64.c | 19 ++++++++----------- src/cpu/cpu_x86.c | 14 ++++++-------- 2 files changed, 14 insertions(+), 19 deletions(-) diff --git a/src/cpu/cpu_ppc64.c b/src/cpu/cpu_ppc64.c index 990bbbd45f..3236a9616e 100644 --- a/src/cpu/cpu_ppc64.c +++ b/src/cpu/cpu_ppc64.c @@ -460,9 +460,8 @@ ppc64Compute(virCPUDefPtr host, VIR_DEBUG("CPU arch %s does not match host arch", virArchToString(cpu->arch)); if (message) - virAsprintf(message, - _("CPU arch %s does not match host arch"), - virArchToString(cpu->arch)); + *message =3D g_strdup_printf(_("CPU arch %s does not match= host arch"), + virArchToString(cpu->arch)); =20 ret =3D VIR_CPU_COMPARE_INCOMPATIBLE; goto cleanup; @@ -477,10 +476,9 @@ ppc64Compute(virCPUDefPtr host, VIR_DEBUG("host CPU vendor does not match required CPU vendor %s", cpu->vendor); if (message) { - virAsprintf(message, - _("host CPU vendor does not match required " - "CPU vendor %s"), - cpu->vendor); + *message =3D g_strdup_printf(_("host CPU vendor does not match= required " + "CPU vendor %s"), + cpu->vendor); } =20 ret =3D VIR_CPU_COMPARE_INCOMPATIBLE; @@ -532,10 +530,9 @@ ppc64Compute(virCPUDefPtr host, VIR_DEBUG("host CPU model does not match required CPU model %s", guest_model->name); if (message) { - virAsprintf(message, - _("host CPU model does not match required " - "CPU model %s"), - guest_model->name); + *message =3D g_strdup_printf(_("host CPU model does not match = required " + "CPU model %s"), + guest_model->name); } =20 ret =3D VIR_CPU_COMPARE_INCOMPATIBLE; diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 8418339d6f..82403472df 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -1725,7 +1725,7 @@ virCPUx86DataParse(xmlXPathContextPtr ctxt) goto error; \ } \ if (message) \ - virAsprintf(message, "%s: %s", _(MSG), flagsStr); \ + *message =3D g_strdup_printf("%s: %s", _(MSG), flagsStr); \ VIR_DEBUG("%s: %s", MSG, flagsStr); \ VIR_FREE(flagsStr); \ ret =3D VIR_CPU_COMPARE_INCOMPATIBLE; \ @@ -1767,9 +1767,8 @@ x86Compute(virCPUDefPtr host, VIR_DEBUG("CPU arch %s does not match host arch", virArchToString(cpu->arch)); if (message) { - virAsprintf(message, - _("CPU arch %s does not match host arch"), - virArchToString(cpu->arch)); + *message =3D g_strdup_printf(_("CPU arch %s does not match= host arch"), + virArchToString(cpu->arch)); } return VIR_CPU_COMPARE_INCOMPATIBLE; } @@ -1783,10 +1782,9 @@ x86Compute(virCPUDefPtr host, VIR_DEBUG("host CPU vendor does not match required CPU vendor %s", cpu->vendor); if (message) { - virAsprintf(message, - _("host CPU vendor does not match required " - "CPU vendor %s"), - cpu->vendor); + *message =3D g_strdup_printf(_("host CPU vendor does not match= required " + "CPU vendor %s"), + cpu->vendor); } =20 return VIR_CPU_COMPARE_INCOMPATIBLE; --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752865; cv=none; d=zoho.com; s=zohoarc; b=P7YR/8pWotF+vooime8R+mrjQIshHIfiOOvoCyX2MhR6aTxALdvXYe2yQlyXnuyXsb3drqWe6ID2tm+qncArF4xDZzn9vbNVgJNFkMrgxiceK4v5HLb5kZpHnSP0UUudwMr/AlL/VR0R1OYkee2BphoEbxlzl2iqHqQyX/6GGfY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752865; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=D1UdoHwoiv77/BKrUiOyw6Vad4NojG3gGgl1z/6CeOY=; b=cYz2DeIwq0bEu97ogrNeILSe5S9BRWzJUBq4lCnloH5YuR/QkzP/JTpsOvu5bREntt/1vQzJHIjfjuQi7U/vFv7+dmbxp82VnX8g+qn3mG7LWW0d8s3UhWQoAuOAaWhj25jLltsu/ttxbLOy5MZz0gDkiTVfxZE++psx/9bl8O8= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1571752865093115.98067346615346; Tue, 22 Oct 2019 07:01:05 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-243-ozJr_o2UN9Oc6EpY3JZNGQ-1; Tue, 22 Oct 2019 10:00:50 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 571501005526; Tue, 22 Oct 2019 14:00:45 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6099EA226; Tue, 22 Oct 2019 14:00:44 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 254B93FB46; Tue, 22 Oct 2019 14:00:43 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9ME0dHg002580 for ; Tue, 22 Oct 2019 10:00:39 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7C7A46046B; Tue, 22 Oct 2019 14:00:39 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id EED29605C6 for ; Tue, 22 Oct 2019 14:00:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752862; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=D1UdoHwoiv77/BKrUiOyw6Vad4NojG3gGgl1z/6CeOY=; b=F5zyS9gZL3scVb5DZNuTiguYOI2AtuED8IRIJ6DEh1GsAxFzBubGsy103Z/y3XtJfMJok+ 1QdJRJcTQ+tQ5gvXR+Pg43PmdshRRoPZC1IrEPQApj8XSkS4xCRquexFX3MoFpK2HP4GQ5 oseYqa7T4nVaeHpJP1yvjwkn3Lygkgs= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:45 +0200 Message-Id: <8168115fa862311c1ecd65f7a5881c97127e3d1e.1571752582.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 41/75] esx: Use g_strdup_printf() instead of virAsprintf() X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: ozJr_o2UN9Oc6EpY3JZNGQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- src/esx/esx_driver.c | 40 +++++++++++++------------- src/esx/esx_storage_backend_vmfs.c | 46 +++++++++++++++--------------- src/esx/esx_stream.c | 8 +++--- src/esx/esx_vi.c | 23 +++++++-------- 4 files changed, 58 insertions(+), 59 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 117ac674d4..8117c454e4 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -143,8 +143,8 @@ esxParseVMXFileName(const char *fileName, void *opaque) =20 if (!strchr(fileName, '/') && !strchr(fileName, '\\')) { /* Plain file name, use same directory as for the .vmx file */ - virAsprintf(&result, "%s/%s", data->datastorePathWithoutFileName, - fileName); + result =3D g_strdup_printf("%s/%s", data->datastorePathWithoutFile= Name, + fileName); } else { if (esxVI_String_AppendValueToList(&propertyNameList, "summary.name") < 0 || @@ -188,7 +188,7 @@ esxParseVMXFileName(const char *fileName, void *opaque) ++tmp; } =20 - virAsprintf(&result, "[%s] %s", datastoreName, strippedFileNam= e); + result =3D g_strdup_printf("[%s] %s", datastoreName, strippedF= ileName); =20 break; } @@ -222,8 +222,8 @@ esxParseVMXFileName(const char *fileName, void *opaque) goto cleanup; } =20 - virAsprintf(&result, "[%s] %s", datastoreName, - directoryAndFileName); + result =3D g_strdup_printf("[%s] %s", datastoreName, + directoryAndFileName); } =20 /* If it's an absolute path outside of a datastore just use it as = is */ @@ -635,8 +635,8 @@ esxConnectToHost(esxPrivate *priv, conn->uri->server))) goto cleanup; =20 - virAsprintf(&url, "%s://%s:%d/sdk", priv->parsedUri->transport, - conn->uri->server, conn->uri->port); + url =3D g_strdup_printf("%s://%s:%d/sdk", priv->parsedUri->transport, + conn->uri->server, conn->uri->port); =20 if (esxVI_Context_Alloc(&priv->host) < 0 || esxVI_Context_Connect(priv->host, url, ipAddress, username, passwo= rd, @@ -723,8 +723,8 @@ esxConnectToVCenter(esxPrivate *priv, if (!(password =3D virAuthGetPassword(conn, auth, "esx", username, hos= tname))) goto cleanup; =20 - virAsprintf(&url, "%s://%s:%d/sdk", priv->parsedUri->transport, hostna= me, - conn->uri->port); + url =3D g_strdup_printf("%s://%s:%d/sdk", priv->parsedUri->transport, = hostname, + conn->uri->port); =20 if (esxVI_Context_Alloc(&priv->vCenter) < 0 || esxVI_Context_Connect(priv->vCenter, url, ipAddress, username, @@ -1158,7 +1158,7 @@ esxConnectGetHostname(virConnectPtr conn) if (!domainName || strlen(domainName) < 1) { complete =3D g_strdup(hostName); } else { - virAsprintf(&complete, "%s.%s", hostName, domainName); + complete =3D g_strdup_printf("%s.%s", hostName, domainName); } =20 cleanup: @@ -2638,10 +2638,10 @@ esxDomainGetXMLDesc(virDomainPtr domain, unsigned i= nt flags) data.ctx =3D priv->primary; =20 if (!directoryName) { - virAsprintf(&data.datastorePathWithoutFileName, "[%s]", datastoreN= ame); + data.datastorePathWithoutFileName =3D g_strdup_printf("[%s]", data= storeName); } else { - virAsprintf(&data.datastorePathWithoutFileName, "[%s] %s", - datastoreName, directoryName); + data.datastorePathWithoutFileName =3D g_strdup_printf("[%s] %s", + datastoreName,= directoryName); } =20 ctx.opaque =3D &data; @@ -3106,11 +3106,11 @@ esxDomainDefineXMLFlags(virConnectPtr conn, const c= har *xml, unsigned int flags) =20 /* Register the domain */ if (directoryName) { - virAsprintf(&datastoreRelatedPath, "[%s] %s/%s.vmx", datastoreName, - directoryName, escapedName); + datastoreRelatedPath =3D g_strdup_printf("[%s] %s/%s.vmx", datasto= reName, + directoryName, escapedName); } else { - virAsprintf(&datastoreRelatedPath, "[%s] %s.vmx", datastoreName, - escapedName); + datastoreRelatedPath =3D g_strdup_printf("[%s] %s.vmx", datastoreN= ame, + escapedName); } =20 if (esxVI_RegisterVM_Task(priv->primary, priv->primary->datacenter->vm= Folder, @@ -3722,9 +3722,9 @@ esxDomainMigratePrepare(virConnectPtr dconn, virCheckFlags(ESX_MIGRATION_FLAGS, -1); =20 if (!uri_in) { - virAsprintf(uri_out, "vpxmigr://%s/%s/%s", priv->vCenter->ipAddres= s, - priv->vCenter->computeResource->resourcePool->value, - priv->vCenter->hostSystem->_reference->value); + *uri_out =3D g_strdup_printf("vpxmigr://%s/%s/%s", priv->vCenter->= ipAddress, + priv->vCenter->computeResource->resourc= ePool->value, + priv->vCenter->hostSystem->_reference->= value); } =20 return 0; diff --git a/src/esx/esx_storage_backend_vmfs.c b/src/esx/esx_storage_backe= nd_vmfs.c index 24deee7215..5f25f80072 100644 --- a/src/esx/esx_storage_backend_vmfs.c +++ b/src/esx/esx_storage_backend_vmfs.c @@ -606,8 +606,8 @@ esxStoragePoolListVolumes(virStoragePoolPtr pool, char = **const names, if (length < 1) { names[count] =3D g_strdup(fileInfo->path); } else { - virAsprintf(&names[count], "%s/%s", - directoryAndFileName, fileInfo->path); + names[count] =3D g_strdup_printf("%s/%s", + directoryAndFileName, fileI= nfo->path); } =20 ++count; @@ -641,7 +641,7 @@ esxStorageVolLookupByName(virStoragePoolPtr pool, char *datastorePath =3D NULL; char *key =3D NULL; =20 - virAsprintf(&datastorePath, "[%s] %s", pool->name, name); + datastorePath =3D g_strdup_printf("[%s] %s", pool->name, name); =20 if (esxVI_LookupStorageVolumeKeyByDatastorePath(priv->primary, datastorePath, &key) <= 0) { @@ -773,11 +773,11 @@ esxStorageVolLookupByKey(virConnectPtr conn, const ch= ar *key) if (length < 1) { volumeName =3D g_strdup(fileInfo->path); } else { - virAsprintf(&volumeName, "%s/%s", - directoryAndFileName, fileInfo->path); + volumeName =3D g_strdup_printf("%s/%s", + directoryAndFileName, fil= eInfo->path); } =20 - virAsprintf(&datastorePath, "[%s] %s", datastoreName, volu= meName); + datastorePath =3D g_strdup_printf("[%s] %s", datastoreName= , volumeName); =20 if (!esxVI_VmDiskFileInfo_DynamicCast(fileInfo)) { /* Only a VirtualDisk has a UUID */ @@ -884,7 +884,7 @@ esxStorageVolCreateXML(virStoragePoolPtr pool, goto cleanup; } =20 - virAsprintf(&unescapedDatastorePath, "[%s] %s", pool->name, def->name); + unescapedDatastorePath =3D g_strdup_printf("[%s] %s", pool->name, def-= >name); =20 if (def->target.format =3D=3D VIR_STORAGE_FILE_VMDK) { /* Parse and escape datastore path */ @@ -905,11 +905,11 @@ esxStorageVolCreateXML(virStoragePoolPtr pool, if (!fileName) goto cleanup; =20 - virAsprintf(&datastorePathWithoutFileName, "[%s] %s", pool->name, - directoryName); + datastorePathWithoutFileName =3D g_strdup_printf("[%s] %s", pool->= name, + directoryName); =20 - virAsprintf(&datastorePath, "[%s] %s/%s", pool->name, directoryNam= e, - fileName); + datastorePath =3D g_strdup_printf("[%s] %s/%s", pool->name, direct= oryName, + fileName); =20 /* Create directory, if it doesn't exist yet */ if (esxVI_LookupFileInfoByDatastorePath @@ -1066,8 +1066,8 @@ esxStorageVolCreateXMLFrom(virStoragePoolPtr pool, goto cleanup; } =20 - virAsprintf(&sourceDatastorePath, "[%s] %s", sourceVolume->pool, - sourceVolume->name); + sourceDatastorePath =3D g_strdup_printf("[%s] %s", sourceVolume->pool, + sourceVolume->name); =20 /* Parse config */ def =3D virStorageVolDefParseString(&poolDef, xmldesc, 0); @@ -1098,7 +1098,7 @@ esxStorageVolCreateXMLFrom(virStoragePoolPtr pool, goto cleanup; } =20 - virAsprintf(&unescapedDatastorePath, "[%s] %s", pool->name, def->name); + unescapedDatastorePath =3D g_strdup_printf("[%s] %s", pool->name, def-= >name); =20 if (def->target.format =3D=3D VIR_STORAGE_FILE_VMDK) { /* Parse and escape datastore path */ @@ -1119,11 +1119,11 @@ esxStorageVolCreateXMLFrom(virStoragePoolPtr pool, if (!fileName) goto cleanup; =20 - virAsprintf(&datastorePathWithoutFileName, "[%s] %s", pool->name, - directoryName); + datastorePathWithoutFileName =3D g_strdup_printf("[%s] %s", pool->= name, + directoryName); =20 - virAsprintf(&datastorePath, "[%s] %s/%s", pool->name, directoryNam= e, - fileName); + datastorePath =3D g_strdup_printf("[%s] %s/%s", pool->name, direct= oryName, + fileName); =20 /* Create directory, if it doesn't exist yet */ if (esxVI_LookupFileInfoByDatastorePath @@ -1218,7 +1218,7 @@ esxStorageVolDelete(virStorageVolPtr volume, unsigned= int flags) =20 virCheckFlags(0, -1); =20 - virAsprintf(&datastorePath, "[%s] %s", volume->pool, volume->name); + datastorePath =3D g_strdup_printf("[%s] %s", volume->pool, volume->nam= e); =20 if (esxVI_DeleteVirtualDisk_Task(priv->primary, datastorePath, priv->primary->datacenter->_reference, @@ -1260,7 +1260,7 @@ esxStorageVolWipe(virStorageVolPtr volume, unsigned i= nt flags) =20 virCheckFlags(0, -1); =20 - virAsprintf(&datastorePath, "[%s] %s", volume->pool, volume->name); + datastorePath =3D g_strdup_printf("[%s] %s", volume->pool, volume->nam= e); =20 if (esxVI_ZeroFillVirtualDisk_Task(priv->primary, datastorePath, priv->primary->datacenter->_referen= ce, @@ -1302,7 +1302,7 @@ esxStorageVolGetInfo(virStorageVolPtr volume, =20 memset(info, 0, sizeof(*info)); =20 - virAsprintf(&datastorePath, "[%s] %s", volume->pool, volume->name); + datastorePath =3D g_strdup_printf("[%s] %s", volume->pool, volume->nam= e); =20 if (esxVI_LookupFileInfoByDatastorePath(priv->primary, datastorePath, false, &fileInfo, @@ -1359,7 +1359,7 @@ esxStorageVolGetXMLDesc(virStorageVolPtr volume, } =20 /* Lookup file info */ - virAsprintf(&datastorePath, "[%s] %s", volume->pool, volume->name); + datastorePath =3D g_strdup_printf("[%s] %s", volume->pool, volume->nam= e); =20 if (esxVI_LookupFileInfoByDatastorePath(priv->primary, datastorePath, false, &fileInfo, @@ -1420,7 +1420,7 @@ esxStorageVolGetPath(virStorageVolPtr volume) { char *path; =20 - virAsprintf(&path, "[%s] %s", volume->pool, volume->name); + path =3D g_strdup_printf("[%s] %s", volume->pool, volume->name); return path; } =20 diff --git a/src/esx/esx_stream.c b/src/esx/esx_stream.c index 1a779aa095..fe3c42ae02 100644 --- a/src/esx/esx_stream.c +++ b/src/esx/esx_stream.c @@ -415,9 +415,9 @@ esxStreamOpen(virStreamPtr stream, esxPrivate *priv, co= nst char *url, streamPriv->mode =3D mode; =20 if (length > 0) { - virAsprintf(&range, "%llu-%llu", offset, offset + length - 1); + range =3D g_strdup_printf("%llu-%llu", offset, offset + length - 1= ); } else if (offset > 0) { - virAsprintf(&range, "%llu-", offset); + range =3D g_strdup_printf("%llu-", offset); } =20 if (esxVI_CURL_Alloc(&streamPriv->curl) < 0 || @@ -446,8 +446,8 @@ esxStreamOpen(virStreamPtr stream, esxPrivate *priv, co= nst char *url, curl_easy_setopt(streamPriv->curl->handle, CURLOPT_PASSWORD, priv->primary->password); #else - virAsprintf(&userpwd, "%s:%s", priv->primary->username, - priv->primary->password); + userpwd =3D g_strdup_printf("%s:%s", priv->primary->username, + priv->primary->password); =20 curl_easy_setopt(streamPriv->curl->handle, CURLOPT_USERPWD, userpwd); #endif diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 61082c5113..3ff25e2a93 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -387,9 +387,9 @@ esxVI_CURL_Download(esxVI_CURL *curl, const char *url, = char **content, return -1; } =20 - virAsprintf(&range, "%llu-%llu", offset, offset + *length - 1); + range =3D g_strdup_printf("%llu-%llu", offset, offset + *length - = 1); } else if (offset > 0) { - virAsprintf(&range, "%llu-", offset); + range =3D g_strdup_printf("%llu-", offset); } =20 virMutexLock(&curl->lock); @@ -1487,9 +1487,8 @@ esxVI_Context_Execute(esxVI_Context *ctx, const char = *methodName, =20 goto cleanup; } else { - virAsprintf(&xpathExpression, - "/soapenv:Envelope/soapenv:Body/vim:%sResponse", - methodName); + xpathExpression =3D g_strdup_printf("/soapenv:Envelope/soapenv= :Body/vim:%sResponse", + methodName); =20 responseNode =3D virXPathNode(xpathExpression, xpathContext); =20 @@ -3585,12 +3584,12 @@ esxVI_LookupFileInfoByDatastorePath(esxVI_Context *= ctx, * The part of the datatore path didn't contain a '/', assu= me * that the part is actually the file name. */ - virAsprintf(&datastorePathWithoutFileName, "[%s]", datastoreName); + datastorePathWithoutFileName =3D g_strdup_printf("[%s]", datastore= Name); =20 fileName =3D g_strdup(directoryAndFileName); } else { - virAsprintf(&datastorePathWithoutFileName, "[%s] %s", datastoreNam= e, - directoryName); + datastorePathWithoutFileName =3D g_strdup_printf("[%s] %s", datast= oreName, + directoryName); =20 length =3D strlen(directoryName); =20 @@ -3816,7 +3815,7 @@ esxVI_LookupDatastoreContentByDatastoreName floppyImageFileQuery =3D NULL; =20 /* Search datastore for files */ - virAsprintf(&datastorePath, "[%s]", datastoreName); + datastorePath =3D g_strdup_printf("[%s]", datastoreName); =20 if (esxVI_SearchDatastoreSubFolders_Task(ctx, hostDatastoreBrowser, datastorePath, searchSpec, @@ -4534,9 +4533,9 @@ esxVI_WaitForTaskCompletion(esxVI_Context *ctx, } else if (!taskInfo->error->localizedMessage) { *errorMessage =3D g_strdup(taskInfo->error->fault->_actualType= ); } else { - virAsprintf(errorMessage, "%s - %s", - taskInfo->error->fault->_actualType, - taskInfo->error->localizedMessage); + *errorMessage =3D g_strdup_printf("%s - %s", + taskInfo->error->fault->_actua= lType, + taskInfo->error->localizedMess= age); } } =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752857; cv=none; d=zoho.com; s=zohoarc; b=ICutuFcWLHBkcNwHc3mw89VokivjqHUT9rzxlXZcpA3Z+rD6AlM0bd7aaVlyY7a7h57DBD7h6lNzmWC8MUGLLdbGdugq/cBEykkFrpEw2938YrMWONaLcsRkvTtgM8ojvVcy9rteBWIAupmc5AieDWzETx7D3nD1A9SOcCP2ZsE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752857; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=e9ywsjhIvyYWfHxjUFgZVpu38mJfAN0wligcLNeozeU=; b=CZdbzYn0Qp1Oys/DzQ6tly1lAtX80nVVXnH8nM3jKDXUxL1hGvXeEJ1F5udADuTtDw30bcURBCUw3P4lpjiTffXxgbg//cEa+MviDCt/htLPXjTlyXgQkDVLCYPmUADs3QSkTbMv3ds80tckxatcwO7ZhypcJ0umsQR5WbZ2B2o= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1571752857274595.2845144375781; Tue, 22 Oct 2019 07:00:57 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-74--DwCLBUfNNeeibh5KKoToA-1; Tue, 22 Oct 2019 10:00:54 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2F789800D57; Tue, 22 Oct 2019 14:00:48 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B486C620A3; Tue, 22 Oct 2019 14:00:47 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 41BE6180B761; Tue, 22 Oct 2019 14:00:47 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9ME0f4W002626 for ; Tue, 22 Oct 2019 10:00:41 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8440C6064B; Tue, 22 Oct 2019 14:00:40 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id CC1DF6046B for ; Tue, 22 Oct 2019 14:00:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752856; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=e9ywsjhIvyYWfHxjUFgZVpu38mJfAN0wligcLNeozeU=; b=bUHUiVY96khIiSMl19thcku8pckmixxZi9jk9XLqK0bRTfYQmRqKkLqgVG/BpO7J8CvV5M iK32bV1bc1vySG8JigwtA9UPBPp2VCu3/8i9Qu8Fa17q/byRvyav+0CmaMibHnJa0iJboX SUQA709xzZiPbdiYwPy7X1A+gWXEtXo= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:46 +0200 Message-Id: <1e313986d8aeed80a5661f92e0634963b5c6b06d.1571752582.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 42/75] hyperv: Use g_strdup_printf() instead of virAsprintf() X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: -DwCLBUfNNeeibh5KKoToA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- src/hyperv/hyperv_driver.c | 8 ++++---- src/hyperv/hyperv_wmi.c | 18 ++++++++---------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index eb35cf6115..b1dafe7c80 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -1378,9 +1378,9 @@ hypervDomainSendKey(virDomainPtr domain, unsigned int= codeset, } } =20 - virAsprintf(&selector, "CreationClassName=3DMsvm_Keyboard&DeviceID=3D%= s&" - "SystemCreationClassName=3DMsvm_ComputerSystem&" - "SystemName=3D%s", keyboard->data.common->DeviceID, uuid_s= tring); + selector =3D g_strdup_printf("CreationClassName=3DMsvm_Keyboard&Device= ID=3D%s&" + "SystemCreationClassName=3DMsvm_ComputerSys= tem&" + "SystemName=3D%s", keyboard->data.common->D= eviceID, uuid_string); =20 /* press the keys */ for (i =3D 0; i < nkeycodes; i++) { @@ -1462,7 +1462,7 @@ hypervDomainSetMemoryFlags(virDomainPtr domain, unsig= ned long memory, =20 virCheckFlags(0, -1); =20 - virAsprintf(&memory_str, "%lu", memory_mb); + memory_str =3D g_strdup_printf("%lu", memory_mb); =20 virUUIDFormat(domain->uuid, uuid_string); =20 diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c index c0c9b7f77e..2c3e8d4f5e 100644 --- a/src/hyperv/hyperv_wmi.c +++ b/src/hyperv/hyperv_wmi.c @@ -439,7 +439,7 @@ hypervCreateInvokeXmlDoc(hypervInvokeParamsListPtr para= ms, WsXmlDocH *docRoot) char *method =3D NULL; WsXmlNodeH xmlNodeMethod =3D NULL; =20 - virAsprintf(&method, "%s_INPUT", params->method); + method =3D g_strdup_printf("%s_INPUT", params->method); =20 *docRoot =3D ws_xml_create_doc(NULL, method); if (*docRoot =3D=3D NULL) { @@ -848,9 +848,8 @@ hypervInvokeMethod(hypervPrivate *priv, hypervInvokePar= amsListPtr params, params->method, paramsDocRoot); =20 /* check return code of invocation */ - virAsprintf(&returnValue_xpath, - "/s:Envelope/s:Body/p:%s_OUTPUT/p:ReturnValue", - params->method); + returnValue_xpath =3D g_strdup_printf("/s:Envelope/s:Body/p:%s_OUTPUT/= p:ReturnValue", + params->method); =20 returnValue =3D ws_xml_get_xpath_value(response, returnValue_xpath); if (!returnValue) { @@ -864,10 +863,9 @@ hypervInvokeMethod(hypervPrivate *priv, hypervInvokePa= ramsListPtr params, goto cleanup; =20 if (returnCode =3D=3D CIM_RETURNCODE_TRANSITION_STARTED) { - virAsprintf(&jobcode_instance_xpath, - "/s:Envelope/s:Body/p:%s_OUTPUT/p:Job/a:ReferenceParam= eters/" - "w:SelectorSet/w:Selector[@Name=3D'InstanceID']", - params->method); + jobcode_instance_xpath =3D g_strdup_printf("/s:Envelope/s:Body/p:%= s_OUTPUT/p:Job/a:ReferenceParameters/" + "w:SelectorSet/w:Selector= [@Name=3D'InstanceID']", + params->method); =20 instanceID =3D ws_xml_get_xpath_value(response, jobcode_instance_x= path); if (!instanceID) { @@ -1338,8 +1336,8 @@ hypervInvokeMsvmComputerSystemRequestStateChange(virD= omainPtr domain, =20 virUUIDFormat(domain->uuid, uuid_string); =20 - virAsprintf(&selector, "Name=3D%s&CreationClassName=3DMsvm_ComputerSys= tem", uuid_string); - virAsprintf(&properties, "RequestedState=3D%d", requestedState); + selector =3D g_strdup_printf("Name=3D%s&CreationClassName=3DMsvm_Compu= terSystem", uuid_string); + properties =3D g_strdup_printf("RequestedState=3D%d", requestedState); =20 if (priv->wmiVersion =3D=3D HYPERV_WMI_VERSION_V1) resourceUri =3D MSVM_COMPUTERSYSTEM_V1_RESOURCE_URI; --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571753057; cv=none; d=zoho.com; s=zohoarc; b=aPeTSa3ql8GpjkitcYbAM7k0TCZclWQUI3C5ERgAWdp8ugPKlipy5GG4TkXnDv4M68ViXCurqcGKFMmopEgBfsiElej8csJD357z6/9G/UgEQUXydtpUkOVU6tbJKxqJt5yVRumPF9RSj0wodS3N/1psiX2wPi8XzJWub6KaKyY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571753057; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=5bZlN5njQZ6hIjtS4SSeo2Nqsb4gf/pK9H5ihiIpUug=; b=f6qRHOosd0yC3Zi0Dp3IYXp5lm2q0XiH6QI24jVmVlpLkI7fVUILatuA65LxiNWIz/Kyu2n1JwGZ2hX95wCcVrTo6ReQugjCv69K25vLiDLmlYctFkn9WyClLoZjUX1ehZNLXv1KE4ony8TshiCFryPcCeylYc+FRBt515LJ4oc= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1571753057626759.3260848506902; Tue, 22 Oct 2019 07:04:17 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-341-IgYmrQ1UND-1SIkmZ1T4YA-1; Tue, 22 Oct 2019 10:00:56 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7E5FA107AD3A; Tue, 22 Oct 2019 14:00:49 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 41F815DD78; Tue, 22 Oct 2019 14:00:49 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id E42A83FB45; Tue, 22 Oct 2019 14:00:48 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9ME0gNX002634 for ; Tue, 22 Oct 2019 10:00:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id 79773605AD; Tue, 22 Oct 2019 14:00:41 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id AC85C6012E for ; Tue, 22 Oct 2019 14:00:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571753056; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=5bZlN5njQZ6hIjtS4SSeo2Nqsb4gf/pK9H5ihiIpUug=; b=GZ1RFtAR1bz0DpUPN/HCDPmuRaPkgOfy3pUwlVosKrnmo2v041Nm51HCMAlKctEXcIvRul PGH/2bObfwLGjPVqwGqOhUJr2O4rHLukjJa/hgcGlGjTDMZdLOjOL5fUsQ1O7l09jV5dts sHQAhfRpnwTy6sJYhURjPPDnQDu0Gm8= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:47 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 43/75] interface: Use g_strdup_printf() instead of virAsprintf() X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: IgYmrQ1UND-1SIkmZ1T4YA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- src/interface/interface_backend_netcf.c | 4 ++-- src/interface/interface_backend_udev.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interf= ace_backend_netcf.c index 170361e761..ac50deb500 100644 --- a/src/interface/interface_backend_netcf.c +++ b/src/interface/interface_backend_netcf.c @@ -101,13 +101,13 @@ netcfStateInitialize(bool privileged, driver->privileged =3D privileged; =20 if (privileged) { - virAsprintf(&driver->stateDir, "%s/libvirt/interface", RUNSTATEDIR= ); + driver->stateDir =3D g_strdup_printf("%s/libvirt/interface", RUNST= ATEDIR); } else { g_autofree char *rundir =3D NULL; =20 if (!(rundir =3D virGetUserRuntimeDirectory())) goto error; - virAsprintf(&driver->stateDir, "%s/interface/run", rundir); + driver->stateDir =3D g_strdup_printf("%s/interface/run", rundir); } =20 if (virFileMakePathWithMode(driver->stateDir, S_IRWXU) < 0) { diff --git a/src/interface/interface_backend_udev.c b/src/interface/interfa= ce_backend_udev.c index a906756830..b7b06ed67a 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -856,7 +856,7 @@ udevGetIfaceDefBridge(struct udev *udev, } =20 /* Members of the bridge */ - virAsprintf(&member_path, "%s/%s", udev_device_get_syspath(dev), "brif= "); + member_path =3D g_strdup_printf("%s/%s", udev_device_get_syspath(dev),= "brif"); =20 /* Get each member of the bridge */ member_count =3D scandir(member_path, &member_list, @@ -918,7 +918,7 @@ udevGetIfaceDefVlan(struct udev *udev G_GNUC_UNUSED, const char *dev_prefix =3D "\nDevice: "; int ret =3D -1; =20 - virAsprintf(&procpath, "/proc/net/vlan/%s", name); + procpath =3D g_strdup_printf("/proc/net/vlan/%s", name); =20 if (virFileReadAll(procpath, BUFSIZ, &buf) < 0) goto cleanup; @@ -1161,13 +1161,13 @@ udevStateInitialize(bool privileged, driver->lockFD =3D -1; =20 if (privileged) { - virAsprintf(&driver->stateDir, "%s/libvirt/interface", RUNSTATEDIR= ); + driver->stateDir =3D g_strdup_printf("%s/libvirt/interface", RUNST= ATEDIR); } else { g_autofree char *rundir =3D NULL; =20 if (!(rundir =3D virGetUserRuntimeDirectory())) goto cleanup; - virAsprintf(&driver->stateDir, "%s/interface/run", rundir); + driver->stateDir =3D g_strdup_printf("%s/interface/run", rundir); } =20 if (virFileMakePathWithMode(driver->stateDir, S_IRWXU) < 0) { --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752864; cv=none; d=zoho.com; s=zohoarc; b=k6QTxM5Wu0JdpcxE1Udo0Dupg7AISrotNllWlZ3jkjaMgPNhqaooHPWZuZqQn8pfwCwA+TwJFFtOIzT5/IEql2DLjP5AzMsvy3bLxkGBwX6VxICMNuRJgqHNSy1j5QGbFqh3NKpAs0gQK4ts1aPryckWJ3dIXj6KJt2orLB6k+o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752864; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=PBySlvW9vq1RQfrGYRDJeTjstfxzF5f0+tP28hQDS7k=; b=citNz1Zw2adl6bifVw7WKb/XzkbPHsKKYBm7JJ/q63wg42Tv2ol2DWk/3hof5DPny3Is69dvc76yr83JVcA48Jz3WVmUQu0sFvlbo0wbDIBT7ICi/76dfmqiQU/qxuNB7DCZF3USEygokPPPbIr8sRu44zmXqycqLjZTDj7Zork= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1571752864968124.33952290905142; Tue, 22 Oct 2019 07:01:04 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-277-62lBeyCRNTu1YTp4j-jKxw-1; Tue, 22 Oct 2019 10:00:59 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8771D107AD35; Tue, 22 Oct 2019 14:00:53 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4A505194BB; Tue, 22 Oct 2019 14:00:53 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id E2014180BA98; Tue, 22 Oct 2019 14:00:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9ME0gI0002641 for ; Tue, 22 Oct 2019 10:00:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3A43C60467; Tue, 22 Oct 2019 14:00:42 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id A0C015C6D9 for ; Tue, 22 Oct 2019 14:00:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752862; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=PBySlvW9vq1RQfrGYRDJeTjstfxzF5f0+tP28hQDS7k=; b=MZMhuUVhT5vWk1474oO+1Io6g4ndNg7OU6WieND7TK+3WoCWW15jXXEU6lv26seseNBdNE JC0Em0iQFCgI6pdSNulRSOyQ15FfhGMvemtXZi+k1sEHnGXjCimNiQc78x8OEsqz7fjkAH WARmDWyPtfDZjyYgzNqI7kgRC9BonSA= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:48 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 44/75] libxl: Use g_strdup_printf() instead of virAsprintf() X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: 62lBeyCRNTu1YTp4j-jKxw-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- src/libxl/libxl_conf.c | 22 +++++++++++----------- src/libxl/libxl_domain.c | 15 +++++++-------- src/libxl/libxl_driver.c | 12 ++++++------ src/libxl/libxl_logger.c | 8 ++++---- src/libxl/libxl_migration.c | 6 +++--- src/libxl/xen_common.c | 10 +++++----- src/libxl/xen_xl.c | 12 ++++++------ src/libxl/xen_xm.c | 4 ++-- 8 files changed, 44 insertions(+), 45 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index a984c9c8aa..1ff2a6af07 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -212,7 +212,7 @@ libxlMakeChrdevStr(virDomainChrDefPtr def, char **buf) =20 case VIR_DOMAIN_CHR_TYPE_FILE: case VIR_DOMAIN_CHR_TYPE_PIPE: - virAsprintf(buf, "%s:%s", type, srcdef->data.file.path); + *buf =3D g_strdup_printf("%s:%s", type, srcdef->data.file.path); break; =20 case VIR_DOMAIN_CHR_TYPE_DEV: @@ -231,8 +231,8 @@ libxlMakeChrdevStr(virDomainChrDefPtr def, char **buf) if (bindService =3D=3D NULL) bindService =3D "0"; =20 - virAsprintf(buf, "udp:%s:%s@%s:%s", connectHost, - srcdef->data.udp.connectService, bindHost, bindService= ); + *buf =3D g_strdup_printf("udp:%s:%s@%s:%s", connectHost, + srcdef->data.udp.connectService, bindHost, b= indService); break; } =20 @@ -244,15 +244,15 @@ libxlMakeChrdevStr(virDomainChrDefPtr def, char **buf) else prefix =3D "tcp"; =20 - virAsprintf(buf, "%s:%s:%s%s", prefix, srcdef->data.tcp.host, - srcdef->data.tcp.service, - srcdef->data.tcp.listen ? ",server,nowait" : ""); + *buf =3D g_strdup_printf("%s:%s:%s%s", prefix, srcdef->data.tcp.ho= st, + srcdef->data.tcp.service, + srcdef->data.tcp.listen ? ",server,nowait" := ""); break; } =20 case VIR_DOMAIN_CHR_TYPE_UNIX: - virAsprintf(buf, "unix:%s%s", srcdef->data.nix.path, - srcdef->data.nix.listen ? ",server,nowait" : ""); + *buf =3D g_strdup_printf("unix:%s%s", srcdef->data.nix.path, + srcdef->data.nix.listen ? ",server,nowait" := ""); break; =20 default: @@ -1927,9 +1927,9 @@ libxlPrepareChannel(virDomainChrDefPtr channel, if (channel->targetType =3D=3D VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_XEN = && channel->source->type =3D=3D VIR_DOMAIN_CHR_TYPE_UNIX && !channel->source->data.nix.path) { - virAsprintf(&channel->source->data.nix.path, "%s/%s-%s", channelDi= r, - domainName, - channel->target.name ? channel->target.name : "unknown= .sock"); + channel->source->data.nix.path =3D g_strdup_printf("%s/%s-%s", cha= nnelDir, + domainName, + channel->target.n= ame ? channel->target.name : "unknown.sock"); =20 channel->source->data.nix.listen =3D true; } diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index ebb739ae54..42fca19c5b 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -714,7 +714,7 @@ libxlDomainManagedSavePath(libxlDriverPrivatePtr driver= , virDomainObjPtr vm) char *ret; g_autoptr(libxlDriverConfig) cfg =3D libxlDriverConfigGet(driver); =20 - virAsprintf(&ret, "%s/%s.save", cfg->saveDir, vm->def->name); + ret =3D g_strdup_printf("%s/%s.save", cfg->saveDir, vm->def->name); return ret; } =20 @@ -905,7 +905,7 @@ libxlDomainCleanup(libxlDriverPrivatePtr driver, } } =20 - virAsprintf(&file, "%s/%s.xml", cfg->stateDir, vm->def->name); + file =3D g_strdup_printf("%s/%s.xml", cfg->stateDir, vm->def->name); =20 if (unlink(file) < 0 && errno !=3D ENOENT && errno !=3D ENOTDIR) VIR_DEBUG("Failed to remove domain XML for %s", vm->def->name); @@ -944,8 +944,8 @@ libxlDomainAutoCoreDump(libxlDriverPrivatePtr driver, localtime_r(&curtime, &time_info); strftime(timestr, sizeof(timestr), "%Y-%m-%d-%H:%M:%S", &time_info); =20 - virAsprintf(&dumpfile, "%s/%s-%s", cfg->autoDumpDir, vm->def->name, - timestr); + dumpfile =3D g_strdup_printf("%s/%s-%s", cfg->autoDumpDir, vm->def->na= me, + timestr); =20 /* Unlock virDomainObj while dumping core */ virObjectUnlock(vm); @@ -1121,7 +1121,7 @@ libxlConsoleCallback(libxl_ctx *ctx, libxl_event *ev,= void *for_callback) for (i =3D 0; i < vm->def->nserials; i++) { chr =3D vm->def->serials[i]; =20 - virAsprintf(&chr->info.alias, "serial%zd", i); + chr->info.alias =3D g_strdup_printf("serial%zd", i); if (chr->source->type =3D=3D VIR_DOMAIN_CHR_TYPE_PTY) { if (chr->source->data.file.path) continue; @@ -1161,9 +1161,8 @@ libxlDomainCreateIfaceNames(virDomainDefPtr def, libx= l_domain_config *d_config) if (net->ifname) continue; =20 - virAsprintf(&net->ifname, - LIBXL_GENERATED_PREFIX_XEN "%d.%d%s", - def->id, x_nic->devid, suffix); + net->ifname =3D g_strdup_printf(LIBXL_GENERATED_PREFIX_XEN "%d.%d%= s", + def->id, x_nic->devid, suffix); } } =20 diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 69a949ee26..b1ea55b560 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -693,7 +693,7 @@ libxlStateInitialize(bool privileged, if (!(cfg =3D libxlDriverConfigNew())) goto error; =20 - virAsprintf(&driverConf, "%s/libxl.conf", cfg->configBaseDir); + driverConf =3D g_strdup_printf("%s/libxl.conf", cfg->configBaseDir); =20 if (libxlDriverConfigLoadFile(cfg, driverConf) < 0) goto error; @@ -5390,13 +5390,13 @@ libxlDiskSectorSize(int domid, int devno) } =20 path =3D val =3D NULL; - virAsprintf(&path, "/local/domain/%d/device/vbd/%d/backend", domid, de= vno); + path =3D g_strdup_printf("/local/domain/%d/device/vbd/%d/backend", dom= id, devno); =20 if ((val =3D xs_read(handle, XBT_NULL, path, &len)) =3D=3D NULL) goto cleanup; =20 VIR_FREE(path); - virAsprintf(&path, "%s/physical-sector-size", val); + path =3D g_strdup_printf("%s/physical-sector-size", val); =20 VIR_FREE(val); if ((val =3D xs_read(handle, XBT_NULL, path, &len)) =3D=3D NULL) @@ -5434,8 +5434,8 @@ libxlDomainBlockStatsVBD(virDomainObjPtr vm, =20 stats->backend =3D g_strdup("vbd"); =20 - virAsprintf(&path, "/sys/bus/xen-backend/devices/vbd-%d-%d/statistics", - vm->def->id, devno); + path =3D g_strdup_printf("/sys/bus/xen-backend/devices/vbd-%d-%d/stati= stics", + vm->def->id, devno); =20 if (!virFileExists(path)) { virReportError(VIR_ERR_OPERATION_FAILED, @@ -5444,7 +5444,7 @@ libxlDomainBlockStatsVBD(virDomainObjPtr vm, } =20 # define LIBXL_SET_VBDSTAT(FIELD, VAR, MUL) \ - virAsprintf(&name, "%s/"FIELD, path); \ + name =3D g_strdup_printf("%s/"FIELD, path); \ if ((virFileReadAll(name, 256, &val) < 0) || \ (sscanf(val, "%llu", &status) !=3D 1)) { \ virReportError(VIR_ERR_OPERATION_FAILED, \ diff --git a/src/libxl/libxl_logger.c b/src/libxl/libxl_logger.c index 4bdca54fcc..ffbc722f2c 100644 --- a/src/libxl/libxl_logger.c +++ b/src/libxl/libxl_logger.c @@ -158,7 +158,7 @@ libxlLoggerNew(const char *logDir, virLogPriority minLe= vel) if ((logger.files =3D virHashCreate(3, libxlLoggerFileFree)) =3D=3D NU= LL) return NULL; =20 - virAsprintf(&path, "%s/libxl-driver.log", logDir); + path =3D g_strdup_printf("%s/libxl-driver.log", logDir); =20 if ((logger.defaultLogFile =3D fopen(path, "a")) =3D=3D NULL) goto error; @@ -195,8 +195,8 @@ libxlLoggerOpenFile(libxlLoggerPtr logger, char *domidstr =3D NULL; char ebuf[1024]; =20 - virAsprintf(&path, "%s/%s.log", logger->logDir, name); - virAsprintf(&domidstr, "%d", id); + path =3D g_strdup_printf("%s/%s.log", logger->logDir, name); + domidstr =3D g_strdup_printf("%d", id); =20 if (!(logFile =3D fopen(path, "a"))) { VIR_WARN("Failed to open log file %s: %s", @@ -220,7 +220,7 @@ void libxlLoggerCloseFile(libxlLoggerPtr logger, int id) { char *domidstr =3D NULL; - virAsprintf(&domidstr, "%d", id); + domidstr =3D g_strdup_printf("%d", id); =20 ignore_value(virHashRemoveEntry(logger->files, domidstr)); =20 diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index 09b709e51b..6bee653e3f 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -709,12 +709,12 @@ libxlDomainMigrationDstPrepare(virConnectPtr dconn, goto endjob; =20 priv->migrationPort =3D port; - virAsprintf(uri_out, "tcp://%s:%d", hostname, port); + *uri_out =3D g_strdup_printf("tcp://%s:%d", hostname, port); } else { if (!(STRPREFIX(uri_in, "tcp://"))) { /* not full URI, add prefix tcp:// */ char *tmp; - virAsprintf(&tmp, "tcp://%s", uri_in); + tmp =3D g_strdup_printf("tcp://%s", uri_in); uri =3D virURIParse(tmp); VIR_FREE(tmp); } else { @@ -745,7 +745,7 @@ libxlDomainMigrationDstPrepare(virConnectPtr dconn, port =3D uri->port; } =20 - virAsprintf(uri_out, "tcp://%s:%d", hostname, port); + *uri_out =3D g_strdup_printf("tcp://%s:%d", hostname, port); } =20 snprintf(portstr, sizeof(portstr), "%d", port); diff --git a/src/libxl/xen_common.c b/src/libxl/xen_common.c index 826e6699bf..b6865098ed 100644 --- a/src/libxl/xen_common.c +++ b/src/libxl/xen_common.c @@ -1838,11 +1838,11 @@ xenFormatPCI(virConfPtr conf, virDomainDefPtr def) virConfValuePtr val, tmp; char *buf; =20 - virAsprintf(&buf, "%04x:%02x:%02x.%x", - def->hostdevs[i]->source.subsys.u.pci.addr.domain, - def->hostdevs[i]->source.subsys.u.pci.addr.bus, - def->hostdevs[i]->source.subsys.u.pci.addr.slot, - def->hostdevs[i]->source.subsys.u.pci.addr.functio= n); + buf =3D g_strdup_printf("%04x:%02x:%02x.%x", + def->hostdevs[i]->source.subsys.u.pci.ad= dr.domain, + def->hostdevs[i]->source.subsys.u.pci.ad= dr.bus, + def->hostdevs[i]->source.subsys.u.pci.ad= dr.slot, + def->hostdevs[i]->source.subsys.u.pci.ad= dr.function); =20 if (VIR_ALLOC(val) < 0) { VIR_FREE(buf); diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c index a7c51e3c98..67fb5366b2 100644 --- a/src/libxl/xen_xl.c +++ b/src/libxl/xen_xl.c @@ -83,9 +83,9 @@ static int xenParseCmdline(virConfPtr conf, char **r_cmdl= ine) VIR_WARN("ignoring root=3D and extra=3D in favour of cmdline= =3D"); } else { if (root && extra) { - virAsprintf(&cmdline, "root=3D%s %s", root, extra); + cmdline =3D g_strdup_printf("root=3D%s %s", root, extra); } else if (root) { - virAsprintf(&cmdline, "root=3D%s", root); + cmdline =3D g_strdup_printf("root=3D%s", root); } else if (extra) { cmdline =3D g_strdup(extra); } @@ -1394,7 +1394,7 @@ xenFormatXLCPUID(virConfPtr conf, virDomainDefPtr def) policy =3D "0"; break; } - virAsprintf(&cpuid_pairs[j++], "%s=3D%s", feature_name, policy); + cpuid_pairs[j++] =3D g_strdup_printf("%s=3D%s", feature_name, poli= cy); } cpuid_pairs[j] =3D NULL; =20 @@ -2068,9 +2068,9 @@ xenFormatXLUSB(virConfPtr conf, virConfValuePtr val, tmp; char *buf; =20 - virAsprintf(&buf, "hostbus=3D%x,hostaddr=3D%x", - def->hostdevs[i]->source.subsys.u.usb.bus, - def->hostdevs[i]->source.subsys.u.usb.device); + buf =3D g_strdup_printf("hostbus=3D%x,hostaddr=3D%x", + def->hostdevs[i]->source.subsys.u.usb.bu= s, + def->hostdevs[i]->source.subsys.u.usb.de= vice); =20 if (VIR_ALLOC(val) < 0) { VIR_FREE(buf); diff --git a/src/libxl/xen_xm.c b/src/libxl/xen_xm.c index d962b13cbb..6f85b2793b 100644 --- a/src/libxl/xen_xm.c +++ b/src/libxl/xen_xm.c @@ -90,9 +90,9 @@ xenParseXMOS(virConfPtr conf, virDomainDefPtr def) return -1; =20 if (root && extra) { - virAsprintf(&def->os.cmdline, "root=3D%s %s", root, extra); + def->os.cmdline =3D g_strdup_printf("root=3D%s %s", root, extr= a); } else if (root) { - virAsprintf(&def->os.cmdline, "root=3D%s", root); + def->os.cmdline =3D g_strdup_printf("root=3D%s", root); } else if (extra) { def->os.cmdline =3D g_strdup(extra); } --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752866; cv=none; d=zoho.com; s=zohoarc; b=TI5xcr2IVP55GfmzOtlr5HoSCqfKvAPR4twz2cxcNP6W1ELxe93I1s+tYAm8nl1FqYgoyK5lEBHKdPyiV/vDjVkcOBLZ8qMUM0hlkr/XgBJ5a0xk7Mdlu50ZrZlzsGyoVuxRwREp98JUCR3K7WJ4QT2G9bBP/faKA/hrhfZYUFA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752866; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=J5NpMdwQEhgwbxrVBv2LgybyjGoozMGK7XZFtbavE+0=; b=DXLnCQBskO0lxNZ3Q8IAfKstdMQ+365BSyl7YgptUJjXlU+9xhyyyHXEAlP4kgw/K/wo1Gvi+dECHJEu5LBp7ec8UFk9kLvgo/hjjjrVASpvFro4h58USkiMgXSFW1Eyxfi/O/QZQ1C2YQqO8d+YMVL+fb/fuYaaE6by4jQfP1U= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1571752866743481.56456760989045; Tue, 22 Oct 2019 07:01:06 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-360-RomgnUx8PUm7LrjFJP_usA-1; Tue, 22 Oct 2019 10:01:00 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E0564801E5C; Tue, 22 Oct 2019 14:00:54 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9C48152CF; Tue, 22 Oct 2019 14:00:54 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 3ECC4180BA98; Tue, 22 Oct 2019 14:00:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9ME0iwb002652 for ; Tue, 22 Oct 2019 10:00:44 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6DA1060559; Tue, 22 Oct 2019 14:00:43 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id A2C6060475 for ; Tue, 22 Oct 2019 14:00:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752865; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=J5NpMdwQEhgwbxrVBv2LgybyjGoozMGK7XZFtbavE+0=; b=b3H9j0EX9vLvJMcJ2o1yTYoIjFIq/syu+DlMC88K0D59aPPb06REnXgAnbqTUV3YG8lCAU 0MeKFkGedTWQAtMEyYC0geKceq3xbWRchiwb1sNAF8rIKGdEJom6s7g/dU/Hp7rR8JJrmS WaK76os/PUHE/9FquO3CRnIhTmns3mw= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:49 +0200 Message-Id: <4f918e7da08b2ea099a78b39f59853fdeb1992ba.1571752582.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 45/75] locking: Use g_strdup_printf() instead of virAsprintf() X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: RomgnUx8PUm7LrjFJP_usA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Michal Privoznik Reviewed-by: Daniel Henrique Barboza --- src/locking/lock_daemon.c | 8 ++++---- src/locking/lock_daemon_config.c | 2 +- src/locking/lock_driver_lockd.c | 4 ++-- src/locking/lock_driver_sanlock.c | 8 ++++---- src/locking/lock_manager.c | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index dc23179009..2fa3238794 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -464,8 +464,8 @@ virLockDaemonUnixSocketPaths(bool privileged, } umask(old_umask); =20 - virAsprintf(sockfile, "%s/virtlockd-sock", rundir); - virAsprintf(adminSockfile, "%s/virtlockd-admin-sock", rundir); + *sockfile =3D g_strdup_printf("%s/virtlockd-sock", rundir); + *adminSockfile =3D g_strdup_printf("%s/virtlockd-admin-sock", rund= ir); =20 VIR_FREE(rundir); } @@ -841,7 +841,7 @@ virLockDaemonExecRestartStatePath(bool privileged, } umask(old_umask); =20 - virAsprintf(state_file, "%s/virtlockd-restart-exec.json", rundir); + *state_file =3D g_strdup_printf("%s/virtlockd-restart-exec.json", = rundir); =20 VIR_FREE(rundir); } @@ -858,7 +858,7 @@ virLockDaemonGetExecRestartMagic(void) { char *ret; =20 - virAsprintf(&ret, "%lld", (long long int)getpid()); + ret =3D g_strdup_printf("%lld", (long long int)getpid()); return ret; } =20 diff --git a/src/locking/lock_daemon_config.c b/src/locking/lock_daemon_con= fig.c index e77e2b7bf6..d7e13013d7 100644 --- a/src/locking/lock_daemon_config.c +++ b/src/locking/lock_daemon_config.c @@ -46,7 +46,7 @@ virLockDaemonConfigFilePath(bool privileged, char **confi= gfile) if (!(configdir =3D virGetUserConfigDirectory())) goto error; =20 - virAsprintf(configfile, "%s/virtlockd.conf", configdir); + *configfile =3D g_strdup_printf("%s/virtlockd.conf", configdir); VIR_FREE(configdir); } =20 diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lock= d.c index 73f699044b..e8f0329b05 100644 --- a/src/locking/lock_driver_lockd.c +++ b/src/locking/lock_driver_lockd.c @@ -127,7 +127,7 @@ static char *virLockManagerLockDaemonPath(bool privileg= ed) if (!(rundir =3D virGetUserRuntimeDirectory())) return NULL; =20 - virAsprintf(&path, "%s/virtlockd-sock", rundir); + path =3D g_strdup_printf("%s/virtlockd-sock", rundir); =20 VIR_FREE(rundir); } @@ -574,7 +574,7 @@ static int virLockManagerLockDaemonAddResource(virLockM= anagerPtr lock, _("Missing path or lockspace for lease resource= ")); goto cleanup; } - virAsprintf(&newLockspace, "%s/%s", path, lockspace); + newLockspace =3D g_strdup_printf("%s/%s", path, lockspace); newName =3D g_strdup(name); =20 } break; diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sa= nlock.c index 55f0a3621d..31fbfb5d7e 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -103,7 +103,7 @@ virLockManagerSanlockError(int err, #if HAVE_SANLOCK_STRERROR *message =3D g_strdup(sanlock_strerror(err)); #else - virAsprintf(message, _("sanlock error %d"), err); + message =3D g_strdup_printf(_("sanlock error %d"), err); #endif return true; } else { @@ -211,8 +211,8 @@ virLockManagerSanlockSetupLockspace(virLockManagerSanlo= ckDriverPtr driver) char *dir =3D NULL; int retries =3D LOCKSPACE_RETRIES; =20 - virAsprintf(&path, "%s/%s", driver->autoDiskLeasePath, - VIR_LOCK_MANAGER_SANLOCK_AUTO_DISK_LOCKSPACE); + path =3D g_strdup_printf("%s/%s", driver->autoDiskLeasePath, + VIR_LOCK_MANAGER_SANLOCK_AUTO_DISK_LOCKSPACE); =20 if (virStrcpyStatic(ls.name, VIR_LOCK_MANAGER_SANLOCK_AUTO_DISK_LOCKSPACE) < 0)= { @@ -643,7 +643,7 @@ virLockManagerSanlockAddDisk(virLockManagerSanlockDrive= rPtr driver, goto cleanup; } =20 - virAsprintf(&path, "%s/%s", driver->autoDiskLeasePath, res->name); + path =3D g_strdup_printf("%s/%s", driver->autoDiskLeasePath, res->name= ); if (virStrcpy(res->disks[0].path, path, SANLK_PATH_LEN) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Lease path '%s' exceeds %d characters"), diff --git a/src/locking/lock_manager.c b/src/locking/lock_manager.c index 0986cafe6c..07318fb53f 100644 --- a/src/locking/lock_manager.c +++ b/src/locking/lock_manager.c @@ -131,7 +131,7 @@ virLockManagerPluginPtr virLockManagerPluginNew(const c= har *name, VIR_DEBUG("name=3D%s driverName=3D%s configDir=3D%s flags=3D0x%x", name, driverName, configDir, flags); =20 - virAsprintf(&configFile, "%s/%s-%s.conf", configDir, driverName, name); + configFile =3D g_strdup_printf("%s/%s-%s.conf", configDir, driverName,= name); =20 if (STREQ(name, "nop")) { driver =3D &virLockDriverNop; --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752866; cv=none; d=zoho.com; s=zohoarc; b=QkFzuekDwI0Tw0ZpR1rvv1sTwhVkVbhO58ztLo6KH4HW/fxrbfGoLNYLyyKjcAsr0rtTK/hU2y2nM7u6SugrjmaaUcnGO58HKjUTCT+efGeovjQenaEiGmcLGMIvab1a8hIm8g3ViPz7GMXIvZh/6y5CstdRDAto0LU5JBkUaZA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752866; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZiPs6Biib2HO3B5Zq6EbISdzBjnliRvB3a2YrzWuqbI=; b=nNJI0bJxGcqkdquHusYLPb733pxaGNBksXNlWASxERFPOIysWUjaFB0IcbglG1Oxl0KIOBxZ15vat+4YSP+g1rdA0vw8wUijpJwoGkLU26c0XmBREAC2h6CRv288GuuwBEfycpmtrJB/l8yzMwYiAg0TyRdytQFzJqKNSgcgK64= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1571752866967204.38719352490057; Tue, 22 Oct 2019 07:01:06 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-236-nJ3pyc4cP6aFksNypLxetA-1; Tue, 22 Oct 2019 10:01:03 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8B6671800E04; Tue, 22 Oct 2019 14:00:58 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 568615C219; Tue, 22 Oct 2019 14:00:58 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id EA33B180BA9F; Tue, 22 Oct 2019 14:00:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9ME0isI002662 for ; Tue, 22 Oct 2019 10:00:44 -0400 Received: by smtp.corp.redhat.com (Postfix) id 26BA660466; Tue, 22 Oct 2019 14:00:44 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 93F0463B90 for ; Tue, 22 Oct 2019 14:00:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752865; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=ZiPs6Biib2HO3B5Zq6EbISdzBjnliRvB3a2YrzWuqbI=; b=NVNbaC6hbj1XW+gXryjf0Pz3MCJTVY04StH6d5eH4lpFi8HQvK55aZyS6P8gSWxz18OcEA 6Boa328aaiSC8egjY/bS2NML5NjpUlkin2qFnZM4zRoOrKAC+IqaFUmR1Jn0IBn1r1ZKGb 2GNwsnTKq4cs3W0OFAM1YUOT4m0qRNw= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:50 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 46/75] logging: Use g_strdup_printf() instead of virAsprintf() X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: nJ3pyc4cP6aFksNypLxetA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Michal Privoznik Reviewed-by: Daniel Henrique Barboza --- src/logging/log_daemon.c | 8 ++++---- src/logging/log_daemon_config.c | 2 +- src/logging/log_manager.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index 2304c310d1..268d3c62b9 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -405,8 +405,8 @@ virLogDaemonUnixSocketPaths(bool privileged, } umask(old_umask); =20 - virAsprintf(sockfile, "%s/virtlogd-sock", rundir); - virAsprintf(adminSockfile, "%s/virtlogd-admin-sock", rundir); + *sockfile =3D g_strdup_printf("%s/virtlogd-sock", rundir); + *adminSockfile =3D g_strdup_printf("%s/virtlogd-admin-sock", rundi= r); =20 VIR_FREE(rundir); } @@ -632,7 +632,7 @@ virLogDaemonExecRestartStatePath(bool privileged, } umask(old_umask); =20 - virAsprintf(state_file, "%s/virtlogd-restart-exec.json", rundir); + *state_file =3D g_strdup_printf("%s/virtlogd-restart-exec.json", r= undir); =20 VIR_FREE(rundir); } @@ -649,7 +649,7 @@ virLogDaemonGetExecRestartMagic(void) { char *ret; =20 - virAsprintf(&ret, "%lld", (long long int)getpid()); + ret =3D g_strdup_printf("%lld", (long long int)getpid()); return ret; } =20 diff --git a/src/logging/log_daemon_config.c b/src/logging/log_daemon_confi= g.c index a0e4c4dd1b..0cf9729e7f 100644 --- a/src/logging/log_daemon_config.c +++ b/src/logging/log_daemon_config.c @@ -47,7 +47,7 @@ virLogDaemonConfigFilePath(bool privileged, char **config= file) if (!(configdir =3D virGetUserConfigDirectory())) goto error; =20 - virAsprintf(configfile, "%s/virtlogd.conf", configdir); + *configfile =3D g_strdup_printf("%s/virtlogd.conf", configdir); VIR_FREE(configdir); } =20 diff --git a/src/logging/log_manager.c b/src/logging/log_manager.c index 024fe9b592..e191093272 100644 --- a/src/logging/log_manager.c +++ b/src/logging/log_manager.c @@ -52,7 +52,7 @@ virLogManagerDaemonPath(bool privileged) if (!(rundir =3D virGetUserRuntimeDirectory())) return NULL; =20 - virAsprintf(&path, "%s/virtlogd-sock", rundir); + path =3D g_strdup_printf("%s/virtlogd-sock", rundir); =20 VIR_FREE(rundir); } --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752874; cv=none; d=zoho.com; s=zohoarc; b=AW4mRj2ZGrt0XZm8X9bda6FWztn+rd0/f1pVf3gpQR36mlFe+XLl3NL+gUwfbcCku4fU8lzFlXhYTDSaY54bHOB3yROaD9cFaVmQ90bl5LlWu6SbJI7VRN1yQwZmum2aZoG0qNf5KbSQHRrkPU5xA1gpku2NV9Uo+GfvTfsKEgE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752874; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+5kBCSxVCMXhV4Vi/cvxasNzv3dSbcL9wojcVo54MV0=; b=Qa7ZVTMVX47ZxWU9F21oKClywz0w3XvZe7vjZy5FpDu99eIVunosiGjHYcnuNbPo7syHTjKPkKqb6LzwFZIicUDWocA6SUvjIqdsiPBFNEO7ib9N3B1ZBJzBGV+pXx/j/aQSFe9M9S8F35RfWMX9ti7aZvI0zqdrQnfN9/FMYzQ= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1571752874494765.9222204950145; Tue, 22 Oct 2019 07:01:14 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-233-6qspmUCIMRCdF2_PqqpnNQ-1; Tue, 22 Oct 2019 10:01:10 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E83F5800D4E; Tue, 22 Oct 2019 14:01:04 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AF63F5D6B0; Tue, 22 Oct 2019 14:01:04 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 24F8C180BA98; Tue, 22 Oct 2019 14:01:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9ME0jEH002673 for ; Tue, 22 Oct 2019 10:00:45 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2775060BDF; Tue, 22 Oct 2019 14:00:45 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 72B0C60475 for ; Tue, 22 Oct 2019 14:00:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752873; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=+5kBCSxVCMXhV4Vi/cvxasNzv3dSbcL9wojcVo54MV0=; b=TwgyWTbsstruasPtyVQi/fjHZd2+P7eg/DCSrr2O81sTEFIJFUrEH1yk3XQEHzzdErU/lR laqa33lQy9iQON5RIx4vWMOEzebFR4vviuzUS7+0wTnq0VmH18lJbj/eo6GMC7ZJc+gWHS tYTqE2TQMMTVK71rb0hcGtkjpmsRJ9E= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:51 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 47/75] lxc: Use g_strdup_printf() instead of virAsprintf() X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: 6qspmUCIMRCdF2_PqqpnNQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Michal Privoznik Reviewed-by: Daniel Henrique Barboza --- src/lxc/lxc_container.c | 41 +++++++++++++++++------------------ src/lxc/lxc_controller.c | 46 ++++++++++++++++++++-------------------- src/lxc/lxc_driver.c | 8 +++---- src/lxc/lxc_fuse.c | 6 +++--- src/lxc/lxc_monitor.c | 2 +- src/lxc/lxc_native.c | 8 +++---- src/lxc/lxc_process.c | 20 ++++++++--------- 7 files changed, 65 insertions(+), 66 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 090a22571d..0ad872b65b 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -682,7 +682,7 @@ static int lxcContainerPrepareRoot(virDomainDefPtr def, if (lxcContainerResolveSymlinks(root, false) < 0) return -1; =20 - virAsprintf(&dst, "%s/%s.root", LXC_STATE_DIR, def->name); + dst =3D g_strdup_printf("%s/%s.root", LXC_STATE_DIR, def->name); =20 tmp =3D root->dst; root->dst =3D dst; @@ -717,7 +717,7 @@ static int lxcContainerPivotRoot(virDomainFSDefPtr root) goto err; } =20 - virAsprintf(&oldroot, "%s/.oldroot", root->src->path); + oldroot =3D g_strdup_printf("%s/.oldroot", root->src->path); =20 if (virFileMakePath(oldroot) < 0) { virReportSystemError(errno, @@ -736,7 +736,7 @@ static int lxcContainerPivotRoot(virDomainFSDefPtr root) } =20 /* Create a directory called 'new' in tmpfs */ - virAsprintf(&newroot, "%s/new", oldroot); + newroot =3D g_strdup_printf("%s/new", oldroot); =20 if (virFileMakePath(newroot) < 0) { virReportSystemError(errno, @@ -921,7 +921,7 @@ static int lxcContainerMountBasicFS(bool userns_enabled, char *hostdir; int ret; =20 - virAsprintf(&hostdir, "/.oldroot%s", mnt->dst); + hostdir =3D g_strdup_printf("/.oldroot%s", mnt->dst); =20 ret =3D virFileIsMountPoint(hostdir); VIR_FREE(hostdir); @@ -1012,10 +1012,9 @@ static int lxcContainerMountProcFuse(virDomainDefPtr= def, =20 VIR_DEBUG("Mount /proc/meminfo stateDir=3D%s", stateDir); =20 - virAsprintf(&meminfo_path, - "/.oldroot/%s/%s.fuse/meminfo", - stateDir, - def->name); + meminfo_path =3D g_strdup_printf("/.oldroot/%s/%s.fuse/meminfo", + stateDir, + def->name); =20 if ((ret =3D mount(meminfo_path, "/proc/meminfo", NULL, MS_BIND, NULL)) < 0) { @@ -1044,7 +1043,7 @@ static int lxcContainerMountFSDev(virDomainDefPtr def, =20 VIR_DEBUG("Mount /dev/ stateDir=3D%s", stateDir); =20 - virAsprintf(&path, "/.oldroot/%s/%s.dev", stateDir, def->name); + path =3D g_strdup_printf("/.oldroot/%s/%s.dev", stateDir, def->name); =20 if (virFileMakePath("/dev") < 0) { virReportSystemError(errno, "%s", @@ -1078,7 +1077,7 @@ static int lxcContainerMountFSDevPTS(virDomainDefPtr = def, =20 VIR_DEBUG("Mount /dev/pts stateDir=3D%s", stateDir); =20 - virAsprintf(&path, "/.oldroot/%s/%s.devpts", stateDir, def->name); + path =3D g_strdup_printf("/.oldroot/%s/%s.devpts", stateDir, def->name= ); =20 if (virFileMakePath("/dev/pts") < 0) { virReportSystemError(errno, "%s", @@ -1130,7 +1129,7 @@ static int lxcContainerSetupDevices(char **ttyPaths, = size_t nttyPaths) =20 for (i =3D 0; i < nttyPaths; i++) { char *tty; - virAsprintf(&tty, "/dev/tty%zu", i + 1); + tty =3D g_strdup_printf("/dev/tty%zu", i + 1); =20 if (virFileBindMountDevice(ttyPaths[i], tty) < 0) { VIR_FREE(tty); @@ -1156,7 +1155,7 @@ static int lxcContainerMountFSBind(virDomainFSDefPtr = fs, =20 VIR_DEBUG("src=3D%s dst=3D%s", fs->src->path, fs->dst); =20 - virAsprintf(&src, "%s%s", srcprefix, fs->src->path); + src =3D g_strdup_printf("%s%s", srcprefix, fs->src->path); =20 if (stat(fs->dst, &st) < 0) { if (errno !=3D ENOENT) { @@ -1326,8 +1325,8 @@ static int lxcContainerMountFSBlockAuto(virDomainFSDe= fPtr fs, =20 /* First time around we use /etc/filesystems */ retry: - virAsprintf(&fslist, "%s%s", srcprefix, - tryProc ? "/proc/filesystems" : "/etc/filesystems"); + fslist =3D g_strdup_printf("%s%s", srcprefix, + tryProc ? "/proc/filesystems" : "/etc/filesys= tems"); =20 VIR_DEBUG("Open fslist %s", fslist); if (!(fp =3D fopen(fslist, "r"))) { @@ -1488,7 +1487,7 @@ static int lxcContainerMountFSBlock(virDomainFSDefPtr= fs, =20 VIR_DEBUG("src=3D%s dst=3D%s", fs->src->path, fs->dst); =20 - virAsprintf(&src, "%s%s", srcprefix, fs->src->path); + src =3D g_strdup_printf("%s%s", srcprefix, fs->src->path); =20 ret =3D lxcContainerMountFSBlockHelper(fs, src, srcprefix, sec_mount_o= ptions); =20 @@ -1507,7 +1506,7 @@ static int lxcContainerMountFSTmpfs(virDomainFSDefPtr= fs, =20 VIR_DEBUG("usage=3D%lld sec=3D%s", fs->usage, sec_mount_options); =20 - virAsprintf(&data, "size=3D%lld%s", fs->usage, sec_mount_options); + data =3D g_strdup_printf("size=3D%lld%s", fs->usage, sec_mount_options= ); =20 if (virFileMakePath(fs->dst) < 0) { virReportSystemError(errno, @@ -1655,20 +1654,20 @@ static int lxcContainerUnmountForSharedRoot(const c= har *stateDir, =20 /* These filesystems are created by libvirt temporarily, they * shouldn't appear in container. */ - virAsprintf(&tmp, "%s/%s.dev", stateDir, domain); + tmp =3D g_strdup_printf("%s/%s.dev", stateDir, domain); =20 if (lxcContainerUnmountSubtree(tmp, false) < 0) goto cleanup; =20 VIR_FREE(tmp); - virAsprintf(&tmp, "%s/%s.devpts", stateDir, domain); + tmp =3D g_strdup_printf("%s/%s.devpts", stateDir, domain); =20 if (lxcContainerUnmountSubtree(tmp, false) < 0) goto cleanup; =20 #if WITH_FUSE VIR_FREE(tmp); - virAsprintf(&tmp, "%s/%s.fuse", stateDir, domain); + tmp =3D g_strdup_printf("%s/%s.fuse", stateDir, domain); =20 if (lxcContainerUnmountSubtree(tmp, false) < 0) goto cleanup; @@ -2232,8 +2231,8 @@ static int lxcContainerChild(void *data) const char *tty =3D argv->ttyPaths[0]; if (STRPREFIX(tty, "/dev/pts/")) tty +=3D strlen("/dev/pts/"); - virAsprintf(&ttyPath, "%s/%s.devpts/%s", LXC_STATE_DIR, vmDef->nam= e, - tty); + ttyPath =3D g_strdup_printf("%s/%s.devpts/%s", LXC_STATE_DIR, vmDe= f->name, + tty); } else { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("At least one tty is required")); diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 56e30eeaa9..17c4282be4 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -568,7 +568,7 @@ static int virLXCControllerAppendNBDPids(virLXCControll= erPtr ctrl, if (!STRPREFIX(dev, "/dev/")) goto cleanup; =20 - virAsprintf(&pidpath, "/sys/devices/virtual/block/%s/pid", dev + 5); + pidpath =3D g_strdup_printf("/sys/devices/virtual/block/%s/pid", dev += 5); =20 /* Wait for the pid file to appear */ while (!virFileExists(pidpath)) { @@ -946,7 +946,7 @@ static int virLXCControllerSetupServer(virLXCController= Ptr ctrl) virNetServerServicePtr svc =3D NULL; char *sockpath; =20 - virAsprintf(&sockpath, "%s/%s.sock", LXC_STATE_DIR, ctrl->name); + sockpath =3D g_strdup_printf("%s/%s.sock", LXC_STATE_DIR, ctrl->name); =20 if (!(srv =3D virNetServerNew("LXC", 1, 0, 0, 0, 1, @@ -1434,14 +1434,14 @@ static int virLXCControllerSetupUserns(virLXCContro= llerPtr ctrl) } =20 VIR_DEBUG("Setting up userns maps"); - virAsprintf(&uid_map, "/proc/%d/uid_map", ctrl->initpid); + uid_map =3D g_strdup_printf("/proc/%d/uid_map", ctrl->initpid); =20 if (virLXCControllerSetupUsernsMap(ctrl->def->idmap.uidmap, ctrl->def->idmap.nuidmap, uid_map) < 0) goto cleanup; =20 - virAsprintf(&gid_map, "/proc/%d/gid_map", ctrl->initpid); + gid_map =3D g_strdup_printf("/proc/%d/gid_map", ctrl->initpid); =20 if (virLXCControllerSetupUsernsMap(ctrl->def->idmap.gidmap, ctrl->def->idmap.ngidmap, @@ -1467,14 +1467,14 @@ static int virLXCControllerSetupDev(virLXCControlle= rPtr ctrl) mount_options =3D virSecurityManagerGetMountOptions(ctrl->securityMana= ger, ctrl->def); =20 - virAsprintf(&dev, "/%s/%s.dev", LXC_STATE_DIR, ctrl->def->name); + dev =3D g_strdup_printf("/%s/%s.dev", LXC_STATE_DIR, ctrl->def->name); =20 /* * tmpfs is limited to 64kb, since we only have device nodes in there * and don't want to DOS the entire OS RAM usage */ =20 - virAsprintf(&opts, "mode=3D755,size=3D65536%s", mount_options); + opts =3D g_strdup_printf("mode=3D755,size=3D65536%s", mount_options); =20 if (virFileSetupDev(dev, opts) < 0) goto cleanup; @@ -1514,8 +1514,8 @@ static int virLXCControllerPopulateDevices(virLXCCont= rollerPtr ctrl) =20 /* Populate /dev/ with a few important bits */ for (i =3D 0; i < G_N_ELEMENTS(devs); i++) { - virAsprintf(&path, "/%s/%s.dev/%s", LXC_STATE_DIR, ctrl->def->name, - devs[i].path); + path =3D g_strdup_printf("/%s/%s.dev/%s", LXC_STATE_DIR, ctrl->def= ->name, + devs[i].path); =20 dev_t dev =3D makedev(devs[i].maj, devs[i].min); if (mknod(path, S_IFCHR, dev) < 0 || @@ -1553,13 +1553,13 @@ virLXCControllerSetupHostdevSubsysUSB(virDomainDefP= tr vmDef, mode_t mode; virDomainHostdevSubsysUSBPtr usbsrc =3D &def->source.subsys.u.usb; =20 - virAsprintf(&src, USB_DEVFS "/%03d/%03d", usbsrc->bus, usbsrc->device); + src =3D g_strdup_printf(USB_DEVFS "/%03d/%03d", usbsrc->bus, usbsrc->d= evice); =20 - virAsprintf(&vroot, "/%s/%s.dev/bus/usb/", LXC_STATE_DIR, vmDef->name); + vroot =3D g_strdup_printf("/%s/%s.dev/bus/usb/", LXC_STATE_DIR, vmDef-= >name); =20 - virAsprintf(&dstdir, "%s/%03d/", vroot, usbsrc->bus); + dstdir =3D g_strdup_printf("%s/%03d/", vroot, usbsrc->bus); =20 - virAsprintf(&dstfile, "%s/%03d", dstdir, usbsrc->device); + dstfile =3D g_strdup_printf("%s/%03d", dstdir, usbsrc->device); =20 if (stat(src, &sb) < 0) { virReportSystemError(errno, @@ -1633,7 +1633,7 @@ virLXCControllerSetupHostdevCapsStorage(virDomainDefP= tr vmDef, while (*(path + len) =3D=3D '/') len++; =20 - virAsprintf(&dst, "/%s/%s.dev/%s", LXC_STATE_DIR, vmDef->name, + dst =3D g_strdup_printf("/%s/%s.dev/%s", LXC_STATE_DIR, vmDef->name, strchr(path + len, '/')); =20 if (stat(dev, &sb) < 0) { @@ -1709,8 +1709,8 @@ virLXCControllerSetupHostdevCapsMisc(virDomainDefPtr = vmDef, while (*(path + len) =3D=3D '/') len++; =20 - virAsprintf(&dst, "/%s/%s.dev/%s", LXC_STATE_DIR, vmDef->name, - strchr(path + len, '/')); + dst =3D g_strdup_printf("/%s/%s.dev/%s", LXC_STATE_DIR, vmDef->name, + strchr(path + len, '/')); =20 if (stat(dev, &sb) < 0) { virReportSystemError(errno, @@ -1865,8 +1865,8 @@ static int virLXCControllerSetupDisk(virLXCController= Ptr ctrl, goto cleanup; } =20 - virAsprintf(&dst, "/%s/%s.dev/%s", LXC_STATE_DIR, ctrl->def->name, - def->dst); + dst =3D g_strdup_printf("/%s/%s.dev/%s", LXC_STATE_DIR, ctrl->def->nam= e, + def->dst); =20 if (stat(def->src->path, &sb) < 0) { virReportSystemError(errno, @@ -2055,8 +2055,8 @@ lxcCreateTty(virLXCControllerPtr ctrl, int *ttymaster, * while glibc has to fstat(), fchmod(), and fchown() for older * kernels, we can skip those steps. ptyno shouldn't currently be * anything other than 0, but let's play it safe. */ - virAsprintf(ttyName, "/dev/pts/%d", ptyno); - virAsprintf(ttyHostPath, "/%s/%s.devpts/%d", LXC_STATE_DIR, ctrl->def-= >name, ptyno); + *ttyName =3D g_strdup_printf("/dev/pts/%d", ptyno); + *ttyHostPath =3D g_strdup_printf("/%s/%s.devpts/%d", LXC_STATE_DIR, ct= rl->def->name, ptyno); =20 ret =3D 0; =20 @@ -2112,8 +2112,8 @@ virLXCControllerSetupDevPTS(virLXCControllerPtr ctrl) mount_options =3D virSecurityManagerGetMountOptions(ctrl->securityMana= ger, ctrl->def); =20 - virAsprintf(&devpts, "%s/%s.devpts", LXC_STATE_DIR, ctrl->def->name); - virAsprintf(&ctrl->devptmx, "%s/%s.devpts/ptmx", LXC_STATE_DIR, ctrl->= def->name); + devpts =3D g_strdup_printf("%s/%s.devpts", LXC_STATE_DIR, ctrl->def->n= ame); + ctrl->devptmx =3D g_strdup_printf("%s/%s.devpts/ptmx", LXC_STATE_DIR, = ctrl->def->name); =20 if (virFileMakePath(devpts) < 0) { virReportSystemError(errno, @@ -2129,8 +2129,8 @@ virLXCControllerSetupDevPTS(virLXCControllerPtr ctrl) =20 /* XXX should we support gid=3DX for X!=3D5 for distros which use * a different gid for tty? */ - virAsprintf(&opts, "newinstance,ptmxmode=3D0666,mode=3D0620,gid=3D%u%s= ", ptsgid, - NULLSTR_EMPTY(mount_options)); + opts =3D g_strdup_printf("newinstance,ptmxmode=3D0666,mode=3D0620,gid= =3D%u%s", ptsgid, + NULLSTR_EMPTY(mount_options)); =20 VIR_DEBUG("Mount devpts on %s type=3Dtmpfs flags=3D0x%x, opts=3D%s", devpts, MS_NOSUID, opts); diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index acaeae9311..2de252ee87 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -3788,7 +3788,7 @@ lxcDomainAttachDeviceDiskLive(virLXCDriverPtr driver, if (VIR_REALLOC_N(vm->def->disks, vm->def->ndisks + 1) < 0) goto cleanup; =20 - virAsprintf(&file, "/dev/%s", def->dst); + file =3D g_strdup_printf("/dev/%s", def->dst); =20 if (lxcDomainAttachDeviceMknod(driver, 0700 | S_IFBLK, @@ -3973,7 +3973,7 @@ lxcDomainAttachDeviceHostdevSubsysUSBLive(virLXCDrive= rPtr driver, } =20 usbsrc =3D &def->source.subsys.u.usb; - virAsprintf(&src, "/dev/bus/usb/%03d/%03d", usbsrc->bus, usbsrc->devic= e); + src =3D g_strdup_printf("/dev/bus/usb/%03d/%03d", usbsrc->bus, usbsrc-= >device); =20 if (!(usb =3D virUSBDeviceNew(usbsrc->bus, usbsrc->device, NULL))) goto cleanup; @@ -4309,7 +4309,7 @@ lxcDomainDetachDeviceDiskLive(virDomainObjPtr vm, def =3D vm->def->disks[idx]; src =3D virDomainDiskGetSource(def); =20 - virAsprintf(&dst, "/dev/%s", def->dst); + dst =3D g_strdup_printf("/dev/%s", def->dst); =20 if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_DEVICE= S)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", @@ -4447,7 +4447,7 @@ lxcDomainDetachDeviceHostdevUSBLive(virLXCDriverPtr d= river, } =20 usbsrc =3D &def->source.subsys.u.usb; - virAsprintf(&dst, "/dev/bus/usb/%03d/%03d", usbsrc->bus, usbsrc->devic= e); + dst =3D g_strdup_printf("/dev/bus/usb/%03d/%03d", usbsrc->bus, usbsrc-= >device); =20 if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_DEVICE= S)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", diff --git a/src/lxc/lxc_fuse.c b/src/lxc/lxc_fuse.c index 35dbad7986..3e2ad197d3 100644 --- a/src/lxc/lxc_fuse.c +++ b/src/lxc/lxc_fuse.c @@ -47,7 +47,7 @@ static int lxcProcGetattr(const char *path, struct stat *= stbuf) virDomainDefPtr def =3D (virDomainDefPtr)context->private_data; =20 memset(stbuf, 0, sizeof(struct stat)); - virAsprintf(&mempath, "/proc/%s", path); + mempath =3D g_strdup_printf("/proc/%s", path); =20 res =3D 0; =20 @@ -250,7 +250,7 @@ static int lxcProcRead(const char *path G_GNUC_UNUSED, struct fuse_context *context =3D NULL; virDomainDefPtr def =3D NULL; =20 - virAsprintf(&hostpath, "/proc/%s", path); + hostpath =3D g_strdup_printf("/proc/%s", path); =20 context =3D fuse_get_context(); def =3D (virDomainDefPtr)context->private_data; @@ -305,7 +305,7 @@ int lxcSetupFuse(virLXCFusePtr *f, virDomainDefPtr def) if (virMutexInit(&fuse->lock) < 0) goto cleanup2; =20 - virAsprintf(&fuse->mountpoint, "%s/%s.fuse/", LXC_STATE_DIR, def->name= ); + fuse->mountpoint =3D g_strdup_printf("%s/%s.fuse/", LXC_STATE_DIR, def= ->name); =20 if (virFileMakePath(fuse->mountpoint) < 0) { virReportSystemError(errno, _("Cannot create %s"), diff --git a/src/lxc/lxc_monitor.c b/src/lxc/lxc_monitor.c index 1983af135e..479125374b 100644 --- a/src/lxc/lxc_monitor.c +++ b/src/lxc/lxc_monitor.c @@ -151,7 +151,7 @@ virLXCMonitorPtr virLXCMonitorNew(virDomainObjPtr vm, if (!(mon =3D virObjectLockableNew(virLXCMonitorClass))) return NULL; =20 - virAsprintf(&sockpath, "%s/%s.sock", socketdir, vm->def->name); + sockpath =3D g_strdup_printf("%s/%s.sock", socketdir, vm->def->name); =20 if (!(mon->client =3D virNetClientNewUNIX(sockpath, false, NULL))) goto error; diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index c7cf2c4b0e..b9dffd6de9 100644 --- a/src/lxc/lxc_native.c +++ b/src/lxc/lxc_native.c @@ -265,7 +265,7 @@ lxcAddFstabLine(virDomainDefPtr def, lxcFstabPtr fstab) return -1; =20 if (fstab->dst[0] !=3D '/') { - virAsprintf(&dst, "/%s", fstab->dst); + dst =3D g_strdup_printf("/%s", fstab->dst); } else { dst =3D g_strdup(fstab->dst); } @@ -491,8 +491,8 @@ lxcAddNetworkDefinition(lxcNetworkParseData *data) * on the host */ if (isVlan && data->vlanid) { VIR_FREE(hostdev->source.caps.u.net.ifname); - virAsprintf(&hostdev->source.caps.u.net.ifname, "%s.%s", - data->link, data->vlanid); + hostdev->source.caps.u.net.ifname =3D g_strdup_printf("%s.%s", + data->link= , data->vlanid); } =20 hostdev->source.caps.u.net.ip.ips =3D data->ips; @@ -948,7 +948,7 @@ lxcBlkioDeviceWalkCallback(const char *name, virConfVal= uePtr value, void *data) goto cleanup; } =20 - virAsprintf(&path, "/dev/block/%s", parts[0]); + path =3D g_strdup_printf("/dev/block/%s", parts[0]); =20 /* Do we already have a device definition for this path? * Get that device or create a new one */ diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 2ec5762856..b59e66c29a 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -138,7 +138,7 @@ lxcProcessRemoveDomainStatus(virLXCDriverConfigPtr cfg, char ebuf[1024]; char *file =3D NULL; =20 - virAsprintf(&file, "%s/%s.xml", cfg->stateDir, vm->def->name); + file =3D g_strdup_printf("%s/%s.xml", cfg->stateDir, vm->def->name); =20 if (unlink(file) < 0 && errno !=3D ENOENT && errno !=3D ENOTDIR) VIR_WARN("Failed to remove domain XML for %s: %s", @@ -418,8 +418,8 @@ static int virLXCProcessSetupNamespaceName(virConnectPt= r conn, int ns_type, cons goto cleanup; } =20 - virAsprintf(&path, "/proc/%lld/ns/%s", (long long int)priv->initpid, - nsInfoLocal[ns_type]); + path =3D g_strdup_printf("/proc/%lld/ns/%s", (long long int)priv->init= pid, + nsInfoLocal[ns_type]); =20 if ((fd =3D open(path, O_RDONLY)) < 0) { virReportSystemError(errno, @@ -440,7 +440,7 @@ static int virLXCProcessSetupNamespacePID(int ns_type, = const char *name) int fd; char *path; =20 - virAsprintf(&path, "/proc/%s/ns/%s", name, nsInfoLocal[ns_type]); + path =3D g_strdup_printf("/proc/%s/ns/%s", name, nsInfoLocal[ns_type]); fd =3D open(path, O_RDONLY); VIR_FREE(path); if (fd < 0) { @@ -464,7 +464,7 @@ static int virLXCProcessSetupNamespaceNet(int ns_type, = const char *name) return -1; } =20 - virAsprintf(&path, "%s/netns/%s", RUNSTATEDIR, name); + path =3D g_strdup_printf("%s/netns/%s", RUNSTATEDIR, name); fd =3D open(path, O_RDONLY); VIR_FREE(path); if (fd < 0) { @@ -625,7 +625,7 @@ static int virLXCProcessSetupInterfaces(virConnectPtr c= onn, =20 /* Make sure all net definitions will have a name in the container= */ if (!net->ifname_guest) { - virAsprintf(&net->ifname_guest, "eth%zu", niface); + net->ifname_guest =3D g_strdup_printf("eth%zu", niface); niface++; } } @@ -749,7 +749,7 @@ virLXCProcessGetNsInode(pid_t pid, struct stat sb; int ret =3D -1; =20 - virAsprintf(&path, "/proc/%lld/ns/%s", (long long)pid, nsname); + path =3D g_strdup_printf("/proc/%lld/ns/%s", (long long)pid, nsname); =20 if (stat(path, &sb) < 0) { virReportSystemError(errno, @@ -974,7 +974,7 @@ virLXCProcessBuildControllerCmd(virLXCDriverPtr driver, for (i =3D 0; i < VIR_LXC_DOMAIN_NAMESPACE_LAST; i++) { if (nsInheritFDs[i] > 0) { char *tmp =3D NULL; - virAsprintf(&tmp, "--share-%s", nsInfoLocal[i]); + tmp =3D g_strdup_printf("--share-%s", nsInfoLocal[i]); virCommandAddArg(cmd, tmp); virCommandAddArgFormat(cmd, "%d", nsInheritFDs[i]); virCommandPassFD(cmd, nsInheritFDs[i], 0); @@ -1257,7 +1257,7 @@ int virLXCProcessStart(virConnectPtr conn, vm->def->resource =3D res; } =20 - virAsprintf(&logfile, "%s/%s.log", cfg->logDir, vm->def->name); + logfile =3D g_strdup_printf("%s/%s.log", cfg->logDir, vm->def->name); =20 if (!(pidfile =3D virPidFileBuildPath(cfg->stateDir, vm->def->name))) goto cleanup; @@ -1344,7 +1344,7 @@ int virLXCProcessStart(virConnectPtr conn, vm->def->consoles[i]->source->data.file.path =3D ttyPath; =20 VIR_FREE(vm->def->consoles[i]->info.alias); - virAsprintf(&vm->def->consoles[i]->info.alias, "console%zu", i); + vm->def->consoles[i]->info.alias =3D g_strdup_printf("console%zu",= i); } =20 VIR_DEBUG("Setting up Interfaces"); --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752905; cv=none; d=zoho.com; s=zohoarc; b=oREBfuDmGmbgBDMheJcCTFTWi8ERbbT025Ot7dnXTQWKqEIOnWYxgedGEK4TjFATVYLG1rM6x5G65sNbJ1DLxWs9di/M40IStND+sLtw5VDFLKMGqu/Tp6Sb8L7/qnAXhUAxiU7ffqLEklAXVoC2y0dO8+m6XPw08juhzC3xYdk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752905; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=WgV1oFpyIJ5eCLfxoeJCL2lqxecg2OWwCmaNwmQNaB4=; b=BNbYbJCdpJ4UKVKaDMcgPVL1HZilkHqlQKsOg3BSPlXzKCOP4WrVP/+90SHPnixJChAJ9iJN9RZ0zoQUVRuVmdQCaa3XYtXZkCmbHZfFDnd8lRtIkdbhGJnq435kYt1hLIJiVR8zNPIMb9NxKwT2T1MUfaXihIBRxXFY8EK/A4M= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1571752905664124.67327322142398; Tue, 22 Oct 2019 07:01:45 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-183-sMOzgn9JPAiZvjdfBWRAIw-1; Tue, 22 Oct 2019 10:01:00 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 386521005526; Tue, 22 Oct 2019 14:00:54 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E54655C22C; Tue, 22 Oct 2019 14:00:53 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 83CD6180BA98; Tue, 22 Oct 2019 14:00:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9ME0krV002681 for ; Tue, 22 Oct 2019 10:00:46 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0A45460475; Tue, 22 Oct 2019 14:00:46 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 51D08620AD for ; Tue, 22 Oct 2019 14:00:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752904; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=WgV1oFpyIJ5eCLfxoeJCL2lqxecg2OWwCmaNwmQNaB4=; b=OQfkGXKfywg3iBWD77IjVRcR4ual0s30yLMlZE0d9NWARQVcX4LgdzpWIxnh+MpNqXbpTL u4NMHpzR92Dc48dQV664+DCrxKgkDFliGKALoYUMftW3GyKJe5LhzHhlfefAQ8LHL6HxCj tJJ5Bt1DqoPIgjgAwqr+nYvl47yYQDk= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:52 +0200 Message-Id: <49f7a600f00697291ceee365ab56c802e03d983d.1571752582.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 48/75] network: Use g_strdup_printf() instead of virAsprintf() X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: sMOzgn9JPAiZvjdfBWRAIw-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Michal Privoznik Reviewed-by: Daniel Henrique Barboza --- src/network/bridge_driver.c | 58 ++++++++++++++++++------------------- src/network/leaseshelper.c | 4 +-- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index b82a371fe4..5d424e3681 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -371,7 +371,7 @@ networkDnsmasqLeaseFileNameDefault(virNetworkDriverStat= ePtr driver, { char *leasefile; =20 - virAsprintf(&leasefile, "%s/%s.leases", driver->dnsmasqStateDir, netna= me); + leasefile =3D g_strdup_printf("%s/%s.leases", driver->dnsmasqStateDir,= netname); return leasefile; } =20 @@ -382,7 +382,7 @@ networkDnsmasqLeaseFileNameCustom(virNetworkDriverState= Ptr driver, { char *leasefile; =20 - virAsprintf(&leasefile, "%s/%s.status", driver->dnsmasqStateDir, bridg= e); + leasefile =3D g_strdup_printf("%s/%s.status", driver->dnsmasqStateDir,= bridge); return leasefile; } =20 @@ -393,7 +393,7 @@ networkDnsmasqConfigFileName(virNetworkDriverStatePtr d= river, { char *conffile; =20 - virAsprintf(&conffile, "%s/%s.conf", driver->dnsmasqStateDir, netname); + conffile =3D g_strdup_printf("%s/%s.conf", driver->dnsmasqStateDir, ne= tname); return conffile; } =20 @@ -404,7 +404,7 @@ networkRadvdPidfileBasename(const char *netname) /* this is simple but we want to be sure it's consistently done */ char *pidfilebase; =20 - virAsprintf(&pidfilebase, "%s-radvd", netname); + pidfilebase =3D g_strdup_printf("%s-radvd", netname); return pidfilebase; } =20 @@ -415,7 +415,7 @@ networkRadvdConfigFileName(virNetworkDriverStatePtr dri= ver, { char *configfile; =20 - virAsprintf(&configfile, "%s/%s-radvd.conf", driver->radvdStateDir, ne= tname); + configfile =3D g_strdup_printf("%s/%s-radvd.conf", driver->radvdStateD= ir, netname); return configfile; } =20 @@ -511,13 +511,13 @@ networkBridgeDummyNicName(const char *brname) * a possible numeric ending (eg virbr0, virbr1, etc), we grab * the first 8 and last 3 characters of the string. */ - virAsprintf(&nicname, "%.*s%s%s", - /* space for last 3 chars + "-nic" + NULL */ - (int)(IFNAMSIZ - (3 + sizeof(dummyNicSuffix))), - brname, brname + strlen(brname) - 3, - dummyNicSuffix); + nicname =3D g_strdup_printf("%.*s%s%s", + /* space for last 3 chars + "-nic" + NUL= L */ + (int)(IFNAMSIZ - (3 + sizeof(dummyNicSuf= fix))), + brname, brname + strlen(brname) - 3, + dummyNicSuffix); } else { - virAsprintf(&nicname, "%s%s", brname, dummyNicSuffix); + nicname =3D g_strdup_printf("%s%s", brname, dummyNicSuffix); } return nicname; } @@ -747,18 +747,18 @@ networkStateInitialize(bool privileged, if (!(configdir && rundir)) goto error; =20 - virAsprintf(&network_driver->networkConfigDir, - "%s/qemu/networks", configdir); - virAsprintf(&network_driver->networkAutostartDir, - "%s/qemu/networks/autostart", configdir); - virAsprintf(&network_driver->stateDir, - "%s/network/lib", rundir); - virAsprintf(&network_driver->pidDir, - "%s/network/run", rundir); - virAsprintf(&network_driver->dnsmasqStateDir, - "%s/dnsmasq/lib", rundir); - virAsprintf(&network_driver->radvdStateDir, - "%s/radvd/lib", rundir); + network_driver->networkConfigDir =3D g_strdup_printf( + "%s/qemu/networ= ks", configdir); + network_driver->networkAutostartDir =3D g_strdup_printf( + "%s/qemu/net= works/autostart", configdir); + network_driver->stateDir =3D g_strdup_printf( + "%s/network/lib", rundi= r); + network_driver->pidDir =3D g_strdup_printf( + "%s/network/run", rundir); + network_driver->dnsmasqStateDir =3D g_strdup_printf( + "%s/dnsmasq/lib"= , rundir); + network_driver->radvdStateDir =3D g_strdup_printf( + "%s/radvd/lib", ru= ndir); } =20 if (virFileMakePath(network_driver->stateDir) < 0) { @@ -2294,8 +2294,8 @@ networkSetIPv6Sysctls(virNetworkObjPtr obj) * network. But also unset it if there *are* ipv6 addresses, as we * can't be sure of its default value. */ - virAsprintf(&field, SYSCTL_PATH "/net/ipv6/conf/%s/disable_ipv6", - def->bridge); + field =3D g_strdup_printf(SYSCTL_PATH "/net/ipv6/conf/%s/disable_ipv6", + def->bridge); =20 if (access(field, W_OK) < 0 && errno =3D=3D ENOENT) { if (!enableIPv6) @@ -2320,8 +2320,8 @@ networkSetIPv6Sysctls(virNetworkObjPtr obj) /* Prevent guests from hijacking the host network by sending out * their own router advertisements. */ - virAsprintf(&field, SYSCTL_PATH "/net/ipv6/conf/%s/accept_ra", - def->bridge); + field =3D g_strdup_printf(SYSCTL_PATH "/net/ipv6/conf/%s/accept_ra", + def->bridge); =20 if (virFileWriteStr(field, "0", 0) < 0) { virReportSystemError(errno, @@ -2333,7 +2333,7 @@ networkSetIPv6Sysctls(virNetworkObjPtr obj) /* All interfaces used as a gateway (which is what this is, by * definition), must always have autoconf=3D0. */ - virAsprintf(&field, SYSCTL_PATH "/net/ipv6/conf/%s/autoconf", def->bri= dge); + field =3D g_strdup_printf(SYSCTL_PATH "/net/ipv6/conf/%s/autoconf", de= f->bridge); =20 if (virFileWriteStr(field, "0", 0) < 0) { virReportSystemError(errno, @@ -3318,7 +3318,7 @@ networkFindUnusedBridgeName(virNetworkObjListPtr nets, templ =3D def->bridge; =20 do { - virAsprintf(&newname, templ, id); + newname =3D g_strdup_printf(templ, id); /* check if this name is used in another libvirt network or * there is an existing device with that name. ignore errors * from virNetDevExists(), just in case it isn't implemented diff --git a/src/network/leaseshelper.c b/src/network/leaseshelper.c index 008a2d668d..3058a3c038 100644 --- a/src/network/leaseshelper.c +++ b/src/network/leaseshelper.c @@ -153,8 +153,8 @@ main(int argc, char **argv) =20 server_duid =3D g_strdup(getenv("DNSMASQ_SERVER_DUID")); =20 - virAsprintf(&custom_lease_file, - LOCALSTATEDIR "/lib/libvirt/dnsmasq/%s.status", interface); + custom_lease_file =3D g_strdup_printf( + LOCALSTATEDIR "/lib/libvirt/dnsmas= q/%s.status", interface); =20 pid_file =3D g_strdup(RUNSTATEDIR "/leaseshelper.pid"); =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752869; cv=none; d=zoho.com; s=zohoarc; b=JPgzJv3Nr6QQ2KddJzE/3XU5IwB5OQfFGAxI98vDpjd0jxHYqY4kTXApga+74hqRLi9JslZHCd+v183u1OeM8Q58KcJg8ErxXfsYQNxbhW2/Jpf6iPrhwaXmQ3ynWMwR+4GcLoQEAE/CD1m7GTlp/0A0RQwNvSOPuhbyMtcK+qQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752869; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=PMg/439FJzv3xx8dSJPWe941yHByiQobrD6wNnBdBxc=; b=LRO8Zl0OPo9it1OPtuIxqZLodNsYQ5nshmDGzeRFDg99FnwpZWrTrZ2zJVRL4ra2FqaRt4hd/ls6D+puaHznEFpJxsD0mVQJDMA+gTAQ01BGSR24DCwh8bTomfDkFF85GoXEJIDYI789SlLxP6oA29dAhtbntRTPo3lxqXKoPmM= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1571752869364424.3641070319097; Tue, 22 Oct 2019 07:01:09 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-32-qAgf9j1UNJCHtfCLQ4rs1A-1; Tue, 22 Oct 2019 10:01:06 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3F5F7609; Tue, 22 Oct 2019 14:00:59 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E4EEC194BB; Tue, 22 Oct 2019 14:00:58 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 81BFA3FB41; Tue, 22 Oct 2019 14:00:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9ME0lJU002697 for ; Tue, 22 Oct 2019 10:00:47 -0400 Received: by smtp.corp.redhat.com (Postfix) id 30B7063BA4; Tue, 22 Oct 2019 14:00:47 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3891760BAC for ; Tue, 22 Oct 2019 14:00:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752868; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=PMg/439FJzv3xx8dSJPWe941yHByiQobrD6wNnBdBxc=; b=ZX4CHleHxPa/L7dUJ3ZJZcp66XsOzQcTwPb+S3olRRR20zxHRLDGlps2NP158PvvFYAvUX gBjuXrCCwvfQUd5c5zBRzzzvrPpfyIKKuP0DgscTnLemNVIj8bfb8dVx9nvDq27f02L7Tg tLjyRVzWo1cSYCWwzSVe61z1srT3KUo= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:53 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 49/75] node_device: Use g_strdup_printf() instead of virAsprintf() X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: qAgf9j1UNJCHtfCLQ4rs1A-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Michal Privoznik Reviewed-by: Daniel Henrique Barboza --- src/node_device/node_device_driver.c | 2 +- src/node_device/node_device_hal.c | 4 ++-- src/node_device/node_device_udev.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_de= vice_driver.c index 53373140be..148ae15fed 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -113,7 +113,7 @@ nodeDeviceUpdateDriverName(virNodeDeviceDefPtr def) =20 VIR_FREE(def->driver); =20 - virAsprintf(&driver_link, "%s/driver", def->sysfs_path); + driver_link =3D g_strdup_printf("%s/driver", def->sysfs_path); =20 /* Some devices don't have an explicit driver, so just return without a name */ diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_devic= e_hal.c index a6042e6bfc..b40f93df46 100644 --- a/src/node_device/node_device_hal.c +++ b/src/node_device/node_device_hal.c @@ -614,13 +614,13 @@ nodeStateInitialize(bool privileged G_GNUC_UNUSED, nodeDeviceLock(); =20 if (privileged) { - virAsprintf(&driver->stateDir, "%s/libvirt/nodedev", RUNSTATEDIR); + driver->stateDir =3D g_strdup_printf("%s/libvirt/nodedev", RUNSTAT= EDIR); } else { g_autofree char *rundir =3D NULL; =20 if (!(rundir =3D virGetUserRuntimeDirectory())) goto failure; - virAsprintf(&driver->stateDir, "%s/nodedev/run", rundir); + driver->stateDir =3D g_strdup_printf("%s/nodedev/run", rundir); } =20 if (virFileMakePathWithMode(driver->stateDir, S_IRWXU) < 0) { diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_devi= ce_udev.c index 92d7048ece..dc440daead 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1028,7 +1028,7 @@ udevProcessMediatedDevice(struct udev_device *dev, * it by waiting for the attributes to become available. */ =20 - virAsprintf(&linkpath, "%s/mdev_type", udev_device_get_syspath(dev)); + linkpath =3D g_strdup_printf("%s/mdev_type", udev_device_get_syspath(d= ev)); =20 if (virFileWaitForExists(linkpath, 1, 100) < 0) { virReportSystemError(errno, @@ -1810,13 +1810,13 @@ nodeStateInitialize(bool privileged, driver->privileged =3D privileged; =20 if (privileged) { - virAsprintf(&driver->stateDir, "%s/libvirt/nodedev", RUNSTATEDIR); + driver->stateDir =3D g_strdup_printf("%s/libvirt/nodedev", RUNSTAT= EDIR); } else { g_autofree char *rundir =3D NULL; =20 if (!(rundir =3D virGetUserRuntimeDirectory())) goto cleanup; - virAsprintf(&driver->stateDir, "%s/nodedev/run", rundir); + driver->stateDir =3D g_strdup_printf("%s/nodedev/run", rundir); } =20 if (virFileMakePathWithMode(driver->stateDir, S_IRWXU) < 0) { --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752881; cv=none; d=zoho.com; s=zohoarc; b=U7nI79p3LOOD2rtpDhretnoY1ZYMxy5GQA3W7bQ8TBhQnDXLqJQXf2peBVr3Oc0hahOzR7RXz9rj4RPl56Svo7HOr1DcUzLZpqhGD7UKGwllg1r6SYx9NG3z2zcLiGDy8N7/SbPPzdK7YvudX4oJ3NG5mH5THIBcpxJ6iXCjDU8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752881; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6irgb2BhEk2iFTUVv6GppSNm2/8gwjpoUuSK6Rnvjew=; b=YrhHZRmq1l4B6gdCmJ4H4LBUG/MID/K+WBDlRIe0EUIaNEAuefj3oN5ffPZ9GGIfjVR0M42Of6ndU8i29TyENi0sHrwkSOBAbAz1eIXOrKr4BH+w8b4vnl8S2HIPvlEoIiWAqu7pDORwWzjG2q/DZCZdAgw+9s+u7VosYp8kJ1k= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1571752881383331.08319503240614; Tue, 22 Oct 2019 07:01:21 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-57-7BdrQTUsNuinwe9x0_pG1g-1; Tue, 22 Oct 2019 10:01:18 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 753EE100551F; Tue, 22 Oct 2019 14:01:11 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 378795DC18; Tue, 22 Oct 2019 14:01:11 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 9C1FE3FB42; Tue, 22 Oct 2019 14:01:10 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9ME0lwl002708 for ; Tue, 22 Oct 2019 10:00:48 -0400 Received: by smtp.corp.redhat.com (Postfix) id DD7F46012C; Tue, 22 Oct 2019 14:00:47 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1FEDB60167 for ; Tue, 22 Oct 2019 14:00:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752880; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=6irgb2BhEk2iFTUVv6GppSNm2/8gwjpoUuSK6Rnvjew=; b=iOxsMDtgV+aPezrr8kZUg6oAEBthrb4ad5/s9gumkcf6ZvvVJ1yVaqpdpp8jraxTPKi66i OXuRMf1Mf4mdY6Jhrgebt9jxeHT2RoIjQAKy6P9GucJ/QmXXKRKVvSpUl5jBR0219bPXfd tcCNiuS4SxrpyUOQApkcsyRaa0JCqcY= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:54 +0200 Message-Id: <1e893fac863bb11a28860fbba7431be19b0dfac1.1571752582.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 50/75] nwfilter: Use g_strdup_printf() instead of virAsprintf() X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: 7BdrQTUsNuinwe9x0_pG1g-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Michal Privoznik Reviewed-by: Daniel Henrique Barboza --- src/nwfilter/nwfilter_dhcpsnoop.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcp= snoop.c index b4ce8a0613..4e77ca0d2d 100644 --- a/src/nwfilter/nwfilter_dhcpsnoop.c +++ b/src/nwfilter/nwfilter_dhcpsnoop.c @@ -315,7 +315,7 @@ virNWFilterSnoopActivate(virNWFilterSnoopReqPtr req) { char *key; =20 - virAsprintf(&key, "%p-%d", req, req->ifindex); + key =3D g_strdup_printf("%p-%d", req, req->ifindex); =20 virNWFilterSnoopActiveLock(); =20 @@ -1080,7 +1080,7 @@ virNWFilterSnoopDHCPOpen(const char *ifname, virMacAd= dr *mac, * extend the filter with the macaddr of the VM; filter the * more unlikely parameters first, then go for the MAC */ - virAsprintf(&ext_filter, "%s and ether src %s", filter, macaddr); + ext_filter =3D g_strdup_printf("%s and ether src %s", filter, maca= ddr); } else { /* * Some DHCP servers respond via MAC broadcast; we rely on later @@ -1763,7 +1763,7 @@ virNWFilterSnoopLeaseFileWrite(int lfd, const char *i= fkey, } =20 /* time intf ip dhcpserver */ - virAsprintf(&lbuf, "%u %s %s %s\n", ipl->timeout, ifkey, ipstr, dhcpst= r); + lbuf =3D g_strdup_printf("%u %s %s %s\n", ipl->timeout, ifkey, ipstr, = dhcpstr); len =3D strlen(lbuf); =20 if (safewrite(lfd, lbuf, len) !=3D len) { --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752871; cv=none; d=zoho.com; s=zohoarc; b=DUN389+EqEoOLbIsCxB5NZRq3f7V61Wa4lmOZ/EBwXXLXCYDBHCoAKmQEvRMk7lNBb9zV4hOiv2T5XZtEPFfT6kUFOYY0XNLgpDjwFaJrkyx2dmjhGB9vExCEqkGaYmaNywG+NtUwN6snx4ush3gWI4x6S5JtXfuRgguZoV2l8s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752871; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=zuWJvENXB6phXEz5GXBDDT6kLdNPtfooAA9ZwVtExA0=; b=hmiJEo/rN/wQZz0z51rPKzSKoOTPsCeaNr550doa5MC4nUC+ceHzLIW9D6adie/Hrh+wUp5YuY6ri2r9FShh3bLiSzkCFmQBQdJVIQntxjTyF2N3KQ/XHKs0BW8STLmNC76RU1PwCSf9bImA2c4RdWPqN9PQ3vKZliCyz+uQIRI= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1571752871460975.7145767946358; Tue, 22 Oct 2019 07:01:11 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-367-3dgoEitQOnq2ow4Z0vdVyQ-1; Tue, 22 Oct 2019 10:01:08 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AF607100552F; Tue, 22 Oct 2019 14:01:00 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 772DA5DC18; Tue, 22 Oct 2019 14:01:00 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 0ADD83FB40; Tue, 22 Oct 2019 14:01:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9ME0mB3002718 for ; Tue, 22 Oct 2019 10:00:48 -0400 Received: by smtp.corp.redhat.com (Postfix) id 779926012C; Tue, 22 Oct 2019 14:00:48 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id ECA3A60167 for ; Tue, 22 Oct 2019 14:00:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752870; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=zuWJvENXB6phXEz5GXBDDT6kLdNPtfooAA9ZwVtExA0=; b=fypMBwMKux2NO4qqnL+unR6jhAMwlCKgx67ntLmtW73EzSMUms7Hh96DpxF8ZKUT50wylE kQpOPC5jA8QuRYm4GxxOlz5KlMgk9X/wnAatF7Cne8CYwLaS7Tcx/lxjErNcAqpxTVAE/6 6A7KL6+mLLuuDk0JcHGthyv0PShOIzY= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:55 +0200 Message-Id: <99341bee0b48a885bfc3e65e208e6cf582cb7fc4.1571752582.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 51/75] openvz: Use g_strdup_printf() instead of virAsprintf() X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: 3dgoEitQOnq2ow4Z0vdVyQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Michal Privoznik Reviewed-by: Daniel Henrique Barboza --- src/openvz/openvz_conf.c | 12 ++++++------ src/openvz/openvz_driver.c | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index cb64ed57f0..7676656af1 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -362,7 +362,7 @@ openvzReadFSConf(virDomainDefPtr def, if (VIR_ALLOC(fs) < 0) goto error; =20 - virAsprintf(&veid_str, "%d", veid); + veid_str =3D g_strdup_printf("%d", veid); =20 fs->type =3D VIR_DOMAIN_FS_TYPE_MOUNT; if (!(fs->src->path =3D virStringReplace(temp, "$VEID", veid_str))) @@ -533,7 +533,7 @@ int openvzLoadDomains(struct openvz_driver *driver) def->id =3D -1; else def->id =3D veid; - virAsprintf(&def->name, "%i", veid); + def->name =3D g_strdup_printf("%i", veid); =20 openvzGetVPSUUID(veid, uuidstr, sizeof(uuidstr)); ret =3D virUUIDParse(uuidstr, def->uuid); @@ -624,7 +624,7 @@ openvzWriteConfigParam(const char * conf_file, const ch= ar *param, const char *va char *line =3D NULL; size_t line_size =3D 0; =20 - virAsprintf(&temp_file, "%s.tmp", conf_file); + temp_file =3D g_strdup_printf("%s.tmp", conf_file); =20 fp =3D fopen(conf_file, "r"); if (fp =3D=3D NULL) @@ -820,8 +820,8 @@ openvzCopyDefaultConfig(int vpsid) if (confdir =3D=3D NULL) goto cleanup; =20 - virAsprintf(&default_conf_file, "%s/ve-%s.conf-sample", confdir, - configfile_value); + default_conf_file =3D g_strdup_printf("%s/ve-%s.conf-sample", confdir, + configfile_value); =20 if (openvzLocateConfFile(vpsid, &conf_file, "conf") < 0) goto cleanup; @@ -851,7 +851,7 @@ openvzLocateConfFileDefault(int vpsid, char **conffile,= const char *ext) if (confdir =3D=3D NULL) return -1; =20 - virAsprintf(conffile, "%s/%d.%s", confdir, vpsid, ext ? ext : "conf"); + *conffile =3D g_strdup_printf("%s/%d.%s", confdir, vpsid, ext ? ext : = "conf"); =20 VIR_FREE(confdir); return ret; diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 463751ec86..8a24c9265f 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -702,7 +702,7 @@ openvzGenerateVethName(int veid, char *dev_name_ve) =20 if (sscanf(dev_name_ve, "%*[^0-9]%d", &ifNo) !=3D 1) return NULL; - virAsprintf(&ret, "veth%d.%d.", veid, ifNo); + ret =3D g_strdup_printf("veth%d.%d.", veid, ifNo); return ret; } =20 @@ -729,7 +729,7 @@ openvzGenerateContainerVethName(int veid) } =20 /* set new name */ - virAsprintf(&name, "eth%d", max + 1); + name =3D g_strdup_printf("eth%d", max + 1); } =20 VIR_FREE(temp); @@ -2207,7 +2207,7 @@ openvzDomainMigratePrepare3Params(virConnectPtr dconn, } } =20 - virAsprintf(uri_out, "ssh://%s", hostname); + *uri_out =3D g_strdup_printf("ssh://%s", hostname); =20 ret =3D 0; goto done; --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752936; cv=none; d=zoho.com; s=zohoarc; b=erzCpOWwCL6UVfV5UPk4vCJ5IFUzZrWVyqAuGnnWlqPXfiKX6OPHZIrzrX/KdrcUqgldyCLCNE3EzuPGF6ZuHwWtP69WCO+YdKgyzyP+tws+kpINazJM39HDw9DjsfXvRWFpuco7HuhlagMhNnmsu8/TP92hwUoAdzOFrHTQjfY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752936; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=bY8OKLlckLi71Tj8lKRunMfCJA2Ty81fXLEoaIG7nFQ=; b=crqUMoVo5NZNFNBgJ5dzYXcsSHsO0o8DzTBH5oqBqmJfctCxBxQcI3NSIAk+RtalQvdVFJ6tAFfA5WRPmu8wdHs5ej5KehUu4YcT3qLMRN8Aig1cOEMneVsXBWAsH2KWdC47E/Hiou/gtSKPzLUT3S3Y3tZaK/jNe4lKpxZamjY= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1571752936575334.61785119626893; Tue, 22 Oct 2019 07:02:16 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-334-5b_RWdhkPm-dQf7dg0F1BA-1; Tue, 22 Oct 2019 10:01:12 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 75C3E800D59; Tue, 22 Oct 2019 14:01:05 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4057E5DC18; Tue, 22 Oct 2019 14:01:05 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id CBD1E180BA9B; Tue, 22 Oct 2019 14:01:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9ME0nQQ002726 for ; Tue, 22 Oct 2019 10:00:49 -0400 Received: by smtp.corp.redhat.com (Postfix) id 53023605B0; Tue, 22 Oct 2019 14:00:49 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id C2A7C6046B for ; Tue, 22 Oct 2019 14:00:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752935; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=bY8OKLlckLi71Tj8lKRunMfCJA2Ty81fXLEoaIG7nFQ=; b=gADS4g+wWtB9X5IvUBegpuyTOjfgczeZRnaEJDLVArRILAF6dYtatFbP1z6dKHUvAnGa6t cdaFTdVurRpwuZfYqgy3/y4KuOLKtAoSJQ3Tmei7B44V4WNBeGj61aJY+acQBNmfybHfyV 6XewsL5Obn5LwjWgyyVgLvdLhG6slWc= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:56 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 52/75] phyp: Use g_strdup_printf() instead of virAsprintf() X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: 5b_RWdhkPm-dQf7dg0F1BA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Michal Privoznik Reviewed-by: Daniel Henrique Barboza --- src/phyp/phyp_driver.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index 6aa47ac511..bc4e08d198 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -504,8 +504,8 @@ phypUUIDTable_Push(virConnectPtr conn) char *remote_file =3D NULL; int ret =3D -1; =20 - virAsprintf(&remote_file, "/home/%s/libvirt_uuid_table", - NULLSTR(conn->uri->user)); + remote_file =3D g_strdup_printf("/home/%s/libvirt_uuid_table", + NULLSTR(conn->uri->user)); =20 if (stat(local_file, &local_fileinfo) =3D=3D -1) { VIR_WARN("Unable to stat local file."); @@ -691,8 +691,8 @@ phypUUIDTable_Pull(virConnectPtr conn) char *remote_file =3D NULL; int ret =3D -1; =20 - virAsprintf(&remote_file, "/home/%s/libvirt_uuid_table", - NULLSTR(conn->uri->user)); + remote_file =3D g_strdup_printf("/home/%s/libvirt_uuid_table", + NULLSTR(conn->uri->user)); =20 /* Trying to stat the remote file. */ do { @@ -937,9 +937,9 @@ openSSHSession(virConnectPtr conn, virConnectAuthPtr au= th, if (userhome =3D=3D NULL) goto err; =20 - virAsprintf(&pubkey, "%s/.ssh/id_rsa.pub", userhome); + pubkey =3D g_strdup_printf("%s/.ssh/id_rsa.pub", userhome); =20 - virAsprintf(&pvtkey, "%s/.ssh/id_rsa", userhome); + pvtkey =3D g_strdup_printf("%s/.ssh/id_rsa", userhome); =20 if (conn->uri->user !=3D NULL) { username =3D g_strdup(conn->uri->user); @@ -2277,7 +2277,7 @@ phypStorageVolGetPath(virStorageVolPtr vol) if (!pv) goto cleanup; =20 - virAsprintf(&path, "/%s/%s/%s", pv, ret, vol->name); + path =3D g_strdup_printf("/%s/%s/%s", pv, ret, vol->name); =20 cleanup: VIR_FREE(ret); --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752885; cv=none; d=zoho.com; s=zohoarc; b=buGhojPvlto30WCxLKtWL9OyBoA73Fg+4nV1xUjuZ9xyDvA9rT+0XSz0eldEtv4o+g7x86NqZO2XHkvxIeyiXp2XDkdVlGaGdFFR3I25lDvLC4OOOR/QBgHxRu+Y/ZAqn63rD7UjsQgIyLb57lOplXS/A5bNwo3+xGjyK+8OB+8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752885; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=oQYqkg+AE+hTkK2wCacWJ+MpMhZXZyYWzyliPnrEAO4=; b=RN2u4nCKy5YQiWLPP9Y3sYYOJiidHh/VXSIX239ELRgIyaIh+S2Vd6nhLvLQri4dIqktbaJ5AliGRyiOWdOxOYaf9R9jNey1KCbKsdesRfkZglBOJ4Ezzz2VB+p7ggsV48OROAR+hotVS+NDR9jyWv3X/u0cC6+YIPF2f5LCMl0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1571752885237557.1624557588826; Tue, 22 Oct 2019 07:01:25 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-222-Xc6Onz1bOCmzCAFJs1Cggg-1; Tue, 22 Oct 2019 10:01:20 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F24C75FB; Tue, 22 Oct 2019 14:01:11 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AC25D6012D; Tue, 22 Oct 2019 14:01:11 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 350773FB45; Tue, 22 Oct 2019 14:01:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9ME0oAe002739 for ; Tue, 22 Oct 2019 10:00:50 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1F2386012E; Tue, 22 Oct 2019 14:00:50 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 993AD605C3 for ; Tue, 22 Oct 2019 14:00:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752883; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=oQYqkg+AE+hTkK2wCacWJ+MpMhZXZyYWzyliPnrEAO4=; b=XXIj2N4g0xY4Uyc26QZ3fiWmU6zC6kKJ4zbylAUj0amye0f9OYq5W+qEJTetrlPHv6OsQR LVBoJybyaOth60wznaB6h/S3eTiNMzp6Z2tnlj6NOSp000FnRHm+7Yho1FD3vELb00al0j Sg7VBUONtQZroZ5hZg0u6ofTr4nvBlo= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:57 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 53/75] qemu: Use g_strdup_printf() instead of virAsprintf() X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: Xc6Onz1bOCmzCAFJs1Cggg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Michal Privoznik Reviewed-by: Daniel Henrique Barboza --- src/qemu/qemu_agent.c | 6 +-- src/qemu/qemu_alias.c | 88 +++++++++++++++---------------- src/qemu/qemu_block.c | 30 +++++------ src/qemu/qemu_blockjob.c | 8 +-- src/qemu/qemu_capabilities.c | 8 +-- src/qemu/qemu_checkpoint.c | 8 +-- src/qemu/qemu_command.c | 72 ++++++++++++------------- src/qemu/qemu_conf.c | 90 ++++++++++++++++---------------- src/qemu/qemu_domain.c | 80 ++++++++++++++-------------- src/qemu/qemu_hotplug.c | 32 ++++++------ src/qemu/qemu_interface.c | 2 +- src/qemu/qemu_interop_config.c | 6 +-- src/qemu/qemu_migration.c | 24 ++++----- src/qemu/qemu_migration_cookie.c | 2 +- src/qemu/qemu_monitor.c | 30 +++++------ src/qemu/qemu_monitor_json.c | 14 ++--- src/qemu/qemu_monitor_text.c | 10 ++-- src/qemu/qemu_process.c | 32 ++++++------ src/qemu/qemu_slirp.c | 10 ++-- src/qemu/qemu_tpm.c | 10 ++-- src/qemu/qemu_vhost_user_gpu.c | 2 +- 21 files changed, 282 insertions(+), 282 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index d1b590d842..5a50f7f3be 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -916,8 +916,8 @@ qemuAgentGuestSync(qemuAgentPtr mon) if (virTimeMillisNow(&id) < 0) return -1; =20 - virAsprintf(&sync_msg.txBuffer, "{\"execute\":\"guest-sync\", " - "\"arguments\":{\"id\":%llu}}\n", id); + sync_msg.txBuffer =3D g_strdup_printf("{\"execute\":\"guest-sync\", " + "\"arguments\":{\"id\":%llu}}\n", = id); =20 sync_msg.txLength =3D strlen(sync_msg.txBuffer); sync_msg.sync =3D true; @@ -1118,7 +1118,7 @@ qemuAgentCommand(qemuAgentPtr mon, =20 if (!(cmdstr =3D virJSONValueToString(cmd, false))) goto cleanup; - virAsprintf(&msg.txBuffer, "%s" LINE_ENDING, cmdstr); + msg.txBuffer =3D g_strdup_printf("%s" LINE_ENDING, cmdstr); msg.txLength =3D strlen(msg.txBuffer); =20 VIR_DEBUG("Send command '%s' for write, seconds =3D %d", cmdstr, secon= ds); diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c index 60ab5735a4..22160a6fd8 100644 --- a/src/qemu/qemu_alias.c +++ b/src/qemu/qemu_alias.c @@ -114,7 +114,7 @@ qemuAssignDeviceChrAlias(virDomainDefPtr def, if (idx =3D=3D -1 && (idx =3D qemuGetNextChrDevIndex(def, chr, prefix)= ) < 0) return -1; =20 - virAsprintf(&chr->info.alias, "%s%zd", prefix, idx); + chr->info.alias =3D g_strdup_printf("%s%zd", prefix, idx); return 0; } =20 @@ -142,14 +142,14 @@ qemuAssignDeviceControllerAlias(virDomainDefPtr domai= nDef, * different naming convention ("pcie.0"), because it is * hardcoded that way in qemu. */ - virAsprintf(&controller->info.alias, "pcie.%d", controller->id= x); + controller->info.alias =3D g_strdup_printf("pcie.%d", controll= er->idx); return 0; } /* All other PCI controllers use the consistent "pci.%u" * (including the hardcoded pci-root controller on * multibus-capable qemus). */ - virAsprintf(&controller->info.alias, "pci.%d", controller->idx); + controller->info.alias =3D g_strdup_printf("pci.%d", controller->i= dx); return 0; } else if (controller->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_IDE) { /* for any machine based on e.g. I440FX or G3Beige, the @@ -179,7 +179,7 @@ qemuAssignDeviceControllerAlias(virDomainDefPtr domainD= ef, /* all other controllers use the default ${type}${index} naming * scheme for alias/id. */ - virAsprintf(&controller->info.alias, "%s%d", prefix, controller->idx); + controller->info.alias =3D g_strdup_printf("%s%d", prefix, controller-= >idx); return 0; } =20 @@ -204,20 +204,20 @@ qemuAssignDeviceDiskAlias(virDomainDefPtr def, =20 if (disk->bus !=3D VIR_DOMAIN_DISK_BUS_SCSI || controllerModel =3D=3D VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LS= ILOGIC) { - virAsprintf(&disk->info.alias, "%s%d-%d-%d", prefix, - disk->info.addr.drive.controller, - disk->info.addr.drive.bus, - disk->info.addr.drive.unit); + disk->info.alias =3D g_strdup_printf("%s%d-%d-%d", prefix, + disk->info.addr.drive.c= ontroller, + disk->info.addr.drive.b= us, + disk->info.addr.drive.u= nit); } else { - virAsprintf(&disk->info.alias, "%s%d-%d-%d-%d", prefix, - disk->info.addr.drive.controller, - disk->info.addr.drive.bus, - disk->info.addr.drive.target, - disk->info.addr.drive.unit); + disk->info.alias =3D g_strdup_printf("%s%d-%d-%d-%d", pref= ix, + disk->info.addr.drive.c= ontroller, + disk->info.addr.drive.b= us, + disk->info.addr.drive.t= arget, + disk->info.addr.drive.u= nit); } } else { int idx =3D virDiskNameToIndex(disk->dst); - virAsprintf(&disk->info.alias, "%s-disk%d", prefix, idx); + disk->info.alias =3D g_strdup_printf("%s-disk%d", prefix, idx); } } =20 @@ -236,15 +236,15 @@ qemuAssignDeviceDiskAlias(virDomainDefPtr def, break; =20 case VIR_DOMAIN_DISK_BUS_VIRTIO: - virAsprintf(&diskPriv->qomName, - "/machine/peripheral/%s/virtio-backend", - disk->info.alias); + diskPriv->qomName =3D g_strdup_printf( + "/machine/peripheral/%s/vi= rtio-backend", + disk->info.alias); break; =20 case VIR_DOMAIN_DISK_BUS_USB: - virAsprintf(&diskPriv->qomName, - "/machine/peripheral/%s/%s.0/legacy[0]", - disk->info.alias, disk->info.alias); + diskPriv->qomName =3D g_strdup_printf( + "/machine/peripheral/%s/%s= .0/legacy[0]", + disk->info.alias, disk->in= fo.alias); break; =20 case VIR_DOMAIN_DISK_BUS_XEN: @@ -290,7 +290,7 @@ qemuAssignDeviceHostdevAlias(virDomainDefPtr def, } } =20 - virAsprintf(alias, "hostdev%d", idx); + *alias =3D g_strdup_printf("hostdev%d", idx); =20 return 0; } @@ -325,7 +325,7 @@ qemuAssignDeviceNetAlias(virDomainDefPtr def, } } =20 - virAsprintf(&net->info.alias, "net%d", idx); + net->info.alias =3D g_strdup_printf("net%d", idx); return 0; } =20 @@ -337,7 +337,7 @@ qemuAssignDeviceFSAlias(virDomainFSDefPtr fss, if (fss->info.alias) return 0; =20 - virAsprintf(&fss->info.alias, "fs%d", idx); + fss->info.alias =3D g_strdup_printf("fs%d", idx); return 0; } =20 @@ -349,7 +349,7 @@ qemuAssignDeviceSoundAlias(virDomainSoundDefPtr sound, if (sound->info.alias) return 0; =20 - virAsprintf(&sound->info.alias, "sound%d", idx); + sound->info.alias =3D g_strdup_printf("sound%d", idx); return 0; } =20 @@ -361,7 +361,7 @@ qemuAssignDeviceVideoAlias(virDomainVideoDefPtr video, if (video->info.alias) return 0; =20 - virAsprintf(&video->info.alias, "video%d", idx); + video->info.alias =3D g_strdup_printf("video%d", idx); return 0; } =20 @@ -373,7 +373,7 @@ qemuAssignDeviceHubAlias(virDomainHubDefPtr hub, if (hub->info.alias) return 0; =20 - virAsprintf(&hub->info.alias, "hub%d", idx); + hub->info.alias =3D g_strdup_printf("hub%d", idx); return 0; } =20 @@ -385,7 +385,7 @@ qemuAssignDeviceSmartcardAlias(virDomainSmartcardDefPtr= smartcard, if (smartcard->info.alias) return 0; =20 - virAsprintf(&smartcard->info.alias, "smartcard%d", idx); + smartcard->info.alias =3D g_strdup_printf("smartcard%d", idx); return 0; } =20 @@ -397,7 +397,7 @@ qemuAssingDeviceMemballoonAlias(virDomainMemballoonDefP= tr memballoon, if (memballoon->info.alias) return 0; =20 - virAsprintf(&memballoon->info.alias, "balloon%d", idx); + memballoon->info.alias =3D g_strdup_printf("balloon%d", idx); return 0; } =20 @@ -409,7 +409,7 @@ qemuAssignDeviceTPMAlias(virDomainTPMDefPtr tpm, if (tpm->info.alias) return 0; =20 - virAsprintf(&tpm->info.alias, "tpm%d", idx); + tpm->info.alias =3D g_strdup_printf("tpm%d", idx); return 0; } =20 @@ -434,7 +434,7 @@ qemuAssignDeviceRedirdevAlias(virDomainDefPtr def, } } =20 - virAsprintf(&redirdev->info.alias, "redir%d", idx); + redirdev->info.alias =3D g_strdup_printf("redir%d", idx); return 0; } =20 @@ -455,7 +455,7 @@ qemuAssignDeviceRNGAlias(virDomainDefPtr def, maxidx =3D idx + 1; } =20 - virAsprintf(&rng->info.alias, "rng%d", maxidx); + rng->info.alias =3D g_strdup_printf("rng%d", maxidx); =20 return 0; } @@ -500,7 +500,7 @@ qemuAssignDeviceMemoryAlias(virDomainDefPtr def, maxidx =3D mem->info.addr.dimm.slot; } =20 - virAsprintf(&mem->info.alias, "%s%d", prefix, maxidx); + mem->info.alias =3D g_strdup_printf("%s%d", prefix, maxidx); =20 return 0; } @@ -529,7 +529,7 @@ qemuAssignDeviceShmemAlias(virDomainDefPtr def, } } =20 - virAsprintf(&shmem->info.alias, "shmem%d", idx); + shmem->info.alias =3D g_strdup_printf("shmem%d", idx); return 0; } =20 @@ -565,7 +565,7 @@ qemuAssignDeviceInputAlias(virDomainDefPtr def, } } =20 - virAsprintf(&input->info.alias, "input%d", idx); + input->info.alias =3D g_strdup_printf("input%d", idx); =20 return 0; } @@ -705,7 +705,7 @@ qemuAliasDiskDriveFromDisk(const virDomainDiskDef *disk) return NULL; } =20 - virAsprintf(&ret, "%s%s", QEMU_DRIVE_HOST_PREFIX, disk->info.alias); + ret =3D g_strdup_printf("%s%s", QEMU_DRIVE_HOST_PREFIX, disk->info.ali= as); return ret; } =20 @@ -741,9 +741,9 @@ qemuAliasFromHostdev(const virDomainHostdevDef *hostdev) return NULL; } =20 - virAsprintf(&ret, "%s-%s", - virDomainDeviceAddressTypeToString(hostdev->info->type), - hostdev->info->alias); + ret =3D g_strdup_printf("%s-%s", + virDomainDeviceAddressTypeToString(hostdev->info= ->type), + hostdev->info->alias); return ret; } =20 @@ -786,9 +786,9 @@ qemuDomainGetSecretAESAlias(const char *srcalias, } =20 if (isLuks) - virAsprintf(&alias, "%s-luks-secret0", srcalias); + alias =3D g_strdup_printf("%s-luks-secret0", srcalias); else - virAsprintf(&alias, "%s-secret0", srcalias); + alias =3D g_strdup_printf("%s-secret0", srcalias); =20 return alias; } @@ -804,7 +804,7 @@ qemuAliasTLSObjFromSrcAlias(const char *srcAlias) { char *ret; =20 - virAsprintf(&ret, "obj%s_tls0", srcAlias); + ret =3D g_strdup_printf("obj%s_tls0", srcAlias); =20 return ret; } @@ -820,7 +820,7 @@ qemuAliasChardevFromDevAlias(const char *devAlias) { char *ret; =20 - virAsprintf(&ret, "char%s", devAlias); + ret =3D g_strdup_printf("char%s", devAlias); =20 return ret; } @@ -838,7 +838,7 @@ qemuDomainGetUnmanagedPRAlias(const char *parentalias) { char *ret; =20 - virAsprintf(&ret, "pr-helper-%s", parentalias); + ret =3D g_strdup_printf("pr-helper-%s", parentalias); =20 return ret; } @@ -849,7 +849,7 @@ qemuAliasDBusVMStateFromId(const char *id) char *ret; size_t i; =20 - virAsprintf(&ret, "dbus-vms-%s", id); + ret =3D g_strdup_printf("dbus-vms-%s", id); =20 for (i =3D 0; ret[i]; i++) { if (ret[i] =3D=3D ':') diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index f40915fe23..b8f0208742 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -423,17 +423,17 @@ qemuBlockStorageSourceGetURI(virStorageSourcePtr src) =20 uri->scheme =3D g_strdup(virStorageNetProtocolTypeToString(src->pr= otocol)); } else { - virAsprintf(&uri->scheme, "%s+%s", - virStorageNetProtocolTypeToString(src->protocol), - virStorageNetHostTransportTypeToString(src->hosts->tra= nsport)); + uri->scheme =3D g_strdup_printf("%s+%s", + virStorageNetProtocolTypeToString(sr= c->protocol), + virStorageNetHostTransportTypeToStri= ng(src->hosts->transport)); } =20 if (src->path) { if (src->volume) { - virAsprintf(&uri->path, "/%s/%s", src->volume, src->path); + uri->path =3D g_strdup_printf("/%s/%s", src->volume, src->path= ); } else { - virAsprintf(&uri->path, "%s%s", src->path[0] =3D=3D '/' ? "" := "/", - src->path); + uri->path =3D g_strdup_printf("%s%s", src->path[0] =3D=3D '/' = ? "" : "/", + src->path); } } =20 @@ -472,7 +472,7 @@ qemuBlockStorageSourceBuildJSONSocketAddress(virStorage= NetHostDefPtr host, else transport =3D "inet"; =20 - virAsprintf(&port, "%u", host->port); + port =3D g_strdup_printf("%u", host->port); =20 if (virJSONValueObjectCreate(&server, "s:type", transport, @@ -564,7 +564,7 @@ qemuBlockStorageSourceBuildJSONInetSocketAddress(virSto= rageNetHostDefPtr host) return NULL; } =20 - virAsprintf(&port, "%u", host->port); + port =3D g_strdup_printf("%u", host->port); =20 ignore_value(virJSONValueObjectCreate(&ret, "s:host", host->name, @@ -760,10 +760,10 @@ qemuBlockStorageSourceGetISCSIProps(virStorageSourceP= tr src, =20 /* combine host and port into portal */ if (virSocketAddrNumericFamily(src->hosts[0].name) =3D=3D AF_INET6) { - virAsprintf(&portal, "[%s]:%u", src->hosts[0].name, - src->hosts[0].port); + portal =3D g_strdup_printf("[%s]:%u", src->hosts[0].name, + src->hosts[0].port); } else { - virAsprintf(&portal, "%s:%u", src->hosts[0].name, src->hosts[0].po= rt); + portal =3D g_strdup_printf("%s:%u", src->hosts[0].name, src->hosts= [0].port); } =20 if (!onlytarget && src->auth) { @@ -1955,7 +1955,7 @@ qemuBlockGetBackingStoreString(virStorageSourcePtr sr= c) if (!(backingJSON =3D virJSONValueToString(backingProps, false))) return NULL; =20 - virAsprintf(&ret, "json:%s", backingJSON); + ret =3D g_strdup_printf("json:%s", backingJSON); =20 return ret; } @@ -2038,9 +2038,9 @@ qemuBlockStorageSourceCreateGetEncryptionLUKS(virStor= ageSourcePtr src, =20 if (src->encryption) { if (src->encryption->encinfo.cipher_name) { - virAsprintf(&cipheralg, "%s-%u", - src->encryption->encinfo.cipher_name, - src->encryption->encinfo.cipher_size); + cipheralg =3D g_strdup_printf("%s-%u", + src->encryption->encinfo.cipher_na= me, + src->encryption->encinfo.cipher_si= ze); } =20 if (virJSONValueObjectAdd(props, diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index e59cab3478..f8ee00711a 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -227,7 +227,7 @@ qemuBlockJobDiskNewPull(virDomainObjPtr vm, g_autofree char *jobname =3D NULL; =20 if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) { - virAsprintf(&jobname, "pull-%s-%s", disk->dst, disk->src->nodeform= at); + jobname =3D g_strdup_printf("pull-%s-%s", disk->dst, disk->src->no= deformat); } else { if (!(jobname =3D qemuAliasDiskDriveFromDisk(disk))) return NULL; @@ -261,7 +261,7 @@ qemuBlockJobDiskNewCommit(virDomainObjPtr vm, jobtype =3D QEMU_BLOCKJOB_TYPE_ACTIVE_COMMIT; =20 if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) { - virAsprintf(&jobname, "commit-%s-%s", disk->dst, top->nodeformat); + jobname =3D g_strdup_printf("commit-%s-%s", disk->dst, top->nodefo= rmat); } else { if (!(jobname =3D qemuAliasDiskDriveFromDisk(disk))) return NULL; @@ -294,7 +294,7 @@ qemuBlockJobNewCreate(virDomainObjPtr vm, if (storage) nodename =3D src->nodestorage; =20 - virAsprintf(&jobname, "create-%s", nodename); + jobname =3D g_strdup_printf("create-%s", nodename); =20 if (!(job =3D qemuBlockJobDataNew(QEMU_BLOCKJOB_TYPE_CREATE, jobname))) return NULL; @@ -323,7 +323,7 @@ qemuBlockJobDiskNewCopy(virDomainObjPtr vm, g_autofree char *jobname =3D NULL; =20 if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) { - virAsprintf(&jobname, "copy-%s-%s", disk->dst, disk->src->nodeform= at); + jobname =3D g_strdup_printf("copy-%s-%s", disk->dst, disk->src->no= deformat); } else { if (!(jobname =3D qemuAliasDiskDriveFromDisk(disk))) return NULL; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index b2ea7ec373..8c339e96ca 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -734,7 +734,7 @@ virQEMUCapsFindBinary(const char *format, char *ret =3D NULL; char *binary =3D NULL; =20 - virAsprintf(&binary, format, archstr); + binary =3D g_strdup_printf(format, archstr); =20 ret =3D virFindFileInPath(binary); VIR_FREE(binary); @@ -2411,7 +2411,7 @@ virQEMUCapsProbeQMPMachineProps(virQEMUCapsPtr qemuCa= ps, =20 /* The QOM type for machine types is the machine type name * followed by the -machine suffix */ - virAsprintf(&type, "%s-machine", canon); + type =3D g_strdup_printf("%s-machine", canon); =20 if ((nvalues =3D qemuMonitorGetObjectProps(mon, type, &values)) < = 0) return -1; @@ -4847,7 +4847,7 @@ virQEMUCapsCacheNew(const char *libDir, virQEMUCapsCachePrivPtr priv =3D NULL; struct utsname uts; =20 - virAsprintf(&capsCacheDir, "%s/capabilities", cacheDir); + capsCacheDir =3D g_strdup_printf("%s/capabilities", cacheDir); =20 if (!(cache =3D virFileCacheNew(capsCacheDir, "xml", &qemuCapsCacheHan= dlers))) goto error; @@ -4865,7 +4865,7 @@ virQEMUCapsCacheNew(const char *libDir, priv->kvmUsable =3D VIR_TRISTATE_BOOL_ABSENT; =20 if (uname(&uts) =3D=3D 0) - virAsprintf(&priv->kernelVersion, "%s %s", uts.release, uts.versio= n); + priv->kernelVersion =3D g_strdup_printf("%s %s", uts.release, uts.= version); =20 cleanup: VIR_FREE(capsCacheDir); diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c index 4c224d6f40..e693e1ab14 100644 --- a/src/qemu/qemu_checkpoint.c +++ b/src/qemu/qemu_checkpoint.c @@ -92,14 +92,14 @@ qemuCheckpointWriteMetadata(virDomainObjPtr vm, if (newxml =3D=3D NULL) return -1; =20 - virAsprintf(&chkDir, "%s/%s", checkpointDir, vm->def->name); + chkDir =3D g_strdup_printf("%s/%s", checkpointDir, vm->def->name); if (virFileMakePath(chkDir) < 0) { virReportSystemError(errno, _("cannot create checkpoint directory = '%s'"), chkDir); return -1; } =20 - virAsprintf(&chkFile, "%s/%s.xml", chkDir, def->parent.name); + chkFile =3D g_strdup_printf("%s/%s.xml", chkDir, def->parent.name); =20 return virXMLSaveFile(chkFile, NULL, "checkpoint-edit", newxml); } @@ -125,8 +125,8 @@ qemuCheckpointDiscard(virQEMUDriverPtr driver, return -1; } =20 - virAsprintf(&chkFile, "%s/%s/%s.xml", cfg->checkpointDir, vm->def->nam= e, - chk->def->name); + chkFile =3D g_strdup_printf("%s/%s/%s.xml", cfg->checkpointDir, vm->de= f->name, + chk->def->name); =20 if (!metadata_only) { qemuDomainObjPrivatePtr priv =3D vm->privateData; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a55a5826a7..e234be298d 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -262,7 +262,7 @@ qemuVirCommandGetFDSet(virCommandPtr cmd, int fd) return NULL; } =20 - virAsprintf(&result, "set=3D%d,fd=3D%d", idx, fd); + result =3D g_strdup_printf("set=3D%d,fd=3D%d", idx, fd); return result; } =20 @@ -289,7 +289,7 @@ qemuVirCommandGetDevSet(virCommandPtr cmd, int fd) return NULL; } =20 - virAsprintf(&result, "/dev/fdset/%d", idx); + result =3D g_strdup_printf("/dev/fdset/%d", idx); return result; } =20 @@ -795,8 +795,8 @@ qemuBuildGeneralSecinfoURI(virURIPtr uri, _("found non printable characters in secret= ")); return -1; } - virAsprintf(&uri->user, "%s:%s", secinfo->s.plain.username, - secinfo->s.plain.secret); + uri->user =3D g_strdup_printf("%s:%s", secinfo->s.plain.userna= me, + secinfo->s.plain.secret); } else { uri->user =3D g_strdup(secinfo->s.plain.username); } @@ -946,7 +946,7 @@ qemuBuildNetworkDriveURI(virStorageSourcePtr src, return NULL; =20 if (src->hosts->socket) - virAsprintf(&uri->query, "socket=3D%s", src->hosts->socket); + uri->query =3D g_strdup_printf("socket=3D%s", src->hosts->socket); =20 if (qemuBuildGeneralSecinfoURI(uri, secinfo) < 0) return NULL; @@ -1035,10 +1035,10 @@ qemuBuildNetworkDriveStr(virStorageSourcePtr src, } =20 if (src->nhosts =3D=3D 0) { - virAsprintf(&ret, "sheepdog:%s", src->path); + ret =3D g_strdup_printf("sheepdog:%s", src->path); } else if (src->nhosts =3D=3D 1) { - virAsprintf(&ret, "sheepdog:%s:%u:%s", src->hosts->name, - src->hosts->port, src->path); + ret =3D g_strdup_printf("sheepdog:%s:%u:%s", src->hosts->n= ame, + src->hosts->port, src->path); } else { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("protocol 'sheepdog' accepts up to one ho= st")); @@ -2370,7 +2370,7 @@ qemuBuildFloppyCommandLineControllerOptions(virComman= dPtr cmd, driveLetter =3D 'A'; =20 if (bootindex) - virAsprintf(&bootindexStr, "bootindex%c=3D%u", driveLetter, bo= otindex); + bootindexStr =3D g_strdup_printf("bootindex%c=3D%u", driveLett= er, bootindex); =20 /* with -blockdev we setup the floppy device and it's backend with= -device */ if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV)) { @@ -2378,7 +2378,7 @@ qemuBuildFloppyCommandLineControllerOptions(virComman= dPtr cmd, return -1; =20 if (backendAlias) - virAsprintf(&backendStr, "drive%c=3D%s", driveLetter, back= endAlias); + backendStr =3D g_strdup_printf("drive%c=3D%s", driveLetter= , backendAlias); } =20 if (!explicitfdc) { @@ -3580,7 +3580,7 @@ qemuBuildMemoryCellBackendStr(virDomainDefPtr def, unsigned long long memsize =3D virDomainNumaGetNodeMemorySize(def->num= a, cell); =20 - virAsprintf(&alias, "ram-node%zu", cell); + alias =3D g_strdup_printf("ram-node%zu", cell); =20 mem.size =3D memsize; mem.targetNode =3D cell; @@ -3613,7 +3613,7 @@ qemuBuildMemoryDimmBackendStr(virBufferPtr buf, return -1; } =20 - virAsprintf(&alias, "mem%s", mem->info.alias); + alias =3D g_strdup_printf("mem%s", mem->info.alias); =20 if (qemuBuildMemoryBackendProps(&props, alias, cfg, priv, def, mem, true) < 0) @@ -3697,14 +3697,14 @@ qemuBuildLegacyNicStr(virDomainNetDefPtr net) char macaddr[VIR_MAC_STRING_BUFLEN]; const char *netmodel =3D virDomainNetGetModelString(net); =20 - virAsprintf(&str, - "nic,macaddr=3D%s,netdev=3Dhost%s%s%s%s%s", - virMacAddrFormat(&net->mac, macaddr), - net->info.alias, - netmodel ? ",model=3D" : "", - NULLSTR_EMPTY(netmodel), - (net->info.alias ? ",id=3D" : ""), - NULLSTR_EMPTY(net->info.alias)); + str =3D g_strdup_printf( + "nic,macaddr=3D%s,netdev=3Dhost%s%s%s%s%s", + virMacAddrFormat(&net->mac, macaddr), + net->info.alias, + netmodel ? ",model=3D" : "", + NULLSTR_EMPTY(netmodel), + (net->info.alias ? ",id=3D" : ""), + NULLSTR_EMPTY(net->info.alias)); return str; } =20 @@ -4698,7 +4698,7 @@ qemuBuildVhostUserChardevStr(const char *alias, return NULL; } =20 - virAsprintf(&chardev, "socket,id=3Dchr-vu-%s,fd=3D%d", alias, *fd); + chardev =3D g_strdup_printf("socket,id=3Dchr-vu-%s,fd=3D%d", alias, *f= d); =20 virCommandPassFD(cmd, *fd, VIR_COMMAND_PASS_FD_CLOSE_PARENT); *fd =3D -1; @@ -5543,7 +5543,7 @@ qemuBuildHostdevCommandLine(virCommandPtr cmd, if (virSCSIVHostOpenVhostSCSI(&vhostfd) < 0) return -1; =20 - virAsprintf(&vhostfdName, "%d", vhostfd); + vhostfdName =3D g_strdup_printf("%d", vhostfd); =20 virCommandPassFD(cmd, vhostfd, VIR_COMMAND_PASS_FD_CLOSE_PARENT); @@ -5777,7 +5777,7 @@ qemuBuildRNGBackendProps(virDomainRNGDefPtr rng, g_autofree char *objAlias =3D NULL; g_autofree char *charBackendAlias =3D NULL; =20 - virAsprintf(&objAlias, "obj%s", rng->info.alias); + objAlias =3D g_strdup_printf("obj%s", rng->info.alias); =20 switch ((virDomainRNGBackend) rng->backend) { case VIR_DOMAIN_RNG_BACKEND_RANDOM: @@ -8566,7 +8566,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, int slirpfd =3D qemuSlirpGetFD(slirp); virCommandPassFD(cmd, slirpfd, VIR_COMMAND_PASS_FD_CLOSE_PARENT); - virAsprintf(&slirpfdName, "%d", slirpfd); + slirpfdName =3D g_strdup_printf("%d", slirpfd); } =20 =20 @@ -8574,14 +8574,14 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driv= er, if (qemuSecuritySetTapFDLabel(driver->securityManager, def, tapfd[i]) < 0) goto cleanup; - virAsprintf(&tapfdName[i], "%d", tapfd[i]); + tapfdName[i] =3D g_strdup_printf("%d", tapfd[i]); virCommandPassFD(cmd, tapfd[i], VIR_COMMAND_PASS_FD_CLOSE_PARENT); tapfd[i] =3D -1; } =20 for (i =3D 0; i < vhostfdSize; i++) { - virAsprintf(&vhostfdName[i], "%d", vhostfd[i]); + vhostfdName[i] =3D g_strdup_printf("%d", vhostfd[i]); virCommandPassFD(cmd, vhostfd[i], VIR_COMMAND_PASS_FD_CLOSE_PARENT); vhostfd[i] =3D -1; @@ -8957,9 +8957,9 @@ qemuBuildShmemBackendMemProps(virDomainShmemDefPtr sh= mem) g_autofree char *mem_path =3D NULL; virJSONValuePtr ret =3D NULL; =20 - virAsprintf(&mem_path, "/dev/shm/%s", shmem->name); + mem_path =3D g_strdup_printf("/dev/shm/%s", shmem->name); =20 - virAsprintf(&mem_alias, "shmmem-%s", shmem->info.alias); + mem_alias =3D g_strdup_printf("shmmem-%s", shmem->info.alias); =20 qemuMonitorCreateObjectProps(&ret, "memory-backend-file", mem_alias, "s:mem-path", mem_path, @@ -9689,8 +9689,8 @@ qemuBuildTPMBackendStr(const virDomainDef *def, case VIR_DOMAIN_TPM_TYPE_EMULATOR: virBufferAddLit(&buf, ",chardev=3Dchrtpm"); =20 - virAsprintf(chardev, "socket,id=3Dchrtpm,path=3D%s", - tpm->data.emulator.source.data.nix.path); + *chardev =3D g_strdup_printf("socket,id=3Dchrtpm,path=3D%s", + tpm->data.emulator.source.data.nix.path); =20 break; case VIR_DOMAIN_TPM_TYPE_LAST: @@ -9775,13 +9775,13 @@ qemuBuildSEVCommandLine(virDomainObjPtr vm, virComm= andPtr cmd, virBufferAsprintf(&buf, ",policy=3D0x%x", sev->policy); =20 if (sev->dh_cert) { - virAsprintf(&path, "%s/dh_cert.base64", priv->libDir); + path =3D g_strdup_printf("%s/dh_cert.base64", priv->libDir); virBufferAsprintf(&buf, ",dh-cert-file=3D%s", path); VIR_FREE(path); } =20 if (sev->session) { - virAsprintf(&path, "%s/session.base64", priv->libDir); + path =3D g_strdup_printf("%s/session.base64", priv->libDir); virBufferAsprintf(&buf, ",session-file=3D%s", path); VIR_FREE(path); } @@ -10578,8 +10578,8 @@ static int qemuBuildParallelChrDeviceStr(char **deviceStr, virDomainChrDefPtr chr) { - virAsprintf(deviceStr, "isa-parallel,chardev=3Dchar%s,id=3D%s", - chr->info.alias, chr->info.alias); + *deviceStr =3D g_strdup_printf("isa-parallel,chardev=3Dchar%s,id=3D%s", + chr->info.alias, chr->info.alias); return 0; } =20 @@ -10600,8 +10600,8 @@ qemuBuildChannelChrDeviceStr(char **deviceStr, return ret; port =3D virSocketAddrGetPort(chr->target.addr); =20 - virAsprintf(deviceStr, "user,guestfwd=3Dtcp:%s:%i-chardev:char%s,i= d=3D%s", - addr, port, chr->info.alias, chr->info.alias); + *deviceStr =3D g_strdup_printf("user,guestfwd=3Dtcp:%s:%i-chardev:= char%s,id=3D%s", + addr, port, chr->info.alias, chr->inf= o.alias); break; =20 case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO: diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 41fd134afc..19f4b00710 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -130,29 +130,29 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool pr= ivileged) cfg->cgroupControllers =3D -1; /* -1 =3D=3D auto-detect */ =20 if (privileged) { - virAsprintf(&cfg->logDir, "%s/log/libvirt/qemu", LOCALSTATEDIR); + cfg->logDir =3D g_strdup_printf("%s/log/libvirt/qemu", LOCALSTATED= IR); =20 - virAsprintf(&cfg->swtpmLogDir, "%s/log/swtpm/libvirt/qemu", - LOCALSTATEDIR); + cfg->swtpmLogDir =3D g_strdup_printf("%s/log/swtpm/libvirt/qemu", + LOCALSTATEDIR); =20 cfg->configBaseDir =3D g_strdup(SYSCONFDIR "/libvirt"); =20 - virAsprintf(&cfg->stateDir, "%s/libvirt/qemu", RUNSTATEDIR); + cfg->stateDir =3D g_strdup_printf("%s/libvirt/qemu", RUNSTATEDIR); =20 - virAsprintf(&cfg->swtpmStateDir, "%s/libvirt/qemu/swtpm", RUNSTATE= DIR); + cfg->swtpmStateDir =3D g_strdup_printf("%s/libvirt/qemu/swtpm", RU= NSTATEDIR); =20 - virAsprintf(&cfg->cacheDir, "%s/cache/libvirt/qemu", LOCALSTATEDIR= ); + cfg->cacheDir =3D g_strdup_printf("%s/cache/libvirt/qemu", LOCALST= ATEDIR); =20 - virAsprintf(&cfg->libDir, "%s/lib/libvirt/qemu", LOCALSTATEDIR); - virAsprintf(&cfg->saveDir, "%s/save", cfg->libDir); - virAsprintf(&cfg->snapshotDir, "%s/snapshot", cfg->libDir); - virAsprintf(&cfg->checkpointDir, "%s/checkpoint", cfg->libDir); - virAsprintf(&cfg->autoDumpPath, "%s/dump", cfg->libDir); - virAsprintf(&cfg->channelTargetDir, "%s/channel/target", cfg->libD= ir); - virAsprintf(&cfg->nvramDir, "%s/nvram", cfg->libDir); - virAsprintf(&cfg->memoryBackingDir, "%s/ram", cfg->libDir); - virAsprintf(&cfg->swtpmStorageDir, "%s/lib/libvirt/swtpm", - LOCALSTATEDIR); + cfg->libDir =3D g_strdup_printf("%s/lib/libvirt/qemu", LOCALSTATED= IR); + cfg->saveDir =3D g_strdup_printf("%s/save", cfg->libDir); + cfg->snapshotDir =3D g_strdup_printf("%s/snapshot", cfg->libDir); + cfg->checkpointDir =3D g_strdup_printf("%s/checkpoint", cfg->libDi= r); + cfg->autoDumpPath =3D g_strdup_printf("%s/dump", cfg->libDir); + cfg->channelTargetDir =3D g_strdup_printf("%s/channel/target", cfg= ->libDir); + cfg->nvramDir =3D g_strdup_printf("%s/nvram", cfg->libDir); + cfg->memoryBackingDir =3D g_strdup_printf("%s/ram", cfg->libDir); + cfg->swtpmStorageDir =3D g_strdup_printf("%s/lib/libvirt/swtpm", + LOCALSTATEDIR); if (!virDoesUserExist("tss") || virGetUserID("tss", &cfg->swtpm_user) < 0) cfg->swtpm_user =3D 0; /* fall back to root */ @@ -167,39 +167,39 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool pr= ivileged) if (!cachedir) return NULL; =20 - virAsprintf(&cfg->logDir, "%s/qemu/log", cachedir); - virAsprintf(&cfg->swtpmLogDir, "%s/qemu/log", cachedir); - virAsprintf(&cfg->cacheDir, "%s/qemu/cache", cachedir); + cfg->logDir =3D g_strdup_printf("%s/qemu/log", cachedir); + cfg->swtpmLogDir =3D g_strdup_printf("%s/qemu/log", cachedir); + cfg->cacheDir =3D g_strdup_printf("%s/qemu/cache", cachedir); =20 rundir =3D virGetUserRuntimeDirectory(); if (!rundir) return NULL; - virAsprintf(&cfg->stateDir, "%s/qemu/run", rundir); + cfg->stateDir =3D g_strdup_printf("%s/qemu/run", rundir); =20 - virAsprintf(&cfg->swtpmStateDir, "%s/swtpm", cfg->stateDir); + cfg->swtpmStateDir =3D g_strdup_printf("%s/swtpm", cfg->stateDir); =20 if (!(cfg->configBaseDir =3D virGetUserConfigDirectory())) return NULL; =20 - virAsprintf(&cfg->libDir, "%s/qemu/lib", cfg->configBaseDir); - virAsprintf(&cfg->saveDir, "%s/qemu/save", cfg->configBaseDir); - virAsprintf(&cfg->snapshotDir, "%s/qemu/snapshot", cfg->configBase= Dir); - virAsprintf(&cfg->checkpointDir, "%s/qemu/checkpoint", - cfg->configBaseDir); - virAsprintf(&cfg->autoDumpPath, "%s/qemu/dump", cfg->configBaseDir= ); - virAsprintf(&cfg->channelTargetDir, "%s/qemu/channel/target", - cfg->configBaseDir); - virAsprintf(&cfg->nvramDir, "%s/qemu/nvram", cfg->configBaseDir); - virAsprintf(&cfg->memoryBackingDir, "%s/qemu/ram", cfg->configBase= Dir); - virAsprintf(&cfg->swtpmStorageDir, "%s/qemu/swtpm", - cfg->configBaseDir); + cfg->libDir =3D g_strdup_printf("%s/qemu/lib", cfg->configBaseDir); + cfg->saveDir =3D g_strdup_printf("%s/qemu/save", cfg->configBaseDi= r); + cfg->snapshotDir =3D g_strdup_printf("%s/qemu/snapshot", cfg->conf= igBaseDir); + cfg->checkpointDir =3D g_strdup_printf("%s/qemu/checkpoint", + cfg->configBaseDir); + cfg->autoDumpPath =3D g_strdup_printf("%s/qemu/dump", cfg->configB= aseDir); + cfg->channelTargetDir =3D g_strdup_printf("%s/qemu/channel/target", + cfg->configBaseDir); + cfg->nvramDir =3D g_strdup_printf("%s/qemu/nvram", cfg->configBase= Dir); + cfg->memoryBackingDir =3D g_strdup_printf("%s/qemu/ram", cfg->conf= igBaseDir); + cfg->swtpmStorageDir =3D g_strdup_printf("%s/qemu/swtpm", + cfg->configBaseDir); cfg->swtpm_user =3D (uid_t)-1; cfg->swtpm_group =3D (gid_t)-1; } =20 - virAsprintf(&cfg->configDir, "%s/qemu", cfg->configBaseDir); - virAsprintf(&cfg->autostartDir, "%s/qemu/autostart", cfg->configBaseDi= r); - virAsprintf(&cfg->slirpStateDir, "%s/slirp", cfg->stateDir); + cfg->configDir =3D g_strdup_printf("%s/qemu", cfg->configBaseDir); + cfg->autostartDir =3D g_strdup_printf("%s/qemu/autostart", cfg->config= BaseDir); + cfg->slirpStateDir =3D g_strdup_printf("%s/slirp", cfg->stateDir); =20 /* Set the default directory to find TLS X.509 certificates. * This will then be used as a fallback if the service specific @@ -1354,8 +1354,8 @@ virQEMUDriverGetDomainCapabilities(virQEMUDriverPtr d= river, cfg->firmwares, cfg->nfirmwares) < 0) return NULL; =20 - virAsprintf(&key, "%d:%d:%s:%s", data.arch, data.virttype, - NULLSTR(data.machine), NULLSTR(data.path)); + key =3D g_strdup_printf("%d:%d:%s:%s", data.arch, data.virttype, + NULLSTR(data.machine), NULLSTR(data.path)); =20 if (virHashAddEntry(domCapsCache, key, domCaps) < 0) return NULL; @@ -1386,7 +1386,7 @@ qemuGetSharedDeviceKey(const char *device_path) return NULL; } =20 - virAsprintf(&key, "%d:%d", maj, min); + key =3D g_strdup_printf("%d:%d", maj, min); =20 return key; } @@ -1662,7 +1662,7 @@ qemuGetHostdevPath(virDomainHostdevDefPtr hostdev) scsihostsrc->unit))) return NULL; =20 - virAsprintf(&dev_path, "/dev/%s", dev_name); + dev_path =3D g_strdup_printf("/dev/%s", dev_name); return dev_path; } =20 @@ -1839,7 +1839,7 @@ qemuGetBaseHugepagePath(virHugeTLBFSPtr hugepage) { char *ret; =20 - virAsprintf(&ret, "%s/libvirt/qemu", hugepage->mnt_dir); + ret =3D g_strdup_printf("%s/libvirt/qemu", hugepage->mnt_dir); =20 return ret; } @@ -1854,7 +1854,7 @@ qemuGetDomainHugepagePath(const virDomainDef *def, char *ret =3D NULL; =20 if (base && domPath) - virAsprintf(&ret, "%s/%s", base, domPath); + ret =3D g_strdup_printf("%s/%s", base, domPath); return ret; } =20 @@ -1906,7 +1906,7 @@ void qemuGetMemoryBackingBasePath(virQEMUDriverConfigPtr cfg, char **path) { - virAsprintf(path, "%s/libvirt/qemu", cfg->memoryBackingDir); + *path =3D g_strdup_printf("%s/libvirt/qemu", cfg->memoryBackingDir); } =20 =20 @@ -1922,7 +1922,7 @@ qemuGetMemoryBackingDomainPath(const virDomainDef *de= f, return -1; =20 qemuGetMemoryBackingBasePath(cfg, &base); - virAsprintf(path, "%s/%s", base, shortName); + *path =3D g_strdup_printf("%s/%s", base, shortName); =20 return 0; } @@ -1958,6 +1958,6 @@ qemuGetMemoryBackingPath(const virDomainDef *def, if (qemuGetMemoryBackingDomainPath(def, cfg, &domainPath) < 0) return -1; =20 - virAsprintf(memPath, "%s/%s", domainPath, alias); + *memPath =3D g_strdup_printf("%s/%s", domainPath, alias); return 0; } diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 25d4a0eb07..fe97e13c4f 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2025,11 +2025,11 @@ qemuDomainSetPrivatePathsOld(virQEMUDriverPtr drive= r, virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); =20 if (!priv->libDir) - virAsprintf(&priv->libDir, "%s/domain-%s", cfg->libDir, vm->def->n= ame); + priv->libDir =3D g_strdup_printf("%s/domain-%s", cfg->libDir, vm->= def->name); =20 if (!priv->channelTargetDir) - virAsprintf(&priv->channelTargetDir, "%s/domain-%s", - cfg->channelTargetDir, vm->def->name); + priv->channelTargetDir =3D g_strdup_printf("%s/domain-%s", + cfg->channelTargetDir, vm= ->def->name); =20 virObjectUnref(cfg); } @@ -2048,11 +2048,11 @@ qemuDomainSetPrivatePaths(virQEMUDriverPtr driver, goto cleanup; =20 if (!priv->libDir) - virAsprintf(&priv->libDir, "%s/domain-%s", cfg->libDir, domname); + priv->libDir =3D g_strdup_printf("%s/domain-%s", cfg->libDir, domn= ame); =20 if (!priv->channelTargetDir) - virAsprintf(&priv->channelTargetDir, "%s/domain-%s", - cfg->channelTargetDir, domname); + priv->channelTargetDir =3D g_strdup_printf("%s/domain-%s", + cfg->channelTargetDir, do= mname); =20 ret =3D 0; cleanup: @@ -9316,7 +9316,7 @@ qemuDomainLogContextPtr qemuDomainLogContextNew(virQE= MUDriverPtr driver, ctxt->writefd =3D -1; ctxt->readfd =3D -1; =20 - virAsprintf(&ctxt->path, "%s/%s.log", cfg->logDir, vm->def->name); + ctxt->path =3D g_strdup_printf("%s/%s.log", cfg->logDir, vm->def->name= ); =20 if (cfg->stdioLogD) { ctxt->manager =3D virLogManagerNew(virQEMUDriverIsPrivileged(drive= r)); @@ -9496,7 +9496,7 @@ qemuDomainLogAppendMessage(virQEMUDriverPtr driver, VIR_DEBUG("Append log message (vm=3D'%s' message=3D'%s) stdioLogD=3D%d= ", vm->def->name, message, cfg->stdioLogD); =20 - virAsprintf(&path, "%s/%s.log", cfg->logDir, vm->def->name); + path =3D g_strdup_printf("%s/%s.log", cfg->logDir, vm->def->name); =20 if (cfg->stdioLogD) { if (!(manager =3D virLogManagerNew(virQEMUDriverIsPrivileged(drive= r)))) @@ -9589,14 +9589,14 @@ qemuDomainSnapshotWriteMetadata(virDomainObjPtr vm, if (newxml =3D=3D NULL) return -1; =20 - virAsprintf(&snapDir, "%s/%s", snapshotDir, vm->def->name); + snapDir =3D g_strdup_printf("%s/%s", snapshotDir, vm->def->name); if (virFileMakePath(snapDir) < 0) { virReportSystemError(errno, _("cannot create snapshot directory '%= s'"), snapDir); goto cleanup; } =20 - virAsprintf(&snapFile, "%s/%s.xml", snapDir, def->parent.name); + snapFile =3D g_strdup_printf("%s/%s.xml", snapDir, def->parent.name); =20 ret =3D virXMLSaveFile(snapFile, NULL, "snapshot-edit", newxml); =20 @@ -9729,8 +9729,8 @@ qemuDomainSnapshotDiscard(virQEMUDriverPtr driver, } } =20 - virAsprintf(&snapFile, "%s/%s/%s.xml", cfg->snapshotDir, vm->def->name, - snap->def->name); + snapFile =3D g_strdup_printf("%s/%s/%s.xml", cfg->snapshotDir, vm->def= ->name, + snap->def->name); =20 if (snap =3D=3D virDomainSnapshotGetCurrent(vm->snapshots)) { virDomainSnapshotSetCurrent(vm->snapshots, NULL); @@ -9818,7 +9818,7 @@ qemuDomainRemoveInactiveCommon(virQEMUDriverPtr drive= r, VIR_WARN("unable to remove all snapshots for domain %s", vm->def->name); } else { - virAsprintf(&snapDir, "%s/%s", cfg->snapshotDir, vm->def->name); + snapDir =3D g_strdup_printf("%s/%s", cfg->snapshotDir, vm->def->na= me); =20 if (rmdir(snapDir) < 0 && errno !=3D ENOENT) VIR_WARN("unable to remove snapshot directory %s", snapDir); @@ -9828,8 +9828,8 @@ qemuDomainRemoveInactiveCommon(virQEMUDriverPtr drive= r, VIR_WARN("unable to remove all checkpoints for domain %s", vm->def->name); } else { - virAsprintf(&chkDir, "%s/%s", cfg->checkpointDir, - vm->def->name); + chkDir =3D g_strdup_printf("%s/%s", cfg->checkpointDir, + vm->def->name); if (rmdir(chkDir) < 0 && errno !=3D ENOENT) VIR_WARN("unable to remove checkpoint directory %s", chkDir); } @@ -10177,7 +10177,7 @@ qemuDomainStorageAlias(const char *device, int dept= h) if (!depth) alias =3D g_strdup(device); else - virAsprintf(&alias, "%s.%d", device, depth); + alias =3D g_strdup_printf("%s.%d", device, depth); return alias; } =20 @@ -11726,8 +11726,8 @@ ppc64VFIODeviceIsNV2Bridge(const char *device) for (i =3D 0; i < G_N_ELEMENTS(nvlink2Files); i++) { g_autofree char *file =3D NULL; =20 - virAsprintf(&file, "/sys/bus/pci/devices/%s/of_node/%s", - device, nvlink2Files[i]); + file =3D g_strdup_printf("/sys/bus/pci/devices/%s/of_node/%s", + device, nvlink2Files[i]); =20 if (!virFileExists(file)) return false; @@ -12406,15 +12406,15 @@ qemuDomainPrepareChannel(virDomainChrDefPtr chann= el, return 0; =20 if (channel->target.name) { - virAsprintf(&channel->source->data.nix.path, "%s/%s", - domainChannelTargetDir, channel->target.name); + channel->source->data.nix.path =3D g_strdup_printf("%s/%s", + domainChannelTarg= etDir, channel->target.name); } else { /* Generate a unique name */ - virAsprintf(&channel->source->data.nix.path, - "%s/vioser-%02d-%02d-%02d.sock", domainChannelTargetDi= r, - channel->info.addr.vioserial.controller, - channel->info.addr.vioserial.bus, - channel->info.addr.vioserial.port); + channel->source->data.nix.path =3D g_strdup_printf( + "%s/vioser-%02d-%= 02d-%02d.sock", domainChannelTargetDir, + channel->info.add= r.vioserial.controller, + channel->info.add= r.vioserial.bus, + channel->info.add= r.vioserial.port); } =20 return 0; @@ -12604,9 +12604,9 @@ qemuDomainPrepareShmemChardev(virDomainShmemDefPtr = shmem) shmem->server.chr.data.nix.path) return; =20 - virAsprintf(&shmem->server.chr.data.nix.path, - "/var/lib/libvirt/shmem-%s-sock", - shmem->name); + shmem->server.chr.data.nix.path =3D g_strdup_printf( + "/var/lib/libvirt/sh= mem-%s-sock", + shmem->name); } =20 =20 @@ -12932,7 +12932,7 @@ qemuDomainGetPreservedMountPath(virQEMUDriverConfig= Ptr cfg, if (STREQ(mountpoint, "/dev")) suffix =3D "dev"; =20 - virAsprintf(&path, "%s/%s.%s", cfg->stateDir, domname, suffix); + path =3D g_strdup_printf("%s/%s.%s", cfg->stateDir, domname, suffix); =20 /* Now consider that @mountpoint is "/dev/blah/blah2". * @suffix then points to "blah/blah2". However, caller @@ -13112,8 +13112,8 @@ qemuDomainCreateDeviceRecursive(const char *device, if (i =3D=3D data->ndevMountsPath) { /* Okay, @device is in /dev but not in any mount point under /= dev. * Create it. */ - virAsprintf(&devicePath, "%s/%s", data->path, - device + strlen(QEMU_DEVPREFIX)); + devicePath =3D g_strdup_printf("%s/%s", data->path, + device + strlen(QEMU_DEVPREFIX)); =20 if (virFileMakeParentPath(devicePath) < 0) { virReportSystemError(errno, @@ -13167,7 +13167,7 @@ qemuDomainCreateDeviceRecursive(const char *device, if ((c =3D strrchr(devTmp, '/'))) *(c + 1) =3D '\0'; =20 - virAsprintf(&tmp, "%s%s", devTmp, target); + tmp =3D g_strdup_printf("%s%s", devTmp, target); VIR_FREE(devTmp); VIR_FREE(target); target =3D g_steal_pointer(&tmp); @@ -13330,7 +13330,7 @@ qemuDomainSetupDev(virQEMUDriverConfigPtr cfg, * tmpfs is limited to 64kb, since we only have device nodes in there * and don't want to DOS the entire OS RAM usage */ - virAsprintf(&opts, "mode=3D755,size=3D65536%s", mount_options); + opts =3D g_strdup_printf("mode=3D755,size=3D65536%s", mount_options); =20 if (virFileSetupDev(data->path, opts) < 0) goto cleanup; @@ -14139,7 +14139,7 @@ qemuDomainAttachDeviceMknodRecursive(virQEMUDriverP= tr driver, if ((c =3D strrchr(fileTmp, '/'))) *(c + 1) =3D '\0'; =20 - virAsprintf(&tmp, "%s%s", fileTmp, target); + tmp =3D g_strdup_printf("%s%s", fileTmp, target); VIR_FREE(fileTmp); VIR_FREE(target); target =3D g_steal_pointer(&tmp); @@ -14695,7 +14695,7 @@ qemuDomainDiskBackingStoreGetName(virDomainDiskDefP= tr disk, char *ret =3D NULL; =20 if (idx) - virAsprintf(&ret, "%s[%d]", disk->dst, idx); + ret =3D g_strdup_printf("%s[%d]", disk->dst, idx); else ret =3D g_strdup(disk->dst); =20 @@ -15138,8 +15138,8 @@ qemuDomainPrepareStorageSourceBlockdev(virDomainDis= kDefPtr disk, { src->id =3D qemuDomainStorageIdNew(priv); =20 - virAsprintf(&src->nodestorage, "libvirt-%u-storage", src->id); - virAsprintf(&src->nodeformat, "libvirt-%u-format", src->id); + src->nodestorage =3D g_strdup_printf("libvirt-%u-storage", src->id); + src->nodeformat =3D g_strdup_printf("libvirt-%u-format", src->id); =20 if (qemuDomainValidateStorageSource(src, priv->qemuCaps) < 0) return -1; @@ -15173,7 +15173,7 @@ qemuDomainPrepareDiskSourceBlockdev(virDomainDiskDe= fPtr disk, =20 if (disk->copy_on_read =3D=3D VIR_TRISTATE_SWITCH_ON && !diskPriv->nodeCopyOnRead) - virAsprintf(&diskPriv->nodeCopyOnRead, "libvirt-CoR-%s", disk->dst= ); + diskPriv->nodeCopyOnRead =3D g_strdup_printf("libvirt-CoR-%s", dis= k->dst); =20 for (n =3D disk->src; virStorageSourceIsBacking(n); n =3D n->backingSt= ore) { if (qemuDomainPrepareStorageSourceBlockdev(disk, n, priv, cfg) < 0) @@ -15326,7 +15326,7 @@ qemuDomainGetManagedPRSocketPath(qemuDomainObjPriva= tePtr priv) { char *ret =3D NULL; =20 - virAsprintf(&ret, "%s/%s.sock", priv->libDir, qemuDomainGetManagedPRAl= ias()); + ret =3D g_strdup_printf("%s/%s.sock", priv->libDir, qemuDomainGetManag= edPRAlias()); =20 return ret; } @@ -15418,7 +15418,7 @@ qemuDomainNVRAMPathFormat(virQEMUDriverConfigPtr cf= g, virDomainDefPtr def, char **path) { - virAsprintf(path, "%s/%s_VARS.fd", cfg->nvramDir, def->name); + *path =3D g_strdup_printf("%s/%s_VARS.fd", cfg->nvramDir, def->name); } =20 =20 diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 1bf0c63eb1..708e1041a3 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -154,7 +154,7 @@ qemuDomainDetachZPCIDevice(qemuMonitorPtr mon, { g_autofree char *zpciAlias =3D NULL; =20 - virAsprintf(&zpciAlias, "zpci%d", info->addr.pci.zpci.uid); + zpciAlias =3D g_strdup_printf("zpci%d", info->addr.pci.zpci.uid); =20 if (qemuMonitorDelDevice(mon, zpciAlias) < 0) return -1; @@ -1307,7 +1307,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, } =20 slirpfd =3D qemuSlirpGetFD(slirp); - virAsprintf(&slirpfdName, "slirpfd-%s", net->info.alias); + slirpfdName =3D g_strdup_printf("slirpfd-%s", net->info.alias); } break; =20 @@ -1356,10 +1356,10 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, goto cleanup; =20 for (i =3D 0; i < tapfdSize; i++) - virAsprintf(&tapfdName[i], "fd-%s%zu", net->info.alias, i); + tapfdName[i] =3D g_strdup_printf("fd-%s%zu", net->info.alias, i); =20 for (i =3D 0; i < vhostfdSize; i++) - virAsprintf(&vhostfdName[i], "vhostfd-%s%zu", net->info.alias, i); + vhostfdName[i] =3D g_strdup_printf("vhostfd-%s%zu", net->info.alia= s, i); =20 if (!(netstr =3D qemuBuildHostNetStr(net, tapfdName, tapfdSize, @@ -1502,7 +1502,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, goto cleanup; =20 virErrorPreserveLast(&originalError); - virAsprintf(&netdev_name, "host%s", net->info.alias); + netdev_name =3D g_strdup_printf("host%s", net->info.alias); if (QEMU_DOMAIN_NETWORK_PRIVATE(net)->slirp) qemuSlirpStop(QEMU_DOMAIN_NETWORK_PRIVATE(net)->slirp, vm, driver,= net, true); qemuDomainObjEnterMonitor(driver, vm); @@ -2353,7 +2353,7 @@ qemuDomainAttachMemory(virQEMUDriverPtr driver, if (qemuAssignDeviceMemoryAlias(vm->def, mem, priv->memAliasOrderMisma= tch) < 0) goto cleanup; =20 - virAsprintf(&objalias, "mem%s", mem->info.alias); + objalias =3D g_strdup_printf("mem%s", mem->info.alias); =20 if (!(devstr =3D qemuBuildMemoryDeviceStr(mem, priv))) goto cleanup; @@ -2699,7 +2699,7 @@ qemuDomainAttachSCSIVHostDevice(virQEMUDriverPtr driv= er, if (virSCSIVHostOpenVhostSCSI(&vhostfd) < 0) goto cleanup; =20 - virAsprintf(&vhostfdName, "vhostfd-%d", vhostfd); + vhostfdName =3D g_strdup_printf("vhostfd-%d", vhostfd); =20 if (hostdev->info->type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { if (qemuDomainIsS390CCW(vm->def) && @@ -2970,7 +2970,7 @@ qemuDomainAttachShmemDevice(virQEMUDriverPtr driver, goto cleanup; =20 if (shmem->server.enabled) { - virAsprintf(&charAlias, "char%s", shmem->info.alias); + charAlias =3D g_strdup_printf("char%s", shmem->info.alias); } else { if (!(props =3D qemuBuildShmemBackendMemProps(shmem))) goto cleanup; @@ -3242,7 +3242,7 @@ qemuDomainAttachVsockDevice(virQEMUDriverPtr driver, if (qemuProcessOpenVhostVsock(vsock) < 0) goto cleanup; =20 - virAsprintf(&fdname, "%s%u", fdprefix, vsockPriv->vhostfd); + fdname =3D g_strdup_printf("%s%u", fdprefix, vsockPriv->vhostfd); =20 if (!(devstr =3D qemuBuildVsockDevStr(vm->def, vsock, priv->qemuCaps, = fdprefix))) goto cleanup; @@ -3975,7 +3975,7 @@ qemuDomainChangeGraphicsPasswords(virQEMUDriverPtr dr= iver, (auth->expires && auth->validTo <=3D now)) { expire =3D "now"; } else if (auth->expires) { - virAsprintf(&validTo, "%lu", (unsigned long)auth->validTo); + validTo =3D g_strdup_printf("%lu", (unsigned long)auth->validTo); expire =3D validTo; } else { expire =3D "never"; @@ -4330,7 +4330,7 @@ qemuDomainRemoveMemoryDevice(virQEMUDriverPtr driver, VIR_DEBUG("Removing memory device %s from domain %p %s", mem->info.alias, vm, vm->def->name); =20 - virAsprintf(&backendAlias, "mem%s", mem->info.alias); + backendAlias =3D g_strdup_printf("mem%s", mem->info.alias); =20 qemuDomainObjEnterMonitor(driver, vm); rc =3D qemuMonitorDelObject(priv->mon, backendAlias); @@ -4548,7 +4548,7 @@ qemuDomainRemoveNetDevice(virQEMUDriverPtr driver, VIR_DEBUG("Removing network interface %s from domain %p %s", net->info.alias, vm, vm->def->name); =20 - virAsprintf(&hostnet_name, "host%s", net->info.alias); + hostnet_name =3D g_strdup_printf("host%s", net->info.alias); if (!(charDevAlias =3D qemuAliasChardevFromDevAlias(net->info.alias))) return -1; =20 @@ -4703,7 +4703,7 @@ qemuDomainRemoveRNGDevice(virQEMUDriverPtr driver, rng->info.alias, vm, vm->def->name); =20 =20 - virAsprintf(&objAlias, "obj%s", rng->info.alias); + objAlias =3D g_strdup_printf("obj%s", rng->info.alias); =20 if (!(charAlias =3D qemuAliasChardevFromDevAlias(rng->info.alias))) return -1; @@ -4762,9 +4762,9 @@ qemuDomainRemoveShmemDevice(virQEMUDriverPtr driver, shmem->info.alias, vm, vm->def->name); =20 if (shmem->server.enabled) { - virAsprintf(&charAlias, "char%s", shmem->info.alias); + charAlias =3D g_strdup_printf("char%s", shmem->info.alias); } else { - virAsprintf(&memAlias, "shmmem-%s", shmem->info.alias); + memAlias =3D g_strdup_printf("shmmem-%s", shmem->info.alias); } =20 qemuDomainObjEnterMonitor(driver, vm); @@ -6005,7 +6005,7 @@ qemuDomainHotplugAddVcpu(virQEMUDriverPtr driver, size_t i; =20 if (newhotplug) { - virAsprintf(&vcpupriv->alias, "vcpu%u", vcpu); + vcpupriv->alias =3D g_strdup_printf("vcpu%u", vcpu); =20 if (!(vcpuprops =3D qemuBuildHotpluggableCPUProps(vcpuinfo))) goto cleanup; diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c index 8377b4d01d..dff4b3d76d 100644 --- a/src/qemu/qemu_interface.c +++ b/src/qemu/qemu_interface.c @@ -365,7 +365,7 @@ qemuCreateInBridgePortWithHelper(virQEMUDriverConfigPtr= cfg, virCommandAbort(cmd); =20 if (errbuf && *errbuf) - virAsprintf(&errstr, "\nstderr=3D%s", errbuf); + errstr =3D g_strdup_printf("\nstderr=3D%s", errbuf); =20 virReportError(VIR_ERR_INTERNAL_ERROR, _("%s: failed to communicate with bridge helper: %s%s"), diff --git a/src/qemu/qemu_interop_config.c b/src/qemu/qemu_interop_config.c index 00b86fde83..cbabde45df 100644 --- a/src/qemu/qemu_interop_config.c +++ b/src/qemu/qemu_interop_config.c @@ -57,7 +57,7 @@ qemuBuildFileList(virHashTablePtr files, const char *dir) =20 filename =3D g_strdup(ent->d_name); =20 - virAsprintf(&path, "%s/%s", dir, filename); + path =3D g_strdup_printf("%s/%s", dir, filename); =20 if (stat(path, &sb) < 0) { virReportSystemError(errno, _("Unable to access %s"), path); @@ -121,10 +121,10 @@ qemuInteropFetchConfigs(const char *name, if (!home) return -1; =20 - virAsprintf(&xdgConfig, "%s/.config", home); + xdgConfig =3D g_strdup_printf("%s/.config", home); } =20 - virAsprintf(&homeConfig, "%s/qemu/%s", xdgConfig, name); + homeConfig =3D g_strdup_printf("%s/qemu/%s", xdgConfig, name); } =20 if (!(files =3D virHashCreate(10, virHashValueFree))) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index aad2f77cb7..0447aa73bf 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -818,8 +818,8 @@ qemuMigrationSrcNBDStorageCopyBlockdev(virQEMUDriverPtr= driver, =20 copysrc->tlsAlias =3D g_strdup(tlsAlias); =20 - virAsprintf(©src->nodestorage, "migration-%s-storage", disk->dst); - virAsprintf(©src->nodeformat, "migration-%s-format", disk->dst); + copysrc->nodestorage =3D g_strdup_printf("migration-%s-storage", disk-= >dst); + copysrc->nodeformat =3D g_strdup_printf("migration-%s-format", disk->d= st); =20 /* Migration via blockdev-mirror was supported sooner than the auto-re= ad-only * feature was added to qemu */ @@ -864,11 +864,11 @@ qemuMigrationSrcNBDStorageCopyDriveMirror(virQEMUDriv= erPtr driver, int mon_ret; =20 if (strchr(host, ':')) { - virAsprintf(&nbd_dest, "nbd:[%s]:%d:exportname=3D%s", host, port, - diskAlias); + nbd_dest =3D g_strdup_printf("nbd:[%s]:%d:exportname=3D%s", host, = port, + diskAlias); } else { - virAsprintf(&nbd_dest, "nbd:%s:%d:exportname=3D%s", host, port, - diskAlias); + nbd_dest =3D g_strdup_printf("nbd:%s:%d:exportname=3D%s", host, po= rt, + diskAlias); } =20 if (qemuDomainObjEnterMonitorAsync(driver, vm, @@ -1831,7 +1831,7 @@ qemuMigrationDstGetURI(const char *migrateFrom, char *uri =3D NULL; =20 if (STREQ(migrateFrom, "stdio")) - virAsprintf(&uri, "fd:%d", migrateFd); + uri =3D g_strdup_printf("fd:%d", migrateFd); else uri =3D g_strdup(migrateFrom); =20 @@ -2255,7 +2255,7 @@ qemuMigrationDstPrepare(virDomainObjPtr vm, incFormat =3D "%s:[%s]:%d"; else incFormat =3D "%s:%s:%d"; - virAsprintf(&migrateFrom, incFormat, protocol, listenAddress, port= ); + migrateFrom =3D g_strdup_printf(incFormat, protocol, listenAddress= , port); } =20 inc =3D qemuProcessIncomingDefNew(priv->qemuCaps, listenAddress, @@ -2695,7 +2695,7 @@ qemuMigrationAnyParseURI(const char *uri, bool *wellF= ormed) /* For compatibility reasons tcp://... URIs are sent as tcp:... * We need to transform them to a well-formed URI before parsing. */ if (STRPREFIX(uri, "tcp:") && !STRPREFIX(uri + 4, "//")) { - virAsprintf(&tmp, "tcp://%s", uri + 4); + tmp =3D g_strdup_printf("tcp://%s", uri + 4); uri =3D tmp; } =20 @@ -2790,7 +2790,7 @@ qemuMigrationDstPrepareDirect(virQEMUDriverPtr driver, else incFormat =3D "%s:%s:%d"; =20 - virAsprintf(uri_out, incFormat, "tcp", hostname, port); + *uri_out =3D g_strdup_printf(incFormat, "tcp", hostname, port); } else { bool well_formed_uri; =20 @@ -2828,7 +2828,7 @@ qemuMigrationDstPrepareDirect(virQEMUDriverPtr driver, if (!(*uri_out =3D virURIFormat(uri))) goto cleanup; } else { - virAsprintf(uri_out, "%s:%d", uri_in, port); + *uri_out =3D g_strdup_printf("%s:%d", uri_in, port); } } else { port =3D uri->port; @@ -3294,7 +3294,7 @@ qemuMigrationSrcConnect(virQEMUDriverPtr driver, int ret =3D -1; =20 host =3D spec->dest.host.name; - virAsprintf(&port, "%d", spec->dest.host.port); + port =3D g_strdup_printf("%d", spec->dest.host.port); =20 spec->destType =3D MIGRATION_DEST_FD; spec->dest.fd.qemu =3D -1; diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_coo= kie.c index 990f2b06d0..1e2babf325 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -141,7 +141,7 @@ qemuDomainExtractTLSSubject(const char *certdir) int ret; size_t subjectlen; =20 - virAsprintf(&certfile, "%s/server-cert.pem", certdir); + certfile =3D g_strdup_printf("%s/server-cert.pem", certdir); =20 if (virFileReadAll(certfile, 8192, &pemdata) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 6495447188..c533819f4d 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -961,7 +961,7 @@ qemuMonitorNextCommandID(qemuMonitorPtr mon) { char *id; =20 - virAsprintf(&id, "libvirt-%d", ++mon->nextSerial); + id =3D g_strdup_printf("libvirt-%d", ++mon->nextSerial); return id; } =20 @@ -2560,8 +2560,8 @@ qemuMonitorMigrateToHost(qemuMonitorPtr mon, QEMU_CHECK_MONITOR(mon); =20 if (strchr(hostname, ':')) { - virAsprintf(&uri, "%s:[%s]:%d", protocol, hostname, port); - } else virAsprintf(&uri, "%s:%s:%d", protocol, hostname, port); + uri =3D g_strdup_printf("%s:[%s]:%d", protocol, hostname, port); + } else uri =3D g_strdup_printf("%s:%s:%d", protocol, hostname, port); =20 ret =3D qemuMonitorJSONMigrate(mon, flags, uri); =20 @@ -4246,20 +4246,20 @@ qemuMonitorGuestPanicEventInfoFormatMsg(qemuMonitor= EventPanicInfoPtr info) =20 switch (info->type) { case QEMU_MONITOR_EVENT_PANIC_INFO_TYPE_HYPERV: - virAsprintf(&ret, - "hyper-v: arg1=3D'0x%llx', arg2=3D'0x%llx', " - "arg3=3D'0x%llx', arg4=3D'0x%llx', arg5=3D'0x%llx'", - info->data.hyperv.arg1, info->data.hyperv.arg2, - info->data.hyperv.arg3, info->data.hyperv.arg4, - info->data.hyperv.arg5); + ret =3D g_strdup_printf( + "hyper-v: arg1=3D'0x%llx', arg2=3D'0x%llx', " + "arg3=3D'0x%llx', arg4=3D'0x%llx', arg5=3D'0= x%llx'", + info->data.hyperv.arg1, info->data.hyperv.ar= g2, + info->data.hyperv.arg3, info->data.hyperv.ar= g4, + info->data.hyperv.arg5); break; case QEMU_MONITOR_EVENT_PANIC_INFO_TYPE_S390: - virAsprintf(&ret, "s390: core=3D'%d' psw-mask=3D'0x%016llx' " - "psw-addr=3D'0x%016llx' reason=3D'%s'", - info->data.s390.core, - info->data.s390.psw_mask, - info->data.s390.psw_addr, - info->data.s390.reason); + ret =3D g_strdup_printf("s390: core=3D'%d' psw-mask=3D'0x%016llx' " + "psw-addr=3D'0x%016llx' reason=3D'%s'", + info->data.s390.core, + info->data.s390.psw_mask, + info->data.s390.psw_addr, + info->data.s390.reason); break; case QEMU_MONITOR_EVENT_PANIC_INFO_TYPE_NONE: case QEMU_MONITOR_EVENT_PANIC_INFO_TYPE_LAST: diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 697b302a7c..ab49cb5f54 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -7120,7 +7120,7 @@ qemuMonitorJSONNBDServerStart(qemuMonitorPtr mon, =20 switch ((virStorageNetHostTransport)server->transport) { case VIR_STORAGE_NET_HOST_TRANS_TCP: - virAsprintf(&port_str, "%u", server->port); + port_str =3D g_strdup_printf("%u", server->port); addr =3D qemuMonitorJSONBuildInetSocketAddress(server->name, port_= str); break; case VIR_STORAGE_NET_HOST_TRANS_UNIX: @@ -8051,7 +8051,7 @@ qemuMonitorJSONSetIOThread(qemuMonitorPtr mon, char *path =3D NULL; qemuMonitorJSONObjectProperty prop; =20 - virAsprintf(&path, "/objects/iothread%u", iothreadInfo->iothread_id); + path =3D g_strdup_printf("/objects/iothread%u", iothreadInfo->iothread= _id); =20 #define VIR_IOTHREAD_SET_PROP(propName, propVal) \ if (iothreadInfo->set_##propVal) { \ @@ -8209,11 +8209,11 @@ qemuMonitorJSONFindObjectPathByAlias(qemuMonitorPtr= mon, if (npaths < 0) return -1; =20 - virAsprintf(&child, "child<%s>", name); + child =3D g_strdup_printf("child<%s>", name); =20 for (i =3D 0; i < npaths; i++) { if (STREQ(paths[i]->name, alias) && STREQ(paths[i]->type, child)) { - virAsprintf(path, "/machine/peripheral/%s", alias); + *path =3D g_strdup_printf("/machine/peripheral/%s", alias); =20 ret =3D 0; goto cleanup; @@ -8265,7 +8265,7 @@ qemuMonitorJSONFindObjectPathByName(qemuMonitorPtr mo= n, if (STREQ_NULLABLE(paths[i]->type, name)) { VIR_DEBUG("Path to '%s' is '%s/%s'", name, curpath, paths[i]->= name); ret =3D 0; - virAsprintf(path, "%s/%s", curpath, paths[i]->name); + *path =3D g_strdup_printf("%s/%s", curpath, paths[i]->name); goto cleanup; } =20 @@ -8273,7 +8273,7 @@ qemuMonitorJSONFindObjectPathByName(qemuMonitorPtr mo= n, * traversed looking for more entries */ if (paths[i]->type && STRPREFIX(paths[i]->type, "child<")) { - virAsprintf(&nextpath, "%s/%s", curpath, paths[i]->name); + nextpath =3D g_strdup_printf("%s/%s", curpath, paths[i]->name); =20 ret =3D qemuMonitorJSONFindObjectPathByName(mon, nextpath, nam= e, path); VIR_FREE(nextpath); @@ -8316,7 +8316,7 @@ qemuMonitorJSONFindLinkPath(qemuMonitorPtr mon, return ret; } =20 - virAsprintf(&linkname, "link<%s>", name); + linkname =3D g_strdup_printf("link<%s>", name); =20 ret =3D qemuMonitorJSONFindObjectPathByName(mon, "/", linkname, path); VIR_FREE(linkname); diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index a5b2d2ccfd..9054682d60 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -42,7 +42,7 @@ int qemuMonitorTextAddDrive(qemuMonitorPtr mon, =20 /* 'dummy' here is just a placeholder since there is no PCI * address required when attaching drives to a controller */ - virAsprintf(&cmd, "drive_add dummy %s", drivestr); + cmd =3D g_strdup_printf("drive_add dummy %s", drivestr); =20 if (qemuMonitorJSONHumanCommand(mon, cmd, &reply) < 0) goto cleanup; @@ -91,7 +91,7 @@ int qemuMonitorTextDriveDel(qemuMonitorPtr mon, char *reply =3D NULL; int ret =3D -1; =20 - virAsprintf(&cmd, "drive_del %s", drivestr); + cmd =3D g_strdup_printf("drive_del %s", drivestr); =20 if (qemuMonitorJSONHumanCommand(mon, cmd, &reply) < 0) goto cleanup; @@ -129,7 +129,7 @@ qemuMonitorTextCreateSnapshot(qemuMonitorPtr mon, char *reply =3D NULL; int ret =3D -1; =20 - virAsprintf(&cmd, "savevm \"%s\"", name); + cmd =3D g_strdup_printf("savevm \"%s\"", name); =20 if (qemuMonitorJSONHumanCommand(mon, cmd, &reply)) goto cleanup; @@ -163,7 +163,7 @@ int qemuMonitorTextLoadSnapshot(qemuMonitorPtr mon, con= st char *name) int ret =3D -1; char *safename; =20 - virAsprintf(&cmd, "loadvm \"%s\"", name); + cmd =3D g_strdup_printf("loadvm \"%s\"", name); =20 if (qemuMonitorJSONHumanCommand(mon, cmd, &reply)) goto cleanup; @@ -206,7 +206,7 @@ int qemuMonitorTextDeleteSnapshot(qemuMonitorPtr mon, c= onst char *name) char *reply =3D NULL; int ret =3D -1; =20 - virAsprintf(&cmd, "delvm \"%s\"", name); + cmd =3D g_strdup_printf("delvm \"%s\"", name); if (qemuMonitorJSONHumanCommand(mon, cmd, &reply)) goto cleanup; =20 diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 925fc44a70..0917ad98d1 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -108,7 +108,7 @@ qemuProcessRemoveDomainStatus(virQEMUDriverPtr driver, qemuDomainObjPrivatePtr priv =3D vm->privateData; virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); =20 - virAsprintf(&file, "%s/%s.xml", cfg->stateDir, vm->def->name); + file =3D g_strdup_printf("%s/%s.xml", cfg->stateDir, vm->def->name); =20 if (unlink(file) < 0 && errno !=3D ENOENT && errno !=3D ENOTDIR) VIR_WARN("Failed to remove domain XML for %s: %s", @@ -2098,7 +2098,7 @@ qemuProcessLookupPTYs(virDomainChrDefPtr *devices, qemuMonitorChardevInfoPtr entry; =20 VIR_FREE(id); - virAsprintf(&id, "char%s", chr->info.alias); + id =3D g_strdup_printf("char%s", chr->info.alias); =20 entry =3D virHashLookup(info, id); if (!entry || !entry->ptyPath) { @@ -2187,7 +2187,7 @@ qemuProcessRefreshChannelVirtioState(virQEMUDriverPtr= driver, if (chr->targetType =3D=3D VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRT= IO) { =20 VIR_FREE(id); - virAsprintf(&id, "char%s", chr->info.alias); + id =3D g_strdup_printf("char%s", chr->info.alias); =20 /* port state not reported */ if (!(entry =3D virHashLookup(info, id)) || @@ -3194,7 +3194,7 @@ qemuProcessPrepareMonitorChr(virDomainChrSourceDefPtr= monConfig, monConfig->type =3D VIR_DOMAIN_CHR_TYPE_UNIX; monConfig->data.nix.listen =3D true; =20 - virAsprintf(&monConfig->data.nix.path, "%s/monitor.sock", domainDir); + monConfig->data.nix.path =3D g_strdup_printf("%s/monitor.sock", domain= Dir); return 0; } =20 @@ -3400,8 +3400,8 @@ qemuProcessUpdateState(virQEMUDriverPtr driver, virDo= mainObjPtr vm) } else { newState =3D VIR_DOMAIN_PAUSED; newReason =3D reason; - virAsprintf(&msg, "was paused (%s)", - virDomainPausedReasonTypeToString(reason)); + msg =3D g_strdup_printf("was paused (%s)", + virDomainPausedReasonTypeToString(reason= )); } } =20 @@ -4066,7 +4066,7 @@ qemuProcessVerifyHypervFeatures(virDomainDefPtr def, if (def->hyperv_features[i] !=3D VIR_TRISTATE_SWITCH_ON) continue; =20 - virAsprintf(&cpuFeature, "hv-%s", virDomainHypervTypeToString(i)); + cpuFeature =3D g_strdup_printf("hv-%s", virDomainHypervTypeToStrin= g(i)); =20 rc =3D virCPUDataCheckFeature(cpu, cpuFeature); VIR_FREE(cpuFeature); @@ -4898,8 +4898,8 @@ qemuProcessGraphicsSetupListen(virQEMUDriverPtr drive= r, * default instead of tcp listen. */ if (useSocket) { memset(glisten, 0, sizeof(virDomainGraphicsListenDef)); - virAsprintf(&glisten->socket, "%s/%s.sock", priv->libD= ir, - type); + glisten->socket =3D g_strdup_printf("%s/%s.sock", priv= ->libDir, + type); glisten->fromConfig =3D true; glisten->type =3D VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCK= ET; } else if (listenAddr) { @@ -4920,8 +4920,8 @@ qemuProcessGraphicsSetupListen(virQEMUDriverPtr drive= r, =20 case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET: if (!glisten->socket) { - virAsprintf(&glisten->socket, "%s/%s.sock", priv->libDir, - type); + glisten->socket =3D g_strdup_printf("%s/%s.sock", priv->li= bDir, + type); glisten->autoGenerated =3D true; } break; @@ -5998,7 +5998,7 @@ qemuProcessSetupHotpluggableVcpus(virQEMUDriverPtr dr= iver, =20 if (vcpu->hotpluggable =3D=3D VIR_TRISTATE_BOOL_YES && vcpu->onlin= e && vcpupriv->vcpus !=3D 0) { - virAsprintf(&vcpupriv->alias, "vcpu%zu", i); + vcpupriv->alias =3D g_strdup_printf("vcpu%zu", i); =20 if (VIR_APPEND_ELEMENT(bootHotplug, nbootHotplug, vcpu) < 0) goto cleanup; @@ -8480,7 +8480,7 @@ qemuProcessQMPInit(qemuProcessQMPPtr proc) =20 VIR_DEBUG("proc=3D%p, emulator=3D%s", proc, proc->binary); =20 - virAsprintf(&template, "%s/qmp-XXXXXX", proc->libDir); + template =3D g_strdup_printf("%s/qmp-XXXXXX", proc->libDir); =20 if (!(proc->uniqDir =3D mkdtemp(template))) { virReportSystemError(errno, @@ -8493,16 +8493,16 @@ qemuProcessQMPInit(qemuProcessQMPPtr proc) if (qemuProcessQEMULabelUniqPath(proc) < 0) goto cleanup; =20 - virAsprintf(&proc->monpath, "%s/%s", proc->uniqDir, "qmp.monitor"); + proc->monpath =3D g_strdup_printf("%s/%s", proc->uniqDir, "qmp.monitor= "); =20 - virAsprintf(&proc->monarg, "unix:%s,server,nowait", proc->monpath); + proc->monarg =3D g_strdup_printf("unix:%s,server,nowait", proc->monpat= h); =20 /* * Normally we'd use runDir for pid files, but because we're using * -daemonize we need QEMU to be allowed to create them, rather * than libvirtd. So we're using libDir which QEMU can write to */ - virAsprintf(&proc->pidfile, "%s/%s", proc->uniqDir, "qmp.pid"); + proc->pidfile =3D g_strdup_printf("%s/%s", proc->uniqDir, "qmp.pid"); =20 ret =3D 0; =20 diff --git a/src/qemu/qemu_slirp.c b/src/qemu/qemu_slirp.c index c08a365548..5266b36eaa 100644 --- a/src/qemu/qemu_slirp.c +++ b/src/qemu/qemu_slirp.c @@ -156,7 +156,7 @@ qemuSlirpCreatePidFilename(virQEMUDriverConfigPtr cfg, if (!(shortName =3D virDomainDefGetShortName(def))) return NULL; =20 - virAsprintf(&name, "%s-%s-slirp", shortName, alias); + name =3D g_strdup_printf("%s-%s-slirp", shortName, alias); =20 return virPidFileBuildPath(cfg->slirpStateDir, name); } @@ -210,7 +210,7 @@ qemuSlirpGetDBusVMStateId(virDomainNetDefPtr net) char *id =3D NULL; =20 /* can't use alias, because it's not stable across restarts */ - virAsprintf(&id, "slirp-%s", virMacAddrFormat(&net->mac, macstr)); + id =3D g_strdup_printf("slirp-%s", virMacAddrFormat(&net->mac, macstr)= ); =20 return id; } @@ -227,8 +227,8 @@ qemuSlirpGetDBusPath(virQEMUDriverConfigPtr cfg, if (!(shortName =3D virDomainDefGetShortName(def))) return NULL; =20 - virAsprintf(&path, "%s/%s-%s-slirp", - cfg->slirpStateDir, shortName, alias); + path =3D g_strdup_printf("%s/%s-%s-slirp", + cfg->slirpStateDir, shortName, alias); =20 return path; } @@ -380,7 +380,7 @@ qemuSlirpStart(qemuSlirpPtr slirp, return -1; } =20 - virAsprintf(&dbus_addr, "unix:path=3D%s", dbus_path); + dbus_addr =3D g_strdup_printf("unix:path=3D%s", dbus_path); =20 virCommandAddArgFormat(cmd, "--dbus-id=3D%s", id); =20 diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index d6d418533c..62b9f803bd 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -78,7 +78,7 @@ qemuTPMCreateEmulatorStoragePath(const char *swtpmStorage= Dir, return NULL; } =20 - virAsprintf(&path, "%s/%s/%s", swtpmStorageDir, uuidstr, dir); + path =3D g_strdup_printf("%s/%s/%s", swtpmStorageDir, uuidstr, dir); return path; } =20 @@ -206,7 +206,7 @@ qemuTPMCreateEmulatorSocket(const char *swtpmStateDir, { char *path =3D NULL; =20 - virAsprintf(&path, "%s/%s-swtpm.sock", swtpmStateDir, shortName); + path =3D g_strdup_printf("%s/%s-swtpm.sock", swtpmStateDir, shortName); =20 return path; } @@ -249,7 +249,7 @@ qemuTPMEmulatorCreatePidFilename(const char *swtpmState= Dir, char *pidfile =3D NULL; char *devicename =3D NULL; =20 - virAsprintf(&devicename, "%s-swtpm", shortName); + devicename =3D g_strdup_printf("%s-swtpm", shortName); =20 pidfile =3D virPidFileBuildPath(swtpmStateDir, devicename); =20 @@ -332,7 +332,7 @@ qemuTPMEmulatorPrepareHost(virDomainTPMDefPtr tpm, =20 /* create logfile name ... */ if (!tpm->data.emulator.logfile) - virAsprintf(&tpm->data.emulator.logfile, "%s/%s-swtpm.log", logDir= , vmname); + tpm->data.emulator.logfile =3D g_strdup_printf("%s/%s-swtpm.log", = logDir, vmname); =20 if (!virFileExists(tpm->data.emulator.logfile) && virFileTouch(tpm->data.emulator.logfile, 0644) < 0) { @@ -486,7 +486,7 @@ qemuTPMEmulatorRunSetup(const char *storagepath, goto cleanup; =20 virUUIDFormat(vmuuid, uuid); - virAsprintf(&vmid, "%s:%s", vmname, uuid); + vmid =3D g_strdup_printf("%s:%s", vmname, uuid); =20 virCommandSetUID(cmd, swtpm_user); virCommandSetGID(cmd, swtpm_group); diff --git a/src/qemu/qemu_vhost_user_gpu.c b/src/qemu/qemu_vhost_user_gpu.c index 7355ae70f8..37e424eac3 100644 --- a/src/qemu/qemu_vhost_user_gpu.c +++ b/src/qemu/qemu_vhost_user_gpu.c @@ -47,7 +47,7 @@ qemuVhostUserGPUCreatePidFilename(const char *stateDir, { g_autofree char *devicename =3D NULL; =20 - virAsprintf(&devicename, "%s-%s-vhost-user-gpu", shortName, alias); + devicename =3D g_strdup_printf("%s-%s-vhost-user-gpu", shortName, alia= s); =20 return virPidFileBuildPath(stateDir, devicename); } --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571753054; cv=none; d=zoho.com; s=zohoarc; b=KD2QdPUt7rFRw0clygweg0RCkBqTJ8yi9k3ZmcZlZuGoX+ReMw08UZ07Uk0z2FJ7GReMl583alP5GWxAoUEkBpnfd09HJgpnE45diahvJoRcZ1Vj5yqU1tUN/ROG2iW7q6jib0kjhcAnUS0UUdV5dPSku6hv+u2OlxfyRcGPYGM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571753054; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HltMP8UpwetwT5JNQMXBHaoBXPgY5sf+DUqVkuLAUiM=; b=Q9w9NR/mNw+exoJC85D1AXZ4LTltZmH0w2jTLvS/BlhjckbyQCWOnSDj6Y8et+2HNoKWNJy9ze0PvkFE1pbL/0Ep1Jd0H2f9GccLTp4ADrJApx8R0KZz3zMO+UkFMMPzBR+0ysDUAJzYxgYeQ/NbGxWqWdNedAPTpInf0+18QDs= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1571753054270256.09404672759615; Tue, 22 Oct 2019 07:04:14 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-339-nvHIhY5mNo6tAmknYHLs9A-1; Tue, 22 Oct 2019 10:01:24 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 875C4107AD3B; Tue, 22 Oct 2019 14:01:17 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 596DF5C1D4; Tue, 22 Oct 2019 14:01:17 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id E5760180B76F; Tue, 22 Oct 2019 14:01:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9ME0oti002754 for ; Tue, 22 Oct 2019 10:00:50 -0400 Received: by smtp.corp.redhat.com (Postfix) id E345B6012D; Tue, 22 Oct 2019 14:00:50 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6B6CE6012C for ; Tue, 22 Oct 2019 14:00:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571753053; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=HltMP8UpwetwT5JNQMXBHaoBXPgY5sf+DUqVkuLAUiM=; b=UqmN1Cy3R3/OdoOcr3k8mud5/FDg7Fc6s5QEgNYYWyr4+LGqCCbsJbP572772oAuKKOhdB xxLEDUNKHHpIZmLeaumI1jsZ+FkREytBZi+KAt7jTsyvmuwerKhn+cX9cGkWFjBWBEkk4G cnZrWP6HGA56c/3T2iIQDM9YHejaCAU= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:58 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 54/75] remote: Use g_strdup_printf() instead of virAsprintf() X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: nvHIhY5mNo6tAmknYHLs9A-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Michal Privoznik Reviewed-by: Daniel Henrique Barboza --- src/remote/remote_daemon.c | 28 ++++++++++++++-------------- src/remote/remote_daemon_config.c | 2 +- src/remote/remote_daemon_dispatch.c | 14 +++++++------- src/remote/remote_driver.c | 12 ++++++------ 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c index 6977cc36e0..56e1455a1a 100644 --- a/src/remote/remote_daemon.c +++ b/src/remote/remote_daemon.c @@ -225,23 +225,23 @@ daemonUnixSocketPaths(struct daemonConfig *config, char *rundir =3D NULL; =20 if (config->unix_sock_dir) { - virAsprintf(sockfile, "%s/%s-sock", config->unix_sock_dir, - SOCK_PREFIX); + *sockfile =3D g_strdup_printf("%s/%s-sock", config->unix_sock_dir, + SOCK_PREFIX); =20 if (privileged) { - virAsprintf(rosockfile, "%s/%s-sock-ro", - config->unix_sock_dir, SOCK_PREFIX); - virAsprintf(admsockfile, "%s/%s-admin-sock", - config->unix_sock_dir, SOCK_PREFIX); + *rosockfile =3D g_strdup_printf("%s/%s-sock-ro", + config->unix_sock_dir, SOCK_PREF= IX); + *admsockfile =3D g_strdup_printf("%s/%s-admin-sock", + config->unix_sock_dir, SOCK_PRE= FIX); } } else { if (privileged) { - virAsprintf(sockfile, "%s/libvirt/%s-sock", - RUNSTATEDIR, SOCK_PREFIX); - virAsprintf(rosockfile, "%s/libvirt/%s-sock-ro", - RUNSTATEDIR, SOCK_PREFIX); - virAsprintf(admsockfile, "%s/libvirt/%s-admin-sock", - RUNSTATEDIR, SOCK_PREFIX); + *sockfile =3D g_strdup_printf("%s/libvirt/%s-sock", + RUNSTATEDIR, SOCK_PREFIX); + *rosockfile =3D g_strdup_printf("%s/libvirt/%s-sock-ro", + RUNSTATEDIR, SOCK_PREFIX); + *admsockfile =3D g_strdup_printf("%s/libvirt/%s-admin-sock", + RUNSTATEDIR, SOCK_PREFIX); } else { mode_t old_umask; =20 @@ -255,8 +255,8 @@ daemonUnixSocketPaths(struct daemonConfig *config, } umask(old_umask); =20 - virAsprintf(sockfile, "%s/%s-sock", rundir, SOCK_PREFIX); - virAsprintf(admsockfile, "%s/%s-admin-sock", rundir, SOCK_PREF= IX); + *sockfile =3D g_strdup_printf("%s/%s-sock", rundir, SOCK_PREFI= X); + *admsockfile =3D g_strdup_printf("%s/%s-admin-sock", rundir, S= OCK_PREFIX); } } =20 diff --git a/src/remote/remote_daemon_config.c b/src/remote/remote_daemon_c= onfig.c index cfc0869747..ae6b491686 100644 --- a/src/remote/remote_daemon_config.c +++ b/src/remote/remote_daemon_config.c @@ -84,7 +84,7 @@ daemonConfigFilePath(bool privileged, char **configfile) if (!(configdir =3D virGetUserConfigDirectory())) goto error; =20 - virAsprintf(configfile, "%s/%s.conf", configdir, DAEMON_NAME); + *configfile =3D g_strdup_printf("%s/%s.conf", configdir, DAEMON_NA= ME); VIR_FREE(configdir); } =20 diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon= _dispatch.c index d12c3c1ed9..a443cb174b 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -2174,7 +2174,7 @@ remoteDispatchProbeURI(bool readonly, g_autofree char *daemonname =3D NULL; g_autofree char *daemonpath =3D NULL; =20 - virAsprintf(&daemonname, "virt%sd", drivers[i]); + daemonname =3D g_strdup_printf("virt%sd", drivers[i]); =20 if (!(daemonpath =3D virFileFindResource(daemonname, "src", SB= INDIR))) return -1; @@ -2184,7 +2184,7 @@ remoteDispatchProbeURI(bool readonly, continue; } =20 - virAsprintf(probeduri, "%s:///session", drivers[i]); + *probeduri =3D g_strdup_printf("%s:///session", drivers[i]); =20 VIR_DEBUG("Probed URI %s via daemon %s", *probeduri, daemonpat= h); return 0; @@ -2217,15 +2217,15 @@ remoteDispatchProbeURI(bool readonly, for (i =3D 0; i < (ssize_t) G_N_ELEMENTS(drivers) && !*probeduri; = i++) { g_autofree char *sockname =3D NULL; =20 - virAsprintf(&sockname, "%s/libvirt/virt%sd-%s", RUNSTATEDIR, - drivers[i], readonly ? "sock-ro" : "sock"); + sockname =3D g_strdup_printf("%s/libvirt/virt%sd-%s", RUNSTATE= DIR, + drivers[i], readonly ? "sock-ro" : = "sock"); =20 if (!virFileExists(sockname)) { VIR_DEBUG("Missing sock %s for driver %s", sockname, drive= rs[i]); continue; } =20 - virAsprintf(probeduri, "%s:///system", drivers[i]); + *probeduri =3D g_strdup_printf("%s:///system", drivers[i]); =20 VIR_DEBUG("Probed URI %s via sock %s", *probeduri, sockname); return 0; @@ -3839,8 +3839,8 @@ remoteDispatchAuthList(virNetServerPtr server, virResetLastError(); } else if (callerUid =3D=3D 0) { char *ident; - virAsprintf(&ident, "pid:%lld,uid:%d", (long long)callerPid, - (int)callerUid); + ident =3D g_strdup_printf("pid:%lld,uid:%d", (long long)caller= Pid, + (int)callerUid); VIR_INFO("Bypass polkit auth for privileged client %s", ident); virNetServerSetClientAuthenticated(server, client); auth =3D VIR_NET_SERVER_SERVICE_AUTH_NONE; diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 4fcf13161c..2872b67469 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -781,7 +781,7 @@ remoteGetUNIXSocketHelper(remoteDriverTransport transpo= rt, if (!(userdir =3D virGetUserRuntimeDirectory())) return NULL; =20 - virAsprintf(&sockname, "%s/%s-sock", userdir, sock_prefix); + sockname =3D g_strdup_printf("%s/%s-sock", userdir, sock_prefix); } else { /* Intentionally do *NOT* use RUNSTATEDIR here. We might * be connecting to a remote machine, and cannot assume @@ -789,9 +789,9 @@ remoteGetUNIXSocketHelper(remoteDriverTransport transpo= rt, * any machine with /run will have a /var/run symlink. * The portable option is to thus use $LOCALSTATEDIR/run */ - virAsprintf(&sockname, "%s/run/libvirt/%s-%s", LOCALSTATEDIR, - sock_prefix, - flags & VIR_DRV_OPEN_REMOTE_RO ? "sock-ro" : "sock"); + sockname =3D g_strdup_printf("%s/run/libvirt/%s-%s", LOCALSTATEDIR, + sock_prefix, + flags & VIR_DRV_OPEN_REMOTE_RO ? "sock-= ro" : "sock"); } =20 VIR_DEBUG("Built UNIX sockname %s for transport %s prefix %s flags=3D0= x%x", @@ -815,7 +815,7 @@ remoteGetUNIXSocket(remoteDriverTransport transport, g_autofree char *legacy_sock_name =3D NULL; =20 if (driver) - virAsprintf(&direct_daemon, "virt%sd", driver); + direct_daemon =3D g_strdup_printf("virt%sd", driver); =20 legacy_daemon =3D g_strdup("libvirtd"); =20 @@ -998,7 +998,7 @@ doRemoteOpen(virConnectPtr conn, =20 /* Remote server defaults to "localhost" if not specified. */ if (conn->uri && conn->uri->port !=3D 0) { - virAsprintf(&port, "%d", conn->uri->port); + port =3D g_strdup_printf("%d", conn->uri->port); } else if (transport =3D=3D REMOTE_DRIVER_TRANSPORT_TLS) { port =3D g_strdup(LIBVIRTD_TLS_PORT); } else if (transport =3D=3D REMOTE_DRIVER_TRANSPORT_TCP) { --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571753054; cv=none; d=zoho.com; s=zohoarc; b=HVNoHJJ2x6noY7gOc0GsKhtxKOyKQ2KgEkUfYMxru3oQmNhmHeVj7L5ojqf7E1UoDwO2HxbA5IA+hQ+AxTHvrzVkwWW7Q2gI+vGM/oCdJpcONnTq8mBhW1l08OpVzXuRNi83rSKZSecKQANHDYAZiKXr15gK/mLfJZ8NzsdzIHo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571753054; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=3mlMWHRUouNgatYaDlQG91sv8D3+shUUPcoK0ANCtrc=; b=XFghegFJWwK0YQJCBGgcA4lWHTYcEAGJ7TaXF+ka8DgO21FQjOydTKKRcPSaNmzMVkO9QXehB9u67fVGatsEt10E/vRFCGJZwBXq9sXoQ+fcF7Qi9VkkmCYjS45kMsiQ0rDGK8bp8GAUmFcAse61gnTblqnbSedvQT7+jlrs9Ys= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1571753054156918.749491679285; Tue, 22 Oct 2019 07:04:14 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-331-dKqNkFc-Nii-WQRJ4RB0Rg-1; Tue, 22 Oct 2019 10:01:23 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1942B801E6F; Tue, 22 Oct 2019 14:01:18 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D4BFD5DE5B; Tue, 22 Oct 2019 14:01:17 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 60153180BA99; Tue, 22 Oct 2019 14:01:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9ME0pYn002761 for ; Tue, 22 Oct 2019 10:00:51 -0400 Received: by smtp.corp.redhat.com (Postfix) id B4D0C6012D; Tue, 22 Oct 2019 14:00:51 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3C48D6012C for ; Tue, 22 Oct 2019 14:00:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571753053; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=3mlMWHRUouNgatYaDlQG91sv8D3+shUUPcoK0ANCtrc=; b=LnK1B+pMbZ374bSuU1LATQvgIjqtfFplczzm7M+ashLjv1nLRTtkw5DlR3JmjaAFiF3vGd ZacodJGnFYdlEbNtb52s8KHAP63R5qxkE5mF4BWXfkwfQcznlYYitNt4kaIKoOmkNkxogh yH9h0qL+VDC0RVqDvUGL1vn9fe+nG8I= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:59 +0200 Message-Id: <3394f08b50913eeaf8bca0bd908b16fe2417a0c7.1571752582.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 55/75] rpc: Use g_strdup_printf() instead of virAsprintf() X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: dKqNkFc-Nii-WQRJ4RB0Rg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Michal Privoznik --- src/rpc/virnetclient.c | 12 ++++++------ src/rpc/virnetlibsshsession.c | 8 ++++---- src/rpc/virnetsocket.c | 2 +- src/rpc/virnetsshsession.c | 11 ++++++----- src/rpc/virnettlscontext.c | 26 +++++++++++++------------- 5 files changed, 30 insertions(+), 29 deletions(-) diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index a423f4db2f..47a17d30f7 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -343,7 +343,7 @@ virNetClientCheckKeyExists(const char *homedir, { char *path; =20 - virAsprintf(&path, "%s/.ssh/%s", homedir, name); + path =3D g_strdup_printf("%s/.ssh/%s", homedir, name); =20 if (!(virFileExists(path))) { VIR_FREE(path); @@ -565,7 +565,7 @@ virNetClientPtr virNetClientNewLibssh(const char *host, } else { confdir =3D virGetUserConfigDirectory(); if (confdir) - virAsprintf(&knownhosts, "%s/known_hosts", confdir); + knownhosts =3D g_strdup_printf("%s/known_hosts", confdir); } =20 if (privkeyPath) { @@ -599,10 +599,10 @@ virNetClientPtr virNetClientNewLibssh(const char *hos= t, if (!(nc =3D virBufferContentAndReset(&buf))) goto no_memory; =20 - virAsprintf(&command, "sh -c " - "'if '%s' -q 2>&1 | grep \"requires an argument\" >/dev/nu= ll 2>&1; then " - "ARG=3D-q0;" "else " "ARG=3D;" "fi;" "'%s' $ARG -U %s'", n= c, nc, - socketPath); + command =3D g_strdup_printf("sh -c " + "'if '%s' -q 2>&1 | grep \"requires an argum= ent\" >/dev/null 2>&1; then " + "ARG=3D-q0;" "else " "ARG=3D;" "fi;" "'%s' $= ARG -U %s'", nc, nc, + socketPath); =20 if (virNetSocketNewConnectLibssh(host, port, family, diff --git a/src/rpc/virnetlibsshsession.c b/src/rpc/virnetlibsshsession.c index 4a9f976914..2fcc606993 100644 --- a/src/rpc/virnetlibsshsession.c +++ b/src/rpc/virnetlibsshsession.c @@ -341,9 +341,9 @@ virNetLibsshCheckHostKey(virNetLibsshSessionPtr sess) if (!keyhashstr) return -1; =20 - virAsprintf(&tmp, - _("Accept SSH host key with hash '%s' for " "host = '%s:%d' (%s/%s)?"), - keyhashstr, sess->hostname, sess->port, "y", "n"); + tmp =3D g_strdup_printf( + _("Accept SSH host key with hash '%s' fo= r " "host '%s:%d' (%s/%s)?"), + keyhashstr, sess->hostname, sess->port, = "y", "n"); askKey.prompt =3D tmp; =20 if (sess->cred->cb(&askKey, 1, sess->cred->cbdata)) { @@ -524,7 +524,7 @@ virNetLibsshAuthenticatePrivkey(virNetLibsshSessionPtr = sess, =20 VIR_DEBUG("sess=3D%p", sess); =20 - virAsprintf(&tmp, "%s.pub", priv->filename); + tmp =3D g_strdup_printf("%s.pub", priv->filename); =20 /* try to open the public part of the private key */ ret =3D ssh_pki_import_pubkey_file(tmp, &public_key); diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 2b66bc609b..f2623c58ef 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -698,7 +698,7 @@ int virNetSocketNewConnectUNIX(const char *path, goto cleanup; } =20 - virAsprintf(&lockpath, "%s/%s.lock", rundir, binname); + lockpath =3D g_strdup_printf("%s/%s.lock", rundir, binname); =20 if ((lockfd =3D open(lockpath, O_RDWR | O_CREAT, 0600)) < 0 || virSetCloseExec(lockfd) < 0) { diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c index 384bedfc34..5b87581b62 100644 --- a/src/rpc/virnetsshsession.c +++ b/src/rpc/virnetsshsession.c @@ -365,9 +365,10 @@ virNetSSHCheckHostKey(virNetSSHSessionPtr sess) keyhashstr =3D virBufferContentAndReset(&buff); =20 askKey.type =3D VIR_CRED_ECHOPROMPT; - virAsprintf((char **)&askKey.prompt, - _("Accept SSH host key with hash '%s' for " "host = '%s:%d' (%s/%s)?"), - keyhashstr, sess->hostname, sess->port, "y", "n"); + askKey.prompt =3D g_strdup_printf(_("Accept SSH host key with = hash '%s' for " "host '%s:%d' (%s/%s)?"), + keyhashstr, + sess->hostname, + sess->port, "y", "n"); =20 if (sess->cred->cb(&askKey, 1, sess->cred->cbdata)) { virReportError(VIR_ERR_SSH, "%s", @@ -628,8 +629,8 @@ virNetSSHAuthenticatePrivkey(virNetSSHSessionPtr sess, return -1; } =20 - virAsprintf((char **)&retr_passphrase.prompt, - _("Passphrase for key '%s'"), priv->filename); + retr_passphrase.prompt =3D g_strdup_printf(_("Passphrase for key '%s'"= ), + priv->filename); =20 if (sess->cred->cb(&retr_passphrase, 1, sess->cred->cbdata)) { virReportError(VIR_ERR_SSH, "%s", diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c index af6d29b376..7163775f74 100644 --- a/src/rpc/virnettlscontext.c +++ b/src/rpc/virnettlscontext.c @@ -796,13 +796,13 @@ static int virNetTLSContextLocateCredentials(const ch= ar *pkipath, */ if (pkipath) { VIR_DEBUG("Told to use TLS credentials in %s", pkipath); - virAsprintf(cacert, "%s/%s", pkipath, "cacert.pem"); - virAsprintf(cacrl, "%s/%s", pkipath, "cacrl.pem"); - virAsprintf(key, "%s/%s", pkipath, - isServer ? "serverkey.pem" : "clientkey.pem"); + *cacert =3D g_strdup_printf("%s/%s", pkipath, "cacert.pem"); + *cacrl =3D g_strdup_printf("%s/%s", pkipath, "cacrl.pem"); + *key =3D g_strdup_printf("%s/%s", pkipath, + isServer ? "serverkey.pem" : "clientkey.pem= "); =20 - virAsprintf(cert, "%s/%s", pkipath, - isServer ? "servercert.pem" : "clientcert.pem"); + *cert =3D g_strdup_printf("%s/%s", pkipath, + isServer ? "servercert.pem" : "clientcert.= pem"); } else if (tryUserPkiPath) { /* Check to see if $HOME/.pki contains at least one of the * files and if so, use that @@ -812,19 +812,19 @@ static int virNetTLSContextLocateCredentials(const ch= ar *pkipath, if (!userdir) goto error; =20 - virAsprintf(&user_pki_path, "%s/.pki/libvirt", userdir); + user_pki_path =3D g_strdup_printf("%s/.pki/libvirt", userdir); =20 VIR_DEBUG("Trying to find TLS user credentials in %s", user_pki_pa= th); =20 - virAsprintf(cacert, "%s/%s", user_pki_path, "cacert.pem"); + *cacert =3D g_strdup_printf("%s/%s", user_pki_path, "cacert.pem"); =20 - virAsprintf(cacrl, "%s/%s", user_pki_path, "cacrl.pem"); + *cacrl =3D g_strdup_printf("%s/%s", user_pki_path, "cacrl.pem"); =20 - virAsprintf(key, "%s/%s", user_pki_path, - isServer ? "serverkey.pem" : "clientkey.pem"); + *key =3D g_strdup_printf("%s/%s", user_pki_path, + isServer ? "serverkey.pem" : "clientkey.pem= "); =20 - virAsprintf(cert, "%s/%s", user_pki_path, - isServer ? "servercert.pem" : "clientcert.pem"); + *cert =3D g_strdup_printf("%s/%s", user_pki_path, + isServer ? "servercert.pem" : "clientcert.= pem"); =20 /* * If some of the files can't be found, fallback --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752986; cv=none; d=zoho.com; s=zohoarc; b=dY4FwcU0iexCrzbdwqXLj4xBJ0zrhro7sSHYDojp7eSC5U8UysX2Y7ENt0RvmkItIbFeJTEG94BCKr2KTqHcYCA1Jllw1kUDBOPIzzoG4PBguA01znpuYFsPNTUFfzBfurBevsQxu3UHM/2ka051ZyjXbyW6CZMNHLHRkPei0QM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752986; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HyOB7MyiuYWt7T8W80NuWhYvpTNZBiFP30r69tX/nN8=; b=h8a8UwBEyko3FZuqcaIfjemQB92XWQlL+yQdoelzI7Um3YzhK4Yl7EkeOdJzY8D8UfeuyZrws7IUTWotX/1rF9eHxa6xcUw9e/BTmhazmkwIVIGSKfiTkBOBOIn0ddoF2Xa29qGzIEWdQEYLnOO/D8k82SEKTfLrlbe3psG1s70= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1571752986571515.7610077375068; Tue, 22 Oct 2019 07:03:06 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-149-9PDy_hXgOWOOcSbClrZHwA-1; Tue, 22 Oct 2019 10:01:29 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D874C1005532; Tue, 22 Oct 2019 14:01:23 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9DDE65DC18; Tue, 22 Oct 2019 14:01:23 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 2CE94180BA9A; Tue, 22 Oct 2019 14:01:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9ME0qp6002769 for ; Tue, 22 Oct 2019 10:00:52 -0400 Received: by smtp.corp.redhat.com (Postfix) id 86D346012E; Tue, 22 Oct 2019 14:00:52 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0E3E160BDF for ; Tue, 22 Oct 2019 14:00:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752985; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=HyOB7MyiuYWt7T8W80NuWhYvpTNZBiFP30r69tX/nN8=; b=WD15xoTFTsahF/oT97a32twL8Ep251F/m9xDuncqK06cIvknHu94OUx5cgVpp2ByO4rX1R EYHvPD6vGwRvytwe7cBEHGQcks7ZCU9EO/OhrT8BQMcwC6cLuJpuYs6mOeaHqkOLA6QUUl BCqy2pWvj5qFVNBUFWiPDYYZqtKRGj0= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:58:00 +0200 Message-Id: <7ad2cebd5114b2ae954908cee642a93f50f820b4.1571752582.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 56/75] secret: Use g_strdup_printf() instead of virAsprintf() X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: 9PDy_hXgOWOOcSbClrZHwA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Michal Privoznik --- src/secret/secret_driver.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c index 064a02dfdd..5a5c84412a 100644 --- a/src/secret/secret_driver.c +++ b/src/secret/secret_driver.c @@ -469,19 +469,19 @@ secretStateInitialize(bool privileged, driver->privileged =3D privileged; =20 if (privileged) { - virAsprintf(&driver->configDir, "%s/libvirt/secrets", SYSCONFDIR); - virAsprintf(&driver->stateDir, "%s/libvirt/secrets", RUNSTATEDIR); + driver->configDir =3D g_strdup_printf("%s/libvirt/secrets", SYSCON= FDIR); + driver->stateDir =3D g_strdup_printf("%s/libvirt/secrets", RUNSTAT= EDIR); } else { g_autofree char *rundir =3D NULL; g_autofree char *cfgdir =3D NULL; =20 if (!(cfgdir =3D virGetUserConfigDirectory())) goto error; - virAsprintf(&driver->configDir, "%s/secrets/", cfgdir); + driver->configDir =3D g_strdup_printf("%s/secrets/", cfgdir); =20 if (!(rundir =3D virGetUserRuntimeDirectory())) goto error; - virAsprintf(&driver->stateDir, "%s/secrets/run", rundir); + driver->stateDir =3D g_strdup_printf("%s/secrets/run", rundir); } =20 if (virFileMakePathWithMode(driver->configDir, S_IRWXU) < 0) { --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752992; cv=none; d=zoho.com; s=zohoarc; b=HdIIrjoH4QbQxA4HAbwqoCVDDAsfCw4MJqrAohhaUDjEmaY3QgXCx1kCV6sDEXmfvF9HVyJIdQMK0sOkRNSqXOuxgjjge+U0Ayc2uv5Pcg5GO3wSTZGgGY7kb46FcLMvZFbr6VqzVA0jin1YPkADp5HCbsMRwDIdCgeCyy0Hq8o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752992; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=pcekDK4xfFVeD+E03uC3Ho6R8nfwAJCIYViJlCHNnys=; b=AAzIN0+DuaUxxRL0E4mtSwpOwyyPmaW0fs77iAEBpJQqWz52RgJ9rXTWdynk8/yUe/dzMF5svkhwBg7G7ZGxaPyaSBr8GE1AF9eQmS/CQtG1D1kE0xmHV9U3KG8tkiPk1Nnv94SklU921Kpu5chgdEWdiOPCdw4+qFv+pTJeXxU= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1571752992296714.1075204955408; Tue, 22 Oct 2019 07:03:12 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-344-BOtOOM_cOPmxGNAjXPXZ5A-1; Tue, 22 Oct 2019 10:01:35 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 11F30601; Tue, 22 Oct 2019 14:01:29 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CE5F34503; Tue, 22 Oct 2019 14:01:28 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 6F3DD3FB47; Tue, 22 Oct 2019 14:01:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9ME0rbm002774 for ; Tue, 22 Oct 2019 10:00:53 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5A8A76012C; Tue, 22 Oct 2019 14:00:53 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id D5B106031D for ; Tue, 22 Oct 2019 14:00:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752991; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=pcekDK4xfFVeD+E03uC3Ho6R8nfwAJCIYViJlCHNnys=; b=RFtPScMaNLYWfXoSvcEzwZmXAY4OKt5goTeqj2hCHC7KD8wc5ga1G7mhz+EQI2D+BwiG0W ZtRMDcjd4Y7+W2R/3mHLyNeVp13tsrhWOXR6cukP7IapUAUtOGllwrh+yv89Ys8WkVXSzO Mh1pTud6+bVC8MbgoB50sCEPOublWts= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:58:01 +0200 Message-Id: <0ac4e97619eceda32adbd6625d1f26efbdd0164a.1571752582.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 57/75] security: Use g_strdup_printf() instead of virAsprintf() X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: BOtOOM_cOPmxGNAjXPXZ5A-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Michal Privoznik --- src/security/security_apparmor.c | 22 +++++++++--------- src/security/security_dac.c | 20 ++++++++-------- src/security/security_selinux.c | 40 ++++++++++++++++---------------- src/security/security_util.c | 12 +++++----- src/security/virt-aa-helper.c | 26 ++++++++++----------- 5 files changed, 60 insertions(+), 60 deletions(-) diff --git a/src/security/security_apparmor.c b/src/security/security_appar= mor.c index 7263c2face..5fdc5fd7f5 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -76,11 +76,11 @@ profile_status(const char *str, const int check_enforci= ng) int rc =3D -2; =20 /* create string that is ' \0' for accurate matching */ - virAsprintf(&tmp, "%s ", str); + tmp =3D g_strdup_printf("%s ", str); =20 if (check_enforcing !=3D 0) { /* create string that is ' (enforce)\0' for accurate matching= */ - virAsprintf(&etmp, "%s (enforce)", str); + etmp =3D g_strdup_printf("%s (enforce)", str); } =20 if (virFileReadAll(APPARMOR_PROFILES_PATH, MAX_FILE_LEN, &content) < 0= ) { @@ -126,7 +126,7 @@ profile_status_file(const char *str) int rc =3D -1; int len; =20 - virAsprintf(&profile, "%s/%s", APPARMOR_DIR "/libvirt", str); + profile =3D g_strdup_printf("%s/%s", APPARMOR_DIR "/libvirt", str); =20 if (!virFileExists(profile)) goto failed; @@ -138,7 +138,7 @@ profile_status_file(const char *str) } =20 /* create string that is ' flags=3D(complain)\0' */ - virAsprintf(&tmp, " %s flags=3D(complain)", str); + tmp =3D g_strdup_printf(" %s flags=3D(complain)", str); =20 if (strstr(content, tmp) !=3D NULL) rc =3D 0; @@ -221,7 +221,7 @@ get_profile_name(virDomainDefPtr def) char *name =3D NULL; =20 virUUIDFormat(def->uuid, uuidstr); - virAsprintf(&name, "%s%s", AA_PREFIX, uuidstr); + name =3D g_strdup_printf("%s%s", AA_PREFIX, uuidstr); =20 return name; } @@ -353,8 +353,8 @@ AppArmorSecurityManagerProbe(const char *virtDriver G_G= NUC_UNUSED) return rc; =20 /* see if template file exists */ - virAsprintf(&template_qemu, "%s/TEMPLATE.qemu", APPARMOR_DIR "/libvirt= "); - virAsprintf(&template_lxc, "%s/TEMPLATE.lxc", APPARMOR_DIR "/libvirt"); + template_qemu =3D g_strdup_printf("%s/TEMPLATE.qemu", APPARMOR_DIR "/l= ibvirt"); + template_lxc =3D g_strdup_printf("%s/TEMPLATE.lxc", APPARMOR_DIR "/lib= virt"); =20 if (!virFileExists(template_qemu)) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -1026,8 +1026,8 @@ AppArmorSetChardevLabel(virSecurityManagerPtr mgr, break; =20 case VIR_DOMAIN_CHR_TYPE_PIPE: - virAsprintf(&in, "%s.in", dev_source->data.file.path); - virAsprintf(&out, "%s.out", dev_source->data.file.path); + in =3D g_strdup_printf("%s.in", dev_source->data.file.path); + out =3D g_strdup_printf("%s.out", dev_source->data.file.path); if (virFileExists(in)) { if (reload_profile(mgr, def, in, true) < 0) goto done; @@ -1091,7 +1091,7 @@ AppArmorSetPathLabel(virSecurityManagerPtr mgr, char *full_path =3D NULL; =20 if (allowSubtree) { - virAsprintf(&full_path, "%s/{,**}", path); + full_path =3D g_strdup_printf("%s/{,**}", path); rc =3D reload_profile(mgr, def, full_path, true); VIR_FREE(full_path); } else { @@ -1123,7 +1123,7 @@ AppArmorSetFDLabel(virSecurityManagerPtr mgr, if (!secdef || !secdef->imagelabel) return 0; =20 - virAsprintf(&proc, "/proc/self/fd/%d", fd); + proc =3D g_strdup_printf("/proc/self/fd/%d", fd); =20 if (virFileResolveLink(proc, &fd_path) < 0) { /* it's a deleted file, presumably. Ignore? */ diff --git a/src/security/security_dac.c b/src/security/security_dac.c index dfa402d544..56cca6cf9c 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -302,8 +302,8 @@ virSecurityDACSetUserAndGroup(virSecurityManagerPtr mgr, priv->user =3D user; priv->group =3D group; =20 - virAsprintf(&priv->baselabel, "+%u:+%u", (unsigned int)user, - (unsigned int)group); + priv->baselabel =3D g_strdup_printf("+%u:+%u", (unsigned int)user, + (unsigned int)group); =20 return 0; } @@ -437,7 +437,7 @@ virSecurityDACRememberLabel(virSecurityDACDataPtr priv = G_GNUC_UNUSED, char *label =3D NULL; int ret =3D -1; =20 - virAsprintf(&label, "+%u:+%u", (unsigned int)uid, (unsigned int)gid); + label =3D g_strdup_printf("+%u:+%u", (unsigned int)uid, (unsigned int)= gid); =20 ret =3D virSecuritySetRememberedLabel(SECURITY_DAC_NAME, path, label); VIR_FREE(label); @@ -1507,8 +1507,8 @@ virSecurityDACSetChardevLabelHelper(virSecurityManage= rPtr mgr, break; =20 case VIR_DOMAIN_CHR_TYPE_PIPE: - virAsprintf(&in, "%s.in", dev_source->data.file.path); - virAsprintf(&out, "%s.out", dev_source->data.file.path); + in =3D g_strdup_printf("%s.in", dev_source->data.file.path); + out =3D g_strdup_printf("%s.out", dev_source->data.file.path); if (virFileExists(in) && virFileExists(out)) { if (virSecurityDACSetOwnership(mgr, NULL, in, user, group, rem= ember) < 0 || virSecurityDACSetOwnership(mgr, NULL, out, user, group, re= member) < 0) @@ -1599,8 +1599,8 @@ virSecurityDACRestoreChardevLabelHelper(virSecurityMa= nagerPtr mgr, break; =20 case VIR_DOMAIN_CHR_TYPE_PIPE: - virAsprintf(&out, "%s.out", dev_source->data.file.path); - virAsprintf(&in, "%s.in", dev_source->data.file.path); + out =3D g_strdup_printf("%s.out", dev_source->data.file.path); + in =3D g_strdup_printf("%s.in", dev_source->data.file.path); if (virFileExists(in) && virFileExists(out)) { if (virSecurityDACRestoreFileLabelInternal(mgr, NULL, out, rec= all) < 0 || virSecurityDACRestoreFileLabelInternal(mgr, NULL, in, reca= ll) < 0) @@ -2281,8 +2281,8 @@ virSecurityDACGenLabel(virSecurityManagerPtr mgr, } break; case VIR_DOMAIN_SECLABEL_DYNAMIC: - virAsprintf(&seclabel->label, "+%u:+%u", (unsigned int)priv->user, - (unsigned int)priv->group); + seclabel->label =3D g_strdup_printf("+%u:+%u", (unsigned int)priv-= >user, + (unsigned int)priv->group); if (seclabel->label =3D=3D NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, _("cannot generate dac user and group id " @@ -2333,7 +2333,7 @@ virSecurityDACGetProcessLabelInternal(pid_t pid, =20 VIR_DEBUG("Getting DAC user and group on process '%d'", pid); =20 - virAsprintf(&path, "/proc/%d", (int)pid); + path =3D g_strdup_printf("/proc/%d", (int)pid); =20 if (lstat(path, &sb) < 0) { virReportSystemError(errno, diff --git a/src/security/security_selinux.c b/src/security/security_selinu= x.c index 47fc95351f..5a2cd6bbeb 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -381,14 +381,14 @@ virSecuritySELinuxMCSFind(virSecurityManagerPtr mgr, VIR_DEBUG("Try cat %s:c%d,c%d", sens, c1 + catMin, c2 + catMin); =20 if (c1 =3D=3D c2) { - virAsprintf(&mcs, "%s:c%d", sens, catMin + c1); + mcs =3D g_strdup_printf("%s:c%d", sens, catMin + c1); } else { if (c1 > c2) { int t =3D c1; c1 =3D c2; c2 =3D t; } - virAsprintf(&mcs, "%s:c%d,c%d", sens, catMin + c1, catMin + c2= ); + mcs =3D g_strdup_printf("%s:c%d,c%d", sens, catMin + c1, catMi= n + c2); } =20 if (virHashLookup(data->mcs, mcs) =3D=3D NULL) @@ -2202,8 +2202,8 @@ virSecuritySELinuxSetHostdevCapsLabel(virSecurityMana= gerPtr mgr, switch (dev->source.caps.type) { case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_STORAGE: { if (vroot) { - virAsprintf(&path, "%s/%s", vroot, - dev->source.caps.u.storage.block); + path =3D g_strdup_printf("%s/%s", vroot, + dev->source.caps.u.storage.block); } else { path =3D g_strdup(dev->source.caps.u.storage.block); } @@ -2214,8 +2214,8 @@ virSecuritySELinuxSetHostdevCapsLabel(virSecurityMana= gerPtr mgr, =20 case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_MISC: { if (vroot) { - virAsprintf(&path, "%s/%s", vroot, - dev->source.caps.u.misc.chardev); + path =3D g_strdup_printf("%s/%s", vroot, + dev->source.caps.u.misc.chardev); } else { path =3D g_strdup(dev->source.caps.u.misc.chardev); } @@ -2433,8 +2433,8 @@ virSecuritySELinuxRestoreHostdevCapsLabel(virSecurity= ManagerPtr mgr, switch (dev->source.caps.type) { case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_STORAGE: { if (vroot) { - virAsprintf(&path, "%s/%s", vroot, - dev->source.caps.u.storage.block); + path =3D g_strdup_printf("%s/%s", vroot, + dev->source.caps.u.storage.block); } else { path =3D g_strdup(dev->source.caps.u.storage.block); } @@ -2445,8 +2445,8 @@ virSecuritySELinuxRestoreHostdevCapsLabel(virSecurity= ManagerPtr mgr, =20 case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_MISC: { if (vroot) { - virAsprintf(&path, "%s/%s", vroot, - dev->source.caps.u.misc.chardev); + path =3D g_strdup_printf("%s/%s", vroot, + dev->source.caps.u.misc.chardev); } else { path =3D g_strdup(dev->source.caps.u.misc.chardev); } @@ -2544,8 +2544,8 @@ virSecuritySELinuxSetChardevLabel(virSecurityManagerP= tr mgr, break; =20 case VIR_DOMAIN_CHR_TYPE_PIPE: - virAsprintf(&in, "%s.in", dev_source->data.file.path); - virAsprintf(&out, "%s.out", dev_source->data.file.path); + in =3D g_strdup_printf("%s.in", dev_source->data.file.path); + out =3D g_strdup_printf("%s.out", dev_source->data.file.path); if (virFileExists(in) && virFileExists(out)) { if ((virSecuritySELinuxSetFilecon(mgr, in, imagelabel, true) <= 0) || (virSecuritySELinuxSetFilecon(mgr, out, imagelabel, true) = < 0)) { @@ -2618,8 +2618,8 @@ virSecuritySELinuxRestoreChardevLabel(virSecurityMana= gerPtr mgr, break; =20 case VIR_DOMAIN_CHR_TYPE_PIPE: - virAsprintf(&out, "%s.out", dev_source->data.file.path); - virAsprintf(&in, "%s.in", dev_source->data.file.path); + out =3D g_strdup_printf("%s.out", dev_source->data.file.path); + in =3D g_strdup_printf("%s.in", dev_source->data.file.path); if (virFileExists(in) && virFileExists(out)) { if ((virSecuritySELinuxRestoreFileLabel(mgr, out, true) < 0) || (virSecuritySELinuxRestoreFileLabel(mgr, in, true) < 0)) { @@ -3257,7 +3257,7 @@ virSecuritySELinuxSetTapFDLabel(virSecurityManagerPtr= mgr, } =20 /* Label /dev/tap.* devices only. Leave /dev/net/tun alone! */ - virAsprintf(&proc, "/proc/self/fd/%d", fd); + proc =3D g_strdup_printf("/proc/self/fd/%d", fd); =20 if (virFileResolveLink(proc, &fd_path) < 0) { virReportSystemError(errno, @@ -3341,9 +3341,9 @@ virSecuritySELinuxGetSecurityMountOptions(virSecurity= ManagerPtr mgr, secdef->imagelabel =3D virSecuritySELinuxGenImageLabel(mgr, de= f); =20 if (secdef->imagelabel) { - virAsprintf(&opts, - ",context=3D\"%s\"", - (const char*) secdef->imagelabel); + opts =3D g_strdup_printf( + ",context=3D\"%s\"", + (const char*) secdef->imagelabel); } } =20 @@ -3402,7 +3402,7 @@ virSecuritySELinuxSetFileLabels(virSecurityManagerPtr= mgr, return -1; =20 while ((ret =3D virDirRead(dir, &ent, path)) > 0) { - virAsprintf(&filename, "%s/%s", path, ent->d_name); + filename =3D g_strdup_printf("%s/%s", path, ent->d_name); ret =3D virSecuritySELinuxSetFilecon(mgr, filename, seclabel->imagelabel, true); VIR_FREE(filename); @@ -3448,7 +3448,7 @@ virSecuritySELinuxRestoreFileLabels(virSecurityManage= rPtr mgr, return -1; =20 while ((ret =3D virDirRead(dir, &ent, path)) > 0) { - virAsprintf(&filename, "%s/%s", path, ent->d_name); + filename =3D g_strdup_printf("%s/%s", path, ent->d_name); ret =3D virSecuritySELinuxRestoreFileLabel(mgr, filename, true); VIR_FREE(filename); if (ret < 0) diff --git a/src/security/security_util.c b/src/security/security_util.c index 5fb0a3aae5..4f661fd75e 100644 --- a/src/security/security_util.c +++ b/src/security/security_util.c @@ -63,7 +63,7 @@ virSecurityGetAttrName(const char *name G_GNUC_UNUSED) { char *ret =3D NULL; #ifdef XATTR_NAMESPACE - virAsprintf(&ret, XATTR_NAMESPACE".libvirt.security.%s", name); + ret =3D g_strdup_printf(XATTR_NAMESPACE".libvirt.security.%s", name); #else errno =3D ENOSYS; virReportSystemError(errno, "%s", @@ -78,7 +78,7 @@ virSecurityGetRefCountAttrName(const char *name G_GNUC_UN= USED) { char *ret =3D NULL; #ifdef XATTR_NAMESPACE - virAsprintf(&ret, XATTR_NAMESPACE".libvirt.security.ref_%s", name); + ret =3D g_strdup_printf(XATTR_NAMESPACE".libvirt.security.ref_%s", nam= e); #else errno =3D ENOSYS; virReportSystemError(errno, "%s", @@ -93,7 +93,7 @@ static char * virSecurityGetTimestampAttrName(const char *name) { char *ret =3D NULL; - virAsprintf(&ret, XATTR_NAMESPACE ".libvirt.security.timestamp_%s", na= me); + ret =3D g_strdup_printf(XATTR_NAMESPACE ".libvirt.security.timestamp_%= s", name); return ret; } #else /* !XATTR_NAMESPACE */ @@ -120,7 +120,7 @@ virSecurityGetTimestamp(void) return NULL; } =20 - virAsprintf(&ret, "%llu", boottime); + ret =3D g_strdup_printf("%llu", boottime); return ret; } =20 @@ -312,7 +312,7 @@ virSecurityGetRememberedLabel(const char *name, refcount--; =20 if (refcount > 0) { - virAsprintf(&value, "%u", refcount); + value =3D g_strdup_printf("%u", refcount); =20 if (virFileSetXAttr(path, ref_name, value) < 0) return -1; @@ -419,7 +419,7 @@ virSecuritySetRememberedLabel(const char *name, return -1; } =20 - virAsprintf(&value, "%u", refcount); + value =3D g_strdup_printf("%u", refcount); =20 if (virFileSetXAttr(path, ref_name, value) < 0) return -1; diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index c2679cdad2..634a532d35 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -157,7 +157,7 @@ parserCommand(const char *profile_name, const char cmd) =20 snprintf(flag, 3, "-%c", cmd); =20 - virAsprintf(&profile, "%s/%s", APPARMOR_DIR "/libvirt", profile_name); + profile =3D g_strdup_printf("%s/%s", APPARMOR_DIR "/libvirt", profile_= name); =20 if (!virFileExists(profile)) { vah_error(NULL, 0, _("profile does not exist")); @@ -214,9 +214,9 @@ update_include_file(const char *include_file, const cha= r *included_files, } =20 if (append && virFileExists(include_file)) - virAsprintf(&pcontent, "%s%s", existing, included_files); + pcontent =3D g_strdup_printf("%s%s", existing, included_files); else - virAsprintf(&pcontent, "%s%s", warning, included_files); + pcontent =3D g_strdup_printf("%s%s", warning, included_files); =20 plen =3D strlen(pcontent); if (plen > MAX_FILE_LEN) { @@ -290,7 +290,7 @@ create_profile(const char *profile, const char *profile= _name, driver_name =3D virDomainVirtTypeToString(virtType); } =20 - virAsprintf(&template, "%s/TEMPLATE.%s", APPARMOR_DIR "/libvirt", driv= er_name); + template =3D g_strdup_printf("%s/TEMPLATE.%s", APPARMOR_DIR "/libvirt"= , driver_name); =20 if (!virFileExists(template)) { vah_error(NULL, 0, _("template does not exist")); @@ -313,11 +313,11 @@ create_profile(const char *profile, const char *profi= le_name, } =20 /* '\nprofile \0' */ - virAsprintf(&replace_name, "\nprofile %s", profile_name); + replace_name =3D g_strdup_printf("\nprofile %s", profile_name); =20 /* '\n\n}\0' */ if (virtType !=3D VIR_DOMAIN_VIRT_LXC) - virAsprintf(&replace_files, "\n%s\n}", profile_files); + replace_files =3D g_strdup_printf("\n%s\n}", profile_files); =20 plen =3D tlen + strlen(replace_name) - strlen(template_name) + 1; =20 @@ -768,7 +768,7 @@ vah_add_path(virBufferPtr buf, const char *path, const = char *perms, bool recursi vah_error(NULL, 0, _("could not find realpath")); goto cleanup; } - virAsprintf(&tmp, "%s%s", pathreal, pathtmp); + tmp =3D g_strdup_printf("%s%s", pathreal, pathtmp); } =20 perms_new =3D g_strdup(perms); @@ -835,13 +835,13 @@ vah_add_file_chardev(virBufferPtr buf, =20 if (type =3D=3D VIR_DOMAIN_CHR_TYPE_PIPE) { /* add the pipe input */ - virAsprintf(&pipe_in, "%s.in", path); + pipe_in =3D g_strdup_printf("%s.in", path); =20 if (vah_add_file(buf, pipe_in, perms) !=3D 0) goto clean_pipe_in; =20 /* add the pipe output */ - virAsprintf(&pipe_out, "%s.out", path); + pipe_out =3D g_strdup_printf("%s.out", path); =20 if (vah_add_file(buf, pipe_out, perms) !=3D 0) goto clean_pipe_out; @@ -934,7 +934,7 @@ get_files(vahControl * ctl) =20 /* verify uuid is same as what we were given on the command line */ virUUIDFormat(ctl->def->uuid, uuidstr); - virAsprintf(&uuid, "%s%s", AA_PREFIX, uuidstr); + uuid =3D g_strdup_printf("%s%s", AA_PREFIX, uuidstr); =20 if (STRNEQ(uuid, ctl->uuid)) { vah_error(ctl, 0, _("given uuid does not match XML uuid")); @@ -1431,8 +1431,8 @@ main(int argc, char **argv) if (vahParseArgv(ctl, argc, argv) !=3D 0) vah_error(ctl, 1, _("could not parse arguments")); =20 - virAsprintf(&profile, "%s/%s", APPARMOR_DIR "/libvirt", ctl->uuid); - virAsprintf(&include_file, "%s/%s.files", APPARMOR_DIR "/libvirt", ctl= ->uuid); + profile =3D g_strdup_printf("%s/%s", APPARMOR_DIR "/libvirt", ctl->uui= d); + include_file =3D g_strdup_printf("%s/%s.files", APPARMOR_DIR "/libvirt= ", ctl->uuid); =20 if (ctl->cmd =3D=3D 'a') { rc =3D parserLoad(ctl->uuid); @@ -1494,7 +1494,7 @@ main(int argc, char **argv) /* create the profile from TEMPLATE */ if (ctl->cmd =3D=3D 'c') { char *tmp =3D NULL; - virAsprintf(&tmp, " #include \n", ctl->uuid= ); + tmp =3D g_strdup_printf(" #include \n", ctl= ->uuid); =20 if (ctl->dryrun) { vah_info(profile); --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752984; cv=none; d=zoho.com; s=zohoarc; b=db9qwF5PilKBR04Ysk53Tl14U3bi9hAR8+LcnjNBm69V7X7j+GpC6fXMXvdSEsQ7xOG0SuSR7GCPPfbeaaYcAax6H8GcXsZjTbYncHJ/Gbbe5r5lOc77KFYNc0ApESDo0LQKCCFhu2FTNeDeGUhQj/lM7IC1ZTKTX0D0Xl7lHM4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752984; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=fx1w0ZVV2oZ/jm9bpsaRXRi0lsFbFBvAgeC9/U2Nzyk=; b=VRZQH4NfITXSDCfk8n+QBeSPa4aO28wBXx0yy0BHhPmbBtOhRJBoTJjdMki5OmfJmEMyEm4L6DKyIeJ14kXZc4kaf24+lQbndV4ObvwdArZBJ1qG29fIiBZwyuNTLKz0gjsrQmOQf0b9OK5Mt+J3a5XeDo0xDmr2hXOPrnWHh/c= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1571752984765502.22416687355724; Tue, 22 Oct 2019 07:03:04 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-356-CdlhiwCNONynTYebOia_CQ-1; Tue, 22 Oct 2019 10:01:13 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 606D5800D56; Tue, 22 Oct 2019 14:01:08 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1660F52D1; Tue, 22 Oct 2019 14:01:08 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 8C5D73FB41; Tue, 22 Oct 2019 14:01:07 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9ME0sKi002786 for ; Tue, 22 Oct 2019 10:00:54 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2F1F06012C; Tue, 22 Oct 2019 14:00:54 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id A891E6064B for ; Tue, 22 Oct 2019 14:00:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752982; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=fx1w0ZVV2oZ/jm9bpsaRXRi0lsFbFBvAgeC9/U2Nzyk=; b=B7qjTHFzDYLwXjYRCuOLuWDE5k0ioT8+h8/PKs55gijwtQ69CeMy8Exzuf4ZVRvA0O0MAj 5GwO02zGthfBTCXd6BNF4UVhMODdGhHXkMMppcPMY4kGL3PbfKtc33fe2Aa6dbpLFSU3dk XpFN80m/CoWpFaYgxALI1xDqDOSW27k= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:58:02 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 58/75] storage: Use g_strdup_printf() instead of virAsprintf() X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: CdlhiwCNONynTYebOia_CQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Michal Privoznik --- src/storage/storage_backend_disk.c | 4 +- src/storage/storage_backend_gluster.c | 8 ++-- src/storage/storage_backend_iscsi.c | 16 +++---- src/storage/storage_backend_iscsi_direct.c | 28 ++++++------ src/storage/storage_backend_logical.c | 8 ++-- src/storage/storage_backend_mpath.c | 6 +-- src/storage/storage_backend_rbd.c | 8 ++-- src/storage/storage_backend_scsi.c | 6 +-- src/storage/storage_backend_sheepdog.c | 4 +- src/storage/storage_backend_vstorage.c | 4 +- src/storage/storage_backend_zfs.c | 8 ++-- src/storage/storage_driver.c | 12 ++--- src/storage/storage_file_gluster.c | 10 ++--- src/storage/storage_util.c | 52 +++++++++++----------- 14 files changed, 87 insertions(+), 87 deletions(-) diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backe= nd_disk.c index d4bd526c14..d971530cd8 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -605,14 +605,14 @@ virStorageBackendDiskPartFormat(virStoragePoolObjPtr = pool, /* XXX Only support one extended partition */ switch (virStorageBackendDiskPartTypeToCreate(pool)) { case VIR_STORAGE_VOL_DISK_TYPE_PRIMARY: - virAsprintf(partFormat, "primary %s", partedFormat); + *partFormat =3D g_strdup_printf("primary %s", partedFormat= ); break; case VIR_STORAGE_VOL_DISK_TYPE_LOGICAL: /* make sure we have an extended partition */ if (virStoragePoolObjSearchVolume(pool, virStorageVolPartFindExt= ended, NULL)) { - virAsprintf(partFormat, "logical %s", partedFormat); + *partFormat =3D g_strdup_printf("logical %s", partedFo= rmat); } else { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("no extended partition found and no " diff --git a/src/storage/storage_backend_gluster.c b/src/storage/storage_ba= ckend_gluster.c index 0022ed2f21..4a8ee3870d 100644 --- a/src/storage/storage_backend_gluster.c +++ b/src/storage/storage_backend_gluster.c @@ -101,7 +101,7 @@ virStorageBackendGlusterOpen(virStoragePoolObjPtr pool) return NULL; =20 ret->volname =3D g_strdup(name); - virAsprintf(&ret->dir, "%s%s", dir ? dir : "/", trailing_slash ? "" : = "/"); + ret->dir =3D g_strdup_printf("%s%s", dir ? dir : "/", trailing_slash ?= "" : "/"); =20 /* FIXME: Currently hard-coded to tcp transport; XML needs to be * extended to allow alternate transport */ @@ -109,7 +109,7 @@ virStorageBackendGlusterOpen(virStoragePoolObjPtr pool) goto error; ret->uri->scheme =3D g_strdup("gluster"); ret->uri->server =3D g_strdup(def->source.hosts[0].name); - virAsprintf(&ret->uri->path, "/%s%s", ret->volname, ret->dir); + ret->uri->path =3D g_strdup_printf("/%s%s", ret->volname, ret->dir); ret->uri->port =3D def->source.hosts[0].port; =20 /* Actually connect to glfs */ @@ -193,10 +193,10 @@ virStorageBackendGlusterSetMetadata(virStorageBackend= GlusterStatePtr state, vol->name =3D g_strdup(name); } =20 - virAsprintf(&path, "%s%s%s", state->volname, state->dir, vol->name); + path =3D g_strdup_printf("%s%s%s", state->volname, state->dir, vol->na= me); =20 tmp =3D state->uri->path; - virAsprintf(&state->uri->path, "/%s", path); + state->uri->path =3D g_strdup_printf("/%s", path); if (!(vol->target.path =3D virURIFormat(state->uri))) { VIR_FREE(state->uri->path); state->uri->path =3D tmp; diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_back= end_iscsi.c index b61abb7cbd..b85c9078f8 100644 --- a/src/storage/storage_backend_iscsi.c +++ b/src/storage/storage_backend_iscsi.c @@ -63,13 +63,13 @@ virStorageBackendISCSIPortal(virStoragePoolSourcePtr so= urce) source->hosts[0].port =3D ISCSI_DEFAULT_TARGET_PORT; =20 if (strchr(source->hosts[0].name, ':')) { - virAsprintf(&portal, "[%s]:%d,1", - source->hosts[0].name, - source->hosts[0].port); + portal =3D g_strdup_printf("[%s]:%d,1", + source->hosts[0].name, + source->hosts[0].port); } else { - virAsprintf(&portal, "%s:%d,1", - source->hosts[0].name, - source->hosts[0].port); + portal =3D g_strdup_printf("%s:%d,1", + source->hosts[0].name, + source->hosts[0].port); } =20 return portal; @@ -133,8 +133,8 @@ virStorageBackendISCSIFindLUs(virStoragePoolObjPtr pool, uint32_t host; g_autofree char *sysfs_path =3D NULL; =20 - virAsprintf(&sysfs_path, "/sys/class/iscsi_session/session%s/device", - session); + sysfs_path =3D g_strdup_printf("/sys/class/iscsi_session/session%s/dev= ice", + session); =20 if (virStorageBackendISCSIGetHostNumber(sysfs_path, &host) < 0) return -1; diff --git a/src/storage/storage_backend_iscsi_direct.c b/src/storage/stora= ge_backend_iscsi_direct.c index f0b27451f0..2afa617cc1 100644 --- a/src/storage/storage_backend_iscsi_direct.c +++ b/src/storage/storage_backend_iscsi_direct.c @@ -68,17 +68,17 @@ virStorageBackendISCSIDirectPortal(virStoragePoolSource= Ptr source) return NULL; } if (source->hosts[0].port =3D=3D 0) { - virAsprintf(&portal, "%s:%d", - source->hosts[0].name, - ISCSI_DEFAULT_TARGET_PORT); + portal =3D g_strdup_printf("%s:%d", + source->hosts[0].name, + ISCSI_DEFAULT_TARGET_PORT); } else if (strchr(source->hosts[0].name, ':')) { - virAsprintf(&portal, "[%s]:%d", - source->hosts[0].name, - source->hosts[0].port); + portal =3D g_strdup_printf("[%s]:%d", + source->hosts[0].name, + source->hosts[0].port); } else { - virAsprintf(&portal, "%s:%d", - source->hosts[0].name, - source->hosts[0].port); + portal =3D g_strdup_printf("%s:%d", + source->hosts[0].name, + source->hosts[0].port); } return portal; } @@ -230,11 +230,11 @@ virISCSIDirectSetVolumeAttributes(virStoragePoolObjPt= r pool, { virStoragePoolDefPtr def =3D virStoragePoolObjGetDef(pool); =20 - virAsprintf(&vol->name, "%s%u", VOL_NAME_PREFIX, lun); - virAsprintf(&vol->key, "ip-%s-iscsi-%s-lun-%u", portal, - def->source.devices[0].path, lun); - virAsprintf(&vol->target.path, "ip-%s-iscsi-%s-lun-%u", portal, - def->source.devices[0].path, lun); + vol->name =3D g_strdup_printf("%s%u", VOL_NAME_PREFIX, lun); + vol->key =3D g_strdup_printf("ip-%s-iscsi-%s-lun-%u", portal, + def->source.devices[0].path, lun); + vol->target.path =3D g_strdup_printf("ip-%s-iscsi-%s-lun-%u", portal, + def->source.devices[0].path, lun); return 0; } =20 diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_ba= ckend_logical.c index 4a5d61e57d..48023abd1a 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -291,7 +291,7 @@ virStorageBackendLogicalMakeVol(char **const groups, } =20 if (vol->target.path =3D=3D NULL) - virAsprintf(&vol->target.path, "%s/%s", def->target.path, vol->nam= e); + vol->target.path =3D g_strdup_printf("%s/%s", def->target.path, vo= l->name); =20 /* Mark the (s) sparse/snapshot lv, e.g. the lv created using * the --virtualsize/-V option. We've already ignored the (t)hin @@ -313,8 +313,8 @@ virStorageBackendLogicalMakeVol(char **const groups, if (!(vol->target.backingStore =3D virStorageSourceNew())) goto cleanup; =20 - virAsprintf(&vol->target.backingStore->path, "%s/%s", - def->target.path, groups[1]); + vol->target.backingStore->path =3D g_strdup_printf("%s/%s", + def->target.path,= groups[1]); =20 vol->target.backingStore->format =3D VIR_STORAGE_POOL_LOGICAL_LVM2; vol->target.backingStore->type =3D VIR_STORAGE_TYPE_BLOCK; @@ -912,7 +912,7 @@ virStorageBackendLogicalCreateVol(virStoragePoolObjPtr = pool, vol->type =3D VIR_STORAGE_VOL_BLOCK; =20 VIR_FREE(vol->target.path); - virAsprintf(&vol->target.path, "%s/%s", def->target.path, vol->name); + vol->target.path =3D g_strdup_printf("%s/%s", def->target.path, vol->n= ame); =20 if (virStorageBackendLogicalLVCreate(vol, def) < 0) return -1; diff --git a/src/storage/storage_backend_mpath.c b/src/storage/storage_back= end_mpath.c index 6912977657..8843dffc30 100644 --- a/src/storage/storage_backend_mpath.c +++ b/src/storage/storage_backend_mpath.c @@ -53,9 +53,9 @@ virStorageBackendMpathNewVol(virStoragePoolObjPtr pool, =20 vol->type =3D VIR_STORAGE_VOL_BLOCK; =20 - virAsprintf(&(vol->name), "dm-%u", devnum); + (vol->name) =3D g_strdup_printf("dm-%u", devnum); =20 - virAsprintf(&vol->target.path, "/dev/%s", dev); + vol->target.path =3D g_strdup_printf("/dev/%s", dev); =20 if (virStorageBackendUpdateVolInfo(vol, true, VIR_STORAGE_VOL_OPEN_DEFAULT, 0) < = 0) { @@ -163,7 +163,7 @@ virStorageBackendCreateVols(virStoragePoolObjPtr pool, =20 if (is_mpath =3D=3D 1) { =20 - virAsprintf(&map_device, "mapper/%s", names->name); + map_device =3D g_strdup_printf("mapper/%s", names->name); =20 if (virStorageBackendGetMinorNumber(names->name, &minor) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backen= d_rbd.c index 491b85e0e0..5cf4acf65f 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -570,10 +570,10 @@ volStorageBackendRBDRefreshVolInfo(virStorageVolDefPt= r vol, vol->target.allocation, info.obj_size, info.num_objs); =20 VIR_FREE(vol->target.path); - virAsprintf(&vol->target.path, "%s/%s", def->source.name, vol->name); + vol->target.path =3D g_strdup_printf("%s/%s", def->source.name, vol->n= ame); =20 VIR_FREE(vol->key); - virAsprintf(&vol->key, "%s/%s", def->source.name, vol->name); + vol->key =3D g_strdup_printf("%s/%s", def->source.name, vol->name); =20 ret =3D 0; =20 @@ -891,10 +891,10 @@ virStorageBackendRBDCreateVol(virStoragePoolObjPtr po= ol, } =20 VIR_FREE(vol->target.path); - virAsprintf(&vol->target.path, "%s/%s", def->source.name, vol->name); + vol->target.path =3D g_strdup_printf("%s/%s", def->source.name, vol->n= ame); =20 VIR_FREE(vol->key); - virAsprintf(&vol->key, "%s/%s", def->source.name, vol->name); + vol->key =3D g_strdup_printf("%s/%s", def->source.name, vol->name); =20 return 0; } diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backe= nd_scsi.c index 80965bc349..9c0f041616 100644 --- a/src/storage/storage_backend_scsi.c +++ b/src/storage/storage_backend_scsi.c @@ -60,7 +60,7 @@ virStorageBackendSCSITriggerRescan(uint32_t host) =20 VIR_DEBUG("Triggering rescan of host %d", host); =20 - virAsprintf(&path, "%s/host%u/scan", LINUX_SYSFS_SCSI_HOST_PREFIX, hos= t); + path =3D g_strdup_printf("%s/host%u/scan", LINUX_SYSFS_SCSI_HOST_PREFI= X, host); =20 VIR_DEBUG("Scan trigger path is '%s'", path); =20 @@ -259,7 +259,7 @@ checkParent(const char *name, goto cleanup; } =20 - virAsprintf(&scsi_host_name, "scsi_%s", name); + scsi_host_name =3D g_strdup_printf("scsi_%s", name); =20 if (!(vhba_parent =3D virNodeDeviceGetParentName(conn, scsi_host_name)= )) goto cleanup; @@ -373,7 +373,7 @@ virStorageBackendSCSICheckPool(virStoragePoolObjPtr poo= l, if (virSCSIHostGetNumber(name, &host) < 0) return -1; =20 - virAsprintf(&path, "%s/host%d", LINUX_SYSFS_SCSI_HOST_PREFIX, host); + path =3D g_strdup_printf("%s/host%d", LINUX_SYSFS_SCSI_HOST_PREFIX, ho= st); =20 *isActive =3D virFileExists(path); =20 diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_b= ackend_sheepdog.c index ff13d2d9bd..853a53115f 100644 --- a/src/storage/storage_backend_sheepdog.c +++ b/src/storage/storage_backend_sheepdog.c @@ -226,7 +226,7 @@ virStorageBackendSheepdogCreateVol(virStoragePoolObjPtr= pool, vol->type =3D VIR_STORAGE_VOL_NETWORK; =20 VIR_FREE(vol->key); - virAsprintf(&vol->key, "%s/%s", def->source.name, vol->name); + vol->key =3D g_strdup_printf("%s/%s", def->source.name, vol->name); =20 VIR_FREE(vol->target.path); vol->target.path =3D g_strdup(vol->name); @@ -338,7 +338,7 @@ virStorageBackendSheepdogRefreshVol(virStoragePoolObjPt= r pool, vol->type =3D VIR_STORAGE_VOL_NETWORK; =20 VIR_FREE(vol->key); - virAsprintf(&vol->key, "%s/%s", def->source.name, vol->name); + vol->key =3D g_strdup_printf("%s/%s", def->source.name, vol->name); =20 VIR_FREE(vol->target.path); vol->target.path =3D g_strdup(vol->name); diff --git a/src/storage/storage_backend_vstorage.c b/src/storage/storage_b= ackend_vstorage.c index 9a34d87ec3..85ab8325ce 100644 --- a/src/storage/storage_backend_vstorage.c +++ b/src/storage/storage_backend_vstorage.c @@ -61,7 +61,7 @@ virStorageBackendVzPoolStart(virStoragePoolObjPtr pool) if (!(usr_name =3D virGetUserName(def->target.perms.uid))) return -1; =20 - virAsprintf(&mode, "%o", def->target.perms.mode); + mode =3D g_strdup_printf("%o", def->target.perms.mode); =20 cmd =3D virCommandNewArgList(VSTORAGE_MOUNT, "-c", def->source.name, @@ -90,7 +90,7 @@ virStorageBackendVzIsMounted(virStoragePoolObjPtr pool) char buf[1024]; g_autofree char *cluster =3D NULL; =20 - virAsprintf(&cluster, "vstorage://%s", def->source.name); + cluster =3D g_strdup_printf("vstorage://%s", def->source.name); =20 if ((mtab =3D fopen(_PATH_MOUNTED, "r")) =3D=3D NULL) { virReportSystemError(errno, diff --git a/src/storage/storage_backend_zfs.c b/src/storage/storage_backen= d_zfs.c index 793eb06f5c..b708c7fd4a 100644 --- a/src/storage/storage_backend_zfs.c +++ b/src/storage/storage_backend_zfs.c @@ -87,7 +87,7 @@ virStorageBackendZFSCheckPool(virStoragePoolObjPtr pool G= _GNUC_UNUSED, virStoragePoolDefPtr def =3D virStoragePoolObjGetDef(pool); g_autofree char *devpath =3D NULL; =20 - virAsprintf(&devpath, "/dev/zvol/%s", def->source.name); + devpath =3D g_strdup_printf("/dev/zvol/%s", def->source.name); *isActive =3D virFileIsDir(devpath); =20 return 0; @@ -137,8 +137,8 @@ virStorageBackendZFSParseVol(virStoragePoolObjPtr pool, volume->key =3D g_strdup(tokens[0]); =20 if (volume->target.path =3D=3D NULL) { - virAsprintf(&volume->target.path, "%s/%s", def->target.path, - volume->name); + volume->target.path =3D g_strdup_printf("%s/%s", def->target.path, + volume->name); } =20 if (virStrToLong_ull(tokens[1], NULL, 10, &volume->target.capacity) < = 0) { @@ -305,7 +305,7 @@ virStorageBackendZFSCreateVol(virStoragePoolObjPtr pool, vol->type =3D VIR_STORAGE_VOL_BLOCK; =20 VIR_FREE(vol->target.path); - virAsprintf(&vol->target.path, "%s/%s", def->target.path, vol->name); + vol->target.path =3D g_strdup_printf("%s/%s", def->target.path, vol->n= ame); =20 vol->key =3D g_strdup(vol->target.path); =20 diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index dfe3dd1354..84d76eebd0 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -281,9 +281,9 @@ storageStateInitialize(bool privileged, if (!(configdir && rundir)) goto error; =20 - virAsprintf(&driver->configDir, "%s/storage", configdir); - virAsprintf(&driver->autostartDir, "%s/storage/autostart", configd= ir); - virAsprintf(&driver->stateDir, "%s/storage/run", rundir); + driver->configDir =3D g_strdup_printf("%s/storage", configdir); + driver->autostartDir =3D g_strdup_printf("%s/storage/autostart", c= onfigdir); + driver->stateDir =3D g_strdup_printf("%s/storage/run", rundir); } driver->privileged =3D privileged; =20 @@ -2289,7 +2289,7 @@ virStorageBackendPloopRestoreDesc(char *path) g_autofree char *refresh_tool =3D NULL; g_autofree char *desc =3D NULL; =20 - virAsprintf(&desc, "%s/DiskDescriptor.xml", path); + desc =3D g_strdup_printf("%s/DiskDescriptor.xml", path); =20 if (virFileRemove(desc, 0, 0) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -2851,8 +2851,8 @@ virStoragePoolObjBuildTempFilePath(virStoragePoolObjP= tr obj, virStoragePoolDefPtr def =3D virStoragePoolObjGetDef(obj); char *tmp =3D NULL; =20 - virAsprintf(&tmp, "%s/%s.%s.secret.XXXXXX", - driver->stateDir, def->name, voldef->name); + tmp =3D g_strdup_printf("%s/%s.%s.secret.XXXXXX", + driver->stateDir, def->name, voldef->name); return tmp; } =20 diff --git a/src/storage/storage_file_gluster.c b/src/storage/storage_file_= gluster.c index 1577239431..f389a94437 100644 --- a/src/storage/storage_file_gluster.c +++ b/src/storage/storage_file_gluster.c @@ -311,11 +311,11 @@ virStorageFileBackendGlusterGetUniqueIdentifier(virSt= orageSourcePtr src) priv))) return NULL; =20 - virAsprintf(&priv->canonpath, "gluster://%s:%u/%s/%s", - src->hosts->name, - src->hosts->port, - src->volume, - filePath); + priv->canonpath =3D g_strdup_printf("gluster://%s:%u/%s/%s", + src->hosts->name, + src->hosts->port, + src->volume, + filePath); =20 return priv->canonpath; } diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index 88fb8b5223..3427c2e446 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -898,7 +898,7 @@ storageBackendCreateQemuImgSetBacking(virStoragePoolObj= Ptr pool, * validation. */ if (*(info->backingPath) !=3D '/') - virAsprintf(&absolutePath, "%s/%s", def->target.path, info->backin= gPath); + absolutePath =3D g_strdup_printf("%s/%s", def->target.path, info->= backingPath); accessRetCode =3D access(absolutePath ? absolutePath : info->backingPath, R_OK); if (accessRetCode !=3D 0) { @@ -1140,7 +1140,7 @@ virStorageBackendCreateQemuImgCmdFromVol(virStoragePo= olObjPtr pool, _("path to secret data file is required")); goto error; } - virAsprintf(&info.secretAlias, "%s_encrypt0", vol->name); + info.secretAlias =3D g_strdup_printf("%s_encrypt0", vol->name); if (storageBackendCreateQemuImgSecretObject(cmd, secretPath, info.secretAlias) < 0) goto error; @@ -1153,7 +1153,7 @@ virStorageBackendCreateQemuImgCmdFromVol(virStoragePo= olObjPtr pool, _("path to inputvol secret data file is require= d")); goto error; } - virAsprintf(&inputSecretAlias, "%s_encrypt0", inputvol->name); + inputSecretAlias =3D g_strdup_printf("%s_encrypt0", inputvol->name= ); if (storageBackendCreateQemuImgSecretObject(cmd, inputSecretPath, inputSecretAlias) < 0) goto error; @@ -1678,10 +1678,10 @@ storageBackendIsPloopDir(char *path) g_autofree char *root =3D NULL; g_autofree char *desc =3D NULL; =20 - virAsprintf(&root, "%s/root.hds", path); + root =3D g_strdup_printf("%s/root.hds", path); if (!virFileExists(root)) return false; - virAsprintf(&desc, "%s/DiskDescriptor.xml", path); + desc =3D g_strdup_printf("%s/DiskDescriptor.xml", path); if (!virFileExists(desc)) return false; =20 @@ -1699,7 +1699,7 @@ storageBackendRedoPloopUpdate(virStorageSourcePtr tar= get, struct stat *sb, { g_autofree char *path =3D NULL; =20 - virAsprintf(&path, "%s/root.hds", target->path); + path =3D g_strdup_printf("%s/root.hds", target->path); VIR_FORCE_CLOSE(*fd); if ((*fd =3D virStorageBackendVolOpen(path, sb, flags)) < 0) return -1; @@ -1949,7 +1949,7 @@ virStorageBackendStablePath(virStoragePoolObjPtr pool, */ retry: while ((direrr =3D virDirRead(dh, &dent, NULL)) > 0) { - virAsprintf(&stablepath, "%s/%s", def->target.path, dent->d_name); + stablepath =3D g_strdup_printf("%s/%s", def->target.path, dent->d_= name); =20 if (virFileLinkPointsTo(stablepath, devpath)) { VIR_DIR_CLOSE(dh); @@ -2045,7 +2045,7 @@ virStorageBackendVolCreateLocal(virStoragePoolObjPtr = pool, } =20 VIR_FREE(vol->target.path); - virAsprintf(&vol->target.path, "%s/%s", def->target.path, vol->name); + vol->target.path =3D g_strdup_printf("%s/%s", def->target.path, vol->n= ame); =20 if (virFileExists(vol->target.path)) { virReportError(VIR_ERR_OPERATION_INVALID, @@ -2282,7 +2282,7 @@ storageBackendResizeQemuImg(virStoragePoolObjPtr pool, storageBackendCreateQemuImgSecretPath(pool, vol))) goto cleanup; =20 - virAsprintf(&secretAlias, "%s_encrypt0", vol->name); + secretAlias =3D g_strdup_printf("%s_encrypt0", vol->name); } =20 /* Round capacity as qemu-img resize errors out on sizes which are not @@ -2419,7 +2419,7 @@ virStorageBackendVolUploadLocal(virStoragePoolObjPtr = pool G_GNUC_UNUSED, return -1; } =20 - virAsprintf(&path, "%s/root.hds", vol->target.path); + path =3D g_strdup_printf("%s/root.hds", vol->target.path); target_path =3D path; } =20 @@ -2453,7 +2453,7 @@ virStorageBackendVolDownloadLocal(virStoragePoolObjPt= r pool G_GNUC_UNUSED, " will be lost")); return -1; } - virAsprintf(&path, "%s/root.hds", vol->target.path); + path =3D g_strdup_printf("%s/root.hds", vol->target.path); target_path =3D path; } =20 @@ -2665,9 +2665,9 @@ storageBackendVolWipePloop(virStorageVolDefPtr vol, return -1; } =20 - virAsprintf(&target_path, "%s/root.hds", vol->target.path); + target_path =3D g_strdup_printf("%s/root.hds", vol->target.path); =20 - virAsprintf(&disk_desc, "%s/DiskDescriptor.xml", vol->target.path); + disk_desc =3D g_strdup_printf("%s/DiskDescriptor.xml", vol->target.pat= h); =20 if (storageBackendVolWipeLocalFile(target_path, algorithm, vol->target.allocation, false) < 0) @@ -3525,7 +3525,7 @@ virStorageBackendRefreshLocal(virStoragePoolObjPtr po= ol) vol->name =3D g_strdup(ent->d_name); =20 vol->type =3D VIR_STORAGE_VOL_FILE; - virAsprintf(&vol->target.path, "%s/%s", def->target.path, vol->nam= e); + vol->target.path =3D g_strdup_printf("%s/%s", def->target.path, vo= l->name); =20 vol->key =3D g_strdup(vol->target.path); =20 @@ -3666,9 +3666,9 @@ virStorageBackendSCSINewLun(virStoragePoolObjPtr pool, * in the volume name. We only need uniqueness per-pool, so * just leave 'host' out */ - virAsprintf(&(vol->name), "unit:%u:%u:%u", bus, target, lun); + (vol->name) =3D g_strdup_printf("unit:%u:%u:%u", bus, target, lun); =20 - virAsprintf(&devpath, "/dev/%s", dev); + devpath =3D g_strdup_printf("/dev/%s", dev); =20 VIR_DEBUG("Trying to create volume for '%s'", devpath); =20 @@ -3728,7 +3728,7 @@ getNewStyleBlockDevice(const char *lun_path, int direrr; g_autofree char *block_path =3D NULL; =20 - virAsprintf(&block_path, "%s/block", lun_path); + block_path =3D g_strdup_printf("%s/block", lun_path); =20 VIR_DEBUG("Looking for block device in '%s'", block_path); =20 @@ -3806,8 +3806,8 @@ getBlockDevice(uint32_t host, =20 *block_device =3D NULL; =20 - virAsprintf(&lun_path, "/sys/bus/scsi/devices/%u:%u:%u:%u", host, bus, - target, lun); + lun_path =3D g_strdup_printf("/sys/bus/scsi/devices/%u:%u:%u:%u", host= , bus, + target, lun); =20 if (virDirOpen(&lun_dir, lun_path) < 0) goto cleanup; @@ -3859,8 +3859,8 @@ getDeviceType(uint32_t host, FILE *typefile; g_autofree char *type_path =3D NULL; =20 - virAsprintf(&type_path, "/sys/bus/scsi/devices/%u:%u:%u:%u/type", host, - bus, target, lun); + type_path =3D g_strdup_printf("/sys/bus/scsi/devices/%u:%u:%u:%u/type"= , host, + bus, target, lun); =20 typefile =3D fopen(type_path, "r"); if (typefile =3D=3D NULL) { @@ -4048,11 +4048,11 @@ virStorageBackendFileSystemGetPoolSource(virStorage= PoolObjPtr pool) =20 if (def->type =3D=3D VIR_STORAGE_POOL_NETFS) { if (def->source.format =3D=3D VIR_STORAGE_POOL_NETFS_CIFS) { - virAsprintf(&src, "//%s/%s", def->source.hosts[0].name, - def->source.dir); + src =3D g_strdup_printf("//%s/%s", def->source.hosts[0].name, + def->source.dir); } else { - virAsprintf(&src, "%s:%s", def->source.hosts[0].name, - def->source.dir); + src =3D g_strdup_printf("%s:%s", def->source.hosts[0].name, + def->source.dir); } } else { src =3D g_strdup(def->source.devices[0].path); @@ -4168,7 +4168,7 @@ virStorageBackendFileSystemMountCmd(const char *cmdst= r, g_autofree char *nfsVers =3D NULL; =20 if (def->type =3D=3D VIR_STORAGE_POOL_NETFS && def->source.protocolVer= > 0) - virAsprintf(&nfsVers, "nfsvers=3D%u", def->source.protocolVer); + nfsVers =3D g_strdup_printf("nfsvers=3D%u", def->source.protocolVe= r); =20 cmd =3D virCommandNew(cmdstr); if (netauto) --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752902; cv=none; d=zoho.com; s=zohoarc; b=jHPR0sKWYc97mMjumxQS755yszHrZcdhyDUC65p+3XG97q1NuInPbUyn/hKPcjR0PLjw/tYYXFafWePRJdp3mgH/6caQMLpWSSY9cGoDFXR+53GXsF7UTfR0rkqSKswkYYmUvqEJlIwk2iaqay/qPWcwKaQV8eOPrqV0WG9JHi8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752902; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=WpL0n+j041YxtP5mt0sPgwXNj75432Jpy6ZAJfAxl8U=; b=PdQ8m1KCdYAv+3O9krYhBERBYcwLTX+J3NerAtJLI98dOkoK30ZWjOK+N9QD1BSJUdij7udcTm0k2ndXSDdw+EpSuXLcvFvp7Wr/NO3EW1dBBvvpKwd3Vsx7GAyoiCpVX67PQ9TNtqIsy5UvBB5/JxY+CD78ZXXr7z8lM9vkmY8= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1571752902835807.698437847032; Tue, 22 Oct 2019 07:01:42 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-60-0lRf5-KBOne1mvBIv0xnzw-1; Tue, 22 Oct 2019 10:01:39 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5C810801E77; Tue, 22 Oct 2019 14:01:34 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 27D091001B22; Tue, 22 Oct 2019 14:01:34 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id ACE77180BA9D; Tue, 22 Oct 2019 14:01:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9ME0t1m002805 for ; Tue, 22 Oct 2019 10:00:55 -0400 Received: by smtp.corp.redhat.com (Postfix) id F1CD86012E; Tue, 22 Oct 2019 14:00:54 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7A8B26012C for ; Tue, 22 Oct 2019 14:00:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752901; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=WpL0n+j041YxtP5mt0sPgwXNj75432Jpy6ZAJfAxl8U=; b=genmP62SIg7Af1q/l9N86Wntc7r7TJcJTOlold8XVZmSGYUT2FB6GgJwAFlVn4bigFlHUp 0Abp5qookoIAXrioc5BAMksEOFipynNImYytzYQD6LpcXmD7HigTp1WwkcZLIRX0lhG+Ta S5XZQlCLcASphcuEsejtDJfTrhCPNWk= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:58:03 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 59/75] test: Use g_strdup_printf() instead of virAsprintf() X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: 0lRf5-KBOne1mvBIv0xnzw-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Michal Privoznik --- src/test/test_driver.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 96607c04eb..b9ed76c26c 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -640,7 +640,7 @@ testDomainGenerateIfname(virDomainDefPtr domdef) virDomainNetDefPtr net =3D NULL; char *ifname; =20 - virAsprintf(&ifname, "testnet%d", ifctr); + ifname =3D g_strdup_printf("testnet%d", ifctr); =20 /* Generate network interface names */ if (!(net =3D virDomainNetFindByName(domdef, ifname))) @@ -1075,7 +1075,7 @@ testOpenVolumesForPool(const char *file, g_autoptr(virStorageVolDef) volDef =3D NULL; =20 /* Find storage volumes */ - virAsprintf(&vol_xpath, "/node/pool[%d]/volume", objidx); + vol_xpath =3D g_strdup_printf("/node/pool[%d]/volume", objidx); =20 num =3D virXPathNodeSet(vol_xpath, ctxt, &nodes); if (num < 0) @@ -1091,8 +1091,8 @@ testOpenVolumesForPool(const char *file, return -1; =20 if (!volDef->target.path) { - virAsprintf(&volDef->target.path, "%s/%s", def->target.path, - volDef->name); + volDef->target.path =3D g_strdup_printf("%s/%s", def->target.p= ath, + volDef->name); } =20 if (!volDef->key) @@ -2043,7 +2043,7 @@ testDomainGetHostname(virDomainPtr domain, if (virDomainObjCheckActive(vm) < 0) goto cleanup; =20 - virAsprintf(&ret, "%shost", domain->name); + ret =3D g_strdup_printf("%shost", domain->name); =20 cleanup: virDomainObjEndAPI(&vm); @@ -4732,7 +4732,7 @@ testDomainGetFSInfo(virDomainPtr dom, info_ret[0]->mountpoint =3D g_strdup("/"); info_ret[0]->fstype =3D g_strdup("ext4"); info_ret[0]->devAlias[0] =3D g_strdup(name); - virAsprintf(&info_ret[0]->name, "%s1", name); + info_ret[0]->name =3D g_strdup_printf("%s1", name); =20 if (VIR_ALLOC(info_ret[1]) < 0 || VIR_ALLOC(info_ret[1]->devAlias) < 0) @@ -4741,7 +4741,7 @@ testDomainGetFSInfo(virDomainPtr dom, info_ret[1]->mountpoint =3D g_strdup("/boot"); info_ret[1]->fstype =3D g_strdup("ext4"); info_ret[1]->devAlias[0] =3D g_strdup(name); - virAsprintf(&info_ret[1]->name, "%s2", name); + info_ret[1]->name =3D g_strdup_printf("%s2", name); =20 info_ret[0]->ndevAlias =3D info_ret[1]->ndevAlias =3D 1; =20 @@ -5111,7 +5111,7 @@ testDomainInterfaceAddresses(virDomainPtr dom, } else { iface->addrs[0].type =3D VIR_IP_ADDR_TYPE_IPV4; iface->addrs[0].prefix =3D 24; - virAsprintf(&iface->addrs[0].addr, "192.168.0.%zu", 1 + i); + iface->addrs[0].addr =3D g_strdup_printf("192.168.0.%zu", 1 + = i); =20 } =20 @@ -6364,7 +6364,7 @@ testConnectFindStoragePoolSources(virConnectPtr conn = G_GNUC_UNUSED, return NULL; } =20 - virAsprintf(&ret, defaultPoolSourcesNetFSXML, source->hosts[0].nam= e); + ret =3D g_strdup_printf(defaultPoolSourcesNetFSXML, source->hosts[= 0].name); return ret; =20 default: @@ -7007,8 +7007,8 @@ testStorageVolCreateXML(virStoragePoolPtr pool, goto cleanup; } =20 - virAsprintf(&privvol->target.path, "%s/%s", def->target.path, - privvol->name); + privvol->target.path =3D g_strdup_printf("%s/%s", def->target.path, + privvol->name); =20 privvol->key =3D g_strdup(privvol->target.path); if (virStoragePoolObjAddVol(obj, privvol) < 0) @@ -7074,8 +7074,8 @@ testStorageVolCreateXMLFrom(virStoragePoolPtr pool, } def->available =3D (def->capacity - def->allocation); =20 - virAsprintf(&privvol->target.path, "%s/%s", def->target.path, - privvol->name); + privvol->target.path =3D g_strdup_printf("%s/%s", def->target.path, + privvol->name); =20 privvol->key =3D g_strdup(privvol->target.path); if (virStoragePoolObjAddVol(obj, privvol) < 0) --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571753050; cv=none; d=zoho.com; s=zohoarc; b=bH8rw0vUpZ722Dhs2nptPxHw1kvZ+c6BnGJ9rSc/ANKJ0FSFaYujXXjRCKLPQkR8O3joV9VBcctjWoQgVA8TYjjlLuaSEfZm7ZxzmA7DxBi3NilfbT7CS6nM4h3IBH33CTkdkATjJYT3lt+JK9TirTQChLeCusdPwH/oF/RN+6w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571753050; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=s1I3CEO7mSncCiK8fZqavDfFPs1ZVOITSnDNPerVqrc=; b=W89QUr0jsWg54yVnPanhT/r6kz90dg4GkiDdeaw4OrxQ7OOv78ly/V5SlsuoeCwnOMf4MJjTm0BC+Re+yd/jAaSpynPSzvowLGS19jCKrBGwLk2ykS6UymNU7CgGF6FTO2v/bG3JV8LwxSoKKffUHxYpGyFW8RkjQVy8B5xldFU= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1571753050144410.4245766550696; Tue, 22 Oct 2019 07:04:10 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-361-bF7TlqPgN5y5mD0KYNvj9w-1; Tue, 22 Oct 2019 10:01:44 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AEA48100552A; Tue, 22 Oct 2019 14:01:39 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7F14260856; Tue, 22 Oct 2019 14:01:39 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 278E33FB41; Tue, 22 Oct 2019 14:01:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9ME0tQ3002841 for ; Tue, 22 Oct 2019 10:00:56 -0400 Received: by smtp.corp.redhat.com (Postfix) id EC3756012D; Tue, 22 Oct 2019 14:00:55 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4B47D6012C for ; Tue, 22 Oct 2019 14:00:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571753048; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=s1I3CEO7mSncCiK8fZqavDfFPs1ZVOITSnDNPerVqrc=; b=bWEpLfelhlASdnKjiyTrqgsqngA6WbQGMm/vhk/aJn1sMswgs2BPaptVF122R6wun9IslJ mDypkf5+iY3Geqh0CrYPzRhyCMteElgVPH28VI7wTkt6LsrfWbZSLb8CaQJxy3IbNOIH3h FdioglJ395OPNafkCK3IccoTw1Aoxz4= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:58:04 +0200 Message-Id: <22e5f58069401c56f4e37a4667f93f5214d9e3f7.1571752582.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 60/75] util: Use g_strdup_printf() instead of virAsprintf() X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: bF7TlqPgN5y5mD0KYNvj9w-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Michal Privoznik --- src/util/viraudit.c | 2 +- src/util/virauth.c | 10 ++--- src/util/virauthconfig.c | 6 +-- src/util/vircgroup.c | 22 +++++------ src/util/vircgroupv1.c | 64 ++++++++++++++++---------------- src/util/vircgroupv2.c | 64 ++++++++++++++++---------------- src/util/virconf.c | 4 +- src/util/virdevmapper.c | 6 +-- src/util/virdnsmasq.c | 30 +++++++-------- src/util/virebtables.c | 2 +- src/util/virerror.c | 2 +- src/util/virfile.c | 26 ++++++------- src/util/virhostcpu.c | 8 ++-- src/util/virhostdev.c | 2 +- src/util/virhostmem.c | 12 +++--- src/util/viriptables.c | 12 +++--- src/util/viriscsi.c | 4 +- src/util/virjson.c | 8 ++-- src/util/virkmod.c | 2 +- src/util/virlockspace.c | 2 +- src/util/virlog.c | 30 +++++++-------- src/util/virmacmap.c | 2 +- src/util/virmdev.c | 8 ++-- src/util/virnetdev.c | 26 ++++++------- src/util/virnetdevbandwidth.c | 46 +++++++++++------------ src/util/virnetdevbridge.c | 12 +++--- src/util/virnetdevip.c | 4 +- src/util/virnetdevmacvlan.c | 4 +- src/util/virnetdevopenvswitch.c | 12 +++--- src/util/virnetdevtap.c | 4 +- src/util/virnetdevveth.c | 6 +-- src/util/virnuma.c | 19 ++++------ src/util/virpci.c | 65 ++++++++++++++++----------------- src/util/virpidfile.c | 6 +-- src/util/virprocess.c | 18 ++++----- src/util/virqemu.c | 4 +- src/util/virrandom.c | 4 +- src/util/virresctrl.c | 14 +++---- src/util/virrotatingfile.c | 8 ++-- src/util/virscsi.c | 22 +++++------ src/util/virscsihost.c | 12 +++--- src/util/virscsivhost.c | 2 +- src/util/virsocketaddr.c | 12 +++--- src/util/virstoragefile.c | 10 ++--- src/util/virstring.c | 2 +- src/util/virsystemd.c | 2 +- src/util/virtpm.c | 4 +- src/util/virtypedparam.c | 12 +++--- src/util/viruri.c | 2 +- src/util/virusb.c | 10 ++--- src/util/virutil.c | 16 ++++---- src/util/virvhba.c | 36 +++++++++--------- 52 files changed, 359 insertions(+), 363 deletions(-) diff --git a/src/util/viraudit.c b/src/util/viraudit.c index 9d423e8f53..8a0ef6f72c 100644 --- a/src/util/viraudit.c +++ b/src/util/viraudit.c @@ -158,7 +158,7 @@ char *virAuditEncode(const char *key, const char *value) return audit_encode_nv_string(key, value, 0); #else char *str; - virAsprintf(&str, "%s=3D%s", key, value); + str =3D g_strdup_printf("%s=3D%s", key, value); return str; #endif } diff --git a/src/util/virauth.c b/src/util/virauth.c index 9ff639ffa8..55208c01ef 100644 --- a/src/util/virauth.c +++ b/src/util/virauth.c @@ -69,7 +69,7 @@ virAuthGetConfigFilePathURI(virURIPtr uri, if (!(userdir =3D virGetUserConfigDirectory())) return -1; =20 - virAsprintf(path, "%s/auth.conf", userdir); + *path =3D g_strdup_printf("%s/auth.conf", userdir); =20 VIR_DEBUG("Checking for readability of '%s'", *path); if (access(*path, R_OK) =3D=3D 0) @@ -157,10 +157,10 @@ virAuthGetUsernamePath(const char *path, memset(&cred, 0, sizeof(virConnectCredential)); =20 if (defaultUsername !=3D NULL) { - virAsprintf(&prompt, _("Enter username for %s [%s]"), hostname, - defaultUsername); + prompt =3D g_strdup_printf(_("Enter username for %s [%s]"), hostna= me, + defaultUsername); } else { - virAsprintf(&prompt, _("Enter username for %s"), hostname); + prompt =3D g_strdup_printf(_("Enter username for %s"), hostname); } =20 for (ncred =3D 0; ncred < auth->ncredtype; ncred++) { @@ -237,7 +237,7 @@ virAuthGetPasswordPath(const char *path, =20 memset(&cred, 0, sizeof(virConnectCredential)); =20 - virAsprintf(&prompt, _("Enter %s's password for %s"), username, hostna= me); + prompt =3D g_strdup_printf(_("Enter %s's password for %s"), username, = hostname); =20 for (ncred =3D 0; ncred < auth->ncredtype; ncred++) { if (auth->credtype[ncred] !=3D VIR_CRED_PASSPHRASE && diff --git a/src/util/virauthconfig.c b/src/util/virauthconfig.c index b7263ebccb..fd846ddd4b 100644 --- a/src/util/virauthconfig.c +++ b/src/util/virauthconfig.c @@ -113,11 +113,11 @@ int virAuthConfigLookup(virAuthConfigPtr auth, if (!hostname) hostname =3D "localhost"; =20 - virAsprintf(&authgroup, "auth-%s-%s", service, hostname); + authgroup =3D g_strdup_printf("auth-%s-%s", service, hostname); =20 if (!virKeyFileHasGroup(auth->keyfile, authgroup)) { VIR_FREE(authgroup); - virAsprintf(&authgroup, "auth-%s-%s", service, "default"); + authgroup =3D g_strdup_printf("auth-%s-%s", service, "default"); } =20 if (!virKeyFileHasGroup(auth->keyfile, authgroup)) @@ -130,7 +130,7 @@ int virAuthConfigLookup(virAuthConfigPtr auth, return -1; } =20 - virAsprintf(&credgroup, "credentials-%s", authcred); + credgroup =3D g_strdup_printf("credentials-%s", authcred); =20 if (!virKeyFileHasGroup(auth->keyfile, credgroup)) { virReportError(VIR_ERR_CONF_SYNTAX, diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 8545cd3049..d5288ecfc5 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -206,7 +206,7 @@ virCgroupPartitionEscape(char **path) if ((rc =3D virCgroupPartitionNeedsEscaping(*path)) <=3D 0) return rc; =20 - virAsprintf(&newstr, "_%s", *path); + newstr =3D g_strdup_printf("_%s", *path); =20 VIR_FREE(*path); *path =3D newstr; @@ -290,7 +290,7 @@ virCgroupDetectPlacement(virCgroupPtr group, if (pid =3D=3D -1) { procfile =3D g_strdup("/proc/self/cgroup"); } else { - virAsprintf(&procfile, "/proc/%lld/cgroup", (long long)pid); + procfile =3D g_strdup_printf("/proc/%lld/cgroup", (long long)pid); } =20 mapping =3D fopen(procfile, "r"); @@ -443,7 +443,7 @@ virCgroupGetBlockDevString(const char *path) =20 /* Automatically append space after the string since all callers * use it anyway */ - virAsprintf(&ret, "%d:%d ", major(sb.st_rdev), minor(sb.st_rdev)); + ret =3D g_strdup_printf("%d:%d ", major(sb.st_rdev), minor(sb.st_rdev)= ); =20 return ret; } @@ -559,7 +559,7 @@ virCgroupSetValueU64(virCgroupPtr group, { g_autofree char *strval =3D NULL; =20 - virAsprintf(&strval, "%llu", value); + strval =3D g_strdup_printf("%llu", value); =20 return virCgroupSetValueStr(group, controller, key, strval); } @@ -573,7 +573,7 @@ virCgroupSetValueI64(virCgroupPtr group, { g_autofree char *strval =3D NULL; =20 - virAsprintf(&strval, "%lld", value); + strval =3D g_strdup_printf("%lld", value); =20 return virCgroupSetValueStr(group, controller, key, strval); } @@ -676,8 +676,8 @@ virCgroupNew(pid_t pid, if (path[0] =3D=3D '/' || !parent) { (*group)->path =3D g_strdup(path); } else { - virAsprintf(&(*group)->path, "%s%s%s", parent->path, - STREQ(parent->path, "") ? "" : "/", path); + (*group)->path =3D g_strdup_printf("%s%s%s", parent->path, + STREQ(parent->path, "") ? "" : "/= ", path); } =20 if (virCgroupDetect(*group, pid, controllers, path, parent) < 0) @@ -909,7 +909,7 @@ virCgroupNewDomainPartition(virCgroupPtr partition, { g_autofree char *grpname =3D NULL; =20 - virAsprintf(&grpname, "%s.libvirt-%s", name, driver); + grpname =3D g_strdup_printf("%s.libvirt-%s", name, driver); =20 if (virCgroupPartitionEscape(&grpname) < 0) return -1; @@ -960,13 +960,13 @@ virCgroupNewThread(virCgroupPtr domain, =20 switch (nameval) { case VIR_CGROUP_THREAD_VCPU: - virAsprintf(&name, "vcpu%d", id); + name =3D g_strdup_printf("vcpu%d", id); break; case VIR_CGROUP_THREAD_EMULATOR: name =3D g_strdup("emulator"); break; case VIR_CGROUP_THREAD_IOTHREAD: - virAsprintf(&name, "iothread%d", id); + name =3D g_strdup_printf("iothread%d", id); break; case VIR_CGROUP_THREAD_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, @@ -2343,7 +2343,7 @@ virCgroupRemoveRecursively(char *grppath) =20 if (ent->d_type !=3D DT_DIR) continue; =20 - virAsprintf(&path, "%s/%s", grppath, ent->d_name); + path =3D g_strdup_printf("%s/%s", grppath, ent->d_name); =20 rc =3D virCgroupRemoveRecursively(path); if (rc !=3D 0) diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c index d04fa521fc..334e6697df 100644 --- a/src/util/vircgroupv1.c +++ b/src/util/vircgroupv1.c @@ -97,13 +97,13 @@ virCgroupV1ValidateMachineGroup(virCgroupPtr group, g_autofree char *scopename_new =3D NULL; g_autofree char *partmachinename =3D NULL; =20 - virAsprintf(&partname, "%s.libvirt-%s", name, drivername); + partname =3D g_strdup_printf("%s.libvirt-%s", name, drivername); =20 if (virCgroupPartitionEscape(&partname) < 0) return false; =20 - virAsprintf(&partmachinename, "%s.libvirt-%s", - machinename, drivername); + partmachinename =3D g_strdup_printf("%s.libvirt-%s", + machinename, drivername); =20 if (virCgroupPartitionEscape(&partmachinename) < 0) return false; @@ -203,10 +203,10 @@ virCgroupV1CopyPlacement(virCgroupPtr group, * parent =3D=3D "/libvirt.service" + path =3D=3D "" =3D> "/li= bvirt.service" * parent =3D=3D "/libvirt.service" + path =3D=3D "foo" =3D> "= /libvirt.service/foo" */ - virAsprintf(&group->legacy[i].placement, "%s%s%s", - parent->legacy[i].placement, - (STREQ(parent->legacy[i].placement, "/") || STREQ(= path, "") ? "" : "/"), - path); + group->legacy[i].placement =3D g_strdup_printf("%s%s%s", + parent->legacy[i]= .placement, + (STREQ(parent->le= gacy[i].placement, "/") || STREQ(path, "") ? "" : "/"), + path); } } =20 @@ -237,7 +237,7 @@ virCgroupV1ResolveMountLink(const char *mntDir, return 0; =20 *dirName =3D '\0'; - virAsprintf(&linkSrc, "%s/%s", tmp, typeStr); + linkSrc =3D g_strdup_printf("%s/%s", tmp, typeStr); *dirName =3D '/'; =20 if (lstat(linkSrc, &sb) < 0) { @@ -349,9 +349,9 @@ virCgroupV1DetectPlacement(virCgroupPtr group, if (i =3D=3D VIR_CGROUP_CONTROLLER_SYSTEMD) { group->legacy[i].placement =3D g_strdup(selfpath); } else { - virAsprintf(&group->legacy[i].placement, "%s%s%s", selfpat= h, - (STREQ(selfpath, "/") || STREQ(path, "") ? "" = : "/"), - path); + group->legacy[i].placement =3D g_strdup_printf("%s%s%s", s= elfpath, + (STREQ(selfpa= th, "/") || STREQ(path, "") ? "" : "/"), + path); } } } @@ -516,8 +516,8 @@ virCgroupV1PathOfController(virCgroupPtr group, return -1; } =20 - virAsprintf(path, "%s%s/%s", group->legacy[controller].mountPoint, - group->legacy[controller].placement, NULLSTR_EMPTY(key)); + *path =3D g_strdup_printf("%s%s/%s", group->legacy[controller].mountPo= int, + group->legacy[controller].placement, NULLSTR_E= MPTY(key)); =20 return 0; } @@ -806,7 +806,7 @@ virCgroupV1BindMount(virCgroupPtr group, return -1; } =20 - virAsprintf(&opts, "mode=3D755,size=3D65536%s", mountopts); + opts =3D g_strdup_printf("mode=3D755,size=3D65536%s", mountopts); =20 if (mount("tmpfs", root, "tmpfs", MS_NOSUID|MS_NODEV|MS_NOEXEC, opts) = < 0) { virReportSystemError(errno, @@ -821,7 +821,7 @@ virCgroupV1BindMount(virCgroupPtr group, =20 if (!virFileExists(group->legacy[i].mountPoint)) { g_autofree char *src =3D NULL; - virAsprintf(&src, "%s%s", oldroot, group->legacy[i].mountPoint= ); + src =3D g_strdup_printf("%s%s", oldroot, group->legacy[i].moun= tPoint); =20 VIR_DEBUG("Create mount point '%s'", group->legacy[i].mountPoint); @@ -881,8 +881,8 @@ virCgroupV1SetOwner(virCgroupPtr cgroup, if (!cgroup->legacy[i].mountPoint) continue; =20 - virAsprintf(&base, "%s%s", cgroup->legacy[i].mountPoint, - cgroup->legacy[i].placement); + base =3D g_strdup_printf("%s%s", cgroup->legacy[i].mountPoint, + cgroup->legacy[i].placement); =20 if (virDirOpen(&dh, base) < 0) goto cleanup; @@ -890,7 +890,7 @@ virCgroupV1SetOwner(virCgroupPtr cgroup, while ((direrr =3D virDirRead(dh, &de, base)) > 0) { g_autofree char *entry =3D NULL; =20 - virAsprintf(&entry, "%s/%s", base, de->d_name); + entry =3D g_strdup_printf("%s/%s", base, de->d_name); =20 if (chown(entry, uid, gid) < 0) { virReportSystemError(errno, @@ -947,7 +947,7 @@ virCgroupV1SetBlkioWeight(virCgroupPtr group, return -1; } =20 - virAsprintf(&value, "%u", weight); + value =3D g_strdup_printf("%u", weight); =20 return virCgroupSetValueRaw(path, value); } @@ -1189,7 +1189,7 @@ virCgroupV1SetBlkioDeviceWeight(virCgroupPtr group, if (!(blkstr =3D virCgroupGetBlockDevString(devPath))) return -1; =20 - virAsprintf(&str, "%s%d", blkstr, weight); + str =3D g_strdup_printf("%s%d", blkstr, weight); =20 if (virCgroupV1PathOfController(group, VIR_CGROUP_CONTROLLER_BLKIO, "blkio.weight_device", &path) < 0) { @@ -1256,7 +1256,7 @@ virCgroupV1SetBlkioDeviceReadIops(virCgroupPtr group, if (!(blkstr =3D virCgroupGetBlockDevString(path))) return -1; =20 - virAsprintf(&str, "%s%u", blkstr, riops); + str =3D g_strdup_printf("%s%u", blkstr, riops); =20 return virCgroupSetValueStr(group, VIR_CGROUP_CONTROLLER_BLKIO, @@ -1307,7 +1307,7 @@ virCgroupV1SetBlkioDeviceWriteIops(virCgroupPtr group, if (!(blkstr =3D virCgroupGetBlockDevString(path))) return -1; =20 - virAsprintf(&str, "%s%u", blkstr, wiops); + str =3D g_strdup_printf("%s%u", blkstr, wiops); =20 return virCgroupSetValueStr(group, VIR_CGROUP_CONTROLLER_BLKIO, @@ -1358,7 +1358,7 @@ virCgroupV1SetBlkioDeviceReadBps(virCgroupPtr group, if (!(blkstr =3D virCgroupGetBlockDevString(path))) return -1; =20 - virAsprintf(&str, "%s%llu", blkstr, rbps); + str =3D g_strdup_printf("%s%llu", blkstr, rbps); =20 return virCgroupSetValueStr(group, VIR_CGROUP_CONTROLLER_BLKIO, @@ -1409,7 +1409,7 @@ virCgroupV1SetBlkioDeviceWriteBps(virCgroupPtr group, if (!(blkstr =3D virCgroupGetBlockDevString(path))) return -1; =20 - virAsprintf(&str, "%s%llu", blkstr, wbps); + str =3D g_strdup_printf("%s%llu", blkstr, wbps); =20 return virCgroupSetValueStr(group, VIR_CGROUP_CONTROLLER_BLKIO, @@ -1761,15 +1761,15 @@ virCgroupV1AllowDevice(virCgroupPtr group, if (major < 0) majorstr =3D g_strdup("*"); else - virAsprintf(&majorstr, "%i", major); + majorstr =3D g_strdup_printf("%i", major); =20 if (minor < 0) minorstr =3D g_strdup("*"); else - virAsprintf(&minorstr, "%i", minor); + minorstr =3D g_strdup_printf("%i", minor); =20 - virAsprintf(&devstr, "%c %s:%s %s", type, majorstr, minorstr, - virCgroupGetDevicePermsString(perms)); + devstr =3D g_strdup_printf("%c %s:%s %s", type, majorstr, minorstr, + virCgroupGetDevicePermsString(perms)); =20 if (virCgroupSetValueStr(group, VIR_CGROUP_CONTROLLER_DEVICES, @@ -1795,15 +1795,15 @@ virCgroupV1DenyDevice(virCgroupPtr group, if (major < 0) majorstr =3D g_strdup("*"); else - virAsprintf(&majorstr, "%i", major); + majorstr =3D g_strdup_printf("%i", major); =20 if (minor < 0) minorstr =3D g_strdup("*"); else - virAsprintf(&minorstr, "%i", minor); + minorstr =3D g_strdup_printf("%i", minor); =20 - virAsprintf(&devstr, "%c %s:%s %s", type, majorstr, minorstr, - virCgroupGetDevicePermsString(perms)); + devstr =3D g_strdup_printf("%c %s:%s %s", type, majorstr, minorstr, + virCgroupGetDevicePermsString(perms)); =20 if (virCgroupSetValueStr(group, VIR_CGROUP_CONTROLLER_DEVICES, diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c index f0ce4a48bc..d3374b6094 100644 --- a/src/util/vircgroupv2.c +++ b/src/util/vircgroupv2.c @@ -75,7 +75,7 @@ virCgroupV2Available(void) /* Systemd uses cgroup v2 for process tracking but no controller is * available. We should consider this configuration as cgroup v2 is * not available. */ - virAsprintf(&contFile, "%s/cgroup.controllers", entry.mnt_dir); + contFile =3D g_strdup_printf("%s/cgroup.controllers", entry.mnt_di= r); =20 if (virFileReadAll(contFile, 1024 * 1024, &contStr) < 0) goto cleanup; @@ -103,7 +103,7 @@ virCgroupV2ValidateMachineGroup(virCgroupPtr group, g_autofree char *scopename =3D NULL; char *tmp; =20 - virAsprintf(&partmachinename, "%s.libvirt-%s", machinename, drivername= ); + partmachinename =3D g_strdup_printf("%s.libvirt-%s", machinename, driv= ername); =20 if (virCgroupPartitionEscape(&partmachinename) < 0) return false; @@ -162,10 +162,10 @@ virCgroupV2CopyPlacement(virCgroupPtr group, * parent =3D=3D "/libvirt.service" + path =3D=3D "" =3D> "/libvir= t.service" * parent =3D=3D "/libvirt.service" + path =3D=3D "foo" =3D> "/lib= virt.service/foo" */ - virAsprintf(&group->unified.placement, "%s%s%s", - parent->unified.placement, - (STREQ(parent->unified.placement, "/") || STREQ(path, = "") ? "" : "/"), - path); + group->unified.placement =3D g_strdup_printf("%s%s%s", + parent->unified.placeme= nt, + (STREQ(parent->unified.= placement, "/") || STREQ(path, "") ? "" : "/"), + path); } =20 return 0; @@ -209,8 +209,8 @@ virCgroupV2DetectPlacement(virCgroupPtr group, * selfpath =3D=3D "/libvirt.service" + path =3D=3D "" -> "/libvirt.se= rvice" * selfpath =3D=3D "/libvirt.service" + path =3D=3D "foo" -> "/libvirt= .service/foo" */ - virAsprintf(&group->unified.placement, "%s%s%s", selfpath, - (STREQ(selfpath, "/") || STREQ(path, "") ? "" : "/"), path= ); + group->unified.placement =3D g_strdup_printf("%s%s%s", selfpath, + (STREQ(selfpath, "/") || ST= REQ(path, "") ? "" : "/"), path); =20 return 0; } @@ -252,13 +252,13 @@ virCgroupV2ParseControllersFile(virCgroupPtr group, char **tmp; =20 if (parent) { - virAsprintf(&contFile, "%s%s/cgroup.subtree_control", - parent->unified.mountPoint, - NULLSTR_EMPTY(parent->unified.placement)); + contFile =3D g_strdup_printf("%s%s/cgroup.subtree_control", + parent->unified.mountPoint, + NULLSTR_EMPTY(parent->unified.placement= )); } else { - virAsprintf(&contFile, "%s%s/cgroup.controllers", - group->unified.mountPoint, - NULLSTR_EMPTY(group->unified.placement)); + contFile =3D g_strdup_printf("%s%s/cgroup.controllers", + group->unified.mountPoint, + NULLSTR_EMPTY(group->unified.placement)= ); } =20 rc =3D virFileReadAll(contFile, 1024 * 1024, &contStr); @@ -345,8 +345,8 @@ virCgroupV2PathOfController(virCgroupPtr group, return -1; } =20 - virAsprintf(path, "%s%s/%s", group->unified.mountPoint, - group->unified.placement, NULLSTR_EMPTY(key)); + *path =3D g_strdup_printf("%s%s/%s", group->unified.mountPoint, + group->unified.placement, NULLSTR_EMPTY(key)); =20 return 0; } @@ -368,7 +368,7 @@ virCgroupV2EnableController(virCgroupPtr group, g_autofree char *val =3D NULL; g_autofree char *path =3D NULL; =20 - virAsprintf(&val, "+%s", virCgroupV2ControllerTypeToString(controller)= ); + val =3D g_strdup_printf("+%s", virCgroupV2ControllerTypeToString(contr= oller)); =20 if (virCgroupPathOfController(parent, controller, "cgroup.subtree_control", &path) < 0) { @@ -550,9 +550,9 @@ virCgroupV2BindMount(virCgroupPtr group, return -1; } =20 - virAsprintf(&opts, "mode=3D755,size=3D65536%s", mountopts); + opts =3D g_strdup_printf("mode=3D755,size=3D65536%s", mountopts); =20 - virAsprintf(&src, "%s%s", oldroot, group->unified.mountPoint); + src =3D g_strdup_printf("%s%s", oldroot, group->unified.mountPoint); =20 if (mount(src, group->unified.mountPoint, "none", MS_BIND, NULL) < 0) { virReportSystemError(errno, _("Failed to bind cgroup '%s' on '%s'"= ), @@ -572,8 +572,8 @@ virCgroupV2SetOwner(virCgroupPtr cgroup, { g_autofree char *base =3D NULL; =20 - virAsprintf(&base, "%s%s", cgroup->unified.mountPoint, - cgroup->unified.placement); + base =3D g_strdup_printf("%s%s", cgroup->unified.mountPoint, + cgroup->unified.placement); =20 if (virFileChownFiles(base, uid, gid) < 0) return -1; @@ -617,7 +617,7 @@ virCgroupV2SetBlkioWeight(virCgroupPtr group, return -1; } =20 - virAsprintf(&value, format, weight); + value =3D g_strdup_printf(format, weight); =20 return virCgroupSetValueRaw(path, value); } @@ -810,7 +810,7 @@ virCgroupV2SetBlkioDeviceWeight(virCgroupPtr group, if (!(blkstr =3D virCgroupGetBlockDevString(devPath))) return -1; =20 - virAsprintf(&str, "%s%d", blkstr, weight); + str =3D g_strdup_printf("%s%d", blkstr, weight); =20 if (virCgroupV2PathOfController(group, VIR_CGROUP_CONTROLLER_BLKIO, "io.weight", &path) < 0) { @@ -879,9 +879,9 @@ virCgroupV2SetBlkioDeviceReadIops(virCgroupPtr group, return -1; =20 if (riops =3D=3D 0) { - virAsprintf(&str, "%sriops=3Dmax", blkstr); + str =3D g_strdup_printf("%sriops=3Dmax", blkstr); } else { - virAsprintf(&str, "%sriops=3D%u", blkstr, riops); + str =3D g_strdup_printf("%sriops=3D%u", blkstr, riops); } =20 return virCgroupSetValueStr(group, @@ -948,9 +948,9 @@ virCgroupV2SetBlkioDeviceWriteIops(virCgroupPtr group, return -1; =20 if (wiops =3D=3D 0) { - virAsprintf(&str, "%swiops=3Dmax", blkstr); + str =3D g_strdup_printf("%swiops=3Dmax", blkstr); } else { - virAsprintf(&str, "%swiops=3D%u", blkstr, wiops); + str =3D g_strdup_printf("%swiops=3D%u", blkstr, wiops); } =20 return virCgroupSetValueStr(group, @@ -1017,9 +1017,9 @@ virCgroupV2SetBlkioDeviceReadBps(virCgroupPtr group, return -1; =20 if (rbps =3D=3D 0) { - virAsprintf(&str, "%srbps=3Dmax", blkstr); + str =3D g_strdup_printf("%srbps=3Dmax", blkstr); } else { - virAsprintf(&str, "%srbps=3D%llu", blkstr, rbps); + str =3D g_strdup_printf("%srbps=3D%llu", blkstr, rbps); } =20 return virCgroupSetValueStr(group, @@ -1086,9 +1086,9 @@ virCgroupV2SetBlkioDeviceWriteBps(virCgroupPtr group, return -1; =20 if (wbps =3D=3D 0) { - virAsprintf(&str, "%swbps=3Dmax", blkstr); + str =3D g_strdup_printf("%swbps=3Dmax", blkstr); } else { - virAsprintf(&str, "%swbps=3D%llu", blkstr, wbps); + str =3D g_strdup_printf("%swbps=3D%llu", blkstr, wbps); } =20 return virCgroupSetValueStr(group, @@ -1488,7 +1488,7 @@ virCgroupV2SetCpuCfsPeriod(virCgroupPtr group, } *tmp =3D '\0'; =20 - virAsprintf(&value, "%s %llu", str, cfs_period); + value =3D g_strdup_printf("%s %llu", str, cfs_period); =20 return virCgroupSetValueStr(group, VIR_CGROUP_CONTROLLER_CPU, "cpu.max", value); diff --git a/src/util/virconf.c b/src/util/virconf.c index d4071d1945..6238b28dd9 100644 --- a/src/util/virconf.c +++ b/src/util/virconf.c @@ -1520,13 +1520,13 @@ virConfLoadConfigPath(const char *name) { char *path; if (geteuid() =3D=3D 0) { - virAsprintf(&path, "%s/libvirt/%s", SYSCONFDIR, name); + path =3D g_strdup_printf("%s/libvirt/%s", SYSCONFDIR, name); } else { char *userdir =3D virGetUserConfigDirectory(); if (!userdir) return NULL; =20 - virAsprintf(&path, "%s/%s", userdir, name); + path =3D g_strdup_printf("%s/%s", userdir, name); VIR_FREE(userdir); } =20 diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c index 4f29f74c77..cc6a099faa 100644 --- a/src/util/virdevmapper.c +++ b/src/util/virdevmapper.c @@ -127,9 +127,9 @@ virDevMapperGetTargetsImpl(const char *path, goto cleanup; =20 for (i =3D 0; i < deps->count; i++) { - virAsprintf(&devPaths[i], "/dev/block/%u:%u", - major(deps->device[i]), - minor(deps->device[i])); + devPaths[i] =3D g_strdup_printf("/dev/block/%u:%u", + major(deps->device[i]), + minor(deps->device[i])); } =20 recursiveDevPaths =3D NULL; diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c index a93c851f7d..12c51875b2 100644 --- a/src/util/virdnsmasq.c +++ b/src/util/virdnsmasq.c @@ -180,7 +180,7 @@ addnhostsWrite(const char *path, * for runtime addition. */ =20 - virAsprintf(&tmp, "%s.new", path); + tmp =3D g_strdup_printf("%s.new", path); =20 if (!(f =3D fopen(tmp, "w"))) { istmp =3D false; @@ -311,24 +311,24 @@ hostsfileAdd(dnsmasqHostsfile *hostsfile, /* the first test determines if it is a dhcpv6 host */ if (ipv6) { if (name && id) { - virAsprintf(&hostsfile->hosts[hostsfile->nhosts].host, - "id:%s,%s,[%s]", id, name, ipstr); + hostsfile->hosts[hostsfile->nhosts].host =3D g_strdup_printf( + "id= :%s,%s,[%s]", id, name, ipstr); } else if (name && !id) { - virAsprintf(&hostsfile->hosts[hostsfile->nhosts].host, "%s,[%s= ]", - name, ipstr); + hostsfile->hosts[hostsfile->nhosts].host =3D g_strdup_printf("= %s,[%s]", + nam= e, ipstr); } else if (!name && id) { - virAsprintf(&hostsfile->hosts[hostsfile->nhosts].host, - "id:%s,[%s]", id, ipstr); + hostsfile->hosts[hostsfile->nhosts].host =3D g_strdup_printf( + "id= :%s,[%s]", id, ipstr); } } else if (name && mac) { - virAsprintf(&hostsfile->hosts[hostsfile->nhosts].host, "%s,%s,%s", - mac, ipstr, name); + hostsfile->hosts[hostsfile->nhosts].host =3D g_strdup_printf("%s,%= s,%s", + mac, ip= str, name); } else if (name && !mac) { - virAsprintf(&hostsfile->hosts[hostsfile->nhosts].host, "%s,%s", na= me, - ipstr); + hostsfile->hosts[hostsfile->nhosts].host =3D g_strdup_printf("%s,%= s", name, + ipstr); } else { - virAsprintf(&hostsfile->hosts[hostsfile->nhosts].host, "%s,%s", ma= c, - ipstr); + hostsfile->hosts[hostsfile->nhosts].host =3D g_strdup_printf("%s,%= s", mac, + ipstr); } VIR_FREE(ipstr); =20 @@ -386,7 +386,7 @@ hostsfileWrite(const char *path, * for runtime addition. */ =20 - virAsprintf(&tmp, "%s.new", path); + tmp =3D g_strdup_printf("%s.new", path); =20 if (!(f =3D fopen(tmp, "w"))) { istmp =3D false; @@ -750,7 +750,7 @@ dnsmasqCapsRefreshInternal(dnsmasqCapsPtr caps, bool fo= rce) if (virCommandRun(cmd, NULL) < 0) goto cleanup; =20 - virAsprintf(&complete, "%s\n%s", version, help); + complete =3D g_strdup_printf("%s\n%s", version, help); =20 ret =3D dnsmasqCapsSetFromBuffer(caps, complete); =20 diff --git a/src/util/virebtables.c b/src/util/virebtables.c index 9f4ba9013e..14a922834a 100644 --- a/src/util/virebtables.c +++ b/src/util/virebtables.c @@ -58,7 +58,7 @@ ebtablesContextNew(const char *driver) if (VIR_ALLOC(ctx) < 0) return NULL; =20 - virAsprintf(&ctx->chain, "libvirt_%s_FORWARD", driver); + ctx->chain =3D g_strdup_printf("libvirt_%s_FORWARD", driver); =20 return ctx; } diff --git a/src/util/virerror.c b/src/util/virerror.c index ee0ec1cffc..76a75e27a8 100644 --- a/src/util/virerror.c +++ b/src/util/virerror.c @@ -1488,7 +1488,7 @@ virLastErrorPrefixMessage(const char *fmt, ...) if (virVasprintfQuiet(&fmtmsg, fmt, args) < 0) goto cleanup; =20 - virAsprintf(&newmsg, "%s: %s", fmtmsg, err->message); + newmsg =3D g_strdup_printf("%s: %s", fmtmsg, err->message); =20 VIR_FREE(err->message); err->message =3D g_steal_pointer(&newmsg); diff --git a/src/util/virfile.c b/src/util/virfile.c index 0636fb8f08..042847137d 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -508,7 +508,7 @@ virFileRewrite(const char *path, int fd =3D -1; int ret =3D -1; =20 - virAsprintf(&newfile, "%s.new", path); + newfile =3D g_strdup_printf("%s.new", path); =20 if ((fd =3D open(newfile, O_WRONLY | O_CREAT | O_TRUNC, mode)) < 0) { virReportSystemError(errno, _("cannot create file '%s'"), @@ -665,7 +665,7 @@ static int virFileLoopDeviceOpenLoopCtl(char **dev_name= , int *fd) =20 VIR_DEBUG("Found free loop device number %i", devnr); =20 - virAsprintf(&looppath, "/dev/loop%i", devnr); + looppath =3D g_strdup_printf("/dev/loop%i", devnr); =20 if ((*fd =3D open(looppath, O_RDWR)) < 0) { virReportSystemError(errno, @@ -701,7 +701,7 @@ static int virFileLoopDeviceOpenSearch(char **dev_name) !c_isdigit(de->d_name[4])) continue; =20 - virAsprintf(&looppath, "/dev/%s", de->d_name); + looppath =3D g_strdup_printf("/dev/%s", de->d_name); =20 VIR_DEBUG("Checking up on device %s", looppath); if ((fd =3D open(looppath, O_RDWR)) < 0) { @@ -831,7 +831,7 @@ virFileNBDDeviceIsBusy(const char *dev_name) { g_autofree char *path =3D NULL; =20 - virAsprintf(&path, SYSFS_BLOCK_DIR "/%s/pid", dev_name); + path =3D g_strdup_printf(SYSFS_BLOCK_DIR "/%s/pid", dev_name); =20 if (!virFileExists(path)) { if (errno =3D=3D ENOENT) @@ -863,7 +863,7 @@ virFileNBDDeviceFindUnused(void) if (rv < 0) goto cleanup; if (rv =3D=3D 0) { - virAsprintf(&ret, "/dev/%s", de->d_name); + ret =3D g_strdup_printf("/dev/%s", de->d_name); goto cleanup; } } @@ -1008,7 +1008,7 @@ int virFileDeleteTree(const char *dir) g_autofree char *filepath =3D NULL; struct stat sb; =20 - virAsprintf(&filepath, "%s/%s", dir, de->d_name); + filepath =3D g_strdup_printf("%s/%s", dir, de->d_name); =20 if (lstat(filepath, &sb) < 0) { virReportSystemError(errno, _("Cannot access '%s'"), @@ -1549,7 +1549,7 @@ virFileRelLinkPointsTo(const char *directory, checkLink); return -1; } - virAsprintf(&candidate, "%s/%s", directory, checkLink); + candidate =3D g_strdup_printf("%s/%s", directory, checkLink); return virFileLinkPointsTo(candidate, checkDest); } =20 @@ -1685,7 +1685,7 @@ virFindFileInPath(const char *file) */ pathiter =3D path; while ((pathseg =3D strsep(&pathiter, ":")) !=3D NULL) { - virAsprintf(&fullpath, "%s/%s", pathseg, file); + fullpath =3D g_strdup_printf("%s/%s", pathseg, file); if (virFileIsExecutable(fullpath)) break; VIR_FREE(fullpath); @@ -1749,7 +1749,7 @@ virFileFindResourceFull(const char *filename, else path =3D installdir; =20 - virAsprintf(&ret, "%s/%s%s%s", path, prefix, filename, suffix); + ret =3D g_strdup_printf("%s/%s%s%s", path, prefix, filename, suffix); =20 VIR_DEBUG("Resolved '%s' to '%s'", filename, ret); return ret; @@ -2976,7 +2976,7 @@ int virFileChownFiles(const char *name, while ((direrr =3D virDirRead(dir, &ent, name)) > 0) { g_autofree char *path =3D NULL; =20 - virAsprintf(&path, "%s/%s", name, ent->d_name); + path =3D g_strdup_printf("%s/%s", name, ent->d_name); =20 if (!virFileIsRegular(path)) continue; @@ -3093,9 +3093,9 @@ virFileBuildPath(const char *dir, const char *name, c= onst char *ext) char *path; =20 if (ext =3D=3D NULL) { - virAsprintf(&path, "%s/%s", dir, name); + path =3D g_strdup_printf("%s/%s", dir, name); } else { - virAsprintf(&path, "%s/%s%s", dir, name, ext); + path =3D g_strdup_printf("%s/%s%s", dir, name, ext); } =20 return path; @@ -3283,7 +3283,7 @@ virFileAbsPath(const char *path, char **abspath) if (buf =3D=3D NULL) return -1; =20 - virAsprintf(abspath, "%s/%s", buf, path); + *abspath =3D g_strdup_printf("%s/%s", buf, path); } =20 return 0; diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index 26b2fdc17f..90543dcb00 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -627,7 +627,7 @@ virHostCPUGetInfoPopulateLinux(FILE *cpuinfo, /* OK, we've parsed clock speed out of /proc/cpuinfo. Get the * core, node, socket, thread and topology information from /sys */ - virAsprintf(&sysfs_nodedir, "%s/node", SYSFS_SYSTEM_PATH); + sysfs_nodedir =3D g_strdup_printf("%s/node", SYSFS_SYSTEM_PATH); =20 if (virDirOpenQuiet(&nodedir, sysfs_nodedir) < 0) { /* the host isn't probably running a NUMA architecture */ @@ -670,8 +670,8 @@ virHostCPUGetInfoPopulateLinux(FILE *cpuinfo, =20 (*nodes)++; =20 - virAsprintf(&sysfs_cpudir, "%s/node/%s", SYSFS_SYSTEM_PATH, - nodedirent->d_name); + sysfs_cpudir =3D g_strdup_printf("%s/node/%s", SYSFS_SYSTEM_PATH, + nodedirent->d_name); =20 if ((nodecpus =3D virHostCPUParseNode(sysfs_cpudir, arch, present_cpus_map, @@ -704,7 +704,7 @@ virHostCPUGetInfoPopulateLinux(FILE *cpuinfo, fallback: VIR_FREE(sysfs_cpudir); =20 - virAsprintf(&sysfs_cpudir, "%s/cpu", SYSFS_SYSTEM_PATH); + sysfs_cpudir =3D g_strdup_printf("%s/cpu", SYSFS_SYSTEM_PATH); =20 if ((nodecpus =3D virHostCPUParseNode(sysfs_cpudir, arch, present_cpus_map, diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c index ab40c5faaa..ee05bc248c 100644 --- a/src/util/virhostdev.c +++ b/src/util/virhostdev.c @@ -184,7 +184,7 @@ virHostdevManagerNew(void) if (!(rundir =3D virGetUserRuntimeDirectory())) return NULL; =20 - virAsprintf(&hostdevMgr->stateDir, "%s/hostdevmgr", rundir); + hostdevMgr->stateDir =3D g_strdup_printf("%s/hostdevmgr", rundir); =20 old_umask =3D umask(077); =20 diff --git a/src/util/virhostmem.c b/src/util/virhostmem.c index 0d57d47529..61bca450e6 100644 --- a/src/util/virhostmem.c +++ b/src/util/virhostmem.c @@ -280,8 +280,8 @@ virHostMemGetStats(int cellNum G_GNUC_UNUSED, return -1; } =20 - virAsprintf(&meminfo_path, - SYSFS_SYSTEM_PATH "/node/node%d/meminfo", cellNum); + meminfo_path =3D g_strdup_printf( + SYSFS_SYSTEM_PATH "/node/node%d= /meminfo", cellNum); } meminfo =3D fopen(meminfo_path, "r"); =20 @@ -316,9 +316,9 @@ virHostMemSetParameterValue(virTypedParameterPtr param) char *field =3D strchr(param->field, '_'); sa_assert(field); field++; - virAsprintf(&path, "%s/%s", SYSFS_MEMORY_SHARED_PATH, field); + path =3D g_strdup_printf("%s/%s", SYSFS_MEMORY_SHARED_PATH, field); =20 - virAsprintf(&strval, "%u", param->value.ui); + strval =3D g_strdup_printf("%u", param->value.ui); =20 if ((rc =3D virFileWriteStr(path, strval, 0)) < 0) { virReportSystemError(-rc, _("failed to set %s"), param->field); @@ -341,7 +341,7 @@ virHostMemParametersAreAllSupported(virTypedParameterPt= r params, char *field =3D strchr(param->field, '_'); sa_assert(field); field++; - virAsprintf(&path, "%s/%s", SYSFS_MEMORY_SHARED_PATH, field); + path =3D g_strdup_printf("%s/%s", SYSFS_MEMORY_SHARED_PATH, field); =20 if (!virFileExists(path)) { virReportError(VIR_ERR_OPERATION_INVALID, @@ -405,7 +405,7 @@ virHostMemGetParameterValue(const char *field, char *tmp =3D NULL; int rc =3D -1; =20 - virAsprintf(&path, "%s/%s", SYSFS_MEMORY_SHARED_PATH, field); + path =3D g_strdup_printf("%s/%s", SYSFS_MEMORY_SHARED_PATH, field); =20 if (!virFileExists(path)) return -2; diff --git a/src/util/viriptables.c b/src/util/viriptables.c index c8c4d98f30..b7cce40d37 100644 --- a/src/util/viriptables.c +++ b/src/util/viriptables.c @@ -401,7 +401,7 @@ static char *iptablesFormatNetwork(virSocketAddr *netad= dr, if (!netstr) return NULL; =20 - virAsprintf(&ret, "%s/%d", netstr, prefix); + ret =3D g_strdup_printf("%s/%d", netstr, prefix); =20 return ret; } @@ -905,7 +905,7 @@ iptablesForwardMasquerade(virFirewallPtr fw, } =20 if (port->start < port->end && port->end < 65536) { - virAsprintf(&portRangeStr, ":%u-%u", port->start, port->end); + portRangeStr =3D g_strdup_printf(":%u-%u", port->start, port->= end); } else { virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid port range '%u-%u'."), @@ -917,11 +917,11 @@ iptablesForwardMasquerade(virFirewallPtr fw, /* Use --jump SNAT if public addr is specified */ if (addrStartStr && addrStartStr[0]) { if (addrEndStr && addrEndStr[0]) { - virAsprintf(&natRangeStr, "%s-%s%s", addrStartStr, addrEndStr, - portRangeStr ? portRangeStr : ""); + natRangeStr =3D g_strdup_printf("%s-%s%s", addrStartStr, addrE= ndStr, + portRangeStr ? portRangeStr : ""= ); } else { - virAsprintf(&natRangeStr, "%s%s", addrStartStr, - portRangeStr ? portRangeStr : ""); + natRangeStr =3D g_strdup_printf("%s%s", addrStartStr, + portRangeStr ? portRangeStr : ""= ); } =20 virFirewallRuleAddArgList(fw, rule, diff --git a/src/util/viriscsi.c b/src/util/viriscsi.c index 55a30470d6..9f4c8f4e03 100644 --- a/src/util/viriscsi.c +++ b/src/util/viriscsi.c @@ -213,8 +213,8 @@ virStorageBackendCreateIfaceIQN(const char *initiatoriq= n, g_autofree char *temp_ifacename =3D NULL; g_autoptr(virCommand) cmd =3D NULL; =20 - virAsprintf(&temp_ifacename, "libvirt-iface-%08llx", - (unsigned long long)virRandomBits(32)); + temp_ifacename =3D g_strdup_printf("libvirt-iface-%08llx", + (unsigned long long)virRandomBits(32)= ); =20 VIR_DEBUG("Attempting to create interface '%s' with IQN '%s'", temp_ifacename, initiatoriqn); diff --git a/src/util/virjson.c b/src/util/virjson.c index ec8d706edd..7ab8f4b52a 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -497,7 +497,7 @@ virJSONValuePtr virJSONValueNewNumberInt(int data) { g_autofree char *str =3D NULL; - virAsprintf(&str, "%i", data); + str =3D g_strdup_printf("%i", data); return virJSONValueNewNumber(str); } =20 @@ -506,7 +506,7 @@ virJSONValuePtr virJSONValueNewNumberUint(unsigned int data) { g_autofree char *str =3D NULL; - virAsprintf(&str, "%u", data); + str =3D g_strdup_printf("%u", data); return virJSONValueNewNumber(str); } =20 @@ -515,7 +515,7 @@ virJSONValuePtr virJSONValueNewNumberLong(long long data) { g_autofree char *str =3D NULL; - virAsprintf(&str, "%lld", data); + str =3D g_strdup_printf("%lld", data); return virJSONValueNewNumber(str); } =20 @@ -524,7 +524,7 @@ virJSONValuePtr virJSONValueNewNumberUlong(unsigned long long data) { g_autofree char *str =3D NULL; - virAsprintf(&str, "%llu", data); + str =3D g_strdup_printf("%llu", data); return virJSONValueNewNumber(str); } =20 diff --git a/src/util/virkmod.c b/src/util/virkmod.c index 12e6e5676c..12cb5920e8 100644 --- a/src/util/virkmod.c +++ b/src/util/virkmod.c @@ -149,7 +149,7 @@ virKModIsBlacklisted(const char *module) g_autofree char *drvblklst =3D NULL; g_autofree char *outbuf =3D NULL; =20 - virAsprintf(&drvblklst, "blacklist %s\n", module); + drvblklst =3D g_strdup_printf("blacklist %s\n", module); =20 /* modprobe will convert all '-' into '_', so we need to as well */ for (i =3D 0; i < drvblklst[i]; i++) diff --git a/src/util/virlockspace.c b/src/util/virlockspace.c index 30868035a9..b7e1b6cfda 100644 --- a/src/util/virlockspace.c +++ b/src/util/virlockspace.c @@ -67,7 +67,7 @@ static char *virLockSpaceGetResourcePath(virLockSpacePtr = lockspace, { char *ret; if (lockspace->dir) - virAsprintf(&ret, "%s/%s", lockspace->dir, resname); + ret =3D g_strdup_printf("%s/%s", lockspace->dir, resname); else ret =3D g_strdup(resname); return ret; diff --git a/src/util/virlog.c b/src/util/virlog.c index 880539e5c0..e7d62e3948 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -152,8 +152,8 @@ virLogUnlock(void) static void virLogSetDefaultOutputToStderr(void) { - virAsprintf(&virLogDefaultOutput, "%d:stderr", - virLogDefaultPriority); + virLogDefaultOutput =3D g_strdup_printf("%d:stderr", + virLogDefaultPriority); } =20 =20 @@ -167,7 +167,7 @@ virLogSetDefaultOutputToJournald(void) if (priority =3D=3D VIR_LOG_DEBUG) priority =3D VIR_LOG_INFO; =20 - virAsprintf(&virLogDefaultOutput, "%d:journald", priority); + virLogDefaultOutput =3D g_strdup_printf("%d:journald", priority); } =20 =20 @@ -179,8 +179,8 @@ virLogSetDefaultOutputToFile(const char *binary, bool p= rivileged) mode_t old_umask; =20 if (privileged) { - virAsprintf(&virLogDefaultOutput, "%d:file:%s/log/libvirt/%s.log", - virLogDefaultPriority, LOCALSTATEDIR, binary); + virLogDefaultOutput =3D g_strdup_printf("%d:file:%s/log/libvirt/%s= .log", + virLogDefaultPriority, LOCAL= STATEDIR, binary); } else { if (!(logdir =3D virGetUserCacheDirectory())) goto cleanup; @@ -192,8 +192,8 @@ virLogSetDefaultOutputToFile(const char *binary, bool p= rivileged) } umask(old_umask); =20 - virAsprintf(&virLogDefaultOutput, "%d:file:%s/%s.log", - virLogDefaultPriority, logdir, binary); + virLogDefaultOutput =3D g_strdup_printf("%d:file:%s/%s.log", + virLogDefaultPriority, logdi= r, binary); } =20 ret =3D 0; @@ -453,13 +453,13 @@ virLogFormatString(char **msg, * to just grep for it to find the right place. */ if ((funcname !=3D NULL)) { - virAsprintf(msg, "%llu: %s : %s:%d : %s\n", - virThreadSelfID(), virLogPriorityString(priority), - funcname, linenr, str); + *msg =3D g_strdup_printf("%llu: %s : %s:%d : %s\n", + virThreadSelfID(), virLogPriorityString(pri= ority), + funcname, linenr, str); } else { - virAsprintf(msg, "%llu: %s : %s\n", - virThreadSelfID(), virLogPriorityString(priority), - str); + *msg =3D g_strdup_printf("%llu: %s : %s\n", + virThreadSelfID(), virLogPriorityString(pri= ority), + str); } } =20 @@ -481,7 +481,7 @@ virLogHostnameString(char **rawmsg, { char *hoststr; =20 - virAsprintf(&hoststr, "hostname: %s", virLogHostname); + hoststr =3D g_strdup_printf("hostname: %s", virLogHostname); =20 virLogFormatString(msg, 0, NULL, VIR_LOG_INFO, hoststr); *rawmsg =3D hoststr; @@ -689,7 +689,7 @@ virLogOutputToFd(virLogSourcePtr source G_GNUC_UNUSED, if (fd < 0) return; =20 - virAsprintf(&msg, "%s: %s", timestamp, str); + msg =3D g_strdup_printf("%s: %s", timestamp, str); ignore_value(safewrite(fd, msg, strlen(msg))); VIR_FREE(msg); } diff --git a/src/util/virmacmap.c b/src/util/virmacmap.c index c515e3e7b0..b38ae8ac43 100644 --- a/src/util/virmacmap.c +++ b/src/util/virmacmap.c @@ -290,7 +290,7 @@ virMacMapFileName(const char *dnsmasqStateDir, { char *filename; =20 - virAsprintf(&filename, "%s/%s.macs", dnsmasqStateDir, bridge); + filename =3D g_strdup_printf("%s/%s.macs", dnsmasqStateDir, bridge); =20 return filename; } diff --git a/src/util/virmdev.c b/src/util/virmdev.c index c5fd4ad42f..545069cfaa 100644 --- a/src/util/virmdev.c +++ b/src/util/virmdev.c @@ -80,7 +80,7 @@ virMediatedDeviceGetSysfsDeviceAPI(virMediatedDevicePtr d= ev, g_autofree char *file =3D NULL; char *tmp =3D NULL; =20 - virAsprintf(&file, "%s/mdev_type/device_api", dev->path); + file =3D g_strdup_printf("%s/mdev_type/device_api", dev->path); =20 /* TODO - make this a generic method to access sysfs files for various * kinds of devices @@ -217,7 +217,7 @@ virMediatedDeviceGetIOMMUGroupDev(const char *uuidstr) if (!dev_path) return NULL; =20 - virAsprintf(&iommu_path, "%s/iommu_group", dev_path); + iommu_path =3D g_strdup_printf("%s/iommu_group", dev_path); =20 if (!virFileExists(iommu_path)) { virReportSystemError(errno, _("failed to access '%s'"), iommu_path= ); @@ -229,7 +229,7 @@ virMediatedDeviceGetIOMMUGroupDev(const char *uuidstr) return NULL; } =20 - virAsprintf(&vfio_path, "/dev/vfio/%s", last_component(result_path)); + vfio_path =3D g_strdup_printf("/dev/vfio/%s", last_component(result_pa= th)); =20 return vfio_path; } @@ -425,7 +425,7 @@ virMediatedDeviceGetSysfsPath(const char *uuidstr) { char *ret =3D NULL; =20 - virAsprintf(&ret, MDEV_SYSFS_DEVICES "%s", uuidstr); + ret =3D g_strdup_printf(MDEV_SYSFS_DEVICES "%s", uuidstr); return ret; } =20 diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 20f7ef5428..9b2741bc28 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -511,7 +511,7 @@ int virNetDevSetNamespace(const char *ifname, pid_t pid= InNs) char *phy_path =3D NULL; int len; =20 - virAsprintf(&pid, "%lld", (long long) pidInNs); + pid =3D g_strdup_printf("%lld", (long long) pidInNs); =20 /* The 802.11 wireless devices only move together with their PHY. */ if (virNetDevSysfsFile(&phy_path, ifname, "phy80211/name") < 0) @@ -1068,7 +1068,7 @@ int virNetDevSysfsFile(char **pf_sysfs_device_link, const char *ifname, const char *file) { - virAsprintf(pf_sysfs_device_link, SYSFS_NET_DIR "%s/%s", ifname, file); + *pf_sysfs_device_link =3D g_strdup_printf(SYSFS_NET_DIR "%s/%s", ifnam= e, file); return 0; } =20 @@ -1076,8 +1076,8 @@ static int virNetDevSysfsDeviceFile(char **pf_sysfs_device_link, const char *ifname, const char *file) { - virAsprintf(pf_sysfs_device_link, SYSFS_NET_DIR "%s/device/%s", ifname, - file); + *pf_sysfs_device_link =3D g_strdup_printf(SYSFS_NET_DIR "%s/device/%s"= , ifname, + file); return 0; } =20 @@ -1099,7 +1099,7 @@ virNetDevIsPCIDevice(const char *devpath) char *subsys =3D NULL; bool ret =3D false; =20 - virAsprintf(&subsys_link, "%s/subsystem", devpath); + subsys_link =3D g_strdup_printf("%s/subsystem", devpath); =20 if (!virFileExists(subsys_link)) goto cleanup; @@ -1400,7 +1400,7 @@ virNetDevPFGetVF(const char *pfname, int vf, char **v= fname) if (virNetDevGetPhysPortID(pfname, &pfPhysPortID) < 0) goto cleanup; =20 - virAsprintf(&virtfnName, "virtfn%d", vf); + virtfnName =3D g_strdup_printf("virtfn%d", vf); =20 /* this provides the path to the VF's directory in sysfs, * e.g. "/sys/class/net/enp2s0f0/virtfn3" @@ -1888,7 +1888,7 @@ virNetDevSaveNetConfig(const char *linkdev, int vf, */ =20 if (pfDevName && saveVlan) { - virAsprintf(&filePath, "%s/%s_vf%d", stateDir, pfDevName, vf); + filePath =3D g_strdup_printf("%s/%s_vf%d", stateDir, pfDevName, vf= ); =20 /* get admin MAC and vlan tag */ if (virNetDevGetVfConfig(pfDevName, vf, &oldMAC, &oldVlanTag) < 0) @@ -1904,7 +1904,7 @@ virNetDevSaveNetConfig(const char *linkdev, int vf, } =20 } else { - virAsprintf(&filePath, "%s/%s", stateDir, linkdev); + filePath =3D g_strdup_printf("%s/%s", stateDir, linkdev); } =20 if (linkdev) { @@ -2009,7 +2009,7 @@ virNetDevReadNetConfig(const char *linkdev, int vf, */ =20 if (pfDevName) { - virAsprintf(&filePath, "%s/%s_vf%d", stateDir, pfDevName, vf); + filePath =3D g_strdup_printf("%s/%s_vf%d", stateDir, pfDevName, vf= ); =20 if (linkdev && !virFileExists(filePath)) { /* the device may have been stored in a file named for the @@ -2023,7 +2023,7 @@ virNetDevReadNetConfig(const char *linkdev, int vf, } =20 if (!pfDevName) - virAsprintf(&filePath, "%s/%s", stateDir, linkdev); + filePath =3D g_strdup_printf("%s/%s", stateDir, linkdev); =20 if (!virFileExists(filePath)) { /* having no file to read is not necessarily an error, so we @@ -2903,7 +2903,7 @@ virNetDevRDMAFeature(const char *ifname, if (virDirOpen(&dirp, SYSFS_INFINIBAND_DIR) < 0) return -1; =20 - virAsprintf(ð_devpath, SYSFS_NET_DIR "%s/device/resource", ifname); + eth_devpath =3D g_strdup_printf(SYSFS_NET_DIR "%s/device/resource", if= name); =20 /* If /sys/class/net//device/resource doesn't exist it is not = a PCI * device and therefore it will not have RDMA. */ @@ -2916,8 +2916,8 @@ virNetDevRDMAFeature(const char *ifname, goto cleanup; =20 while (virDirRead(dirp, &dp, SYSFS_INFINIBAND_DIR) > 0) { - virAsprintf(&ib_devpath, SYSFS_INFINIBAND_DIR "%s/device/resource", - dp->d_name); + ib_devpath =3D g_strdup_printf(SYSFS_INFINIBAND_DIR "%s/device/res= ource", + dp->d_name); if (virFileReadAll(ib_devpath, RESOURCE_FILE_LEN, &ib_res_buf) > 0= && STREQ(eth_res_buf, ib_res_buf)) { ignore_value(virBitmapSetBit(*out, VIR_NET_DEV_FEAT_RDMA)); diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c index b7e0c0c7c1..1f1872464a 100644 --- a/src/util/virnetdevbandwidth.c +++ b/src/util/virnetdevbandwidth.c @@ -114,7 +114,7 @@ virNetDevBandwidthManipulateFilter(const char *ifname, } =20 /* u32 filters must have 800:: prefix. Don't ask. */ - virAsprintf(&filter_id, "800::%u", id); + filter_id =3D g_strdup_printf("800::%u", id); =20 if (remove_old) { int cmd_ret =3D 0; @@ -131,9 +131,9 @@ virNetDevBandwidthManipulateFilter(const char *ifname, if (create_new) { virMacAddrGetRaw(ifmac_ptr, ifmac); =20 - virAsprintf(&mac[0], "0x%02x%02x%02x%02x", ifmac[2], - ifmac[3], ifmac[4], ifmac[5]); - virAsprintf(&mac[1], "0x%02x%02x", ifmac[0], ifmac[1]); + mac[0] =3D g_strdup_printf("0x%02x%02x%02x%02x", ifmac[2], + ifmac[3], ifmac[4], ifmac[5]); + mac[1] =3D g_strdup_printf("0x%02x%02x", ifmac[0], ifmac[1]); =20 virCommandFree(cmd); cmd =3D virCommandNew(TC); @@ -230,11 +230,11 @@ virNetDevBandwidthSet(const char *ifname, virNetDevBandwidthClear(ifname); =20 if (tx && tx->average) { - virAsprintf(&average, "%llukbps", tx->average); + average =3D g_strdup_printf("%llukbps", tx->average); if (tx->peak) - virAsprintf(&peak, "%llukbps", tx->peak); + peak =3D g_strdup_printf("%llukbps", tx->peak); if (tx->burst) - virAsprintf(&burst, "%llukb", tx->burst); + burst =3D g_strdup_printf("%llukb", tx->burst); =20 cmd =3D virCommandNew(TC); virCommandAddArgList(cmd, "qdisc", "add", "dev", ifname, "root", @@ -357,8 +357,8 @@ virNetDevBandwidthSet(const char *ifname, } =20 if (rx) { - virAsprintf(&average, "%llukbps", rx->average); - virAsprintf(&burst, "%llukb", rx->burst ? rx->burst : rx->average); + average =3D g_strdup_printf("%llukbps", rx->average); + burst =3D g_strdup_printf("%llukb", rx->burst ? rx->burst : rx->av= erage); =20 virCommandFree(cmd); cmd =3D virCommandNew(TC); @@ -568,12 +568,12 @@ virNetDevBandwidthPlug(const char *brname, return -1; } =20 - virAsprintf(&class_id, "1:%x", id); - virAsprintf(&qdisc_id, "%x:", id); - virAsprintf(&floor, "%llukbps", bandwidth->in->floor); - virAsprintf(&ceil, "%llukbps", net_bandwidth->in->peak ? - net_bandwidth->in->peak : - net_bandwidth->in->average); + class_id =3D g_strdup_printf("1:%x", id); + qdisc_id =3D g_strdup_printf("%x:", id); + floor =3D g_strdup_printf("%llukbps", bandwidth->in->floor); + ceil =3D g_strdup_printf("%llukbps", net_bandwidth->in->peak ? + net_bandwidth->in->peak : + net_bandwidth->in->average); =20 cmd =3D virCommandNew(TC); virCommandAddArgList(cmd, "class", "add", "dev", brname, "parent", "1:= 1", @@ -632,8 +632,8 @@ virNetDevBandwidthUnplug(const char *brname, return -1; } =20 - virAsprintf(&class_id, "1:%x", id); - virAsprintf(&qdisc_id, "%x:", id); + class_id =3D g_strdup_printf("1:%x", id); + qdisc_id =3D g_strdup_printf("%x:", id); =20 cmd =3D virCommandNew(TC); virCommandAddArgList(cmd, "qdisc", "del", "dev", brname, @@ -691,11 +691,11 @@ virNetDevBandwidthUpdateRate(const char *ifname, char *rate =3D NULL; char *ceil =3D NULL; =20 - virAsprintf(&class_id, "1:%x", id); - virAsprintf(&rate, "%llukbps", new_rate); - virAsprintf(&ceil, "%llukbps", bandwidth->in->peak ? - bandwidth->in->peak : - bandwidth->in->average); + class_id =3D g_strdup_printf("1:%x", id); + rate =3D g_strdup_printf("%llukbps", new_rate); + ceil =3D g_strdup_printf("%llukbps", bandwidth->in->peak ? + bandwidth->in->peak : + bandwidth->in->average); =20 cmd =3D virCommandNew(TC); virCommandAddArgList(cmd, "class", "change", "dev", ifname, @@ -741,7 +741,7 @@ virNetDevBandwidthUpdateFilter(const char *ifname, int ret =3D -1; char *class_id =3D NULL; =20 - virAsprintf(&class_id, "1:%x", id); + class_id =3D g_strdup_printf("1:%x", id); =20 if (virNetDevBandwidthManipulateFilter(ifname, ifmac_ptr, id, class_id, true, true) < 0) diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c index 0a0834be69..2cef3c0a2b 100644 --- a/src/util/virnetdevbridge.c +++ b/src/util/virnetdevbridge.c @@ -122,7 +122,7 @@ static int virNetDevBridgeSet(const char *brname, { g_autofree char *path =3D NULL; =20 - virAsprintf(&path, SYSFS_NET_DIR "%s/bridge/%s", brname, paramname); + path =3D g_strdup_printf(SYSFS_NET_DIR "%s/bridge/%s", brname, paramna= me); =20 if (virFileExists(path)) { char valuestr[INT_BUFSIZE_BOUND(value)]; @@ -164,7 +164,7 @@ static int virNetDevBridgeGet(const char *brname, g_autofree char *path =3D NULL; VIR_AUTOCLOSE fd =3D -1; =20 - virAsprintf(&path, SYSFS_NET_DIR "%s/bridge/%s", brname, paramname); + path =3D g_strdup_printf(SYSFS_NET_DIR "%s/bridge/%s", brname, paramna= me); =20 if (virFileExists(path)) { g_autofree char *valuestr =3D NULL; @@ -221,8 +221,8 @@ virNetDevBridgePortSet(const char *brname, =20 snprintf(valuestr, sizeof(valuestr), "%lu", value); =20 - virAsprintf(&path, SYSFS_NET_DIR "%s/brif/%s/%s", brname, ifname, - paramname); + path =3D g_strdup_printf(SYSFS_NET_DIR "%s/brif/%s/%s", brname, ifname, + paramname); =20 if (!virFileExists(path)) errno =3D EINVAL; @@ -248,8 +248,8 @@ virNetDevBridgePortGet(const char *brname, g_autofree char *path =3D NULL; g_autofree char *valuestr =3D NULL; =20 - virAsprintf(&path, SYSFS_NET_DIR "%s/brif/%s/%s", brname, ifname, - paramname); + path =3D g_strdup_printf(SYSFS_NET_DIR "%s/brif/%s/%s", brname, ifname, + paramname); =20 if (virFileReadAll(path, INT_BUFSIZE_BOUND(unsigned long), &valuestr) = < 0) return -1; diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c index 057e75e5e1..5696bc367e 100644 --- a/src/util/virnetdevip.c +++ b/src/util/virnetdevip.c @@ -487,8 +487,8 @@ virNetDevIPGetAcceptRA(const char *ifname) char *suffix; int accept_ra =3D -1; =20 - virAsprintf(&path, "/proc/sys/net/ipv6/conf/%s/accept_ra", - ifname ? ifname : "all"); + path =3D g_strdup_printf("/proc/sys/net/ipv6/conf/%s/accept_ra", + ifname ? ifname : "all"); =20 if ((virFileReadAll(path, 512, &buf) < 0) || (virStrToLong_i(buf, &suffix, 10, &accept_ra) < 0)) diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index 11fcb96400..cb901d7136 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -294,7 +294,7 @@ virNetDevMacVLanIsMacvtap(const char *ifname) if (virNetDevGetIndex(ifname, &ifindex) < 0) return false; =20 - virAsprintf(&tapname, "/dev/tap%d", ifindex); + tapname =3D g_strdup_printf("/dev/tap%d", ifindex); =20 return virFileExists(tapname); } @@ -392,7 +392,7 @@ virNetDevMacVLanTapOpen(const char *ifname, if (virNetDevGetIndex(ifname, &ifindex) < 0) return -1; =20 - virAsprintf(&tapname, "/dev/tap%d", ifindex); + tapname =3D g_strdup_printf("/dev/tap%d", ifindex); =20 for (i =3D 0; i < tapfdSize; i++) { int fd =3D -1; diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitc= h.c index 9862e550b7..a864b34799 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -151,13 +151,13 @@ int virNetDevOpenvswitchAddPort(const char *brname, c= onst char *ifname, virUUIDFormat(ovsport->interfaceID, ifuuidstr); virUUIDFormat(vmuuid, vmuuidstr); =20 - virAsprintf(&attachedmac_ex_id, "external-ids:attached-mac=3D\"%s\"", - macaddrstr); - virAsprintf(&ifaceid_ex_id, "external-ids:iface-id=3D\"%s\"", ifuuidst= r); - virAsprintf(&vmid_ex_id, "external-ids:vm-id=3D\"%s\"", vmuuidstr); + attachedmac_ex_id =3D g_strdup_printf("external-ids:attached-mac=3D\"%= s\"", + macaddrstr); + ifaceid_ex_id =3D g_strdup_printf("external-ids:iface-id=3D\"%s\"", if= uuidstr); + vmid_ex_id =3D g_strdup_printf("external-ids:vm-id=3D\"%s\"", vmuuidst= r); if (ovsport->profileID[0] !=3D '\0') { - virAsprintf(&profile_ex_id, "external-ids:port-profile=3D\"%s\"", - ovsport->profileID); + profile_ex_id =3D g_strdup_printf("external-ids:port-profile=3D\"%= s\"", + ovsport->profileID); } =20 cmd =3D virCommandNew(OVSVSCTL); diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index 23f2882bc3..aea4c91a6a 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -395,7 +395,7 @@ int virNetDevTapCreate(char **ifname, for (i =3D 0; i <=3D IF_MAXUNIT; i++) { g_autofree char *newname =3D NULL; =20 - virAsprintf(&newname, *ifname, i); + newname =3D g_strdup_printf(*ifname, i); =20 if (virNetDevExists(newname) =3D=3D 0) { newifname =3D g_steal_pointer(&newname); @@ -415,7 +415,7 @@ int virNetDevTapCreate(char **ifname, =20 if (tapfd) { g_autofree char *dev_path =3D NULL; - virAsprintf(&dev_path, "/dev/%s", ifr.ifr_name); + dev_path =3D g_strdup_printf("/dev/%s", ifr.ifr_name); =20 if ((*tapfd =3D open(dev_path, O_RDWR)) < 0) { virReportSystemError(errno, diff --git a/src/util/virnetdevveth.c b/src/util/virnetdevveth.c index 5e5074dd68..387017f2a8 100644 --- a/src/util/virnetdevveth.c +++ b/src/util/virnetdevveth.c @@ -44,7 +44,7 @@ static int virNetDevVethExists(int devNum) int ret; g_autofree char *path =3D NULL; =20 - virAsprintf(&path, SYSFS_NET_DIR "vnet%d/", devNum); + path =3D g_strdup_printf(SYSFS_NET_DIR "vnet%d/", devNum); ret =3D virFileExists(path) ? 1 : 0; VIR_DEBUG("Checked dev vnet%d usage: %d", devNum, ret); return ret; @@ -127,7 +127,7 @@ int virNetDevVethCreate(char** veth1, char** veth2) if ((veth1num =3D virNetDevVethGetFreeNum(vethNum)) < 0) goto cleanup; =20 - virAsprintf(&veth1auto, "vnet%d", veth1num); + veth1auto =3D g_strdup_printf("vnet%d", veth1num); vethNum =3D veth1num + 1; } if (!*veth2) { @@ -135,7 +135,7 @@ int virNetDevVethCreate(char** veth1, char** veth2) if ((veth2num =3D virNetDevVethGetFreeNum(vethNum)) < 0) goto cleanup; =20 - virAsprintf(&veth2auto, "vnet%d", veth2num); + veth2auto =3D g_strdup_printf("vnet%d", veth2num); vethNum =3D veth2num + 1; } =20 diff --git a/src/util/virnuma.c b/src/util/virnuma.c index e6213df6da..61b9687291 100644 --- a/src/util/virnuma.c +++ b/src/util/virnuma.c @@ -540,15 +540,13 @@ virNumaGetHugePageInfoPath(char **path, { if (node =3D=3D -1) { /* We are aiming at overall system info */ - virAsprintf(path, - HUGEPAGES_SYSTEM_PREFIX HUGEPAGES_PREFIX "%ukB/%s", - page_size, NULLSTR_EMPTY(suffix)); + *path =3D g_strdup_printf(HUGEPAGES_SYSTEM_PREFIX HUGEPAGES_PREFIX= "%ukB/%s", + page_size, NULLSTR_EMPTY(suffix)); } else { /* We are aiming on specific NUMA node */ - virAsprintf(path, - HUGEPAGES_NUMA_PREFIX "node%d/hugepages/" - HUGEPAGES_PREFIX "%ukB/%s", - node, page_size, NULLSTR_EMPTY(suffix)); + *path =3D g_strdup_printf(HUGEPAGES_NUMA_PREFIX "node%d/hugepages/" + HUGEPAGES_PREFIX "%ukB/%s", + node, page_size, NULLSTR_EMPTY(suffix)); } =20 if (!virFileExists(*path)) { @@ -580,9 +578,8 @@ virNumaGetHugePageInfoDir(char **path, int node) *path =3D g_strdup(HUGEPAGES_SYSTEM_PREFIX); return 0; } else { - virAsprintf(path, - HUGEPAGES_NUMA_PREFIX "node%d/hugepages/", - node); + *path =3D g_strdup_printf(HUGEPAGES_NUMA_PREFIX "node%d/hugepages/= ", + node); return 0; } } @@ -929,7 +926,7 @@ virNumaSetPagePoolSize(int node, * all the pages we wanted. So do the second read to check. */ VIR_FREE(nr_buf); - virAsprintf(&nr_buf, "%llu", page_count); + nr_buf =3D g_strdup_printf("%llu", page_count); =20 if (virFileWriteStr(nr_path, nr_buf, 0) < 0) { virReportSystemError(errno, diff --git a/src/util/virpci.c b/src/util/virpci.c index 3ae13469bd..63580f3021 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -213,7 +213,7 @@ virPCIDriverDir(const char *driver) { char *buffer; =20 - virAsprintf(&buffer, PCI_SYSFS "drivers/%s", driver); + buffer =3D g_strdup_printf(PCI_SYSFS "drivers/%s", driver); return buffer; } =20 @@ -223,7 +223,7 @@ virPCIFile(const char *device, const char *file) { char *buffer; =20 - virAsprintf(&buffer, PCI_SYSFS "devices/%s/%s", device, file); + buffer =3D g_strdup_printf(PCI_SYSFS "devices/%s/%s", device, file); return buffer; } =20 @@ -604,7 +604,7 @@ virPCIDeviceDetectFunctionLevelReset(virPCIDevicePtr de= v, int cfgfd) * device is a VF, we just assume FLR works */ =20 - virAsprintf(&path, PCI_SYSFS "devices/%s/physfn", dev->name); + path =3D g_strdup_printf(PCI_SYSFS "devices/%s/physfn", dev->name); =20 found =3D virFileExists(path); if (found) { @@ -1353,12 +1353,12 @@ virPCIDeviceAddressAsString(const virPCIDeviceAddre= ss *addr) { char *str; =20 - virAsprintf(&str, - VIR_PCI_DEVICE_ADDRESS_FMT, - addr->domain, - addr->bus, - addr->slot, - addr->function); + str =3D g_strdup_printf( + VIR_PCI_DEVICE_ADDRESS_FMT, + addr->domain, + addr->bus, + addr->slot, + addr->function); return str; } =20 @@ -1380,10 +1380,10 @@ virPCIDeviceNew(unsigned int domain, dev->address.slot =3D slot; dev->address.function =3D function; =20 - virAsprintf(&dev->name, VIR_PCI_DEVICE_ADDRESS_FMT, domain, bus, slot, - function); + dev->name =3D g_strdup_printf(VIR_PCI_DEVICE_ADDRESS_FMT, domain, bus,= slot, + function); =20 - virAsprintf(&dev->path, PCI_SYSFS "devices/%s/config", dev->name); + dev->path =3D g_strdup_printf(PCI_SYSFS "devices/%s/config", dev->name= ); =20 if (!virFileExists(dev->path)) { virReportSystemError(errno, @@ -1728,9 +1728,9 @@ int virPCIDeviceFileIterate(virPCIDevicePtr dev, struct dirent *ent; int direrr; =20 - virAsprintf(&pcidir, "/sys/bus/pci/devices/" VIR_PCI_DEVICE_ADDRESS_FM= T, - dev->address.domain, dev->address.bus, dev->address.slot, - dev->address.function); + pcidir =3D g_strdup_printf("/sys/bus/pci/devices/" VIR_PCI_DEVICE_ADDR= ESS_FMT, + dev->address.domain, dev->address.bus, dev->a= ddress.slot, + dev->address.function); =20 if (virDirOpen(&dir, pcidir) < 0) goto cleanup; @@ -1747,7 +1747,7 @@ int virPCIDeviceFileIterate(virPCIDevicePtr dev, STREQ(ent->d_name, "vendor") || STREQ(ent->d_name, "device") || STREQ(ent->d_name, "reset")) { - virAsprintf(&file, "%s/%s", pcidir, ent->d_name); + file =3D g_strdup_printf("%s/%s", pcidir, ent->d_name); if ((actor)(dev, file, opaque) < 0) goto cleanup; } @@ -1779,9 +1779,9 @@ virPCIDeviceAddressIOMMUGroupIterate(virPCIDeviceAddr= essPtr orig, struct dirent *ent; int direrr; =20 - virAsprintf(&groupPath, - PCI_SYSFS "devices/" VIR_PCI_DEVICE_ADDRESS_FMT "/iommu_gr= oup/devices", - orig->domain, orig->bus, orig->slot, orig->function); + groupPath =3D g_strdup_printf( + PCI_SYSFS "devices/" VIR_PCI_DEVICE_ADDRES= S_FMT "/iommu_group/devices", + orig->domain, orig->bus, orig->slot, orig-= >function); =20 if (virDirOpenQuiet(&groupDir, groupPath) < 0) { /* just process the original device, nothing more */ @@ -1928,8 +1928,8 @@ virPCIDeviceAddressGetIOMMUGroupNum(virPCIDeviceAddre= ssPtr addr) const char *groupNumStr; unsigned int groupNum; =20 - virAsprintf(&devName, VIR_PCI_DEVICE_ADDRESS_FMT, addr->domain, addr->= bus, - addr->slot, addr->function); + devName =3D g_strdup_printf(VIR_PCI_DEVICE_ADDRESS_FMT, addr->domain, = addr->bus, + addr->slot, addr->function); =20 if (!(devPath =3D virPCIFile(devName, "iommu_group"))) return -1; @@ -1979,7 +1979,7 @@ virPCIDeviceGetIOMMUGroupDev(virPCIDevicePtr dev) dev->name, devPath); return NULL; } - virAsprintf(&groupDev, "/dev/vfio/%s", last_component(groupPath)); + groupDev =3D g_strdup_printf("/dev/vfio/%s", last_component(groupPath)= ); =20 return groupDev; } @@ -2278,7 +2278,7 @@ virPCIGetVirtualFunctions(const char *sysfs_path, *num_virtual_functions =3D 0; *max_virtual_functions =3D 0; =20 - virAsprintf(&totalvfs_file, "%s/sriov_totalvfs", sysfs_path); + totalvfs_file =3D g_strdup_printf("%s/sriov_totalvfs", sysfs_path); if (virFileExists(totalvfs_file)) { char *end =3D NULL; /* so that terminating \n doesn't create error= */ =20 @@ -2295,8 +2295,8 @@ virPCIGetVirtualFunctions(const char *sysfs_path, do { g_autofree char *device_link =3D NULL; /* look for virtfn%d links until one isn't found */ - virAsprintf(&device_link, "%s/virtfn%zu", sysfs_path, - *num_virtual_functions); + device_link =3D g_strdup_printf("%s/virtfn%zu", sysfs_path, + *num_virtual_functions); =20 if (!virFileExists(device_link)) break; @@ -2337,7 +2337,7 @@ virPCIIsVirtualFunction(const char *vf_sysfs_device_l= ink) { g_autofree char *vf_sysfs_physfn_link =3D NULL; =20 - virAsprintf(&vf_sysfs_physfn_link, "%s/physfn", vf_sysfs_device_link); + vf_sysfs_physfn_link =3D g_strdup_printf("%s/physfn", vf_sysfs_device_= link); =20 return virFileExists(vf_sysfs_physfn_link); } @@ -2395,8 +2395,8 @@ virPCIGetVirtualFunctionIndex(const char *pf_sysfs_de= vice_link, int virPCIGetSysfsFile(char *virPCIDeviceName, char **pci_sysfs_device_link) { - virAsprintf(pci_sysfs_device_link, PCI_SYSFS "devices/%s", - virPCIDeviceName); + *pci_sysfs_device_link =3D g_strdup_printf(PCI_SYSFS "devices/%s", + virPCIDeviceName); return 0; } =20 @@ -2404,9 +2404,8 @@ int virPCIDeviceAddressGetSysfsFile(virPCIDeviceAddressPtr addr, char **pci_sysfs_device_link) { - virAsprintf(pci_sysfs_device_link, - PCI_SYSFS "devices/" VIR_PCI_DEVICE_ADDRESS_FMT, addr->dom= ain, - addr->bus, addr->slot, addr->function); + *pci_sysfs_device_link =3D g_strdup_printf(PCI_SYSFS "devices/" VIR_PC= I_DEVICE_ADDRESS_FMT, addr->domain, + addr->bus, addr->slot, addr->= function); return 0; } =20 @@ -2591,7 +2590,7 @@ virPCIGetMdevTypes(const char *sysfspath, size_t ntypes =3D 0; size_t i; =20 - virAsprintf(&types_path, "%s/mdev_supported_types", sysfspath); + types_path =3D g_strdup_printf("%s/mdev_supported_types", sysfspath); =20 if ((dirret =3D virDirOpenIfExists(&dir, types_path)) < 0) goto cleanup; @@ -2604,7 +2603,7 @@ virPCIGetMdevTypes(const char *sysfspath, while ((dirret =3D virDirRead(dir, &entry, types_path)) > 0) { g_autofree char *tmppath =3D NULL; /* append the type id to the path and read the attributes from the= re */ - virAsprintf(&tmppath, "%s/%s", types_path, entry->d_name); + tmppath =3D g_strdup_printf("%s/%s", types_path, entry->d_name); =20 if (virMediatedDeviceTypeReadAttrs(tmppath, &mdev_type) < 0) goto cleanup; diff --git a/src/util/virpidfile.c b/src/util/virpidfile.c index 2faa6215e4..59f540c7e6 100644 --- a/src/util/virpidfile.c +++ b/src/util/virpidfile.c @@ -233,7 +233,7 @@ int virPidFileReadPathIfAlive(const char *path, goto cleanup; } =20 - virAsprintf(&procPath, "/proc/%lld/exe", (long long)retPid); + procPath =3D g_strdup_printf("/proc/%lld/exe", (long long)retPid); =20 if ((ret =3D virFileIsLink(procPath)) < 0) return ret; @@ -494,7 +494,7 @@ virPidFileConstructPath(bool privileged, "%s", _("No runstatedir specified")); return -1; } - virAsprintf(pidfile, "%s/%s.pid", runstatedir, progname); + *pidfile =3D g_strdup_printf("%s/%s.pid", runstatedir, progname); } else { if (!(rundir =3D virGetUserRuntimeDirectory())) return -1; @@ -506,7 +506,7 @@ virPidFileConstructPath(bool privileged, return -1; } =20 - virAsprintf(pidfile, "%s/%s.pid", rundir, progname); + *pidfile =3D g_strdup_printf("%s/%s.pid", rundir, progname); } =20 return 0; diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 107a0fb9c9..11928cb4b3 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -129,13 +129,13 @@ virProcessTranslateStatus(int status) { char *buf; if (WIFEXITED(status)) { - virAsprintf(&buf, _("exit status %d"), - WEXITSTATUS(status)); + buf =3D g_strdup_printf(_("exit status %d"), + WEXITSTATUS(status)); } else if (WIFSIGNALED(status)) { - virAsprintf(&buf, _("fatal signal %d"), - WTERMSIG(status)); + buf =3D g_strdup_printf(_("fatal signal %d"), + WTERMSIG(status)); } else { - virAsprintf(&buf, _("invalid value %d"), status); + buf =3D g_strdup_printf(_("invalid value %d"), status); } return buf; } @@ -586,7 +586,7 @@ int virProcessGetPids(pid_t pid, size_t *npids, pid_t *= *pids) *npids =3D 0; *pids =3D NULL; =20 - virAsprintf(&taskPath, "/proc/%llu/task", (long long)pid); + taskPath =3D g_strdup_printf("/proc/%llu/task", (long long)pid); =20 if (virDirOpen(&dir, taskPath) < 0) goto cleanup; @@ -631,7 +631,7 @@ int virProcessGetNamespaces(pid_t pid, int fd; g_autofree char *nsfile =3D NULL; =20 - virAsprintf(&nsfile, "/proc/%llu/ns/%s", (long long)pid, ns[i]); + nsfile =3D g_strdup_printf("/proc/%llu/ns/%s", (long long)pid, ns[= i]); =20 if ((fd =3D open(nsfile, O_RDONLY)) >=3D 0) { if (VIR_EXPAND_N(*fdlist, *nfdlist, 1) < 0) { @@ -950,7 +950,7 @@ int virProcessGetStartTime(pid_t pid, g_autofree char *buf =3D NULL; VIR_AUTOSTRINGLIST tokens =3D NULL; =20 - virAsprintf(&filename, "/proc/%llu/stat", (long long)pid); + filename =3D g_strdup_printf("/proc/%llu/stat", (long long)pid); =20 if ((len =3D virFileReadAll(filename, 1024, &buf)) < 0) return -1; @@ -1049,7 +1049,7 @@ static int virProcessNamespaceHelper(pid_t pid G_GNUC= _UNUSED, int ret =3D -1; g_autofree char *path =3D NULL; =20 - virAsprintf(&path, "/proc/%lld/ns/mnt", (long long)data->pid); + path =3D g_strdup_printf("/proc/%lld/ns/mnt", (long long)data->pid); =20 if ((fd =3D open(path, O_RDONLY)) < 0) { virReportSystemError(errno, "%s", diff --git a/src/util/virqemu.c b/src/util/virqemu.c index 1eee238771..0220d9eda3 100644 --- a/src/util/virqemu.c +++ b/src/util/virqemu.c @@ -89,7 +89,7 @@ virQEMUBuildCommandLineJSONArrayNumbered(const char *key, member =3D virJSONValueArrayGet((virJSONValuePtr) array, i); g_autofree char *prefix =3D NULL; =20 - virAsprintf(&prefix, "%s.%zu", key, i); + prefix =3D g_strdup_printf("%s.%zu", key, i); =20 if (virQEMUBuildCommandLineJSONRecurse(prefix, member, buf, virQEMUBuildCommandLineJSON= ArrayNumbered, @@ -112,7 +112,7 @@ virQEMUBuildCommandLineJSONIterate(const char *key, if (data->prefix) { g_autofree char *tmpkey =3D NULL; =20 - virAsprintf(&tmpkey, "%s.%s", data->prefix, key); + tmpkey =3D g_strdup_printf("%s.%s", data->prefix, key); =20 return virQEMUBuildCommandLineJSONRecurse(tmpkey, value, data->buf, data->arrayFunc, false); diff --git a/src/util/virrandom.c b/src/util/virrandom.c index 12ea9bbbdc..39ac36a76e 100644 --- a/src/util/virrandom.c +++ b/src/util/virrandom.c @@ -194,7 +194,7 @@ virRandomGenerateWWN(char **wwn, return -1; } =20 - virAsprintf(wwn, "5" "%s%09llx", oui, - (unsigned long long)virRandomBits(36)); + *wwn =3D g_strdup_printf("5" "%s%09llx", oui, + (unsigned long long)virRandomBits(36)); return 0; } diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c index 55c15d04a4..903af52786 100644 --- a/src/util/virresctrl.c +++ b/src/util/virresctrl.c @@ -2319,7 +2319,7 @@ virResctrlDeterminePath(const char *parentpath, return NULL; } =20 - virAsprintf(&path, "%s/%s-%s", parentpath, prefix, id); + path =3D g_strdup_printf("%s/%s-%s", parentpath, prefix, id); =20 return path; } @@ -2415,7 +2415,7 @@ virResctrlAllocCreate(virResctrlInfoPtr resctrl, if (!alloc_str) goto cleanup; =20 - virAsprintf(&schemata_path, "%s/schemata", alloc->path); + schemata_path =3D g_strdup_printf("%s/schemata", alloc->path); =20 VIR_DEBUG("Writing resctrl schemata '%s' into '%s'", alloc_str, schema= ta_path); if (virFileWriteStr(schemata_path, alloc_str, 0) < 0) { @@ -2449,9 +2449,9 @@ virResctrlAddPID(const char *path, return -1; } =20 - virAsprintf(&tasks, "%s/tasks", path); + tasks =3D g_strdup_printf("%s/tasks", path); =20 - virAsprintf(&pidstr, "%lld", (long long int)pid); + pidstr =3D g_strdup_printf("%lld", (long long int)pid); =20 if (virFileWriteStr(tasks, pidstr, 0) < 0) { virReportSystemError(errno, @@ -2562,7 +2562,7 @@ virResctrlMonitorDeterminePath(virResctrlMonitorPtr m= onitor, return 0; } =20 - virAsprintf(&parentpath, "%s/mon_groups", monitor->alloc->path); + parentpath =3D g_strdup_printf("%s/mon_groups", monitor->alloc->path); =20 monitor->path =3D virResctrlDeterminePath(parentpath, machinename, monitor->id); @@ -2694,7 +2694,7 @@ virResctrlMonitorGetStats(virResctrlMonitorPtr monito= r, return -1; } =20 - virAsprintf(&datapath, "%s/mon_data", monitor->path); + datapath =3D g_strdup_printf("%s/mon_data", monitor->path); =20 if (virDirOpen(&dirp, datapath) < 0) goto cleanup; @@ -2711,7 +2711,7 @@ virResctrlMonitorGetStats(virResctrlMonitorPtr monito= r, * "mon_L3_01" are two target directories for a two nodes system * with resource utilization data file for each node respectively. */ - virAsprintf(&filepath, "%s/%s", datapath, ent->d_name); + filepath =3D g_strdup_printf("%s/%s", datapath, ent->d_name); =20 if (!virFileIsDir(filepath)) continue; diff --git a/src/util/virrotatingfile.c b/src/util/virrotatingfile.c index 826a3db2c2..b77e30dba7 100644 --- a/src/util/virrotatingfile.c +++ b/src/util/virrotatingfile.c @@ -195,7 +195,7 @@ virRotatingFileWriterDelete(virRotatingFileWriterPtr fi= le) =20 for (i =3D 0; i < file->maxbackup; i++) { char *oldpath; - virAsprintf(&oldpath, "%s.%zu", file->basepath, i); + oldpath =3D g_strdup_printf("%s.%zu", file->basepath, i); =20 if (unlink(oldpath) < 0 && errno !=3D ENOENT) { @@ -307,7 +307,7 @@ virRotatingFileReaderNew(const char *path, =20 for (i =3D 0; i < maxbackup; i++) { char *tmppath; - virAsprintf(&tmppath, "%s.%zu", path, i); + tmppath =3D g_strdup_printf("%s.%zu", path, i); =20 file->entries[file->nentries - (i + 2)] =3D virRotatingFileReaderE= ntryNew(tmppath); VIR_FREE(tmppath); @@ -380,13 +380,13 @@ virRotatingFileWriterRollover(virRotatingFileWriterPt= r file) goto cleanup; } } else { - virAsprintf(&nextpath, "%s.%zu", file->basepath, file->maxbackup -= 1); + nextpath =3D g_strdup_printf("%s.%zu", file->basepath, file->maxba= ckup - 1); =20 for (i =3D file->maxbackup; i > 0; i--) { if (i =3D=3D 1) { thispath =3D g_strdup(file->basepath); } else { - virAsprintf(&thispath, "%s.%zu", file->basepath, i - 2); + thispath =3D g_strdup_printf("%s.%zu", file->basepath, i -= 2); } VIR_DEBUG("Rollover %s -> %s", thispath, nextpath); =20 diff --git a/src/util/virscsi.c b/src/util/virscsi.c index 0f28c617b0..55707a8d34 100644 --- a/src/util/virscsi.c +++ b/src/util/virscsi.c @@ -117,8 +117,8 @@ virSCSIDeviceGetSgName(const char *sysfs_prefix, if (virSCSIDeviceGetAdapterId(adapter, &adapter_id) < 0) return NULL; =20 - virAsprintf(&path, "%s/%d:%u:%u:%llu/scsi_generic", prefix, adapter_id, - bus, target, unit); + path =3D g_strdup_printf("%s/%d:%u:%u:%llu/scsi_generic", prefix, adap= ter_id, + bus, target, unit); =20 if (virDirOpen(&dir, path) < 0) goto cleanup; @@ -154,8 +154,8 @@ virSCSIDeviceGetDevName(const char *sysfs_prefix, if (virSCSIDeviceGetAdapterId(adapter, &adapter_id) < 0) return NULL; =20 - virAsprintf(&path, "%s/%d:%u:%u:%llu/block", prefix, adapter_id, bus, - target, unit); + path =3D g_strdup_printf("%s/%d:%u:%u:%llu/block", prefix, adapter_id,= bus, + target, unit); =20 if (virDirOpen(&dir, path) < 0) goto cleanup; @@ -203,10 +203,10 @@ virSCSIDeviceNew(const char *sysfs_prefix, if (virSCSIDeviceGetAdapterId(adapter, &dev->adapter) < 0) return NULL; =20 - virAsprintf(&dev->name, "%d:%u:%u:%llu", dev->adapter, - dev->bus, dev->target, dev->unit); - virAsprintf(&dev->sg_path, "%s/%s", - sysfs_prefix ? sysfs_prefix : "/dev", sg); + dev->name =3D g_strdup_printf("%d:%u:%u:%llu", dev->adapter, + dev->bus, dev->target, dev->unit); + dev->sg_path =3D g_strdup_printf("%s/%s", + sysfs_prefix ? sysfs_prefix : "/dev", s= g); =20 if (!virFileExists(dev->sg_path)) { virReportSystemError(errno, @@ -215,8 +215,8 @@ virSCSIDeviceNew(const char *sysfs_prefix, return NULL; } =20 - virAsprintf(&vendor_path, "%s/%s/vendor", prefix, dev->name); - virAsprintf(&model_path, "%s/%s/model", prefix, dev->name); + vendor_path =3D g_strdup_printf("%s/%s/vendor", prefix, dev->name); + model_path =3D g_strdup_printf("%s/%s/model", prefix, dev->name); =20 if (virFileReadAll(vendor_path, 1024, &vendor) < 0) return NULL; @@ -227,7 +227,7 @@ virSCSIDeviceNew(const char *sysfs_prefix, virTrimSpaces(vendor, NULL); virTrimSpaces(model, NULL); =20 - virAsprintf(&dev->id, "%s:%s", vendor, model); + dev->id =3D g_strdup_printf("%s:%s", vendor, model); =20 ret =3D g_steal_pointer(&dev); return ret; diff --git a/src/util/virscsihost.c b/src/util/virscsihost.c index 53da460fdf..7d8e5299b8 100644 --- a/src/util/virscsihost.c +++ b/src/util/virscsihost.c @@ -52,8 +52,8 @@ virSCSIHostGetUniqueId(const char *sysfs_prefix, char *buf =3D NULL; int unique_id; =20 - virAsprintf(&sysfs_path, "%s/host%d/unique_id", - sysfs_prefix ? sysfs_prefix : SYSFS_SCSI_HOST_PATH, host); + sysfs_path =3D g_strdup_printf("%s/host%d/unique_id", + sysfs_prefix ? sysfs_prefix : SYSFS_SCSI_= HOST_PATH, host); =20 if (virFileReadAll(sysfs_path, 1024, &buf) < 0) goto cleanup; @@ -116,7 +116,7 @@ virSCSIHostFindByPCI(const char *sysfs_prefix, if (!virFileIsLink(entry->d_name)) continue; =20 - virAsprintf(&host_link, "%s/%s", prefix, entry->d_name); + host_link =3D g_strdup_printf("%s/%s", prefix, entry->d_name); =20 if (virFileResolveLink(host_link, &host_path) < 0) goto cleanup; @@ -129,7 +129,7 @@ virSCSIHostFindByPCI(const char *sysfs_prefix, VIR_FREE(host_link); VIR_FREE(host_path); =20 - virAsprintf(&unique_path, "%s/%s/unique_id", prefix, entry->d_name= ); + unique_path =3D g_strdup_printf("%s/%s/unique_id", prefix, entry->= d_name); =20 if (!virFileExists(unique_path)) { VIR_FREE(unique_path); @@ -235,8 +235,8 @@ virSCSIHostGetNameByParentaddr(unsigned int domain, char *name =3D NULL; char *parentaddr =3D NULL; =20 - virAsprintf(&parentaddr, "%04x:%02x:%02x.%01x", domain, bus, slot, - function); + parentaddr =3D g_strdup_printf("%04x:%02x:%02x.%01x", domain, bus, slo= t, + function); if (!(name =3D virSCSIHostFindByPCI(NULL, parentaddr, unique_id))) { virReportError(VIR_ERR_XML_ERROR, _("Failed to find scsi_host using PCI '%s' " diff --git a/src/util/virscsivhost.c b/src/util/virscsivhost.c index 4687c30f97..d096dca518 100644 --- a/src/util/virscsivhost.c +++ b/src/util/virscsivhost.c @@ -256,7 +256,7 @@ virSCSIVHostDeviceNew(const char *name) =20 dev->name =3D g_strdup(name); =20 - virAsprintf(&dev->path, "%s/%s", SYSFS_VHOST_SCSI_DEVICES, name); + dev->path =3D g_strdup_printf("%s/%s", SYSFS_VHOST_SCSI_DEVICES, name); =20 VIR_DEBUG("%s: initialized", dev->name); =20 diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c index ba1cde05cd..d7b0f12d96 100644 --- a/src/util/virsocketaddr.c +++ b/src/util/virsocketaddr.c @@ -477,8 +477,8 @@ virSocketAddrFormatFull(const virSocketAddr *addr, * nicely for UNIX sockets */ if (addr->data.sa.sa_family =3D=3D AF_UNIX) { if (withService) { - virAsprintf(&addrstr, VIR_LOOPBACK_IPV4_ADDR "%s0", - separator ? separator : ":"); + addrstr =3D g_strdup_printf(VIR_LOOPBACK_IPV4_ADDR "%s0", + separator ? separator : ":"); } else { addrstr =3D g_strdup(VIR_LOOPBACK_IPV4_ADDR); } @@ -503,11 +503,11 @@ virSocketAddrFormatFull(const virSocketAddr *addr, * IPv6 only if no separator is passed to the function */ if (!separator && VIR_SOCKET_ADDR_FAMILY(addr) =3D=3D AF_INET6) - virAsprintf(&ipv6_host, "[%s]", host); + ipv6_host =3D g_strdup_printf("[%s]", host); =20 - virAsprintf(&addrstr, "%s%s%s", - ipv6_host ? ipv6_host : host, - separator ? separator : ":", port); + addrstr =3D g_strdup_printf("%s%s%s", + ipv6_host ? ipv6_host : host, + separator ? separator : ":", port); } else { addrstr =3D g_strdup(host); } diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index f3b388a7bc..64d583b0f7 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1541,7 +1541,7 @@ virStorageFileGetNPIVKey(const char *path, *tmp =3D '\0'; =20 if (*serial !=3D '\0' && *port !=3D '\0') - virAsprintf(key, "%s_PORT%s", serial, port); + *key =3D g_strdup_printf("%s_PORT%s", serial, port); } =20 return 0; @@ -2620,9 +2620,9 @@ virStorageSourceNewFromBackingRelative(virStorageSour= cePtr parent, } =20 if (STRNEQ(dirname, "/")) { - virAsprintf(&def->path, "%s/%s", dirname, rel); + def->path =3D g_strdup_printf("%s/%s", dirname, rel); } else { - virAsprintf(&def->path, "/%s", rel); + def->path =3D g_strdup_printf("/%s", rel); } =20 if (virStorageSourceGetActualType(parent) =3D=3D VIR_STORAGE_TYPE_NETW= ORK) { @@ -3281,7 +3281,7 @@ virStorageSourceParseBackingJSONiSCSI(virStorageSourc= ePtr src, *port =3D '\0'; } =20 - virAsprintf(&src->path, "%s/%s", target, lun); + src->path =3D g_strdup_printf("%s/%s", target, lun); =20 /* Libvirt doesn't handle inline authentication. Make the caller aware= . */ if (virJSONValueObjectGetString(json, "user") || @@ -4193,7 +4193,7 @@ virStorageFileGetRelativeBackingPath(virStorageSource= Ptr top, =20 VIR_FREE(path); =20 - virAsprintf(&path, "%s%s", tmp, next->relPath); + path =3D g_strdup_printf("%s%s", tmp, next->relPath); =20 VIR_FREE(tmp); =20 diff --git a/src/util/virstring.c b/src/util/virstring.c index 91b237f358..ac132ff924 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -713,7 +713,7 @@ virDoubleToStr(char **strp, double number) if (virLocaleSetRaw(&oldlocale) < 0) return -1; =20 - virAsprintf(strp, "%lf", number); + *strp =3D g_strdup_printf("%lf", number); =20 virLocaleRevert(&oldlocale); virLocaleFixupRadix(strp); diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index bb6ee24f4e..a692bfa86d 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -301,7 +301,7 @@ int virSystemdCreateMachine(const char *name, =20 ret =3D -1; =20 - virAsprintf(&creatorname, "libvirt-%s", drivername); + creatorname =3D g_strdup_printf("libvirt-%s", drivername); =20 if (partition) { if (!(slicename =3D virSystemdMakeSliceName(partition))) diff --git a/src/util/virtpm.c b/src/util/virtpm.c index 149a82310d..97013f6a7d 100644 --- a/src/util/virtpm.c +++ b/src/util/virtpm.c @@ -73,8 +73,8 @@ virTPMCreateCancelPath(const char *devpath) =20 dev++; for (i =3D 0; i < G_N_ELEMENTS(prefix); i++) { - virAsprintf(&path, "/sys/class/%s%s/device/cancel", prefix[i], - dev); + path =3D g_strdup_printf("/sys/class/%s%s/device/cancel", prefix[i= ], + dev); =20 if (virFileExists(path)) break; diff --git a/src/util/virtypedparam.c b/src/util/virtypedparam.c index d8c296c138..4ad2ed455f 100644 --- a/src/util/virtypedparam.c +++ b/src/util/virtypedparam.c @@ -176,22 +176,22 @@ virTypedParameterToString(virTypedParameterPtr param) =20 switch (param->type) { case VIR_TYPED_PARAM_INT: - virAsprintf(&value, "%d", param->value.i); + value =3D g_strdup_printf("%d", param->value.i); break; case VIR_TYPED_PARAM_UINT: - virAsprintf(&value, "%u", param->value.ui); + value =3D g_strdup_printf("%u", param->value.ui); break; case VIR_TYPED_PARAM_LLONG: - virAsprintf(&value, "%lld", param->value.l); + value =3D g_strdup_printf("%lld", param->value.l); break; case VIR_TYPED_PARAM_ULLONG: - virAsprintf(&value, "%llu", param->value.ul); + value =3D g_strdup_printf("%llu", param->value.ul); break; case VIR_TYPED_PARAM_DOUBLE: - virAsprintf(&value, "%g", param->value.d); + value =3D g_strdup_printf("%g", param->value.d); break; case VIR_TYPED_PARAM_BOOLEAN: - virAsprintf(&value, "%d", param->value.b); + value =3D g_strdup_printf("%d", param->value.b); break; case VIR_TYPED_PARAM_STRING: value =3D g_strdup(param->value.s); diff --git a/src/util/viruri.c b/src/util/viruri.c index 241e4ea102..4717feb05e 100644 --- a/src/util/viruri.c +++ b/src/util/viruri.c @@ -234,7 +234,7 @@ virURIFormat(virURIPtr uri) if (xmluri.server !=3D NULL && strchr(xmluri.server, ':') !=3D NULL) { =20 - virAsprintf(&tmpserver, "[%s]", xmluri.server); + tmpserver =3D g_strdup_printf("[%s]", xmluri.server); =20 xmluri.server =3D tmpserver; } diff --git a/src/util/virusb.c b/src/util/virusb.c index 3e97480b1a..7ce582085f 100644 --- a/src/util/virusb.c +++ b/src/util/virusb.c @@ -89,7 +89,7 @@ static int virUSBSysReadFile(const char *f_name, const ch= ar *d_name, g_autofree char *filename =3D NULL; char *ignore =3D NULL; =20 - virAsprintf(&filename, USB_SYSFS "/devices/%s/%s", d_name, f_name); + filename =3D g_strdup_printf(USB_SYSFS "/devices/%s/%s", d_name, f_nam= e); =20 if (virFileReadAll(filename, 1024, &buf) < 0) return -1; @@ -329,11 +329,11 @@ virUSBDeviceNew(unsigned int bus, } =20 if (vroot) { - virAsprintf(&dev->path, "%s/%03d/%03d", - vroot, dev->bus, dev->dev); + dev->path =3D g_strdup_printf("%s/%03d/%03d", + vroot, dev->bus, dev->dev); } else { - virAsprintf(&dev->path, USB_DEVFS "%03d/%03d", - dev->bus, dev->dev); + dev->path =3D g_strdup_printf(USB_DEVFS "%03d/%03d", + dev->bus, dev->dev); } =20 /* XXX fixme. this should be product/vendor */ diff --git a/src/util/virutil.c b/src/util/virutil.c index 705fb6bd74..51f8796b40 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -744,11 +744,11 @@ static char *virGetXDGDirectory(const char *xdgenvnam= e, const char *xdgdefdir) char *home =3D NULL; =20 if (path && path[0]) { - virAsprintf(&ret, "%s/libvirt", path); + ret =3D g_strdup_printf("%s/libvirt", path); } else { home =3D virGetUserDirectory(); if (home) - virAsprintf(&ret, "%s/%s/libvirt", home, xdgdefdir); + ret =3D g_strdup_printf("%s/%s/libvirt", home, xdgdefdir); } =20 VIR_FREE(home); @@ -774,7 +774,7 @@ char *virGetUserRuntimeDirectory(void) } else { char *ret; =20 - virAsprintf(&ret, "%s/libvirt", path); + ret =3D g_strdup_printf("%s/libvirt", path); return ret; } } @@ -1587,9 +1587,9 @@ virGetUnprivSGIOSysfsPath(const char *path, return NULL; } =20 - virAsprintf(&sysfs_path, "%s/%d:%d/queue/unpriv_sgio", - sysfs_dir ? sysfs_dir : SYSFS_DEV_BLOCK_PATH, - maj, min); + sysfs_path =3D g_strdup_printf("%s/%d:%d/queue/unpriv_sgio", + sysfs_dir ? sysfs_dir : SYSFS_DEV_BLOCK_P= ATH, + maj, min); return sysfs_path; } =20 @@ -1612,7 +1612,7 @@ virSetDeviceUnprivSGIO(const char *path, goto cleanup; } =20 - virAsprintf(&val, "%d", unpriv_sgio); + val =3D g_strdup_printf("%d", unpriv_sgio); =20 if ((rc =3D virFileWriteStr(sysfs_path, val, 0)) < 0) { virReportSystemError(-rc, _("failed to set %s"), sysfs_path); @@ -1877,7 +1877,7 @@ virHostGetDRMRenderNode(void) goto cleanup; } =20 - virAsprintf(&ret, "%s/%s", driPath, ent->d_name); + ret =3D g_strdup_printf("%s/%s", driPath, ent->d_name); =20 cleanup: VIR_DIR_CLOSE(driDir); diff --git a/src/util/virvhba.c b/src/util/virvhba.c index c78d5e2cd9..df0691a658 100644 --- a/src/util/virvhba.c +++ b/src/util/virvhba.c @@ -52,8 +52,8 @@ virVHBAPathExists(const char *sysfs_prefix, char *sysfs_path =3D NULL; bool ret =3D false; =20 - virAsprintf(&sysfs_path, "%s/host%d", - sysfs_prefix ? sysfs_prefix : SYSFS_FC_HOST_PATH, host); + sysfs_path =3D g_strdup_printf("%s/host%d", + sysfs_prefix ? sysfs_prefix : SYSFS_FC_HO= ST_PATH, host); =20 if (virFileExists(sysfs_path)) ret =3D true; @@ -83,13 +83,13 @@ virVHBAIsVportCapable(const char *sysfs_prefix, char *fc_host_path =3D NULL; bool ret =3D false; =20 - virAsprintf(&fc_host_path, "%s/host%d/%s", - sysfs_prefix ? sysfs_prefix : SYSFS_FC_HOST_PATH, host, - "vport_create"); + fc_host_path =3D g_strdup_printf("%s/host%d/%s", + sysfs_prefix ? sysfs_prefix : SYSFS_FC_= HOST_PATH, host, + "vport_create"); =20 - virAsprintf(&scsi_host_path, "%s/host%d/%s", - sysfs_prefix ? sysfs_prefix : SYSFS_SCSI_HOST_PATH, host, - "vport_create"); + scsi_host_path =3D g_strdup_printf("%s/host%d/%s", + sysfs_prefix ? sysfs_prefix : SYSFS_S= CSI_HOST_PATH, host, + "vport_create"); =20 if (virFileExists(fc_host_path) || virFileExists(scsi_host_path)) ret =3D true; @@ -120,8 +120,8 @@ virVHBAGetConfig(const char *sysfs_prefix, char *buf =3D NULL; char *result =3D NULL; =20 - virAsprintf(&sysfs_path, "%s/host%d/%s", - sysfs_prefix ? sysfs_prefix : SYSFS_FC_HOST_PATH, host, en= try); + sysfs_path =3D g_strdup_printf("%s/host%d/%s", + sysfs_prefix ? sysfs_prefix : SYSFS_FC_HO= ST_PATH, host, entry); =20 if (!virFileExists(sysfs_path)) goto cleanup; @@ -258,13 +258,13 @@ virVHBAManageVport(const int parent_host, goto cleanup; } =20 - virAsprintf(&operation_path, "%s/host%d/%s", SYSFS_FC_HOST_PATH, - parent_host, operation_file); + operation_path =3D g_strdup_printf("%s/host%d/%s", SYSFS_FC_HOST_PATH, + parent_host, operation_file); =20 if (!virFileExists(operation_path)) { VIR_FREE(operation_path); - virAsprintf(&operation_path, "%s/host%d/%s", SYSFS_SCSI_HOST_PATH, - parent_host, operation_file); + operation_path =3D g_strdup_printf("%s/host%d/%s", SYSFS_SCSI_HOST= _PATH, + parent_host, operation_file); =20 if (!virFileExists(operation_path)) { virReportError(VIR_ERR_OPERATION_INVALID, @@ -281,7 +281,7 @@ virVHBAManageVport(const int parent_host, * in calling either the Add or Remove device functions. This translat= es * into either adding or removing a node device object and a node devi= ce * lifecycle event for applications to consume. */ - virAsprintf(&vport_name, "%s:%s", wwpn, wwnn); + vport_name =3D g_strdup_printf("%s:%s", wwpn, wwnn); =20 if (virFileWriteStr(operation_path, vport_name, 0) =3D=3D 0) ret =3D 0; @@ -321,7 +321,7 @@ vhbaReadCompareWWN(const char *prefix, char *p; int ret =3D -1; =20 - virAsprintf(&path, "%s/%s/%s", prefix, d_name, f_name); + path =3D g_strdup_printf("%s/%s/%s", prefix, d_name, f_name); =20 if (!virFileExists(path)) { ret =3D 0; @@ -425,8 +425,8 @@ virVHBAGetHostByFabricWWN(const char *sysfs_prefix, =20 /* Existing vHBA's will have the same fabric_name, but won't * have the vport_create file - so we check for both */ - virAsprintf(&vport_create_path, "%s/%s/vport_create", prefix, - entry->d_name); + vport_create_path =3D g_strdup_printf("%s/%s/vport_create", prefix, + entry->d_name); =20 if (!virFileExists(vport_create_path)) continue; --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752925; cv=none; d=zoho.com; s=zohoarc; b=NYqPdSn3SfV+WUfp+OWkDypepqRq7Yuoti253gw2GTs4b3sPu0po9B8XX7YnuV+/Q5OfNK0GAxHTZSBEK+WMPnKamaov6TREVJOqxXrt3R7PdecaAjCZnavJogtmTZ87S1OdCQXMa9FhXD2iMQA/77ALohdqVslGFHVRadUx9Wk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752925; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=op0UjjNzYog/YOls+nciD7fCBnO+WkGmBBsH5Tc5yNM=; b=TXv9zbjInNzvXVzEMnAnIvTKIY1wnupsnRpQmktKiF4im3M/uJomZORss0cmTWrNRG5zoUuAgB/Nes3v5Mh1/2G0PiFN1gGFdnc/Na6cofYhXb+u4p2VmOs8kZQmFBWrkD/9nKCTteCrTpI93LNkAGp72l2+Nis4eRuGbI6iA4U= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1571752925297541.834256496457; Tue, 22 Oct 2019 07:02:05 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-139-4KknoX7TMRiBw_-lz0tYZw-1; Tue, 22 Oct 2019 10:01:28 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 805931005531; Tue, 22 Oct 2019 14:01:23 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 422CF1F3; Tue, 22 Oct 2019 14:01:23 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id CD417180BA9C; Tue, 22 Oct 2019 14:01:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9ME0u9I002854 for ; Tue, 22 Oct 2019 10:00:56 -0400 Received: by smtp.corp.redhat.com (Postfix) id BA5146012C; Tue, 22 Oct 2019 14:00:56 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 428D16012D for ; Tue, 22 Oct 2019 14:00:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752923; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=op0UjjNzYog/YOls+nciD7fCBnO+WkGmBBsH5Tc5yNM=; b=VruDu/i5WZfrIKCMOus85Dlas8MyKDSSpyAAXizJ+/Yiq0/hw712Un+VRcgHzMvxZt2Pl/ t3uUAZSIEC75sMF/I1f77hpIY3/ZmsoDhjdVly4FnXB6SNo8mOLkmfzd00WFAkxrhwfN5+ WD6a/kuPmnt2V5RGv5PD0pdxDEFyeqU= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:58:05 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 61/75] vbox: Use g_strdup_printf() instead of virAsprintf() X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: 4KknoX7TMRiBw_-lz0tYZw-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Michal Privoznik --- src/vbox/vbox_MSCOMGlue.c | 4 ++-- src/vbox/vbox_XPCOMCGlue.c | 2 +- src/vbox/vbox_common.c | 30 +++++++++++++++--------------- src/vbox/vbox_network.c | 10 +++++----- src/vbox/vbox_snapshot_conf.c | 12 ++++++------ src/vbox/vbox_storage.c | 2 +- src/vbox/vbox_tmpl.c | 2 +- 7 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/vbox/vbox_MSCOMGlue.c b/src/vbox/vbox_MSCOMGlue.c index db000385bc..18a291a0d8 100644 --- a/src/vbox/vbox_MSCOMGlue.c +++ b/src/vbox/vbox_MSCOMGlue.c @@ -525,8 +525,8 @@ vboxComInitialize_v2(const char *pszVirtualBoxIID, IVir= tualBox **ppVirtualBox, =20 CoInitialize(NULL); =20 - if (virAsprintf(&mbsVirtualBoxIID, "{%s}", pszVirtualBoxIID) < 0 || - virAsprintf(&mbsSessionIID, "{%s}", pszSessionIID) < 0) + mbsVirtualBoxIID =3D g_strdup_printf("{%s}", pszVirtualBoxIID); + mbsSessionIID =3D g_strdup_printf("{%s}", pszSessionIID) goto cleanup; =20 if (vboxUtf8ToUtf16(mbsVirtualBoxIID, &wcsVirtualBoxIID) < 0 || diff --git a/src/vbox/vbox_XPCOMCGlue.c b/src/vbox/vbox_XPCOMCGlue.c index 09768d5d38..f48a78a923 100644 --- a/src/vbox/vbox_XPCOMCGlue.c +++ b/src/vbox/vbox_XPCOMCGlue.c @@ -85,7 +85,7 @@ tryLoadOne(const char *dir, bool setAppHome, bool ignoreM= issing, PFNVBOXGETXPCOMCFUNCTIONS pfnGetFunctions; =20 if (dir !=3D NULL) { - virAsprintf(&name, "%s/%s", dir, DYNLIB_NAME); + name =3D g_strdup_printf("%s/%s", dir, DYNLIB_NAME); =20 if (!virFileExists(name)) { if (!ignoreMissing) diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 6ffa43addc..05656bffb2 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -1770,7 +1770,7 @@ vboxAttachUSB(virDomainDefPtr def, vboxDriverPtr data= , IMachine *machine) /* Zero pad for nice alignment when fewer than 9999 * devices. */ - virAsprintf(&filtername, "filter%04zu", i); + filtername =3D g_strdup_printf("filter%04zu", i); VBOX_UTF8_TO_UTF16(filtername, &filternameUtf16); VIR_FREE(filtername); gVBoxAPI.UIUSBCommon.CreateDeviceFilter(USBCommon, @@ -2126,7 +2126,7 @@ vboxStartMachine(virDomainPtr dom, int maxDomID, IMac= hine *machine, vboxIID *iid if (guiPresent) { if (guiDisplay) { char *displayutf8; - virAsprintf(&displayutf8, "DISPLAY=3D%s", guiDisplay); + displayutf8 =3D g_strdup_printf("DISPLAY=3D%s", guiDisplay); VBOX_UTF8_TO_UTF16(displayutf8, &env); VIR_FREE(displayutf8); VIR_FREE(guiDisplay); @@ -2138,7 +2138,7 @@ vboxStartMachine(virDomainPtr dom, int maxDomID, IMac= hine *machine, vboxIID *iid if (sdlPresent) { if (sdlDisplay) { char *displayutf8; - virAsprintf(&displayutf8, "DISPLAY=3D%s", sdlDisplay); + displayutf8 =3D g_strdup_printf("DISPLAY=3D%s", sdlDisplay); VBOX_UTF8_TO_UTF16(displayutf8, &env); VIR_FREE(displayutf8); VIR_FREE(sdlDisplay); @@ -4616,7 +4616,7 @@ vboxSnapshotRedefine(virDomainPtr dom, } VBOX_UTF16_TO_UTF8(machineNameUtf16, &machineName); =20 - virAsprintf(&nameTmpUse, "%s.vbox", machineName); + nameTmpUse =3D g_strdup_printf("%s.vbox", machineName); machineLocationPath =3D virStringReplace(settingsFilePath_Utf8, nameTm= pUse, ""); if (machineLocationPath =3D=3D NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -4632,8 +4632,8 @@ vboxSnapshotRedefine(virDomainPtr dom, goto cleanup; } if (snapshotMachineDesc->currentSnapshot !=3D NULL) { - virAsprintf(¤tSnapshotXmlFilePath, "%s%s.xml", - machineLocationPath, snapshotMachineDesc->currentSnaps= hot); + currentSnapshotXmlFilePath =3D g_strdup_printf("%s%s.xml", + machineLocationPath, = snapshotMachineDesc->currentSnapshot); snapshotFileExists =3D virFileExists(currentSnapshotXmlFilePath); } =20 @@ -5201,8 +5201,8 @@ vboxSnapshotRedefine(virDomainPtr dom, vboxIIDUnalloc(&parentiid); VBOX_UTF8_TO_UTF16("VDI", &formatUtf16); =20 - virAsprintf(&newLocationUtf8, "%sfakedisk-%d.vdi", - machineLocationPath, it); + newLocationUtf8 =3D g_strdup_printf("%sfakedisk-%d.vdi", + machineLocationPath, it); VBOX_UTF8_TO_UTF16(newLocationUtf8, &newLocation); rc =3D gVBoxAPI.UIVirtualBox.CreateHardDisk(data->vboxObj, formatUtf16, @@ -5300,8 +5300,8 @@ vboxSnapshotRedefine(virDomainPtr dom, * next define. This file is saved as "'machineLocation'/snapshot-= 'uuid'.xml" */ VIR_FREE(currentSnapshotXmlFilePath); - virAsprintf(¤tSnapshotXmlFilePath, "%s%s.xml", - machineLocationPath, snapshotMachineDesc->currentSnaps= hot); + currentSnapshotXmlFilePath =3D g_strdup_printf("%s%s.xml", + machineLocationPath, = snapshotMachineDesc->currentSnapshot); char *snapshotContent =3D virDomainSnapshotDefFormat(NULL, def, data->caps, data->xmlopt, @@ -6888,7 +6888,7 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapsho= tPtr snapshot) goto cleanup; } VBOX_UTF16_TO_UTF8(machineNameUtf16, &machineName); - virAsprintf(&nameTmpUse, "%s.vbox", machineName); + nameTmpUse =3D g_strdup_printf("%s.vbox", machineName); machineLocationPath =3D virStringReplace(settingsFilepath, nameTmpUse,= ""); if (machineLocationPath =3D=3D NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -6972,8 +6972,8 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapsho= tPtr snapshot) VBOX_UTF16_FREE(locationUtf16); VBOX_UTF8_TO_UTF16("VDI", &formatUtf16); =20 - virAsprintf(&newLocationUtf8, "%sfakedisk-%s-%d.vdi", - machineLocationPath, def->parent.parent_name, = it); + newLocationUtf8 =3D g_strdup_printf("%sfakedisk-%s-%d.vdi", + machineLocationPath, def= ->parent.parent_name, it); VBOX_UTF8_TO_UTF16(newLocationUtf8, &newLocation); rc =3D gVBoxAPI.UIVirtualBox.CreateHardDisk(data->vboxObj, formatUtf16, @@ -7377,13 +7377,13 @@ vboxDomainScreenshot(virDomainPtr dom, } =20 if (privileged) { - virAsprintf(&cacheDir, "%s/cache/libvirt", LOCALSTATEDIR); + cacheDir =3D g_strdup_printf("%s/cache/libvirt", LOCALSTATEDIR); } else if (!(cacheDir =3D virGetUserCacheDirectory())) { VBOX_RELEASE(machine); return NULL; } =20 - virAsprintf(&tmp, "%s/vbox.screendump.XXXXXX", cacheDir); + tmp =3D g_strdup_printf("%s/vbox.screendump.XXXXXX", cacheDir); =20 if ((tmp_fd =3D mkostemp(tmp, O_CLOEXEC)) =3D=3D -1) { virReportSystemError(errno, _("mkostemp(\"%s\") failed"), tmp); diff --git a/src/vbox/vbox_network.c b/src/vbox/vbox_network.c index a942587bcb..19b4d23ed8 100644 --- a/src/vbox/vbox_network.c +++ b/src/vbox/vbox_network.c @@ -432,8 +432,8 @@ vboxNetworkDefineCreateXML(virConnectPtr conn, const ch= ar *xml, bool start) =20 VBOX_UTF16_TO_UTF8(networkInterfaceNameUtf16, &networkInterfaceNameUtf= 8); =20 - virAsprintf(&networkNameUtf8, "HostInterfaceNetworking-%s", - networkInterfaceNameUtf8); + networkNameUtf8 =3D g_strdup_printf("HostInterfaceNetworking-%s", + networkInterfaceNameUtf8); =20 VBOX_UTF8_TO_UTF16(networkNameUtf8, &networkNameUtf16); =20 @@ -588,7 +588,7 @@ vboxNetworkUndefineDestroy(virNetworkPtr network, bool = removeinterface) * show up in the net-list in virsh */ =20 - virAsprintf(&networkNameUtf8, "HostInterfaceNetworking-%s", network->n= ame); + networkNameUtf8 =3D g_strdup_printf("HostInterfaceNetworking-%s", netw= ork->name); =20 VBOX_UTF8_TO_UTF16(network->name, &networkInterfaceNameUtf16); =20 @@ -692,7 +692,7 @@ static int vboxNetworkCreate(virNetworkPtr network) * server by giving the machine static IP */ =20 - virAsprintf(&networkNameUtf8, "HostInterfaceNetworking-%s", network->n= ame); + networkNameUtf8 =3D g_strdup_printf("HostInterfaceNetworking-%s", netw= ork->name); =20 VBOX_UTF8_TO_UTF16(network->name, &networkInterfaceNameUtf16); =20 @@ -789,7 +789,7 @@ static char *vboxNetworkGetXMLDesc(virNetworkPtr networ= k, unsigned int flags) def->ips =3D ipdef; def->nips =3D 1; =20 - virAsprintf(&networkNameUtf8, "HostInterfaceNetworking-%s", network->n= ame); + networkNameUtf8 =3D g_strdup_printf("HostInterfaceNetworking-%s", netw= ork->name); =20 VBOX_UTF8_TO_UTF16(network->name, &networkInterfaceNameUtf16); =20 diff --git a/src/vbox/vbox_snapshot_conf.c b/src/vbox/vbox_snapshot_conf.c index 8c92d8797b..acac037208 100644 --- a/src/vbox/vbox_snapshot_conf.c +++ b/src/vbox/vbox_snapshot_conf.c @@ -84,7 +84,7 @@ virVBoxSnapshotConfCreateVBoxSnapshotConfHardDiskPtr(xmlN= odePtr diskNode, } if (location[0] !=3D '/') { /*The location is a relative path, so we must change it into an ab= solute one. */ - virAsprintf(&tmp, "%s%s", machineLocation, location); + tmp =3D g_strdup_printf("%s%s", machineLocation, location); hardDisk->location =3D g_strdup(tmp); } else { hardDisk->location =3D g_strdup(location); @@ -330,7 +330,7 @@ virVBoxSnapshotConfCreateHardDiskNode(virVBoxSnapshotCo= nfHardDiskPtr hardDisk) size_t i =3D 0; char *uuid =3D NULL; xmlNodePtr ret =3D xmlNewNode(NULL, BAD_CAST "HardDisk"); - virAsprintf(&uuid, "{%s}", hardDisk->uuid); + uuid =3D g_strdup_printf("{%s}", hardDisk->uuid); =20 if (xmlNewProp(ret, BAD_CAST "uuid", BAD_CAST uuid) =3D=3D NULL) goto cleanup; @@ -376,7 +376,7 @@ virVBoxSnapshotConfSerializeSnapshot(xmlNodePtr node, char **secondRegex =3D NULL; int secondRegexResult =3D 0; =20 - virAsprintf(&uuid, "{%s}", snapshot->uuid); + uuid =3D g_strdup_printf("{%s}", snapshot->uuid); =20 if (xmlNewProp(node, BAD_CAST "uuid", BAD_CAST uuid) =3D=3D NULL) goto cleanup; @@ -397,7 +397,7 @@ virVBoxSnapshotConfSerializeSnapshot(xmlNodePtr node, goto cleanup; if (secondRegexResult < 1) goto cleanup; - virAsprintf(&timeStamp, "%sT%sZ", firstRegex[0], secondRegex[0]); + timeStamp =3D g_strdup_printf("%sT%sZ", firstRegex[0], secondRegex[0]); =20 if (xmlNewProp(node, BAD_CAST "timeStamp", BAD_CAST timeStamp) =3D=3D = NULL) goto cleanup; @@ -1069,7 +1069,7 @@ virVBoxSnapshotConfSaveVboxFile(virVBoxSnapshotConfMa= chinePtr machine, } =20 if (machine->currentSnapshot !=3D NULL) { - virAsprintf(¤tSnapshot, "{%s}", machine->currentSnapshot); + currentSnapshot =3D g_strdup_printf("{%s}", machine->currentSnapsh= ot); if (!xmlNewProp(machineNode, BAD_CAST "currentSnapshot", BAD_CAST = currentSnapshot)) { virReportError(VIR_ERR_XML_ERROR, "%s", _("Error in xmlNewProp")); @@ -1106,7 +1106,7 @@ virVBoxSnapshotConfSaveVboxFile(virVBoxSnapshotConfMa= chinePtr machine, if (secondRegexResult < 1) goto cleanup; =20 - virAsprintf(&timeStamp, "%sT%sZ", firstRegex[0], secondRegex[0]); + timeStamp =3D g_strdup_printf("%sT%sZ", firstRegex[0], secondRegex[0]); if (!xmlNewProp(machineNode, BAD_CAST "lastStateChange", BAD_CAST time= Stamp)) { virReportError(VIR_ERR_XML_ERROR, "%s", _("Error in xmlNewProp")); diff --git a/src/vbox/vbox_storage.c b/src/vbox/vbox_storage.c index 8cd1b20628..beb5b9e846 100644 --- a/src/vbox/vbox_storage.c +++ b/src/vbox/vbox_storage.c @@ -449,7 +449,7 @@ vboxStorageVolCreateXML(virStoragePoolPtr pool, =20 /* If target.path isn't given, use default path ~/.VirtualBox/image_na= me */ if (!def->target.path) - virAsprintf(&def->target.path, "%s/.VirtualBox/%s", virGetUserDire= ctory(), def->name); + def->target.path =3D g_strdup_printf("%s/.VirtualBox/%s", virGetUs= erDirectory(), def->name); VBOX_UTF8_TO_UTF16(def->target.path, &hddNameUtf16); =20 if (!hddFormatUtf16 || !hddNameUtf16) diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 88e7deaea0..a5a907768b 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -619,7 +619,7 @@ _virtualboxCreateMachine(vboxDriverPtr data, virDomainD= efPtr def, IMachine **mac =20 VBOX_UTF8_TO_UTF16(def->name, &machineNameUtf16); vboxIIDFromUUID(&iid, def->uuid); - virAsprintf(&createFlags, "UUID=3D%s,forceOverwrite=3D0", uuidstr); + createFlags =3D g_strdup_printf("UUID=3D%s,forceOverwrite=3D0", uuidst= r); VBOX_UTF8_TO_UTF16(createFlags, &createFlagsUtf16); rc =3D data->vboxObj->vtbl->CreateMachine(data->vboxObj, NULL, --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752927; cv=none; d=zoho.com; s=zohoarc; b=GG2YfYXdn8yak9lwKF4fu4J93J/+EIemZnENdiLjWDKohRZGlxuRrZP5akJTr6j26ULDE65BudnREO3Mtdw+jZOunlkp4aIFadlfXJ2PG8nUeBHbEmZ+kpt9OAinGStiXiLnfmuUjOowsRuMcLUxTgVI2eak1bC0bhjZ5pWEVSY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752927; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hk57doCu9HneokowidJ6wuPrcEK/7Swg9BlUctkGRQw=; b=lKqOIyFZTTMKt32uW3sf6YuA9UEukYnGQLGcyC6roLIf+kFTm1dulhZXm8DYr1AMY9xPz8R6nUdJzhKED1Fk76CkWNt718mtymz0OqYd6y4Lp71xDii9s1yqToLn7PWf8F/st5L4XdNqk7aOCKNRdqf8MZXDpZme86mGHk7LsZY= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1571752927273525.0328230129446; Tue, 22 Oct 2019 07:02:07 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-36-UQh1CM5uNl2hCET86Lpi7A-1; Tue, 22 Oct 2019 10:01:50 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A727E107AD3A; Tue, 22 Oct 2019 14:01:44 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 60DEB5D6A5; Tue, 22 Oct 2019 14:01:44 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 009F3180085A; Tue, 22 Oct 2019 14:01:43 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9ME0vJP002867 for ; Tue, 22 Oct 2019 10:00:57 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8A0DD60167; Tue, 22 Oct 2019 14:00:57 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 125966012C for ; Tue, 22 Oct 2019 14:00:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752926; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=hk57doCu9HneokowidJ6wuPrcEK/7Swg9BlUctkGRQw=; b=gYiHQn0owMExdfYGcOpcY9sxU7bKzQtnAvShwxQMjhSylCVZeVjkNL7q7IdAMSBq6xtqha 06jtwsRSL0F4gUl1ZwIrAbyfTYEJbjlsGVQdpbcpJRPBvt9MnlxG4OLas3kko0fpEJjOFr LCCMSlOfHHuRCzd2wUZmqHQYf2MZW9A= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:58:06 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 62/75] vmware: Use g_strdup_printf() instead of virAsprintf() X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: UQh1CM5uNl2hCET86Lpi7A-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Michal Privoznik --- src/vmware/vmware_conf.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c index 1e836ec7ed..ef7696a496 100644 --- a/src/vmware/vmware_conf.c +++ b/src/vmware/vmware_conf.c @@ -275,15 +275,15 @@ vmwareExtractVersion(struct vmware_driver *driver) =20 switch (driver->type) { case VMWARE_DRIVER_PLAYER: - virAsprintf(&bin, "%s/%s", vmwarePath, "vmplayer"); + bin =3D g_strdup_printf("%s/%s", vmwarePath, "vmplayer"); break; =20 case VMWARE_DRIVER_WORKSTATION: - virAsprintf(&bin, "%s/%s", vmwarePath, "vmware"); + bin =3D g_strdup_printf("%s/%s", vmwarePath, "vmware"); break; =20 case VMWARE_DRIVER_FUSION: - virAsprintf(&bin, "%s/%s", vmwarePath, "vmware-vmx"); + bin =3D g_strdup_printf("%s/%s", vmwarePath, "vmware-vmx"); break; =20 default: @@ -366,9 +366,9 @@ void vmwareConstructVmxPath(char *directoryName, char *name, char **vmxPath) { if (directoryName !=3D NULL) - virAsprintf(vmxPath, "%s/%s.vmx", directoryName, name); + *vmxPath =3D g_strdup_printf("%s/%s.vmx", directoryName, name); else - virAsprintf(vmxPath, "%s.vmx", name); + *vmxPath =3D g_strdup_printf("%s.vmx", name); } =20 int @@ -467,7 +467,7 @@ vmwareMoveFile(char *srcFile, char *dstFile) int vmwareMakePath(char *srcDir, char *srcName, char *srcExt, char **outpath) { - virAsprintf(outpath, "%s/%s.%s", srcDir, srcName, srcExt); + *outpath =3D g_strdup_printf("%s/%s.%s", srcDir, srcName, srcExt); return 0; } =20 @@ -484,7 +484,7 @@ vmwareExtractPid(const char * vmxPath) if ((vmxDir =3D mdir_name(vmxPath)) =3D=3D NULL) goto cleanup; =20 - virAsprintf(&logFilePath, "%s/vmware.log", vmxDir); + logFilePath =3D g_strdup_printf("%s/vmware.log", vmxDir); =20 if ((logFile =3D fopen(logFilePath, "r")) =3D=3D NULL) goto cleanup; --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752885; cv=none; d=zoho.com; s=zohoarc; b=RF0MJ9RLl/x4AVLR6Br03lHXXXbGzalIEShuhKtH6MG7k3t2gMoIeBQnXba+pvlhz98ThofASlCJsv/pILW0rj6lcnfgYRTJTN5JOv/iZarO2zquXg5Fl2ALIOBeJlfFybQHKUxREjDPB51caiVGvzXmsePqXtquf58JIK7LpI8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752885; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=nIaCfWFTNDLHm8nONalX3aPY6z038RpXze3PJa+5hfg=; b=dz8GxW75kVSt955LN6rChMTVbVBeKmApsZQ35WTTScw25O0KCxn3YuI1Z0ci+gy02D3JXccdFygKpqRSqt9uaQxbBUaZaUH9OQ/ZnpvAPe3hWr75y50KDg/U7C925JEAnB+CX1P2/hsJDRHe0I+1dut+RELfndiogupHwK2xBzI= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1571752885432401.8995858693215; Tue, 22 Oct 2019 07:01:25 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-191-wFxL9L_0NI6wFg93M_7KUQ-1; Tue, 22 Oct 2019 10:01:21 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BB5641800D79; Tue, 22 Oct 2019 14:01:14 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7B3FB5D6A5; Tue, 22 Oct 2019 14:01:14 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 151EC180085A; Tue, 22 Oct 2019 14:01:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9ME0wj9002876 for ; Tue, 22 Oct 2019 10:00:58 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6A5126012C; Tue, 22 Oct 2019 14:00:58 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id E450160BAC for ; Tue, 22 Oct 2019 14:00:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752884; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=nIaCfWFTNDLHm8nONalX3aPY6z038RpXze3PJa+5hfg=; b=H7hzFipbGRpfH9JPryavW93R5roCB8iRGUHWSoLv7soSn1Ppbbu4iwq8xLM989S7og+kwn 2LJEu1t/nNMJRJq9jtxylMDmuglfMRtWvwGVqcgMLj0gugiaXDBEiZpnaWiDuV9da4Xn+3 O3tUNMNMrtw+fAb7eGtfVtlzj39FuPE= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:58:07 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 63/75] vmx: Use g_strdup_printf() instead of virAsprintf() X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: wFxL9L_0NI6wFg93M_7KUQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Michal Privoznik --- src/vmx/vmx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 6f47546edf..8aaefba1c1 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -2081,7 +2081,7 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptio= nPtr xmlopt, virConfPtr con goto cleanup; } =20 - virAsprintf(&prefix, "scsi%d:%d", controllerOrBus, unit); + prefix =3D g_strdup_printf("scsi%d:%d", controllerOrBus, unit); =20 (*def)->dst =3D virIndexToDiskName @@ -2103,7 +2103,7 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptio= nPtr xmlopt, virConfPtr con goto cleanup; } =20 - virAsprintf(&prefix, "ide%d:%d", controllerOrBus, unit); + prefix =3D g_strdup_printf("ide%d:%d", controllerOrBus, unit); =20 (*def)->dst =3D virIndexToDiskName(controllerOrBus * 2 + unit,= "hd"); =20 @@ -2132,7 +2132,7 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptio= nPtr xmlopt, virConfPtr con goto cleanup; } =20 - virAsprintf(&prefix, "floppy%d", unit); + prefix =3D g_strdup_printf("floppy%d", unit); =20 (*def)->dst =3D virIndexToDiskName(unit, "fd"); =20 @@ -2839,7 +2839,7 @@ virVMXParseSerial(virVMXContext *ctx, virConfPtr conf= , int port, =20 (*def)->source->data.tcp.host =3D g_strdup(parsedUri->server); =20 - virAsprintf(&(*def)->source->data.tcp.service, "%d", parsedUri->po= rt); + (*def)->source->data.tcp.service =3D g_strdup_printf("%d", parsedU= ri->port); =20 /* See vSphere API documentation about VirtualSerialPortURIBacking= Info */ if (parsedUri->scheme =3D=3D NULL || --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752983; cv=none; d=zoho.com; s=zohoarc; b=jIxGqfevhaC1euQjjGKSVhBX9hQqfmxXDhCljUduQexhpb10356OqZJoO1ls4Vbl2SuFIAwyPuUvOMnw8NLEFkJbB/+rIDnMLmrec/VmOphRg0Nkx0IjGKkbGxzTGUxeN9kbTX8qFINnc3upIOzK4w8+S2L0xq79H4FppFt/6jY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752983; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=CwhzNOrAtlzlyu39Rl29pnHYUB/yG/Kj7EGCymxkm20=; b=Frzrd+SOqak+kjuVkIN5R3diwJaTdPJKILZpd6q6bjuenwJR51ch2xQwQkHvOGHZJopKkjTFcwTXKZ1XT6MBxXoyfeYqVv2Ke6tdJKp4Ssss4x9zmD8WO+GM7eCSjIs/W4IBEmriOsJjwFQcqGi0sZiNNorTO38toImGvuYdP7Q= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1571752983408246.186757657209; Tue, 22 Oct 2019 07:03:03 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-148-Gwl6Sy4iNe6Zn_CbEXa_iQ-1; Tue, 22 Oct 2019 10:01:35 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CC87B107AD3B; Tue, 22 Oct 2019 14:01:28 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9710F5DAAD; Tue, 22 Oct 2019 14:01:28 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 3C2FF3FB43; Tue, 22 Oct 2019 14:01:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9ME0xO6002886 for ; Tue, 22 Oct 2019 10:00:59 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3F9116055B; Tue, 22 Oct 2019 14:00:59 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id B4C4160167 for ; Tue, 22 Oct 2019 14:00:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752982; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=CwhzNOrAtlzlyu39Rl29pnHYUB/yG/Kj7EGCymxkm20=; b=Z+HM35LE+kXEgCPVpY6X6eMs6nu+xWiehoiTvSA0hVe2BvgrqYiHM+LTyvS7pTZu/JKC9R AllSvbXYTwxHNm05ue5Jbzr4Mmz8K/4o0kPsAkTw+jRkZXRxabm7MBbNM84soUriGdV1Wr trNNgxgj8KjGIQPtaGOXNgXINEUVL28= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:58:08 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 64/75] vz: Use g_strdup_printf() instead of virAsprintf() X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: Gwl6Sy4iNe6Zn_CbEXa_iQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Michal Privoznik --- src/vz/vz_driver.c | 2 +- src/vz/vz_sdk.c | 32 +++++++++++++++----------------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index adde179951..54413fdc67 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -2955,7 +2955,7 @@ vzMigrationCreateURI(void) goto cleanup; } =20 - virAsprintf(&uri, "vzmigr://%s", hostname); + uri =3D g_strdup_printf("vzmigr://%s", hostname); =20 cleanup: VIR_FREE(hostname); diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 9e2bddf6df..70bbde5e1d 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -1213,22 +1213,22 @@ prlsdkGetSerialInfo(PRL_HANDLE serialPort, virDomai= nChrDefPtr chr) break; case PDT_USE_TCP: chr->source->type =3D VIR_DOMAIN_CHR_TYPE_TCP; - virAsprintf(&uristr, "tcp://%s", friendlyName); + uristr =3D g_strdup_printf("tcp://%s", friendlyName); if (!(uri =3D virURIParse(uristr))) goto cleanup; chr->source->data.tcp.host =3D g_strdup(uri->server); - virAsprintf(&chr->source->data.tcp.service, "%d", uri->port); + chr->source->data.tcp.service =3D g_strdup_printf("%d", uri->port); chr->source->data.tcp.listen =3D socket_mode =3D=3D PSP_SERIAL_SOC= KET_SERVER; break; case PDT_USE_UDP: chr->source->type =3D VIR_DOMAIN_CHR_TYPE_UDP; - virAsprintf(&uristr, "udp://%s", friendlyName); + uristr =3D g_strdup_printf("udp://%s", friendlyName); if (!(uri =3D virURIParse(uristr))) goto cleanup; chr->source->data.udp.bindHost =3D g_strdup(uri->server); - virAsprintf(&chr->source->data.udp.bindService, "%d", uri->port); + chr->source->data.udp.bindService =3D g_strdup_printf("%d", uri->p= ort); chr->source->data.udp.connectHost =3D g_strdup(uri->server); - virAsprintf(&chr->source->data.udp.connectService, "%d", uri->port= ); + chr->source->data.udp.connectService =3D g_strdup_printf("%d", uri= ->port); break; default: virReportError(VIR_ERR_INTERNAL_ERROR, @@ -3123,16 +3123,16 @@ static int prlsdkAddSerial(PRL_HANDLE sdkdom, virDo= mainChrDefPtr chr) break; case VIR_DOMAIN_CHR_TYPE_TCP: emutype =3D PDT_USE_TCP; - virAsprintf(&url, "%s:%s", chr->source->data.tcp.host, - chr->source->data.tcp.service); + url =3D g_strdup_printf("%s:%s", chr->source->data.tcp.host, + chr->source->data.tcp.service); if (!chr->source->data.tcp.listen) socket_mode =3D PSP_SERIAL_SOCKET_CLIENT; path =3D url; break; case VIR_DOMAIN_CHR_TYPE_UDP: emutype =3D PDT_USE_UDP; - virAsprintf(&url, "%s:%s", chr->source->data.udp.bindHost, - chr->source->data.udp.bindService); + url =3D g_strdup_printf("%s:%s", chr->source->data.udp.bindHost, + chr->source->data.udp.bindService); path =3D url; break; default: @@ -3324,7 +3324,7 @@ static int prlsdkConfigureNet(vzDriverPtr driver G_GN= UC_UNUSED, if (!(tmpstr =3D virSocketAddrFormat(&net->guestIP.ips[i]->address= ))) goto cleanup; =20 - virAsprintf(&addrstr, "%s/%d", tmpstr, net->guestIP.ips[i]->prefix= ); + addrstr =3D g_strdup_printf("%s/%d", tmpstr, net->guestIP.ips[i]->= prefix); =20 VIR_FREE(tmpstr); pret =3D PrlStrList_AddItem(addrlist, addrstr); @@ -3779,8 +3779,8 @@ prlsdkAddFS(PRL_HANDLE sdkdom, virDomainFSDefPtr fs) prlsdkCheckRetGoto(pret, cleanup); =20 if (fs->type =3D=3D VIR_DOMAIN_FS_TYPE_VOLUME) { - virAsprintf(&storage, "libvirt://localhost/%s/%s", - fs->src->srcpool->pool, fs->src->srcpool->volume); + storage =3D g_strdup_printf("libvirt://localhost/%s/%s", + fs->src->srcpool->pool, fs->src->srcpool= ->volume); pret =3D PrlVmDevHd_SetStorageURL(sdkdisk, storage); prlsdkCheckRetGoto(pret, cleanup); } @@ -4393,8 +4393,7 @@ prlsdkGetBlockStats(PRL_HANDLE sdkstats, =20 =20 #define PRLSDK_GET_STAT_PARAM(VAL, TYPE, NAME) \ - if (virAsprintf(&name, "devices.%s%d.%s", prefix, idx, NAME) < 0) \ - goto cleanup; \ + name =3D g_strdup_printf("devices.%s%d.%s", prefix, idx, NAME); \ if (prlsdkExtractStatsParam(sdkstats, name, &stats->VAL) < 0) \ goto cleanup; \ VIR_FREE(name); @@ -4474,8 +4473,7 @@ prlsdkGetNetStats(PRL_HANDLE sdkstats, PRL_HANDLE sdk= dom, const char *device, prlsdkCheckRetGoto(pret, cleanup); =20 #define PRLSDK_GET_NET_COUNTER(VAL, NAME) \ - if (virAsprintf(&name, "net.nic%u.%s", net_index, NAME) < 0) \ - goto cleanup; \ + name =3D g_strdup_printf("net.nic%u.%s", net_index, NAME); \ if (prlsdkExtractStatsParam(sdkstats, name, &stats->VAL) < 0) \ goto cleanup; \ VIR_FREE(name); @@ -4506,7 +4504,7 @@ prlsdkGetVcpuStats(PRL_HANDLE sdkstats, int idx, unsi= gned long long *vtime) long long ptime =3D 0; int ret =3D -1; =20 - virAsprintf(&name, "guest.vcpu%u.time", (unsigned int)idx); + name =3D g_strdup_printf("guest.vcpu%u.time", (unsigned int)idx); if (prlsdkExtractStatsParam(sdkstats, name, &ptime) < 0) goto cleanup; *vtime =3D ptime =3D=3D -1 ? 0 : ptime; --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752996; cv=none; d=zoho.com; s=zohoarc; b=E2XI+Z34pxyGJd5aRpQHFhQ3uNI+IbujnZ8r4vZ7OFpV4YZUMpVVs20WVZhvK2i1fcgsDBtO0OmdUFaP+Y8QUPdJYXwOJrbjxgQf6umyuP4Bd+hBE9N1fdzCV7G4iQvAX4AkXVFaug2Xk+gHrynqUK2idfNW0POrq8zBMuCwlCo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752996; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=jmq96WHeDnl8RqOVInBexgV+adoFqKd1i5GC2jYvYqc=; b=cJC9vJvvPn53CCNy+PcrmCS3Viv15EC61m/RoWa88/GLQMQrcpb4dBKKj1VWxzuMqfcyqdfJNsCfFe3R/R54gDpzIobmfwR9UOY1I4Ux8/fsYaaB/Ik0Eh5s98CXnZ0Szha15U0RUCuPZHsLbm8I8DS9WqvOlyYC/BMdiPkiuDg= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1571752996538457.4614337616588; Tue, 22 Oct 2019 07:03:16 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-215-_6ZonkJKO7S4ATVzYs0Cgg-1; Tue, 22 Oct 2019 10:01:56 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9719A800D59; Tue, 22 Oct 2019 14:01:51 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5FC31100164D; Tue, 22 Oct 2019 14:01:51 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id E99FE180B780; Tue, 22 Oct 2019 14:01:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9ME10vR002907 for ; Tue, 22 Oct 2019 10:01:00 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0DB456012D; Tue, 22 Oct 2019 14:01:00 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 883DD6012C for ; Tue, 22 Oct 2019 14:00:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752995; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=jmq96WHeDnl8RqOVInBexgV+adoFqKd1i5GC2jYvYqc=; b=Tk+5AaK0UDV3h2sEn0R0ITyQId/J/FaVAWumQlBg6pZ7bjVCZzr/4qnIK5kJebcmUGVPza 0b15HjujgEFT4/GZpAuovLq/Ukwg4QSoENaLJEqY+HroNzXOv5IAHmfXhwrw63XQhQJ65W 1VR38tGs26OvzvcMpMU5OkPzdedKbwk= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:58:09 +0200 Message-Id: <33f35bd3e5e6c35b15896bd5d70f41c48f84be0f.1571752582.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 65/75] tests: Use g_strdup_printf() instead of virAsprintf() X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: _6ZonkJKO7S4ATVzYs0Cgg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Michal Privoznik --- tests/bhyveargv2xmltest.c | 10 ++-- tests/bhyvexml2argvtest.c | 18 +++---- tests/bhyvexml2xmltest.c | 10 ++-- tests/commandtest.c | 18 +++---- tests/cputest.c | 60 ++++++++++----------- tests/domaincapstest.c | 16 +++--- tests/domainconftest.c | 4 +- tests/fchosttest.c | 2 +- tests/fdstreamtest.c | 4 +- tests/genericxml2xmltest.c | 8 +-- tests/interfacexml2xmltest.c | 4 +- tests/libxlxml2domconfigtest.c | 4 +- tests/lxcconf2xmltest.c | 16 +++--- tests/lxcxml2xmltest.c | 8 +-- tests/networkxml2conftest.c | 4 +- tests/networkxml2firewalltest.c | 10 ++-- tests/networkxml2xmltest.c | 4 +- tests/networkxml2xmlupdatetest.c | 12 ++--- tests/nodedevxml2xmltest.c | 4 +- tests/nssmock.c | 6 +-- tests/nwfilterxml2firewalltest.c | 12 ++--- tests/nwfilterxml2xmltest.c | 4 +- tests/openvzutilstest.c | 4 +- tests/qemuagenttest.c | 2 +- tests/qemublocktest.c | 22 ++++---- tests/qemucapabilitiestest.c | 16 +++--- tests/qemucaps2xmltest.c | 10 ++-- tests/qemudomaincheckpointxml2xmltest.c | 2 +- tests/qemudomainsnapshotxml2xmltest.c | 2 +- tests/qemufirmwaretest.c | 2 +- tests/qemuhotplugtest.c | 26 ++++----- tests/qemumemlocktest.c | 4 +- tests/qemumigparamstest.c | 20 +++---- tests/qemumonitorjsontest.c | 50 +++++++++--------- tests/qemumonitortestutils.c | 24 ++++----- tests/qemusecuritymock.c | 2 +- tests/qemusecuritytest.c | 2 +- tests/qemuvhostusertest.c | 2 +- tests/qemuxml2argvtest.c | 18 +++---- tests/qemuxml2xmltest.c | 18 +++---- tests/scsihosttest.c | 14 ++--- tests/secretxml2xmltest.c | 10 ++-- tests/securityselinuxlabeltest.c | 16 +++--- tests/storagebackendsheepdogtest.c | 8 +-- tests/storagepoolcapstest.c | 4 +- tests/storagepoolxml2argvtest.c | 8 +-- tests/storagepoolxml2xmltest.c | 8 +-- tests/storagevolxml2argvtest.c | 22 ++++---- tests/storagevolxml2xmltest.c | 12 ++--- tests/sysinfotest.c | 8 +-- tests/testutils.c | 10 ++-- tests/testutils.h | 2 +- tests/testutilsqemu.c | 8 +-- tests/vboxsnapshotxmltest.c | 4 +- tests/virbuftest.c | 2 +- tests/vircaps2xmltest.c | 12 ++--- tests/vircgroupmock.c | 8 +-- tests/vircgrouptest.c | 2 +- tests/virconftest.c | 4 +- tests/virfilemock.c | 2 +- tests/virfiletest.c | 2 +- tests/virfilewrapper.c | 2 +- tests/virhostcputest.c | 32 +++++------ tests/virjsontest.c | 24 ++++----- tests/virmacmaptest.c | 6 +-- tests/virnetdaemontest.c | 8 +-- tests/virnetdevmock.c | 4 +- tests/virnetdevopenvswitchtest.c | 4 +- tests/virnetsockettest.c | 4 +- tests/virnetworkportxml2xmltest.c | 4 +- tests/virnumamock.c | 2 +- tests/virnwfilterbindingxml2xmltest.c | 4 +- tests/virpcimock.c | 70 ++++++++++++------------- tests/virpcitest.c | 10 ++-- tests/virrandommock.c | 4 +- tests/virresctrltest.c | 12 ++--- tests/virschematest.c | 10 ++-- tests/virscsitest.c | 6 +-- tests/virshtest.c | 4 +- tests/virstoragetest.c | 58 ++++++++++---------- tests/virtestmock.c | 2 +- tests/virusbmock.c | 2 +- tests/virusbtest.c | 4 +- tests/vmwarevertest.c | 2 +- tests/vmx2xmltest.c | 12 ++--- tests/xlconfigtest.c | 4 +- tests/xmconfigtest.c | 4 +- tests/xml2vmxtest.c | 12 ++--- 88 files changed, 467 insertions(+), 473 deletions(-) diff --git a/tests/bhyveargv2xmltest.c b/tests/bhyveargv2xmltest.c index d108366682..5e39face33 100644 --- a/tests/bhyveargv2xmltest.c +++ b/tests/bhyveargv2xmltest.c @@ -106,15 +106,13 @@ testCompareXMLToArgvHelper(const void *data) char *xml =3D NULL; char *args =3D NULL; =20 - if (virAsprintf(&xml, "%s/bhyveargv2xmldata/bhyveargv2xml-%s.xml", - abs_srcdir, info->name) < 0 || - virAsprintf(&args, "%s/bhyveargv2xmldata/bhyveargv2xml-%s.args", - abs_srcdir, info->name) < 0) - goto cleanup; + xml =3D g_strdup_printf("%s/bhyveargv2xmldata/bhyveargv2xml-%s.xml", + abs_srcdir, info->name); + args =3D g_strdup_printf("%s/bhyveargv2xmldata/bhyveargv2xml-%s.args", + abs_srcdir, info->name); =20 result =3D testCompareXMLToArgvFiles(xml, args, info->flags); =20 - cleanup: VIR_FREE(xml); VIR_FREE(args); return result; diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index eeedd04f72..f5dbb4e154 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -119,19 +119,17 @@ testCompareXMLToArgvHelper(const void *data) char *xml =3D NULL; char *args =3D NULL, *ldargs =3D NULL, *dmargs =3D NULL; =20 - if (virAsprintf(&xml, "%s/bhyvexml2argvdata/bhyvexml2argv-%s.xml", - abs_srcdir, info->name) < 0 || - virAsprintf(&args, "%s/bhyvexml2argvdata/bhyvexml2argv-%s.args", - abs_srcdir, info->name) < 0 || - virAsprintf(&ldargs, "%s/bhyvexml2argvdata/bhyvexml2argv-%s.ldargs= ", - abs_srcdir, info->name) < 0 || - virAsprintf(&dmargs, "%s/bhyvexml2argvdata/bhyvexml2argv-%s.devmap= ", - abs_srcdir, info->name) < 0) - goto cleanup; + xml =3D g_strdup_printf("%s/bhyvexml2argvdata/bhyvexml2argv-%s.xml", + abs_srcdir, info->name); + args =3D g_strdup_printf("%s/bhyvexml2argvdata/bhyvexml2argv-%s.args", + abs_srcdir, info->name); + ldargs =3D g_strdup_printf("%s/bhyvexml2argvdata/bhyvexml2argv-%s.ldar= gs", + abs_srcdir, info->name); + dmargs =3D g_strdup_printf("%s/bhyvexml2argvdata/bhyvexml2argv-%s.devm= ap", + abs_srcdir, info->name); =20 ret =3D testCompareXMLToArgvFiles(xml, args, ldargs, dmargs, info->fla= gs); =20 - cleanup: VIR_FREE(xml); VIR_FREE(args); VIR_FREE(ldargs); diff --git a/tests/bhyvexml2xmltest.c b/tests/bhyvexml2xmltest.c index 9f64df8bb2..a0c20a14c1 100644 --- a/tests/bhyvexml2xmltest.c +++ b/tests/bhyvexml2xmltest.c @@ -31,11 +31,10 @@ testCompareXMLToXMLHelper(const void *data) bool is_different =3D info->flags & FLAG_IS_DIFFERENT; int ret =3D -1; =20 - if (virAsprintf(&xml_in, "%s/bhyvexml2argvdata/bhyvexml2argv-%s.xml", - abs_srcdir, info->name) < 0 || - virAsprintf(&xml_out, "%s/bhyvexml2xmloutdata/bhyvexml2xmlout-%s.x= ml", - abs_srcdir, info->name) < 0) - goto cleanup; + xml_in =3D g_strdup_printf("%s/bhyvexml2argvdata/bhyvexml2argv-%s.xml", + abs_srcdir, info->name); + xml_out =3D g_strdup_printf("%s/bhyvexml2xmloutdata/bhyvexml2xmlout-%s= .xml", + abs_srcdir, info->name); =20 ret =3D testCompareDomXML2XMLFiles(driver.caps, driver.xmlopt, xml_in, is_different ? xml_out : xml_in, @@ -49,7 +48,6 @@ testCompareXMLToXMLHelper(const void *data) virResetLastError(); } =20 - cleanup: VIR_FREE(xml_in); VIR_FREE(xml_out); return ret; diff --git a/tests/commandtest.c b/tests/commandtest.c index 9ee23add4c..a8686f777f 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -67,8 +67,8 @@ static int checkoutput(const char *testname, char *actualname =3D NULL; char *actuallog =3D NULL; =20 - virAsprintf(&expectname, "%s/commanddata/%s.log", abs_srcdir, testname= ); - virAsprintf(&actualname, "%s/commandhelper.log", abs_builddir); + expectname =3D g_strdup_printf("%s/commanddata/%s.log", abs_srcdir, te= stname); + actualname =3D g_strdup_printf("%s/commandhelper.log", abs_builddir); =20 if (virFileReadAll(expectname, 1024*64, &expectlog) < 0) { fprintf(stderr, "cannot read %s\n", expectname); @@ -83,7 +83,7 @@ static int checkoutput(const char *testname, if (prefix) { char *tmp =3D NULL; =20 - virAsprintf(&tmp, "%s%s", prefix, expectlog); + tmp =3D g_strdup_printf("%s%s", prefix, expectlog); =20 VIR_FREE(expectlog); expectlog =3D tmp; @@ -591,7 +591,7 @@ static int test15(const void *unused G_GNUC_UNUSED) char *cwd =3D NULL; int ret =3D -1; =20 - virAsprintf(&cwd, "%s/commanddata", abs_srcdir); + cwd =3D g_strdup_printf("%s/commanddata", abs_srcdir); virCommandSetWorkingDirectory(cmd, cwd); virCommandSetUmask(cmd, 002); =20 @@ -810,7 +810,7 @@ static int test20(const void *unused G_GNUC_UNUSED) =20 sigaction(SIGPIPE, &sig_action, NULL); =20 - virAsprintf(&buf, "1\n%100000d\n", 2); + buf =3D g_strdup_printf("1\n%100000d\n", 2); virCommandSetInputBuffer(cmd, buf); =20 if (virCommandRun(cmd, NULL) < 0) { @@ -1168,10 +1168,10 @@ static int test27(const void *unused G_GNUC_UNUSED) buffer2[buflen - 2] =3D '\n'; buffer2[buflen - 1] =3D 0; =20 - virAsprintf(&outexpect, TEST27_OUTEXPECT_TEMP, - buffer0, buffer1, buffer2); - virAsprintf(&errexpect, TEST27_ERREXPECT_TEMP, - buffer0, buffer1, buffer2); + outexpect =3D g_strdup_printf(TEST27_OUTEXPECT_TEMP, + buffer0, buffer1, buffer2); + errexpect =3D g_strdup_printf(TEST27_ERREXPECT_TEMP, + buffer0, buffer1, buffer2); =20 if (pipe(pipe1) < 0 || pipe(pipe2) < 0) { printf("Could not create pipe: %s\n", g_strerror(errno)); diff --git a/tests/cputest.c b/tests/cputest.c index e1b609ef73..e872861690 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -75,8 +75,8 @@ cpuTestLoadXML(virArch arch, const char *name) xmlXPathContextPtr ctxt =3D NULL; virCPUDefPtr cpu =3D NULL; =20 - virAsprintf(&xml, "%s/cputestdata/%s-%s.xml", abs_srcdir, - virArchToString(arch), name); + xml =3D g_strdup_printf("%s/cputestdata/%s-%s.xml", abs_srcdir, + virArchToString(arch), name); =20 if (!(doc =3D virXMLParseFileCtxt(xml, &ctxt))) goto cleanup; @@ -104,8 +104,8 @@ cpuTestLoadMultiXML(virArch arch, int n; size_t i; =20 - virAsprintf(&xml, "%s/cputestdata/%s-%s.xml", abs_srcdir, - virArchToString(arch), name); + xml =3D g_strdup_printf("%s/cputestdata/%s-%s.xml", abs_srcdir, + virArchToString(arch), name); =20 if (!(doc =3D virXMLParseFileCtxt(xml, &ctxt))) goto cleanup; @@ -148,8 +148,8 @@ cpuTestCompareXML(virArch arch, char *actual =3D NULL; int ret =3D -1; =20 - virAsprintf(&xml, "%s/cputestdata/%s-%s.xml", abs_srcdir, - virArchToString(arch), name); + xml =3D g_strdup_printf("%s/cputestdata/%s-%s.xml", abs_srcdir, + virArchToString(arch), name); =20 if (!(actual =3D virCPUDefFormat(cpu, NULL))) goto cleanup; @@ -342,7 +342,7 @@ cpuTestBaseline(const void *arg) suffix =3D "migratable"; else suffix =3D "result"; - virAsprintf(&result, "%s-%s", data->name, suffix); + result =3D g_strdup_printf("%s-%s", data->name, suffix); =20 if (cpuTestCompareXML(data->arch, baseline, result) < 0) goto cleanup; @@ -395,7 +395,7 @@ cpuTestUpdate(const void *arg) if (virCPUUpdate(host->arch, cpu, migHost) < 0) goto cleanup; =20 - virAsprintf(&result, "%s+%s", data->host, data->name); + result =3D g_strdup_printf("%s+%s", data->host, data->name); =20 ret =3D cpuTestCompareXML(data->arch, cpu, result); =20 @@ -480,8 +480,8 @@ cpuTestMakeQEMUCaps(const struct data *data) bool fail_no_props =3D true; char *json =3D NULL; =20 - virAsprintf(&json, "%s/cputestdata/%s-cpuid-%s.json", abs_srcdir, - virArchToString(data->arch), data->host); + json =3D g_strdup_printf("%s/cputestdata/%s-cpuid-%s.json", abs_srcdir, + virArchToString(data->arch), data->host); =20 if (!(testMon =3D qemuMonitorTestNewFromFile(json, driver.xmlopt, true= ))) goto error; @@ -583,8 +583,8 @@ cpuTestCPUID(bool guest, const void *arg) char *result =3D NULL; virDomainCapsCPUModelsPtr models =3D NULL; =20 - virAsprintf(&hostFile, "%s/cputestdata/%s-cpuid-%s.xml", abs_srcdir, - virArchToString(data->arch), data->host); + hostFile =3D g_strdup_printf("%s/cputestdata/%s-cpuid-%s.xml", abs_src= dir, + virArchToString(data->arch), data->host); =20 if (virTestLoadFile(hostFile, &host) < 0 || !(hostData =3D virCPUDataParse(host))) @@ -615,7 +615,7 @@ cpuTestCPUID(bool guest, const void *arg) if (cpuDecode(cpu, hostData, models) < 0) goto cleanup; =20 - virAsprintf(&result, "cpuid-%s-%s", data->host, guest ? "guest" : "hos= t"); + result =3D g_strdup_printf("cpuid-%s-%s", data->host, guest ? "guest" = : "host"); =20 ret =3D cpuTestCompareXML(data->arch, cpu, result); =20 @@ -657,12 +657,12 @@ cpuTestCompareSignature(const struct data *data, =20 signature =3D virCPUx86DataGetSignature(hostData, &family, &model, &st= epping); =20 - virAsprintf(&result, "%s/cputestdata/%s-cpuid-%s.sig", abs_srcdir, - virArchToString(data->arch), data->host); + result =3D g_strdup_printf("%s/cputestdata/%s-cpuid-%s.sig", abs_srcdi= r, + virArchToString(data->arch), data->host); =20 - virAsprintf(&sigStr, "%1$06lx\n" "family: %2$3u (0x%2$02x)\n" - "model: %3$3u (0x%3$02x)\n" "stepping: %4$3u (0x%4$02x)= \n", - signature, family, model, stepping); + sigStr =3D g_strdup_printf("%1$06lx\n" "family: %2$3u (0x%2$02x)\n" + "model: %3$3u (0x%3$02x)\n" "stepping: %4$= 3u (0x%4$02x)\n", + signature, family, model, stepping); =20 return virTestCompareToFile(sigStr, result); } @@ -677,8 +677,8 @@ cpuTestCPUIDSignature(const void *arg) char *host =3D NULL; int ret =3D -1; =20 - virAsprintf(&hostFile, "%s/cputestdata/%s-cpuid-%s.xml", abs_srcdir, - virArchToString(data->arch), data->host); + hostFile =3D g_strdup_printf("%s/cputestdata/%s-cpuid-%s.xml", abs_src= dir, + virArchToString(data->arch), data->host); =20 if (virTestLoadFile(hostFile, &host) < 0 || !(hostData =3D virCPUDataParse(host))) @@ -801,23 +801,23 @@ cpuTestUpdateLive(const void *arg) virDomainCapsCPUModelsPtr models =3D NULL; int ret =3D -1; =20 - virAsprintf(&cpuFile, "cpuid-%s-guest", data->host); + cpuFile =3D g_strdup_printf("cpuid-%s-guest", data->host); if (!(cpu =3D cpuTestLoadXML(data->arch, cpuFile))) goto cleanup; =20 - virAsprintf(&enabledFile, "%s/cputestdata/%s-cpuid-%s-enabled.xml", - abs_srcdir, virArchToString(data->arch), data->host); + enabledFile =3D g_strdup_printf("%s/cputestdata/%s-cpuid-%s-enabled.xm= l", + abs_srcdir, virArchToString(data->arch),= data->host); if (virTestLoadFile(enabledFile, &enabled) < 0 || !(enabledData =3D virCPUDataParse(enabled))) goto cleanup; =20 - virAsprintf(&disabledFile, "%s/cputestdata/%s-cpuid-%s-disabled.xml", - abs_srcdir, virArchToString(data->arch), data->host); + disabledFile =3D g_strdup_printf("%s/cputestdata/%s-cpuid-%s-disabled.= xml", + abs_srcdir, virArchToString(data->arch)= , data->host); if (virTestLoadFile(disabledFile, &disabled) < 0 || !(disabledData =3D virCPUDataParse(disabled))) goto cleanup; =20 - virAsprintf(&expectedFile, "cpuid-%s-json", data->host); + expectedFile =3D g_strdup_printf("cpuid-%s-json", data->host); if (!(expected =3D cpuTestLoadXML(data->arch, expectedFile))) goto cleanup; =20 @@ -890,7 +890,7 @@ cpuTestJSONCPUID(const void *arg) char *result =3D NULL; int ret =3D -1; =20 - virAsprintf(&result, "cpuid-%s-json", data->host); + result =3D g_strdup_printf("cpuid-%s-json", data->host); =20 if (!(qemuCaps =3D cpuTestMakeQEMUCaps(data))) goto cleanup; @@ -1011,8 +1011,8 @@ mymain(void) tmp =3D virTestLogContentAndReset(); \ VIR_FREE(tmp); \ \ - virAsprintf(&testLabel, "%s(%s): %s", \ - #api, virArchToString(arch), name); \ + testLabel =3D g_strdup_printf("%s(%s): %s", #api, \ + virArchToString(arch), name); \ \ if (virTestRun(testLabel, api, &data) < 0) { \ if (virTestGetDebug()) { \ @@ -1052,7 +1052,7 @@ mymain(void) suffix =3D " (expanded)"; \ if ((flags) & VIR_CONNECT_BASELINE_CPU_MIGRATABLE) \ suffix =3D " (migratable)"; \ - virAsprintf(&label, "%s%s", name, suffix); \ + label =3D g_strdup_printf("%s%s", name, suffix); \ DO_TEST(arch, cpuTestBaseline, label, NULL, \ "baseline-" name, NULL, flags, result); \ VIR_FREE(label); \ diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index 3289eb3ef7..7d37faefe5 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -88,7 +88,7 @@ fillQemuCaps(virDomainCapsPtr domCaps, fakeHostCPU(caps, domCaps->arch) < 0) goto cleanup; =20 - virAsprintf(&path, "%s/%s.%s.xml", TEST_QEMU_CAPS_PATH, name, arch); + path =3D g_strdup_printf("%s/%s.%s.xml", TEST_QEMU_CAPS_PATH, name, ar= ch); if (!(qemuCaps =3D qemuTestParseCapabilities(caps, path))) goto cleanup; =20 @@ -216,8 +216,8 @@ test_virDomainCapsFormat(const void *opaque) char *domCapsXML =3D NULL; int ret =3D -1; =20 - virAsprintf(&path, "%s/domaincapsschemadata/%s.xml", abs_srcdir, - data->name); + path =3D g_strdup_printf("%s/domaincapsschemadata/%s.xml", abs_srcdir, + data->name); =20 if (!(domCaps =3D virDomainCapsNew(data->emulator, data->machine, virArchFromString(data->arch), @@ -297,10 +297,10 @@ mymain(void) #define DO_TEST_QEMU(Name, CapsName, Emulator, Machine, Arch, Type) \ do { \ char *name =3D NULL; \ - virAsprintf(&name, "qemu_%s%s%s.%s", \ - Name, \ - Machine ? "-" : "", Machine ? Machine : "", \ - Arch); \ + name =3D g_strdup_printf("qemu_%s%s%s.%s", \ + Name, \ + Machine ? "-" : "", Machine ? Machine : "",= \ + Arch); \ struct testData data =3D { \ .name =3D name, \ .emulator =3D Emulator, \ @@ -333,7 +333,7 @@ mymain(void) #define DO_TEST_BHYVE(Name, Emulator, BhyveCaps, Type) \ do { \ char *name =3D NULL; \ - virAsprintf(&name, "bhyve_%s.x86_64", Name); \ + name =3D g_strdup_printf("bhyve_%s.x86_64", Name); \ struct testData data =3D { \ .name =3D name, \ .emulator =3D Emulator, \ diff --git a/tests/domainconftest.c b/tests/domainconftest.c index 3de6e7740e..f48c3ca682 100644 --- a/tests/domainconftest.c +++ b/tests/domainconftest.c @@ -46,8 +46,8 @@ static int testGetFilesystem(const void *opaque) const struct testGetFilesystemData *data =3D opaque; virDomainFSDefPtr fsdef; =20 - virAsprintf(&filename, "%s/domainconfdata/%s.xml", abs_srcdir, - data->filename); + filename =3D g_strdup_printf("%s/domainconfdata/%s.xml", abs_srcdir, + data->filename); =20 if (!(def =3D virDomainDefParseFile(filename, caps, xmlopt, NULL, 0))) goto cleanup; diff --git a/tests/fchosttest.c b/tests/fchosttest.c index fe4f255fe1..44e7f11599 100644 --- a/tests/fchosttest.c +++ b/tests/fchosttest.c @@ -343,7 +343,7 @@ mymain(void) { int ret =3D 0; =20 - virAsprintf(&fchost_prefix, "%s/%s", abs_srcdir, "fchostdata/fc_host/"= ); + fchost_prefix =3D g_strdup_printf("%s/%s", abs_srcdir, "fchostdata/fc_= host/"); =20 if (virTestRun("virVHBAPathExists", test1, NULL) < 0) ret =3D -1; diff --git a/tests/fdstreamtest.c b/tests/fdstreamtest.c index 4acc97967e..f4d38d5a20 100644 --- a/tests/fdstreamtest.c +++ b/tests/fdstreamtest.c @@ -62,7 +62,7 @@ static int testFDStreamReadCommon(const char *scratchdir,= bool blocking) for (i =3D 0; i < PATTERN_LEN; i++) pattern[i] =3D i; =20 - virAsprintf(&file, "%s/input.data", scratchdir); + file =3D g_strdup_printf("%s/input.data", scratchdir); =20 if ((fd =3D open(file, O_CREAT|O_WRONLY|O_EXCL, 0600)) < 0) goto cleanup; @@ -193,7 +193,7 @@ static int testFDStreamWriteCommon(const char *scratchd= ir, bool blocking) for (i =3D 0; i < PATTERN_LEN; i++) pattern[i] =3D i; =20 - virAsprintf(&file, "%s/input.data", scratchdir); + file =3D g_strdup_printf("%s/input.data", scratchdir); =20 if (!(st =3D virStreamNew(conn, flags))) goto cleanup; diff --git a/tests/genericxml2xmltest.c b/tests/genericxml2xmltest.c index 7b59749d01..0d04413712 100644 --- a/tests/genericxml2xmltest.c +++ b/tests/genericxml2xmltest.c @@ -29,10 +29,10 @@ testCompareXMLToXMLHelper(const void *data) char *xml_out =3D NULL; int ret =3D -1; =20 - virAsprintf(&xml_in, "%s/genericxml2xmlindata/%s.xml", - abs_srcdir, info->name); - virAsprintf(&xml_out, "%s/genericxml2xmloutdata/%s.xml", - abs_srcdir, info->name); + xml_in =3D g_strdup_printf("%s/genericxml2xmlindata/%s.xml", + abs_srcdir, info->name); + xml_out =3D g_strdup_printf("%s/genericxml2xmloutdata/%s.xml", + abs_srcdir, info->name); =20 ret =3D testCompareDomXML2XMLFiles(caps, xmlopt, xml_in, info->different ? xml_out : xml_in, diff --git a/tests/interfacexml2xmltest.c b/tests/interfacexml2xmltest.c index c7de2e4bd0..f9740d1cf3 100644 --- a/tests/interfacexml2xmltest.c +++ b/tests/interfacexml2xmltest.c @@ -50,8 +50,8 @@ testCompareXMLToXMLHelper(const void *data) int result =3D -1; char *xml =3D NULL; =20 - virAsprintf(&xml, "%s/interfaceschemadata/%s.xml", abs_srcdir, - (const char *)data); + xml =3D g_strdup_printf("%s/interfaceschemadata/%s.xml", abs_srcdir, + (const char *)data); =20 result =3D testCompareXMLToXMLFiles(xml); =20 diff --git a/tests/libxlxml2domconfigtest.c b/tests/libxlxml2domconfigtest.c index efd003eb58..5bda6db360 100644 --- a/tests/libxlxml2domconfigtest.c +++ b/tests/libxlxml2domconfigtest.c @@ -151,8 +151,8 @@ testCompareXMLToDomConfigHelper(const void *data) char *xmlfile =3D NULL; char *jsonfile =3D NULL; =20 - virAsprintf(&xmlfile, "%s/libxlxml2domconfigdata/%s.xml", abs_srcdir, = info->name); - virAsprintf(&jsonfile, "%s/libxlxml2domconfigdata/%s.json", abs_srcdir= , info->name); + xmlfile =3D g_strdup_printf("%s/libxlxml2domconfigdata/%s.xml", abs_sr= cdir, info->name); + jsonfile =3D g_strdup_printf("%s/libxlxml2domconfigdata/%s.json", abs_= srcdir, info->name); =20 ret =3D testCompareXMLToDomConfig(xmlfile, jsonfile); =20 diff --git a/tests/lxcconf2xmltest.c b/tests/lxcconf2xmltest.c index f2d884dc15..c52c6e7fd7 100644 --- a/tests/lxcconf2xmltest.c +++ b/tests/lxcconf2xmltest.c @@ -71,10 +71,10 @@ testCompareXMLToConfigHelperLegacy(const void *data) char *xml =3D NULL; char *config =3D NULL; =20 - virAsprintf(&xml, "%s/lxcconf2xmldata/lxcconf2xml-%s.xml", - abs_srcdir, info->name); - virAsprintf(&config, "%s/lxcconf2xmldata/lxcconf2xml-%s.config", - abs_srcdir, info->name); + xml =3D g_strdup_printf("%s/lxcconf2xmldata/lxcconf2xml-%s.xml", + abs_srcdir, info->name); + config =3D g_strdup_printf("%s/lxcconf2xmldata/lxcconf2xml-%s.config", + abs_srcdir, info->name); =20 result =3D testCompareXMLToConfigFiles(xml, config, info->expectError); =20 @@ -91,10 +91,10 @@ testCompareXMLToConfigHelperV3(const void *data) char *xml =3D NULL; char *config =3D NULL; =20 - virAsprintf(&xml, "%s/lxcconf2xmldata/lxcconf2xml-%s.xml", - abs_srcdir, info->name); - virAsprintf(&config, "%s/lxcconf2xmldata/lxcconf2xml-%s-v3.config", - abs_srcdir, info->name); + xml =3D g_strdup_printf("%s/lxcconf2xmldata/lxcconf2xml-%s.xml", + abs_srcdir, info->name); + config =3D g_strdup_printf("%s/lxcconf2xmldata/lxcconf2xml-%s-v3.confi= g", + abs_srcdir, info->name); =20 result =3D testCompareXMLToConfigFiles(xml, config, info->expectError); =20 diff --git a/tests/lxcxml2xmltest.c b/tests/lxcxml2xmltest.c index ded35f8d4b..6a720503a9 100644 --- a/tests/lxcxml2xmltest.c +++ b/tests/lxcxml2xmltest.c @@ -34,10 +34,10 @@ testCompareXMLToXMLHelper(const void *data) char *xml_out =3D NULL; int ret =3D -1; =20 - virAsprintf(&xml_in, "%s/lxcxml2xmldata/lxc-%s.xml", - abs_srcdir, info->name); - virAsprintf(&xml_out, "%s/lxcxml2xmloutdata/lxc-%s.xml", - abs_srcdir, info->name); + xml_in =3D g_strdup_printf("%s/lxcxml2xmldata/lxc-%s.xml", + abs_srcdir, info->name); + xml_out =3D g_strdup_printf("%s/lxcxml2xmloutdata/lxc-%s.xml", + abs_srcdir, info->name); =20 ret =3D testCompareDomXML2XMLFiles(caps, xmlopt, xml_in, info->different ? xml_out : xml_in, diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c index 9992afaf62..a8355272b9 100644 --- a/tests/networkxml2conftest.c +++ b/tests/networkxml2conftest.c @@ -86,8 +86,8 @@ testCompareXMLToConfHelper(const void *data) char *inxml =3D NULL; char *outconf =3D NULL; =20 - virAsprintf(&inxml, "%s/networkxml2confdata/%s.xml", abs_srcdir, info-= >name); - virAsprintf(&outconf, "%s/networkxml2confdata/%s.conf", abs_srcdir, in= fo->name); + inxml =3D g_strdup_printf("%s/networkxml2confdata/%s.xml", abs_srcdir,= info->name); + outconf =3D g_strdup_printf("%s/networkxml2confdata/%s.conf", abs_srcd= ir, info->name); =20 result =3D testCompareXMLToConfFiles(inxml, outconf, info->caps); =20 diff --git a/tests/networkxml2firewalltest.c b/tests/networkxml2firewalltes= t.c index 0aaebf5bc6..831b7630d4 100644 --- a/tests/networkxml2firewalltest.c +++ b/tests/networkxml2firewalltest.c @@ -117,10 +117,10 @@ testCompareXMLToIPTablesHelper(const void *data) char *xml =3D NULL; char *args =3D NULL; =20 - virAsprintf(&xml, "%s/networkxml2firewalldata/%s.xml", - abs_srcdir, info->name); - virAsprintf(&args, "%s/networkxml2firewalldata/%s-%s.args", - abs_srcdir, info->name, RULESTYPE); + xml =3D g_strdup_printf("%s/networkxml2firewalldata/%s.xml", + abs_srcdir, info->name); + args =3D g_strdup_printf("%s/networkxml2firewalldata/%s-%s.args", + abs_srcdir, info->name, RULESTYPE); =20 result =3D testCompareXMLToArgvFiles(xml, args, info->baseargs); =20 @@ -167,7 +167,7 @@ mymain(void) goto cleanup; } =20 - virAsprintf(&basefile, "%s/networkxml2firewalldata/base.args", abs_src= dir); + basefile =3D g_strdup_printf("%s/networkxml2firewalldata/base.args", a= bs_srcdir); =20 if (virTestLoadFile(basefile, &baseargs) < 0) { ret =3D -1; diff --git a/tests/networkxml2xmltest.c b/tests/networkxml2xmltest.c index 64aada5f34..f784b90c69 100644 --- a/tests/networkxml2xmltest.c +++ b/tests/networkxml2xmltest.c @@ -90,8 +90,8 @@ testCompareXMLToXMLHelper(const void *data) char *inxml =3D NULL; char *outxml =3D NULL; =20 - virAsprintf(&inxml, "%s/networkxml2xmlin/%s.xml", abs_srcdir, info->na= me); - virAsprintf(&outxml, "%s/networkxml2xmlout/%s.xml", abs_srcdir, info->= name); + inxml =3D g_strdup_printf("%s/networkxml2xmlin/%s.xml", abs_srcdir, in= fo->name); + outxml =3D g_strdup_printf("%s/networkxml2xmlout/%s.xml", abs_srcdir, = info->name); =20 result =3D testCompareXMLToXMLFiles(inxml, outxml, info->flags, info->expectResult); diff --git a/tests/networkxml2xmlupdatetest.c b/tests/networkxml2xmlupdatet= est.c index a76498c085..00d867fbc2 100644 --- a/tests/networkxml2xmlupdatetest.c +++ b/tests/networkxml2xmlupdatetest.c @@ -82,12 +82,12 @@ testCompareXMLToXMLHelper(const void *data) char *updatexml =3D NULL; char *outxml =3D NULL; =20 - virAsprintf(&netxml, "%s/networkxml2xmlin/%s.xml", - abs_srcdir, info->netxml); - virAsprintf(&updatexml, "%s/networkxml2xmlupdatein/%s.xml", - abs_srcdir, info->updatexml); - virAsprintf(&outxml, "%s/networkxml2xmlupdateout/%s.xml", - abs_srcdir, info->outxml); + netxml =3D g_strdup_printf("%s/networkxml2xmlin/%s.xml", + abs_srcdir, info->netxml); + updatexml =3D g_strdup_printf("%s/networkxml2xmlupdatein/%s.xml", + abs_srcdir, info->updatexml); + outxml =3D g_strdup_printf("%s/networkxml2xmlupdateout/%s.xml", + abs_srcdir, info->outxml); =20 result =3D testCompareXMLToXMLFiles(netxml, updatexml, outxml, info->f= lags, info->command, info->section, diff --git a/tests/nodedevxml2xmltest.c b/tests/nodedevxml2xmltest.c index e8b869526d..6168c29c70 100644 --- a/tests/nodedevxml2xmltest.c +++ b/tests/nodedevxml2xmltest.c @@ -72,8 +72,8 @@ testCompareXMLToXMLHelper(const void *data) int result =3D -1; char *xml =3D NULL; =20 - virAsprintf(&xml, "%s/nodedevschemadata/%s.xml", abs_srcdir, - (const char *)data); + xml =3D g_strdup_printf("%s/nodedevschemadata/%s.xml", abs_srcdir, + (const char *)data); =20 result =3D testCompareXMLToXMLFiles(xml); =20 diff --git a/tests/nssmock.c b/tests/nssmock.c index 8d707a64a5..62e8fa372a 100644 --- a/tests/nssmock.c +++ b/tests/nssmock.c @@ -55,9 +55,9 @@ getrealpath(char **newpath, const char *path) { if (STRPREFIX(path, LEASEDIR)) { - virAsprintf(newpath, "%s/nssdata/%s", - abs_srcdir, - path + strlen(LEASEDIR)); + *newpath =3D g_strdup_printf("%s/nssdata/%s", + abs_srcdir, + path + strlen(LEASEDIR)); } else { *newpath =3D g_strdup(path); } diff --git a/tests/nwfilterxml2firewalltest.c b/tests/nwfilterxml2firewallt= est.c index 95b6b24014..2f92885d0f 100644 --- a/tests/nwfilterxml2firewalltest.c +++ b/tests/nwfilterxml2firewalltest.c @@ -243,8 +243,8 @@ virNWFilterIncludeDefToRuleInst(virNWFilterIncludeDefPt= r inc, int ret =3D -1; char *xml; =20 - virAsprintf(&xml, "%s/nwfilterxml2firewalldata/%s.xml", abs_srcdir, - inc->filterref); + xml =3D g_strdup_printf("%s/nwfilterxml2firewalldata/%s.xml", abs_srcd= ir, + inc->filterref); =20 /* create a temporary hashmap for depth-first tree traversal */ if (!(tmpvars =3D virNWFilterCreateVarsFrom(inc->params, @@ -428,10 +428,10 @@ testCompareXMLToIPTablesHelper(const void *data) char *xml =3D NULL; char *args =3D NULL; =20 - virAsprintf(&xml, "%s/nwfilterxml2firewalldata/%s.xml", - abs_srcdir, info->name); - virAsprintf(&args, "%s/nwfilterxml2firewalldata/%s-%s.args", - abs_srcdir, info->name, RULESTYPE); + xml =3D g_strdup_printf("%s/nwfilterxml2firewalldata/%s.xml", + abs_srcdir, info->name); + args =3D g_strdup_printf("%s/nwfilterxml2firewalldata/%s-%s.args", + abs_srcdir, info->name, RULESTYPE); =20 result =3D testCompareXMLToArgvFiles(xml, args); =20 diff --git a/tests/nwfilterxml2xmltest.c b/tests/nwfilterxml2xmltest.c index 344dd68bc5..52a4af12cc 100644 --- a/tests/nwfilterxml2xmltest.c +++ b/tests/nwfilterxml2xmltest.c @@ -62,8 +62,8 @@ testCompareXMLToXMLHelper(const void *data) char *inxml =3D NULL; char *outxml =3D NULL; =20 - virAsprintf(&inxml, "%s/nwfilterxml2xmlin/%s.xml", abs_srcdir, tp->nam= e); - virAsprintf(&outxml, "%s/nwfilterxml2xmlout/%s.xml", abs_srcdir, tp->n= ame); + inxml =3D g_strdup_printf("%s/nwfilterxml2xmlin/%s.xml", abs_srcdir, t= p->name); + outxml =3D g_strdup_printf("%s/nwfilterxml2xmlout/%s.xml", abs_srcdir,= tp->name); =20 result =3D testCompareXMLToXMLFiles(inxml, outxml, tp->expect_warning); =20 diff --git a/tests/openvzutilstest.c b/tests/openvzutilstest.c index 9287dc3c79..83969197c6 100644 --- a/tests/openvzutilstest.c +++ b/tests/openvzutilstest.c @@ -17,7 +17,7 @@ static int testLocateConfFile(int vpsid G_GNUC_UNUSED, char **conffile, const char *ext G_GNUC_UNUSED) { - virAsprintf(conffile, "%s/openvzutilstest.conf", abs_srcdir); + *conffile =3D g_strdup_printf("%s/openvzutilstest.conf", abs_srcdir); return 0; } =20 @@ -41,7 +41,7 @@ testReadConfigParam(const void *data G_GNUC_UNUSED) char *conf =3D NULL; char *value =3D NULL; =20 - virAsprintf(&conf, "%s/openvzutilstest.conf", abs_srcdir); + conf =3D g_strdup_printf("%s/openvzutilstest.conf", abs_srcdir); =20 for (i =3D 0; i < G_N_ELEMENTS(configParams); ++i) { if (openvzReadConfigParam(conf, configParams[i].param, diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c index 65fb937901..f9f0930a33 100644 --- a/tests/qemuagenttest.c +++ b/tests/qemuagenttest.c @@ -183,7 +183,7 @@ testQemuAgentGetFSInfoCommon(virDomainXMLOptionPtr xmlo= pt, if (!(ret_test =3D qemuMonitorTestNewAgent(xmlopt))) return -1; =20 - virAsprintf(&domain_filename, "%s/qemuagentdata/fsinfo.xml", abs_srcdi= r); + domain_filename =3D g_strdup_printf("%s/qemuagentdata/fsinfo.xml", abs= _srcdir); =20 if (!(ret_def =3D virDomainDefParseFile(domain_filename, driver.caps, = xmlopt, NULL, VIR_DOMAIN_DEF_PARSE_INACT= IVE))) diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c index 0c7c6ed4fa..0f1bf68315 100644 --- a/tests/qemublocktest.c +++ b/tests/qemublocktest.c @@ -82,7 +82,7 @@ testBackingXMLjsonXML(const void *args) if (!(propsstr =3D virJSONValueToString(wrapper, false))) return -1; =20 - virAsprintf(&protocolwrapper, "json:%s", propsstr); + protocolwrapper =3D g_strdup_printf("json:%s", propsstr); =20 if (virStorageSourceNewFromBackingAbsolute(protocolwrapper, &jsonsrc) < 0) { @@ -162,8 +162,8 @@ testQemuDiskXMLToJSONFakeSecrets(virStorageSourcePtr sr= c) srcpriv->secinfo->type =3D VIR_DOMAIN_SECRET_INFO_TYPE_AES; srcpriv->secinfo->s.aes.username =3D g_strdup(src->auth->username); =20 - virAsprintf(&srcpriv->secinfo->s.aes.alias, "%s-secalias", - NULLSTR(src->nodestorage)); + srcpriv->secinfo->s.aes.alias =3D g_strdup_printf("%s-secalias", + NULLSTR(src->nodes= torage)); } =20 if (src->encryption) { @@ -171,8 +171,8 @@ testQemuDiskXMLToJSONFakeSecrets(virStorageSourcePtr sr= c) return -1; =20 srcpriv->encinfo->type =3D VIR_DOMAIN_SECRET_INFO_TYPE_AES; - virAsprintf(&srcpriv->encinfo->s.aes.alias, "%s-encalias", - NULLSTR(src->nodeformat)); + srcpriv->encinfo->s.aes.alias =3D g_strdup_printf("%s-encalias", + NULLSTR(src->nodef= ormat)); } =20 return 0; @@ -194,7 +194,7 @@ testQemuDiskXMLToProps(const void *opaque) char *xmlstr =3D NULL; int ret =3D -1; =20 - virAsprintf(&xmlpath, "%s%s.xml", testQemuDiskXMLToJSONPath, data->nam= e); + xmlpath =3D g_strdup_printf("%s%s.xml", testQemuDiskXMLToJSONPath, dat= a->name); =20 if (virTestLoadFile(xmlpath, &xmlstr) < 0) goto cleanup; @@ -311,7 +311,7 @@ testQemuDiskXMLToPropsValidateFile(const void *opaque) if (data->fail) return EXIT_AM_SKIP; =20 - virAsprintf(&jsonpath, "%s%s.json", testQemuDiskXMLToJSONPath, data->n= ame); + jsonpath =3D g_strdup_printf("%s%s.json", testQemuDiskXMLToJSONPath, d= ata->name); =20 for (i =3D 0; i < data->nprops; i++) { char *jsonstr; @@ -360,7 +360,7 @@ testQemuImageCreateLoadDiskXML(const char *name, g_autofree char *xmlpath =3D NULL; virStorageSourcePtr ret =3D NULL; =20 - virAsprintf(&xmlpath, "%s%s.xml", testQemuImageCreatePath, name); + xmlpath =3D g_strdup_printf("%s%s.xml", testQemuImageCreatePath, name); =20 if (!(doc =3D virXMLParseFileCtxt(xmlpath, &ctxt))) return NULL; @@ -456,7 +456,7 @@ testQemuImageCreate(const void *opaque) virBufferTrim(&actualbuf, "\n", -1); virBufferAddLit(&actualbuf, "\n"); =20 - virAsprintf(&jsonpath, "%s%s.json", testQemuImageCreatePath, data->nam= e); + jsonpath =3D g_strdup_printf("%s%s.json", testQemuImageCreatePath, dat= a->name); =20 if (!(actual =3D virBufferContentAndReset(&actualbuf))) return -1; @@ -477,8 +477,8 @@ testQemuDiskXMLToPropsValidateFileSrcOnly(const void *o= paque) if (data->fail) return EXIT_AM_SKIP; =20 - virAsprintf(&jsonpath, "%s%s-srconly.json", testQemuDiskXMLToJSONPath, - data->name); + jsonpath =3D g_strdup_printf("%s%s-srconly.json", testQemuDiskXMLToJSO= NPath, + data->name); =20 for (i =3D 0; i < data->npropssrc; i++) { g_autofree char *jsonstr =3D NULL; diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index cf1e86c893..f62f147e64 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -76,10 +76,10 @@ testQemuCaps(const void *opaque) unsigned int fakeMicrocodeVersion =3D 0; const char *p; =20 - virAsprintf(&repliesFile, "%s/%s.%s.replies", - data->dataDir, data->base, data->archName); - virAsprintf(&capsFile, "%s/%s.%s.xml", - data->dataDir, data->base, data->archName); + repliesFile =3D g_strdup_printf("%s/%s.%s.replies", + data->dataDir, data->base, data->archNam= e); + capsFile =3D g_strdup_printf("%s/%s.%s.xml", + data->dataDir, data->base, data->archName); =20 if (!(mon =3D qemuMonitorTestNewFromFileFull(repliesFile, &data->drive= r, NULL, NULL))) @@ -144,8 +144,8 @@ testQemuCapsCopy(const void *opaque) virQEMUCapsPtr copy =3D NULL; char *actual =3D NULL; =20 - virAsprintf(&capsFile, "%s/%s.%s.xml", data->dataDir, data->base, - data->archName); + capsFile =3D g_strdup_printf("%s/%s.%s.xml", data->dataDir, data->base, + data->archName); =20 if (!(caps =3D virCapabilitiesNew(virArchFromString(data->archName), false, false))) @@ -184,8 +184,8 @@ doCapsTest(const char *base, g_autofree char *title =3D NULL; g_autofree char *copyTitle =3D NULL; =20 - virAsprintf(&title, "%s (%s)", base, archName); - virAsprintf(©Title, "copy %s (%s)", base, archName); + title =3D g_strdup_printf("%s (%s)", base, archName); + copyTitle =3D g_strdup_printf("copy %s (%s)", base, archName); =20 data->base =3D base; data->archName =3D archName; diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c index f46b056c18..ea8735df36 100644 --- a/tests/qemucaps2xmltest.c +++ b/tests/qemucaps2xmltest.c @@ -102,7 +102,7 @@ testGetCaps(char *capsData, const testQemuData *data) virArch arch =3D virArchFromString(data->archName); g_autofree char *binary =3D NULL; =20 - virAsprintf(&binary, "/usr/bin/qemu-system-%s", data->archName); + binary =3D g_strdup_printf("/usr/bin/qemu-system-%s", data->archName); =20 if ((qemuCaps =3D testQemuGetCaps(capsData)) =3D=3D NULL) { fprintf(stderr, "failed to parse qemu capabilities flags"); @@ -141,10 +141,10 @@ testQemuCapsXML(const void *opaque) char *capsXml =3D NULL; virCapsPtr capsProvided =3D NULL; =20 - virAsprintf(&xmlFile, "%s/caps.%s.xml", data->outputDir, data->archNam= e); + xmlFile =3D g_strdup_printf("%s/caps.%s.xml", data->outputDir, data->a= rchName); =20 - virAsprintf(&capsFile, "%s/%s.%s.xml", data->inputDir, data->base, - data->archName); + capsFile =3D g_strdup_printf("%s/%s.%s.xml", data->inputDir, data->bas= e, + data->archName); =20 if (virTestLoadFile(capsFile, &capsData) < 0) goto cleanup; @@ -177,7 +177,7 @@ doCapsTest(const char *base, testQemuDataPtr data =3D (testQemuDataPtr) opaque; g_autofree char *title =3D NULL; =20 - virAsprintf(&title, "%s (%s)", base, archName); + title =3D g_strdup_printf("%s (%s)", base, archName); =20 data->base =3D base; data->archName =3D archName; diff --git a/tests/qemudomaincheckpointxml2xmltest.c b/tests/qemudomainchec= kpointxml2xmltest.c index 7f393d68a8..49e8cddeb3 100644 --- a/tests/qemudomaincheckpointxml2xmltest.c +++ b/tests/qemudomaincheckpointxml2xmltest.c @@ -121,7 +121,7 @@ testCheckpointPostParse(virDomainMomentDefPtr def) return -1; def->creationTime =3D mocktime; if (!def->name) - virAsprintf(&def->name, "%lld", def->creationTime); + def->name =3D g_strdup_printf("%lld", def->creationTime); return 0; } =20 diff --git a/tests/qemudomainsnapshotxml2xmltest.c b/tests/qemudomainsnapsh= otxml2xmltest.c index 0a3aaac6cf..fd3bb04e26 100644 --- a/tests/qemudomainsnapshotxml2xmltest.c +++ b/tests/qemudomainsnapshotxml2xmltest.c @@ -106,7 +106,7 @@ testSnapshotPostParse(virDomainMomentDefPtr def) return -1; def->creationTime =3D mocktime; if (!def->name) - virAsprintf(&def->name, "%lld", def->creationTime); + def->name =3D g_strdup_printf("%lld", def->creationTime); return 0; } =20 diff --git a/tests/qemufirmwaretest.c b/tests/qemufirmwaretest.c index 01d4ebc26f..906d594ace 100644 --- a/tests/qemufirmwaretest.c +++ b/tests/qemufirmwaretest.c @@ -24,7 +24,7 @@ testParseFormatFW(const void *opaque) g_autofree char *expected =3D NULL; g_autofree char *actual =3D NULL; =20 - virAsprintf(&path, "%s/qemufirmwaredata/%s", abs_srcdir, filename); + path =3D g_strdup_printf("%s/qemufirmwaredata/%s", abs_srcdir, filenam= e); =20 if (!(fw =3D qemuFirmwareParse(path))) return -1; diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index 04dc347fd8..a78f97d2ae 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -245,14 +245,14 @@ testQemuHotplug(const void *data) qemuMonitorTestPtr test_mon =3D NULL; qemuDomainObjPrivatePtr priv =3D NULL; =20 - virAsprintf(&domain_filename, "%s/qemuhotplugtestdomains/qemuhotplug-%= s.xml", - abs_srcdir, test->domain_filename); - virAsprintf(&device_filename, "%s/qemuhotplugtestdevices/qemuhotplug-%= s.xml", - abs_srcdir, test->device_filename); - virAsprintf(&result_filename, - "%s/qemuhotplugtestdomains/qemuhotplug-%s+%s.xml", - abs_srcdir, test->domain_filename, - test->device_filename); + domain_filename =3D g_strdup_printf("%s/qemuhotplugtestdomains/qemuhot= plug-%s.xml", + abs_srcdir, test->domain_filename); + device_filename =3D g_strdup_printf("%s/qemuhotplugtestdevices/qemuhot= plug-%s.xml", + abs_srcdir, test->device_filename); + result_filename =3D g_strdup_printf( + "%s/qemuhotplugtestdomains/qemuhotpl= ug-%s+%s.xml", + abs_srcdir, test->domain_filename, + test->device_filename); =20 if (virTestLoadFile(domain_filename, &domain_xml) < 0 || virTestLoadFile(device_filename, &device_xml) < 0) @@ -408,17 +408,17 @@ testQemuHotplugCpuPrepare(const char *test, char *prefix =3D NULL; struct testQemuHotplugCpuData *data =3D NULL; =20 - virAsprintf(&prefix, "%s/qemuhotplugtestcpus/%s", abs_srcdir, test); + prefix =3D g_strdup_printf("%s/qemuhotplugtestcpus/%s", abs_srcdir, te= st); =20 if (VIR_ALLOC(data) < 0) goto error; =20 data->modern =3D modern; =20 - virAsprintf(&data->file_xml_dom, "%s-domain.xml", prefix); - virAsprintf(&data->file_xml_res_live, "%s-result-live.xml", prefix); - virAsprintf(&data->file_xml_res_conf, "%s-result-conf.xml", prefix); - virAsprintf(&data->file_json_monitor, "%s-monitor.json", prefix); + data->file_xml_dom =3D g_strdup_printf("%s-domain.xml", prefix); + data->file_xml_res_live =3D g_strdup_printf("%s-result-live.xml", pref= ix); + data->file_xml_res_conf =3D g_strdup_printf("%s-result-conf.xml", pref= ix); + data->file_json_monitor =3D g_strdup_printf("%s-monitor.json", prefix); =20 if (virTestLoadFile(data->file_xml_dom, &data->xml_dom) < 0) goto error; diff --git a/tests/qemumemlocktest.c b/tests/qemumemlocktest.c index 8e395759e1..d5a4fb1268 100644 --- a/tests/qemumemlocktest.c +++ b/tests/qemumemlocktest.c @@ -34,8 +34,8 @@ testCompareMemLock(const void *data) char *xml =3D NULL; int ret =3D -1; =20 - virAsprintf(&xml, "%s/qemumemlockdata/qemumemlock-%s.xml", abs_srcdir, - info->name); + xml =3D g_strdup_printf("%s/qemumemlockdata/qemumemlock-%s.xml", abs_s= rcdir, + info->name); =20 if (!(def =3D virDomainDefParseFile(xml, driver.caps, driver.xmlopt, N= ULL, VIR_DOMAIN_DEF_PARSE_INACTIVE))) { diff --git a/tests/qemumigparamstest.c b/tests/qemumigparamstest.c index ded3a8ef64..b36aa60302 100644 --- a/tests/qemumigparamstest.c +++ b/tests/qemumigparamstest.c @@ -66,8 +66,8 @@ qemuMigParamsTestXML2XML(const void *opaque) char *actualXML =3D NULL; int ret =3D -1; =20 - virAsprintf(&xmlFile, "%s/qemumigparamsdata/%s.xml", abs_srcdir, - data->name); + xmlFile =3D g_strdup_printf("%s/qemumigparamsdata/%s.xml", abs_srcdir, + data->name); =20 if (!(doc =3D virXMLParseFileCtxt(xmlFile, &ctxt))) goto cleanup; @@ -109,10 +109,10 @@ qemuMigParamsTestXML(const void *opaque) char *actualXML =3D NULL; int ret =3D -1; =20 - virAsprintf(&replyFile, "%s/qemumigparamsdata/%s.reply", - abs_srcdir, data->name); - virAsprintf(&xmlFile, "%s/qemumigparamsdata/%s.xml", - abs_srcdir, data->name); + replyFile =3D g_strdup_printf("%s/qemumigparamsdata/%s.reply", + abs_srcdir, data->name); + xmlFile =3D g_strdup_printf("%s/qemumigparamsdata/%s.xml", + abs_srcdir, data->name); =20 if (!(mon =3D qemuMonitorTestNewFromFile(replyFile, data->xmlopt, true= ))) goto cleanup; @@ -159,10 +159,10 @@ qemuMigParamsTestJSON(const void *opaque) char *actualJSON =3D NULL; int ret =3D -1; =20 - virAsprintf(&replyFile, "%s/qemumigparamsdata/%s.reply", - abs_srcdir, data->name); - virAsprintf(&jsonFile, "%s/qemumigparamsdata/%s.json", - abs_srcdir, data->name); + replyFile =3D g_strdup_printf("%s/qemumigparamsdata/%s.reply", + abs_srcdir, data->name); + jsonFile =3D g_strdup_printf("%s/qemumigparamsdata/%s.json", + abs_srcdir, data->name); =20 if (!(mon =3D qemuMonitorTestNewFromFile(replyFile, data->xmlopt, true= ))) goto cleanup; diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index c87f7db2e0..2420ac8e18 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -796,9 +796,9 @@ qemuMonitorJSONTestAttachOneChardev(virDomainXMLOptionP= tr xmlopt, if (!reply) reply =3D ""; =20 - virAsprintf(&jsonreply, "{\"return\": {%s}}", reply); + jsonreply =3D g_strdup_printf("{\"return\": {%s}}", reply); =20 - virAsprintf(&fulllabel, "qemuMonitorJSONTestAttachChardev(%s)", label); + fulllabel =3D g_strdup_printf("qemuMonitorJSONTestAttachChardev(%s)", = label); =20 data.chr =3D chr; data.fail =3D fail; @@ -2457,12 +2457,12 @@ testQemuMonitorJSONGetCPUData(const void *opaque) if (!(test =3D qemuMonitorTestNewSchema(data->xmlopt, data->schema))) return -1; =20 - virAsprintf(&jsonFile, - "%s/qemumonitorjsondata/qemumonitorjson-getcpu-%s.json", - abs_srcdir, data->name); - virAsprintf(&dataFile, - "%s/qemumonitorjsondata/qemumonitorjson-getcpu-%s.data", - abs_srcdir, data->name); + jsonFile =3D g_strdup_printf( + "%s/qemumonitorjsondata/qemumonitorjson-get= cpu-%s.json", + abs_srcdir, data->name); + dataFile =3D g_strdup_printf( + "%s/qemumonitorjsondata/qemumonitorjson-get= cpu-%s.data", + abs_srcdir, data->name); =20 if (virTestLoadFile(jsonFile, &jsonStr) < 0) goto cleanup; @@ -2709,15 +2709,15 @@ testQemuMonitorCPUInfo(const void *opaque) if (!(test =3D qemuMonitorTestNewSchema(data->xmlopt, data->schema))) return -1; =20 - virAsprintf(&queryCpusFile, - "%s/qemumonitorjsondata/qemumonitorjson-cpuinfo-%s-cpus.js= on", - abs_srcdir, data->name); - virAsprintf(&queryHotpluggableFile, - "%s/qemumonitorjsondata/qemumonitorjson-cpuinfo-%s-hotplug= .json", - abs_srcdir, data->name); - virAsprintf(&dataFile, - "%s/qemumonitorjsondata/qemumonitorjson-cpuinfo-%s.data", - abs_srcdir, data->name); + queryCpusFile =3D g_strdup_printf( + "%s/qemumonitorjsondata/qemumonitorjso= n-cpuinfo-%s-cpus.json", + abs_srcdir, data->name); + queryHotpluggableFile =3D g_strdup_printf( + "%s/qemumonitorjsondata/qemumo= nitorjson-cpuinfo-%s-hotplug.json", + abs_srcdir, data->name); + dataFile =3D g_strdup_printf( + "%s/qemumonitorjsondata/qemumonitorjson-cpu= info-%s.data", + abs_srcdir, data->name); =20 if (virTestLoadFile(queryCpusFile, &queryCpusStr) < 0) goto cleanup; @@ -2812,8 +2812,8 @@ testBlockNodeNameDetect(const void *opaque) virBuffer buf =3D VIR_BUFFER_INITIALIZER; int ret =3D -1; =20 - virAsprintf(&resultFile, "%s/%s%s.result", abs_srcdir, pathprefix, - testname); + resultFile =3D g_strdup_printf("%s/%s%s.result", abs_srcdir, pathprefi= x, + testname); =20 if (!(namedNodesJson =3D virTestLoadFileJSON(pathprefix, testname, "-named-nodes.json", NULL))) @@ -2956,12 +2956,12 @@ testQueryJobs(const void *opaque) if (!test) return -1; =20 - virAsprintf(&filenameJSON, - abs_srcdir "/qemumonitorjsondata/query-jobs-%s.json", - data->name); - virAsprintf(&filenameResult, - abs_srcdir "/qemumonitorjsondata/query-jobs-%s.result", - data->name); + filenameJSON =3D g_strdup_printf( + abs_srcdir "/qemumonitorjsondata/query-= jobs-%s.json", + data->name); + filenameResult =3D g_strdup_printf( + abs_srcdir "/qemumonitorjsondata/quer= y-jobs-%s.result", + data->name); =20 if (virTestLoadFile(filenameJSON, &fileJSON) < 0) goto cleanup; diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index b7625bb157..3c93468a4e 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -145,8 +145,8 @@ qemuMonitorTestAddErrorResponse(qemuMonitorTestPtr test, } =20 /* format the JSON error message */ - virAsprintf(&jsonmsg, "{ \"error\": " " { \"desc\": \"%s\", " - " \"class\": \"UnexpectedCommand\" } }", escapemsg); + jsonmsg =3D g_strdup_printf("{ \"error\": " " { \"desc\": \"%s\", " + " \"class\": \"UnexpectedCommand\" } }", e= scapemsg); =20 return qemuMonitorTestAddResponse(test, jsonmsg); } @@ -158,7 +158,7 @@ qemuMonitorTestAddUnexpectedErrorResponse(qemuMonitorTe= stPtr test, { g_autofree char *msg =3D NULL; =20 - virAsprintf(&msg, "unexpected command: '%s'", command); + msg =3D g_strdup_printf("unexpected command: '%s'", command); =20 return qemuMonitorTestAddErrorResponse(test, msg); } @@ -171,8 +171,8 @@ qemuMonitorTestAddInvalidCommandResponse(qemuMonitorTes= tPtr test, { g_autofree char *msg =3D NULL; =20 - virAsprintf(&msg, "expected command '%s' got '%s'", expectedcommand, - actualcommand); + msg =3D g_strdup_printf("expected command '%s' got '%s'", expectedcomm= and, + actualcommand); =20 return qemuMonitorTestAddErrorResponse(test, msg); } @@ -191,8 +191,8 @@ qemuMonitorReportError(qemuMonitorTestPtr test, const c= har *errmsg, ...) if (virVasprintf(&msg, errmsg, msgargs) < 0) goto cleanup; =20 - virAsprintf(&jsonmsg, "{ \"error\": " " { \"desc\": \"%s\", " - " \"class\": \"UnexpectedCommand\" } }", msg); + jsonmsg =3D g_strdup_printf("{ \"error\": " " { \"desc\": \"%s\", " + " \"class\": \"UnexpectedCommand\" } }", m= sg); =20 ret =3D qemuMonitorTestAddResponse(test, jsonmsg); =20 @@ -522,7 +522,7 @@ qemuMonitorTestProcessCommandDefaultValidate(qemuMonito= rTestPtr test, if (STREQ(cmdname, "device_add")) return 0; =20 - virAsprintf(&schemapath, "%s/arg-type", cmdname); + schemapath =3D g_strdup_printf("%s/arg-type", cmdname); =20 if (virQEMUQAPISchemaPathGet(schemapath, test->qapischema, &schemaroot= ) < 0 || !schemaroot) { @@ -640,7 +640,7 @@ qemuMonitorTestProcessCommandVerbatim(qemuMonitorTestPt= r test, ret =3D qemuMonitorTestAddResponse(test, data->response); } else { if (data->cmderr) { - virAsprintf(&errmsg, "%s: %s", data->cmderr, cmdstr); + errmsg =3D g_strdup_printf("%s: %s", data->cmderr, cmdstr); =20 ret =3D qemuMonitorTestAddErrorResponse(test, errmsg); } else { @@ -731,7 +731,7 @@ qemuMonitorTestProcessGuestAgentSync(qemuMonitorTestPtr= test, goto cleanup; } =20 - virAsprintf(&retmsg, "{\"return\":%llu}", id); + retmsg =3D g_strdup_printf("{\"return\":%llu}", id); =20 =20 ret =3D qemuMonitorTestAddResponse(test, retmsg); @@ -1057,7 +1057,7 @@ qemuMonitorCommonTestNew(virDomainXMLOptionPtr xmlopt, =20 tmpdir_template =3D NULL; =20 - virAsprintf(&path, "%s/qemumonitorjsontest.sock", test->tmpdir); + path =3D g_strdup_printf("%s/qemumonitorjsontest.sock", test->tmpdir); =20 if (vm) { test->vm =3D virObjectRef(vm); @@ -1285,7 +1285,7 @@ qemuMonitorTestFullAddItem(qemuMonitorTestPtr test, char *cmderr; int ret; =20 - virAsprintf(&cmderr, "wrong expected command in %s:%zu: ", filename, l= ine); + cmderr =3D g_strdup_printf("wrong expected command in %s:%zu: ", filen= ame, line); =20 ret =3D qemuMonitorTestAddItemVerbatim(test, command, cmderr, response= ); =20 diff --git a/tests/qemusecuritymock.c b/tests/qemusecuritymock.c index 63bcae0f27..ad182c7bf7 100644 --- a/tests/qemusecuritymock.c +++ b/tests/qemusecuritymock.c @@ -117,7 +117,7 @@ get_key(const char *path, { char *ret; =20 - virAsprintf(&ret, "%s:%s", path, name); + ret =3D g_strdup_printf("%s:%s", path, name); =20 return ret; } diff --git a/tests/qemusecuritytest.c b/tests/qemusecuritytest.c index e8ebbf36d8..685ac4dca2 100644 --- a/tests/qemusecuritytest.c +++ b/tests/qemusecuritytest.c @@ -45,7 +45,7 @@ prepareObjects(virQEMUDriverPtr driver, g_autofree char *domxml =3D NULL; g_autofree char *latestCapsFile =3D NULL; =20 - virAsprintf(&filename, "%s/qemuxml2argvdata/%s.xml", abs_srcdir, xmlna= me); + filename =3D g_strdup_printf("%s/qemuxml2argvdata/%s.xml", abs_srcdir,= xmlname); =20 if (virTestLoadFile(filename, &domxml) < 0) return -1; diff --git a/tests/qemuvhostusertest.c b/tests/qemuvhostusertest.c index 903e6631dc..cc1e523841 100644 --- a/tests/qemuvhostusertest.c +++ b/tests/qemuvhostusertest.c @@ -24,7 +24,7 @@ testParseFormatVU(const void *opaque) g_autofree char *expected =3D NULL; g_autofree char *actual =3D NULL; =20 - virAsprintf(&path, "%s/qemuvhostuserdata/%s", abs_srcdir, filename); + path =3D g_strdup_printf("%s/qemuvhostuserdata/%s", abs_srcdir, filena= me); =20 if (!(vu =3D qemuVhostUserParse(path))) return -1; diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 39bc3b0aef..1aca59a3e3 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -106,8 +106,8 @@ fakeStoragePoolLookupByName(virConnectPtr conn, virStoragePoolPtr ret =3D NULL; =20 if (STRNEQ(name, "inactive")) { - virAsprintf(&xmlpath, "%s/%s%s.xml", abs_srcdir, - STORAGE_POOL_XML_PATH, name); + xmlpath =3D g_strdup_printf("%s/%s%s.xml", abs_srcdir, + STORAGE_POOL_XML_PATH, name); =20 if (!virFileExists(xmlpath)) { virReportError(VIR_ERR_NO_STORAGE_POOL, @@ -187,7 +187,7 @@ fakeStorageVolGetPath(virStorageVolPtr vol) { char *ret =3D NULL; =20 - virAsprintf(&ret, "/some/%s/device/%s", vol->key, vol->name); + ret =3D g_strdup_printf("/some/%s/device/%s", vol->key, vol->name); =20 return ret; } @@ -205,8 +205,8 @@ fakeStoragePoolGetXMLDesc(virStoragePoolPtr pool, return NULL; } =20 - virAsprintf(&xmlpath, "%s/%s%s.xml", abs_srcdir, STORAGE_POOL_XML_PATH, - pool->name); + xmlpath =3D g_strdup_printf("%s/%s%s.xml", abs_srcdir, STORAGE_POOL_XM= L_PATH, + pool->name); =20 if (virTestLoadFile(xmlpath, &xmlbuf) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -592,10 +592,10 @@ static void testInfoSetPaths(struct testQemuInfo *info, const char *suffix) { - virAsprintf(&info->infile, "%s/qemuxml2argvdata/%s.xml", - abs_srcdir, info->name); - virAsprintf(&info->outfile, "%s/qemuxml2argvdata/%s%s.args", - abs_srcdir, info->name, suffix ? suffix : ""); + info->infile =3D g_strdup_printf("%s/qemuxml2argvdata/%s.xml", + abs_srcdir, info->name); + info->outfile =3D g_strdup_printf("%s/qemuxml2argvdata/%s%s.args", + abs_srcdir, info->name, suffix ? suffi= x : ""); } =20 # define FAKEROOTDIRTEMPLATE abs_builddir "/fakerootdir-XXXXXX" diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 679b882704..02bbc504ae 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -98,18 +98,18 @@ testInfoSetPaths(struct testQemuInfo *info, VIR_FREE(info->infile); VIR_FREE(info->outfile); =20 - virAsprintf(&info->infile, "%s/qemuxml2argvdata/%s.xml", abs_srcdir, - info->name); + info->infile =3D g_strdup_printf("%s/qemuxml2argvdata/%s.xml", abs_src= dir, + info->name); =20 - virAsprintf(&info->outfile, "%s/qemuxml2xmloutdata/%s-%s%s.xml", - abs_srcdir, info->name, - when =3D=3D WHEN_ACTIVE ? "active" : "inactive", suffix); + info->outfile =3D g_strdup_printf("%s/qemuxml2xmloutdata/%s-%s%s.xml", + abs_srcdir, info->name, + when =3D=3D WHEN_ACTIVE ? "active" : "= inactive", suffix); =20 if (!virFileExists(info->outfile)) { VIR_FREE(info->outfile); =20 - virAsprintf(&info->outfile, "%s/qemuxml2xmloutdata/%s%s.xml", - abs_srcdir, info->name, suffix); + info->outfile =3D g_strdup_printf("%s/qemuxml2xmloutdata/%s%s.xml", + abs_srcdir, info->name, suffix); } =20 return 0; @@ -121,8 +121,8 @@ static const char *statusPath =3D abs_srcdir "/qemustat= usxml2xmldata/"; static void testInfoSetStatusPaths(struct testQemuInfo *info) { - virAsprintf(&info->infile, "%s%s-in.xml", statusPath, info->name); - virAsprintf(&info->outfile, "%s%s-out.xml", statusPath, info->name); + info->infile =3D g_strdup_printf("%s%s-in.xml", statusPath, info->name= ); + info->outfile =3D g_strdup_printf("%s%s-out.xml", statusPath, info->na= me); } =20 =20 diff --git a/tests/scsihosttest.c b/tests/scsihosttest.c index 947a81560a..b35ec6980a 100644 --- a/tests/scsihosttest.c +++ b/tests/scsihosttest.c @@ -72,10 +72,10 @@ create_scsihost(const char *fakesysfsdir, const char *d= evicepath, int ret =3D -1; int fd =3D -1; =20 - virAsprintf(&unique_id_path, "%s/devices/pci0000:00/%s/unique_id", - fakesysfsdir, devicepath); - virAsprintf(&link_path, "%s/class/scsi_host/%s", - fakesysfsdir, hostname); + unique_id_path =3D g_strdup_printf("%s/devices/pci0000:00/%s/unique_id= ", + fakesysfsdir, devicepath); + link_path =3D g_strdup_printf("%s/class/scsi_host/%s", + fakesysfsdir, hostname); =20 /* Rather than create path & file, temporarily snip off the file to * create the path @@ -205,7 +205,7 @@ testVirFindSCSIHostByPCI(const void *data G_GNUC_UNUSED) char *ret_host =3D NULL; int ret =3D -1; =20 - virAsprintf(&path_addr, "%s/%s", abs_srcdir, "sysfs/class/scsi_host"); + path_addr =3D g_strdup_printf("%s/%s", abs_srcdir, "sysfs/class/scsi_h= ost"); =20 if (!(ret_host =3D virSCSIHostFindByPCI(TEST_SCSIHOST_CLASS_PATH, pci_addr1, unique_id1)) || @@ -255,14 +255,14 @@ mymain(void) goto cleanup; } =20 - virAsprintf(&fakesysfsdir, "%s/sys", fakerootdir); + fakesysfsdir =3D g_strdup_printf("%s/sys", fakerootdir); =20 if (init_scsihost_sysfs(fakesysfsdir) < 0) { fprintf(stderr, "Failed to create fakesysfs=3D'%s'\n", fakesysfsdi= r); goto cleanup; } =20 - virAsprintf(&scsihost_class_path, "%s/class/scsi_host", fakesysfsdir); + scsihost_class_path =3D g_strdup_printf("%s/class/scsi_host", fakesysf= sdir); VIR_DEBUG("Reading from '%s'", scsihost_class_path); =20 if (virTestRun("testVirReadSCSIUniqueId", diff --git a/tests/secretxml2xmltest.c b/tests/secretxml2xmltest.c index 44f4615be8..9eb3c460e7 100644 --- a/tests/secretxml2xmltest.c +++ b/tests/secretxml2xmltest.c @@ -44,11 +44,11 @@ testCompareXMLToXMLHelper(const void *data) char *outxml =3D NULL; const struct testInfo *info =3D data; =20 - virAsprintf(&inxml, "%s/secretxml2xmlin/%s.xml", abs_srcdir, info->nam= e); - virAsprintf(&outxml, "%s/secretxml2xml%s/%s.xml", - abs_srcdir, - info->different ? "out" : "in", - info->name); + inxml =3D g_strdup_printf("%s/secretxml2xmlin/%s.xml", abs_srcdir, inf= o->name); + outxml =3D g_strdup_printf("%s/secretxml2xml%s/%s.xml", + abs_srcdir, + info->different ? "out" : "in", + info->name); =20 result =3D testCompareXMLToXMLFiles(inxml, outxml); =20 diff --git a/tests/securityselinuxlabeltest.c b/tests/securityselinuxlabelt= est.c index cc0de456cd..703052418c 100644 --- a/tests/securityselinuxlabeltest.c +++ b/tests/securityselinuxlabeltest.c @@ -60,7 +60,7 @@ testUserXattrEnabled(void) ssize_t len; const char *con_value =3D "system_u:object_r:svirt_image_t:s0:c41,c264= "; char *path =3D NULL; - virAsprintf(&path, "%s/securityselinuxlabeldata/testxattr", abs_buildd= ir); + path =3D g_strdup_printf("%s/securityselinuxlabeldata/testxattr", abs_= builddir); =20 if (virFileMakePath(abs_builddir "/securityselinuxlabeldata") < 0 || virFileTouch(path, 0600) < 0) @@ -88,7 +88,7 @@ testSELinuxMungePath(char **path) { char *tmp; =20 - virAsprintf(&tmp, "%s/securityselinuxlabeldata%s", abs_builddir, *path= ); + tmp =3D g_strdup_printf("%s/securityselinuxlabeldata%s", abs_builddir,= *path); =20 VIR_FREE(*path); *path =3D tmp; @@ -108,8 +108,8 @@ testSELinuxLoadFileList(const char *testname, *files =3D NULL; *nfiles =3D 0; =20 - virAsprintf(&path, "%s/securityselinuxlabeldata/%s.txt", abs_srcdir, - testname); + path =3D g_strdup_printf("%s/securityselinuxlabeldata/%s.txt", abs_src= dir, + testname); =20 if (!(fp =3D fopen(path, "r"))) goto cleanup; @@ -135,8 +135,8 @@ testSELinuxLoadFileList(const char *testname, *tmp =3D '\0'; tmp++; =20 - virAsprintf(&file, "%s/securityselinuxlabeldata%s", abs_builddir, - line); + file =3D g_strdup_printf("%s/securityselinuxlabeldata%s", abs_buil= ddir, + line); if (*tmp !=3D '\0' && *tmp !=3D '\n') { context =3D g_strdup(tmp); =20 @@ -172,8 +172,8 @@ testSELinuxLoadDef(const char *testname) virDomainDefPtr def =3D NULL; size_t i; =20 - virAsprintf(&xmlfile, "%s/securityselinuxlabeldata/%s.xml", abs_srcdir, - testname); + xmlfile =3D g_strdup_printf("%s/securityselinuxlabeldata/%s.xml", abs_= srcdir, + testname); =20 if (!(def =3D virDomainDefParseFile(xmlfile, driver.caps, driver.xmlop= t, NULL, 0))) diff --git a/tests/storagebackendsheepdogtest.c b/tests/storagebackendsheep= dogtest.c index 7d50b1a303..c7dabd976b 100644 --- a/tests/storagebackendsheepdogtest.c +++ b/tests/storagebackendsheepdogtest.c @@ -158,11 +158,11 @@ mymain(void) =20 collie_test *test =3D node_info_tests; =20 - virAsprintf(&poolxml, "%s/storagepoolxml2xmlin/pool-sheepdog.xml", - abs_srcdir); + poolxml =3D g_strdup_printf("%s/storagepoolxml2xmlin/pool-sheepdog.xml= ", + abs_srcdir); =20 - virAsprintf(&volxml, "%s/storagevolxml2xmlin/vol-sheepdog.xml", - abs_srcdir); + volxml =3D g_strdup_printf("%s/storagevolxml2xmlin/vol-sheepdog.xml", + abs_srcdir); =20 #define DO_TEST_NODE(collie) \ do { \ diff --git a/tests/storagepoolcapstest.c b/tests/storagepoolcapstest.c index 5f66a67da6..28b9f7d90a 100644 --- a/tests/storagepoolcapstest.c +++ b/tests/storagepoolcapstest.c @@ -62,8 +62,8 @@ test_virStoragePoolCapsFormat(const void *opaque) if (!(poolCaps =3D virStoragePoolCapsNew(driverCaps))) return -1; =20 - virAsprintf(&path, "%s/storagepoolcapsschemadata/poolcaps-%s.xml", - abs_srcdir, data->filename); + path =3D g_strdup_printf("%s/storagepoolcapsschemadata/poolcaps-%s.xml= ", + abs_srcdir, data->filename); =20 if (!(poolCapsXML =3D virStoragePoolCapsFormat(poolCaps))) return -1; diff --git a/tests/storagepoolxml2argvtest.c b/tests/storagepoolxml2argvtes= t.c index 50b79b4625..967d1f21a8 100644 --- a/tests/storagepoolxml2argvtest.c +++ b/tests/storagepoolxml2argvtest.c @@ -108,11 +108,11 @@ testCompareXMLToArgvHelper(const void *data) g_autofree char *poolxml =3D NULL; g_autofree char *cmdline =3D NULL; =20 - virAsprintf(&poolxml, "%s/storagepoolxml2xmlin/%s.xml", abs_srcdir, - info->pool); + poolxml =3D g_strdup_printf("%s/storagepoolxml2xmlin/%s.xml", abs_srcd= ir, + info->pool); =20 - virAsprintf(&cmdline, "%s/storagepoolxml2argvdata/%s%s.argv", - abs_srcdir, info->pool, info->platformSuffix); + cmdline =3D g_strdup_printf("%s/storagepoolxml2argvdata/%s%s.argv", + abs_srcdir, info->pool, info->platformSuffix= ); =20 return testCompareXMLToArgvFiles(info->shouldFail, poolxml, cmdline); } diff --git a/tests/storagepoolxml2xmltest.c b/tests/storagepoolxml2xmltest.c index e4c78d3fd5..382a7c659f 100644 --- a/tests/storagepoolxml2xmltest.c +++ b/tests/storagepoolxml2xmltest.c @@ -39,10 +39,10 @@ testCompareXMLToXMLHelper(const void *data) g_autofree char *inxml =3D NULL; g_autofree char *outxml =3D NULL; =20 - virAsprintf(&inxml, "%s/storagepoolxml2xmlin/%s.xml", - abs_srcdir, (const char*)data); - virAsprintf(&outxml, "%s/storagepoolxml2xmlout/%s.xml", - abs_srcdir, (const char*)data); + inxml =3D g_strdup_printf("%s/storagepoolxml2xmlin/%s.xml", + abs_srcdir, (const char*)data); + outxml =3D g_strdup_printf("%s/storagepoolxml2xmlout/%s.xml", + abs_srcdir, (const char*)data); =20 return testCompareXMLToXMLFiles(inxml, outxml); } diff --git a/tests/storagevolxml2argvtest.c b/tests/storagevolxml2argvtest.c index 833000a636..1832690e29 100644 --- a/tests/storagevolxml2argvtest.c +++ b/tests/storagevolxml2argvtest.c @@ -113,7 +113,7 @@ testCompareXMLToArgvFiles(bool shouldFail, if (!(cvtCmdline =3D virCommandToString(cmd, false))) goto cleanup; =20 - virAsprintf(&actualCmdline, "%s\n%s", createCmdline, cvtCmdlin= e); + actualCmdline =3D g_strdup_printf("%s\n%s", createCmdline, cvt= Cmdline); =20 VIR_FREE(createCmdline); } @@ -159,17 +159,17 @@ testCompareXMLToArgvHelper(const void *data) g_autofree char *cmdline =3D NULL; =20 if (info->inputvol) - virAsprintf(&inputvolxml, "%s/storagevolxml2xmlin/%s.xml", - abs_srcdir, info->inputvol); + inputvolxml =3D g_strdup_printf("%s/storagevolxml2xmlin/%s.xml", + abs_srcdir, info->inputvol); if (info->inputpool) - virAsprintf(&inputpoolxml, "%s/storagepoolxml2xmlin/%s.xml", - abs_srcdir, info->inputpool); - virAsprintf(&poolxml, "%s/storagepoolxml2xmlin/%s.xml", - abs_srcdir, info->pool); - virAsprintf(&volxml, "%s/storagevolxml2xmlin/%s.xml", - abs_srcdir, info->vol); - virAsprintf(&cmdline, "%s/storagevolxml2argvdata/%s.argv", - abs_srcdir, info->cmdline); + inputpoolxml =3D g_strdup_printf("%s/storagepoolxml2xmlin/%s.xml", + abs_srcdir, info->inputpool); + poolxml =3D g_strdup_printf("%s/storagepoolxml2xmlin/%s.xml", + abs_srcdir, info->pool); + volxml =3D g_strdup_printf("%s/storagevolxml2xmlin/%s.xml", + abs_srcdir, info->vol); + cmdline =3D g_strdup_printf("%s/storagevolxml2argvdata/%s.argv", + abs_srcdir, info->cmdline); =20 return testCompareXMLToArgvFiles(info->shouldFail, poolxml, volxml, inputpoolxml, inputvolxml, diff --git a/tests/storagevolxml2xmltest.c b/tests/storagevolxml2xmltest.c index 4e92d2818c..c65296c7eb 100644 --- a/tests/storagevolxml2xmltest.c +++ b/tests/storagevolxml2xmltest.c @@ -50,12 +50,12 @@ testCompareXMLToXMLHelper(const void *data) g_autofree char *inxml =3D NULL; g_autofree char *outxml =3D NULL; =20 - virAsprintf(&poolxml, "%s/storagepoolxml2xmlin/%s.xml", - abs_srcdir, info->pool); - virAsprintf(&inxml, "%s/storagevolxml2xmlin/%s.xml", - abs_srcdir, info->name); - virAsprintf(&outxml, "%s/storagevolxml2xmlout/%s.xml", - abs_srcdir, info->name); + poolxml =3D g_strdup_printf("%s/storagepoolxml2xmlin/%s.xml", + abs_srcdir, info->pool); + inxml =3D g_strdup_printf("%s/storagevolxml2xmlin/%s.xml", + abs_srcdir, info->name); + outxml =3D g_strdup_printf("%s/storagevolxml2xmlout/%s.xml", + abs_srcdir, info->name); =20 return testCompareXMLToXMLFiles(poolxml, inxml, outxml, info->flags); } diff --git a/tests/sysinfotest.c b/tests/sysinfotest.c index 4167d4baee..a8a0d0869e 100644 --- a/tests/sysinfotest.c +++ b/tests/sysinfotest.c @@ -91,13 +91,13 @@ sysinfotest_run(const char *test, testdata.func =3D func; =20 if (decoder) - virAsprintf(&testdata.decoder, "%s/%s", abs_srcdir, decoder); + testdata.decoder =3D g_strdup_printf("%s/%s", abs_srcdir, decoder); if (sysinfo) - virAsprintf(&testdata.sysinfo, "%s/%s", abs_srcdir, sysinfo); + testdata.sysinfo =3D g_strdup_printf("%s/%s", abs_srcdir, sysinfo); if (cpuinfo) - virAsprintf(&testdata.cpuinfo, "%s/%s", abs_srcdir, cpuinfo); + testdata.cpuinfo =3D g_strdup_printf("%s/%s", abs_srcdir, cpuinfo); if (expected) - virAsprintf(&testdata.expected, "%s/%s", abs_srcdir, expected); + testdata.expected =3D g_strdup_printf("%s/%s", abs_srcdir, expecte= d); =20 if (virTestRun(test, testSysinfo, &testdata) < 0) goto error; diff --git a/tests/testutils.c b/tests/testutils.c index 3ae66d3007..3116b1c5b9 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -404,7 +404,7 @@ virTestRewrapFile(const char *filename) return -1; } =20 - virAsprintf(&script, "%s/test-wrap-argv.pl", abs_srcdir); + script =3D g_strdup_printf("%s/test-wrap-argv.pl", abs_srcdir); =20 cmd =3D virCommandNewArgList(perl, script, "--in-place", filename, NUL= L); if (virCommandRun(cmd, NULL) < 0) @@ -663,7 +663,7 @@ virTestCompareToFile(const char *actual, if (filecontentLen > 0 && filecontent[filecontentLen - 1] =3D=3D '\n' && (cmpcontentLen =3D=3D 0 || cmpcontent[cmpcontentLen - 1] !=3D = '\n')) { - virAsprintf(&fixedcontent, "%s\n", cmpcontent); + fixedcontent =3D g_strdup_printf("%s\n", cmpcontent); cmpcontent =3D fixedcontent; } } @@ -689,9 +689,9 @@ virTestCompareToULL(unsigned long long expect, g_autofree char *expectStr =3D NULL; g_autofree char *actualStr =3D NULL; =20 - virAsprintf(&expectStr, "%llu", expect); + expectStr =3D g_strdup_printf("%llu", expect); =20 - virAsprintf(&actualStr, "%llu", actual); + actualStr =3D g_strdup_printf("%llu", actual); =20 return virTestCompareToString(expectStr, actualStr); } @@ -809,7 +809,7 @@ virTestSetEnvPath(void) =20 if (path) { if (strstr(path, abs_builddir) !=3D path) - virAsprintf(&new_path, "%s:%s", abs_builddir, path); + new_path =3D g_strdup_printf("%s:%s", abs_builddir, path); } else { new_path =3D g_strdup(abs_builddir); } diff --git a/tests/testutils.h b/tests/testutils.h index 36d2d5ba04..0088251dca 100644 --- a/tests/testutils.h +++ b/tests/testutils.h @@ -138,7 +138,7 @@ int virTestMain(int argc, if (!preload) { \ newenv =3D (char *) lib; \ } else { \ - virAsprintf(&newenv, "%s:%s", lib, preload); \ + newenv =3D g_strdup_printf("%s:%s", lib, preload); \ } \ setenv(PRELOAD_VAR, newenv, 1); \ FORCE_FLAT_NAMESPACE \ diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 3b656cdd1e..fa73e18cb5 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -809,7 +809,7 @@ testQemuGetLatestCapsForArch(const char *arch, const char *maxname =3D NULL; char *ret =3D NULL; =20 - virAsprintf(&fullsuffix, "%s.%s", arch, suffix); + fullsuffix =3D g_strdup_printf("%s.%s", arch, suffix); =20 if (virDirOpen(&dir, TEST_QEMU_CAPS_PATH) < 0) goto cleanup; @@ -845,7 +845,7 @@ testQemuGetLatestCapsForArch(const char *arch, goto cleanup; } =20 - virAsprintf(&ret, "%s/%s", TEST_QEMU_CAPS_PATH, maxname); + ret =3D g_strdup_printf("%s/%s", TEST_QEMU_CAPS_PATH, maxname); =20 cleanup: VIR_FREE(tmp); @@ -1042,8 +1042,8 @@ testQemuInfoSetArgs(struct testQemuInfo *info, if (STREQ(capsver, "latest")) { capsfile =3D g_strdup(virHashLookup(capslatest, capsarch)); stripmachinealiases =3D true; - } else virAsprintf(&capsfile, "%s/caps_%s.%s.xml", - TEST_QEMU_CAPS_PATH, capsver, capsarch); + } else capsfile =3D g_strdup_printf("%s/caps_%s.%s.xml", + TEST_QEMU_CAPS_PATH, capsver, ca= psarch); =20 if (!(qemuCaps =3D qemuTestParseCapabilitiesArch(virArchFromString= (capsarch), capsfile))) { diff --git a/tests/vboxsnapshotxmltest.c b/tests/vboxsnapshotxmltest.c index fdc2c92719..db3ef3d550 100644 --- a/tests/vboxsnapshotxmltest.c +++ b/tests/vboxsnapshotxmltest.c @@ -104,8 +104,8 @@ testCompareXMLToXMLHelper(const void *data) int result =3D -1; char *xml =3D NULL; =20 - virAsprintf(&xml, "%s/vboxsnapshotxmldata/%s.vbox", abs_srcdir, - (const char *)data); + xml =3D g_strdup_printf("%s/vboxsnapshotxmldata/%s.vbox", abs_srcdir, + (const char *)data); =20 result =3D testCompareXMLtoXMLFiles(xml); =20 diff --git a/tests/virbuftest.c b/tests/virbuftest.c index 6bbd6545ac..9d69809268 100644 --- a/tests/virbuftest.c +++ b/tests/virbuftest.c @@ -31,7 +31,7 @@ static int testBufInfiniteLoop(const void *data) * This test is a bit fragile, since it relies on virBuffer internals. */ len =3D buf->size - buf->use - 1; - virAsprintf(&addstr, "%*s", len, "a"); + addstr =3D g_strdup_printf("%*s", len, "a"); =20 if (info->doEscape) virBufferEscapeString(buf, "%s", addstr); diff --git a/tests/vircaps2xmltest.c b/tests/vircaps2xmltest.c index c0a1ef2e2b..32c8f95303 100644 --- a/tests/vircaps2xmltest.c +++ b/tests/vircaps2xmltest.c @@ -45,11 +45,11 @@ test_virCapabilities(const void *opaque) char *resctrl =3D NULL; int ret =3D -1; =20 - virAsprintf(&system, "%s/vircaps2xmldata/linux-%s/system", abs_srcdir, - data->filename); + system =3D g_strdup_printf("%s/vircaps2xmldata/linux-%s/system", abs_s= rcdir, + data->filename); =20 - virAsprintf(&resctrl, "%s/vircaps2xmldata/linux-%s/resctrl", abs_srcdi= r, - data->filename); + resctrl =3D g_strdup_printf("%s/vircaps2xmldata/linux-%s/resctrl", abs= _srcdir, + data->filename); =20 virFileWrapperAddPrefix("/sys/devices/system", system); virFileWrapperAddPrefix("/sys/fs/resctrl", resctrl); @@ -67,8 +67,8 @@ test_virCapabilities(const void *opaque) if (!(capsXML =3D virCapabilitiesFormatXML(caps))) goto cleanup; =20 - virAsprintf(&path, "%s/vircaps2xmldata/vircaps-%s-%s.xml", abs_srcdir, - archStr, data->filename); + path =3D g_strdup_printf("%s/vircaps2xmldata/vircaps-%s-%s.xml", abs_s= rcdir, + archStr, data->filename); =20 if (virTestCompareToFile(capsXML, path) < 0) goto cleanup; diff --git a/tests/vircgroupmock.c b/tests/vircgroupmock.c index 1735852f39..3168b689f2 100644 --- a/tests/vircgroupmock.c +++ b/tests/vircgroupmock.c @@ -376,8 +376,8 @@ static void init_sysfs(void) =20 VIR_FREE(fakesysfscgroupdir); =20 - virAsprintf(&fakesysfscgroupdir, "%s%s", - fakerootdir, SYSFS_CGROUP_PREFIX); + fakesysfscgroupdir =3D g_strdup_printf("%s%s", + fakerootdir, SYSFS_CGROUP_PREFIX); =20 if (virFileMakePath(fakesysfscgroupdir) < 0) { fprintf(stderr, "Cannot create %s\n", fakesysfscgroupdir); @@ -458,8 +458,8 @@ FILE *fopen(const char *path, const char *mode) errno =3D EACCES; return NULL; } - virAsprintf(&filepath, "%s/vircgroupdata/%s.%s", - abs_srcdir, filename, type); + filepath =3D g_strdup_printf("%s/vircgroupdata/%s.%s", + abs_srcdir, filename, type); rc =3D real_fopen(filepath, mode); free(filepath); return rc; diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c index 224e8116dd..07f53f1857 100644 --- a/tests/vircgrouptest.c +++ b/tests/vircgrouptest.c @@ -189,7 +189,7 @@ testCgroupDetectMounts(const void *args) =20 setenv("VIR_CGROUP_MOCK_FILENAME", data->file, 1); =20 - virAsprintf(&parsed, "%s/vircgroupdata/%s.parsed", abs_srcdir, data->f= ile); + parsed =3D g_strdup_printf("%s/vircgroupdata/%s.parsed", abs_srcdir, d= ata->file); =20 if (virCgroupNewSelf(&group) < 0) { if (data->fail) diff --git a/tests/virconftest.c b/tests/virconftest.c index c6d8ff2272..83077342a9 100644 --- a/tests/virconftest.c +++ b/tests/virconftest.c @@ -39,8 +39,8 @@ static int testConfRoundTrip(const void *opaque) char *srcfile =3D NULL; char *dstfile =3D NULL; =20 - virAsprintf(&srcfile, "%s/virconfdata/%s.conf", abs_srcdir, name); - virAsprintf(&dstfile, "%s/virconfdata/%s.out", abs_srcdir, name); + srcfile =3D g_strdup_printf("%s/virconfdata/%s.conf", abs_srcdir, name= ); + dstfile =3D g_strdup_printf("%s/virconfdata/%s.out", abs_srcdir, name); =20 if (VIR_ALLOC_N_QUIET(buffer, len) < 0) { fprintf(stderr, "out of memory\n"); diff --git a/tests/virfilemock.c b/tests/virfilemock.c index bb5fcc2ed8..65685c6d26 100644 --- a/tests/virfilemock.c +++ b/tests/virfilemock.c @@ -188,7 +188,7 @@ canonicalize_file_name(const char *path) char *ret; =20 if ((p =3D STRSKIP(path, "/some/symlink"))) - virAsprintf(&ret, "/gluster%s", p); + ret =3D g_strdup_printf("/gluster%s", p); else ret =3D g_strdup(path); =20 diff --git a/tests/virfiletest.c b/tests/virfiletest.c index ba947129be..c7d5f6abeb 100644 --- a/tests/virfiletest.c +++ b/tests/virfiletest.c @@ -325,7 +325,7 @@ testFileIsSharedFSType(const void *opaque G_GNUC_UNUSED) bool actual; int ret =3D -1; =20 - virAsprintf(&mtabFile, abs_srcdir "/virfiledata/%s", data->mtabFile); + mtabFile =3D g_strdup_printf(abs_srcdir "/virfiledata/%s", data->mtabF= ile); =20 if (setenv("LIBVIRT_MTAB", mtabFile, 1) < 0) { fprintf(stderr, "Unable to set env variable\n"); diff --git a/tests/virfilewrapper.c b/tests/virfilewrapper.c index e3d3c225ad..0500a3617e 100644 --- a/tests/virfilewrapper.c +++ b/tests/virfilewrapper.c @@ -124,7 +124,7 @@ virMockStatRedirect(const char *path, char **newpath) if (!tmp) continue; =20 - virAsprintf(newpath, "%s%s", overrides[i], tmp); + *newpath =3D g_strdup_printf("%s%s", overrides[i], tmp); break; } =20 diff --git a/tests/virhostcputest.c b/tests/virhostcputest.c index 7b1b1a6d89..01ba745338 100644 --- a/tests/virhostcputest.c +++ b/tests/virhostcputest.c @@ -55,12 +55,12 @@ linuxTestCompareFiles(const char *cpuinfofile, } VIR_FORCE_FCLOSE(cpuinfo); =20 - virAsprintf(&actualData, - "CPUs: %u/%u, MHz: %u, Nodes: %u, Sockets: %u, " - "Cores: %u, Threads: %u\n", - nodeinfo.cpus, VIR_NODEINFO_MAXCPUS(nodeinfo), - nodeinfo.mhz, nodeinfo.nodes, nodeinfo.sockets, - nodeinfo.cores, nodeinfo.threads); + actualData =3D g_strdup_printf( + "CPUs: %u/%u, MHz: %u, Nodes: %u, Sockets= : %u, " + "Cores: %u, Threads: %u\n", + nodeinfo.cpus, VIR_NODEINFO_MAXCPUS(nodei= nfo), + nodeinfo.mhz, nodeinfo.nodes, nodeinfo.so= ckets, + nodeinfo.cores, nodeinfo.threads); =20 if (virTestCompareToFile(actualData, outputfile) < 0) goto fail; @@ -176,12 +176,12 @@ linuxTestHostCPU(const void *opaque) struct linuxTestHostCPUData *data =3D (struct linuxTestHostCPUData *) = opaque; const char *archStr =3D virArchToString(data->arch); =20 - virAsprintf(&sysfs_prefix, "%s/virhostcpudata/linux-%s", - abs_srcdir, data->testName); - virAsprintf(&cpuinfo, "%s/virhostcpudata/linux-%s-%s.cpuinfo", - abs_srcdir, archStr, data->testName); - virAsprintf(&output, "%s/virhostcpudata/linux-%s-%s.expected", - abs_srcdir, archStr, data->testName); + sysfs_prefix =3D g_strdup_printf("%s/virhostcpudata/linux-%s", + abs_srcdir, data->testName); + cpuinfo =3D g_strdup_printf("%s/virhostcpudata/linux-%s-%s.cpuinfo", + abs_srcdir, archStr, data->testName); + output =3D g_strdup_printf("%s/virhostcpudata/linux-%s-%s.expected", + abs_srcdir, archStr, data->testName); =20 virFileWrapperAddPrefix(SYSFS_SYSTEM_PATH, sysfs_prefix); result =3D linuxTestCompareFiles(cpuinfo, data->arch, output); @@ -207,10 +207,10 @@ linuxTestNodeCPUStats(const void *data) char *cpustatfile =3D NULL; char *outfile =3D NULL; =20 - virAsprintf(&cpustatfile, "%s/virhostcpudata/linux-cpustat-%s.stat", - abs_srcdir, testData->name); - virAsprintf(&outfile, "%s/virhostcpudata/linux-cpustat-%s.out", - abs_srcdir, testData->name); + cpustatfile =3D g_strdup_printf("%s/virhostcpudata/linux-cpustat-%s.st= at", + abs_srcdir, testData->name); + outfile =3D g_strdup_printf("%s/virhostcpudata/linux-cpustat-%s.out", + abs_srcdir, testData->name); =20 result =3D linuxCPUStatsCompareFiles(cpustatfile, testData->ncpus, diff --git a/tests/virjsontest.c b/tests/virjsontest.c index 75c70a49c9..9da0f9c90d 100644 --- a/tests/virjsontest.c +++ b/tests/virjsontest.c @@ -26,10 +26,10 @@ testJSONFromFile(const void *data) g_autofree char *outfile =3D NULL; g_autofree char *actual =3D NULL; =20 - virAsprintf(&infile, "%s/virjsondata/parse-%s-in.json", - abs_srcdir, info->name); - virAsprintf(&outfile, "%s/virjsondata/parse-%s-out.json", - abs_srcdir, info->name); + infile =3D g_strdup_printf("%s/virjsondata/parse-%s-in.json", + abs_srcdir, info->name); + outfile =3D g_strdup_printf("%s/virjsondata/parse-%s-out.json", + abs_srcdir, info->name); =20 if (virTestLoadFile(infile, &indata) < 0) return -1; @@ -113,10 +113,10 @@ testJSONAddRemove(const void *data) g_autofree char *outfile =3D NULL; g_autofree char *actual =3D NULL; =20 - virAsprintf(&infile, "%s/virjsondata/add-remove-%s-in.json", - abs_srcdir, info->name); - virAsprintf(&outfile, "%s/virjsondata/add-remove-%s-out.json", - abs_srcdir, info->name); + infile =3D g_strdup_printf("%s/virjsondata/add-remove-%s-in.json", + abs_srcdir, info->name); + outfile =3D g_strdup_printf("%s/virjsondata/add-remove-%s-out.json", + abs_srcdir, info->name); =20 if (virTestLoadFile(infile, &indata) < 0) return -1; @@ -348,10 +348,10 @@ testJSONDeflatten(const void *data) g_autofree char *outfile =3D NULL; g_autofree char *actual =3D NULL; =20 - virAsprintf(&infile, "%s/virjsondata/deflatten-%s-in.json", - abs_srcdir, info->name); - virAsprintf(&outfile, "%s/virjsondata/deflatten-%s-out.json", - abs_srcdir, info->name); + infile =3D g_strdup_printf("%s/virjsondata/deflatten-%s-in.json", + abs_srcdir, info->name); + outfile =3D g_strdup_printf("%s/virjsondata/deflatten-%s-out.json", + abs_srcdir, info->name); =20 if (virTestLoadFile(infile, &indata) < 0) return -1; diff --git a/tests/virmacmaptest.c b/tests/virmacmaptest.c index 17880728e7..69d75dfa34 100644 --- a/tests/virmacmaptest.c +++ b/tests/virmacmaptest.c @@ -41,7 +41,7 @@ testMACLookup(const void *opaque) char *file =3D NULL; int ret =3D -1; =20 - virAsprintf(&file, "%s/virmacmaptestdata/%s.json", abs_srcdir, data->f= ile); + file =3D g_strdup_printf("%s/virmacmaptestdata/%s.json", abs_srcdir, d= ata->file); =20 if (!(mgr =3D virMacMapNew(file))) goto cleanup; @@ -92,7 +92,7 @@ testMACRemove(const void *opaque) char *file =3D NULL; int ret =3D -1; =20 - virAsprintf(&file, "%s/virmacmaptestdata/%s.json", abs_srcdir, data->f= ile); + file =3D g_strdup_printf("%s/virmacmaptestdata/%s.json", abs_srcdir, d= ata->file); =20 if (!(mgr =3D virMacMapNew(file))) goto cleanup; @@ -127,7 +127,7 @@ testMACFlush(const void *opaque) char *str =3D NULL; int ret =3D -1; =20 - virAsprintf(&file, "%s/virmacmaptestdata/%s.json", abs_srcdir, data->f= ile); + file =3D g_strdup_printf("%s/virmacmaptestdata/%s.json", abs_srcdir, d= ata->file); =20 if (virMacMapDumpStr(data->mgr, &str) < 0) goto cleanup; diff --git a/tests/virnetdaemontest.c b/tests/virnetdaemontest.c index 2dfa04e83f..825487f0a1 100644 --- a/tests/virnetdaemontest.c +++ b/tests/virnetdaemontest.c @@ -295,11 +295,11 @@ static int testExecRestart(const void *opaque) goto cleanup; } =20 - virAsprintf(&infile, "%s/virnetdaemondata/input-data-%s.json", abs_src= dir, - data->jsonfile); + infile =3D g_strdup_printf("%s/virnetdaemondata/input-data-%s.json", a= bs_srcdir, + data->jsonfile); =20 - virAsprintf(&outfile, "%s/virnetdaemondata/output-data-%s.json", - abs_srcdir, data->jsonfile); + outfile =3D g_strdup_printf("%s/virnetdaemondata/output-data-%s.json", + abs_srcdir, data->jsonfile); =20 if (virFileReadAll(infile, 8192, &injsonstr) < 0) goto cleanup; diff --git a/tests/virnetdevmock.c b/tests/virnetdevmock.c index 8834b2ca6a..f26991a48c 100644 --- a/tests/virnetdevmock.c +++ b/tests/virnetdevmock.c @@ -30,8 +30,8 @@ virNetDevSysfsFile(char **pf_sysfs_device_link, const char *ifname, const char *file) { - virAsprintf(pf_sysfs_device_link, "%s/%s/%s", - NET_DEV_TEST_DATA_PREFIX, ifname, file); + *pf_sysfs_device_link =3D g_strdup_printf("%s/%s/%s", + NET_DEV_TEST_DATA_PREFIX, ifna= me, file); return 0; } #else diff --git a/tests/virnetdevopenvswitchtest.c b/tests/virnetdevopenvswitcht= est.c index 7b814474b7..fd47e927ea 100644 --- a/tests/virnetdevopenvswitchtest.c +++ b/tests/virnetdevopenvswitchtest.c @@ -38,8 +38,8 @@ testInterfaceParseStats(const void *opaque) g_autofree char *buf =3D NULL; virDomainInterfaceStatsStruct actual; =20 - virAsprintf(&filename, "%s/virnetdevopenvswitchdata/%s", abs_srcdir, - data->filename); + filename =3D g_strdup_printf("%s/virnetdevopenvswitchdata/%s", abs_src= dir, + data->filename); =20 if (virFileReadAll(filename, 1024, &buf) < 0) return -1; diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c index 29568eea1a..4e9f201e45 100644 --- a/tests/virnetsockettest.c +++ b/tests/virnetsockettest.c @@ -196,7 +196,7 @@ testSocketAccept(const void *opaque) VIR_WARN("Failed to create temporary directory"); goto cleanup; } - virAsprintf(&path, "%s/test.sock", tmpdir); + path =3D g_strdup_printf("%s/test.sock", tmpdir); =20 if (virNetSocketNewListenUNIX(path, 0700, -1, getegid(), &usock) <= 0) goto cleanup; @@ -320,7 +320,7 @@ static int testSocketUNIXAddrs(const void *data G_GNUC_= UNUSED) VIR_WARN("Failed to create temporary directory"); goto cleanup; } - virAsprintf(&path, "%s/test.sock", tmpdir); + path =3D g_strdup_printf("%s/test.sock", tmpdir); =20 if (virNetSocketNewListenUNIX(path, 0700, -1, getegid(), &lsock) < 0) goto cleanup; diff --git a/tests/virnetworkportxml2xmltest.c b/tests/virnetworkportxml2xm= ltest.c index 89f9de0c17..1b2175dd9d 100644 --- a/tests/virnetworkportxml2xmltest.c +++ b/tests/virnetworkportxml2xmltest.c @@ -66,8 +66,8 @@ testCompareXMLToXMLHelper(const void *data) int ret =3D -1; char *xml =3D NULL; =20 - virAsprintf(&xml, "%s/virnetworkportxml2xmldata/%s.xml", abs_srcdir, - info->name); + xml =3D g_strdup_printf("%s/virnetworkportxml2xmldata/%s.xml", abs_src= dir, + info->name); =20 ret =3D testCompareXMLToXMLFiles(xml); =20 diff --git a/tests/virnumamock.c b/tests/virnumamock.c index 4a52483a7f..e6282c7f33 100644 --- a/tests/virnumamock.c +++ b/tests/virnumamock.c @@ -43,7 +43,7 @@ virNumaIsAvailable(void) if (numa_avail < 0) { char *sysfs_node_path =3D NULL; =20 - virAsprintf(&sysfs_node_path, "%s/node", SYSFS_SYSTEM_PATH); + sysfs_node_path =3D g_strdup_printf("%s/node", SYSFS_SYSTEM_PATH); =20 numa_avail =3D virFileExists(sysfs_node_path); =20 diff --git a/tests/virnwfilterbindingxml2xmltest.c b/tests/virnwfilterbindi= ngxml2xmltest.c index d5ace8f89f..3360dd28d3 100644 --- a/tests/virnwfilterbindingxml2xmltest.c +++ b/tests/virnwfilterbindingxml2xmltest.c @@ -72,8 +72,8 @@ testCompareXMLToXMLHelper(const void *data) const test_parms *tp =3D data; char *xml =3D NULL; =20 - virAsprintf(&xml, "%s/virnwfilterbindingxml2xmldata/%s.xml", abs_srcdi= r, - tp->name); + xml =3D g_strdup_printf("%s/virnwfilterbindingxml2xmldata/%s.xml", abs= _srcdir, + tp->name); =20 result =3D testCompareXMLToXMLFiles(xml); =20 diff --git a/tests/virpcimock.c b/tests/virpcimock.c index 67107450e6..0d502db68c 100644 --- a/tests/virpcimock.c +++ b/tests/virpcimock.c @@ -186,7 +186,7 @@ make_file(const char *path, if (value && len =3D=3D -1) len =3D strlen(value); =20 - virAsprintf(&filepath, "%s/%s", path, name); + filepath =3D g_strdup_printf("%s/%s", path, name); =20 if ((fd =3D real_open(filepath, O_CREAT|O_WRONLY, 0666)) < 0) ABORT("Unable to open: %s", filepath); @@ -203,7 +203,7 @@ make_dir(const char *path, { g_autofree char *dirpath =3D NULL; =20 - virAsprintf(&dirpath, "%s/%s", path, name); + dirpath =3D g_strdup_printf("%s/%s", path, name); =20 if (virFileMakePath(dirpath) < 0) ABORT("Unable to create: %s", dirpath); @@ -216,7 +216,7 @@ make_symlink(const char *path, { g_autofree char *filepath =3D NULL; =20 - virAsprintf(&filepath, "%s/%s", path, name); + filepath =3D g_strdup_printf("%s/%s", path, name); =20 if (symlink(target, filepath) < 0) ABORT("Unable to create symlink filepath -> target"); @@ -232,7 +232,7 @@ pci_read_file(const char *path, int fd =3D -1; g_autofree char *newpath =3D NULL; =20 - virAsprintf(&newpath, "%s/%s", fakerootdir, path); + newpath =3D g_strdup_printf("%s/%s", fakerootdir, path); =20 if ((fd =3D real_open(newpath, O_RDWR)) < 0) goto cleanup; @@ -269,13 +269,13 @@ getrealpath(char **newpath, init_env(); =20 if (STRPREFIX(path, SYSFS_PCI_PREFIX)) { - virAsprintf(newpath, "%s/sys/bus/pci/%s", - fakerootdir, - path + strlen(SYSFS_PCI_PREFIX)); + *newpath =3D g_strdup_printf("%s/sys/bus/pci/%s", + fakerootdir, + path + strlen(SYSFS_PCI_PREFIX)); } else if (pathPrefixIsMocked(path)) { - virAsprintf(newpath, "%s/%s", - fakerootdir, - path); + *newpath =3D g_strdup_printf("%s/%s", + fakerootdir, + path); } else { *newpath =3D g_strdup(path); } @@ -356,9 +356,9 @@ pci_address_format(struct pciDeviceAddress const *addr) { char *ret; =20 - virAsprintf(&ret, ADDR_STR_FMT, - addr->domain, addr->bus, - addr->device, addr->function); + ret =3D g_strdup_printf(ADDR_STR_FMT, + addr->domain, addr->bus, + addr->device, addr->function); return ret; } =20 @@ -393,13 +393,13 @@ pci_device_get_path(const struct pciDevice *dev, * and then they are just symlinked to /sys/bus/pci/devices/ */ if (file) { - virAsprintf(&ret, "%s/sys/devices/pci%04x:%02x/%s/%s", - prefix, dev->addr.domain, dev->addr.bus, - devid, file); + ret =3D g_strdup_printf("%s/sys/devices/pci%04x:%02x/%s/%s", + prefix, dev->addr.domain, dev->addr.bus, + devid, file); } else { - virAsprintf(&ret, "%s/sys/devices/pci%04x:%02x/%s", - prefix, dev->addr.domain, dev->addr.bus, - devid); + ret =3D g_strdup_printf("%s/sys/devices/pci%04x:%02x/%s", + prefix, dev->addr.domain, dev->addr.bus, + devid); } =20 return ret; @@ -415,8 +415,8 @@ pci_device_create_iommu(const struct pciDevice *dev, char tmp[256]; size_t i; =20 - virAsprintf(&iommuPath, "%s/sys/kernel/iommu_groups/%d/devices/", - fakerootdir, dev->iommuGroup); + iommuPath =3D g_strdup_printf("%s/sys/kernel/iommu_groups/%d/devices/", + fakerootdir, dev->iommuGroup); =20 if (virFileMakePath(iommuPath) < 0) ABORT("Unable to create: %s", iommuPath); @@ -482,7 +482,7 @@ pci_device_new_from_stub(const struct pciDevice *data) if (VIR_ALLOC_QUIET(dev) < 0) ABORT_OOM(); =20 - virAsprintf(&configSrc, "%s/virpcitestdata/%s.config", abs_srcdir, id); + configSrc =3D g_strdup_printf("%s/virpcitestdata/%s.config", abs_srcdi= r, id); =20 memcpy(dev, data, sizeof(*dev)); =20 @@ -544,7 +544,7 @@ pci_device_new_from_stub(const struct pciDevice *data) ABORT("@tmp overflow"); } =20 - virAsprintf(&devsympath, "%s" SYSFS_PCI_PREFIX "devices", fakerootdir); + devsympath =3D g_strdup_printf("%s" SYSFS_PCI_PREFIX "devices", fakero= otdir); =20 make_symlink(devsympath, devid, tmp); =20 @@ -625,9 +625,9 @@ pci_vfio_release_iommu(struct pciDevice *device) pciIommuGroups[i]->nDevicesBoundToVFIO--; =20 if (!pciIommuGroups[i]->nDevicesBoundToVFIO) { - virAsprintf(&vfiopath, "%s/dev/vfio/%d", - fakerootdir, - device->iommuGroup); + vfiopath =3D g_strdup_printf("%s/dev/vfio/%d", + fakerootdir, + device->iommuGroup); =20 if (unlink(vfiopath) < 0) return -1; @@ -651,9 +651,9 @@ pci_vfio_lock_iommu(struct pciDevice *device) continue; =20 if (pciIommuGroups[i]->nDevicesBoundToVFIO =3D=3D 0) { - virAsprintf(&vfiopath, "%s/dev/vfio/%d", - fakerootdir, - device->iommuGroup); + vfiopath =3D g_strdup_printf("%s/dev/vfio/%d", + fakerootdir, + device->iommuGroup); if ((fd =3D real_open(vfiopath, O_CREAT)) < 0) goto cleanup; =20 @@ -685,11 +685,11 @@ pci_driver_get_path(const struct pciDriver *driver, prefix =3D fakerootdir; =20 if (file) { - virAsprintf(&ret, "%s" SYSFS_PCI_PREFIX "drivers/%s/%s", - prefix, driver->name, file); + ret =3D g_strdup_printf("%s" SYSFS_PCI_PREFIX "drivers/%s/%s", + prefix, driver->name, file); } else { - virAsprintf(&ret, "%s" SYSFS_PCI_PREFIX "drivers/%s", - prefix, driver->name); + ret =3D g_strdup_printf("%s" SYSFS_PCI_PREFIX "drivers/%s", + prefix, driver->name); } =20 return ret; @@ -971,7 +971,7 @@ init_env(void) if (!(fakerootdir =3D getenv("LIBVIRT_FAKE_ROOT_DIR"))) ABORT("Missing LIBVIRT_FAKE_ROOT_DIR env variable\n"); =20 - virAsprintf(&tmp, "%s%s", fakerootdir, SYSFS_PCI_PREFIX); + tmp =3D g_strdup_printf("%s%s", fakerootdir, SYSFS_PCI_PREFIX); =20 if (virFileMakePath(tmp) < 0) ABORT("Unable to create: %s", tmp); @@ -982,7 +982,7 @@ init_env(void) =20 /* Create /dev/vfio/ dir and /dev/vfio/vfio file */ VIR_FREE(tmp); - virAsprintf(&tmp, "%s/dev/vfio", fakerootdir); + tmp =3D g_strdup_printf("%s/dev/vfio", fakerootdir); =20 if (virFileMakePath(tmp) < 0) ABORT("Unable to create: %s", tmp); diff --git a/tests/virpcitest.c b/tests/virpcitest.c index 20eb2caea9..0bac23cb23 100644 --- a/tests/virpcitest.c +++ b/tests/virpcitest.c @@ -349,8 +349,8 @@ mymain(void) domain, bus, slot, function, NULL \ }; \ char *label =3D NULL; \ - virAsprintf(&label, "%s(%04x:%02x:%02x.%x)", \ - #fnc, domain, bus, slot, function); \ + label =3D g_strdup_printf("%s(%04x:%02x:%02x.%x)", \ +#fnc, domain, bus, slot, function); \ if (virTestRun(label, fnc, &data) < 0) \ ret =3D -1; \ VIR_FREE(label); \ @@ -362,9 +362,9 @@ mymain(void) domain, bus, slot, function, driver \ }; \ char *label =3D NULL; \ - virAsprintf(&label, "PCI driver %04x:%02x:%02x.%x is %s", \ - domain, bus, slot, function, \ - NULLSTR(driver)); \ + label =3D g_strdup_printf("PCI driver %04x:%02x:%02x.%x is %s", \ + domain, bus, slot, function, \ + NULLSTR(driver)); \ if (virTestRun(label, testVirPCIDeviceCheckDriverTest, \ &data) < 0) \ ret =3D -1; \ diff --git a/tests/virrandommock.c b/tests/virrandommock.c index eff72a8aa7..6dd15213e3 100644 --- a/tests/virrandommock.c +++ b/tests/virrandommock.c @@ -53,8 +53,8 @@ uint64_t virRandomBits(int nbits) int virRandomGenerateWWN(char **wwn, const char *virt_type G_GNUC_UNUSED) { - virAsprintf(wwn, "5100000%09llx", - (unsigned long long)virRandomBits(36)); + *wwn =3D g_strdup_printf("5100000%09llx", + (unsigned long long)virRandomBits(36)); return 0; } =20 diff --git a/tests/virresctrltest.c b/tests/virresctrltest.c index 71870e9f3f..bb6d0fe48e 100644 --- a/tests/virresctrltest.c +++ b/tests/virresctrltest.c @@ -26,14 +26,14 @@ test_virResctrlGetUnused(const void *opaque) char *schemata_file; virCapsPtr caps =3D NULL; =20 - virAsprintf(&system_dir, "%s/vircaps2xmldata/linux-%s/system", abs_src= dir, - data->filename); + system_dir =3D g_strdup_printf("%s/vircaps2xmldata/linux-%s/system", a= bs_srcdir, + data->filename); =20 - virAsprintf(&resctrl_dir, "%s/vircaps2xmldata/linux-%s/resctrl", - abs_srcdir, data->filename); + resctrl_dir =3D g_strdup_printf("%s/vircaps2xmldata/linux-%s/resctrl", + abs_srcdir, data->filename); =20 - virAsprintf(&schemata_file, "%s/virresctrldata/%s.schemata", abs_srcdi= r, - data->filename); + schemata_file =3D g_strdup_printf("%s/virresctrldata/%s.schemata", abs= _srcdir, + data->filename); =20 virFileWrapperAddPrefix("/sys/devices/system", system_dir); virFileWrapperAddPrefix("/sys/fs/resctrl", resctrl_dir); diff --git a/tests/virschematest.c b/tests/virschematest.c index 1370068601..c301b37a9d 100644 --- a/tests/virschematest.c +++ b/tests/virschematest.c @@ -87,9 +87,9 @@ testSchemaDir(const char *schema, if (ent->d_name[0] =3D=3D '.') continue; =20 - virAsprintf(&xml_path, "%s/%s", dir_path, ent->d_name); + xml_path =3D g_strdup_printf("%s/%s", dir_path, ent->d_name); =20 - virAsprintf(&test_name, "Checking %s against %s", ent->d_name, sch= ema); + test_name =3D g_strdup_printf("Checking %s against %s", ent->d_nam= e, schema); =20 data.xml_path =3D xml_path; if (virTestRun(test_name, testSchemaFile, &data) < 0) @@ -120,7 +120,7 @@ testSchemaDirs(const char *schema, virXMLValidatorPtr v= alidator, ...) va_start(args, validator); =20 while ((dir =3D va_arg(args, char *))) { - virAsprintf(&dir_path, "%s/%s", abs_srcdir, dir); + dir_path =3D g_strdup_printf("%s/%s", abs_srcdir, dir); if (testSchemaDir(schema, validator, dir_path) < 0) ret =3D -1; VIR_FREE(dir_path); @@ -139,8 +139,8 @@ testSchemaGrammar(const void *opaque) char *schema_path; int ret =3D -1; =20 - virAsprintf(&schema_path, "%s/docs/schemas/%s", abs_top_srcdir, - data->schema); + schema_path =3D g_strdup_printf("%s/docs/schemas/%s", abs_top_srcdir, + data->schema); =20 if (!(data->validator =3D virXMLValidatorInit(schema_path))) goto cleanup; diff --git a/tests/virscsitest.c b/tests/virscsitest.c index 0d2ddd3b6a..4d40f2bb82 100644 --- a/tests/virscsitest.c +++ b/tests/virscsitest.c @@ -167,9 +167,9 @@ create_symlink(const char *tmpdir, const char *src_name= , const char *dst_name) char *src_path =3D NULL; char *dst_path =3D NULL; =20 - virAsprintf(&src_path, "%s/%s", virscsi_prefix, src_name); + src_path =3D g_strdup_printf("%s/%s", virscsi_prefix, src_name); =20 - virAsprintf(&dst_path, "%s/%s", tmpdir, dst_name); + dst_path =3D g_strdup_printf("%s/%s", tmpdir, dst_name); =20 if (symlink(src_path, dst_path) < 0) { VIR_WARN("Failed to create symlink '%s' to '%s'", src_path, dst_pa= th); @@ -192,7 +192,7 @@ mymain(void) char *tmpdir =3D NULL; char template[] =3D "/tmp/libvirt_XXXXXX"; =20 - virAsprintf(&virscsi_prefix, "%s" VIR_SCSI_DATA, abs_srcdir); + virscsi_prefix =3D g_strdup_printf("%s" VIR_SCSI_DATA, abs_srcdir); =20 tmpdir =3D mkdtemp(template); =20 diff --git a/tests/virshtest.c b/tests/virshtest.c index 475933a93c..189238b826 100644 --- a/tests/virshtest.c +++ b/tests/virshtest.c @@ -252,8 +252,8 @@ mymain(void) { int ret =3D 0; =20 - virAsprintf(&custom_uri, "test://%s/../examples/xml/test/testnode.xml", - abs_srcdir); + custom_uri =3D g_strdup_printf("test://%s/../examples/xml/test/testnod= e.xml", + abs_srcdir); =20 if (virTestRun("virsh list (default)", testCompareListDefault, NULL) !=3D 0) diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index af1b4fc43f..f0de35dd83 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -138,12 +138,12 @@ testPrepImages(void) compat =3D true; VIR_FREE(buf); =20 - virAsprintf(&absraw, "%s/raw", datadir); - virAsprintf(&absqcow2, "%s/qcow2", datadir); - virAsprintf(&abswrap, "%s/wrap", datadir); - virAsprintf(&absqed, "%s/qed", datadir); - virAsprintf(&absdir, "%s/dir", datadir); - virAsprintf(&abslink2, "%s/sub/link2", datadir); + absraw =3D g_strdup_printf("%s/raw", datadir); + absqcow2 =3D g_strdup_printf("%s/qcow2", datadir); + abswrap =3D g_strdup_printf("%s/wrap", datadir); + absqed =3D g_strdup_printf("%s/qed", datadir); + absdir =3D g_strdup_printf("%s/dir", datadir); + abslink2 =3D g_strdup_printf("%s/sub/link2", datadir); =20 if (virFileMakePath(datadir "/sub") < 0) { fprintf(stderr, "unable to create directory %s\n", datadir "/sub"); @@ -159,7 +159,7 @@ testPrepImages(void) goto cleanup; } =20 - virAsprintf(&buf, "%1024d", 0); + buf =3D g_strdup_printf("%1024d", 0); if (virFileWriteStr("raw", buf, 0600) < 0) { fprintf(stderr, "unable to create raw file\n"); goto cleanup; @@ -321,28 +321,28 @@ testStorageChain(const void *args) return -1; } =20 - virAsprintf(&expect, - testStorageChainFormat, i, - NULLSTR(data->files[i]->path), - NULLSTR(data->files[i]->expBackingStoreRaw), - data->files[i]->expCapacity, - data->files[i]->expEncrypted, - NULLSTR(data->files[i]->pathRel), - data->files[i]->type, - data->files[i]->format, - virStorageNetProtocolTypeToString(data->files[i]->prot= ocol), - NULLSTR(data->files[i]->hostname)); - virAsprintf(&actual, - testStorageChainFormat, i, - NULLSTR(elt->path), - NULLSTR(elt->backingStoreRaw), - elt->capacity, - !!elt->encryption, - NULLSTR(elt->relPath), - elt->type, - elt->format, - virStorageNetProtocolTypeToString(elt->protocol), - NULLSTR(elt->nhosts ? elt->hosts[0].name : NULL)); + expect =3D g_strdup_printf( + testStorageChainFormat, i, + NULLSTR(data->files[i]->path), + NULLSTR(data->files[i]->expBackingStoreRa= w), + data->files[i]->expCapacity, + data->files[i]->expEncrypted, + NULLSTR(data->files[i]->pathRel), + data->files[i]->type, + data->files[i]->format, + virStorageNetProtocolTypeToString(data->f= iles[i]->protocol), + NULLSTR(data->files[i]->hostname)); + actual =3D g_strdup_printf( + testStorageChainFormat, i, + NULLSTR(elt->path), + NULLSTR(elt->backingStoreRaw), + elt->capacity, + !!elt->encryption, + NULLSTR(elt->relPath), + elt->type, + elt->format, + virStorageNetProtocolTypeToString(elt->pr= otocol), + NULLSTR(elt->nhosts ? elt->hosts[0].name = : NULL)); if (STRNEQ(expect, actual)) { virTestDifference(stderr, expect, actual); return -1; diff --git a/tests/virtestmock.c b/tests/virtestmock.c index 116a6ad400..046898dbe1 100644 --- a/tests/virtestmock.c +++ b/tests/virtestmock.c @@ -110,7 +110,7 @@ checkPath(const char *path, char *crippledPath =3D NULL; =20 if (path[0] !=3D '/') - virAsprintf(&relPath, "./%s", path); + relPath =3D g_strdup_printf("./%s", path); =20 /* Le sigh. virFileCanonicalizePath() expects @path to exist, otherwise * it will return an error. So if we are called over an non-existent diff --git a/tests/virusbmock.c b/tests/virusbmock.c index 1b0beb81cb..57c9611e54 100644 --- a/tests/virusbmock.c +++ b/tests/virusbmock.c @@ -54,7 +54,7 @@ static char *get_fake_path(const char *real_path) char *path =3D NULL; =20 if ((p =3D STRSKIP(real_path, USB_SYSFS))) - virAsprintf(&path, "%s/%s/%s", abs_srcdir, FAKE_USB_SYSFS, p); + path =3D g_strdup_printf("%s/%s/%s", abs_srcdir, FAKE_USB_SYSFS, p= ); else if (!p) path =3D g_strdup(real_path); =20 diff --git a/tests/virusbtest.c b/tests/virusbtest.c index 94c55e1fb8..7df4e3aec3 100644 --- a/tests/virusbtest.c +++ b/tests/virusbtest.c @@ -52,8 +52,8 @@ static int testDeviceFileActor(virUSBDevicePtr dev, char *str =3D NULL; int ret =3D 0; =20 - virAsprintf(&str, USB_DEVFS "%03d/%03d", virUSBDeviceGetBus(dev), - virUSBDeviceGetDevno(dev)); + str =3D g_strdup_printf(USB_DEVFS "%03d/%03d", virUSBDeviceGetBus(dev), + virUSBDeviceGetDevno(dev)); =20 if (STRNEQ(path, str)) { virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/tests/vmwarevertest.c b/tests/vmwarevertest.c index b482873103..fa909ad022 100644 --- a/tests/vmwarevertest.c +++ b/tests/vmwarevertest.c @@ -43,7 +43,7 @@ testVerStrParse(const void *data) unsigned long version; int vmware_type; =20 - virAsprintf(&path, "%s/vmwareverdata/%s.txt", abs_srcdir, info->name); + path =3D g_strdup_printf("%s/vmwareverdata/%s.txt", abs_srcdir, info->= name); =20 if (virTestLoadFile(path, &databuf) < 0) goto cleanup; diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c index 7e05052744..ad7b3360c3 100644 --- a/tests/vmx2xmltest.c +++ b/tests/vmx2xmltest.c @@ -114,10 +114,10 @@ testCompareHelper(const void *data) char *vmx =3D NULL; char *xml =3D NULL; =20 - virAsprintf(&vmx, "%s/vmx2xmldata/vmx2xml-%s.vmx", abs_srcdir, - info->input); - virAsprintf(&xml, "%s/vmx2xmldata/vmx2xml-%s.xml", abs_srcdir, - info->output); + vmx =3D g_strdup_printf("%s/vmx2xmldata/vmx2xml-%s.vmx", abs_srcdir, + info->input); + xml =3D g_strdup_printf("%s/vmx2xmldata/vmx2xml-%s.xml", abs_srcdir, + info->output); =20 ret =3D testCompareFiles(vmx, xml); =20 @@ -148,7 +148,7 @@ testParseVMXFileName(const char *fileName, void *opaque= G_GNUC_UNUSED) goto cleanup; } =20 - virAsprintf(&src, "[%s] %s", datastoreName, directoryAndFileName); + src =3D g_strdup_printf("[%s] %s", datastoreName, directoryAndFile= Name); } else if (STRPREFIX(fileName, "/")) { /* Found absolute path referencing a file outside a datastore */ src =3D g_strdup(fileName); @@ -157,7 +157,7 @@ testParseVMXFileName(const char *fileName, void *opaque= G_GNUC_UNUSED) src =3D NULL; } else { /* Found single file name referencing a file inside a datastore */ - virAsprintf(&src, "[datastore] directory/%s", fileName); + src =3D g_strdup_printf("[datastore] directory/%s", fileName); } =20 cleanup: diff --git a/tests/xlconfigtest.c b/tests/xlconfigtest.c index 25988b1ae8..5a094e3b0e 100644 --- a/tests/xlconfigtest.c +++ b/tests/xlconfigtest.c @@ -187,8 +187,8 @@ testCompareHelper(const void *data) char *xml =3D NULL; char *cfg =3D NULL; =20 - virAsprintf(&xml, "%s/xlconfigdata/test-%s.xml", abs_srcdir, info->nam= e); - virAsprintf(&cfg, "%s/xlconfigdata/test-%s.cfg", abs_srcdir, info->nam= e); + xml =3D g_strdup_printf("%s/xlconfigdata/test-%s.xml", abs_srcdir, inf= o->name); + cfg =3D g_strdup_printf("%s/xlconfigdata/test-%s.cfg", abs_srcdir, inf= o->name); =20 if (info->mode =3D=3D 0) result =3D testCompareParseXML(cfg, xml, info->replaceVars); diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c index 55fcd95081..82f4908a63 100644 --- a/tests/xmconfigtest.c +++ b/tests/xmconfigtest.c @@ -131,8 +131,8 @@ testCompareHelper(const void *data) char *cfg =3D NULL; char *cfgout =3D NULL; =20 - virAsprintf(&xml, "%s/xmconfigdata/test-%s.xml", abs_srcdir, info->nam= e); - virAsprintf(&cfg, "%s/xmconfigdata/test-%s.cfg", abs_srcdir, info->nam= e); + xml =3D g_strdup_printf("%s/xmconfigdata/test-%s.xml", abs_srcdir, inf= o->name); + cfg =3D g_strdup_printf("%s/xmconfigdata/test-%s.cfg", abs_srcdir, inf= o->name); =20 if (info->mode =3D=3D 0) result =3D testCompareParseXML(cfg, xml); diff --git a/tests/xml2vmxtest.c b/tests/xml2vmxtest.c index b39862b4bb..8dc37f265a 100644 --- a/tests/xml2vmxtest.c +++ b/tests/xml2vmxtest.c @@ -115,10 +115,10 @@ testCompareHelper(const void *data) char *xml =3D NULL; char *vmx =3D NULL; =20 - virAsprintf(&xml, "%s/xml2vmxdata/xml2vmx-%s.xml", abs_srcdir, - info->input); - virAsprintf(&vmx, "%s/xml2vmxdata/xml2vmx-%s.vmx", abs_srcdir, - info->output); + xml =3D g_strdup_printf("%s/xml2vmxdata/xml2vmx-%s.xml", abs_srcdir, + info->input); + vmx =3D g_strdup_printf("%s/xml2vmxdata/xml2vmx-%s.vmx", abs_srcdir, + info->output); =20 result =3D testCompareFiles(xml, vmx, info->virtualHW_version); =20 @@ -166,8 +166,8 @@ testFormatVMXFileName(const char *src, void *opaque G_G= NUC_UNUSED) directoryAndFileName +=3D strspn(directoryAndFileName, " "); } =20 - virAsprintf(&absolutePath, "/vmfs/volumes/%s/%s", datastoreName, - directoryAndFileName); + absolutePath =3D g_strdup_printf("/vmfs/volumes/%s/%s", datastoreN= ame, + directoryAndFileName); } else if (STRPREFIX(src, "/")) { /* Found absolute path */ absolutePath =3D g_strdup(src); --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571753046; cv=none; d=zoho.com; s=zohoarc; b=Z9vCjrWNDLUUDNvcxAoI2pPS99AWNlCyxQoUMEywva8OJQw8pl67C4MS/DsQvxb0AIA8XSAItpQlkhz21Mcp+WQUeNK40g6cpfZY6zwx2PXOARtp2IcR8xCSHZfrBk2JGIy5GLV4Co/RNWYYnLnSgPOWg0KOPZWoiDuu8VjziYU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571753046; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=akUZe7+3mc03EBJSl0nzP7+VljsQRhEhjw82p9L2hPI=; b=PBeYqIrttgvCp2dUSP/AYqSeuNLb/PlE8PunvsB/5cSeArnkmofNEv5TVMNn5IUqaqKCHS6sMDBDGDg6i01fUaGs6HjT0qpo/PNLlf+DRoQ306UbvoGnTRxg1noqsmbX9k7EjmoIUs1jR2CQBM0rkEYWVFYbkGknzPprtMe6I0g= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1571753046832885.8107822615416; Tue, 22 Oct 2019 07:04:06 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-198-mE3MQcT9Mr62I5mGLBT5tA-1; Tue, 22 Oct 2019 10:01:29 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6C1C0800D62; Tue, 22 Oct 2019 14:01:23 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2849F10512; Tue, 22 Oct 2019 14:01:23 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id ACFC2180BA9D; Tue, 22 Oct 2019 14:01:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9ME10Dh002912 for ; Tue, 22 Oct 2019 10:01:00 -0400 Received: by smtp.corp.redhat.com (Postfix) id D3F186012E; Tue, 22 Oct 2019 14:01:00 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5ADBB6012C for ; Tue, 22 Oct 2019 14:01:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571753045; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=akUZe7+3mc03EBJSl0nzP7+VljsQRhEhjw82p9L2hPI=; b=h8rNxuHqkkJWKeMBOZy1p3b+CeF1b4/gJfI3X3+rdFtdXTG6s+ILkHbhSKumxensnElUpq nMbIZQh8CWJ2YiT+EWw87MM6qC7KR8WsumUhzV7zSHgXbOM2Tr8KFRZmWUdvqi/8iM4xYq vjvftKQivjOuaqgtbAfQqPR6ANRyWLk= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:58:10 +0200 Message-Id: <688949a88981a2af95792046dbb742fcf80b1604.1571752582.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 66/75] tools: Use g_strdup_printf() instead of virAsprintf() X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: mE3MQcT9Mr62I5mGLBT5tA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Michal Privoznik --- tools/virsh-completer-domain.c | 6 +++--- tools/virsh-completer-host.c | 10 +++++----- tools/virsh-completer.c | 2 +- tools/virsh-domain-monitor.c | 18 +++++++++--------- tools/virsh-domain.c | 22 +++++++++++----------- tools/virsh-host.c | 2 +- tools/virsh-interface.c | 2 +- tools/virsh-network.c | 2 +- tools/virsh-pool.c | 12 ++++++------ tools/virsh-volume.c | 6 +++--- tools/virt-admin.c | 4 ++-- tools/vsh.c | 22 +++++++++++----------- 12 files changed, 54 insertions(+), 54 deletions(-) diff --git a/tools/virsh-completer-domain.c b/tools/virsh-completer-domain.c index 0bf6202c0a..d625ab8bb4 100644 --- a/tools/virsh-completer-domain.c +++ b/tools/virsh-completer-domain.c @@ -221,9 +221,9 @@ virshDomainInterfaceStateCompleter(vshControl *ctl, if (virMacAddrParse(iface, &macaddr) =3D=3D 0) virMacAddrFormat(&macaddr, macstr); =20 - virAsprintf(&xpath, "/domain/devices/interface[(mac/@address =3D '%s')= or " - " (target/@dev =3D '%s')]", macst= r, - iface); + xpath =3D g_strdup_printf("/domain/devices/interface[(mac/@address =3D= '%s') or " + " (target/@dev =3D '%= s')]", macstr, + iface); =20 if ((ninterfaces =3D virXPathNodeSet(xpath, ctxt, &interfaces)) < 0) return NULL; diff --git a/tools/virsh-completer-host.c b/tools/virsh-completer-host.c index 8cb98ad88d..41615226d2 100644 --- a/tools/virsh-completer-host.c +++ b/tools/virsh-completer-host.c @@ -44,7 +44,7 @@ virshPagesizeNodeToString(xmlNodePtr node) if (virScaleInteger(&byteval, unit, 1024, UINT_MAX) < 0) return NULL; size =3D vshPrettyCapacity(byteval, &suffix); - virAsprintf(&ret, "%.0f%s", size, suffix); + ret =3D g_strdup_printf("%.0f%s", size, suffix); return ret; } =20 @@ -78,11 +78,11 @@ virshAllocpagesPagesizeCompleter(vshControl *ctl, return NULL; =20 if (cellno && vshCommandOptStringQuiet(ctl, cmd, "cellno", &cellnum) >= 0) { - virAsprintf(&path, - "/capabilities/host/topology/cells/cell[@id=3D\"%s\"]/= pages", - cellnum); + path =3D g_strdup_printf( + "/capabilities/host/topology/cells/cell[@id= =3D\"%s\"]/pages", + cellnum); } else { - virAsprintf(&path, "/capabilities/host/cpu/pages"); + path =3D g_strdup_printf("/capabilities/host/cpu/pages"); } =20 npages =3D virXPathNodeSet(path, ctxt, &pages); diff --git a/tools/virsh-completer.c b/tools/virsh-completer.c index 8bd7be888f..1d9d212f8a 100644 --- a/tools/virsh-completer.c +++ b/tools/virsh-completer.c @@ -119,7 +119,7 @@ virshCommaStringListComplete(const char *input, continue; =20 if (inputCopy) - virAsprintf(&ret[nret], "%s,%s", inputCopy, options[i]); + ret[nret] =3D g_strdup_printf("%s,%s", inputCopy, options[i]); else ret[nret] =3D g_strdup(options[i]); =20 diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 9178e534d6..530bfeca1b 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -431,9 +431,9 @@ cmdDomblkinfoGet(const virDomainBlockInfo *info, *alloc =3D g_strdup("-"); *phy =3D g_strdup("-"); } else if (!human) { - virAsprintf(cap, "%llu", info->capacity); - virAsprintf(alloc, "%llu", info->allocation); - virAsprintf(phy, "%llu", info->physical); + *cap =3D g_strdup_printf("%llu", info->capacity); + *alloc =3D g_strdup_printf("%llu", info->allocation); + *phy =3D g_strdup_printf("%llu", info->physical); } else { double val_cap, val_alloc, val_phy; const char *unit_cap, *unit_alloc, *unit_phy; @@ -442,9 +442,9 @@ cmdDomblkinfoGet(const virDomainBlockInfo *info, val_alloc =3D vshPrettyCapacity(info->allocation, &unit_alloc); val_phy =3D vshPrettyCapacity(info->physical, &unit_phy); =20 - virAsprintf(cap, "%.3lf %s", val_cap, unit_cap); - virAsprintf(alloc, "%.3lf %s", val_alloc, unit_alloc); - virAsprintf(phy, "%.3lf %s", val_phy, unit_phy); + *cap =3D g_strdup_printf("%.3lf %s", val_cap, unit_cap); + *alloc =3D g_strdup_printf("%.3lf %s", val_alloc, unit_alloc); + *phy =3D g_strdup_printf("%.3lf %s", val_phy, unit_phy); } =20 return true; @@ -826,9 +826,9 @@ cmdDomIfGetLink(vshControl *ctl, const vshCmd *cmd) if (virMacAddrParse(iface, &macaddr) =3D=3D 0) virMacAddrFormat(&macaddr, macstr); =20 - virAsprintf(&xpath, "/domain/devices/interface[(mac/@address =3D '%s')= or " - " (target/@dev =3D '%s')]", macst= r, - iface); + xpath =3D g_strdup_printf("/domain/devices/interface[(mac/@address =3D= '%s') or " + " (target/@dev =3D '%= s')]", macstr, + iface); =20 if ((ninterfaces =3D virXPathNodeSet(xpath, ctxt, &interfaces)) < 0) { vshError(ctl, _("Failed to extract interface information")); diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 7a03c1fb6e..3a7015b198 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -5535,8 +5535,8 @@ virshGenFileName(vshControl *ctl, virDomainPtr dom, c= onst char *mime) localtime_r(&cur_time, &time_info); strftime(timestr, sizeof(timestr), "%Y-%m-%d-%H:%M:%S", &time_info); =20 - virAsprintf(&ret, "%s-%s%s", virDomainGetName(dom), timestr, - NULLSTR_EMPTY(ext)); + ret =3D g_strdup_printf("%s-%s%s", virDomainGetName(dom), timestr, + NULLSTR_EMPTY(ext)); =20 return ret; } @@ -6966,7 +6966,7 @@ virshVcpuPinQuery(vshControl *ctl, cpumaplen))) goto cleanup; =20 - virAsprintf(&vcpuStr, "%zu", i); + vcpuStr =3D g_strdup_printf("%zu", i); =20 if (vshTableRowAppend(table, vcpuStr, pinInfo, NULL) < 0) goto cleanup; @@ -7582,7 +7582,7 @@ cmdIOThreadInfo(vshControl *ctl, const vshCmd *cmd) g_autofree char *pinInfo =3D NULL; g_autofree char *iothreadIdStr =3D NULL; =20 - virAsprintf(&iothreadIdStr, "%u", info[i]->iothread_id); + iothreadIdStr =3D g_strdup_printf("%u", info[i]->iothread_id); =20 ignore_value(pinInfo =3D virBitmapDataFormat(info[i]->cpumap, info= [i]->cpumaplen)); =20 @@ -11386,7 +11386,7 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) =20 /* Create our XPATH lookup for the current display's port */ VIR_FREE(xpath); - virAsprintf(&xpath, xpath_fmt, scheme[iter], "@port"); + xpath =3D g_strdup_printf(xpath_fmt, scheme[iter], "@port"); =20 /* Attempt to get the port number for the current graphics scheme = */ tmp =3D virXPathInt(xpath, ctxt, &port); @@ -11399,7 +11399,7 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) =20 /* Create our XPATH lookup for TLS Port (automatically skipped * for unsupported schemes */ - virAsprintf(&xpath, xpath_fmt, scheme[iter], "@tlsPort"); + xpath =3D g_strdup_printf(xpath_fmt, scheme[iter], "@tlsPort"); =20 /* Attempt to get the TLS port number */ tmp =3D virXPathInt(xpath, ctxt, &tls_port); @@ -11408,7 +11408,7 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) tls_port =3D 0; =20 /* Create our XPATH lookup for the current display's address */ - virAsprintf(&xpath, xpath_fmt, scheme[iter], "@listen"); + xpath =3D g_strdup_printf(xpath_fmt, scheme[iter], "@listen"); =20 /* Attempt to get the listening addr if set for the current * graphics scheme */ @@ -11417,7 +11417,7 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) VIR_FREE(xpath); =20 /* Create our XPATH lookup for the current spice type. */ - virAsprintf(&xpath, xpath_fmt, scheme[iter], "listen/@type"); + xpath =3D g_strdup_printf(xpath_fmt, scheme[iter], "listen/@type"); =20 /* Attempt to get the type of spice connection */ VIR_FREE(type_conn); @@ -11426,7 +11426,7 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) =20 if (STREQ_NULLABLE(type_conn, "socket")) { if (!sockpath) { - virAsprintf(&xpath, xpath_fmt, scheme[iter], "listen/@sock= et"); + xpath =3D g_strdup_printf(xpath_fmt, scheme[iter], "listen= /@socket"); =20 sockpath =3D virXPathString(xpath, ctxt); =20 @@ -11446,7 +11446,7 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) * subelement (which, by the way, doesn't exist on libvirt * < 0.9.4, so we really do need to check both places) */ - virAsprintf(&xpath, xpath_fmt, scheme[iter], "listen/@address"= ); + xpath =3D g_strdup_printf(xpath_fmt, scheme[iter], "listen/@ad= dress"); =20 listen_addr =3D virXPathString(xpath, ctxt); VIR_FREE(xpath); @@ -11482,7 +11482,7 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) * care of when getting the XML */ =20 /* Create our XPATH lookup for the password */ - virAsprintf(&xpath, xpath_fmt, scheme[iter], "@passwd"); + xpath =3D g_strdup_printf(xpath_fmt, scheme[iter], "@passwd"); =20 /* Attempt to get the password */ VIR_FREE(passwd); diff --git a/tools/virsh-host.c b/tools/virsh-host.c index fe172d2c29..0fd77cbae5 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -1140,7 +1140,7 @@ vshExtractCPUDefXMLs(vshControl *ctl, else doc =3D buffer; =20 - virAsprintf(&xmlStr, "%s", doc); + xmlStr =3D g_strdup_printf("%s", doc); =20 if (!(xml =3D virXMLParseStringCtxt(xmlStr, xmlFile, &ctxt))) goto error; diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c index fbeb40fc6a..8aa2fcf71d 100644 --- a/tools/virsh-interface.c +++ b/tools/virsh-interface.c @@ -894,7 +894,7 @@ cmdInterfaceBridge(vshControl *ctl, const vshCmd *cmd) } =20 if (stp) { - virAsprintf(&delay_str, "%d", delay); + delay_str =3D g_strdup_printf("%d", delay); if (!xmlSetProp(br_node, BAD_CAST "delay", BAD_CAST delay_str)) { vshError(ctl, _("Failed to set bridge delay %d in xml document= "), delay); goto cleanup; diff --git a/tools/virsh-network.c b/tools/virsh-network.c index 662ca00e1c..59b7b5d075 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -1447,7 +1447,7 @@ cmdNetworkDHCPLeases(vshControl *ctl, const vshCmd *c= md) else if (lease->type =3D=3D VIR_IP_ADDR_TYPE_IPV6) typestr =3D "ipv6"; =20 - virAsprintf(&cidr_format, "%s/%d", lease->ipaddr, lease->prefix); + cidr_format =3D g_strdup_printf("%s/%d", lease->ipaddr, lease->pre= fix); =20 if (vshTableRowAppend(table, expirytime, diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c index 5138a5946c..2c39a9b1a6 100644 --- a/tools/virsh-pool.c +++ b/tools/virsh-pool.c @@ -1286,16 +1286,16 @@ cmdPoolList(vshControl *ctl, const vshCmd *cmd G_GN= UC_UNUSED) const char *unit; =20 val =3D vshPrettyCapacity(info.capacity, &unit); - virAsprintf(&poolInfoTexts[i].capacity, "%.2lf %s", va= l, - unit); + poolInfoTexts[i].capacity =3D g_strdup_printf("%.2lf %= s", val, + unit); =20 val =3D vshPrettyCapacity(info.allocation, &unit); - virAsprintf(&poolInfoTexts[i].allocation, "%.2lf %s", = val, - unit); + poolInfoTexts[i].allocation =3D g_strdup_printf("%.2lf= %s", val, + unit); =20 val =3D vshPrettyCapacity(info.available, &unit); - virAsprintf(&poolInfoTexts[i].available, "%.2lf %s", v= al, - unit); + poolInfoTexts[i].available =3D g_strdup_printf("%.2lf = %s", val, + unit); } else { /* Capacity related information isn't available */ poolInfoTexts[i].capacity =3D g_strdup(_("-")); diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index bd57fd695d..b4afa51d9b 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -1430,11 +1430,11 @@ cmdVolList(vshControl *ctl, const vshCmd *cmd G_GNU= C_UNUSED) volInfoTexts[i].type =3D g_strdup(virshVolumeTypeToString(= volumeInfo.type)); =20 val =3D vshPrettyCapacity(volumeInfo.capacity, &unit); - virAsprintf(&volInfoTexts[i].capacity, "%.2lf %s", val, un= it); + volInfoTexts[i].capacity =3D g_strdup_printf("%.2lf %s", v= al, unit); =20 val =3D vshPrettyCapacity(volumeInfo.allocation, &unit); - virAsprintf(&volInfoTexts[i].allocation, "%.2lf %s", val, - unit); + volInfoTexts[i].allocation =3D g_strdup_printf("%.2lf %s",= val, + unit); } } } diff --git a/tools/virt-admin.c b/tools/virt-admin.c index da28d760db..30106d1971 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -394,7 +394,7 @@ cmdSrvList(vshControl *ctl, const vshCmd *cmd G_GNUC_UN= USED) =20 for (i =3D 0; i < nsrvs; i++) { g_autofree char *idStr =3D NULL; - virAsprintf(&idStr, "%zu", i); + idStr =3D g_strdup_printf("%zu", i); =20 if (vshTableRowAppend(table, idStr, @@ -655,7 +655,7 @@ cmdSrvClientsList(vshControl *ctl, const vshCmd *cmd) ×tr) < 0) goto cleanup; =20 - virAsprintf(&idStr, "%llu", id); + idStr =3D g_strdup_printf("%llu", id); if (vshTableRowAppend(table, idStr, vshAdmClientTransportToString(transport), timestr, NULL) < 0) diff --git a/tools/vsh.c b/tools/vsh.c index 8cd613bbbd..7002aa635e 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -1799,23 +1799,23 @@ vshGetTypedParamValue(vshControl *ctl, virTypedPara= meterPtr item) =20 switch (item->type) { case VIR_TYPED_PARAM_INT: - virAsprintf(&str, "%d", item->value.i); + str =3D g_strdup_printf("%d", item->value.i); break; =20 case VIR_TYPED_PARAM_UINT: - virAsprintf(&str, "%u", item->value.ui); + str =3D g_strdup_printf("%u", item->value.ui); break; =20 case VIR_TYPED_PARAM_LLONG: - virAsprintf(&str, "%lld", item->value.l); + str =3D g_strdup_printf("%lld", item->value.l); break; =20 case VIR_TYPED_PARAM_ULLONG: - virAsprintf(&str, "%llu", item->value.ul); + str =3D g_strdup_printf("%llu", item->value.ul); break; =20 case VIR_TYPED_PARAM_DOUBLE: - virAsprintf(&str, "%f", item->value.d); + str =3D g_strdup_printf("%f", item->value.d); break; =20 case VIR_TYPED_PARAM_BOOLEAN: @@ -2418,7 +2418,7 @@ vshEditWriteToTempFile(vshControl *ctl, const char *d= oc) =20 tmpdir =3D getenv("TMPDIR"); if (!tmpdir) tmpdir =3D "/tmp"; - virAsprintf(&ret, "%s/virshXXXXXX.xml", tmpdir); + ret =3D g_strdup_printf("%s/virshXXXXXX.xml", tmpdir); fd =3D mkostemps(ret, 4, O_CLOEXEC); if (fd =3D=3D -1) { vshError(ctl, _("mkostemps: failed to create temporary file: %s"), @@ -2936,7 +2936,7 @@ vshReadlineInit(vshControl *ctl) rl_completer_quote_characters =3D quote_characters; rl_char_is_quoted_p =3D vshReadlineCharIsQuoted; =20 - virAsprintf(&histsize_env, "%s_HISTSIZE", ctl->env_prefix); + histsize_env =3D g_strdup_printf("%s_HISTSIZE", ctl->env_prefix); =20 /* Limit the total size of the history buffer */ if ((histsize_str =3D getenv(histsize_env))) { @@ -2962,9 +2962,9 @@ vshReadlineInit(vshControl *ctl) goto cleanup; } =20 - virAsprintf(&ctl->historydir, "%s/%s", userdir, ctl->name); + ctl->historydir =3D g_strdup_printf("%s/%s", userdir, ctl->name); =20 - virAsprintf(&ctl->historyfile, "%s/history", ctl->historydir); + ctl->historyfile =3D g_strdup_printf("%s/history", ctl->historydir); =20 read_history(ctl->historyfile); ret =3D 0; @@ -3046,7 +3046,7 @@ vshInitDebug(vshControl *ctl) char *env =3D NULL; =20 if (ctl->debug =3D=3D VSH_DEBUG_DEFAULT) { - virAsprintf(&env, "%s_DEBUG", ctl->env_prefix); + env =3D g_strdup_printf("%s_DEBUG", ctl->env_prefix); =20 /* log level not set from commandline, check env variable */ debugEnv =3D getenv(env); @@ -3064,7 +3064,7 @@ vshInitDebug(vshControl *ctl) } =20 if (ctl->logfile =3D=3D NULL) { - virAsprintf(&env, "%s_LOG_FILE", ctl->env_prefix); + env =3D g_strdup_printf("%s_LOG_FILE", ctl->env_prefix); =20 /* log file not set from cmdline */ debugEnv =3D getenv(env); --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752903; cv=none; d=zoho.com; s=zohoarc; b=O5oKmW/Mn8HHVcbJ/OHbmQLKQKvYTYLxMOzez18DGg78sQSAcNfELpAq4BhP+k57QHObRmCrXD0xiX2Eq1VlDg3G4Zqya+JOCoertzQ+LqDHBjbdkqnQBYXYPcETm9AzxlsLpJ/HB1B/2Q49cRH/Nhbapy5ALcVG9YRYpQcBE9Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752903; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xB4Xz8S1/olet94grqqHO5/smT5k76+NGsk/wTjztV0=; b=hUZGmnLiAGV5OR0kS/WvSWcwWQgnyG1aa5B0xOFNDm2LRyLwOL2VPaQcEz5/zRNXmm17fNuZ834ZCnzE0mHGK6y1k+q476oOGTphDUVVkNq5U/VuS+SznE9E28z5p9VpodSNkAXvEabR/q3VvJv6M12eTOPrF4/fJhnWZnojbHw= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1571752903320980.8238988177827; Tue, 22 Oct 2019 07:01:43 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-353-H3KMA8F3NMWvyyC51Vx6qA-1; Tue, 22 Oct 2019 10:01:39 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3A0815FD; Tue, 22 Oct 2019 14:01:34 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id ED30F6012C; Tue, 22 Oct 2019 14:01:33 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 754B7180BA9C; Tue, 22 Oct 2019 14:01:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9ME11tJ002929 for ; Tue, 22 Oct 2019 10:01:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id A5ABD6012D; Tue, 22 Oct 2019 14:01:01 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2B4886012C for ; Tue, 22 Oct 2019 14:01:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752902; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=xB4Xz8S1/olet94grqqHO5/smT5k76+NGsk/wTjztV0=; b=h2nIDYgzbSbccAgeHYtJhTP57hUBkQkw9SjoK3B4snUqBBQbL+ePhob6kypu0xBVlj+2Zb dKluhErvxa4QBtmSwZMWUxtF/qjo3wHF+hUHip9KrJ9H9hKTC9lZtNFzUQLADQOFxwat1U ZbPVfqvRnrFLnPRPc4gEB4FzoVdz7u0= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:58:11 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 67/75] Use g_strdup_printf instead of virAsprintf everywhere X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: H3KMA8F3NMWvyyC51Vx6qA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Michal Privoznik --- src/driver.c | 4 ++-- src/libvirt-admin.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/driver.c b/src/driver.c index 89851cb629..2392fd7d5f 100644 --- a/src/driver.c +++ b/src/driver.c @@ -90,7 +90,7 @@ virDriverShouldAutostart(const char *dir, =20 *autostart =3D false; =20 - virAsprintf(&path, "%s/autostarted", dir); + path =3D g_strdup_printf("%s/autostarted", dir); =20 if (virFileExists(path)) { VIR_DEBUG("Autostart file %s exists, skipping autostart", path); @@ -151,7 +151,7 @@ virGetConnectGeneric(virThreadLocalPtr threadPtr, const= char *name) g_autofree char *uri =3D NULL; const char *uriPath =3D geteuid() =3D=3D 0 ? "/system" : "/session= "; =20 - virAsprintf(&uri, "%s://%s", name, uriPath); + uri =3D g_strdup_printf("%s://%s", name, uriPath); =20 conn =3D virConnectOpen(uri); VIR_DEBUG("Opened new %s connection %p", name, conn); diff --git a/src/libvirt-admin.c b/src/libvirt-admin.c index 7ff549bca4..f156736d9f 100644 --- a/src/libvirt-admin.c +++ b/src/libvirt-admin.c @@ -141,16 +141,16 @@ getSocketPath(virURIPtr uri) if (legacy) { sockbase =3D g_strdup("libvirt-admin-sock"); } else { - virAsprintf(&sockbase, "%s-admin-sock", uri->scheme); + sockbase =3D g_strdup_printf("%s-admin-sock", uri->scheme); } =20 if (STREQ_NULLABLE(uri->path, "/system")) { - virAsprintf(&sock_path, RUNSTATEDIR "/libvirt/%s", sockbase); + sock_path =3D g_strdup_printf(RUNSTATEDIR "/libvirt/%s", sockb= ase); } else if (STREQ_NULLABLE(uri->path, "/session")) { if (!rundir) goto error; =20 - virAsprintf(&sock_path, "%s/%s", rundir, sockbase); + sock_path =3D g_strdup_printf("%s/%s", rundir, sockbase); } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Invalid URI path '%s', try '/system'"), --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752908; cv=none; d=zoho.com; s=zohoarc; b=XYZIDWw4GkBG2AFaQBAzbjsjZ+sIdJyV4cUw4IbmsRd0OQ7W2niK6aCLpOQjEsPFaiOH4OqDStNZ71qXQa4GrwpppX3WPJZcasVOlzfi+zluHoBMHoRY7hx6r7jbZOUZMPFeIWsGu/nNhRBtwfNc9tY2Qp6DHxUjpdcyySfA6A4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752908; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=vHGqMww40XpakK7jhVk8ssmv065PufEHIyPuaOV0yrY=; b=MRYyCU5DO41rGNISBPxgHrc4vjnA7FcFTxsbaOOXY3TPbOtvXEVCZ68RYrs8dFalNpQ5vTcDb8BInlm5LJSBuNsPeBBbk39uaUUGBQ6gfe1zOdMKnRUpp9nkbn/KmWNNoaBSXPbFP0cBzbAFSk1S5wPnLTJfqlYJ57NCtpwpj4Q= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 15717529088221022.8977073616876; Tue, 22 Oct 2019 07:01:48 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-3-3VfnxFLmNye0rijokHYdJA-1; Tue, 22 Oct 2019 10:01:44 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 81CDE801E73; Tue, 22 Oct 2019 14:01:39 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4FAE75C1D4; Tue, 22 Oct 2019 14:01:39 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id E0E243FB42; Tue, 22 Oct 2019 14:01:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9ME12CX002946 for ; Tue, 22 Oct 2019 10:01:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id 765DE6012D; Tue, 22 Oct 2019 14:01:02 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id F2B976012C for ; Tue, 22 Oct 2019 14:01:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752907; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=vHGqMww40XpakK7jhVk8ssmv065PufEHIyPuaOV0yrY=; b=fiEs+Qbj9oDJy3594m/NaLP1Y36qJCWlqrgPdoswqd7H5flTFkFpOt4Gp8whR0aFuJCs7H 0U53odM0vf9IkZfC8xDRpUm0dbxAPfYB1naf1PKiIhPIuXkM4+fXY7IuCF86IyWIZbkeO0 Wr0NaIRa5n1Azsaxrz7BZn5bOJnuZTI= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:58:12 +0200 Message-Id: <274e5ded8e0530e42cbf3b7784cccc0b9a599570.1571752582.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 68/75] virpcimock: Make @fakerootdir static X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: 3VfnxFLmNye0rijokHYdJA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Since we are not passing the @fakerootdir variable to any inline function anymore, we can make the variable static. Signed-off-by: Michal Privoznik --- tests/virpcimock.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tests/virpcimock.c b/tests/virpcimock.c index 0d502db68c..7e4554a1dc 100644 --- a/tests/virpcimock.c +++ b/tests/virpcimock.c @@ -39,11 +39,7 @@ static int (*real_close)(int fd); static DIR * (*real_opendir)(const char *name); static char *(*real_virFileCanonicalizePath)(const char *path); =20 -/* Don't make static, since it causes problems with clang - * when passed as an arg to virAsprintf() - * vircgroupmock.c:462:22: error: static variable 'fakesysfsdir' is used i= n an inline function with external linkage [-Werror,-Wstatic-in-inline] - */ -char *fakerootdir; +static char *fakerootdir; =20 /* To add a new mocked prefix in virpcimock: * - add the prefix here as a define to make it easier to track what we --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752914; cv=none; d=zoho.com; s=zohoarc; b=ewZPfMsJqy6JXj+vHxtBXE06yDXtoz+cwtBJVKHgQ+2HR0oT0NwS+7os9HUrdRu1ryizMiv9eeCwBNqhflQAvJa2VriI5ph/z9gmARPbCBxIcE6fJWAfQ5u5MkQySYL6Mz/GsFUmfWaVy4wVMXNdp2yLiGv3rFhetFZ7ozVreSc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752914; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wX9YZLIsB3poiHjb8d6PZcr44F5kztfqeVkMRYX5dsU=; b=A9/mVf51JT3rvVGp4DIiw8K+T9o2OrG1VeN02S8tV6p8TNvAEg9uMSd4etyhmRfULx+iRXn8nb1L9ivpguU/AeCdm6eV4y+90CE3Q1o3XN6ikUu39JnSyOs8VmsLPyV68JGY7llN9HkCChXzoGm7C+FuKkh5c1zHLEu/MEASBgo= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 15717529141600.8349142456477239; Tue, 22 Oct 2019 07:01:54 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-247-qi70kS7yMPOGikJ68PTvow-1; Tue, 22 Oct 2019 10:01:49 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5E380107AD39; Tue, 22 Oct 2019 14:01:44 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2E7F35C1D4; Tue, 22 Oct 2019 14:01:44 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id C9B403FB46; Tue, 22 Oct 2019 14:01:43 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9ME13G5002963 for ; Tue, 22 Oct 2019 10:01:03 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4FB896012C; Tue, 22 Oct 2019 14:01:03 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id C84F86012D for ; Tue, 22 Oct 2019 14:01:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752913; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=wX9YZLIsB3poiHjb8d6PZcr44F5kztfqeVkMRYX5dsU=; b=g/nuHvGiy0HwZTVsKyZuu6wAFgCxKIBSSl1YHJgcjoZCtBglkOvhzTj/By1j1mFq+h867G hWWB4WGom+36kipl6fbKGDd6nylWlN0p/8nkhF2IPDH7H9RiLbx+x0L9RnQDofnBYWByKg jtc7/bqmrjztCyqtpCX0se/NiWdI51M= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:58:13 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 69/75] Drop virAsprintf() X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: qi70kS7yMPOGikJ68PTvow-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Now that function is no longer used, it can be dropped. Signed-off-by: Michal Privoznik --- build-aux/syntax-check.mk | 10 +++++----- docs/hacking.html.in | 8 ++++---- m4/virt-compile-warnings.m4 | 2 -- src/libvirt_private.syms | 1 - src/util/virstring.c | 14 -------------- src/util/virstring.h | 14 -------------- 6 files changed, 9 insertions(+), 40 deletions(-) diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index 033eaf70c4..11b0ac7150 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -443,14 +443,14 @@ sc_prohibit_strtol: halt=3D'use virStrToDouble, not strtod variants' \ $(_sc_search_regexp) =20 -# Use virAsprintf rather than as'printf since *strp is undefined on error. -# But for plain %s, virAsprintf is overkill compared to strdup. +# Use g_strdup_printf rather than as'printf since *strp is undefined on er= ror. +# But for plain %s, g_strdup_printf is overkill compared to g_strdup. sc_prohibit_asprintf: @prohibit=3D'\' \ - halt=3D'use virAsprintf, not asprintf' \ + halt=3D'use g_strdup_printf, not asprintf' \ $(_sc_search_regexp) - @prohibit=3D'virAsprintf.*, *"%s",' \ - halt=3D'use VIR_STRDUP instead of virAsprintf with "%s"' \ + @prohibit=3D'g_strdup_printf.*, *"%s",' \ + halt=3D'use g_strdup instead of g_strdup_printf with "%s"' \ $(_sc_search_regexp) =20 sc_prohibit_strdup: diff --git a/docs/hacking.html.in b/docs/hacking.html.in index 981b782d31..f442eeb32a 100644 --- a/docs/hacking.html.in +++ b/docs/hacking.html.in @@ -1321,12 +1321,12 @@ BAD: Whenever you add a new printf-style function, i.e., one with a format string argument and following "..." in its prototype, be sure to use gcc's printf attribute directive in the prototype. For example, her= e's - the one for virAsprintf, in util.h: + the one for virBufferAsprintf, in virbuffer.h:

=20 
-  int virAsprintf(char **strp, const char *fmt, ...)
-      ATTRIBUTE_FORMAT(printf, 2, 3);
+  void virBufferAsprintf(virBufferPtr buf, const char *format, ...)
+    G_GNUC_PRINTF(2, 3);
=20

@@ -1337,7 +1337,7 @@ BAD: =20

When printing to a string, consider using virBuffer for - incremental allocations, virAsprintf for a one-shot allocation, + incremental allocations, g_strdup_printf for a one-shot allocation, and snprintf for fixed-width buffers. Do not use sprintf, even if you can prove the buffer won't overflow, since gnulib does not provide the same portability guarantees for sprintf as it diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4 index 1318ca59b9..be5dc3de51 100644 --- a/m4/virt-compile-warnings.m4 +++ b/m4/virt-compile-warnings.m4 @@ -51,8 +51,6 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ dontwarn=3D"$dontwarn -Wstrict-overflow" # Not a problem since we don't use -funsafe-loop-optimizations dontwarn=3D"$dontwarn -Wunsafe-loop-optimizations" - # Things like virAsprintf mean we can't use this - dontwarn=3D"$dontwarn -Wformat-nonliteral" # Gnulib's stat-time.h violates this dontwarn=3D"$dontwarn -Waggregate-return" # gcc 4.4.6 complains this is C++ only; gcc 4.7.0 implies this from -W= all diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 12cb3b5bf7..e8458e26c7 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -3070,7 +3070,6 @@ virStorageFileBackendRegister; =20 =20 # util/virstring.h -virAsprintfInternal; virSkipSpaces; virSkipSpacesAndBackslash; virSkipSpacesBackwards; diff --git a/src/util/virstring.c b/src/util/virstring.c index ac132ff924..f6495fdb72 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -746,20 +746,6 @@ virVasprintfInternal(char **strp, return ret; } =20 -void -virAsprintfInternal(char **strp, - const char *fmt, ...) -{ - va_list ap; - - va_start(ap, fmt); - g_vasprintf(strp, fmt, ap); - va_end(ap); - - if (!*strp) - abort(); -} - /** * virStrncpy: * diff --git a/src/util/virstring.h b/src/util/virstring.h index 318b64a136..5de6dd3252 100644 --- a/src/util/virstring.h +++ b/src/util/virstring.h @@ -133,8 +133,6 @@ int virStrdup(char **dest, const char *src) =20 int virStrndup(char **dest, const char *src, ssize_t n) G_GNUC_WARN_UNUSED_RESULT ATTRIBUTE_NONNULL(1); -void virAsprintfInternal(char **strp, const char *fmt, ...) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_PRINTF(2, 3); int virVasprintfInternal(char **strp, const char *fmt, va_list list) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_PRINTF(2, 0) G_GNUC_WARN_UNUSED_RESULT; @@ -228,18 +226,6 @@ size_t virStringListLength(const char * const *strings= ); */ #define virVasprintfQuiet(strp, fmt, list) virVasprintf(strp, fmt, list) =20 -/** - * virAsprintf: - * @strp: variable to hold result (char **) - * @fmt: printf format - * - * Like glibc's asprintf but aborts on OOM. - * - * Returns number of bytes printed on success, aborts on OOM - */ - -#define virAsprintf(strp, ...) virAsprintfInternal(strp, __VA_ARGS__) - int virStringSortCompare(const void *a, const void *b); int virStringSortRevCompare(const void *a, const void *b); int virStringToUpper(char **dst, const char *src); --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752918; cv=none; d=zoho.com; s=zohoarc; b=HtNdTNy75C3cGMkKekXl6sMxyBu5RQ3QeSu/fkgfzLDcyUmYMfj4PK/+vulZ7SKJrnYyvq4P9UwzBtWBXY47XeIjywvaRQAyFo4bn33zm/N+ioGFf5SrONj+Pa+fL377jNnlgzwgAvjZKbwUuqKHXAoljhcyg4mklyttT3Yb5LE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752918; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=SCsr0WFoCZ4gUFYqhe84HVnAcCFUJlYe4Qg7Q4WJjTw=; b=PCstRBvhLDiYAx7daUTjzHBNFlHRZ3DRrn2dtQaJiln/T8aa08UNXCaWLN+obIA3ffCwNUB8rTkAPP1VjXzQcEUFndAKBiWrgilLdpdLoiFyv2rSz7whjcrXYhGsuf9RQU6QkKAB6DTIC1BK9YDg3yMZCux/HCCEUyP/0PyfJa0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1571752918633246.87446384293662; Tue, 22 Oct 2019 07:01:58 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-1-V_iV-q-uMDaoQ6PkqvnPsQ-1; Tue, 22 Oct 2019 10:01:54 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4E0CF1005529; Tue, 22 Oct 2019 14:01:49 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 24F721001B20; Tue, 22 Oct 2019 14:01:49 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id C98DF180B536; Tue, 22 Oct 2019 14:01:48 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9ME14Mk002976 for ; Tue, 22 Oct 2019 10:01:04 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3D49760166; Tue, 22 Oct 2019 14:01:04 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id B6E086012D for ; Tue, 22 Oct 2019 14:01:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752917; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=SCsr0WFoCZ4gUFYqhe84HVnAcCFUJlYe4Qg7Q4WJjTw=; b=PUTpSdT4CExBeG6VbFlEmvmXlYjwYmkTw3VFILIhjlzOSmBNraz2QS8e9YVMSIOFv302Xq UpNIZOq5hJ/TWgcbNi0zZtU4tIrixMKqy5xlxp3BZylp97BbyA18S8XZpnpsVmYszYCZIA HEIwBNUCpausc4Cy4h8qb5i0t19WpJA= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:58:14 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 70/75] Rename virVasprintfQuiet() to virVasprintf() X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: V_iV-q-uMDaoQ6PkqvnPsQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" There's no difference between virVasprintf() and virVasprintfQuiet(). Fix places where the latter is used to use the former. Signed-off-by: Michal Privoznik --- src/util/virerror.c | 4 ++-- src/util/virlog.c | 2 +- tests/eventtest.c | 2 +- tools/vsh.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/util/virerror.c b/src/util/virerror.c index 76a75e27a8..5403caf025 100644 --- a/src/util/virerror.c +++ b/src/util/virerror.c @@ -830,7 +830,7 @@ virRaiseErrorFull(const char *filename, } else { va_list ap; va_start(ap, fmt); - ignore_value(virVasprintfQuiet(&str, fmt, ap)); + ignore_value(virVasprintf(&str, fmt, ap)); va_end(ap); } =20 @@ -1485,7 +1485,7 @@ virLastErrorPrefixMessage(const char *fmt, ...) =20 va_start(args, fmt); =20 - if (virVasprintfQuiet(&fmtmsg, fmt, args) < 0) + if (virVasprintf(&fmtmsg, fmt, args) < 0) goto cleanup; =20 newmsg =3D g_strdup_printf("%s: %s", fmtmsg, err->message); diff --git a/src/util/virlog.c b/src/util/virlog.c index e7d62e3948..f7ae47559f 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -594,7 +594,7 @@ virLogVMessage(virLogSourcePtr source, /* * serialize the error message, add level and timestamp */ - if (virVasprintfQuiet(&str, fmt, vargs) < 0) + if (virVasprintf(&str, fmt, vargs) < 0) goto cleanup; =20 virLogFormatString(&msg, linenr, funcname, priority, str); diff --git a/tests/eventtest.c b/tests/eventtest.c index 363fc776fd..74b2a807f3 100644 --- a/tests/eventtest.c +++ b/tests/eventtest.c @@ -89,7 +89,7 @@ testEventReport(const char *name, bool failed, const char= *msg, ...) char *str =3D NULL; struct testEventResultData data; =20 - if (msg && virVasprintfQuiet(&str, msg, vargs) !=3D 0) + if (msg && virVasprintf(&str, msg, vargs) !=3D 0) failed =3D true; =20 data.failed =3D failed; diff --git a/tools/vsh.c b/tools/vsh.c index 7002aa635e..7af3ce237c 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -1875,7 +1875,7 @@ vshPrintExtra(vshControl *ctl, const char *format, ..= .) return; =20 va_start(ap, format); - if (virVasprintfQuiet(&str, format, ap) < 0) + if (virVasprintf(&str, format, ap) < 0) vshErrorOOM(); va_end(ap); fputs(str, stdout); @@ -1890,7 +1890,7 @@ vshPrint(vshControl *ctl G_GNUC_UNUSED, const char *f= ormat, ...) char *str; =20 va_start(ap, format); - if (virVasprintfQuiet(&str, format, ap) < 0) + if (virVasprintf(&str, format, ap) < 0) vshErrorOOM(); va_end(ap); fputs(str, stdout); --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752922; cv=none; d=zoho.com; s=zohoarc; b=UjNOMmTlSuen/Vk/cgj/v5p0zozI/WvkaY4F2I1w65Lf4X4lqBSjM0WH70dQf+6c4kBGK4fda0rWBxnDrdk8B4XtbjApKV5o8K9UbdAYJ9YIxe//jdXmDzasYcHsS/pfQ4GUbV1fVtlc/gBQEKyD12+I/KsamT+IDDZxW8Kxjoc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752922; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=FKfXzsQkq+cbgBe6euB8k6bKCZfnLvMZA8sqtlHnWIY=; b=hIQgG5D9wSvZ9tiQW01QbcXvn7kqc5t35Zuc0IF0NPQBn3eGpoaPwdOv54CDmwEGXiKMIPz9A0MaOmjbtD815UMxwwZz/Cp8zCLOOsemvWn5Aa2HMOYAbyigx9CqQl+kNQ8/zf8yShTirhHy58fAyinUspjTQrjuqTyeUgqbHM0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1571752922305581.5157056214247; Tue, 22 Oct 2019 07:02:02 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-139-DMWXEmonPNW30MCjgD6LTQ-1; Tue, 22 Oct 2019 10:01:59 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 650331800E03; Tue, 22 Oct 2019 14:01:54 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 368625C1D4; Tue, 22 Oct 2019 14:01:54 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id CFFA63FB44; Tue, 22 Oct 2019 14:01:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9ME15AQ002992 for ; Tue, 22 Oct 2019 10:01:05 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0B8E46012C; Tue, 22 Oct 2019 14:01:05 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 87D9C6012E for ; Tue, 22 Oct 2019 14:01:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752921; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=FKfXzsQkq+cbgBe6euB8k6bKCZfnLvMZA8sqtlHnWIY=; b=CgjdOVfIpFhpKR1Z2CgjKfjZ5HAvEJZCf73duRD9qvfpQve6CKuS3dBAYfDxxBHBig0a9A 01YcsJpsWGsSnSj+8Gv+V8EApPbYP2+XEAmHd583eO0oF2W9+uqPDZmiJO48AUd+jLaanq 35bgQYQYEi71PdN8CUfWyhKl3r0X5yM= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:58:15 +0200 Message-Id: <5e6e636f90fe0df6be7221dcdfa72b81ca74e6a2.1571752582.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 71/75] virstring: Drop virVasprintfQuiet() X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: DMWXEmonPNW30MCjgD6LTQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" This macro is no longer used and therefore can be dropped. Signed-off-by: Michal Privoznik --- src/util/virstring.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/util/virstring.h b/src/util/virstring.h index 5de6dd3252..6072af8f59 100644 --- a/src/util/virstring.h +++ b/src/util/virstring.h @@ -217,15 +217,6 @@ size_t virStringListLength(const char * const *strings= ); */ #define virVasprintf(strp, fmt, list) virVasprintfInternal(strp, fmt, list) =20 -/** - * virVasprintfQuiet - * - * Like glibc's vasprintf but aborts on OOM. - * - * Returns number of bytes printed on success, aborts on OOM - */ -#define virVasprintfQuiet(strp, fmt, list) virVasprintf(strp, fmt, list) - int virStringSortCompare(const void *a, const void *b); int virStringSortRevCompare(const void *a, const void *b); int virStringToUpper(char **dst, const char *src); --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752932; cv=none; d=zoho.com; s=zohoarc; b=It6ocp5LzSYrVPY3XBTzEoFwgkB1XTWMv1AlLbxyX+GAQeDayPm/Ffsj4zTMQ3rVR8f1CUaLpWQDs8uApS/p73GPGJsHmRuawarPPVva1vl7qEUxFpcq6tQw56RC6TZwG6vEoS2d/N2doPSjjLH7iuVifpmlY5JatOgH+C+H8UY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752932; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=sTqNlbEj3otOaJzxFzxjW0UEXJy95kVTSodtNGbO1nw=; b=NnAsygxnIeCuwpUgcBzZWWB+912Dq8UqYSZ9feJOmUP2tyeImrHLn39PDvlfQGs5UAOgeB3fJ0K1ubrrdpoxg0g3EYWOI/POyv6oqhvMxs8lxUKB5D2DVS94+9fjP12Lzk37bYWFTJJxc1zYw+nB8slTzac9HOre+St40KX15fw= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1571752932257251.7089757358151; Tue, 22 Oct 2019 07:02:12 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-308-dqq34PUuP7SInGMmSQPayQ-1; Tue, 22 Oct 2019 10:02:08 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C50C8800D53; Tue, 22 Oct 2019 14:01:58 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9B9391001B20; Tue, 22 Oct 2019 14:01:58 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 4CF1A180BA9A; Tue, 22 Oct 2019 14:01:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9ME152g003011 for ; Tue, 22 Oct 2019 10:01:05 -0400 Received: by smtp.corp.redhat.com (Postfix) id D28FD6012C; Tue, 22 Oct 2019 14:01:05 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 58E026012D for ; Tue, 22 Oct 2019 14:01:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752931; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=sTqNlbEj3otOaJzxFzxjW0UEXJy95kVTSodtNGbO1nw=; b=eRg0eczlDAFuM6RTWq9ejwJcxmSpHWm+03LDIb6J7vuCCv8mZ4n9h6qijhHfvgzfHMCx/1 AILbTwP/T2q9Y/mX1N+91DE9xC1JEna0nGAvXnbvA+WRLYe8zS9MKuqMgdXqjnqNfwxRMP fRhV7Jiv/2mGio1VCtQzEm3knrfkOLE= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:58:16 +0200 Message-Id: <942a5f57565a85e63e3c82e77256d519d3faa7b9.1571752582.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 72/75] Drop virVasprintf() retval checking X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: dqq34PUuP7SInGMmSQPayQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" These functions can't fail really. Drop checking of their retval then. Signed-off-by: Michal Privoznik --- src/libxl/libxl_logger.c | 3 +-- src/qemu/qemu_domain.c | 6 ++---- src/util/viraudit.c | 3 +-- src/util/vircommand.c | 12 ++---------- src/util/virerror.c | 6 ++---- src/util/virfile.c | 29 ++++++----------------------- src/util/virfirewall.c | 8 ++------ src/util/virlog.c | 3 +-- tests/eventtest.c | 4 ++-- tests/qemumonitortestutils.c | 4 +--- tools/virt-host-validate-common.c | 10 ++-------- tools/vsh.c | 16 ++++------------ 12 files changed, 26 insertions(+), 78 deletions(-) diff --git a/src/libxl/libxl_logger.c b/src/libxl/libxl_logger.c index ffbc722f2c..63e2df046f 100644 --- a/src/libxl/libxl_logger.c +++ b/src/libxl/libxl_logger.c @@ -74,8 +74,7 @@ libvirt_vmessage(xentoollog_logger *logger_in, if (level < lg->minLevel) return; =20 - if (virVasprintf(&message, format, args) < 0) - return; + virVasprintf(&message, format, args); =20 /* Should we print to a domain-specific log file? */ if ((start =3D strstr(message, ": Domain ")) && diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index fe97e13c4f..a2eac8f579 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9396,8 +9396,7 @@ int qemuDomainLogContextWrite(qemuDomainLogContextPtr= ctxt, =20 va_start(argptr, fmt); =20 - if (virVasprintf(&message, fmt, argptr) < 0) - goto cleanup; + virVasprintf(&message, fmt, argptr); if (!ctxt->manager && lseek(ctxt->writefd, 0, SEEK_END) < 0) { virReportSystemError(errno, "%s", @@ -9490,8 +9489,7 @@ qemuDomainLogAppendMessage(virQEMUDriverPtr driver, =20 va_start(ap, fmt); =20 - if (virVasprintf(&message, fmt, ap) < 0) - goto cleanup; + virVasprintf(&message, fmt, ap); =20 VIR_DEBUG("Append log message (vm=3D'%s' message=3D'%s) stdioLogD=3D%d= ", vm->def->name, message, cfg->stdioLogD); diff --git a/src/util/viraudit.c b/src/util/viraudit.c index 8a0ef6f72c..1210ba8c94 100644 --- a/src/util/viraudit.c +++ b/src/util/viraudit.c @@ -110,8 +110,7 @@ void virAuditSend(virLogSourcePtr source, #endif =20 va_start(args, fmt); - if (virVasprintf(&str, fmt, args) < 0) - VIR_WARN("Out of memory while formatting audit message"); + virVasprintf(&str, fmt, args); va_end(args); =20 if (auditlog && str) { diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 223a2a824e..4b9e837ff0 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -1324,11 +1324,7 @@ virCommandAddEnvFormat(virCommandPtr cmd, const char= *format, ...) return; =20 va_start(list, format); - if (virVasprintf(&env, format, list) < 0) { - cmd->has_error =3D ENOMEM; - va_end(list); - return; - } + virVasprintf(&env, format, list); va_end(list); =20 virCommandAddEnv(cmd, env); @@ -1557,11 +1553,7 @@ virCommandAddArgFormat(virCommandPtr cmd, const char= *format, ...) return; =20 va_start(list, format); - if (virVasprintf(&arg, format, list) < 0) { - cmd->has_error =3D ENOMEM; - va_end(list); - return; - } + virVasprintf(&arg, format, list); va_end(list); =20 /* Arg plus trailing NULL. */ diff --git a/src/util/virerror.c b/src/util/virerror.c index 5403caf025..a5e43361b8 100644 --- a/src/util/virerror.c +++ b/src/util/virerror.c @@ -830,7 +830,7 @@ virRaiseErrorFull(const char *filename, } else { va_list ap; va_start(ap, fmt); - ignore_value(virVasprintf(&str, fmt, ap)); + virVasprintf(&str, fmt, ap); va_end(ap); } =20 @@ -1485,15 +1485,13 @@ virLastErrorPrefixMessage(const char *fmt, ...) =20 va_start(args, fmt); =20 - if (virVasprintf(&fmtmsg, fmt, args) < 0) - goto cleanup; + virVasprintf(&fmtmsg, fmt, args); =20 newmsg =3D g_strdup_printf("%s: %s", fmtmsg, err->message); =20 VIR_FREE(err->message); err->message =3D g_steal_pointer(&newmsg); =20 - cleanup: va_end(args); errno =3D save_errno; } diff --git a/src/util/virfile.c b/src/util/virfile.c index 042847137d..d2407e7068 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -3387,8 +3387,7 @@ int virFilePrintf(FILE *fp, const char *msg, ...) =20 va_start(vargs, msg); =20 - if (virVasprintf(&str, msg, vargs) < 0) - goto cleanup; + virVasprintf(&str, msg, vargs); ret =3D strlen(str); =20 if (fwrite(str, 1, ret, fp) !=3D ret) { @@ -3397,7 +3396,6 @@ int virFilePrintf(FILE *fp, const char *msg, ...) ret =3D -1; } =20 - cleanup: va_end(vargs); =20 return ret; @@ -4149,10 +4147,7 @@ virFileReadValueInt(int *value, const char *format, = ...) va_list ap; =20 va_start(ap, format); - if (virVasprintf(&path, format, ap) < 0) { - va_end(ap); - return -1; - } + virVasprintf(&path, format, ap); va_end(ap); =20 if (!virFileExists(path)) @@ -4192,10 +4187,7 @@ virFileReadValueUint(unsigned int *value, const char= *format, ...) va_list ap; =20 va_start(ap, format); - if (virVasprintf(&path, format, ap) < 0) { - va_end(ap); - return -1; - } + virVasprintf(&path, format, ap); va_end(ap); =20 if (!virFileExists(path)) @@ -4236,10 +4228,7 @@ virFileReadValueScaledInt(unsigned long long *value,= const char *format, ...) va_list ap; =20 va_start(ap, format); - if (virVasprintf(&path, format, ap) < 0) { - va_end(ap); - return -1; - } + virVasprintf(&path, format, ap); va_end(ap); =20 if (!virFileExists(path)) @@ -4282,10 +4271,7 @@ virFileReadValueBitmap(virBitmapPtr *value, const ch= ar *format, ...) va_list ap; =20 va_start(ap, format); - if (virVasprintf(&path, format, ap) < 0) { - va_end(ap); - return -1; - } + virVasprintf(&path, format, ap); va_end(ap); =20 if (!virFileExists(path)) @@ -4323,10 +4309,7 @@ virFileReadValueString(char **value, const char *for= mat, ...) va_list ap; =20 va_start(ap, format); - if (virVasprintf(&path, format, ap) < 0) { - va_end(ap); - return -1; - } + virVasprintf(&path, format, ap); va_end(ap); =20 if (!virFileExists(path)) diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c index fc2c7248cb..55dfc65d0f 100644 --- a/src/util/virfirewall.c +++ b/src/util/virfirewall.c @@ -509,19 +509,15 @@ void virFirewallRuleAddArgFormat(virFirewallPtr firew= all, VIR_FIREWALL_RULE_RETURN_IF_ERROR(firewall, rule); =20 va_start(list, fmt); - - if (virVasprintf(&arg, fmt, list) < 0) - goto no_memory; + virVasprintf(&arg, fmt, list); + va_end(list); =20 ADD_ARG(rule, arg); =20 - va_end(list); - return; =20 no_memory: firewall->err =3D ENOMEM; - va_end(list); } =20 =20 diff --git a/src/util/virlog.c b/src/util/virlog.c index f7ae47559f..d2c7b373cf 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -594,8 +594,7 @@ virLogVMessage(virLogSourcePtr source, /* * serialize the error message, add level and timestamp */ - if (virVasprintf(&str, fmt, vargs) < 0) - goto cleanup; + virVasprintf(&str, fmt, vargs); =20 virLogFormatString(&msg, linenr, funcname, priority, str); =20 diff --git a/tests/eventtest.c b/tests/eventtest.c index 74b2a807f3..4c553d5eb7 100644 --- a/tests/eventtest.c +++ b/tests/eventtest.c @@ -89,8 +89,8 @@ testEventReport(const char *name, bool failed, const char= *msg, ...) char *str =3D NULL; struct testEventResultData data; =20 - if (msg && virVasprintf(&str, msg, vargs) !=3D 0) - failed =3D true; + if (msg) + virVasprintf(&str, msg, vargs); =20 data.failed =3D failed; data.msg =3D str; diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index 3c93468a4e..c522ee6a83 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -188,15 +188,13 @@ qemuMonitorReportError(qemuMonitorTestPtr test, const= char *errmsg, ...) =20 va_start(msgargs, errmsg); =20 - if (virVasprintf(&msg, errmsg, msgargs) < 0) - goto cleanup; + virVasprintf(&msg, errmsg, msgargs); =20 jsonmsg =3D g_strdup_printf("{ \"error\": " " { \"desc\": \"%s\", " " \"class\": \"UnexpectedCommand\" } }", m= sg); =20 ret =3D qemuMonitorTestAddResponse(test, jsonmsg); =20 - cleanup: va_end(msgargs); return ret; } diff --git a/tools/virt-host-validate-common.c b/tools/virt-host-validate-c= ommon.c index daeb2f0e1c..bc14227864 100644 --- a/tools/virt-host-validate-common.c +++ b/tools/virt-host-validate-common.c @@ -59,10 +59,7 @@ void virHostMsgCheck(const char *prefix, return; =20 va_start(args, format); - if (virVasprintf(&msg, format, args) < 0) { - perror("malloc"); - abort(); - } + virVasprintf(&msg, format, args); va_end(args); =20 fprintf(stdout, _("%6s: Checking %-60s: "), prefix, msg); @@ -120,10 +117,7 @@ void virHostMsgFail(virHostValidateLevel level, return; =20 va_start(args, format); - if (virVasprintf(&msg, format, args) < 0) { - perror("malloc"); - abort(); - } + virVasprintf(&msg, format, args); va_end(args); =20 if (virHostMsgWantEscape()) diff --git a/tools/vsh.c b/tools/vsh.c index 7af3ce237c..b1d3bcff6d 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -1855,11 +1855,7 @@ vshDebug(vshControl *ctl, int level, const char *for= mat, ...) va_end(ap); =20 va_start(ap, format); - if (virVasprintf(&str, format, ap) < 0) { - /* Skip debug messages on low memory */ - va_end(ap); - return; - } + virVasprintf(&str, format, ap); va_end(ap); fputs(str, stdout); VIR_FREE(str); @@ -1875,8 +1871,7 @@ vshPrintExtra(vshControl *ctl, const char *format, ..= .) return; =20 va_start(ap, format); - if (virVasprintf(&str, format, ap) < 0) - vshErrorOOM(); + virVasprintf(&str, format, ap); va_end(ap); fputs(str, stdout); VIR_FREE(str); @@ -1890,8 +1885,7 @@ vshPrint(vshControl *ctl G_GNUC_UNUSED, const char *f= ormat, ...) char *str; =20 va_start(ap, format); - if (virVasprintf(&str, format, ap) < 0) - vshErrorOOM(); + virVasprintf(&str, format, ap); va_end(ap); fputs(str, stdout); VIR_FREE(str); @@ -2023,9 +2017,7 @@ vshError(vshControl *ctl, const char *format, ...) fputs(_("error: "), stderr); =20 va_start(ap, format); - /* We can't recursively call vshError on an OOM situation, so ignore - failure here. */ - ignore_value(virVasprintf(&str, format, ap)); + virVasprintf(&str, format, ap); va_end(ap); =20 fprintf(stderr, "%s\n", NULLSTR(str)); --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752900; cv=none; d=zoho.com; s=zohoarc; b=n1Wx5mG0C6s91fmgyN/LsMfcKMBtLF/q7q/wXf8lMh10tEGr2JHzMELz+PwEteGSJ7/fJTrtM1lPVqu9jMF4QoPRHeulVdeSy7fjgGq884l+yMj+cPi/WYFaheersrGxuqnCjZuB+Vv1jGH9pHL4ANXfnbZlRzKzEhvV58NcoHU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752900; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YPkBmNBKjhW0iJvNVLqeyYuLvOITUALGzyxxnYTNy8o=; b=XdlRxiRePZmo2a//XbHm7/OQDHUC0OK9SWkApH6tQd5dTmFV5Nr7CRKrAkyFoyf5xW28hx2imHjoxSfJ+rHybhFHMlCQSuX5CIy8aBU7mrhv3rVFNgF60ga70mDBqrxhbmXeGO2Gd3goQKP/Y2YBGkrA8sw1mcb/U+sjCjfvN4Q= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1571752900019737.1098101819948; Tue, 22 Oct 2019 07:01:40 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-349-Y6yPfJvMMzGodop6p6vqqQ-1; Tue, 22 Oct 2019 10:01:36 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E1999107AD3E; Tue, 22 Oct 2019 14:01:28 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A524762A79; Tue, 22 Oct 2019 14:01:28 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 3E3593FB45; Tue, 22 Oct 2019 14:01:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9ME16nu003020 for ; Tue, 22 Oct 2019 10:01:06 -0400 Received: by smtp.corp.redhat.com (Postfix) id A5A726012E; Tue, 22 Oct 2019 14:01:06 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2B34A6012D for ; Tue, 22 Oct 2019 14:01:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752898; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=YPkBmNBKjhW0iJvNVLqeyYuLvOITUALGzyxxnYTNy8o=; b=hybt8E1B+bPCWffgvFl5esgEq7kjnhvUFStHcWumkptf80NVaZfIa/t8s/ovkDiE2nkdCj zAPGLXY1Voqflj17P41wkrxvvx1BN0oNV57A57F4vjn1NGbAG4brEnUe5fFdpRbPN6Jtua 5Hih6nL5CwZxCk9WVn6QxS3JA7jK3Tk= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:58:17 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 73/75] virstring: Make virVasprintf() return no value X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: Y6yPfJvMMzGodop6p6vqqQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Michal Privoznik --- src/util/virstring.c | 7 ++----- src/util/virstring.h | 5 ++--- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/util/virstring.c b/src/util/virstring.c index f6495fdb72..c704ce38f0 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -722,15 +722,14 @@ virDoubleToStr(char **strp, double number) } =20 =20 -int +void virVasprintfInternal(char **strp, const char *fmt, va_list list) { char *str =3D NULL; - int ret; =20 - ret =3D g_vasprintf(&str, fmt, list); + g_vasprintf(&str, fmt, list); =20 /* GLib is supposed to abort() on OOM, but a mistake meant * it did not. Delete this once our min glib is at 2.64.0 @@ -742,8 +741,6 @@ virVasprintfInternal(char **strp, abort(); #endif *strp =3D str; - - return ret; } =20 /** diff --git a/src/util/virstring.h b/src/util/virstring.h index 6072af8f59..ea0774f2c7 100644 --- a/src/util/virstring.h +++ b/src/util/virstring.h @@ -133,9 +133,8 @@ int virStrdup(char **dest, const char *src) =20 int virStrndup(char **dest, const char *src, ssize_t n) G_GNUC_WARN_UNUSED_RESULT ATTRIBUTE_NONNULL(1); -int virVasprintfInternal(char **strp, const char *fmt, va_list list) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_PRINTF(2, 0) - G_GNUC_WARN_UNUSED_RESULT; +void virVasprintfInternal(char **strp, const char *fmt, va_list list) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_PRINTF(2, 0); =20 /** * VIR_STRDUP: --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571752933; cv=none; d=zoho.com; s=zohoarc; b=Oi6WNK/M2p2nRs5oEOvk/PsZfqRGFfyrAC5QWBYcSiWg6F5Jh2ad42tWanNFvrwNNKqHI0YuZZJ9WmkhRy3POvf4b839ip/682lkLko5ocvqx66Xd6Dsy+neBn0O3NM4SzNI4AUd+HyvVZ2LHMfGjfGUylThtpS2L7H58G1tkmc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752933; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=w0pt39eb9/mPB69V2AVlOZj//btRoqeTB1volRRjqQM=; b=oPLpTQ03Kgng6/PYTk6oTWFOZGuRD8H4AxNjjCR2eRuQg6wvXfas40SMF7nsqludpUTK6m2LGT8+ozEmdf+ahnq5df2c2dhT8LQDOK0o2nteoBbqSgxGVjRgf9B3Be7v2oiglLfi/A/+9Hd+BJvWqUPrxHFb4tv6LkT+ZjGenGE= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1571752933940715.6058968130731; Tue, 22 Oct 2019 07:02:13 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-188-0Uv1oCFJMEqem720RfdmPQ-1; Tue, 22 Oct 2019 10:02:10 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B5ADE800D4E; Tue, 22 Oct 2019 14:02:03 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7B6D31001B23; Tue, 22 Oct 2019 14:02:03 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 15D943FB41; Tue, 22 Oct 2019 14:02:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9ME17hb003030 for ; Tue, 22 Oct 2019 10:01:07 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7640C6012D; Tue, 22 Oct 2019 14:01:07 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id F3B826012E for ; Tue, 22 Oct 2019 14:01:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571752932; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=w0pt39eb9/mPB69V2AVlOZj//btRoqeTB1volRRjqQM=; b=NPf8lNBURv64LB1dyllnA48MF/O9gSeQMTE6+Z6wYTK1gjTUd/unZR+BS8Bc+00JeK9nRf ZILAxaZMsgKeVgAVmRE2NOKfA3MTDAzRuQrord4jlWE3jlKawpiG42dseu77HdrBupvhEi jp8fKI1EpYIOoWZDHleaISGSnYzUqLA= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:58:18 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 74/75] Use g_strdup_vprintf() instead of virVasprintf() everywhere X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: 0Uv1oCFJMEqem720RfdmPQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Michal Privoznik --- src/libxl/libxl_logger.c | 2 +- src/qemu/qemu_domain.c | 4 ++-- src/util/viraudit.c | 2 +- src/util/vircommand.c | 4 ++-- src/util/virerror.c | 4 ++-- src/util/virfile.c | 18 +++++++++--------- src/util/virfirewall.c | 2 +- src/util/virlog.c | 2 +- tests/eventtest.c | 2 +- tests/qemumonitortestutils.c | 2 +- tools/virt-host-validate-common.c | 4 ++-- tools/vsh.c | 8 ++++---- 12 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/libxl/libxl_logger.c b/src/libxl/libxl_logger.c index 63e2df046f..a829142b2b 100644 --- a/src/libxl/libxl_logger.c +++ b/src/libxl/libxl_logger.c @@ -74,7 +74,7 @@ libvirt_vmessage(xentoollog_logger *logger_in, if (level < lg->minLevel) return; =20 - virVasprintf(&message, format, args); + message =3D g_strdup_vprintf(format, args); =20 /* Should we print to a domain-specific log file? */ if ((start =3D strstr(message, ": Domain ")) && diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index a2eac8f579..b1fa2d1862 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9396,7 +9396,7 @@ int qemuDomainLogContextWrite(qemuDomainLogContextPtr= ctxt, =20 va_start(argptr, fmt); =20 - virVasprintf(&message, fmt, argptr); + message =3D g_strdup_vprintf(fmt, argptr); if (!ctxt->manager && lseek(ctxt->writefd, 0, SEEK_END) < 0) { virReportSystemError(errno, "%s", @@ -9489,7 +9489,7 @@ qemuDomainLogAppendMessage(virQEMUDriverPtr driver, =20 va_start(ap, fmt); =20 - virVasprintf(&message, fmt, ap); + message =3D g_strdup_vprintf(fmt, ap); =20 VIR_DEBUG("Append log message (vm=3D'%s' message=3D'%s) stdioLogD=3D%d= ", vm->def->name, message, cfg->stdioLogD); diff --git a/src/util/viraudit.c b/src/util/viraudit.c index 1210ba8c94..20eb3f3621 100644 --- a/src/util/viraudit.c +++ b/src/util/viraudit.c @@ -110,7 +110,7 @@ void virAuditSend(virLogSourcePtr source, #endif =20 va_start(args, fmt); - virVasprintf(&str, fmt, args); + str =3D g_strdup_vprintf(fmt, args); va_end(args); =20 if (auditlog && str) { diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 4b9e837ff0..e062ac554f 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -1324,7 +1324,7 @@ virCommandAddEnvFormat(virCommandPtr cmd, const char = *format, ...) return; =20 va_start(list, format); - virVasprintf(&env, format, list); + env =3D g_strdup_vprintf(format, list); va_end(list); =20 virCommandAddEnv(cmd, env); @@ -1553,7 +1553,7 @@ virCommandAddArgFormat(virCommandPtr cmd, const char = *format, ...) return; =20 va_start(list, format); - virVasprintf(&arg, format, list); + arg =3D g_strdup_vprintf(format, list); va_end(list); =20 /* Arg plus trailing NULL. */ diff --git a/src/util/virerror.c b/src/util/virerror.c index a5e43361b8..f569cd363c 100644 --- a/src/util/virerror.c +++ b/src/util/virerror.c @@ -830,7 +830,7 @@ virRaiseErrorFull(const char *filename, } else { va_list ap; va_start(ap, fmt); - virVasprintf(&str, fmt, ap); + str =3D g_strdup_vprintf(fmt, ap); va_end(ap); } =20 @@ -1485,7 +1485,7 @@ virLastErrorPrefixMessage(const char *fmt, ...) =20 va_start(args, fmt); =20 - virVasprintf(&fmtmsg, fmt, args); + fmtmsg =3D g_strdup_vprintf(fmt, args); =20 newmsg =3D g_strdup_printf("%s: %s", fmtmsg, err->message); =20 diff --git a/src/util/virfile.c b/src/util/virfile.c index d2407e7068..7382f8e19a 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -3374,9 +3374,9 @@ virFileRemoveLastComponent(char *path) /** * virFilePrintf: * - * A replacement for fprintf() which uses virVasprintf to - * ensure that portable string format placeholders can be - * used, since gnulib's fprintf() replacement is not + * A replacement for fprintf() which uses g_strdup_vprintf + * to ensure that portable string format placeholders can + * be used, since gnulib's fprintf() replacement is not * LGPLV2+ compatible */ int virFilePrintf(FILE *fp, const char *msg, ...) @@ -3387,7 +3387,7 @@ int virFilePrintf(FILE *fp, const char *msg, ...) =20 va_start(vargs, msg); =20 - virVasprintf(&str, msg, vargs); + str =3D g_strdup_vprintf(msg, vargs); ret =3D strlen(str); =20 if (fwrite(str, 1, ret, fp) !=3D ret) { @@ -4147,7 +4147,7 @@ virFileReadValueInt(int *value, const char *format, .= ..) va_list ap; =20 va_start(ap, format); - virVasprintf(&path, format, ap); + path =3D g_strdup_vprintf(format, ap); va_end(ap); =20 if (!virFileExists(path)) @@ -4187,7 +4187,7 @@ virFileReadValueUint(unsigned int *value, const char = *format, ...) va_list ap; =20 va_start(ap, format); - virVasprintf(&path, format, ap); + path =3D g_strdup_vprintf(format, ap); va_end(ap); =20 if (!virFileExists(path)) @@ -4228,7 +4228,7 @@ virFileReadValueScaledInt(unsigned long long *value, = const char *format, ...) va_list ap; =20 va_start(ap, format); - virVasprintf(&path, format, ap); + path =3D g_strdup_vprintf(format, ap); va_end(ap); =20 if (!virFileExists(path)) @@ -4271,7 +4271,7 @@ virFileReadValueBitmap(virBitmapPtr *value, const cha= r *format, ...) va_list ap; =20 va_start(ap, format); - virVasprintf(&path, format, ap); + path =3D g_strdup_vprintf(format, ap); va_end(ap); =20 if (!virFileExists(path)) @@ -4309,7 +4309,7 @@ virFileReadValueString(char **value, const char *form= at, ...) va_list ap; =20 va_start(ap, format); - virVasprintf(&path, format, ap); + path =3D g_strdup_vprintf(format, ap); va_end(ap); =20 if (!virFileExists(path)) diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c index 55dfc65d0f..ee72b579e4 100644 --- a/src/util/virfirewall.c +++ b/src/util/virfirewall.c @@ -509,7 +509,7 @@ void virFirewallRuleAddArgFormat(virFirewallPtr firewal= l, VIR_FIREWALL_RULE_RETURN_IF_ERROR(firewall, rule); =20 va_start(list, fmt); - virVasprintf(&arg, fmt, list); + arg =3D g_strdup_vprintf(fmt, list); va_end(list); =20 ADD_ARG(rule, arg); diff --git a/src/util/virlog.c b/src/util/virlog.c index d2c7b373cf..c104687ace 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -594,7 +594,7 @@ virLogVMessage(virLogSourcePtr source, /* * serialize the error message, add level and timestamp */ - virVasprintf(&str, fmt, vargs); + str =3D g_strdup_vprintf(fmt, vargs); =20 virLogFormatString(&msg, linenr, funcname, priority, str); =20 diff --git a/tests/eventtest.c b/tests/eventtest.c index 4c553d5eb7..fdd732f7fa 100644 --- a/tests/eventtest.c +++ b/tests/eventtest.c @@ -90,7 +90,7 @@ testEventReport(const char *name, bool failed, const char= *msg, ...) struct testEventResultData data; =20 if (msg) - virVasprintf(&str, msg, vargs); + str =3D g_strdup_vprintf(msg, vargs); =20 data.failed =3D failed; data.msg =3D str; diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index c522ee6a83..4ec0e107ab 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -188,7 +188,7 @@ qemuMonitorReportError(qemuMonitorTestPtr test, const c= har *errmsg, ...) =20 va_start(msgargs, errmsg); =20 - virVasprintf(&msg, errmsg, msgargs); + msg =3D g_strdup_vprintf(errmsg, msgargs); =20 jsonmsg =3D g_strdup_printf("{ \"error\": " " { \"desc\": \"%s\", " " \"class\": \"UnexpectedCommand\" } }", m= sg); diff --git a/tools/virt-host-validate-common.c b/tools/virt-host-validate-c= ommon.c index bc14227864..af8def21f3 100644 --- a/tools/virt-host-validate-common.c +++ b/tools/virt-host-validate-common.c @@ -59,7 +59,7 @@ void virHostMsgCheck(const char *prefix, return; =20 va_start(args, format); - virVasprintf(&msg, format, args); + msg =3D g_strdup_vprintf(format, args); va_end(args); =20 fprintf(stdout, _("%6s: Checking %-60s: "), prefix, msg); @@ -117,7 +117,7 @@ void virHostMsgFail(virHostValidateLevel level, return; =20 va_start(args, format); - virVasprintf(&msg, format, args); + msg =3D g_strdup_vprintf(format, args); va_end(args); =20 if (virHostMsgWantEscape()) diff --git a/tools/vsh.c b/tools/vsh.c index b1d3bcff6d..ce7d80c621 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -1855,7 +1855,7 @@ vshDebug(vshControl *ctl, int level, const char *form= at, ...) va_end(ap); =20 va_start(ap, format); - virVasprintf(&str, format, ap); + str =3D g_strdup_vprintf(format, ap); va_end(ap); fputs(str, stdout); VIR_FREE(str); @@ -1871,7 +1871,7 @@ vshPrintExtra(vshControl *ctl, const char *format, ..= .) return; =20 va_start(ap, format); - virVasprintf(&str, format, ap); + str =3D g_strdup_vprintf(format, ap); va_end(ap); fputs(str, stdout); VIR_FREE(str); @@ -1885,7 +1885,7 @@ vshPrint(vshControl *ctl G_GNUC_UNUSED, const char *f= ormat, ...) char *str; =20 va_start(ap, format); - virVasprintf(&str, format, ap); + str =3D g_strdup_vprintf(format, ap); va_end(ap); fputs(str, stdout); VIR_FREE(str); @@ -2017,7 +2017,7 @@ vshError(vshControl *ctl, const char *format, ...) fputs(_("error: "), stderr); =20 va_start(ap, format); - virVasprintf(&str, format, ap); + str =3D g_strdup_vprintf(format, ap); va_end(ap); =20 fprintf(stderr, "%s\n", NULLSTR(str)); --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 03:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571753046; cv=none; d=zoho.com; s=zohoarc; b=HJwXGL8py10XJlEyx5NNpGcaopbVYx9eJwjRPZEMakzpdIS2PrhnQSKzr4mOR7Mm0BSmVNhAAnIhJgaYZbJfuOl/ZKKJvFqvtNMP9JFg4Sa5ZKUeegWqQ9fbvUFydFXDgXAVC9hwKQU9SITu/1Q9IQBdNx7RFZRDVbg40ypqDv0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571753046; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=nfuWjEAbbG0pKxvbg0a9cxk2k2Yrjavehcv23vbV8Rw=; b=IYBp0Tut2F8omSttYKqhFj/hNU7jX5dlQm4n0BNmFNoZNtfFTw3s+90xJJ8S0KIFiAGyei05QdExzAsx+HBFGypCZFlfNO6cQzc7AutlOccqasT/e8BhhWZ6P+tgnYMoONNXBoUUh0Evqn4tOIUwlRFhAp7dC+SqxBSPXkzNJH4= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1571753046579561.9480747494641; Tue, 22 Oct 2019 07:04:06 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-83-emXvraYBPJWOvRlBP_9qbQ-1; Tue, 22 Oct 2019 10:01:39 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2AC1D1800E09; Tue, 22 Oct 2019 14:01:34 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E137D5DD78; Tue, 22 Oct 2019 14:01:33 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 74389180BA9B; Tue, 22 Oct 2019 14:01:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9ME18Gc003042 for ; Tue, 22 Oct 2019 10:01:08 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4EACC6012E; Tue, 22 Oct 2019 14:01:08 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id CC82D6012D for ; Tue, 22 Oct 2019 14:01:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571753045; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=nfuWjEAbbG0pKxvbg0a9cxk2k2Yrjavehcv23vbV8Rw=; b=YRTLqXcpvr0yZLYZv6LyRVa1zo0vdlfro3La7axK5ZlTxFW6sUCk4JbLpLgVOm7m0ULms0 K1e4LSGugxRrm29+vc9D9i+mQNPtma1SN8pF6szunQMnTmpkdbU0AtWAfh/DYZvhjvGHjQ wJTnO6mBRTB/OGhvx4fY4JSBf97nUls= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:58:19 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 75/75] Drop virVasprintf() X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: emXvraYBPJWOvRlBP_9qbQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Now that function is no longer used, it can be dropped. Signed-off-by: Michal Privoznik --- docs/hacking.html.in | 5 ----- src/libvirt_private.syms | 1 - src/util/virstring.c | 21 --------------------- src/util/virstring.h | 11 ----------- 4 files changed, 38 deletions(-) diff --git a/docs/hacking.html.in b/docs/hacking.html.in index f442eeb32a..4b6bcaed53 100644 --- a/docs/hacking.html.in +++ b/docs/hacking.html.in @@ -1028,11 +1028,6 @@ BAD:

VIR_STRDUP, VIR_STRNDUP
Prefer the GLib APIs g_strdup and g_strndup.
=20 -
virAsprintf, virVasprintf
-
The GLib APIs g_strdup_printf / g_strdup_vpri= nt should be used - instead. Don't use g_vasprintf unless having the stri= ng length - returned is unavoidable.
-
virStrerror
The GLib g_strerror() function should be used inste= ad, which has a simpler calling convention as an added benefit.
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index e8458e26c7..59a1fdbe79 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -3121,7 +3121,6 @@ virStrToLong_ull; virStrToLong_ullp; virStrToLong_ulp; virTrimSpaces; -virVasprintfInternal; =20 =20 # util/virsysinfo.h diff --git a/src/util/virstring.c b/src/util/virstring.c index c704ce38f0..f729bf9aa3 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -722,27 +722,6 @@ virDoubleToStr(char **strp, double number) } =20 =20 -void -virVasprintfInternal(char **strp, - const char *fmt, - va_list list) -{ - char *str =3D NULL; - - g_vasprintf(&str, fmt, list); - - /* GLib is supposed to abort() on OOM, but a mistake meant - * it did not. Delete this once our min glib is at 2.64.0 - * which includes the fix: - * https://gitlab.gnome.org/GNOME/glib/merge_requests/1145 - */ -#if !GLIB_CHECK_VERSION(2, 64, 0) - if (!str) - abort(); -#endif - *strp =3D str; -} - /** * virStrncpy: * diff --git a/src/util/virstring.h b/src/util/virstring.h index ea0774f2c7..081a5ff1aa 100644 --- a/src/util/virstring.h +++ b/src/util/virstring.h @@ -133,8 +133,6 @@ int virStrdup(char **dest, const char *src) =20 int virStrndup(char **dest, const char *src, ssize_t n) G_GNUC_WARN_UNUSED_RESULT ATTRIBUTE_NONNULL(1); -void virVasprintfInternal(char **strp, const char *fmt, va_list list) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_PRINTF(2, 0); =20 /** * VIR_STRDUP: @@ -207,15 +205,6 @@ void virVasprintfInternal(char **strp, const char *fmt= , va_list list) =20 size_t virStringListLength(const char * const *strings); =20 -/** - * virVasprintf - * - * Like glibc's vasprintf but aborts on OOM - * - * Returns number of bytes printed on success, aborts on OOM - */ -#define virVasprintf(strp, fmt, list) virVasprintfInternal(strp, fmt, list) - int virStringSortCompare(const void *a, const void *b); int virStringSortRevCompare(const void *a, const void *b); int virStringToUpper(char **dst, const char *src); --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list