refresh and enable debian/patches/virtio-balloon-fix-query.patch

diff --git a/debian/patches/series b/debian/patches/series
index 32822fc5bc1ed246fd4832ae6ffa8260f1ab8c5b..be13c8b18f0bf99486b3e69841ff1faac691f84e 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,7 +7,7 @@ pve-auth.patch
 vencrypt-auth-plain.patch
 fix-qemu-img-snapshot-removal.patch
 enable-kvm-by-default.patch
-#virtio-balloon-fix-query.patch
+virtio-balloon-fix-query.patch
 #set-cpu-model-to-kvm64.patch
 #modify-query-machines.patch
 ##spice-socket.patch

diff --git a/debian/patches/virtio-balloon-fix-query.patch b/debian/patches/virtio-balloon-fix-query.patch
index 6a30b832bdc8db77ab16c0f0583bdae927e2105f..1bf9d2c1ed7064a8baa8b9aff00393fcf15ac8aa 100644 (file)
--- a/debian/patches/virtio-balloon-fix-query.patch
+++ b/debian/patches/virtio-balloon-fix-query.patch
@@ -1,8 +1,8 @@
 Index: new/hmp.c
 ===================================================================
---- new.orig/hmp.c     2013-11-27 10:51:33.000000000 +0100
-+++ new/hmp.c  2013-11-27 11:35:03.000000000 +0100
-@@ -525,7 +525,35 @@
+--- new.orig/hmp.c     2014-05-05 06:55:26.000000000 +0200
++++ new/hmp.c  2014-05-05 07:34:43.000000000 +0200
+@@ -526,7 +526,35 @@
          return;
      }
  
@@ -41,8 +41,8 @@ Index: new/hmp.c
  }
 Index: new/hw/virtio/virtio-balloon.c
 ===================================================================
---- new.orig/hw/virtio/virtio-balloon.c        2013-11-27 10:51:33.000000000 +0100
-+++ new/hw/virtio/virtio-balloon.c     2013-11-27 11:35:03.000000000 +0100
+--- new.orig/hw/virtio/virtio-balloon.c        2014-05-05 06:55:25.000000000 +0200
++++ new/hw/virtio/virtio-balloon.c     2014-05-05 07:34:43.000000000 +0200
 @@ -291,6 +291,35 @@
      VirtIOBalloon *dev = opaque;
      info->actual = ram_size - ((uint64_t) dev->actual <<
@@ -81,9 +81,9 @@ Index: new/hw/virtio/virtio-balloon.c
  static void virtio_balloon_to_target(void *opaque, ram_addr_t target)
 Index: new/qapi-schema.json
 ===================================================================
---- new.orig/qapi-schema.json  2013-11-27 10:51:33.000000000 +0100
-+++ new/qapi-schema.json       2013-11-27 11:35:03.000000000 +0100
-@@ -1229,15 +1229,34 @@
+--- new.orig/qapi-schema.json  2014-05-05 06:55:26.000000000 +0200
++++ new/qapi-schema.json       2014-05-05 07:34:43.000000000 +0200
+@@ -1340,15 +1340,34 @@
  
  ##
  # @BalloonInfo:
@@ -123,9 +123,9 @@ Index: new/qapi-schema.json
  # @query-balloon:
 Index: new/qmp-commands.hx
 ===================================================================
---- new.orig/qmp-commands.hx   2013-11-27 10:51:33.000000000 +0100
-+++ new/qmp-commands.hx        2013-11-27 11:35:03.000000000 +0100
-@@ -2948,6 +2948,13 @@
+--- new.orig/qmp-commands.hx   2014-05-05 06:55:26.000000000 +0200
++++ new/qmp-commands.hx        2014-05-05 07:34:43.000000000 +0200
+@@ -3152,6 +3152,13 @@
  json-object will be returned containing the following data:
  
  - "actual": current balloon value in bytes (json-int)
@@ -139,7 +139,7 @@ Index: new/qmp-commands.hx
  
  Example:
  
-@@ -2955,6 +2962,12 @@
+@@ -3159,6 +3166,12 @@
  <- {
        "return":{
           "actual":1073741824,