From patchwork Wed Jul 22 15:01:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 498590 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id E2B591402C8 for ; Thu, 23 Jul 2015 01:04:30 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=pZsodBLd; dkim-atps=neutral Received: from localhost ([::1]:36987 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZHvZN-0006kk-2M for incoming@patchwork.ozlabs.org; Wed, 22 Jul 2015 11:04:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43672) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZHvYs-0005ya-TL for qemu-devel@nongnu.org; Wed, 22 Jul 2015 11:04:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZHvYp-0007i1-5P for qemu-devel@nongnu.org; Wed, 22 Jul 2015 11:03:58 -0400 Received: from mail-qk0-x22f.google.com ([2607:f8b0:400d:c09::22f]:35763) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZHvYp-0007hw-1e for qemu-devel@nongnu.org; Wed, 22 Jul 2015 11:03:55 -0400 Received: by qkbm65 with SMTP id m65so100701069qkb.2 for ; Wed, 22 Jul 2015 08:03:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=ksuwlIK3y+AItrgr1Egffs98Q3lyXLZWO11OsyYUxoo=; b=pZsodBLdfRk8qEbdmUB+yUqNN/c2Nkh2jveSrIccRpwnBrFPAosmAe48f6sABSMWcB GpHl/GiEwVhCTcQNfsFWJKfSTceEVAG+DfMUTEtChKfdVbZ3uuWdmBKYCYHc0DKIcs3a jPM8yCgD5Yq3XHXsRcBzx+us7sNL/KfQxj+vrbvvHgharRziQrIoiKIrQuCKzp4omvu7 ypxLNvk+IipEQOzOynGfyEvWO8PeoykGSquz2nIHW0zLqpAD2alHCGq7pzmGLnkG3DJU qbiQ664V9lD6Dr3pXFK/bwnUpnGHe6Ryxg/6LwCBHbktRUxC5MsXB9v3IL3e8CMZgZe5 gYrA== X-Received: by 10.140.147.195 with SMTP id 186mr4496410qht.59.1437577434663; Wed, 22 Jul 2015 08:03:54 -0700 (PDT) Received: from localhost (bne75-h02-31-39-163-232.dsl.sta.abo.bbox.fr. [31.39.163.232]) by smtp.gmail.com with ESMTPSA id u95sm804047qge.16.2015.07.22.08.03.53 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Jul 2015 08:03:53 -0700 (PDT) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Wed, 22 Jul 2015 17:01:28 +0200 Message-Id: <1437577288-15740-2-git-send-email-marcandre.lureau@redhat.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1437577288-15740-1-git-send-email-marcandre.lureau@redhat.com> References: <1437577288-15740-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c09::22f Cc: peter.maydell@linaro.org, kraxel@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Frediano Ziglio Subject: [Qemu-devel] [PULL for-2.4] qxl: Fix new function name for spice-server library X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Frediano Ziglio The new spice-server function to limit the number of monitors (0.12.6) changed while development from spice_qxl_set_monitors_config_limit to spice_qxl_max_monitors (accepted upstream). By mistake I post patch with former name. This patch fix the function name. Signed-off-by: Frediano Ziglio Acked-by: Christophe Fergeau Acked-by: Martin Kletzander Signed-off-by: Marc-André Lureau --- hw/display/qxl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/display/qxl.c b/hw/display/qxl.c index 4e5ff69..2288238 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;