From patchwork Wed Feb 17 17:17:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 62124 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp123138lbl; Wed, 17 Feb 2016 09:20:23 -0800 (PST) X-Received: by 10.31.182.143 with SMTP id g137mr2265149vkf.45.1455729623042; Wed, 17 Feb 2016 09:20:23 -0800 (PST) Return-Path: Received: from mx6-phx2.redhat.com (mx6-phx2.redhat.com. [209.132.183.39]) by mx.google.com with ESMTPS id h11si1786463vkd.65.2016.02.17.09.20.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Feb 2016 09:20:23 -0800 (PST) Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.39 as permitted sender) client-ip=209.132.183.39; Authentication-Results: mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.39 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx6-phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u1HHHc9d031524; Wed, 17 Feb 2016 12:17:38 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id u1HHHXIO006676 for ; Wed, 17 Feb 2016 12:17:33 -0500 Received: from colepc.redhat.com (ovpn-113-23.phx2.redhat.com [10.3.113.23]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u1HHHRAc019765; Wed, 17 Feb 2016 12:17:33 -0500 From: Cole Robinson To: libvirt-list@redhat.com Date: Wed, 17 Feb 2016 12:17:19 -0500 Message-Id: <1f30de978a4e3e8ea8d5b6dd985ddb69996fd8e8.1455728795.git.crobinso@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/3] qemu: parse: rename qemuCaps->caps 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: , MIME-Version: 1.0 Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com Everywhere else in qemu driver code 'qemuCaps' is a virQEMUCapsPtr, and virCapsPtr is generally named just 'caps'. Rename the offenders --- src/qemu/qemu_parse_command.c | 16 ++++++++-------- src/qemu/qemu_parse_command.h | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) -- 2.5.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c index ca59f91..077767e 100644 --- a/src/qemu/qemu_parse_command.c +++ b/src/qemu/qemu_parse_command.c @@ -1721,7 +1721,7 @@ qemuParseCommandLineBootDevs(virDomainDefPtr def, const char *str) * as is practical. This is not an exact science.... */ static virDomainDefPtr -qemuParseCommandLine(virCapsPtr qemuCaps, +qemuParseCommandLine(virCapsPtr caps, virDomainXMLOptionPtr xmlopt, char **progenv, char **progargv, @@ -1796,7 +1796,7 @@ qemuParseCommandLine(virCapsPtr qemuCaps, } if (def->virtType == VIR_DOMAIN_VIRT_KVM) - def->os.arch = qemuCaps->host.arch; + def->os.arch = caps->host.arch; else if (STRPREFIX(path, "qemu-system-")) def->os.arch = virArchFromString(path + strlen("qemu-system-")); else @@ -2522,7 +2522,7 @@ qemuParseCommandLine(virCapsPtr qemuCaps, if (!def->os.machine) { virCapsDomainDataPtr capsdata; - if (!(capsdata = virCapabilitiesDomainDataLookup(qemuCaps, def->os.type, + if (!(capsdata = virCapabilitiesDomainDataLookup(caps, def->os.type, def->os.arch, def->virtType, NULL, NULL))) goto error; @@ -2597,7 +2597,7 @@ qemuParseCommandLine(virCapsPtr qemuCaps, if (virDomainDefAddImplicitControllers(def) < 0) goto error; - if (virDomainDefPostParse(def, qemuCaps, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, + if (virDomainDefPostParse(def, caps, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, xmlopt) < 0) goto error; @@ -2626,7 +2626,7 @@ qemuParseCommandLine(virCapsPtr qemuCaps, } -virDomainDefPtr qemuParseCommandLineString(virCapsPtr qemuCaps, +virDomainDefPtr qemuParseCommandLineString(virCapsPtr caps, virDomainXMLOptionPtr xmlopt, const char *args, char **pidfile, @@ -2640,7 +2640,7 @@ virDomainDefPtr qemuParseCommandLineString(virCapsPtr qemuCaps, if (qemuStringToArgvEnv(args, &progenv, &progargv) < 0) goto cleanup; - def = qemuParseCommandLine(qemuCaps, xmlopt, progenv, progargv, + def = qemuParseCommandLine(caps, xmlopt, progenv, progargv, pidfile, monConfig, monJSON); cleanup: @@ -2698,7 +2698,7 @@ static int qemuParseProcFileStrings(int pid_value, return ret; } -virDomainDefPtr qemuParseCommandLinePid(virCapsPtr qemuCaps, +virDomainDefPtr qemuParseCommandLinePid(virCapsPtr caps, virDomainXMLOptionPtr xmlopt, pid_t pid, char **pidfile, @@ -2718,7 +2718,7 @@ virDomainDefPtr qemuParseCommandLinePid(virCapsPtr qemuCaps, qemuParseProcFileStrings(pid, "environ", &progenv) < 0) goto cleanup; - if (!(def = qemuParseCommandLine(qemuCaps, xmlopt, progenv, progargv, + if (!(def = qemuParseCommandLine(caps, xmlopt, progenv, progargv, pidfile, monConfig, monJSON))) goto cleanup; diff --git a/src/qemu/qemu_parse_command.h b/src/qemu/qemu_parse_command.h index a743189..ed65342 100644 --- a/src/qemu/qemu_parse_command.h +++ b/src/qemu/qemu_parse_command.h @@ -30,13 +30,13 @@ * NB: def->name can be NULL upon return and the caller * *must* decide how to fill in a name in this case */ -virDomainDefPtr qemuParseCommandLineString(virCapsPtr qemuCaps, +virDomainDefPtr qemuParseCommandLineString(virCapsPtr caps, virDomainXMLOptionPtr xmlopt, const char *args, char **pidfile, virDomainChrSourceDefPtr *monConfig, bool *monJSON); -virDomainDefPtr qemuParseCommandLinePid(virCapsPtr qemuCaps, +virDomainDefPtr qemuParseCommandLinePid(virCapsPtr caps, virDomainXMLOptionPtr xmlopt, pid_t pid, char **pidfile,