update to qemu-kvm-1.1-rc2

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

diff --git a/debian/patches/fairsched.diff b/debian/patches/fairsched.diff
index dd1069b46193c8109316f5d4b6aa79b5c2db3cd4..d1f1c7a50bcbee242d6582ac3aa7a235eefb6f6c 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   2012-02-09 13:15:26.000000000 +0100
-+++ new/qemu-options.hx        2012-02-09 13:22:39.000000000 +0100
-@@ -92,6 +92,12 @@
+--- new.orig/qemu-options.hx   2012-03-12 06:44:56.000000000 +0100
++++ new/qemu-options.hx        2012-03-13 07:25:22.000000000 +0100
+@@ -95,6 +95,12 @@
  are split equally.
  ETEXI
  
@@ -17,8 +17,8 @@ Index: new/qemu-options.hx
  DEF("fdb", HAS_ARG, QEMU_OPTION_fdb, "", QEMU_ARCH_ALL)
 Index: new/vl.c
 ===================================================================
---- new.orig/vl.c      2012-02-09 13:15:26.000000000 +0100
-+++ new/vl.c   2012-02-09 13:22:39.000000000 +0100
+--- new.orig/vl.c      2012-03-12 06:44:56.000000000 +0100
++++ new/vl.c   2012-03-13 08:58:16.000000000 +0100
 @@ -153,6 +153,8 @@
  #include "fsdev/qemu-fsdev.h"
  #endif
@@ -28,15 +28,15 @@ Index: new/vl.c
  #include "disas.h"
  
  #include "qemu_socket.h"
-@@ -204,6 +206,7 @@
- int rtc_td_hack = 0;
+@@ -203,6 +205,7 @@
+ int win2k_install_hack = 0;
  int usb_enabled = 0;
  int singlestep = 0;
 +int fairsched_id = 0;
  int smp_cpus = 1;
  int max_cpus = 0;
  int smp_cores = 1;
-@@ -1959,7 +1962,7 @@
+@@ -2045,7 +2048,7 @@
  }
  
  static int debugcon_parse(const char *devname)
@@ -45,21 +45,24 @@ Index: new/vl.c
      QemuOpts *opts;
  
      if (!qemu_chr_new("debugcon", devname, NULL)) {
-@@ -2175,6 +2178,7 @@
+@@ -2258,6 +2261,9 @@
+ int main(int argc, char **argv, char **envp)
  {
-     const char *gdbstub_dev = NULL;
      int i;
 +    int cpuunits = 0;
++    long int fairsched_id_long = 0;
++    char *ep;
      int snapshot, linux_boot;
      const char *icount_option = NULL;
      const char *initrd_filename;
-@@ -2923,6 +2927,20 @@
+@@ -3022,6 +3028,21 @@
                      exit(1);
                  }
                  break;
 +            case QEMU_OPTION_id:
-+                fairsched_id = atoi(optarg);
-+              if (fairsched_id < 100 || fairsched_id >= 1000000) {
++                fairsched_id_long = strtol(optarg, &ep, 10);
++                fairsched_id = fairsched_id_long;
++              if (*ep != 0 || fairsched_id_long < 100 || fairsched_id_long > INT_MAX) {
 +                  fprintf(stderr, "Invalid ID\n");
 +                  exit(1);
 +              }
@@ -74,7 +77,7 @@ Index: new/vl.c
            case QEMU_OPTION_vnc:
  #ifdef CONFIG_VNC
                  display_remote++;
-@@ -2997,8 +3015,8 @@
+@@ -3093,8 +3114,8 @@
                        }
                        p += 8;
                        os_set_proc_name(p);
@@ -85,7 +88,7 @@ Index: new/vl.c
                  break;
              case QEMU_OPTION_prom_env:
                  if (nb_prom_envs >= MAX_PROM_ENVS) {
-@@ -3309,6 +3327,39 @@
+@@ -3411,6 +3432,39 @@
          }
      }
  
@@ -128,7 +131,7 @@ Index: new/vl.c
 Index: new/vzsyscalls.h
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ new/vzsyscalls.h   2012-02-09 13:22:39.000000000 +0100
++++ new/vzsyscalls.h   2012-03-13 07:25:22.000000000 +0100
 @@ -0,0 +1,47 @@
 +/*
 + *  Copyright (C) 2000-2008, Parallels, Inc. All rights reserved.