debian/patches/virtio-balloon-fix-query.patch

   1 Index: new/hmp.c
   2 ===================================================================
   3 --- new.orig/hmp.c      2014-06-17 06:14:28.000000000 +0200
   4 +++ new/hmp.c   2014-06-17 06:14:58.000000000 +0200
   5 @@ -536,7 +536,35 @@
   6          return;
   7      }
   8
   9 -    monitor_printf(mon, "balloon: actual=%" PRId64 "\n", info->actual >> 20);
  10 +    monitor_printf(mon, "balloon: actual=%" PRId64, info->actual >> 20);
  11 +    monitor_printf(mon, " max_mem=%" PRId64, info->max_mem >> 20);
  12 +    if (info->has_total_mem) {
  13 +        monitor_printf(mon, " total_mem=%" PRId64, info->total_mem >> 20);
  14 +    }
  15 +    if (info->has_free_mem) {
  16 +        monitor_printf(mon, " free_mem=%" PRId64, info->free_mem >> 20);
  17 +    }
  18 +
  19 +    if (info->has_mem_swapped_in) {
  20 +        monitor_printf(mon, " mem_swapped_in=%" PRId64, info->mem_swapped_in);
  21 +    }
  22 +    if (info->has_mem_swapped_out) {
  23 +        monitor_printf(mon, " mem_swapped_out=%" PRId64, info->mem_swapped_out);
  24 +    }
  25 +    if (info->has_major_page_faults) {
  26 +        monitor_printf(mon, " major_page_faults=%" PRId64,
  27 +                       info->major_page_faults);
  28 +    }
  29 +    if (info->has_minor_page_faults) {
  30 +        monitor_printf(mon, " minor_page_faults=%" PRId64,
  31 +                       info->minor_page_faults);
  32 +    }
  33 +    if (info->has_last_update) {
  34 +        monitor_printf(mon, " last_update=%" PRId64,
  35 +                       info->last_update);
  36 +    }
  37 +
  38 +    monitor_printf(mon, "\n");
  39
  40      qapi_free_BalloonInfo(info);
  41  }
  42 Index: new/hw/virtio/virtio-balloon.c
  43 ===================================================================
  44 --- new.orig/hw/virtio/virtio-balloon.c 2014-06-17 06:14:28.000000000 +0200
  45 +++ new/hw/virtio/virtio-balloon.c      2014-06-17 06:14:58.000000000 +0200
  46 @@ -305,6 +305,35 @@
  47      VirtIOBalloon *dev = opaque;
  48      info->actual = ram_size - ((uint64_t) dev->actual <<
  49                                 VIRTIO_BALLOON_PFN_SHIFT);
  50 +
  51 +    info->max_mem = ram_size;
  52 +
  53 +    if (!(balloon_stats_enabled(dev) && balloon_stats_supported(dev) &&
  54 +           dev->stats_last_update)) {
  55 +       return;
  56 +    }
  57 +
  58 +    info->last_update = dev->stats_last_update;
  59 +    info->has_last_update = true;
  60 +
  61 +    info->mem_swapped_in = dev->stats[VIRTIO_BALLOON_S_SWAP_IN];
  62 +    info->has_mem_swapped_in = info->mem_swapped_in >= 0 ? true : false;
  63 +
  64 +    info->mem_swapped_out = dev->stats[VIRTIO_BALLOON_S_SWAP_OUT];
  65 +    info->has_mem_swapped_out = info->mem_swapped_out >= 0 ? true : false;
  66 +
  67 +    info->major_page_faults = dev->stats[VIRTIO_BALLOON_S_MAJFLT];
  68 +    info->has_major_page_faults = info->major_page_faults >= 0 ? true : false;
  69 +
  70 +    info->minor_page_faults = dev->stats[VIRTIO_BALLOON_S_MINFLT];
  71 +    info->has_minor_page_faults = info->minor_page_faults >= 0 ? true : false;
  72 +
  73 +    info->free_mem = dev->stats[VIRTIO_BALLOON_S_MEMFREE];
  74 +    info->has_free_mem = info->free_mem >= 0 ? true : false;
  75 +
  76 +    info->total_mem = dev->stats[VIRTIO_BALLOON_S_MEMTOT];
  77 +    info->has_total_mem = info->total_mem >= 0 ? true : false;
  78 +
  79  }
  80
  81  static void virtio_balloon_to_target(void *opaque, ram_addr_t target)
  82 Index: new/qapi-schema.json
  83 ===================================================================
  84 --- new.orig/qapi-schema.json   2014-06-17 06:14:28.000000000 +0200
  85 +++ new/qapi-schema.json        2014-06-17 06:14:58.000000000 +0200
  86 @@ -815,15 +815,34 @@
  87
  88  ##
  89  # @BalloonInfo:
  90 -#
  91 +#
  92  # Information about the guest balloon device.
  93  #
  94  # @actual: the number of bytes the balloon currently contains
  95  #
  96 -# Since: 0.14.0
  97 +# @last_update: #optional time when stats got updated from guest
  98 +#
  99 +# @mem_swapped_in: #optional number of pages swapped in within the guest
 100 +#
 101 +# @mem_swapped_out: #optional number of pages swapped out within the guest
 102 +#
 103 +# @major_page_faults: #optional number of major page faults within the guest
 104  #
 105 +# @minor_page_faults: #optional number of minor page faults within the guest
 106 +#
 107 +# @free_mem: #optional amount of memory (in bytes) free in the guest
 108 +#
 109 +# @total_mem: #optional amount of memory (in bytes) visible to the guest
 110 +#
 111 +# @max_mem: amount of memory (in bytes) assigned to the guest
 112 +#
 113 +# Since: 0.14.0
 114  ##
 115 -{ 'type': 'BalloonInfo', 'data': {'actual': 'int' } }
 116 +{ 'type': 'BalloonInfo',
 117 +  'data': {'actual': 'int', '*last_update': 'int', '*mem_swapped_in': 'int',
 118 +           '*mem_swapped_out': 'int', '*major_page_faults': 'int',
 119 +           '*minor_page_faults': 'int', '*free_mem': 'int',
 120 +           '*total_mem': 'int', 'max_mem': 'int' } }
 121
 122  ##
 123  # @query-balloon:
 124 Index: new/qmp-commands.hx
 125 ===================================================================
 126 --- new.orig/qmp-commands.hx    2014-06-17 06:14:28.000000000 +0200
 127 +++ new/qmp-commands.hx 2014-06-17 06:14:58.000000000 +0200
 128 @@ -3162,6 +3162,13 @@
 129  json-object will be returned containing the following data:
 130
 131  - "actual": current balloon value in bytes (json-int)
 132 +- "mem_swapped_in": Amount of memory swapped in bytes (json-int, optional)
 133 +- "mem_swapped_out": Amount of memory swapped out in bytes (json-int, optional)
 134 +- "major_page_faults": Number of major faults (json-int, optional)
 135 +- "minor_page_faults": Number of minor faults (json-int, optional)
 136 +- "free_mem": Total amount of free and unused memory in
 137 +              bytes (json-int, optional)
 138 +- "total_mem": Total amount of available memory in bytes (json-int, optional)
 139
 140  Example:
 141
 142 @@ -3169,6 +3176,12 @@
 143  <- {
 144        "return":{
 145           "actual":1073741824,
 146 +         "mem_swapped_in":0,
 147 +         "mem_swapped_out":0,
 148 +         "major_page_faults":142,
 149 +         "minor_page_faults":239245,
 150 +         "free_mem":1014185984,
 151 +         "total_mem":1044668416
 152        }
 153     }
 154