From nobody Sun Feb 8 15:42:43 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1547558642897394.2304796587101; Tue, 15 Jan 2019 05:24:02 -0800 (PST) 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 mx1.redhat.com (Postfix) with ESMTPS id 2B3E5C0828A9; Tue, 15 Jan 2019 13:24: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 D9E67108BD11; Tue, 15 Jan 2019 13:23:59 +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 75560184B54A; Tue, 15 Jan 2019 13:23: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 x0FDNbjk011103 for ; Tue, 15 Jan 2019 08:23:37 -0500 Received: by smtp.corp.redhat.com (Postfix) id 1CFC66031B; Tue, 15 Jan 2019 13:23:37 +0000 (UTC) Received: from lpt.brq.redhat.com (unknown [10.43.2.68]) by smtp.corp.redhat.com (Postfix) with ESMTP id 96A9E53E10 for ; Tue, 15 Jan 2019 13:23:36 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Tue, 15 Jan 2019 14:23:05 +0100 Message-Id: <83f47c273e0c0b92500db8ccb7c7e78e11222930.1547558465.git.jtomko@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/23] qemu_conf: split out virQEMUDriverConfigLoadNVRAMEntry 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: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 15 Jan 2019 13:24:01 +0000 (UTC) Split out parts of the config parsing code to make the parent function easier to read. Signed-off-by: J=C3=A1n Tomko Reviewed-by: John Ferlan --- src/qemu/qemu_conf.c | 49 +++++++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 17 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index ca31a222e8..29f948346d 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -423,6 +423,37 @@ virQEMUDriverConfigHugeTLBFSInit(virHugeTLBFSPtr huget= lbfs, } =20 =20 +static int +virQEMUDriverConfigLoadNVRAMEntry(virQEMUDriverConfigPtr cfg, + virConfPtr conf) +{ + char **nvram =3D NULL; + int ret =3D -1; + size_t i; + + if (virConfGetValueStringList(conf, "nvram", false, &nvram) < 0) + goto cleanup; + if (nvram) { + virFirmwareFreeList(cfg->firmwares, cfg->nfirmwares); + + cfg->nfirmwares =3D virStringListLength((const char *const *)nvram= ); + if (nvram[0] && VIR_ALLOC_N(cfg->firmwares, cfg->nfirmwares) < 0) + goto cleanup; + + for (i =3D 0; nvram[i] !=3D NULL; i++) { + if (VIR_ALLOC(cfg->firmwares[i]) < 0) + goto cleanup; + if (virFirmwareParse(nvram[i], cfg->firmwares[i]) < 0) + goto cleanup; + } + } + + ret =3D 0; + cleanup: + virStringListFree(nvram); + return ret; +} + static int virQEMUDriverConfigLoadGlusterDebugEntry(virQEMUDriverConfigPtr cfg, virConfPtr conf) @@ -591,7 +622,6 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr = cfg, size_t i; char *stdioHandler =3D NULL; char **hugetlbfs =3D NULL; - char **nvram =3D NULL; char *corestr =3D NULL; bool tmp; =20 @@ -907,22 +937,8 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr= cfg, if (virConfGetValueBool(conf, "log_timestamp", &cfg->logTimestamp) < 0) goto cleanup; =20 - if (virConfGetValueStringList(conf, "nvram", false, &nvram) < 0) + if (virQEMUDriverConfigLoadNVRAMEntry(cfg, conf) < 0) goto cleanup; - if (nvram) { - virFirmwareFreeList(cfg->firmwares, cfg->nfirmwares); - - cfg->nfirmwares =3D virStringListLength((const char *const *)nvram= ); - if (nvram[0] && VIR_ALLOC_N(cfg->firmwares, cfg->nfirmwares) < 0) - goto cleanup; - - for (i =3D 0; nvram[i] !=3D NULL; i++) { - if (VIR_ALLOC(cfg->firmwares[i]) < 0) - goto cleanup; - if (virFirmwareParse(nvram[i], cfg->firmwares[i]) < 0) - goto cleanup; - } - } =20 if (virQEMUDriverConfigLoadGlusterDebugEntry(cfg, conf) < 0) goto cleanup; @@ -940,7 +956,6 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr = cfg, =20 cleanup: virStringListFree(hugetlbfs); - virStringListFree(nvram); VIR_FREE(corestr); virConfFree(conf); return ret; --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list