| Message ID | 1358769827-7317-1-git-send-email-peter.maydell@linaro.org |
|---|---|
| State | Accepted |
| Commit | 0b0878611c64f027ca5d15ba641f423cc04ead3f |
| Headers | show |
> Stefan: I've made the obvious change to fix the spice compile issue, > but none of my systems have a new enough spice-protocol/spice-server > to allow me to configure with spice enabled. I'd appreciate it if > you could check it does indeed compile OK now... I'll run this through the buildbot ... cheers, Gerd
On 21 January 2013 14:19, Gerd Hoffmann <kraxel@redhat.com> wrote: >> Stefan: I've made the obvious change to fix the spice compile issue, >> but none of my systems have a new enough spice-protocol/spice-server >> to allow me to configure with spice enabled. I'd appreciate it if >> you could check it does indeed compile OK now... > > I'll run this through the buildbot ... Thanks, and apologies for forgetting to cc you. -- PMM
On 01/21/13 15:19, Gerd Hoffmann wrote: >> Stefan: I've made the obvious change to fix the spice compile issue, >> but none of my systems have a new enough spice-protocol/spice-server >> to allow me to configure with spice enabled. I'd appreciate it if >> you could check it does indeed compile OK now... > > I'll run this through the buildbot ... All green. Acked-by: Gerd Hoffmann <kraxel@redhat.com> Taking through trivial would be a nice service as I don't have any 1.4-ish pixman stuff pending arm. thanks, Gerd
Ping: Stefan, are you going to take this via -trivial as Gerd suggests? [patchwork url: http://patchwork.ozlabs.org/patch/214114/ ] thanks -- PMM On 21 January 2013 17:14, Gerd Hoffmann <kraxel@redhat.com> wrote: > On 01/21/13 15:19, Gerd Hoffmann wrote: >>> Stefan: I've made the obvious change to fix the spice compile issue, >>> but none of my systems have a new enough spice-protocol/spice-server >>> to allow me to configure with spice enabled. I'd appreciate it if >>> you could check it does indeed compile OK now... >> >> I'll run this through the buildbot ... > > All green. > > Acked-by: Gerd Hoffmann <kraxel@redhat.com> > > Taking through trivial would be a nice service as I don't have any > 1.4-ish pixman stuff pending arm. > > thanks, > Gerd
On Mon, Jan 21, 2013 at 12:03:47PM +0000, Peter Maydell wrote: > Remove an unnecessary mutual inclusion loop between qemu-pixman.h and > console.h, since the former was only including the latter for > 'PixelFormat*', which can be provided by typedefs.h. This requires a > minor adjustment to the files which included qemu-pixman.h, since > they were relying on it implicitly dragging in all of console.h. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > Stefan: I've made the obvious change to fix the spice compile issue, > but none of my systems have a new enough spice-protocol/spice-server > to allow me to configure with spice enabled. I'd appreciate it if > you could check it does indeed compile OK now... > > include/ui/qemu-pixman.h | 2 +- > include/ui/spice-display.h | 1 + > ui/qemu-pixman.c | 3 ++- > 3 files changed, 4 insertions(+), 2 deletions(-) Thanks, applied to the trivial patches tree: https://github.com/stefanha/qemu/commits/trivial-patches Stefan
diff --git a/include/ui/qemu-pixman.h b/include/ui/qemu-pixman.h index 016fd87..b032f52 100644 --- a/include/ui/qemu-pixman.h +++ b/include/ui/qemu-pixman.h @@ -15,7 +15,7 @@ #pragma GCC diagnostic error "-Wredundant-decls" #endif -#include "console.h" +#include "qemu/typedefs.h" /* * pixman image formats are defined to be native endian, diff --git a/include/ui/spice-display.h b/include/ui/spice-display.h index 8b192e9..46f9530 100644 --- a/include/ui/spice-display.h +++ b/include/ui/spice-display.h @@ -21,6 +21,7 @@ #include "qemu/thread.h" #include "ui/qemu-pixman.h" +#include "ui/console.h" #include "sysemu/sysemu.h" #define NUM_MEMSLOTS 8 diff --git a/ui/qemu-pixman.c b/ui/qemu-pixman.c index 609335a..6dcbe90 100644 --- a/ui/qemu-pixman.c +++ b/ui/qemu-pixman.c @@ -3,7 +3,8 @@ * See the COPYING file in the top-level directory. */ -#include "ui/qemu-pixman.h" +#include "qemu-common.h" +#include "ui/console.h" int qemu_pixman_get_type(int rshift, int gshift, int bshift) {
Remove an unnecessary mutual inclusion loop between qemu-pixman.h and console.h, since the former was only including the latter for 'PixelFormat*', which can be provided by typedefs.h. This requires a minor adjustment to the files which included qemu-pixman.h, since they were relying on it implicitly dragging in all of console.h. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- Stefan: I've made the obvious change to fix the spice compile issue, but none of my systems have a new enough spice-protocol/spice-server to allow me to configure with spice enabled. I'd appreciate it if you could check it does indeed compile OK now... include/ui/qemu-pixman.h | 2 +- include/ui/spice-display.h | 1 + ui/qemu-pixman.c | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-)