diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-07-22 16:22:49 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-07-22 16:22:49 +0100 |
| commit | 3edf6b3f1e68104dba692337fdcecdba39e73c59 (patch) | |
| tree | bc8c6dd0941bbcc43604b8f22306084e71409899 | |
| parent | dc94bd9166af5236a56bd5bb06845911915a925c (diff) | |
| parent | a52b2cbf218d52f9e357961acb271a98a2bdff71 (diff) | |
| download | qemu-3edf6b3f1e68104dba692337fdcecdba39e73c59.tar.gz | |
Merge remote-tracking branch 'remotes/elmarco/tags/for-upstream' into staging
qxl: build fix for 2.4
# gpg: Signature made Wed Jul 22 15:55:00 2015 BST using DSA key ID F43F0992
# gpg: Good signature from "Marc-André Lureau <marcandre.lureau@redhat.com>"
# gpg: aka "Marc-Andre Lureau <marcandre.lureau@gmail.com>"
# gpg: aka "Marc-Andre Lureau <marc-andre.lureau@nokia.com>"
# gpg: aka "Marc-André Lureau <marc-andre.lureau@nokia.com>"
# gpg: aka "Marc-André Lureau (elmarco) <marcandre.lureau@gmail.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 7346 2483 9404 4E20 ABFF 7D48 D864 9487 F43F 0992
* remotes/elmarco/tags/for-upstream:
qxl: Fix new function name for spice-server library
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/display/qxl.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/display/qxl.c b/hw/display/qxl.c index 4e5ff69af3..2288238d00 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -273,8 +273,7 @@ static void qxl_spice_monitors_config_async(PCIQXLDevice *qxl, int replay) } else { #if SPICE_SERVER_VERSION >= 0x000c06 /* release 0.12.6 */ if (qxl->max_outputs) { - spice_qxl_set_monitors_config_limit(&qxl->ssd.qxl, - qxl->max_outputs); + spice_qxl_set_max_monitors(&qxl->ssd.qxl, qxl->max_outputs); } #endif qxl->guest_monitors_config = qxl->ram->monitors_config; |