NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

build: really silence the 32-bit warning

Browse Source 
Commit cdce2f42d tried to silence a compiler warning on 32-bit builds,
but the gcc shipped with RHEL 5 is old enough that the type conversion
via multiplication by 1 was insufficient for the task.

* src/qemu/qemu_monitor.c (qemuMonitorBlockJob): Previous attempt
didn't get past all gcc versions.
This commit is contained in:
Eric Blake 2012-05-12 07:24:08 -06:00
parent aaf36b15a6
commit 5f89c86004
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/qemu/qemu_monitor.c
View File

@ -2785,13 +2785,14 @@ int qemuMonitorBlockJob(qemuMonitorPtr mon,
modern); modern);
/* Convert bandwidth MiB to bytes */ /* Convert bandwidth MiB to bytes */
if (bandwidth * 1ULL > ULLONG_MAX / 1024 / 1024) { speed = bandwidth;
if (speed > ULLONG_MAX / 1024 / 1024) {
qemuReportError(VIR_ERR_OVERFLOW, qemuReportError(VIR_ERR_OVERFLOW,
_("bandwidth must be less than %llu"), _("bandwidth must be less than %llu"),
ULLONG_MAX / 1024 / 1024); ULLONG_MAX / 1024 / 1024);
return -1; return -1;
} }
speed = bandwidth * 1024ULL * 1024ULL; speed <<= 20;
if (mon->json) if (mon->json)
ret = qemuMonitorJSONBlockJob(mon, device, base, speed, info, mode, ret = qemuMonitorJSONBlockJob(mon, device, base, speed, info, mode,