update to qemu 2.2.0-rc2

[pve-qemu-kvm.git] / debian / patches / modify-query-machines.patch

diff --git a/debian/patches/modify-query-machines.patch b/debian/patches/modify-query-machines.patch
index 81556a439d6489f8b77d4867fc65823008e5eb93..d028e3e1ca85fe53b2258f2de1d23a07dd40cc32 100644 (file)
--- a/debian/patches/modify-query-machines.patch
+++ b/debian/patches/modify-query-machines.patch
@@ -1,8 +1,8 @@
 Index: new/qapi-schema.json
 ===================================================================
---- new.orig/qapi-schema.json  2014-07-16 12:01:29.000000000 +0200
-+++ new/qapi-schema.json       2014-07-16 12:01:30.000000000 +0200
-@@ -2388,6 +2388,8 @@
+--- new.orig/qapi-schema.json  2014-11-20 07:26:23.000000000 +0100
++++ new/qapi-schema.json       2014-11-20 07:26:39.000000000 +0100
+@@ -2393,6 +2393,8 @@
  #
  # @default: #optional whether the machine is default
  #
@@ -11,7 +11,7 @@ Index: new/qapi-schema.json
  # @cpu-max: maximum number of CPUs supported by the machine type
  #           (since 1.5.0)
  #
-@@ -2395,7 +2397,7 @@
+@@ -2400,7 +2402,7 @@
  ##
  { 'type': 'MachineInfo',
    'data': { 'name': 'str', '*alias': 'str',
@@ -22,9 +22,9 @@ Index: new/qapi-schema.json
  # @query-machines:
 Index: new/vl.c
 ===================================================================
---- new.orig/vl.c      2014-07-16 12:01:29.000000000 +0200
-+++ new/vl.c   2014-07-16 12:01:30.000000000 +0200
-@@ -1660,6 +1660,11 @@
+--- new.orig/vl.c      2014-11-20 06:50:55.000000000 +0100
++++ new/vl.c   2014-11-20 07:26:39.000000000 +0100
+@@ -1534,6 +1534,11 @@
          info->name = g_strdup(mc->name);
          info->cpu_max = !mc->max_cpus ? 1 : mc->max_cpus;