bump version to 2.9.0-1~rc2+5

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

Index: qemu-kvm/qemu-options.hx
===================================================================
--- qemu-kvm.orig/qemu-options.hx	2009-12-21 10:37:57.000000000 +0100
+++ qemu-kvm/qemu-options.hx	2009-12-21 10:41:25.000000000 +0100
@@ -66,6 +66,12 @@
 are split equally.
 ETEXI
 
+DEF("id", HAS_ARG, QEMU_OPTION_id,
+    "-id n	     set the faisched ID\n")
+
+DEF("cpuunits",  HAS_ARG, QEMU_OPTION_cpuunits,
+    "-cpuuinits n    set fairsched cpu units\n")
+
 DEF("fda", HAS_ARG, QEMU_OPTION_fda,
     "-fda/-fdb file  use 'file' as floppy disk 0/1 image\n")
 DEF("fdb", HAS_ARG, QEMU_OPTION_fdb, "")
Index: qemu-kvm/vl.c
===================================================================
--- qemu-kvm.orig/vl.c	2009-12-21 10:37:58.000000000 +0100
+++ qemu-kvm/vl.c	2009-12-21 10:42:50.000000000 +0100
@@ -159,6 +159,7 @@
 #include "qemu-objects.h"
 #include "qemu-kvm.h"
 #include "hw/device-assignment.h"
+#include "vzsyscalls.h"
 
 #include "disas.h"
 
@@ -224,6 +225,7 @@
 int max_cpus = 0;
 int smp_cores = 1;
 int smp_threads = 1;
+int fairsched_id = 0;
 const char *vnc_display;
 int acpi_enabled = 1;
 #ifdef TARGET_I386
@@ -363,7 +365,7 @@
     prctl(PR_SET_NAME, name);
 #endif    	
 }
- 
+
 /***************/
 /* ballooning */
 
@@ -4897,6 +4899,7 @@
     const char *gdbstub_dev = NULL;
     uint32_t boot_devices_bitmap = 0;
     int i;
+    int cpuunits = 0;
     int snapshot, linux_boot, net_boot;
     const char *initrd_filename;
     const char *kernel_filename, *kernel_cmdline;
@@ -5550,6 +5553,20 @@
                     exit(1);
                 }
                 break;
+            case QEMU_OPTION_id:
+                fairsched_id = atoi(optarg);
+		if (fairsched_id < 100 || fairsched_id >= 1000000) {
+		    fprintf(stderr, "Invalid ID\n");
+		    exit(1);
+		}
+                break;
+            case QEMU_OPTION_cpuunits:
+                cpuunits = atoi(optarg);
+		if (cpuunits < 8 || cpuunits > 500000) {
+		    fprintf(stderr, "Invalid value for cpuunits\n");
+                    exit(1);
+                }
+                break;
 	    case QEMU_OPTION_vnc:
                 display_type = DT_VNC;
 		vnc_display = optarg;
@@ -5947,6 +5964,39 @@
     if (ram_size == 0)
         ram_size = DEFAULT_RAM_SIZE * 1024 * 1024;
 
+    if (cpuunits && !fairsched_id) {
+      fprintf(stderr, "cpuunits specified without -id");
+      exit (1);
+    }
+
+    if (fairsched_id) {
+      int ret;
+      int weight = cpuunits ? 500000/cpuunits : 500;
+      pid_t cpid = getpid();
+
+      ret = syscall(__NR_fairsched_rmnod, fairsched_id);
+      if (ret == -EBUSY) {
+	fprintf (stderr, "unable to create fairsched node - still in use\n");
+	exit(1);
+      }
+
+      ret = syscall(__NR_fairsched_mknod, 0, weight, fairsched_id);
+      if (ret != fairsched_id) {
+	fprintf (stderr, "unable to create fairsched node\n");
+	exit(1);
+      }
+
+      ret = syscall(__NR_fairsched_mvpr, cpid, fairsched_id);
+      if (ret != 0) {
+	fprintf (stderr, "unable to move procces to fairsched group");
+	exit (1);
+      }
+
+      /* note: we can never remove ourself from the group, so the empty group
+	 will exist after we finish
+      */
+    }
+
     /* init the dynamic translator */
     cpu_exec_init_all(tb_size * 1024 * 1024);
 
Index: qemu-kvm/vzsyscalls.h
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ qemu-kvm/vzsyscalls.h	2009-12-21 10:41:25.000000000 +0100
@@ -0,0 +1,47 @@
+/*
+ *  Copyright (C) 2000-2008, Parallels, Inc. All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#ifndef _VZSYSCALLS_H_
+#define _VZSYSCALLS_H_
+
+#include <sys/syscall.h>
+
+#ifdef __x86_64__
+#define __NR_fairsched_vcpus	499
+#define __NR_setluid		501
+#define __NR_setublimit		502
+#define __NR_fairsched_mknod    504
+#define __NR_fairsched_rmnod    505
+#define __NR_fairsched_chwt	506
+#define __NR_fairsched_mvpr     507
+#define __NR_fairsched_rate	508
+#define __NR_ioprio_set		251
+#elif defined(__i386__)
+#define __NR_fairsched_mknod    500
+#define __NR_fairsched_rmnod    501
+#define __NR_fairsched_chwt	502
+#define __NR_fairsched_mvpr     503
+#define __NR_fairsched_rate	504
+#define __NR_fairsched_vcpus	505
+#define __NR_setluid		511
+#define __NR_setublimit		512
+#define __NR_ioprio_set		289
+#else
+#error "no syscall for this arch"
+#endif
+
+#endif