update to qemu 1.3 rc1

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

diff --git a/debian/patches/fairsched.diff b/debian/patches/fairsched.diff
index 4d344a707dcdb6deed6bb83f4d428e9e8551f3b2..7e1799ef39ab6c2906185eda954b3bb3f2f3a3a3 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-09-24 07:15:00.000000000 +0200
-+++ new/qemu-options.hx        2012-09-24 07:15:20.000000000 +0200
-@@ -102,6 +102,12 @@
+--- new.orig/qemu-options.hx   2012-11-21 11:11:22.000000000 +0100
++++ new/qemu-options.hx        2012-11-21 11:25:23.000000000 +0100
+@@ -103,6 +103,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-09-24 07:15:00.000000000 +0200
-+++ new/vl.c   2012-09-24 07:15:20.000000000 +0200
+--- new.orig/vl.c      2012-11-21 11:11:22.000000000 +0100
++++ new/vl.c   2012-11-21 11:25:23.000000000 +0100
 @@ -154,6 +154,8 @@
  #endif
  #include "qtest.h"
@@ -29,14 +29,14 @@ Index: new/vl.c
  
  #include "qemu_socket.h"
 @@ -205,6 +207,7 @@
+ CharDriverState *virtcon_hds[MAX_VIRTIO_CONSOLES];
  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;
-@@ -2135,7 +2138,7 @@
+@@ -2275,7 +2278,7 @@
  }
  
  static int debugcon_parse(const char *devname)
@@ -45,7 +45,7 @@ Index: new/vl.c
      QemuOpts *opts;
  
      if (!qemu_chr_new("debugcon", devname, NULL)) {
-@@ -2345,6 +2348,9 @@
+@@ -2527,6 +2530,9 @@
  int main(int argc, char **argv, char **envp)
  {
      int i;
@@ -55,7 +55,7 @@ Index: new/vl.c
      int snapshot, linux_boot;
      const char *icount_option = NULL;
      const char *initrd_filename;
-@@ -3120,6 +3126,21 @@
+@@ -3306,6 +3312,21 @@
                      exit(1);
                  }
                  break;
@@ -77,7 +77,7 @@ Index: new/vl.c
            case QEMU_OPTION_vnc:
  #ifdef CONFIG_VNC
                  display_remote++;
-@@ -3191,8 +3212,8 @@
+@@ -3377,8 +3398,8 @@
                        }
                        p += 8;
                        os_set_proc_name(p);
@@ -88,7 +88,7 @@ Index: new/vl.c
                  break;
              case QEMU_OPTION_prom_env:
                  if (nb_prom_envs >= MAX_PROM_ENVS) {
-@@ -3552,6 +3573,39 @@
+@@ -3765,6 +3786,39 @@
          }
      }
  
@@ -131,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-09-24 07:15:20.000000000 +0200
++++ new/vzsyscalls.h   2012-11-21 11:25:23.000000000 +0100
 @@ -0,0 +1,47 @@
 +/*
 + *  Copyright (C) 2000-2008, Parallels, Inc. All rights reserved.