From: Paolo Bonzini Date: Tue, 27 Nov 2012 08:16:24 +0000 (+0100) Subject: virtio-rng: do not use g_assert_cmpint X-Git-Tag: v2.7.1~3916 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=03a36f17d7788e4a1e07b3341b18028aa0206845;p=mirror_qemu.git virtio-rng: do not use g_assert_cmpint g_assert_cmpint is not available on glib 2.12, which is the minimum version required to build QEMU (we only require 2.16 to run tests, since that is the first version including GTester). Do not use it in hardware models, use a normal assertion instead. This fixes the buildbot failure for default_x86_64_rhel5. Signed-off-by: Paolo Bonzini Signed-off-by: Anthony Liguori --- diff --git a/hw/virtio-rng.c b/hw/virtio-rng.c index f4ed9cf92a..df329f25e1 100644 --- a/hw/virtio-rng.c +++ b/hw/virtio-rng.c @@ -173,10 +173,9 @@ VirtIODevice *virtio_rng_init(DeviceState *dev, VirtIORNGConf *conf) vrng->qdev = dev; vrng->conf = conf; + assert(vrng->conf->max_bytes <= INT64_MAX); vrng->quota_remaining = vrng->conf->max_bytes; - g_assert_cmpint(vrng->conf->max_bytes, <=, INT64_MAX); - vrng->rate_limit_timer = qemu_new_timer_ms(vm_clock, check_rate_limit, vrng);