refresh and enable debian/patches/modify-query-machines.patch

diff --git a/debian/patches/modify-query-machines.patch b/debian/patches/modify-query-machines.patch
index 58c6cc0bef6d1ed7eae1512da0f012272b2b1041..adf78693ce72e776cf0b068ab078a6ab423ef9e4 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  2013-11-27 11:35:03.000000000 +0100
-+++ new/qapi-schema.json       2013-11-27 11:41:45.000000000 +0100
-@@ -3180,6 +3180,8 @@
+--- new.orig/qapi-schema.json  2014-05-05 07:54:16.000000000 +0200
++++ new/qapi-schema.json       2014-05-05 08:09:23.000000000 +0200
+@@ -3431,6 +3431,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)
  #
-@@ -3187,7 +3189,7 @@
+@@ -3438,7 +3440,7 @@
  ##
  { 'type': 'MachineInfo',
    'data': { 'name': 'str', '*alias': 'str',
@@ -22,13 +22,13 @@ Index: new/qapi-schema.json
  # @query-machines:
 Index: new/vl.c
 ===================================================================
---- new.orig/vl.c      2013-11-27 11:27:31.000000000 +0100
-+++ new/vl.c   2013-11-27 11:38:27.000000000 +0100
-@@ -1643,6 +1643,11 @@
+--- new.orig/vl.c      2014-05-05 07:54:16.000000000 +0200
++++ new/vl.c   2014-05-05 08:14:33.000000000 +0200
+@@ -1673,6 +1673,11 @@
          info->name = g_strdup(m->name);
          info->cpu_max = !m->max_cpus ? 1 : m->max_cpus;
  
-+        if (strcmp(m->name, current_machine->name) == 0) {
++        if (strcmp(m->name, MACHINE_GET_CLASS(current_machine)->qemu_machine->name) == 0) {
 +            info->has_is_current = true;
 +            info->is_current = true;
 +        }

diff --git a/debian/patches/series b/debian/patches/series
index 1a2366f8a1846d0ecf87cd2083023fda6d03a34a..75a7c8df60d9dd2b7298f7dd8de814e7e56427a3 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,8 +9,8 @@ fix-qemu-img-snapshot-removal.patch
 enable-kvm-by-default.patch
 virtio-balloon-fix-query.patch
 set-cpu-model-to-kvm64.patch
-#modify-query-machines.patch
-##spice-socket.patch
+modify-query-machines.patch
+#spice-socket.patch
 #modify-query-spice.patch
 #spice-use-pve-certs.patch
 #backup-add-vma-binary.patch