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)
commit924c09db51b147881d51d8102deb4f285305c1b7
treee93c98fc182fc367a98e60bed7b206dd47354dd2
parent7b13ff3f156b98c3183dfa30edfd6473e8660374
parentc617dd3b7e8e82511060b8f7a9c51e46c5c1e87a
Merge remote-tracking branch 'remotes/amit-virtio-rng/for-2.2' into staging

* 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>