[Spice-devel] [PATCH spice-server 2/8] Make red-replay-qxl.h a public header

[Jonathon Jongsma]

Acked-by: Jonathon Jongsma <jjongsma at redhat.com>


On Fri, 2016-11-04 at 13:16 +0000, Frediano Ziglio wrote:
> The functions declared in that header are all exported by the
> library.
> 
> Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
> ---
>  server/Makefile.am      |  2 +-
>  server/red-replay-qxl.c |  1 -
>  server/red-replay-qxl.h | 35 -----------------------------------
>  server/spice-replay.h   | 37 +++++++++++++++++++++++++++++++++++++
>  server/spice.h          |  1 +
>  server/tests/replay.c   |  1 -
>  6 files changed, 39 insertions(+), 38 deletions(-)
>  delete mode 100644 server/red-replay-qxl.h
>  create mode 100644 server/spice-replay.h
> 
> diff --git a/server/Makefile.am b/server/Makefile.am
> index ca67be1..91f9666 100644
> --- a/server/Makefile.am
> +++ b/server/Makefile.am
> @@ -64,6 +64,7 @@ libspice_serverinclude_HEADERS =		\
>  	spice-qxl.h				\
>  	spice-server.h				\
>  	spice-version.h				\
> +	spice-replay.h				\
>  	spice.h					\
>  	$(NULL)
>  
> @@ -121,7 +122,6 @@ libserver_la_SOURCES =				
> \
>  	red-record-qxl.c			\
>  	red-record-qxl.h			\
>  	red-replay-qxl.c			\
> -	red-replay-qxl.h			\
>  	red-parse-qxl.h				\
>  	red-worker.c				\
>  	red-worker.h				\
> diff --git a/server/red-replay-qxl.c b/server/red-replay-qxl.c
> index 78de48b..0ab87d4 100644
> --- a/server/red-replay-qxl.c
> +++ b/server/red-replay-qxl.c
> @@ -28,7 +28,6 @@
>  #include "red-common.h"
>  #include "memslot.h"
>  #include "red-parse-qxl.h"
> -#include "red-replay-qxl.h"
>  #include <glib.h>
>  
>  #define QXLPHYSICAL_FROM_PTR(ptr) ((QXLPHYSICAL)(intptr_t)(ptr))
> diff --git a/server/red-replay-qxl.h b/server/red-replay-qxl.h
> deleted file mode 100644
> index c9e074d..0000000
> --- a/server/red-replay-qxl.h
> +++ /dev/null
> @@ -1,35 +0,0 @@
> -/* -*- Mode: C; c-basic-offset: 4; indent-tabs-mode: nil -*- */
> -/*
> -   Copyright (C) 2009-2015 Red Hat, Inc.
> -
> -   This library is free software; you can redistribute it and/or
> -   modify it under the terms of the GNU Lesser General Public
> -   License as published by the Free Software Foundation; either
> -   version 2.1 of the License, or (at your option) any later
> version.
> -
> -   This library is distributed in the hope that it will be useful,
> -   but WITHOUT ANY WARRANTY; without even the implied warranty of
> -   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> -   Lesser General Public License for more details.
> -
> -   You should have received a copy of the GNU Lesser General Public
> -   License along with this library; if not, see <http://www.gnu.org/
> licenses/>.
> -*/
> -#ifndef RED_REPLAY_QXL_H
> -#define RED_REPLAY_QXL_H
> -
> -#include <stdio.h>
> -#include <spice/qxl_dev.h>
> -
> -#include "spice.h"
> -
> -typedef struct SpiceReplay SpiceReplay;
> -
> -/* reads until encountering a cmd, processing any recorded messages
> (io) on the
> - * way */
> -QXLCommandExt*  spice_replay_next_cmd(SpiceReplay *replay, QXLWorker
> *worker);
> -void            spice_replay_free_cmd(SpiceReplay *replay,
> QXLCommandExt *cmd);
> -void            spice_replay_free(SpiceReplay *replay);
> -SpiceReplay *   spice_replay_new(FILE *file, int nsurfaces);
> -
> -#endif // RED_REPLAY_QXL_H
> diff --git a/server/spice-replay.h b/server/spice-replay.h
> new file mode 100644
> index 0000000..9a02869
> --- /dev/null
> +++ b/server/spice-replay.h
> @@ -0,0 +1,37 @@
> +/* -*- Mode: C; c-basic-offset: 4; indent-tabs-mode: nil -*- */
> +/*
> +   Copyright (C) 2009-2015 Red Hat, Inc.
> +
> +   This library is free software; you can redistribute it and/or
> +   modify it under the terms of the GNU Lesser General Public
> +   License as published by the Free Software Foundation; either
> +   version 2.1 of the License, or (at your option) any later
> version.
> +
> +   This library is distributed in the hope that it will be useful,
> +   but WITHOUT ANY WARRANTY; without even the implied warranty of
> +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> +   Lesser General Public License for more details.
> +
> +   You should have received a copy of the GNU Lesser General Public
> +   License along with this library; if not, see <http://www.gnu.org/
> licenses/>.
> +*/
> +#ifndef SPICE_REPLAY_H_
> +#define SPICE_REPLAY_H_
> +
> +#if !defined(SPICE_H_INSIDE) && !defined(SPICE_SERVER_INTERNAL)
> +#error "Only spice.h can be included directly."
> +#endif
> +
> +#include <stdio.h>
> +#include "spice-core.h"
> +
> +typedef struct SpiceReplay SpiceReplay;
> +
> +/* reads until encountering a cmd, processing any recorded messages
> (io) on the
> + * way */
> +QXLCommandExt*  spice_replay_next_cmd(SpiceReplay *replay, QXLWorker
> *worker);
> +void            spice_replay_free_cmd(SpiceReplay *replay,
> QXLCommandExt *cmd);
> +void            spice_replay_free(SpiceReplay *replay);
> +SpiceReplay *   spice_replay_new(FILE *file, int nsurfaces);
> +
> +#endif // SPICE_REPLAY_H_
> diff --git a/server/spice.h b/server/spice.h
> index bd533b3..901addf 100644
> --- a/server/spice.h
> +++ b/server/spice.h
> @@ -28,6 +28,7 @@
>  #include "spice-audio.h"
>  #include "spice-char.h"
>  #include "spice-migration.h"
> +#include "spice-replay.h"
>  
>  #undef SPICE_H_INSIDE
>  
> diff --git a/server/tests/replay.c b/server/tests/replay.c
> index 467a344..6c6e01e 100644
> --- a/server/tests/replay.c
> +++ b/server/tests/replay.c
> @@ -36,7 +36,6 @@
>  #include <pthread.h>
>  
>  #include <spice/macros.h>
> -#include "red-replay-qxl.h"
>  #include "test_display_base.h"
>  #include <common/log.h>
>