debian/patches/pve/0046-pve-cleanup-includes-all-over-the-place.patch

   1 From 17751f15c2d15782ee24ddcfe991de940dbdc3b0 Mon Sep 17 00:00:00 2001
   2 From: Thomas Lamprecht <t.lamprecht@proxmox.com>
   3 Date: Wed, 6 Apr 2016 13:28:16 +0200
   4 Subject: [PATCH 46/55] pve: cleanup includes all over the place
   5
   6 QEMU wants to get a cleaner include system, adapt to it.
   7 ---
   8  block/zeroinit.c |  3 +++
   9  savevm-async.c   |  4 ++++
  10  vma-reader.c     | 11 +----------
  11  vma-writer.c     | 12 +++---------
  12  vma.c            |  9 +--------
  13  5 files changed, 12 insertions(+), 27 deletions(-)
  14
  15 diff --git a/block/zeroinit.c b/block/zeroinit.c
  16 index 04a9bd0..eb77657 100644
  17 --- a/block/zeroinit.c
  18 +++ b/block/zeroinit.c
  19 @@ -8,9 +8,12 @@
  20   * See the COPYING file in the top-level directory.
  21   */
  22
  23 +#include "qemu/osdep.h"
  24 +#include "qapi/error.h"
  25  #include "block/block_int.h"
  26  #include "qapi/qmp/qdict.h"
  27  #include "qapi/qmp/qstring.h"
  28 +#include "qemu/cutils.h"
  29
  30  typedef struct {
  31      bool has_zero_init;
  32 diff --git a/savevm-async.c b/savevm-async.c
  33 index bb4372c..4d73e66 100644
  34 --- a/savevm-async.c
  35 +++ b/savevm-async.c
  36 @@ -1,3 +1,4 @@
  37 +#include "qemu/osdep.h"
  38  #include "qemu-common.h"
  39  #include "qapi/qmp/qerror.h"
  40  #include "qemu/error-report.h"
  41 @@ -13,6 +14,9 @@
  42  #include "qemu/timer.h"
  43  #include "sysemu/block-backend.h"
  44  #include "qapi/qmp/qstring.h"
  45 +#include "qemu/rcu.h"
  46 +#include "qemu/thread.h"
  47 +#include "qemu/cutils.h"
  48
  49  /* #define DEBUG_SAVEVM_STATE */
  50
  51 diff --git a/vma-reader.c b/vma-reader.c
  52 index 5d0d3ea..cb58360 100644
  53 --- a/vma-reader.c
  54 +++ b/vma-reader.c
  55 @@ -11,14 +11,7 @@
  56   *
  57   */
  58
  59 -#include <stdio.h>
  60 -#include <errno.h>
  61 -#include <unistd.h>
  62 -#include <stdio.h>
  63 -#include <string.h>
  64 -#include <sys/types.h>
  65 -#include <sys/stat.h>
  66 -#include <fcntl.h>
  67 +#include "qemu/osdep.h"
  68  #include <glib.h>
  69  #include <uuid/uuid.h>
  70
  71 @@ -28,8 +21,6 @@
  72  #include "vma.h"
  73  #include "block/block.h"
  74
  75 -#define BITS_PER_LONG  (sizeof(unsigned long) * CHAR_BIT)
  76 -
  77  static unsigned char zero_vma_block[VMA_BLOCK_SIZE];
  78
  79  typedef struct VmaRestoreState {
  80 diff --git a/vma-writer.c b/vma-writer.c
  81 index 3cde204..e96fb55 100644
  82 --- a/vma-writer.c
  83 +++ b/vma-writer.c
  84 @@ -11,22 +11,16 @@
  85   *
  86   */
  87
  88 -#include <stdio.h>
  89 -#include <errno.h>
  90 -#include <unistd.h>
  91 -#include <stdio.h>
  92 -#include <string.h>
  93 -#include <sys/types.h>
  94 -#include <sys/stat.h>
  95 -#include <fcntl.h>
  96 +#include "qemu/osdep.h"
  97  #include <glib.h>
  98  #include <uuid/uuid.h>
  99
 100 -#include "qemu-common.h"
 101  #include "vma.h"
 102  #include "block/block.h"
 103  #include "monitor/monitor.h"
 104  #include "qemu/main-loop.h"
 105 +#include "qemu/coroutine.h"
 106 +#include "qemu/cutils.h"
 107
 108  #define DEBUG_VMA 0
 109
 110 diff --git a/vma.c b/vma.c
 111 index 46ae14b..c3db633 100644
 112 --- a/vma.c
 113 +++ b/vma.c
 114 @@ -11,14 +11,7 @@
 115   *
 116   */
 117
 118 -#include <stdio.h>
 119 -#include <errno.h>
 120 -#include <unistd.h>
 121 -#include <stdio.h>
 122 -#include <string.h>
 123 -#include <sys/types.h>
 124 -#include <sys/stat.h>
 125 -#include <fcntl.h>
 126 +#include "qemu/osdep.h"
 127  #include <glib.h>
 128
 129  #include "vma.h"
 130 --
 131 2.1.4
 132