From nobody Sun Feb 8 19:13:00 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 1547558632713554.0741756038333; Tue, 15 Jan 2019 05:23:52 -0800 (PST) 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 mx1.redhat.com (Postfix) with ESMTPS id 8AE76A0BF9; Tue, 15 Jan 2019 13:23:45 +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 4A0EC5D777; Tue, 15 Jan 2019 13:23: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 EB09B18434BE; Tue, 15 Jan 2019 13:23: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 x0FDNhZd011158 for ; Tue, 15 Jan 2019 08:23:43 -0500 Received: by smtp.corp.redhat.com (Postfix) id 9A47018B4E; Tue, 15 Jan 2019 13:23:43 +0000 (UTC) Received: from lpt.brq.redhat.com (unknown [10.43.2.68]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1E7306031B for ; Tue, 15 Jan 2019 13:23:42 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Tue, 15 Jan 2019 14:23:09 +0100 Message-Id: <4384d9e7c3931b39052feac65526982dd9c269f4.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 13/23] qemu_conf: split out virQEMUDriverConfigLoadDeviceEntry 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.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Tue, 15 Jan 2019 13:23:51 +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 | 45 +++++++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 17 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index b555e33e7b..776ba3f3ad 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -423,6 +423,31 @@ virQEMUDriverConfigHugeTLBFSInit(virHugeTLBFSPtr huget= lbfs, } =20 =20 +static int +virQEMUDriverConfigLoadDeviceEntry(virQEMUDriverConfigPtr cfg, + virConfPtr conf) +{ + bool tmp; + int rv; + + if (virConfGetValueBool(conf, "mac_filter", &cfg->macFilter) < 0) + return -1; + + if (virConfGetValueBool(conf, "relaxed_acs_check", &cfg->relaxedACS) <= 0) + return -1; + if (virConfGetValueString(conf, "lock_manager", &cfg->lockManagerName)= < 0) + return -1; + if ((rv =3D virConfGetValueBool(conf, "allow_disk_format_probing", &tm= p)) < 0) + return -1; + if (rv =3D=3D 1 && tmp) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("allow_disk_format_probing is no longer supported= ")); + return -1; + } + + return 0; +} + static int virQEMUDriverConfigLoadRPCEntry(virQEMUDriverConfigPtr cfg, virConfPtr conf) @@ -701,7 +726,6 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr = cfg, char *stdioHandler =3D NULL; char **hugetlbfs =3D NULL; char *corestr =3D NULL; - bool tmp; =20 /* Just check the file is readable before opening it, otherwise * libvirt emits an error. @@ -900,21 +924,8 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr= cfg, if (virConfGetValueString(conf, "pr_helper", &cfg->prHelperName) < 0) goto cleanup; =20 - if (virConfGetValueBool(conf, "mac_filter", &cfg->macFilter) < 0) - goto cleanup; - - if (virConfGetValueBool(conf, "relaxed_acs_check", &cfg->relaxedACS) <= 0) - goto cleanup; if (virConfGetValueBool(conf, "clear_emulator_capabilities", &cfg->cle= arEmulatorCapabilities) < 0) goto cleanup; - - if ((rv =3D virConfGetValueBool(conf, "allow_disk_format_probing", &tm= p)) < 0) - goto cleanup; - if (rv =3D=3D 1 && tmp) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("allow_disk_format_probing is no longer supported= ")); - goto cleanup; - } if (virConfGetValueBool(conf, "set_process_name", &cfg->setProcessName= ) < 0) goto cleanup; if (virConfGetValueUInt(conf, "max_processes", &cfg->maxProcesses) < 0) @@ -940,9 +951,6 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr = cfg, if (virConfGetValueBool(conf, "dump_guest_core", &cfg->dumpGuestCore) = < 0) goto cleanup; =20 - if (virConfGetValueString(conf, "lock_manager", &cfg->lockManagerName)= < 0) - goto cleanup; - if (virConfGetValueString(conf, "stdio_handler", &stdioHandler) < 0) goto cleanup; if (stdioHandler) { @@ -960,6 +968,9 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr = cfg, VIR_FREE(stdioHandler); } =20 + if (virQEMUDriverConfigLoadDeviceEntry(cfg, conf) < 0) + goto cleanup; + if (virQEMUDriverConfigLoadRPCEntry(cfg, conf) < 0) goto cleanup; =20 --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list