From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:40073) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T8q7s-0004p5-Tx for qemu-devel@nongnu.org; Tue, 04 Sep 2012 06:13:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T8q7r-0004dj-UE for qemu-devel@nongnu.org; Tue, 04 Sep 2012 06:12:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:17460) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T8q7r-0004df-ML for qemu-devel@nongnu.org; Tue, 04 Sep 2012 06:12:55 -0400 Message-ID: <5045D424.6030903@redhat.com> Date: Tue, 04 Sep 2012 12:12:52 +0200 From: Gerd Hoffmann MIME-Version: 1.0 References: <5040688D.5070707@redhat.com> <1346621726-11313-1-git-send-email-ssp@redhat.com> <1346621726-11313-7-git-send-email-ssp@redhat.com> In-Reply-To: <1346621726-11313-7-git-send-email-ssp@redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH-v2 qemu] qxl: Add set_client_capabilities() interface to QXLInterface List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?ISO-8859-1?Q?S=F8ren_Sandmann_Pedersen?= Cc: spice-devel@lists.freedesktop.org, qemu-devel@nongnu.org Hi, > static void qxl_enter_vga_mode(PCIQXLDevice *d) > @@ -1292,7 +1315,7 @@ static void qxl_set_mode(PCIQXLDevice *d, int modenr, int loadvm) > > d->mode = QXL_MODE_COMPAT; > d->cmdflags = QXL_COMMAND_FLAG_COMPAT; > -#ifdef QXL_COMMAND_FLAG_COMPAT_16BPP /* new in spice 0.6.1 */ > +#if QXL_COMMAND_FLAG_COMPAT_16BPP /* new in spice 0.6.1 */ Unrelated change in there. btw: we require spice-server > 0.8.x anyway, so this #ifdef can go anyway, but if you do it make it a separate patch please. > case 3: /* qxl-3 */ > + pci_device_rev = QXL_REVISION_STABLE_V10; > + io_size = msb_mask(QXL_IO_RANGE_SIZE * 2 - 1); > + break; > + case 4: Conflicts with queued patches. Please just drop it, I'll go switch to rev4 by default once we have a spice-server 0.12.0 release & all qemu patches needed to use the new stuff merged. > -#define QXL_DEFAULT_REVISION QXL_REVISION_STABLE_V10 > +#define QXL_DEFAULT_REVISION QXL_REVISION_STABLE_V12 Likewise. cheers, Gerd