Signed-off-by: Gao feng <gaofeng@xxxxxxxxxxxxxx> --- src/conf/domain_conf.c | 8 ++++---- src/conf/domain_conf.h | 4 ++-- src/libvirt_private.syms | 2 +- src/qemu/qemu_driver.c | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 5eb0278..3cb1187 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -882,8 +882,8 @@ virDomainXMLOptionGetNamespace(virDomainXMLOptionPtr xmlopt) void -virBlkioDeviceWeightArrayClear(virBlkioDeviceWeightPtr deviceWeights, - int ndevices) +virBlkioDeviceArrayClear(virBlkioDeviceWeightPtr deviceWeights, + int ndevices) { size_t i; @@ -1990,8 +1990,8 @@ void virDomainDefFree(virDomainDefPtr def) VIR_FREE(def->description); VIR_FREE(def->title); - virBlkioDeviceWeightArrayClear(def->blkio.devices, - def->blkio.ndevices); + virBlkioDeviceArrayClear(def->blkio.devices, + def->blkio.ndevices); VIR_FREE(def->blkio.devices); virDomainWatchdogDefFree(def->watchdog); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 4561ccc..383eb27 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1910,8 +1910,8 @@ struct _virDomainIdMapDef { }; -void virBlkioDeviceWeightArrayClear(virBlkioDeviceWeightPtr deviceWeights, - int ndevices); +void virBlkioDeviceArrayClear(virBlkioDeviceWeightPtr deviceWeights, + int ndevices); typedef struct _virDomainResourceDef virDomainResourceDef; typedef virDomainResourceDef *virDomainResourceDefPtr; diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 50fe00e..e5f7cbd 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -104,7 +104,7 @@ virDomainAuditVcpu; # conf/domain_conf.h -virBlkioDeviceWeightArrayClear; +virBlkioDeviceArrayClear; virDiskNameToBusDeviceIndex; virDiskNameToIndex; virDomainActualNetDefFree; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 47d8a09..8a833c7 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7497,7 +7497,7 @@ error: virReportError(VIR_ERR_INVALID_ARG, _("unable to parse device weight '%s'"), deviceWeightStr); cleanup: - virBlkioDeviceWeightArrayClear(result, ndevices); + virBlkioDeviceArrayClear(result, ndevices); VIR_FREE(result); return -1; } @@ -7628,7 +7628,7 @@ qemuDomainSetBlkioParameters(virDomainPtr dom, &vm->def->blkio.ndevices, devices, ndevices) < 0) ret = -1; - virBlkioDeviceWeightArrayClear(devices, ndevices); + virBlkioDeviceArrayClear(devices, ndevices); VIR_FREE(devices); } } @@ -7665,7 +7665,7 @@ qemuDomainSetBlkioParameters(virDomainPtr dom, &persistentDef->blkio.ndevices, devices, ndevices) < 0) ret = -1; - virBlkioDeviceWeightArrayClear(devices, ndevices); + virBlkioDeviceArrayClear(devices, ndevices); VIR_FREE(devices); } } -- 1.8.3.1 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list