Merge remote-tracking branch 'remotes/amit-virtio-rng/for-2.2' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 4 Aug 2014 12:07:02 +0000 (13:07 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 4 Aug 2014 12:07:02 +0000 (13:07 +0100)
* remotes/amit-virtio-rng/for-2.2:
  virtio-rng: replace error_set calls with error_setg
  virtio-rng: Move error-checking forward to prevent memory leak

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Trivial merge