Fixes an init-time check for parameter validity

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUqkx9AAoJEB6aO1+FQIO2qnIP/33MyBiu0h/jJzjnYqYLYq6q
 2NEYnn1DyQsA/21LzXbJuWAs5fuoxkLznAFXnoFIoflWJ9teuisvxQGc7kXgPOLm
 D3rud2e0ydBmF30vibM834vm+TmHz9bT8k8Y/uo+VoCAp9PJT+kOdPqBmVDTKq/6
 Js3CqtNByqyr6nu+G/K25oOjAWxsWP7IfdbaGf6ZsO1AjcXzkAS3NYOEUab/pT6+
 Zri7/4+awpBJxrQtM/hULFMVL6Kp9PU1d8/QtYnHuVrG6Vj1J1awAvXXSx5GRcdi
 p2SUrpUIJW3fjzsqa/1O89258eQytH0UoRD/U0B3ngZQSd4Xk9vPwwZwVgT+UrkP
 G4F852jeV6HnkWwxC4Dy+VRS33VJN74uERAJJ7UGQLv660FXUJTI3AaAOQaUwKc7
 8HMIjbQi7WaF2Sa/t9un5+UF66IcuF4M6QR1k+CCCpTCUKLW0R9bsdKfRIF67eKb
 OGOnXl0OxIIYlzgyD5/9tCpEbXbQ0K3y7P2cp/FN5liS9uBcFMmdR9IX0HRwhsch
 c5bI8SQ3uizFt4OBc4w/b1D31yIUVwY5dgMam0qs/eDd9lTYkRqIgX80hViPKIPi
 u+YQt+T7nHvGGiI9T/Nlb3FcidWdhv8pGddqpMcZxY8IV8WunkxTch0lIZz2cFny
 Z73kkgek3g8L4Ysf40KJ
 =XQVU
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/amit-virtio-rng/tags/rng-for-2.3' into staging

Fixes an init-time check for parameter validity

# gpg: Signature made Mon 05 Jan 2015 08:34:05 GMT using RSA key ID 854083B6
# gpg: Good signature from "Amit Shah <amit@amitshah.net>"
# gpg:                 aka "Amit Shah <amit@kernel.org>"
# gpg:                 aka "Amit Shah <amitshah@gmx.net>"

* remotes/amit-virtio-rng/tags/rng-for-2.3:
  virtio-rng: fix check for period_ms validity

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2015-01-09 18:55:29 +00:00
commit f1c5831ca3

View file

@ -149,7 +149,7 @@ static void virtio_rng_device_realize(DeviceState *dev, Error **errp)
VirtIORNG *vrng = VIRTIO_RNG(dev);
Error *local_err = NULL;
if (!vrng->conf.period_ms > 0) {
if (vrng->conf.period_ms <= 0) {
error_setg(errp, "'period' parameter expects a positive integer");
return;
}