Patchwork [1.3] virtio-rng: do not use g_assert_cmpint

login
register
mail settings
Submitter Paolo Bonzini
Date Nov. 27, 2012, 8:16 a.m.
Message ID <1354004184-15543-1-git-send-email-pbonzini@redhat.com>
Download mbox | patch
Permalink /patch/202113/
State New
Headers show

Comments

Paolo Bonzini - Nov. 27, 2012, 8:16 a.m.
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 <pbonzini@redhat.com>
---
 hw/virtio-rng.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
Stefan Hajnoczi - Nov. 29, 2012, 2:13 p.m.
On Tue, Nov 27, 2012 at 09:16:24AM +0100, Paolo Bonzini wrote:
> 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 <pbonzini@redhat.com>
> ---
>  hw/virtio-rng.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>

Patch

diff --git a/hw/virtio-rng.c b/hw/virtio-rng.c
index f4ed9cf..df329f2 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);