From nobody Fri Dec 19 02:51:18 2025 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=1678464635; cv=none; d=zohomail.com; s=zohoarc; b=RRiJnlXF7nlwzuZ/9ibGVg6OHaRKnhp5/2CIT30bBOQROx8yAS4GvRYPPDbB+/5FoStuMkWOtDRHlw/DgO8BtG0amldo7+oUQxmiUnGEYnBn6QotlIYyvSivw10ykSl3wWqfQp4+xdlHy5RI2Zmd0kQl84OOVEu+qdAzK0ygbzo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678464635; 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=O1VA+xUESLq8pa4Wpwxyrcx0DW5PEeWBdMDnvjUm2RM=; b=VTC2tlrqAu1T3T6iIXk+a+XKAgdmuN37vooUB10TmcPttvnrE4IWd+QHsMPElhnwGhV4pObdQ10sLFvNpnuA64WXS9cvgHLW1aDoKA9wVCWxdNLFHjIoPnX5LzM1H6v2ZaBWXaX2c99BiDZNYaC0CYZUmgE1Qpbx/Rq9sBuDi3w= 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 1678464635308226.7696318567264; Fri, 10 Mar 2023 08:10:35 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-84-HLXJ4nFiOiOWJEe2VpMS2g-1; Fri, 10 Mar 2023 11:10:32 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 129FD2A5954E; Fri, 10 Mar 2023 16:10:26 +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 EFC1B1121315; Fri, 10 Mar 2023 16:10:25 +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 E4F4E1946A4A; Fri, 10 Mar 2023 16:10:25 +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 52C781946587 for ; Fri, 10 Mar 2023 16:10:20 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 4869E492C3E; Fri, 10 Mar 2023 16:10:20 +0000 (UTC) Received: from rein.int.mamuti.net (unknown [10.45.226.138]) by smtp.corp.redhat.com (Postfix) with ESMTP id E280F492B02 for ; Fri, 10 Mar 2023 16:10:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678464634; 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=O1VA+xUESLq8pa4Wpwxyrcx0DW5PEeWBdMDnvjUm2RM=; b=fOgYhPLkXwVpgSGZJVCPXLffUl5Kp5QW79ZvTx4Yrct6e6MVWFqcBirM48bsskBWTT9Sbn PKF3v1M43PyOpsKlo9gCz4Jmuco7U1LcqSIG9TGXrkVzBedyVMEx6r1wBfnlLES+2DgKW5 8r8vjX+6Hlq1wnf6Jvf8SQRZRlytAIw= X-MC-Unique: HLXJ4nFiOiOWJEe2VpMS2g-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Jiri Denemark To: libvir-list@redhat.com Subject: [libvirt PATCH 04/51] bhyve: Update format strings in translated messages Date: Fri, 10 Mar 2023 17:09:20 +0100 Message-Id: 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.3 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: 1678464636739100010 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jiri Denemark --- src/bhyve/bhyve_command.c | 18 ++++++++-------- src/bhyve/bhyve_domain.c | 2 +- src/bhyve/bhyve_driver.c | 38 ++++++++++++++++----------------- src/bhyve/bhyve_firmware.c | 4 ++-- src/bhyve/bhyve_monitor.c | 6 +++--- src/bhyve/bhyve_parse_command.c | 17 +++++++-------- src/bhyve/bhyve_process.c | 20 ++++++++--------- 7 files changed, 52 insertions(+), 53 deletions(-) diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index 1c0f2e2bfb..563651336e 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -74,7 +74,7 @@ bhyveBuildNetArgStr(const virDomainDef *def, brname =3D g_strdup(virDomainNetGetActualBridgeName(net)); } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Network type %d is not supported"), + _("Network type %1$d is not supported"), virDomainNetGetActualType(net)); goto cleanup; } @@ -553,7 +553,7 @@ bhyveBuildSoundArgStr(const virDomainDef *def G_GNUC_UN= USED, case VIR_DOMAIN_AUDIO_TYPE_FILE: case VIR_DOMAIN_AUDIO_TYPE_DBUS: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported audio backend '%s'"), + _("unsupported audio backend '%1$s'"), virDomainAudioTypeTypeToString(audio->type)); return -1; case VIR_DOMAIN_AUDIO_TYPE_LAST: @@ -589,7 +589,7 @@ bhyveBuildFSArgStr(const virDomainDef *def G_GNUC_UNUSE= D, case VIR_DOMAIN_FS_TYPE_VOLUME: case VIR_DOMAIN_FS_TYPE_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported filesystem type '%s'"), + _("unsupported filesystem type '%1$s'"), virDomainFSTypeToString(fs->type)); return -1; } @@ -606,7 +606,7 @@ bhyveBuildFSArgStr(const virDomainDef *def G_GNUC_UNUSE= D, case VIR_DOMAIN_FS_DRIVER_TYPE_PLOOP: case VIR_DOMAIN_FS_DRIVER_TYPE_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported filesystem driver '%s'"), + _("unsupported filesystem driver '%1$s'"), virDomainFSDriverTypeToString(fs->fsdriver)); return -1; } @@ -620,7 +620,7 @@ bhyveBuildFSArgStr(const virDomainDef *def G_GNUC_UNUSE= D, case VIR_DOMAIN_FS_ACCESSMODE_DEFAULT: case VIR_DOMAIN_FS_ACCESSMODE_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported filesystem accessmode '%s'"), + _("unsupported filesystem accessmode '%1$s'"), virDomainFSAccessModeTypeToString(fs->accessmode)); return -1; } @@ -723,7 +723,7 @@ virBhyveProcessBuildBhyveCmd(struct _bhyveConn *driver,= virDomainDef *def, break; default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported clock offset '%s'"), + _("unsupported clock offset '%1$s'"), virDomainClockOffsetTypeToString(def->clock.offset= )); return NULL; } @@ -874,7 +874,7 @@ virBhyveProcessBuildCustomLoaderCmd(virDomainDef *def) =20 if (def->os.bootloaderArgs =3D=3D NULL) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Custom loader requires explicit %s configuration= "), + _("Custom loader requires explicit %1$s configurati= on"), "bootloader_args"); return NULL; } @@ -1059,7 +1059,7 @@ virBhyveGetBootDisk(virDomainDef *def) case VIR_DOMAIN_BOOT_LAST: default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Cannot boot from device %s"), + _("Cannot boot from device %1$s"), virDomainBootTypeToString(def->os.bootDevs[0])); return NULL; } @@ -1080,7 +1080,7 @@ virBhyveGetBootDisk(virDomainDef *def) =20 if (match =3D=3D NULL) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Cannot find boot device of requested type %s= "), + _("Cannot find boot device of requested type %1= $s"), virDomainBootTypeToString(def->os.bootDevs[0])); return NULL; } diff --git a/src/bhyve/bhyve_domain.c b/src/bhyve/bhyve_domain.c index a1d1ebc706..a8b1f97790 100644 --- a/src/bhyve/bhyve_domain.c +++ b/src/bhyve/bhyve_domain.c @@ -114,7 +114,7 @@ bhyveDomainDiskDefAssignAddress(struct _bhyveConn *driv= er, =20 if (idx < 0) { virReportError(VIR_ERR_XML_ERROR, - _("Unknown disk name '%s' and no address specified"= ), + _("Unknown disk name '%1$s' and no address specifie= d"), def->dst); return -1; } diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index e7d9c2adf3..9ece06447d 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -83,7 +83,7 @@ bhyveAutostartDomain(virDomainObj *vm, void *opaque) VIR_DOMAIN_RUNNING_BOOTED, 0); if (ret < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to autostart VM '%s': %s"), + _("Failed to autostart VM '%1$s': %2$s"), vm->def->name, virGetLastErrorMessage()); } } @@ -153,7 +153,7 @@ bhyveDomObjFromDomain(virDomainPtr domain) if (!vm) { virUUIDFormat(domain->uuid, uuidstr); virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching uuid '%s' (%s)"), + _("no domain with matching uuid '%1$s' (%2$s)"), uuidstr, domain->name); return NULL; } @@ -183,7 +183,7 @@ bhyveConnectOpen(virConnectPtr conn, =20 if (STRNEQ(conn->uri->path, "/system")) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unexpected bhyve URI path '%s', try bhyve:///sys= tem"), + _("Unexpected bhyve URI path '%1$s', try bhyve:///s= ystem"), conn->uri->path); return VIR_DRV_OPEN_ERROR; } @@ -257,7 +257,7 @@ bhyveConnectGetVersion(virConnectPtr conn, unsigned lon= g *version) =20 if (virStringParseVersion(version, ver.release, true) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown release: %s"), ver.release); + _("Unknown release: %1$s"), ver.release); return -1; } =20 @@ -369,21 +369,21 @@ bhyveDomainSetAutostart(virDomainPtr domain, int auto= start) if (autostart) { if (g_mkdir_with_parents(BHYVE_AUTOSTART_DIR, 0777) < 0) { virReportSystemError(errno, - _("cannot create autostart directory = %s"), + _("cannot create autostart directory = %1$s"), BHYVE_AUTOSTART_DIR); goto cleanup; } =20 if (symlink(configFile, autostartLink) < 0) { virReportSystemError(errno, - _("Failed to create symlink '%s' to '= %s'"), + _("Failed to create symlink '%1$s' to= '%2$s'"), autostartLink, configFile); goto cleanup; } } else { if (unlink(autostartLink) < 0 && errno !=3D ENOENT && errno != =3D ENOTDIR) { virReportSystemError(errno, - _("Failed to delete symlink '%s'"), + _("Failed to delete symlink '%1$s'"), autostartLink); goto cleanup; } @@ -669,7 +669,7 @@ bhyveConnectDomainXMLToNative(virConnectPtr conn, =20 if (STRNEQ(format, BHYVE_CONFIG_FORMAT_ARGV)) { virReportError(VIR_ERR_INVALID_ARG, - _("Unsupported config type %s"), format); + _("Unsupported config type %1$s"), format); return NULL; } =20 @@ -742,7 +742,7 @@ bhyveDomainLookupByUUID(virConnectPtr conn, char uuidstr[VIR_UUID_STRING_BUFLEN]; virUUIDFormat(uuid, uuidstr); virReportError(VIR_ERR_NO_DOMAIN, - _("No domain with matching uuid '%s'"), uuidstr); + _("No domain with matching uuid '%1$s'"), uuidstr); goto cleanup; } =20 @@ -767,7 +767,7 @@ static virDomainPtr bhyveDomainLookupByName(virConnectP= tr conn, =20 if (!vm) { virReportError(VIR_ERR_NO_DOMAIN, - _("no domain with matching name '%s'"), name); + _("no domain with matching name '%1$s'"), name); goto cleanup; } =20 @@ -793,7 +793,7 @@ bhyveDomainLookupByID(virConnectPtr conn, =20 if (!vm) { virReportError(VIR_ERR_NO_DOMAIN, - _("No domain with matching ID '%d'"), id); + _("No domain with matching ID '%1$d'"), id); goto cleanup; } =20 @@ -1234,14 +1234,14 @@ bhyveStateInitialize(bool privileged, =20 if (g_mkdir_with_parents(BHYVE_LOG_DIR, 0777) < 0) { virReportSystemError(errno, - _("Failed to mkdir %s"), + _("Failed to mkdir %1$s"), BHYVE_LOG_DIR); goto cleanup; } =20 if (g_mkdir_with_parents(BHYVE_STATE_DIR, 0777) < 0) { virReportSystemError(errno, - _("Failed to mkdir %s"), + _("Failed to mkdir %1$s"), BHYVE_STATE_DIR); goto cleanup; } @@ -1309,7 +1309,7 @@ bhyveConnectGetMaxVcpus(virConnectPtr conn, if (!type || STRCASEEQ(type, "bhyve")) return 16; =20 - virReportError(VIR_ERR_INVALID_ARG, _("unknown type '%s'"), type); + virReportError(VIR_ERR_INVALID_ARG, _("unknown type '%1$s'"), type); return -1; } =20 @@ -1543,7 +1543,7 @@ bhyveConnectDomainXMLFromNative(virConnectPtr conn, =20 if (STRNEQ(nativeFormat, BHYVE_CONFIG_FORMAT_ARGV)) { virReportError(VIR_ERR_INVALID_ARG, - _("unsupported config type %s"), nativeFormat); + _("unsupported config type %1$s"), nativeFormat); return NULL; } =20 @@ -1576,28 +1576,28 @@ bhyveConnectGetDomainCapabilities(virConnectPtr con= n, if (virttype_str && (virttype =3D virDomainVirtTypeFromString(virttype_str)) < 0) { virReportError(VIR_ERR_INVALID_ARG, - _("unknown virttype: %s"), + _("unknown virttype: %1$s"), virttype_str); goto cleanup; } =20 if (virttype !=3D VIR_DOMAIN_VIRT_BHYVE) { virReportError(VIR_ERR_INVALID_ARG, - _("unknown virttype: %s"), + _("unknown virttype: %1$s"), virttype_str); goto cleanup; } =20 if (arch_str && (arch =3D virArchFromString(arch_str)) =3D=3D VIR_ARCH= _NONE) { virReportError(VIR_ERR_INVALID_ARG, - _("unknown architecture: %s"), + _("unknown architecture: %1$s"), arch_str); goto cleanup; } =20 if (!ARCH_IS_X86(arch)) { virReportError(VIR_ERR_NO_SUPPORT, - _("unsupported architecture: %s"), + _("unsupported architecture: %1$s"), virArchToString(arch)); goto cleanup; } diff --git a/src/bhyve/bhyve_firmware.c b/src/bhyve/bhyve_firmware.c index ff131efa41..57ab9c7a82 100644 --- a/src/bhyve/bhyve_firmware.c +++ b/src/bhyve/bhyve_firmware.c @@ -69,7 +69,7 @@ bhyveFirmwareFillDomain(bhyveConn *driver, if (!matching_firmware) { if (!first_found) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("no firmwares found in %s"), + _("no firmwares found in %1$s"), firmware_dir); return -1; } else { @@ -82,7 +82,7 @@ bhyveFirmwareFillDomain(bhyveConn *driver, =20 if (def->os.loader->format !=3D VIR_STORAGE_FILE_RAW) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unsupported loader format '%s'"), + _("Unsupported loader format '%1$s'"), virStorageFileFormatTypeToString(def->os.loader->fo= rmat)); return -1; } diff --git a/src/bhyve/bhyve_monitor.c b/src/bhyve/bhyve_monitor.c index ae602b5c39..8cf4b41ca3 100644 --- a/src/bhyve/bhyve_monitor.c +++ b/src/bhyve/bhyve_monitor.c @@ -120,7 +120,7 @@ bhyveMonitorIO(int watch, int kq, int events G_GNUC_UNU= SED, void *opaque) =20 if (watch !=3D mon->watch || kq !=3D mon->kq) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("event from unexpected fd %d!=3D%d / watch %d!=3D= %d"), + _("event from unexpected fd %1$d!=3D%2$d / watch %3= $d!=3D%4$d"), mon->kq, kq, mon->watch, watch); return; } @@ -142,7 +142,7 @@ bhyveMonitorIO(int watch, int kq, int events G_GNUC_UNU= SED, void *opaque) if (kev.filter =3D=3D EVFILT_PROC && (kev.fflags & NOTE_EXIT) !=3D 0) { if ((pid_t)kev.ident !=3D vm->pid) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("event from unexpected proc %ju!=3D%ju"), + _("event from unexpected proc %1$ju!=3D%2$ju"), (uintmax_t)vm->pid, (uintmax_t)kev.ident); return; } @@ -151,7 +151,7 @@ bhyveMonitorIO(int watch, int kq, int events G_GNUC_UNU= SED, void *opaque) status =3D kev.data; if (WIFSIGNALED(status) && WCOREDUMP(status)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Guest %s got signal %d and crashed"), + _("Guest %1$s got signal %2$d and crashed"), name, WTERMSIG(status)); virBhyveProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_CRASHED); } else if (WIFEXITED(status)) { diff --git a/src/bhyve/bhyve_parse_command.c b/src/bhyve/bhyve_parse_comman= d.c index 2a5959ba1d..394e043c45 100644 --- a/src/bhyve/bhyve_parse_command.c +++ b/src/bhyve/bhyve_parse_command.c @@ -281,8 +281,8 @@ bhyveParseBhyveLPCArg(virDomainDef *def, =20 if (!STRPREFIX(param, "/dev/nmdm")) { virReportError(VIR_ERR_OPERATION_FAILED, - _("Failed to set com port %s: does not start wi= th " - "'/dev/nmdm'."), type); + _("Failed to set com port %1$s: does not start = with '/dev/nmdm'."), + type); goto error; } =20 @@ -301,8 +301,7 @@ bhyveParseBhyveLPCArg(virDomainDef *def, break; default: virReportError(VIR_ERR_OPERATION_FAILED, - _("Failed to set slave for %s: last letter = not " - "'A' or 'B'"), + _("Failed to set slave for %1$s: last lette= r not 'A' or 'B'"), NULLSTR(chr->source->data.nmdm.master)); goto error; } @@ -314,8 +313,8 @@ bhyveParseBhyveLPCArg(virDomainDef *def, break; default: virReportError(VIR_ERR_OPERATION_FAILED, - _("Failed to parse %s: only com1 and com2" - " supported."), type); + _("Failed to parse %1$s: only com1 and com2 sup= ported."), + type); goto error; break; } @@ -515,7 +514,7 @@ bhyveParsePCINet(virDomainDef *def, =20 if (virMacAddrParse(mac, &net->mac) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("unable to parse mac address '%s'"), + _("unable to parse mac address '%1$s'"), mac); goto cleanup; } @@ -716,7 +715,7 @@ bhyveParseBhyvePCIArg(virDomainDef *def, =20 #define CONSUME_ARG(var) \ if ((opti + 1) =3D=3D argc) { \ - virReportError(VIR_ERR_INVALID_ARG, _("Missing argument for '%s'")= , \ + virReportError(VIR_ERR_INVALID_ARG, _("Missing argument for '%1$s'= "), \ argv[opti]); \ return -1; \ } \ @@ -800,7 +799,7 @@ bhyveParseBhyveCommandLine(virDomainDef *def, CONSUME_ARG(arg); if (virUUIDParse(arg, def->uuid) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Cannot parse UUID '%s'"), arg); + _("Cannot parse UUID '%1$s'"), arg); return -1; } break; diff --git a/src/bhyve/bhyve_process.c b/src/bhyve/bhyve_process.c index eee0c4bf1d..5b0fd7658a 100644 --- a/src/bhyve/bhyve_process.c +++ b/src/bhyve/bhyve_process.c @@ -129,7 +129,7 @@ virBhyveProcessStartImpl(struct _bhyveConn *driver, if ((logfd =3D open(logfile, O_WRONLY | O_APPEND | O_CREAT, S_IRUSR | S_IWUSR)) < 0) { virReportSystemError(errno, - _("Failed to open '%s'"), + _("Failed to open '%1$s'"), logfile); goto cleanup; } @@ -145,7 +145,7 @@ virBhyveProcessStartImpl(struct _bhyveConn *driver, if (unlink(driver->pidfile) < 0 && errno !=3D ENOENT) { virReportSystemError(errno, - _("Cannot remove state PID file %s"), + _("Cannot remove state PID file %1$s"), driver->pidfile); goto cleanup; } @@ -180,7 +180,7 @@ virBhyveProcessStartImpl(struct _bhyveConn *driver, rc =3D virFileWriteStr(devmap_file, devicemap, 0644); if (rc) { virReportSystemError(errno, - _("Cannot write device.map '%s'"), + _("Cannot write device.map '%1$s'"), devmap_file); goto cleanup; } @@ -204,7 +204,7 @@ virBhyveProcessStartImpl(struct _bhyveConn *driver, =20 if (virPidFileReadPath(driver->pidfile, &vm->pid) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Domain %s didn't show up"), vm->def->name); + _("Domain %1$s didn't show up"), vm->def->name); goto cleanup; } =20 @@ -225,7 +225,7 @@ virBhyveProcessStartImpl(struct _bhyveConn *driver, if (devicemap !=3D NULL) { rc =3D unlink(devmap_file); if (rc < 0 && errno !=3D ENOENT) - virReportSystemError(errno, _("cannot unlink file '%s'"), + virReportSystemError(errno, _("cannot unlink file '%1$s'"), devmap_file); } =20 @@ -293,7 +293,7 @@ virBhyveProcessStop(struct _bhyveConn *driver, =20 if (vm->pid =3D=3D 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid PID %d for VM"), + _("Invalid PID %1$d for VM"), (int)vm->pid); return -1; } @@ -343,7 +343,7 @@ virBhyveProcessShutdown(virDomainObj *vm) { if (vm->pid =3D=3D 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid PID %d for VM"), + _("Invalid PID %1$d for VM"), (int)vm->pid); return -1; } @@ -386,7 +386,7 @@ virBhyveGetDomainTotalCpuStats(virDomainObj *vm, =20 if ((kd =3D kvm_openfiles(NULL, NULL, NULL, O_RDONLY, errbuf)) =3D=3D = NULL) { virReportError(VIR_ERR_SYSTEM_ERROR, - _("Unable to get kvm descriptor: %s"), + _("Unable to get kvm descriptor: %1$s"), errbuf); return -1; =20 @@ -395,7 +395,7 @@ virBhyveGetDomainTotalCpuStats(virDomainObj *vm, kp =3D kvm_getprocs(kd, KERN_PROC_PID, vm->pid, &nprocs); if (kp =3D=3D NULL || nprocs !=3D 1) { virReportError(VIR_ERR_SYSTEM_ERROR, - _("Unable to obtain information about pid: %d"), + _("Unable to obtain information about pid: %1$d"), (int)vm->pid); goto cleanup; } @@ -485,7 +485,7 @@ virBhyveProcessReconnectAll(struct _bhyveConn *driver) =20 if ((kd =3D kvm_openfiles(NULL, NULL, NULL, O_RDONLY, errbuf)) =3D=3D = NULL) { virReportError(VIR_ERR_SYSTEM_ERROR, - _("Unable to get kvm descriptor: %s"), + _("Unable to get kvm descriptor: %1$s"), errbuf); return; =20 --=20 2.39.2