From: Peter Maydell Date: Mon, 4 Aug 2014 12:07:02 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/amit-virtio-rng/for-2.2' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=924c09db51b147881d51d8102deb4f285305c1b7;p=qemu.git 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 --- 924c09db51b147881d51d8102deb4f285305c1b7