From nobody Fri Dec 19 06:34:30 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1678464798; cv=none; d=zohomail.com; s=zohoarc; b=Z8BweiwFMWtV8VA8Dt6x+VFs1d9PLOGrV7+T7Cd19jXQm0o6mEDdaqTadBa1b0pH14uyUYiJ3ZtM9cCohbg7xcj0ySIh++4o6VvuKMaKE0LqcO7K0VN06c8Syc66ZY5B7gt+o9FD//lH+CXxvZQgrREo/1MEWtNrjwlw9gxjdxg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678464798; 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=r3y9Wk/9QMcDhdk3FOG9Th2EqntVt+JatUYk/pWU5Ms=; b=kG1L71CwmxtIayQgJ4XPTqNMRtWeF5Xb6t0Gvub955zihdQPcZSQUtHahEqwpv8+E04KMHCYUv0xOIIo+UzSeYs1mO6q0NWa5a04jvLABkrA2I3hR2mBK508Ah/rTyqJtK9WipAjCZE4ufOmaaFhfTFL4M/IoBD58nCg5ESfNfE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1678464798904934.8426172789135; Fri, 10 Mar 2023 08:13:18 -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-267-B5EGlZPhOv6c5wGMSKgySg-1; Fri, 10 Mar 2023 11:11:24 -0500 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7CD9D8564EB; Fri, 10 Mar 2023 16:10:45 +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 60F7B492B14; Fri, 10 Mar 2023 16:10:45 +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 31DB21946A7D; Fri, 10 Mar 2023 16:10:45 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id B6A671946A69 for ; Fri, 10 Mar 2023 16:10:44 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id A727E492B02; Fri, 10 Mar 2023 16:10:44 +0000 (UTC) Received: from rein.int.mamuti.net (unknown [10.45.226.138]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4D733492B00 for ; Fri, 10 Mar 2023 16:10:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678464797; 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=r3y9Wk/9QMcDhdk3FOG9Th2EqntVt+JatUYk/pWU5Ms=; b=df+V39v2Daz6AMmdE/Nx0eElh+eYIN2ZpSxNL3bmN6MkwIgehn68qu3r4aoRMpcJG+j/FP kDSwK2QlDf95FYB9UDhkjGwlwDwwdFdW/21z1W7vXNBd1yn0mnPorGaaN+XvKNsi12DBqG e+s4xV2NM+9Xe7HF92tIQbsmHmkV/S0= X-MC-Unique: B5EGlZPhOv6c5wGMSKgySg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Jiri Denemark To: libvir-list@redhat.com Subject: [libvirt PATCH 24/51] qemu/qemu_command: Update format strings in translated messages Date: Fri, 10 Mar 2023 17:09:40 +0100 Message-Id: <63fce2f9d7a4132665ca4d37836c9626c69d7de8.1678463799.git.jdenemar@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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.10 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: 1678464799700100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jiri Denemark --- src/qemu/qemu_command.c | 82 ++++++++++++++++++++--------------------- 1 file changed, 40 insertions(+), 42 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 929bcc0be1..843dd103c7 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -357,7 +357,7 @@ qemuBuildDeviceAddressPCIGetBus(const virDomainDef *dom= ainDef, =20 if (!contAlias) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Device alias was not set for PCI control= ler with index '%u' required for device at address '%s'"), + _("Device alias was not set for PCI control= ler with index '%1$u' required for device at address '%2$s'"), info->addr.pci.bus, devStr); return NULL; } @@ -382,7 +382,7 @@ qemuBuildDeviceAddressPCIGetBus(const virDomainDef *dom= ainDef, =20 if (!contAlias) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not find PCI controller with index '%u' re= quired for device at address '%s'"), + _("Could not find PCI controller with index '%1$u' = required for device at address '%2$s'"), info->addr.pci.bus, devStr); return NULL; } @@ -467,7 +467,7 @@ qemuBuildDeviceAddresDriveProps(virJSONValue *props, case VIR_DOMAIN_DISK_BUS_SCSI: if (!(controller =3D virDomainDeviceFindSCSIController(domainDef, = &info->addr.drive))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unable to find a SCSI controller for idx=3D%= d"), + _("unable to find a SCSI controller for idx=3D%= 1$d"), info->addr.drive.controller); return -1; } @@ -511,7 +511,7 @@ qemuBuildDeviceAddresDriveProps(virJSONValue *props, case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_DEFAULT: case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unexpected SCSI controller model %d"), + _("Unexpected SCSI controller model %1$d"), controller->model); return -1; } @@ -527,7 +527,7 @@ qemuBuildDeviceAddresDriveProps(virJSONValue *props, case VIR_DOMAIN_DISK_BUS_LAST: default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("address type drive is not supported for bus '%s'= "), + _("address type drive is not supported for bus '%1$= s'"), NULLSTR(virDomainDiskBusTypeToString(info->addr.dri= ve.diskbus))); return -1; } @@ -778,7 +778,7 @@ qemuDeviceVideoGetModel(virQEMUCaps *qemuCaps, =20 if (!model || STREQ(model, "")) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("invalid model for video type '%s'"), + _("invalid model for video type '%1$s'"), virDomainVideoTypeToString(video->type)); return NULL; } @@ -1003,7 +1003,7 @@ qemuBuildVirtioDevGetConfig(const virDomainDeviceDef = *device, case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_ISA: case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DIMM: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unexpected address type for '%s'"), baseName); + _("Unexpected address type for '%1$s'"), baseName); return -1; =20 case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE: @@ -1020,8 +1020,7 @@ qemuBuildVirtioDevGetConfig(const virDomainDeviceDef = *device, if (has_tmodel || has_ntmodel) { if (info->type !=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("virtio (non-)transitional models are not " - "supported for address type=3D%s"), + _("virtio (non-)transitional models are not sup= ported for address type=3D%1$s"), virDomainDeviceAddressTypeToString(info->type)); } =20 @@ -1532,7 +1531,7 @@ qemuBuildChardevCommand(virCommand *cmd, case VIR_DOMAIN_CHR_TYPE_LAST: default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported chardev '%s'"), + _("unsupported chardev '%1$s'"), virDomainChrTypeToString(dev->type)); return -1; } @@ -1860,7 +1859,7 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, case VIR_DOMAIN_DISK_BUS_LAST: default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("unsupported disk bus '%s' with device setup"), + _("unsupported disk bus '%1$s' with device setup"), NULLSTR(virDomainDiskBusTypeToString(disk->bus))); return NULL; } @@ -1897,7 +1896,7 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, =20 if (virStrToLong_ull(disk->wwn, NULL, 16, &w) < 0) { virReportError(VIR_ERR_INVALID_ARG, - _("Failed to parse wwn '%s' as number"), disk->= wwn); + _("Failed to parse wwn '%1$s' as number"), disk= ->wwn); return NULL; } =20 @@ -2493,7 +2492,7 @@ qemuValidateDomainDeviceDefControllerUSB(const virDom= ainControllerDef *def, =20 if (!virQEMUCapsGet(qemuCaps, qemuControllerModelUSBToCaps(def->model)= )) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("USB controller model '%s' not supported in this = QEMU binary"), + _("USB controller model '%1$s' not supported in thi= s QEMU binary"), virDomainControllerModelUSBTypeToString(def->model)= ); return -1; } @@ -2502,7 +2501,7 @@ qemuValidateDomainDeviceDefControllerUSB(const virDom= ainControllerDef *def, if (def->model !=3D VIR_DOMAIN_CONTROLLER_MODEL_USB_NEC_XHCI && def->model !=3D VIR_DOMAIN_CONTROLLER_MODEL_USB_QEMU_XHCI) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("usb controller type '%s' doesn't support 'po= rts' with this QEMU binary"), + _("usb controller type '%1$s' doesn't support '= ports' with this QEMU binary"), virDomainControllerModelUSBTypeToString(def->mo= del)); return -1; } @@ -2637,13 +2636,13 @@ qemuBuildControllerSCSIDevProps(virDomainController= Def *def, case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_BUSLOGIC: case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_NCR53C90: /* It is built-in dev = */ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported controller model: %s"), + _("Unsupported controller model: %1$s"), virDomainControllerModelSCSITypeToString(def->model= )); return NULL; case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_DEFAULT: case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unexpected SCSI controller model %d"), + _("Unexpected SCSI controller model %1$d"), def->model); return NULL; } @@ -2679,7 +2678,7 @@ qemuBuildControllerPCIDevProps(virDomainControllerDef= *def, =20 if (!modelName) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown virDomainControllerPCIModelName value: %= d"), + _("Unknown virDomainControllerPCIModelName value: %= 1$d"), pciopts->modelName); return -1; } @@ -2753,7 +2752,7 @@ qemuBuildControllerPCIDevProps(virDomainControllerDef= *def, case VIR_DOMAIN_CONTROLLER_MODEL_PCI_DEFAULT: case VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unexpected PCI controller model %d"), + _("Unexpected PCI controller model %1$d"), def->model); return -1; } @@ -2850,7 +2849,7 @@ qemuBuildControllerDevProps(const virDomainDef *domai= nDef, case VIR_DOMAIN_CONTROLLER_TYPE_ISA: case VIR_DOMAIN_CONTROLLER_TYPE_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported controller type: %s"), + _("Unsupported controller type: %1$s"), virDomainControllerTypeToString(def->type)); return -1; } @@ -3825,7 +3824,7 @@ qemuBuildHostNetProps(virDomainObj *vm, =20 if (net->script && netType !=3D VIR_DOMAIN_NET_TYPE_ETHERNET) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("scripts are not supported on interfaces of type = %s"), + _("scripts are not supported on interfaces of type = %1$s"), virDomainNetTypeToString(netType)); return NULL; } @@ -4023,7 +4022,7 @@ qemuBuildHostNetProps(virDomainObj *vm, case VIR_DOMAIN_NET_TYPE_NULL: case VIR_DOMAIN_NET_TYPE_VDS: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("network device type '%s' is not supported by thi= s hypervisor"), + _("network device type '%1$s' is not supported by t= his hypervisor"), virDomainNetTypeToString(netType)); return NULL; =20 @@ -4643,7 +4642,7 @@ qemuBuildPCIHostdevDevProps(const virDomainDef *def, case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_XEN: case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_TYPE_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, - _("invalid PCI passthrough type '%s'"), + _("invalid PCI passthrough type '%1$s'"), virDomainHostdevSubsysPCIBackendTypeToString(pcisrc= ->backend)); return NULL; } @@ -4846,28 +4845,28 @@ qemuOpenChrChardevUNIXSocket(const virDomainChrSour= ceDef *dev) addr.sun_family =3D AF_UNIX; if (virStrcpyStatic(addr.sun_path, dev->data.nix.path) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("UNIX socket path '%s' too long"), + _("UNIX socket path '%1$s' too long"), dev->data.nix.path); goto error; } =20 if (unlink(dev->data.nix.path) < 0 && errno !=3D ENOENT) { virReportSystemError(errno, - _("Unable to unlink %s"), + _("Unable to unlink %1$s"), dev->data.nix.path); goto error; } =20 if (bind(fd, (struct sockaddr *)&addr, addrlen) < 0) { virReportSystemError(errno, - _("Unable to bind to UNIX socket path '%s'"), + _("Unable to bind to UNIX socket path '%1$s'"= ), dev->data.nix.path); goto error; } =20 if (listen(fd, 1) < 0) { virReportSystemError(errno, - _("Unable to listen to UNIX socket path '%s'"= ), + _("Unable to listen to UNIX socket path '%1$s= '"), dev->data.nix.path); goto error; } @@ -5190,7 +5189,7 @@ qemuBuildVirtioSerialPortDevProps(const virDomainDef = *def, dev->target.name && STRNEQ(dev->target.name, "com.redhat.spice.0")) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported spicevmc target name '%s'"), + _("Unsupported spicevmc target name '%1$s'"), dev->target.name); return NULL; } @@ -5629,7 +5628,7 @@ qemuBuildSmbiosCommandLine(virCommand *cmd, =20 if (!source) { virReportError(VIR_ERR_XML_ERROR, - _("Domain '%s' sysinfo are not available"), + _("Domain '%1$s' sysinfo are not available"), def->name); return -1; } @@ -5811,7 +5810,7 @@ qemuBuildClockArgStr(virDomainClockDef *def) case VIR_DOMAIN_CLOCK_OFFSET_LAST: default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported clock offset '%s'"), + _("unsupported clock offset '%1$s'"), virDomainClockOffsetTypeToString(def->offset)); return NULL; } @@ -6201,7 +6200,7 @@ qemuBuildCpuModelArgStr(virQEMUDriver *driver, virBufferAddLit(buf, "host"); } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected host-model CPU for %s architectur= e"), + _("unexpected host-model CPU for %1$s architect= ure"), virArchToString(def->os.arch)); return -1; } @@ -6219,8 +6218,8 @@ qemuBuildCpuModelArgStr(virQEMUDriver *driver, cpu->features && !virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("CPU features not supported by hypervisor for %s " - "architecture"), virArchToString(def->os.arch)); + _("CPU features not supported by hypervisor for %1$= s architecture"), + virArchToString(def->os.arch)); return -1; } =20 @@ -6519,8 +6518,7 @@ qemuBuildCpuCommandLine(virCommand *cmd, break; default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("CPU flags requested but can't determine " - "default CPU for arch %s"), + _("CPU flags requested but can't determine defa= ult CPU for arch %1$s"), virArchToString(def->os.arch)); return -1; } @@ -8354,7 +8352,7 @@ qemuInterfaceVhostuserConnect(virCommand *cmd, case VIR_DOMAIN_CHR_TYPE_DBUS: case VIR_DOMAIN_CHR_TYPE_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, - _("vhost-user type '%s' not supported"), + _("vhost-user type '%1$s' not supported"), virDomainChrTypeToString(net->data.vhostuser->type)= ); return -1; } @@ -9095,7 +9093,7 @@ qemuBuildSerialCommandLine(virCommand *cmd, =20 if (caps && !virQEMUCapsGet(qemuCaps, caps)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("'%s' is not supported in this QEMU binar= y"), + _("'%1$s' is not supported in this QEMU bin= ary"), virDomainChrSerialTargetModelTypeToString(s= erial->targetModel)); return -1; } @@ -9378,15 +9376,15 @@ qemuBuildTPMOpenBackendFDs(const char *tpmdev, return -1; =20 if ((*tpmfd =3D open(tpmdev, O_RDWR)) < 0) { - virReportSystemError(errno, _("Could not open TPM device %s"), + virReportSystemError(errno, _("Could not open TPM device %1$s"), tpmdev); return -1; } =20 if ((*cancelfd =3D open(cancel_path, O_WRONLY)) < 0) { virReportSystemError(errno, - _("Could not open TPM device's cancel " - "path %s"), cancel_path); + _("Could not open TPM device's cancel path %1= $s"), + cancel_path); VIR_FORCE_CLOSE(*tpmfd); return -1; } @@ -9928,7 +9926,7 @@ qemuBuildCommandLineValidate(virQEMUDriver *driver, def->os.type =3D=3D VIR_DOMAIN_OSTYPE_XEN || def->os.type =3D=3D VIR_DOMAIN_OSTYPE_LINUX) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("qemu emulator '%s' does not support xen"), + _("qemu emulator '%1$s' does not support xen"), def->emulator); return -1; } @@ -10488,7 +10486,7 @@ qemuBuildSerialChrDeviceProps(const virDomainDef *d= ef, =20 if (caps && !virQEMUCapsGet(qemuCaps, caps)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("'%s' is not supported in this QEMU binary"), + _("'%1$s' is not supported in this QEMU binary"= ), virDomainChrSerialTargetModelTypeToString(seria= l->targetModel)); return NULL; } @@ -10620,7 +10618,7 @@ qemuBuildConsoleChrDeviceProps(const virDomainDef *= def, case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_OPENVZ: case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported console target type %s"), + _("unsupported console target type %1$s"), NULLSTR(virDomainChrConsoleTargetTypeToString(chr->= targetType))); break; } --=20 2.39.2