[pve-devel] r5396 - pve-qemu-kvm/pve2/debian/patches

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-01-19 11:50:18 +0100 (Wed, 19 Jan 2011)
New Revision: 5396

Modified:
   pve-qemu-kvm/pve2/debian/patches/fairsched.diff
Log:
allow to pass -id without cpuuinits


Modified: pve-qemu-kvm/pve2/debian/patches/fairsched.diff
===================================================================
--- pve-qemu-kvm/pve2/debian/patches/fairsched.diff	2011-01-19 10:38:16 UTC (rev 5395)
+++ pve-qemu-kvm/pve2/debian/patches/fairsched.diff	2011-01-19 10:50:18 UTC (rev 5396)
@@ -1,7 +1,7 @@
-Index: qemu-kvm/qemu-options.hx
+Index: new/qemu-options.hx
 ===================================================================
---- qemu-kvm.orig/qemu-options.hx	2010-10-21 14:39:35.000000000 +0200
-+++ qemu-kvm/qemu-options.hx	2010-10-21 14:41:52.000000000 +0200
+--- new.orig/qemu-options.hx	2011-01-19 11:49:17.000000000 +0100
++++ new/qemu-options.hx	2011-01-19 11:49:20.000000000 +0100
 @@ -74,6 +74,12 @@
  are split equally.
  ETEXI
@@ -15,10 +15,10 @@
  DEF("fda", HAS_ARG, QEMU_OPTION_fda,
      "-fda/-fdb file  use 'file' as floppy disk 0/1 image\n", QEMU_ARCH_ALL)
  DEF("fdb", HAS_ARG, QEMU_OPTION_fdb, "", QEMU_ARCH_ALL)
-Index: qemu-kvm/vl.c
+Index: new/vl.c
 ===================================================================
---- qemu-kvm.orig/vl.c	2010-10-21 14:39:35.000000000 +0200
-+++ qemu-kvm/vl.c	2010-10-21 14:39:45.000000000 +0200
+--- new.orig/vl.c	2011-01-19 11:49:17.000000000 +0100
++++ new/vl.c	2011-01-19 11:50:47.000000000 +0100
 @@ -152,6 +152,8 @@
  #include "fsdev/qemu-fsdev.h"
  #endif
@@ -74,7 +74,7 @@
 +      exit (1);
 +    }
 +
-+    if (fairsched_id) {
++    if (fairsched_id && cpuunits) {
 +      int ret;
 +      int weight = cpuunits ? 500000/cpuunits : 500;
 +      pid_t cpid = getpid();
@@ -105,10 +105,10 @@
      /* init the dynamic translator */
      cpu_exec_init_all(tb_size * 1024 * 1024);
  
-Index: qemu-kvm/vzsyscalls.h
+Index: new/vzsyscalls.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ qemu-kvm/vzsyscalls.h	2010-10-21 14:39:45.000000000 +0200
++++ new/vzsyscalls.h	2011-01-19 11:49:20.000000000 +0100
 @@ -0,0 +1,47 @@
 +/*
 + *  Copyright (C) 2000-2008, Parallels, Inc. All rights reserved.