From a4d1ce3f8791425d60ce1c5840f0ee92e6b89d05 Mon Sep 17 00:00:00 2001 From: Edison Su Date: Thu, 15 Dec 2011 15:08:14 -0800 Subject: [PATCH] set the cpu weight based on cpu * cores --- .../com/cloud/agent/resource/computing/KVMGuestOsMapper.java | 3 +++ .../agent/resource/computing/LibvirtComputingResource.java | 2 +- setup/db/templates.sql | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/agent/src/com/cloud/agent/resource/computing/KVMGuestOsMapper.java b/agent/src/com/cloud/agent/resource/computing/KVMGuestOsMapper.java index ff148409dd2..61013d5ed00 100644 --- a/agent/src/com/cloud/agent/resource/computing/KVMGuestOsMapper.java +++ b/agent/src/com/cloud/agent/resource/computing/KVMGuestOsMapper.java @@ -120,6 +120,9 @@ public class KVMGuestOsMapper { s_mapper.put("Windows 95", "Windows 95"); s_mapper.put("Windows NT 4", "Windows NT"); s_mapper.put("Windows 3.1", "Windows 3.1"); + s_mapper.put("Windows PV", "Other PV"); + s_mapper.put("Other PV (32-bit)", "Other PV"); + s_mapper.put("Other PV (64-bit)", "Other PV"); } public static String getGuestOsName(String guestOsName) { diff --git a/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java b/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java index 99e38c57b08..41035571758 100644 --- a/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java +++ b/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java @@ -2287,7 +2287,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv s_logger.debug("starting " + vmName + ": " + vm.toString()); startDomain(conn, vmName, vm.toString()); - + Script.runSimpleBashScript("virsh schedinfo " + vmName + " --set cpu_shares=" + vmSpec.getCpus() * vmSpec.getSpeed()); NicTO[] nics = vmSpec.getNics(); for (NicTO nic : nics) { diff --git a/setup/db/templates.sql b/setup/db/templates.sql index 688b6f3b1c5..fa5c3564520 100755 --- a/setup/db/templates.sql +++ b/setup/db/templates.sql @@ -171,6 +171,7 @@ INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (139, 7, ' INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (140, 7, 'Other PV (64-bit)'); INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (141, 9, 'Sun Solaris 11 (64-bit)'); INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (142, 9, 'Sun Solaris 11 (32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (143, 6, 'Windows PV'); INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (200, 1, 'Other CentOS (32-bit)'); INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (201, 1, 'Other CentOS (64-bit)');