From nobody Sun Feb 8 11:26:00 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1548335861716406.80878427574453; Thu, 24 Jan 2019 05:17:41 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A4D1A9D789; Thu, 24 Jan 2019 13:17:39 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6B22B5D75E; Thu, 24 Jan 2019 13:17:39 +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 1997018033A1; Thu, 24 Jan 2019 13:17:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.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 x0ODHPG4016861 for ; Thu, 24 Jan 2019 08:17:25 -0500 Received: by smtp.corp.redhat.com (Postfix) id B09C726DFC; Thu, 24 Jan 2019 13:17:25 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-61.ams2.redhat.com [10.36.112.61]) by smtp.corp.redhat.com (Postfix) with ESMTP id B385D26332; Thu, 24 Jan 2019 13:17:24 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Thu, 24 Jan 2019 13:17:07 +0000 Message-Id: <20190124131707.17976-9-berrange@redhat.com> In-Reply-To: <20190124131707.17976-1-berrange@redhat.com> References: <20190124131707.17976-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [go PATCH 8/8] Rename typedParamsUnpackLen to typedParamsUnpack 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-Type: text/plain; charset="utf-8" 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 24 Jan 2019 13:17:40 +0000 (UTC) Now we only have one variant of this method it can loose the suffix Signed-off-by: Daniel P. Berrang=C3=A9 --- connect.go | 20 ++++++++++---------- domain.go | 26 +++++++++++++------------- domain_events.go | 10 +++++----- typedparams.go | 2 +- typedparams_test.go | 2 +- 5 files changed, 30 insertions(+), 30 deletions(-) diff --git a/connect.go b/connect.go index f627e7d..f77d10d 100644 --- a/connect.go +++ b/connect.go @@ -1912,7 +1912,7 @@ func (c *Connect) GetMemoryParameters(flags uint32) (= *NodeMemoryParameters, erro return nil, makeError(&err) } =20 - _, gerr :=3D typedParamsUnpackLen(cparams, cnparams, info) + _, gerr :=3D typedParamsUnpack(cparams, cnparams, info) if gerr !=3D nil { return nil, gerr } @@ -2797,7 +2797,7 @@ func (c *Connect) GetAllDomainStats(doms []*Domain, s= tatsTypes DomainStatsTypes, state :=3D &DomainStatsState{} stateInfo :=3D getDomainStatsStateFieldInfo(state) =20 - count, gerr :=3D typedParamsUnpackLen(cdomstats.params, cdomstats.nparam= s, stateInfo) + count, gerr :=3D typedParamsUnpack(cdomstats.params, cdomstats.nparams, = stateInfo) if gerr !=3D nil { return []DomainStats{}, gerr } @@ -2808,7 +2808,7 @@ func (c *Connect) GetAllDomainStats(doms []*Domain, s= tatsTypes DomainStatsTypes, cpu :=3D &DomainStatsCPU{} cpuInfo :=3D getDomainStatsCPUFieldInfo(cpu) =20 - count, gerr =3D typedParamsUnpackLen(cdomstats.params, cdomstats.nparams= , cpuInfo) + count, gerr =3D typedParamsUnpack(cdomstats.params, cdomstats.nparams, c= puInfo) if gerr !=3D nil { return []DomainStats{}, gerr } @@ -2819,7 +2819,7 @@ func (c *Connect) GetAllDomainStats(doms []*Domain, s= tatsTypes DomainStatsTypes, balloon :=3D &DomainStatsBalloon{} balloonInfo :=3D getDomainStatsBalloonFieldInfo(balloon) =20 - count, gerr =3D typedParamsUnpackLen(cdomstats.params, cdomstats.nparams= , balloonInfo) + count, gerr =3D typedParamsUnpack(cdomstats.params, cdomstats.nparams, b= alloonInfo) if gerr !=3D nil { return []DomainStats{}, gerr } @@ -2830,7 +2830,7 @@ func (c *Connect) GetAllDomainStats(doms []*Domain, s= tatsTypes DomainStatsTypes, perf :=3D &DomainStatsPerf{} perfInfo :=3D getDomainStatsPerfFieldInfo(perf) =20 - count, gerr =3D typedParamsUnpackLen(cdomstats.params, cdomstats.nparams= , perfInfo) + count, gerr =3D typedParamsUnpack(cdomstats.params, cdomstats.nparams, p= erfInfo) if gerr !=3D nil { return []DomainStats{}, gerr } @@ -2841,7 +2841,7 @@ func (c *Connect) GetAllDomainStats(doms []*Domain, s= tatsTypes DomainStatsTypes, lengths :=3D domainStatsLengths{} lengthsInfo :=3D getDomainStatsLengthsFieldInfo(&lengths) =20 - count, gerr =3D typedParamsUnpackLen(cdomstats.params, cdomstats.nparams= , lengthsInfo) + count, gerr =3D typedParamsUnpack(cdomstats.params, cdomstats.nparams, l= engthsInfo) if gerr !=3D nil { return []DomainStats{}, gerr } @@ -2857,7 +2857,7 @@ func (c *Connect) GetAllDomainStats(doms []*Domain, s= tatsTypes DomainStatsTypes, vcpu :=3D DomainStatsVcpu{} vcpuInfo :=3D getDomainStatsVcpuFieldInfo(j, &vcpu) =20 - count, gerr =3D typedParamsUnpackLen(cdomstats.params, cdomstats.npara= ms, vcpuInfo) + count, gerr =3D typedParamsUnpack(cdomstats.params, cdomstats.nparams,= vcpuInfo) if gerr !=3D nil { return []DomainStats{}, gerr } @@ -2875,7 +2875,7 @@ func (c *Connect) GetAllDomainStats(doms []*Domain, s= tatsTypes DomainStatsTypes, block :=3D DomainStatsBlock{} blockInfo :=3D getDomainStatsBlockFieldInfo(j, &block) =20 - count, gerr =3D typedParamsUnpackLen(cdomstats.params, cdomstats.npara= ms, blockInfo) + count, gerr =3D typedParamsUnpack(cdomstats.params, cdomstats.nparams,= blockInfo) if gerr !=3D nil { return []DomainStats{}, gerr } @@ -2891,7 +2891,7 @@ func (c *Connect) GetAllDomainStats(doms []*Domain, s= tatsTypes DomainStatsTypes, net :=3D DomainStatsNet{} netInfo :=3D getDomainStatsNetFieldInfo(j, &net) =20 - count, gerr =3D typedParamsUnpackLen(cdomstats.params, cdomstats.npara= ms, netInfo) + count, gerr =3D typedParamsUnpack(cdomstats.params, cdomstats.nparams,= netInfo) if gerr !=3D nil { return []DomainStats{}, gerr } @@ -2963,7 +2963,7 @@ func (c *Connect) GetSEVInfo(flags uint32) (*NodeSEVP= arameters, error) { =20 defer C.virTypedParamsFree(cparams, cnparams) =20 - _, gerr :=3D typedParamsUnpackLen(cparams, cnparams, info) + _, gerr :=3D typedParamsUnpack(cparams, cnparams, info) if gerr !=3D nil { return nil, gerr } diff --git a/domain.go b/domain.go index bee779f..98dd290 100644 --- a/domain.go +++ b/domain.go @@ -1195,7 +1195,7 @@ func (d *Domain) GetCPUStats(startCpu int, nCpus uint= , flags uint32) ([]DomainCP var cparamscpu *C.virTypedParameter cparamscpu =3D (*C.virTypedParameter)(unsafe.Pointer(uintptr(unsafe.Poin= ter(cparams)) + (unsafe.Sizeof(*cparams) * uintptr(coffset)))) - _, gerr :=3D typedParamsUnpackLen(cparamscpu, cnparams, info) + _, gerr :=3D typedParamsUnpack(cparamscpu, cnparams, info) if gerr !=3D nil { return []DomainCPUStats{}, gerr } @@ -1275,7 +1275,7 @@ func (d *Domain) GetInterfaceParameters(device string= , flags DomainModificationI return nil, makeError(&err) } =20 - _, gerr :=3D typedParamsUnpackLen(cparams, cnparams, info) + _, gerr :=3D typedParamsUnpack(cparams, cnparams, info) if gerr !=3D nil { return nil, gerr } @@ -1665,7 +1665,7 @@ func (d *Domain) BlockStatsFlags(disk string, flags u= int32) (*DomainBlockStats, return nil, makeError(&err) } =20 - _, gerr :=3D typedParamsUnpackLen(cparams, cnparams, info) + _, gerr :=3D typedParamsUnpack(cparams, cnparams, info) if gerr !=3D nil { return nil, gerr } @@ -2609,7 +2609,7 @@ func (d *Domain) GetBlkioParameters(flags DomainModif= icationImpact) (*DomainBlki return nil, makeError(&err) } =20 - _, gerr :=3D typedParamsUnpackLen(cparams, cnparams, info) + _, gerr :=3D typedParamsUnpack(cparams, cnparams, info) if gerr !=3D nil { return nil, gerr } @@ -2787,7 +2787,7 @@ func (d *Domain) GetBlockIoTune(disk string, flags Do= mainModificationImpact) (*D return nil, makeError(&err) } =20 - _, gerr :=3D typedParamsUnpackLen(cparams, cnparams, info) + _, gerr :=3D typedParamsUnpack(cparams, cnparams, info) if gerr !=3D nil { return nil, gerr } @@ -3165,7 +3165,7 @@ func (d *Domain) GetJobStats(flags DomainGetJobStatsF= lags) (*DomainJobInfo, erro params :=3D DomainJobInfo{} info :=3D getDomainJobInfoFieldInfo(¶ms) =20 - _, gerr :=3D typedParamsUnpackLen(cparams, cnparams, info) + _, gerr :=3D typedParamsUnpack(cparams, cnparams, info) if gerr !=3D nil { return nil, gerr } @@ -3259,7 +3259,7 @@ func (d *Domain) GetMemoryParameters(flags DomainModi= ficationImpact) (*DomainMem return nil, makeError(&err) } =20 - _, gerr :=3D typedParamsUnpackLen(cparams, cnparams, info) + _, gerr :=3D typedParamsUnpack(cparams, cnparams, info) if gerr !=3D nil { return nil, gerr } @@ -3326,7 +3326,7 @@ func (d *Domain) GetNumaParameters(flags DomainModifi= cationImpact) (*DomainNumaP return nil, makeError(&err) } =20 - _, gerr :=3D typedParamsUnpackLen(cparams, cnparams, info) + _, gerr :=3D typedParamsUnpack(cparams, cnparams, info) if gerr !=3D nil { return nil, gerr } @@ -3515,7 +3515,7 @@ func (d *Domain) GetPerfEvents(flags DomainModificati= onImpact) (*DomainPerfEvent =20 defer C.virTypedParamsFree(cparams, cnparams) =20 - _, gerr :=3D typedParamsUnpackLen(cparams, cnparams, info) + _, gerr :=3D typedParamsUnpack(cparams, cnparams, info) if gerr !=3D nil { return nil, gerr } @@ -3665,7 +3665,7 @@ func (d *Domain) GetSchedulerParameters() (*DomainSch= edulerParameters, error) { return nil, makeError(&err) } =20 - _, gerr :=3D typedParamsUnpackLen(cparams, cnparams, info) + _, gerr :=3D typedParamsUnpack(cparams, cnparams, info) if gerr !=3D nil { return nil, gerr } @@ -3699,7 +3699,7 @@ func (d *Domain) GetSchedulerParametersFlags(flags Do= mainModificationImpact) (*D return nil, makeError(&err) } =20 - _, gerr :=3D typedParamsUnpackLen(cparams, cnparams, info) + _, gerr :=3D typedParamsUnpack(cparams, cnparams, info) if gerr !=3D nil { return nil, gerr } @@ -4534,7 +4534,7 @@ func (d *Domain) GetGuestVcpus(flags uint32) (*Domain= GuestVcpus, error) { =20 defer C.virTypedParamsFree(cparams, C.int(cnparams)) =20 - _, gerr :=3D typedParamsUnpackLen(cparams, C.int(cnparams), info) + _, gerr :=3D typedParamsUnpack(cparams, C.int(cnparams), info) if gerr !=3D nil { return nil, gerr } @@ -4751,7 +4751,7 @@ func (d *Domain) GetLaunchSecurityInfo(flags uint32) = (*DomainLaunchSecurityParam =20 defer C.virTypedParamsFree(cparams, cnparams) =20 - _, gerr :=3D typedParamsUnpackLen(cparams, cnparams, info) + _, gerr :=3D typedParamsUnpack(cparams, cnparams, info) if gerr !=3D nil { return nil, gerr } diff --git a/domain_events.go b/domain_events.go index 7e72313..2aff8e8 100644 --- a/domain_events.go +++ b/domain_events.go @@ -763,7 +763,7 @@ func domainEventTunableGetPin(params C.virTypedParamete= rPtr, cnparams C.int) *Do numvcpus, numiothreads :=3D countPinInfo(params, cnparams) pinInfo :=3D getDomainPinTempFieldInfo(numvcpus, numiothreads, &pin) =20 - num, err :=3D typedParamsUnpackLen(params, cnparams, pinInfo) + num, err :=3D typedParamsUnpack(params, cnparams, pinInfo) if num =3D=3D 0 || err !=3D nil { return nil } @@ -820,7 +820,7 @@ func domainEventTunableCallback(c C.virConnectPtr, d C.= virDomainPtr, params C.vi var sched DomainSchedulerParameters schedInfo :=3D getDomainTuneSchedulerParametersFieldInfo(&sched) =20 - num, _ :=3D typedParamsUnpackLen(params, cnparams, schedInfo) + num, _ :=3D typedParamsUnpack(params, cnparams, schedInfo) if num > 0 { eventDetails.CpuSched =3D &sched } @@ -831,12 +831,12 @@ func domainEventTunableCallback(c C.virConnectPtr, d = C.virDomainPtr, params C.vi s: &eventDetails.BlkdevDisk, }, } - typedParamsUnpackLen(params, cnparams, blknameInfo) + typedParamsUnpack(params, cnparams, blknameInfo) =20 var blktune DomainBlockIoTuneParameters blktuneInfo :=3D getTuneBlockIoTuneParametersFieldInfo(&blktune) =20 - num, _ =3D typedParamsUnpackLen(params, cnparams, blktuneInfo) + num, _ =3D typedParamsUnpack(params, cnparams, blktuneInfo) if num > 0 { eventDetails.BlkdevTune =3D &blktune } @@ -910,7 +910,7 @@ func domainEventJobCompletedCallback(c C.virConnectPtr,= d C.virDomainPtr, params eventDetails :=3D &DomainEventJobCompleted{} info :=3D getDomainJobInfoFieldInfo(&eventDetails.Info) =20 - typedParamsUnpackLen(params, cnparams, info) + typedParamsUnpack(params, cnparams, info) =20 callbackFunc :=3D getCallbackId(goCallbackId) callback, ok :=3D callbackFunc.(DomainEventJobCompletedCallback) diff --git a/typedparams.go b/typedparams.go index 0a4c175..ccceee1 100644 --- a/typedparams.go +++ b/typedparams.go @@ -53,7 +53,7 @@ type typedParamsFieldInfo struct { sl *[]string } =20 -func typedParamsUnpackLen(cparams *C.virTypedParameter, cnparams C.int, in= fomap map[string]typedParamsFieldInfo) (uint, error) { +func typedParamsUnpack(cparams *C.virTypedParameter, cnparams C.int, infom= ap map[string]typedParamsFieldInfo) (uint, error) { count :=3D uint(0) for name, value :=3D range infomap { var err C.virError diff --git a/typedparams_test.go b/typedparams_test.go index dca65b2..7720bcd 100644 --- a/typedparams_test.go +++ b/typedparams_test.go @@ -86,7 +86,7 @@ func TestPackUnpack(t *testing.T) { t.Fatal(err) } =20 - nout, err :=3D typedParamsUnpackLen(params, nparams, infoout) + nout, err :=3D typedParamsUnpack(params, nparams, infoout) if err !=3D nil { t.Fatal(err) } --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list