Noticed these while building on FreeBSD.
* src/qemu/qemu_monitor.c (qemuMonitorBlockInfoLookup): Rename
variable to avoid 'devname' collision.
* src/qemu/qemu_driver.c (qemuDomainInterfaceStats): Mark unused
variable.
---
Pushing under the build-breaker rule.
src/qemu/qemu_driver.c | 2 +-
src/qemu/qemu_monitor.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 6f0849c..2dd6922 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -8898,7 +8898,7 @@ cleanup:
}
#else
static int
-qemuDomainInterfaceStats(virDomainPtr dom,
+qemuDomainInterfaceStats(virDomainPtr dom ATTRIBUTE_UNUSED,
const char *path ATTRIBUTE_UNUSED,
struct _virDomainInterfaceStats *stats ATTRIBUTE_UNUSED)
{
diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 5ad6c15..131e8df 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -1428,16 +1428,16 @@ qemuMonitorGetBlockInfo(qemuMonitorPtr mon)
struct qemuDomainDiskInfo *
qemuMonitorBlockInfoLookup(virHashTablePtr blockInfo,
- const char *devname)
+ const char *dev)
{
struct qemuDomainDiskInfo *info;
- VIR_DEBUG("blockInfo=%p dev=%s", blockInfo, NULLSTR(devname));
+ VIR_DEBUG("blockInfo=%p dev=%s", blockInfo, NULLSTR(dev));
- if (!(info = virHashLookup(blockInfo, devname))) {
+ if (!(info = virHashLookup(blockInfo, dev))) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("cannot find info for device '%s'"),
- NULLSTR(devname));
+ NULLSTR(dev));
}
return info;
--
1.8.0.2
Show replies by date
Eric Blake wrote:
Noticed these while building on FreeBSD.
* src/qemu/qemu_monitor.c (qemuMonitorBlockInfoLookup): Rename
variable to avoid 'devname' collision.
* src/qemu/qemu_driver.c (qemuDomainInterfaceStats): Mark unused
variable.
Although I see it's already committed, just wanted to confirm that this
change looks reasonable and works good on my installation.
Thanks
Roman Bogorodskiy