update to qemu 2.2.0-rc2

[pve-qemu-kvm.git] / debian / patches / virtio-balloon-fix-query.patch

diff --git a/debian/patches/virtio-balloon-fix-query.patch b/debian/patches/virtio-balloon-fix-query.patch
index fd21ed24d65bc25432c1446470c2d10bb5ebc0f6..2220073d9e1a428ed303abbeeb506eb82a56d6ca 100644 (file)
--- a/debian/patches/virtio-balloon-fix-query.patch
+++ b/debian/patches/virtio-balloon-fix-query.patch
@@ -1,7 +1,7 @@
 Index: new/hmp.c
 ===================================================================
---- new.orig/hmp.c     2014-07-16 11:53:56.000000000 +0200
-+++ new/hmp.c  2014-07-16 12:01:29.000000000 +0200
+--- new.orig/hmp.c     2014-11-20 06:45:05.000000000 +0100
++++ new/hmp.c  2014-11-20 07:26:23.000000000 +0100
 @@ -539,7 +539,35 @@
          return;
      }
@@ -41,9 +41,9 @@ Index: new/hmp.c
  }
 Index: new/hw/virtio/virtio-balloon.c
 ===================================================================
---- new.orig/hw/virtio/virtio-balloon.c        2014-07-16 11:53:56.000000000 +0200
-+++ new/hw/virtio/virtio-balloon.c     2014-07-16 12:01:29.000000000 +0200
-@@ -309,6 +309,35 @@
+--- new.orig/hw/virtio/virtio-balloon.c        2014-11-20 06:45:06.000000000 +0100
++++ new/hw/virtio/virtio-balloon.c     2014-11-20 07:26:23.000000000 +0100
+@@ -314,6 +314,35 @@
      VirtIOBalloon *dev = opaque;
      info->actual = ram_size - ((uint64_t) dev->actual <<
                                 VIRTIO_BALLOON_PFN_SHIFT);
@@ -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  2014-07-16 11:53:56.000000000 +0200
-+++ new/qapi-schema.json       2014-07-16 12:01:29.000000000 +0200
-@@ -885,15 +885,34 @@
+--- new.orig/qapi-schema.json  2014-11-20 06:45:06.000000000 +0100
++++ new/qapi-schema.json       2014-11-20 07:26:23.000000000 +0100
+@@ -888,15 +888,34 @@
  
  ##
  # @BalloonInfo:
@@ -123,9 +123,9 @@ Index: new/qapi-schema.json
  # @query-balloon:
 Index: new/qmp-commands.hx
 ===================================================================
---- new.orig/qmp-commands.hx   2014-07-16 11:53:56.000000000 +0200
-+++ new/qmp-commands.hx        2014-07-16 12:01:29.000000000 +0200
-@@ -3235,6 +3235,13 @@
+--- new.orig/qmp-commands.hx   2014-11-20 06:45:06.000000000 +0100
++++ new/qmp-commands.hx        2014-11-20 07:26:23.000000000 +0100
+@@ -3234,6 +3234,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:
  
-@@ -3242,6 +3249,12 @@
+@@ -3241,6 +3248,12 @@
  <- {
        "return":{
           "actual":1073741824,