From nobody Mon Feb 9 10:33:20 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 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=1560863450; cv=none; d=zoho.com; s=zohoarc; b=IrIN+Ur5cKGYGfWHF9UTmD4ZA8vtnVnKzPqmRMFpQkLlBR9l6L1CxbR6LAWXTu6JcjvaQGbwl6e81Yx9HY2d+Ky/p3BvsR91/oIFgnOlHep6ru632NctkkEhbN6L3fDVls0OEK78kfN1zQye0/MRg/RNwMcV+DF6pofhCH/eRRM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560863450; 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:ARC-Authentication-Results; bh=6yKOka/ocFOr2h4TSc2Qk0WOgviVpndKWg9V8LiKJkU=; b=OmUGW/e9+RujGIGW9+VjB5flCi5LnWDe/KnfPVQKNgmTrPxIJTmUoOToXe4FWPuYiPyEHy/tSU3AKAUsprJLks8cEWbdxYTukqnV2SXXyww8oUicr3q1oQUDE+jmIzXNrIpABxfWD5NijrgV+yvUAPRjAPnIgSSQEqz5bdo6310= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1560863450306693.4180570387955; Tue, 18 Jun 2019 06:10:50 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4384A3082E71; Tue, 18 Jun 2019 13:10:41 +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 1822B82A35; Tue, 18 Jun 2019 13:10:36 +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 48BB054D3D; Tue, 18 Jun 2019 13:10:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x5IDAS94018671 for ; Tue, 18 Jun 2019 09:10:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id D32D31001DDC; Tue, 18 Jun 2019 13:10:28 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5F2EB1001DCB for ; Tue, 18 Jun 2019 13:10:28 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Tue, 18 Jun 2019 15:10:10 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 01/15] qemu: Rename qemuDomainCmdlineDefPtr to qemuDomainXmlNsDefPtr 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Tue, 18 Jun 2019 13:10:49 +0000 (UTC) Content-Type: text/plain; charset="utf-8" The data injected via the namespace may contain also other things than commandline passthrough definitions. Rename it to make it more universal. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_command.c | 16 ++++++++-------- src/qemu/qemu_conf.c | 2 +- src/qemu/qemu_conf.h | 8 ++++---- src/qemu/qemu_domain.c | 12 ++++++------ 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 59dc134785..637de74e90 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -10881,14 +10881,14 @@ qemuBuildCommandLine(virQEMUDriverPtr driver, virCommandAddArgList(cmd, "-loadvm", snapshot->def->name, NULL); if (def->namespaceData) { - qemuDomainCmdlineDefPtr qemucmd; - - qemucmd =3D def->namespaceData; - for (i =3D 0; i < qemucmd->num_args; i++) - virCommandAddArg(cmd, qemucmd->args[i]); - for (i =3D 0; i < qemucmd->num_env; i++) - virCommandAddEnvPair(cmd, qemucmd->env_name[i], - NULLSTR_EMPTY(qemucmd->env_value[i])); + qemuDomainXmlNsDefPtr qemuxmlns; + + qemuxmlns =3D def->namespaceData; + for (i =3D 0; i < qemuxmlns->num_args; i++) + virCommandAddArg(cmd, qemuxmlns->args[i]); + for (i =3D 0; i < qemuxmlns->num_env; i++) + virCommandAddEnvPair(cmd, qemuxmlns->env_name[i], + NULLSTR_EMPTY(qemuxmlns->env_value[i])); } if (qemuBuildSeccompSandboxCommandLine(cmd, cfg, qemuCaps) < 0) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index daea11dacb..afff77b1f3 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -94,7 +94,7 @@ qemuDriverUnlock(virQEMUDriverPtr driver) virMutexUnlock(&driver->lock); } -void qemuDomainCmdlineDefFree(qemuDomainCmdlineDefPtr def) +void qemuDomainXmlNsDefFree(qemuDomainXmlNsDefPtr def) { size_t i; diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 983e74a3cf..26aa96f194 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -297,9 +297,9 @@ struct _virQEMUDriver { virHashAtomicPtr migrationErrors; }; -typedef struct _qemuDomainCmdlineDef qemuDomainCmdlineDef; -typedef qemuDomainCmdlineDef *qemuDomainCmdlineDefPtr; -struct _qemuDomainCmdlineDef { +typedef struct _qemuDomainXmlNsDef qemuDomainXmlNsDef; +typedef qemuDomainXmlNsDef *qemuDomainXmlNsDefPtr; +struct _qemuDomainXmlNsDef { size_t num_args; char **args; @@ -310,7 +310,7 @@ struct _qemuDomainCmdlineDef { -void qemuDomainCmdlineDefFree(qemuDomainCmdlineDefPtr def); +void qemuDomainXmlNsDefFree(qemuDomainXmlNsDefPtr def); virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 8262107311..10215ffa47 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3094,9 +3094,9 @@ virDomainXMLPrivateDataCallbacks virQEMUDriverPrivate= DataCallbacks =3D { static void qemuDomainDefNamespaceFree(void *nsdata) { - qemuDomainCmdlineDefPtr cmd =3D nsdata; + qemuDomainXmlNsDefPtr cmd =3D nsdata; - qemuDomainCmdlineDefFree(cmd); + qemuDomainXmlNsDefFree(cmd); } static int @@ -3105,7 +3105,7 @@ qemuDomainDefNamespaceParse(xmlDocPtr xml ATTRIBUTE_U= NUSED, xmlXPathContextPtr ctxt, void **data) { - qemuDomainCmdlineDefPtr cmd =3D NULL; + qemuDomainXmlNsDefPtr cmd =3D NULL; bool uses_qemu_ns =3D false; xmlNodePtr *nodes =3D NULL; int n; @@ -3205,7 +3205,7 @@ static int qemuDomainDefNamespaceFormatXML(virBufferPtr buf, void *nsdata) { - qemuDomainCmdlineDefPtr cmd =3D nsdata; + qemuDomainXmlNsDefPtr cmd =3D nsdata; size_t i; if (!cmd->num_args && !cmd->num_env) @@ -8182,8 +8182,8 @@ void qemuDomainObjCheckTaint(virQEMUDriverPtr driver, qemuDomainObjTaint(driver, obj, VIR_DOMAIN_TAINT_HOOK, logCtxt); if (obj->def->namespaceData) { - qemuDomainCmdlineDefPtr qemucmd =3D obj->def->namespaceData; - if (qemucmd->num_args || qemucmd->num_env) + qemuDomainXmlNsDefPtr qemuxmlns =3D obj->def->namespaceData; + if (qemuxmlns->num_args || qemuxmlns->num_env) qemuDomainObjTaint(driver, obj, VIR_DOMAIN_TAINT_CUSTOM_ARGV, = logCtxt); } --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list