From nobody Mon Feb 9 12:43:14 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=1692949264; cv=none; d=zohomail.com; s=zohoarc; b=T0CqCm3IsjS66Cwqd+wkm0PJB326z0+CaLPkkVJF3/4sWA9EOqTu/Pj3Ua/aidLeX4ut2fzR187l1cBmdzjkF+Yufmy0YimGeP3+lSCaOcDYCoRYqLS00C8oEHA1sMGljCr5XqjKek+Ak9gHz4mmMV4tkVaxyTrfA8MgW8pmxFk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692949264; 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=4l1uEofmrLpCqQ4dzZJEjx/HO2AeXKBkKK5ioRzDd60=; b=KTImfrgnCHM6I6SQYCzpbL3t2J8RBr+2FXNhwre10qeRtAtiubfXU4ens5w1jJ4wb3n1at/y6+jIXefrAWD3TCWAwiwRyqx7S/s0B6T6w+KfyJwumJiu17eYD2Hf6HVmaXNPRV5k6CPwnTQItdn9dIr+o4tyyMWGlqNzrFPuZoQ= 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 1692949264468193.1644978434365; Fri, 25 Aug 2023 00:41:04 -0700 (PDT) Received: from mimecast-mx02.redhat.com (66.187.233.73 [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-606-BMfYzlzKMoOQ0WTVUnIvXQ-1; Fri, 25 Aug 2023 03:40:54 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 33F521C25A8E; Fri, 25 Aug 2023 07:40:45 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 118D1140E969; Fri, 25 Aug 2023 07:40: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 ECAD819465B1; Fri, 25 Aug 2023 07:40:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id C712C1946589 for ; Fri, 25 Aug 2023 07:40:41 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id A99442026D76; Fri, 25 Aug 2023 07:40:41 +0000 (UTC) Received: from localhost.localdomain (unknown [10.43.2.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 50F702026E04 for ; Fri, 25 Aug 2023 07:40:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692949263; 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=4l1uEofmrLpCqQ4dzZJEjx/HO2AeXKBkKK5ioRzDd60=; b=hr/aKW2b0H4Th26cPtspnzYVNwsP6EUCcBssk1Wv0sp1L3m8/ZKq7pUgDBMWE6LBOZHLWp dBV/PL2X07+4b9tVBzRRa8TpHU+JnkRZX3kGdClj5oQgnYFF0CW79BG51cfXiCKSGVx1bw 7aqZ3fTdN4fh9QjCARuqXtI/QYNqhYg= X-MC-Unique: BMfYzlzKMoOQ0WTVUnIvXQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 25/27] vz: Move error messages onto a single line Date: Fri, 25 Aug 2023 09:40:22 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 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.7 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: 1692949265657100003 Content-Type: text/plain; charset="utf-8"; x-default="true" Error messages are exempt from the 80 columns rule. Move them onto one line. Signed-off-by: Michal Privoznik --- src/vz/vz_driver.c | 15 ++--- src/vz/vz_sdk.c | 135 +++++++++++++++------------------------------ src/vz/vz_utils.c | 66 ++++++++-------------- 3 files changed, 72 insertions(+), 144 deletions(-) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 401ca041ed..c7ceec2339 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -842,8 +842,7 @@ vzDomainDefineXMLFlags(virConnectPtr conn, const char *= xml, unsigned int flags) =20 if (!virDomainDefCheckABIStability(dom->def, def, driver->xmlo= pt)) { virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", - _("Can't change domain configuration " - "in managed save state")); + _("Can't change domain configuration in man= aged save state")); goto cleanup; } } else { @@ -1461,15 +1460,13 @@ static int vzCheckConfigUpdateFlags(virDomainObj *d= om, unsigned int *flags) =20 if (!(*flags & VIR_DOMAIN_AFFECT_CONFIG)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("domain config update needs VIR_DOMAIN_AFFECT_CON= FIG " - "flag to be set")); + _("domain config update needs VIR_DOMAIN_AFFECT_CON= FIG flag to be set")); return -1; } =20 if (virDomainObjIsActive(dom) && !(*flags & VIR_DOMAIN_AFFECT_LIVE)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("Updates on a running domain need " - "VIR_DOMAIN_AFFECT_LIVE flag")); + _("Updates on a running domain need VIR_DOMAIN_AFFE= CT_LIVE flag")); return -1; } =20 @@ -2793,8 +2790,7 @@ vzEatCookie(const char *cookiein, int cookieinlen, un= signed int flags) if ((!(tmp =3D virXPathString("string(./session-uuid[1])", ctx)) || (virUUIDParse(tmp, mig->session_uuid) < 0))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("missing or malformed session-uuid element " - "in migration data")); + _("missing or malformed session-uuid element in= migration data")); goto error; } } @@ -2921,8 +2917,7 @@ vzMigrationCreateURI(void) =20 if (STRPREFIX(hostname, "localhost")) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("hostname on destination resolved to localhost," - " but migration requires an FQDN")); + _("hostname on destination resolved to localhost, b= ut migration requires an FQDN")); goto cleanup; } =20 diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 286b52a29e..6a15d60577 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -2415,15 +2415,13 @@ prlsdkCheckUnsupportedParams(PRL_HANDLE sdkdom, vir= DomainDef *def) =20 if (def->blkio.ndevices > 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("blkio parameters are not supported " - "by vz driver")); + _("blkio parameters are not supported by vz driver"= )); return -1; } =20 if (virDomainDefGetMemoryTotal(def) !=3D def->mem.cur_balloon) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("changing balloon parameters is not supported " - "by vz driver")); + _("changing balloon parameters is not supported by = vz driver")); return -1; } =20 @@ -2440,8 +2438,7 @@ prlsdkCheckUnsupportedParams(PRL_HANDLE sdkdom, virDo= mainDef *def) virMemoryLimitIsSet(def->mem.swap_hard_limit)) { =20 virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Memory parameter is not supported " - "by vz driver")); + _("Memory parameter is not supported by vz driver")= ); return -1; } =20 @@ -2453,8 +2450,7 @@ prlsdkCheckUnsupportedParams(PRL_HANDLE sdkdom, virDo= mainDef *def) =20 if (def->placement_mode) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("changing cpu placement mode is not supported " - "by vz driver")); + _("changing cpu placement mode is not supported by = vz driver")); return -1; } =20 @@ -2489,8 +2485,7 @@ prlsdkCheckUnsupportedParams(PRL_HANDLE sdkdom, virDo= mainDef *def) memMode =3D=3D VIR_DOMAIN_NUMATUNE_MEM_STRICT) || virDomainNumatuneHasPerNodeBinding(def->numa)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("numa parameters are not supported " - "by vz driver")); + _("numa parameters are not supported by vz driver")= ); return -1; } =20 @@ -2499,8 +2494,7 @@ prlsdkCheckUnsupportedParams(PRL_HANDLE sdkdom, virDo= mainDef *def) def->onCrash !=3D VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY) { =20 virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("on_reboot, on_poweroff and on_crash parameters " - "are not supported by vz driver")); + _("on_reboot, on_poweroff and on_crash parameters a= re not supported by vz driver")); return -1; } =20 @@ -2516,8 +2510,7 @@ prlsdkCheckUnsupportedParams(PRL_HANDLE sdkdom, virDo= mainDef *def) def->os.bios.useserial !=3D 0) { =20 virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("changing OS parameters is not supported " - "by vz driver")); + _("changing OS parameters is not supported by vz dr= iver")); return -1; } =20 @@ -2531,8 +2524,7 @@ prlsdkCheckUnsupportedParams(PRL_HANDLE sdkdom, virDo= mainDef *def) !(vmType =3D=3D PVT_CT && IS_CT(def))) { =20 virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("changing OS type is not supported " - "by vz driver")); + _("changing OS type is not supported by vz driver")= ); return -1; } =20 @@ -2555,16 +2547,14 @@ prlsdkCheckUnsupportedParams(PRL_HANDLE sdkdom, vir= DomainDef *def) =20 if (def->emulator) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("changing emulator is not supported " - "by vz driver")); + _("changing emulator is not supported by vz driver"= )); return -1; } =20 for (i =3D 0; i < VIR_DOMAIN_FEATURE_LAST; i++) { if (def->features[i]) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("changing features is not supported " - "by vz driver")); + _("changing features is not supported by vz dri= ver")); return -1; } } @@ -2573,15 +2563,13 @@ prlsdkCheckUnsupportedParams(PRL_HANDLE sdkdom, vir= DomainDef *def) def->clock.ntimers !=3D 0) { =20 virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("changing clock parameters is not supported " - "by vz driver")); + _("changing clock parameters is not supported by vz= driver")); return -1; } =20 if (!IS_CT(def) && def->nfss !=3D 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Filesystems in VMs are not supported " - "by vz driver")); + _("Filesystems in VMs are not supported by vz drive= r")); return -1; } =20 @@ -2591,8 +2579,7 @@ prlsdkCheckUnsupportedParams(PRL_HANDLE sdkdom, virDo= mainDef *def) def->nleases !=3D 0 || def->nhubs !=3D 0) { =20 virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("changing devices parameters is not supported " - "by vz driver")); + _("changing devices parameters is not supported by = vz driver")); return -1; } =20 @@ -2716,15 +2703,13 @@ static int prlsdkCheckVideoUnsupportedParams(virDom= ainDef *def) return 0; } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Video adapters are not supported " - "int containers.")); + _("Video adapters are not supported int contain= ers.")); return -1; } } else { if (def->nvideos !=3D 1) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("vz driver supports " - "only one video adapter.")); + _("vz driver supports only one video adapter.")= ); return -1; } } @@ -2733,22 +2718,19 @@ static int prlsdkCheckVideoUnsupportedParams(virDom= ainDef *def) =20 if (v->type !=3D VIR_DOMAIN_VIDEO_TYPE_VGA) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("vz driver supports " - "only VGA video adapters.")); + _("vz driver supports only VGA video adapters.")); return -1; } =20 if (v->heads !=3D 1) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("vz driver doesn't support " - "multihead video adapters.")); + _("vz driver doesn't support multihead video adapte= rs.")); return -1; } =20 if (v->accel !=3D NULL && (v->accel->accel2d || v->accel->accel3d)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("vz driver doesn't support " - "setting video acceleration parameters.")); + _("vz driver doesn't support setting video accelera= tion parameters.")); return -1; } =20 @@ -2759,15 +2741,13 @@ static int prlsdkCheckSerialUnsupportedParams(virDo= mainChrDef *chr) { if (chr->deviceType !=3D VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Specified character device type is not supported= " - "by vz driver.")); + _("Specified character device type is not supported= by vz driver.")); return -1; } =20 if (chr->targetType !=3D VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_NONE) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Specified character device target type is not " - "supported by vz driver.")); + _("Specified character device target type is not su= pported by vz driver.")); return -1; } =20 @@ -2779,22 +2759,19 @@ static int prlsdkCheckSerialUnsupportedParams(virDo= mainChrDef *chr) =20 =20 virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Specified character device source type is not " - "supported by vz driver.")); + _("Specified character device source type is not su= pported by vz driver.")); return -1; } =20 if (chr->info.type !=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Setting device info for character devices is not= " - "supported by vz driver.")); + _("Setting device info for character devices is not= supported by vz driver.")); return -1; } =20 if (chr->source->nseclabels > 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Setting security labels is not " - "supported by vz driver.")); + _("Setting security labels is not supported by vz d= river.")); return -1; } =20 @@ -2812,8 +2789,7 @@ static int prlsdkCheckSerialUnsupportedParams(virDoma= inChrDef *chr) STRNEQ(chr->source->data.udp.bindService, chr->source->data.udp.connectService))) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Different bind and connect parameters for " - "udp character device is not supported.")); + _("Different bind and connect parameters for udp ch= aracter device is not supported.")); return -1; } =20 @@ -2825,71 +2801,61 @@ static int prlsdkCheckNetUnsupportedParams(virDomai= nNetDef *net) if (net->type !=3D VIR_DOMAIN_NET_TYPE_NETWORK && net->type !=3D VIR_DOMAIN_NET_TYPE_BRIDGE) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Specified network adapter type is not " - "supported by vz driver.")); + _("Specified network adapter type is not supported = by vz driver.")); return -1; } =20 if (net->backend.tap || net->backend.vhost) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Interface backend parameters are not " - "supported by vz driver.")); + _("Interface backend parameters are not supported b= y vz driver.")); return -1; } =20 if (net->data.network.portgroup) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Virtual network portgroups are not " - "supported by vz driver.")); + _("Virtual network portgroups are not supported by = vz driver.")); return -1; } =20 if (net->tune.sndbuf_specified) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Setting interface sndbuf is not " - "supported by vz driver.")); + _("Setting interface sndbuf is not supported by vz = driver.")); return -1; } =20 if (net->script) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Setting interface script is not " - "supported by vz driver.")); + _("Setting interface script is not supported by vz = driver.")); return -1; } =20 if (net->ifname_guest) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Setting guest interface name is not " - "supported by vz driver.")); + _("Setting guest interface name is not supported by= vz driver.")); return -1; } =20 if (net->info.type !=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Setting device info for network devices is not " - "supported by vz driver.")); + _("Setting device info for network devices is not s= upported by vz driver.")); return -1; } =20 if (net->filter) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Setting network filter is not " - "supported by vz driver.")); + _("Setting network filter is not supported by vz dr= iver.")); return -1; } =20 if (net->bandwidth) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Setting network bandwidth is not " - "supported by vz driver.")); + _("Setting network bandwidth is not supported by vz= driver.")); return -1; } =20 if (net->vlan.trunk) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Setting up vlans is not " - "supported by vz driver.")); + _("Setting up vlans is not supported by vz driver."= )); return -1; } =20 @@ -2901,50 +2867,43 @@ static int prlsdkCheckFSUnsupportedParams(virDomain= FSDef *fs) if (fs->type !=3D VIR_DOMAIN_FS_TYPE_FILE && fs->type !=3D VIR_DOMAIN_FS_TYPE_VOLUME) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Only file based or volume based filesystems " - "are supported by vz driver.")); + _("Only file based or volume based filesystems are = supported by vz driver.")); return -1; } =20 if (fs->fsdriver !=3D VIR_DOMAIN_FS_DRIVER_TYPE_PLOOP) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Only ploop fs driver is " - "supported by vz driver.")); + _("Only ploop fs driver is supported by vz driver."= )); return -1; } =20 if (fs->accessmode !=3D VIR_DOMAIN_FS_ACCESSMODE_PASSTHROUGH) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Changing fs access mode is not " - "supported by vz driver.")); + _("Changing fs access mode is not supported by vz d= river.")); return -1; } =20 if (fs->wrpolicy !=3D VIR_DOMAIN_FS_WRPOLICY_DEFAULT) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Changing fs write policy is not " - "supported by vz driver.")); + _("Changing fs write policy is not supported by vz = driver.")); return -1; } =20 if (fs->format !=3D VIR_STORAGE_FILE_PLOOP) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Only ploop disk images are " - "supported by vz driver.")); + _("Only ploop disk images are supported by vz drive= r.")); return -1; } =20 if (fs->readonly) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Setting readonly for filesystems is " - "not supported by vz driver.")); + _("Setting readonly for filesystems is not supporte= d by vz driver.")); return -1; } =20 if (fs->space_hard_limit || fs->space_soft_limit) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Setting fs quotas is not " - "supported by vz driver.")); + _("Setting fs quotas is not supported by vz driver.= ")); return -1; } =20 @@ -3053,8 +3012,7 @@ static int prlsdkAddSerial(PRL_HANDLE sdkdom, virDoma= inChrDef *chr) break; default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("vz driver doesn't support " - "specified serial source type.")); + _("vz driver doesn't support specified serial sourc= e type.")); goto cleanup; } =20 @@ -3280,8 +3238,7 @@ static int prlsdkConfigureNet(struct _vzDriver *drive= r G_GNUC_UNUSED, pret =3D PrlVmDevNet_SetAdapterType(sdknet, PNT_VIRTIO); } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Specified network adapter model is not " - "supported by vz driver.")); + _("Specified network adapter model is not suppo= rted by vz driver.")); goto cleanup; } prlsdkCheckRetGoto(pret, cleanup); @@ -3434,8 +3391,7 @@ static int prlsdkConfigureDisk(struct _vzDriver *driv= er, case VIR_DOMAIN_DISK_BUS_LAST: default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Specified disk bus is not " - "supported by vz driver.")); + _("Specified disk bus is not supported by vz driver= .")); goto cleanup; } =20 @@ -4276,8 +4232,7 @@ prlsdkUnregisterDomain(struct _vzDriver *driver, virD= omainObj *dom, unsigned int !(flags & VIR_DOMAIN_UNDEFINE_MANAGED_SAVE)) { =20 virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("Refusing to undefine while domain managed " - "save image exists")); + _("Refusing to undefine while domain managed save i= mage exists")); return -1; } =20 diff --git a/src/vz/vz_utils.c b/src/vz/vz_utils.c index 7db7dbd419..be1879a58b 100644 --- a/src/vz/vz_utils.c +++ b/src/vz/vz_utils.c @@ -273,16 +273,14 @@ vzCheckDiskUnsupportedParams(virDomainDiskDef *disk) disk->device !=3D VIR_DOMAIN_DISK_DEVICE_CDROM) { =20 virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Only hard disks and cdroms are supported " - "by vz driver.")); + _("Only hard disks and cdroms are supported by vz d= river.")); return -1; } =20 if (disk->blockio.logical_block_size || disk->blockio.physical_block_size) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Setting disk block sizes is not " - "supported by vz driver.")); + _("Setting disk block sizes is not supported by vz = driver.")); return -1; } =20 @@ -294,56 +292,48 @@ vzCheckDiskUnsupportedParams(virDomainDiskDef *disk) disk->blkdeviotune.write_iops_sec) { =20 virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Setting disk io limits is not " - "supported by vz driver yet.")); + _("Setting disk io limits is not supported by vz dr= iver yet.")); return -1; } =20 if (disk->serial && disk->device !=3D VIR_DOMAIN_DISK_DEVICE_DISK) { - VIR_INFO("%s", _("Setting disk serial number is " - "supported only for disk devices.")); + VIR_INFO("%s", _("Setting disk serial number is supported only for= disk devices.")); } =20 if (disk->wwn) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Setting disk wwn id is not " - "supported by vz driver.")); + _("Setting disk wwn id is not supported by vz drive= r.")); return -1; } =20 if (disk->vendor) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Setting disk vendor is not " - "supported by vz driver.")); + _("Setting disk vendor is not supported by vz drive= r.")); return -1; } =20 if (disk->product) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Setting disk product id is not " - "supported by vz driver.")); + _("Setting disk product id is not supported by vz d= river.")); return -1; } =20 if (disk->error_policy !=3D VIR_DOMAIN_DISK_ERROR_POLICY_DEFAULT) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Setting disk error policy is not " - "supported by vz driver.")); + _("Setting disk error policy is not supported by vz= driver.")); return -1; } =20 if (disk->iomode !=3D VIR_DOMAIN_DISK_IO_DEFAULT && disk->iomode !=3D VIR_DOMAIN_DISK_IO_NATIVE) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Only native iomode is " - "supported by vz driver.")); + _("Only native iomode is supported by vz driver.")); return -1; } =20 if (disk->copy_on_read) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Disk copy_on_read is not " - "supported by vz driver.")); + _("Disk copy_on_read is not supported by vz driver.= ")); return -1; } =20 @@ -355,29 +345,25 @@ vzCheckDiskUnsupportedParams(virDomainDiskDef *disk) =20 if (disk->startupPolicy !=3D VIR_DOMAIN_STARTUP_POLICY_DEFAULT) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Setting up disk startup policy is not " - "supported by vz driver.")); + _("Setting up disk startup policy is not supported = by vz driver.")); return -1; } =20 if (disk->transient) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Transient disks are not " - "supported by vz driver.")); + _("Transient disks are not supported by vz driver."= )); return -1; } =20 if (disk->discard) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Setting up disk discard parameter is not " - "supported by vz driver.")); + _("Setting up disk discard parameter is not support= ed by vz driver.")); return -1; } =20 if (disk->iothread) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Setting up disk io thread # is not " - "supported by vz driver.")); + _("Setting up disk io thread # is not supported by = vz driver.")); return -1; } =20 @@ -385,8 +371,7 @@ vzCheckDiskUnsupportedParams(virDomainDiskDef *disk) disk->src->type !=3D VIR_STORAGE_TYPE_BLOCK) { =20 virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Only disk and block storage types are " - "supported by vz driver.")); + _("Only disk and block storage types are supported = by vz driver.")); return -1; =20 } @@ -503,52 +488,45 @@ int vzCheckUnsupportedGraphics(virDomainGraphicsDef *= gr) { if (gr->type !=3D VIR_DOMAIN_GRAPHICS_TYPE_VNC) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("vz driver supports only " - "VNC graphics.")); + _("vz driver supports only VNC graphics.")); return -1; } =20 if (gr->data.vnc.websocket !=3D 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("vz driver doesn't support " - "websockets for VNC graphics.")); + _("vz driver doesn't support websockets for VNC gra= phics.")); return -1; } =20 if (gr->data.vnc.keymap !=3D 0 && STRNEQ(gr->data.vnc.keymap, "en-us")) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("vz driver supports only " - "\"en-us\" keymap for VNC graphics.")); + _("vz driver supports only \"en-us\" keymap for VNC= graphics.")); return -1; } =20 if (gr->data.vnc.sharePolicy =3D=3D VIR_DOMAIN_GRAPHICS_VNC_SHARE_ALLO= W_EXCLUSIVE) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("vz driver doesn't support " - "exclusive share policy for VNC graphics.")); + _("vz driver doesn't support exclusive share policy= for VNC graphics.")); return -1; } =20 if (gr->data.vnc.auth.connected =3D=3D VIR_DOMAIN_GRAPHICS_AUTH_CONNEC= TED_FAIL || gr->data.vnc.auth.connected =3D=3D VIR_DOMAIN_GRAPHICS_AUTH_CONNEC= TED_KEEP) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("vz driver doesn't support " - "given action in case of password change.")); + _("vz driver doesn't support given action in case o= f password change.")); return -1; } =20 if (gr->data.vnc.auth.expires) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("vz driver doesn't support " - "setting password expire time.")); + _("vz driver doesn't support setting password expir= e time.")); return -1; } =20 if (gr->nListens > 1) { virReportError(VIR_ERR_INVALID_ARG, "%s", - _("vz driver doesn't support more than " - "one listening VNC server per domain")); + _("vz driver doesn't support more than one listenin= g VNC server per domain")); return -1; } =20 --=20 2.41.0