From nobody Tue Feb 10 01:16:29 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 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=1676457857; cv=none; d=zohomail.com; s=zohoarc; b=UZiPBifeNdwtEp2Ur7ZtDPe++wUoI8k66+Hte5vxsQFR5nT3uYAT849fM1mz6GPzH6L3/nTvdwFQDs+4Qqnu+ODF1L0tynqwlkVxT1Halvh9SgeuOqmF5EW91FqNyvrwvfVvYxHeHVa3DnoH8MegnhRnA86A+qNIzx3s+lpf6LM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1676457857; 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=lak8TH76I3FBDL+vTzLFYNaVO+aFQyYCMla2CIIA4Vo=; b=kK+qVbVw1GFIu5NyNtZEMd99iEfwTvxZC/oO5nRT8AYBOG8W265GZ0gC0Qr3mGuXyK9VioRvvk0IcDzQbNlK7Ra9AndsVMEM8nXNk6K/qeRz7q5lECmdsOIjIRP9pcEfZlsdxZ/Zm1Eeo3ULGwEoCLrzH4CZRfrxddHCM27X03Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1676457857418940.3535404352286; Wed, 15 Feb 2023 02:44:17 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-203-qqnCvMsMOxquE1-qehNkvw-1; Wed, 15 Feb 2023 05:42:49 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EB7FF88B7CE; Wed, 15 Feb 2023 10:42:44 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9F69A422A9; Wed, 15 Feb 2023 10:42:44 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 951D11946589; Wed, 15 Feb 2023 10:42:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 6EEB71946586 for ; Wed, 15 Feb 2023 10:42:43 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 5D9F214171B6; Wed, 15 Feb 2023 10:42:43 +0000 (UTC) Received: from harajuku.usersys.redhat.com (ovpn-194-29.brq.redhat.com [10.40.194.29]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E034A140EBF4 for ; Wed, 15 Feb 2023 10:42:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676457856; 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=lak8TH76I3FBDL+vTzLFYNaVO+aFQyYCMla2CIIA4Vo=; b=WwqIvMwBE4LDpmDa5QxorI7igoyT9wZ839dsqKTH3+WGhTvyolR2TZswqV4MO53IovdmoP 8KC7SiXLxHWfv1BJo+njSoFElZafMIlDYB1z2bUfp9pPzxpbocnKu7pGmYRy6f7LGgzzFv 9fPnNSGE+AZsSadhSbm9aT7E8o8f3T0= X-MC-Unique: qqnCvMsMOxquE1-qehNkvw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 13/33] qemu: Add convenience local variables Date: Wed, 15 Feb 2023 11:42:10 +0100 Message-Id: <20230215104230.980815-14-abologna@redhat.com> In-Reply-To: <20230215104230.980815-1-abologna@redhat.com> References: <20230215104230.980815-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1676457858223100004 Content-Type: text/plain; charset="utf-8"; x-default="true" This makes the code more compact and less awkward. Signed-off-by: Andrea Bolognani --- src/qemu/qemu_firmware.c | 58 +++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 27 deletions(-) diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index 98b42bc6fb..13bac9490a 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -986,6 +986,7 @@ qemuFirmwareMatchDomain(const virDomainDef *def, const qemuFirmware *fw, const char *path) { + const virDomainLoaderDef *loader =3D def->os.loader; size_t i; qemuFirmwareOSInterface want; bool supportsS3 =3D false; @@ -1000,17 +1001,16 @@ qemuFirmwareMatchDomain(const virDomainDef *def, =20 want =3D qemuFirmwareOSInterfaceTypeFromOsDefFirmware(def->os.firmware= ); =20 - if (want =3D=3D QEMU_FIRMWARE_OS_INTERFACE_NONE && - def->os.loader) { - want =3D qemuFirmwareOSInterfaceTypeFromOsDefLoaderType(def->os.lo= ader->type); + if (want =3D=3D QEMU_FIRMWARE_OS_INTERFACE_NONE && loader) { + want =3D qemuFirmwareOSInterfaceTypeFromOsDefLoaderType(loader->ty= pe); =20 if (fw->mapping.device !=3D QEMU_FIRMWARE_DEVICE_FLASH || - STRNEQ(def->os.loader->path, fw->mapping.data.flash.executable= .filename)) { + STRNEQ(loader->path, fw->mapping.data.flash.executable.filenam= e)) { VIR_DEBUG("Not matching FW interface %s or loader " "path '%s' for user provided path '%s'", qemuFirmwareDeviceTypeToString(fw->mapping.device), fw->mapping.data.flash.executable.filename, - def->os.loader->path); + loader->path); return false; } } @@ -1102,8 +1102,7 @@ qemuFirmwareMatchDomain(const virDomainDef *def, } } =20 - if (def->os.loader && - def->os.loader->secure =3D=3D VIR_TRISTATE_BOOL_YES && + if (loader && loader->secure =3D=3D VIR_TRISTATE_BOOL_YES && !requiresSMM) { VIR_DEBUG("Domain restricts pflash programming to SMM, " "but firmware '%s' doesn't support SMM", path); @@ -1111,13 +1110,15 @@ qemuFirmwareMatchDomain(const virDomainDef *def, } =20 if (fw->mapping.device =3D=3D QEMU_FIRMWARE_DEVICE_FLASH) { - if (def->os.loader && def->os.loader->stateless =3D=3D VIR_TRISTAT= E_BOOL_YES) { - if (fw->mapping.data.flash.mode !=3D QEMU_FIRMWARE_FLASH_MODE_= STATELESS) { + const qemuFirmwareMappingFlash *flash =3D &fw->mapping.data.flash; + + if (loader && loader->stateless =3D=3D VIR_TRISTATE_BOOL_YES) { + if (flash->mode !=3D QEMU_FIRMWARE_FLASH_MODE_STATELESS) { VIR_DEBUG("Discarding loader without stateless flash"); return false; } } else { - if (fw->mapping.data.flash.mode !=3D QEMU_FIRMWARE_FLASH_MODE_= SPLIT) { + if (flash->mode !=3D QEMU_FIRMWARE_FLASH_MODE_SPLIT) { VIR_DEBUG("Discarding loader without split flash"); return false; } @@ -1163,15 +1164,17 @@ qemuFirmwareEnableFeatures(virQEMUDriver *driver, const qemuFirmwareMappingFlash *flash =3D &fw->mapping.data.flash; const qemuFirmwareMappingKernel *kernel =3D &fw->mapping.data.kernel; const qemuFirmwareMappingMemory *memory =3D &fw->mapping.data.memory; + virDomainLoaderDef *loader =3D NULL; size_t i; =20 switch (fw->mapping.device) { case QEMU_FIRMWARE_DEVICE_FLASH: if (!def->os.loader) def->os.loader =3D virDomainLoaderDefNew(); + loader =3D def->os.loader; =20 - def->os.loader->type =3D VIR_DOMAIN_LOADER_TYPE_PFLASH; - def->os.loader->readonly =3D VIR_TRISTATE_BOOL_YES; + loader->type =3D VIR_DOMAIN_LOADER_TYPE_PFLASH; + loader->readonly =3D VIR_TRISTATE_BOOL_YES; =20 if (STRNEQ(flash->executable.format, "raw")) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, @@ -1180,8 +1183,8 @@ qemuFirmwareEnableFeatures(virQEMUDriver *driver, return -1; } =20 - VIR_FREE(def->os.loader->path); - def->os.loader->path =3D g_strdup(flash->executable.filename); + VIR_FREE(loader->path); + loader->path =3D g_strdup(flash->executable.filename); =20 if (flash->mode =3D=3D QEMU_FIRMWARE_FLASH_MODE_SPLIT) { if (STRNEQ(flash->nvram_template.format, "raw")) { @@ -1191,21 +1194,21 @@ qemuFirmwareEnableFeatures(virQEMUDriver *driver, return -1; } =20 - VIR_FREE(def->os.loader->nvramTemplate); - def->os.loader->nvramTemplate =3D g_strdup(flash->nvram_templa= te.filename); + VIR_FREE(loader->nvramTemplate); + loader->nvramTemplate =3D g_strdup(flash->nvram_template.filen= ame); =20 - if (!def->os.loader->nvram) { - def->os.loader->nvram =3D virStorageSourceNew(); - def->os.loader->nvram->type =3D VIR_STORAGE_TYPE_FILE; - def->os.loader->nvram->format =3D VIR_STORAGE_FILE_RAW; - qemuDomainNVRAMPathFormat(cfg, def, &def->os.loader->nvram= ->path); + if (!loader->nvram) { + loader->nvram =3D virStorageSourceNew(); + loader->nvram->type =3D VIR_STORAGE_TYPE_FILE; + loader->nvram->format =3D VIR_STORAGE_FILE_RAW; + qemuDomainNVRAMPathFormat(cfg, def, &loader->nvram->path); } } =20 VIR_DEBUG("decided on firmware '%s' template '%s' NVRAM '%s'", - def->os.loader->path, - NULLSTR(def->os.loader->nvramTemplate), - NULLSTR(def->os.loader->nvram ? def->os.loader->nvram->p= ath : NULL)); + loader->path, + NULLSTR(loader->nvramTemplate), + NULLSTR(loader->nvram ? loader->nvram->path : NULL)); break; =20 case QEMU_FIRMWARE_DEVICE_KERNEL: @@ -1219,12 +1222,13 @@ qemuFirmwareEnableFeatures(virQEMUDriver *driver, case QEMU_FIRMWARE_DEVICE_MEMORY: if (!def->os.loader) def->os.loader =3D virDomainLoaderDefNew(); + loader =3D def->os.loader; =20 - def->os.loader->type =3D VIR_DOMAIN_LOADER_TYPE_ROM; - def->os.loader->path =3D g_strdup(memory->filename); + loader->type =3D VIR_DOMAIN_LOADER_TYPE_ROM; + loader->path =3D g_strdup(memory->filename); =20 VIR_DEBUG("decided on loader '%s'", - def->os.loader->path); + loader->path); break; =20 case QEMU_FIRMWARE_DEVICE_NONE: --=20 2.39.1