From nobody Mon Feb 9 01:03:04 2026 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=1678464728; cv=none; d=zohomail.com; s=zohoarc; b=hzOLpfGXoS3zu/SlmfacCocuo9BNyQAQTEBkjOrh4THYCFKMkWycCwnOY1jetgYgvyLu9OMHnY5PQbXta0Ij0zQxHiYv5Me1SrcUSCaXdDD5z/K8dIRL7l6VStNTYekOjM7+k96yVycI1BWKZoVz9/S8GMEHbNSDWZ+Vw6CAI0A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678464728; 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=sY58AWIzWsurJwU6np2zeeQ+E6RhFXgw9udG8KltzWI=; b=gPTTroJ4UZZ8x481lFg5dgRXdaWd2UicnZdBezw2XeZUssVql2Xw00mjDrsZosDpG1risYMkGGqCgnn5NmGaboKSNbQuu9QA3GIcWhQ62qLA0yckBS1IjP8gVYXyCI2KvMXBkerfsWjBaRufRAn+GQPzvsOgzwY14FvAIp1+6tA= 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 1678464728655721.9056332902326; Fri, 10 Mar 2023 08:12:08 -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-396-WPJmGhVYMvmYEwu27rmqsg-1; Fri, 10 Mar 2023 11:11:35 -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 C99561871CD7; Fri, 10 Mar 2023 16:10:52 +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 B40BE492C3E; Fri, 10 Mar 2023 16:10:52 +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 A5B531946A69; Fri, 10 Mar 2023 16:10:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 3181A1946587 for ; Fri, 10 Mar 2023 16:10:51 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 2510D1121318; Fri, 10 Mar 2023 16:10:51 +0000 (UTC) Received: from rein.int.mamuti.net (unknown [10.45.226.138]) by smtp.corp.redhat.com (Postfix) with ESMTP id BB14F1121315 for ; Fri, 10 Mar 2023 16:10:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678464727; 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=sY58AWIzWsurJwU6np2zeeQ+E6RhFXgw9udG8KltzWI=; b=H9RzRBn9Angi1uG7pLbMQ0cA9aTBxZPVSkPyafmodTN2+9tpo9gmOUA01tUITm5n/r1NFY EnrlyZLABxRvQCaD/NTuQO/nFQG/6uzG0jnQVodiCJwJx7PkLHXBGbiQeF3vCxvTHmXOJA 6YNvm8bYiuy8vlkSoyg0lVhMNKcqEDk= X-MC-Unique: WPJmGhVYMvmYEwu27rmqsg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Jiri Denemark To: libvir-list@redhat.com Subject: [libvirt PATCH 29/51] qemu/qemu_monitor_json: Update format strings in translated messages Date: Fri, 10 Mar 2023 17:09:45 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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: 1678464729302100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jiri Denemark --- src/qemu/qemu_monitor_json.c | 91 ++++++++++++++++++------------------ 1 file changed, 45 insertions(+), 46 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index f4416c929f..3b42b28fa1 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -195,7 +195,7 @@ qemuMonitorJSONIOProcessLine(qemuMonitor *mon, =20 if (virJSONValueGetType(obj) !=3D VIR_JSON_TYPE_OBJECT) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Parsed JSON reply '%s' isn't an object"), line); + _("Parsed JSON reply '%1$s' isn't an object"), line= ); return -1; } =20 @@ -215,11 +215,11 @@ qemuMonitorJSONIOProcessLine(qemuMonitor *mon, return 0; } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unexpected JSON reply '%s'"), line); + _("Unexpected JSON reply '%1$s'"), line); } } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown JSON reply '%s'"), line); + _("Unknown JSON reply '%1$s'"), line); } =20 return -1; @@ -362,11 +362,11 @@ qemuMonitorJSONCheckErrorFull(virJSONValue *cmd, /* Only send the user the command name + friendly error */ if (!error) virReportError(VIR_ERR_INTERNAL_ERROR, - _("unable to execute QEMU command '%s'"), + _("unable to execute QEMU command '%1$s'"), qemuMonitorJSONCommandName(cmd)); else virReportError(VIR_ERR_INTERNAL_ERROR, - _("unable to execute QEMU command '%s': %s"), + _("unable to execute QEMU command '%1$s': %2$s"= ), qemuMonitorJSONCommandName(cmd), qemuMonitorJSONStringifyError(error)); =20 @@ -382,7 +382,7 @@ qemuMonitorJSONCheckErrorFull(virJSONValue *cmd, return -1; =20 virReportError(VIR_ERR_INTERNAL_ERROR, - _("unable to execute QEMU command '%s'"), + _("unable to execute QEMU command '%1$s'"), qemuMonitorJSONCommandName(cmd)); return -1; } @@ -416,7 +416,7 @@ qemuMonitorJSONGetReply(virJSONValue *cmd, VIR_DEBUG("Unexpected return type %d (expecting %d) for command %s= : %s", virJSONValueGetType(data), type, cmdstr, retstr); virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected type returned by QEMU command '%s'"), + _("unexpected type returned by QEMU command '%1$s'"= ), qemuMonitorJSONCommandName(cmd)); =20 return NULL; @@ -632,7 +632,7 @@ qemuMonitorJSONGuestPanicExtractInfo(virJSONValue *data) return qemuMonitorJSONGuestPanicExtractInfoS390(data); =20 virReportError(VIR_ERR_INTERNAL_ERROR, - _("unknown panic info type '%s'"), NULLSTR(type)); + _("unknown panic info type '%1$s'"), NULLSTR(type)); return NULL; } =20 @@ -1261,7 +1261,7 @@ qemuMonitorJSONExtractDumpStats(virJSONValue *result, ret->status =3D qemuMonitorDumpStatusTypeFromString(statusstr); if (ret->status < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("incomplete result, unknown status string '%s'"), + _("incomplete result, unknown status string '%1$s'"= ), statusstr); return -1; } @@ -1389,7 +1389,7 @@ qemuMonitorJSONHumanCommand(qemuMonitor *mon, =20 if (qemuMonitorJSONHasError(reply, "CommandNotFound")) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, - _("Human monitor command is not available to run %s= "), + _("Human monitor command is not available to run %1= $s"), cmd_str); return -1; } @@ -1763,7 +1763,7 @@ qemuMonitorJSONUpdateVideoMemorySize(qemuMonitor *mon, case VIR_DOMAIN_VIDEO_TYPE_VGA: if (qemuMonitorJSONGetObjectProperty(mon, path, "vgamem_mb", &prop= ) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("QOM Object '%s' has no property 'vgamem_mb'"= ), + _("QOM Object '%1$s' has no property 'vgamem_mb= '"), path); return -1; } @@ -1772,7 +1772,7 @@ qemuMonitorJSONUpdateVideoMemorySize(qemuMonitor *mon, case VIR_DOMAIN_VIDEO_TYPE_QXL: if (qemuMonitorJSONGetObjectProperty(mon, path, "vram_size", &prop= ) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("QOM Object '%s' has no property 'vram_size'"= ), + _("QOM Object '%1$s' has no property 'vram_size= '"), path); return -1; } @@ -1780,14 +1780,14 @@ qemuMonitorJSONUpdateVideoMemorySize(qemuMonitor *m= on, =20 if (qemuMonitorJSONGetObjectProperty(mon, path, "ram_size", &prop)= < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("QOM Object '%s' has no property 'ram_size'"), + _("QOM Object '%1$s' has no property 'ram_size'= "), path); return -1; } video->ram =3D prop.val.ul / 1024; if (qemuMonitorJSONGetObjectProperty(mon, path, "vgamem_mb", &prop= ) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("QOM Object '%s' has no property 'vgamem_mb'"= ), + _("QOM Object '%1$s' has no property 'vgamem_mb= '"), path); return -1; } @@ -1796,7 +1796,7 @@ qemuMonitorJSONUpdateVideoMemorySize(qemuMonitor *mon, case VIR_DOMAIN_VIDEO_TYPE_VMVGA: if (qemuMonitorJSONGetObjectProperty(mon, path, "vgamem_mb", &prop= ) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("QOM Object '%s' has no property 'vgamem_mb'"= ), + _("QOM Object '%1$s' has no property 'vgamem_mb= '"), path); return -1; } @@ -1842,7 +1842,7 @@ qemuMonitorJSONUpdateVideoVram64Size(qemuMonitor *mon, if (qemuMonitorJSONGetObjectProperty(mon, path, "vram64_size_mb", &prop) = < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("QOM Object '%s' has no property 'vram64_= size_mb'"), + _("QOM Object '%1$s' has no property 'vram6= 4_size_mb'"), path); return -1; } @@ -2157,7 +2157,7 @@ qemuMonitorJSONBlockInfoAdd(GHashTable *table, =20 if (g_hash_table_contains(table, entryname)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Duplicate block info for '%s'"), entryname); + _("Duplicate block info for '%1$s'"), entryname); return -1; } =20 @@ -2209,7 +2209,7 @@ int qemuMonitorJSONGetBlockInfo(qemuMonitor *mon, =20 if (virJSONValueObjectGetBoolean(dev, "removable", &info.removable= ) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot read %s value"), + _("cannot read %1$s value"), "removable"); return -1; } @@ -2268,7 +2268,7 @@ qemuMonitorJSONBlockStatsCollectData(virJSONValue *de= v, (*nstats)++; \ if (virJSONValueObjectGetNumberUlong(stats, NAME, &VAR) < 0) { \ virReportError(VIR_ERR_INTERNAL_ERROR, \ - _("cannot read %s statistic"), NAME); \ + _("cannot read %1$s statistic"), NAME); \ return NULL; \ } \ } @@ -2931,7 +2931,7 @@ qemuMonitorJSONGetMigrationStatsReply(virJSONValue *r= eply, stats->status =3D qemuMonitorMigrationStatusTypeFromString(statusstr); if (stats->status < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected migration status in %s"), statusstr); + _("unexpected migration status in %1$s"), statusstr= ); return -1; } =20 @@ -3675,14 +3675,14 @@ qemuMonitorJSONQueryRxFilterParse(virJSONValue *msg, if (!(element =3D virJSONValueArrayGet(table, i)) || !(tmp =3D virJSONValueGetString(element))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Missing or invalid element %zu of 'unicast' " - "list in query-rx-filter response"), i); + _("Missing or invalid element %1$zu of 'unicast= ' list in query-rx-filter response"), + i); return -1; } if (virMacAddrParse(tmp, &fil->unicast.table[i]) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("invalid mac address '%s' in 'unicast-table' " - "array in query-rx-filter response"), tmp); + _("invalid mac address '%1$s' in 'unicast-table= ' array in query-rx-filter response"), + tmp); return -1; } } @@ -3714,14 +3714,14 @@ qemuMonitorJSONQueryRxFilterParse(virJSONValue *msg, if (!(element =3D virJSONValueArrayGet(table, i)) || !(tmp =3D virJSONValueGetString(element))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Missing or invalid element %zu of 'multicast= ' " - "list in query-rx-filter response"), i); + _("Missing or invalid element %1$zu of 'multica= st' list in query-rx-filter response"), + i); return -1; } if (virMacAddrParse(tmp, &fil->multicast.table[i]) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("invalid mac address '%s' in 'multicast-table= ' " - "array in query-rx-filter response"), tmp); + _("invalid mac address '%1$s' in 'multicast-tab= le' array in query-rx-filter response"), + tmp); return -1; } } @@ -3746,8 +3746,8 @@ qemuMonitorJSONQueryRxFilterParse(virJSONValue *msg, if (!(element =3D virJSONValueArrayGet(table, i)) || virJSONValueGetNumberUint(element, &fil->vlan.table[i]) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Missing or invalid element %zu of 'vlan-tabl= e' " - "array in query-rx-filter response"), i); + _("Missing or invalid element %1$zu of 'vlan-ta= ble' array in query-rx-filter response"), + i); return -1; } } @@ -3842,7 +3842,7 @@ qemuMonitorJSONExtractChardevInfo(virJSONValue *reply, =20 if (virHashAddEntry(info, alias, entry) < 0) { virReportError(VIR_ERR_OPERATION_FAILED, - _("failed to add chardev '%s' info"), alias); + _("failed to add chardev '%1$s' info"), alias); goto cleanup; } =20 @@ -4137,7 +4137,7 @@ int qemuMonitorJSONSendKey(qemuMonitor *mon, =20 if (keycodes[i] > 0xffff) { virReportError(VIR_ERR_OPERATION_FAILED, - _("keycode %zu is invalid: 0x%X"), i, keycodes[= i]); + _("keycode %1$zu is invalid: 0x%2$X"), i, keyco= des[i]); return -1; } =20 @@ -4316,7 +4316,7 @@ qemuMonitorJSONBlockJobError(virJSONValue *cmd, if ((error =3D virJSONValueObjectGet(reply, "error")) && (qemuMonitorJSONErrorIsClass(error, "DeviceNotActive"))) { virReportError(VIR_ERR_OPERATION_INVALID, - _("No active block job '%s'"), jobname); + _("No active block job '%1$s'"), jobname); return -1; } =20 @@ -4511,8 +4511,7 @@ int qemuMonitorJSONOpenGraphics(qemuMonitor *mon, FIELD, \ &reply->STORE) < 0) { \ virReportError(VIR_ERR_OPERATION_UNSUPPORTED, \ - _("block_io_throttle field '%s' missing " \ - "in qemu's output"), \ + _("block_io_throttle field '%1$s' missing in qemu's= output"), \ #STORE); \ return -1; \ } @@ -4587,7 +4586,7 @@ qemuMonitorJSONBlockIoThrottleInfo(virJSONValue *io_t= hrottle, =20 if (!found) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot find throttling info for device '%s'"), + _("cannot find throttling info for device '%1$s'"), drivealias ? drivealias : qdevid); return -1; } @@ -5033,20 +5032,20 @@ qemuMonitorJSONParseCPUModelData(virJSONValue *data, { if (!(*cpu_model =3D virJSONValueObjectGetObject(data, "model"))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("%s reply data was missing 'model'"), cmd_name); + _("%1$s reply data was missing 'model'"), cmd_name); return -1; } =20 if (!(*cpu_name =3D virJSONValueObjectGetString(*cpu_model, "name"))) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("%s reply data was missing 'name'"), cmd_name); + _("%1$s reply data was missing 'name'"), cmd_name); return -1; } =20 if (!(*cpu_props =3D virJSONValueObjectGetObject(*cpu_model, "props"))= && fail_no_props) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("%s reply data was missing 'props'"), cmd_name); + _("%1$s reply data was missing 'props'"), cmd_name); return -1; } =20 @@ -5565,7 +5564,7 @@ int qemuMonitorJSONGetObjectProperty(qemuMonitor *mon, break; case QEMU_MONITOR_OBJECT_PROPERTY_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, - _("qom-get invalid object property type %d"), + _("qom-get invalid object property type %1$d"), prop->type); return -1; break; @@ -5653,7 +5652,7 @@ int qemuMonitorJSONSetObjectProperty(qemuMonitor *mon, break; case QEMU_MONITOR_OBJECT_PROPERTY_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, - _("qom-set invalid object property type %d"), + _("qom-set invalid object property type %1$d"), prop->type); return -1; =20 @@ -6586,7 +6585,7 @@ qemuMonitorJSONAttachCharDevGetProps(const char *chrI= D, case VIR_DOMAIN_CHR_TYPE_STDIO: case VIR_DOMAIN_CHR_TYPE_NMDM: virReportError(VIR_ERR_OPERATION_FAILED, - _("Hotplug unsupported for char device type '%s'"), + _("Hotplug unsupported for char device type '%1$s'"= ), virDomainChrTypeToString(chr->type)); return NULL; =20 @@ -6763,7 +6762,7 @@ qemuMonitorJSONParseCPUx86FeatureWord(virJSONValue *d= ata, cpuid->edx =3D features; } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unknown CPU register '%s'"), reg); + _("unknown CPU register '%1$s'"), reg); return -1; } =20 @@ -7116,7 +7115,7 @@ qemuMonitorJSONGetIOThreads(qemuMonitor *mon, if (virStrToLong_ui(tmp + strlen("iothread"), NULL, 10, &info->iothread_id) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to find iothread id for '%s'"), + _("failed to find iothread id for '%1$s'"), tmp); goto cleanup; } @@ -8560,7 +8559,7 @@ qemuMonitorJSONExtractDirtyRateInfo(virJSONValue *dat= a, =20 if ((status =3D qemuMonitorDirtyRateStatusTypeFromString(statusstr)) <= 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown dirty rate status: %s"), statusstr); + _("Unknown dirty rate status: %1$s"), statusstr); return -1; } info->status =3D status; @@ -8590,7 +8589,7 @@ qemuMonitorJSONExtractDirtyRateInfo(virJSONValue *dat= a, if ((modestr =3D virJSONValueObjectGetString(data, "mode"))) { if ((mode =3D qemuMonitorDirtyRateCalcModeTypeFromString(modestr))= < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown dirty page rate calculation mode: %s"), = modestr); + _("Unknown dirty page rate calculation mode: %1$s")= , modestr); return -1; } info->mode =3D mode; --=20 2.39.2