diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-04-27 17:28:41 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-04-27 17:28:41 +0100 |
| commit | 0d81cdddaa40a1988b24657aeac19959cfad0fde (patch) | |
| tree | 2c41f3347b5cfac69d1cf8c5d2ce7f161a4d225e /hw | |
| parent | e1a5476354d396773e4c555f126d752d4ae58fa9 (diff) | |
| parent | 2d5a8346a484250934526a15b3a522bdba7e6772 (diff) | |
| download | qemu-0d81cdddaa40a1988b24657aeac19959cfad0fde.zip qemu-0d81cdddaa40a1988b24657aeac19959cfad0fde.tar.gz qemu-0d81cdddaa40a1988b24657aeac19959cfad0fde.tar.bz2 | |
Merge remote-tracking branch 'remotes/qmp-unstable/tags/for-upstream' into staging
Four little fixes
# gpg: Signature made Fri Apr 24 19:56:51 2015 BST using RSA key ID E24ED5A7
# gpg: Good signature from "Luiz Capitulino <lcapitulino@gmail.com>"
* remotes/qmp-unstable/tags/for-upstream:
qmp: Give saner messages related to qmp_capabilities misuse
qmp-commands: fix incorrect uses of ":O" specifier
qapi: Drop dead genlist parameter
balloon: improve error msg when adding second device
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/virtio/virtio-balloon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c index 95b0643..484c3c3 100644 --- a/hw/virtio/virtio-balloon.c +++ b/hw/virtio/virtio-balloon.c @@ -383,7 +383,7 @@ static void virtio_balloon_device_realize(DeviceState *dev, Error **errp) virtio_balloon_stat, s); if (ret < 0) { - error_setg(errp, "Adding balloon handler failed"); + error_setg(errp, "Only one balloon device is supported"); virtio_cleanup(vdev); return; } |