rebase patches onto 2.6.1

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

diff --git a/debian/patches/pve/0008-qapi-modify-query-machines.patch b/debian/patches/pve/0008-qapi-modify-query-machines.patch
index eacc23b9361969ff942a0d5e1604d6855c2f1d65..227ef07874fbbba6881af70ed084a0967acac20d 100644 (file)
--- a/debian/patches/pve/0008-qapi-modify-query-machines.patch
+++ b/debian/patches/pve/0008-qapi-modify-query-machines.patch
@@ -1,7 +1,7 @@
-From f3aa6523c91f0259f7168a8bbcf978b2e42168f7 Mon Sep 17 00:00:00 2001
+From 7ec55edfacec8698e6fde6e8be0163e57526be2b Mon Sep 17 00:00:00 2001
 From: Wolfgang Bumiller <w.bumiller@proxmox.com>
 Date: Wed, 9 Dec 2015 14:31:18 +0100
-Subject: [PATCH 08/41] qapi: modify query machines
+Subject: [PATCH 08/55] qapi: modify query machines
 
 provide '*is-current' in MachineInfo struct
 ---
@@ -10,10 +10,10 @@ provide '*is-current' in MachineInfo struct
  2 files changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/qapi-schema.json b/qapi-schema.json
-index 9f54ebf..3ac59c5 100644
+index 639f7b6..0e97da1 100644
 --- a/qapi-schema.json
 +++ b/qapi-schema.json
-@@ -2790,6 +2790,8 @@
+@@ -2941,6 +2941,8 @@
  #
  # @default: #optional whether the machine is default
  #
@@ -22,7 +22,7 @@ index 9f54ebf..3ac59c5 100644
  # @cpu-max: maximum number of CPUs supported by the machine type
  #           (since 1.5.0)
  #
-@@ -2797,7 +2799,7 @@
+@@ -2948,7 +2950,7 @@
  ##
  { 'struct': 'MachineInfo',
    'data': { 'name': 'str', '*alias': 'str',
@@ -32,10 +32,10 @@ index 9f54ebf..3ac59c5 100644
  ##
  # @query-machines:
 diff --git a/vl.c b/vl.c
-index 4211ff1..77c734e 100644
+index 5db5dc2..feeb2c4 100644
 --- a/vl.c
 +++ b/vl.c
-@@ -1523,6 +1523,11 @@ MachineInfoList *qmp_query_machines(Error **errp)
+@@ -1538,6 +1538,11 @@ MachineInfoList *qmp_query_machines(Error **errp)
          info->name = g_strdup(mc->name);
          info->cpu_max = !mc->max_cpus ? 1 : mc->max_cpus;