update to qemu 1.3 rc1

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

Index: new/qemu-options.hx
===================================================================
--- 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
 
+DEF("id", HAS_ARG, QEMU_OPTION_id,
+    "-id n	     set the faisched ID\n", QEMU_ARCH_ALL)
+
+DEF("cpuunits",  HAS_ARG, QEMU_OPTION_cpuunits,
+    "-cpuuinits n    set fairsched cpu units\n", QEMU_ARCH_ALL)
+
 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: new/vl.c
===================================================================
--- 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"
 
+#include "vzsyscalls.h"
+
 #include "disas.h"
 
 #include "qemu_socket.h"
@@ -205,6 +207,7 @@
 CharDriverState *virtcon_hds[MAX_VIRTIO_CONSOLES];
 int win2k_install_hack = 0;
 int singlestep = 0;
+int fairsched_id = 0;
 int smp_cpus = 1;
 int max_cpus = 0;
 int smp_cores = 1;
@@ -2275,7 +2278,7 @@
 }
 
 static int debugcon_parse(const char *devname)
-{   
+{
     QemuOpts *opts;
 
     if (!qemu_chr_new("debugcon", devname, NULL)) {
@@ -2527,6 +2530,9 @@
 int main(int argc, char **argv, char **envp)
 {
     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;
@@ -3306,6 +3312,21 @@
                     exit(1);
                 }
                 break;
+            case QEMU_OPTION_id:
+                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);
+		}
+                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:
 #ifdef CONFIG_VNC
                 display_remote++;
@@ -3377,8 +3398,8 @@
 			}
 			p += 8;
 			os_set_proc_name(p);
-		     }	
-		 }	
+		     }
+		 }
                 break;
             case QEMU_OPTION_prom_env:
                 if (nb_prom_envs >= MAX_PROM_ENVS) {
@@ -3765,6 +3786,39 @@
         }
     }
 
+    if (cpuunits && !fairsched_id) {
+      fprintf(stderr, "cpuunits specified without -id");
+      exit (1);
+    }
+
+    if (fairsched_id && cpuunits) {
+	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
+	*/
+    }
+
     cpu_exec_init_all();
 
     bdrv_init_with_whitelist();
Index: new/vzsyscalls.h
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ new/vzsyscalls.h	2012-11-21 11:25:23.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