From nobody Sun Feb 8 11:59:16 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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=1598534874; cv=none; d=zohomail.com; s=zohoarc; b=kD429HZB6E2NaZiqyj4hr9CMwomtQ8Vvdle/n9oomw7TXF56fDfW2EnzLJiSkOtvJozmfq5txXtbqMBRLQkqwcvdanbqiLdU2r4czlQ3HAsnKyidryTNnjovE+8QAonF0wmH9707j781rHMkjwF0SpavILgUo6baXaHeD1gd+ZM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598534874; 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=hX7NAhlTDPyylga98KLhuC6ezBvSufkoELugQTl9fV8=; b=OuRWdTHIATwq/eYttlWdYIHr/2SM86btKey8CoMkCnvPpuzmFyPjhhGtziH7JOXeUVmJHGpDVaooeQoReqQLQ3liAJ61xHI7dUukXlmxgb5t8bvzfVs04EgF3cq5gDDIvFYbrBeu04WeJa1pRRYmzDazLRP295J3u+5YvKrtXl0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1598534874232936.3808404139821; Thu, 27 Aug 2020 06:27:54 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-327-_uSq_WfNMpCVlyM44dslnQ-1; Thu, 27 Aug 2020 09:27:33 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C1B131084CA2; Thu, 27 Aug 2020 13:27:24 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A039710013D0; Thu, 27 Aug 2020 13:27:24 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 7021B6690B; Thu, 27 Aug 2020 13:27:24 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 07RDRGdM007995 for ; Thu, 27 Aug 2020 09:27:16 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0D61B7E565; Thu, 27 Aug 2020 13:27:16 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.43.2.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8A0A27B9F2 for ; Thu, 27 Aug 2020 13:27:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598534873; 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=hX7NAhlTDPyylga98KLhuC6ezBvSufkoELugQTl9fV8=; b=UworU1gL7BGBtFncsKwb9mVxzGwZtpIlYpB79huX/nQ0VX2+QCoP2/1PhXbemEsE7iBNCJ qtltC7wQhd9kFOcm+xqqYkfFgRG9K5JJWIU+9JZlALFt8zzxJrKbo2xb9hid6wCY6DUfUt OjqVk9I+bcIUXzUlRTY7qP8z44Rpk9g= X-MC-Unique: _uSq_WfNMpCVlyM44dslnQ-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 4/8] vbox: do not repeat the innotek namespace url Date: Thu, 27 Aug 2020 15:27:01 +0200 Message-Id: <3c60e30e5be1f2f06ad4f04f55c9b4e6a1185840.1598534729.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Also, remove the url from the translatable string, reducing it to the generic message already used by virXMLNamespaceRegister. Signed-off-by: J=C3=A1n Tomko --- src/vbox/vbox_snapshot_conf.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/vbox/vbox_snapshot_conf.c b/src/vbox/vbox_snapshot_conf.c index ee644e1e2d..a18958fcc0 100644 --- a/src/vbox/vbox_snapshot_conf.c +++ b/src/vbox/vbox_snapshot_conf.c @@ -571,6 +571,8 @@ virVBoxSnapshotConfMachineFree(virVBoxSnapshotConfMachi= nePtr machine) VIR_FREE(machine); } =20 +#define VBOX_SETTINGS_NS "http://www.innotek.de/VirtualBox-settings" + /* *vboxSnapshotLoadVboxFile: Create a vboxSnapshotXmlMachinePtr from a Virt= ualBoxl xml file. *return an initialized vboxSnapshotXmlMachinePtr on success @@ -613,10 +615,10 @@ virVBoxSnapshotConfLoadVboxFile(const char *filePath, =20 if (xmlXPathRegisterNs(xPathContext, BAD_CAST "vbox", - BAD_CAST "http://www.innotek.de/VirtualBox-sett= ings") < 0) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("Failed to register xml namespace " - "'http://www.innotek.de/VirtualBox-settings'")); + BAD_CAST VBOX_SETTINGS_NS) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("Failed to register xml namespace '%s'"), + VBOX_SETTINGS_NS); goto cleanup; } =20 @@ -1015,7 +1017,7 @@ virVBoxSnapshotConfSaveVboxFile(virVBoxSnapshotConfMa= chinePtr machine, } if (xmlNewProp(cur, BAD_CAST "xmlns", - BAD_CAST "http://www.innotek.de/VirtualBox-settings") = =3D=3D NULL) { + BAD_CAST VBOX_SETTINGS_NS) =3D=3D NULL) { virReportError(VIR_ERR_XML_ERROR, "%s", _("Error in xmlNewProp")); goto cleanup; --=20 2.26.2