update to v2.1.0-rc2

[pve-qemu-kvm.git] / debian / patches / fairsched.diff

diff --git a/debian/patches/fairsched.diff b/debian/patches/fairsched.diff
index 417687844b24280e55e5a9a61db2399cad7bd78c..502038af0ddf4b06469599f657fe326a152144ef 100644 (file)
--- a/debian/patches/fairsched.diff
+++ b/debian/patches/fairsched.diff
@@ -1,8 +1,8 @@
 Index: new/qemu-options.hx
 ===================================================================
---- new.orig/qemu-options.hx   2014-06-17 06:14:28.000000000 +0200
-+++ new/qemu-options.hx        2014-06-17 06:14:52.000000000 +0200
-@@ -366,6 +366,12 @@
+--- new.orig/qemu-options.hx   2014-07-16 09:54:13.000000000 +0200
++++ new/qemu-options.hx        2014-07-16 09:55:58.000000000 +0200
+@@ -379,6 +379,12 @@
  @table @option
  ETEXI
  
@@ -17,9 +17,9 @@ Index: new/qemu-options.hx
  DEF("fdb", HAS_ARG, QEMU_OPTION_fdb, "", QEMU_ARCH_ALL)
 Index: new/vl.c
 ===================================================================
---- new.orig/vl.c      2014-06-17 06:14:28.000000000 +0200
-+++ new/vl.c   2014-06-17 06:14:52.000000000 +0200
-@@ -102,6 +102,8 @@
+--- new.orig/vl.c      2014-07-16 09:54:13.000000000 +0200
++++ new/vl.c   2014-07-16 10:01:14.000000000 +0200
+@@ -101,6 +101,8 @@
  #endif
  #include "sysemu/qtest.h"
  
@@ -28,7 +28,7 @@ Index: new/vl.c
  #include "disas/disas.h"
  
  
-@@ -152,6 +154,7 @@
+@@ -153,6 +155,7 @@
  CharDriverState *sclp_hds[MAX_SCLP_CONSOLES];
  int win2k_install_hack = 0;
  int singlestep = 0;
@@ -36,7 +36,7 @@ Index: new/vl.c
  int smp_cpus = 1;
  int max_cpus = 0;
  int smp_cores = 1;
-@@ -2956,6 +2959,9 @@
+@@ -2897,6 +2900,9 @@
  int main(int argc, char **argv, char **envp)
  {
      int i;
@@ -46,7 +46,7 @@ Index: new/vl.c
      int snapshot, linux_boot;
      const char *icount_option = NULL;
      const char *initrd_filename;
-@@ -3731,6 +3737,21 @@
+@@ -3717,6 +3723,21 @@
                      exit(1);
                  }
                  break;
@@ -68,13 +68,14 @@ Index: new/vl.c
            case QEMU_OPTION_vnc:
  #ifdef CONFIG_VNC
                  display_remote++;
-@@ -4332,6 +4353,39 @@
-         }
-     }
- 
+@@ -3992,6 +4013,40 @@
+                           OBJECT_CLASS(machine_class))));
+     object_property_add_child(object_get_root(), "machine",
+                               OBJECT(current_machine), &error_abort);
++
 +    if (cpuunits && !fairsched_id) {
-+      fprintf(stderr, "cpuunits specified without -id");
-+      exit (1);
++        fprintf(stderr, "cpuunits specified without -id");
++        exit(1);
 +    }
 +
 +    if (fairsched_id && cpuunits) {
@@ -107,11 +108,11 @@ Index: new/vl.c
 +
      cpu_exec_init_all();
  
-     blk_mig_init();
+     if (machine_class->hw_version) {
 Index: new/vzsyscalls.h
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ new/vzsyscalls.h   2014-06-17 06:14:52.000000000 +0200
++++ new/vzsyscalls.h   2014-07-16 09:55:58.000000000 +0200
 @@ -0,0 +1,47 @@
 +/*
 + *  Copyright (C) 2000-2008, Parallels, Inc. All rights reserved.