On Wed, Aug 15, 2012 at 10:23:23AM +0200, Gerd Hoffmann wrote: > On 08/09/12 16:21, Alon Levy wrote: > > Revision bumped to 4 for new IO support, enabled for spice-server >= > > 0.11.1. New io enabled iff spice-server >= 0.11.1 && spice-protocol >= > > 0.12.0. > > Patch doesn't apply cleanly to master.
Strange, will resend. > > > + if $pkg_config --atleast-version=0.12.0 spice-protocol >/dev/null > > 2>&1; then > > + QEMU_CFLAGS="$QEMU_CFLAGS -DQXL_HAS_IO_MONITORS_CONFIG_ASYNC" > > + fi > > /me thinks now with spice-server having no dependency any more on > spice-protocol we should add a #define SPICE_PROTOCOL_VERSION to > spice-protocol so we don't need constructs like this. So yet another place to remember to update the version number. But I agree it's cleaner. > > Or maybe just use > > #ifndef QXL_HAS_IO_MONITORS_CONFIG_ASYNC > #define QXL_HAS_IO_MONITORS_CONFIG_ASYNC $whatever > #endif I don't get this. You mean to have add #define QXL_HAS_IO_MONITORS_CONFIG_ASYNC bla to spice-protocol? > > ? > > > +#if SPICE_SERVER_VERSION >= 0x000b01 /* 0.11.1 */ > > +#ifdef QXL_HAS_IO_MONITORS_CONFIG_ASYNC > > Can be on a single line: > > #if (SPICE_SERVER_VERSION >= 0x000b01) && > defined(QXL_HAS_IO_MONITORS_CONFIG_ASYNC) > > Or: > > #if (SPICE_SERVER_VERSION >= 0x000b01) && (SPICE_PROTOCOL_VERSION >= ...) > Correct, the point was to make sure when I later removed only a part of it it would show up as a single line removal. But sure, if you prefer it this way. > cheers, > Gerd >