CLOUDSTACK-6790: Disable PXE ROM for system vm nics

Marcus Sorensen · Marcus Sorensen · commit 7ce303429921 · 2014-05-27T16:52:26.000-06:00
diff --git a/api/src/com/cloud/agent/api/to/NicTO.java b/api/src/com/cloud/agent/api/to/NicTO.java
@@ -23,6 +23,7 @@ public class NicTO extends NetworkTO {
     Integer networkRateMbps;
     Integer networkRateMulticastMbps;
     boolean defaultNic;
+    boolean pxeDisable;
     String uuid;
     List<String> nicSecIps;
 
@@ -58,6 +59,14 @@ public void setDefaultNic(boolean defaultNic) {
         this.defaultNic = defaultNic;
     }
 
+    public void setPxeDisable(boolean pxeDisable) {
+        this.pxeDisable = pxeDisable;
+    }
+
+    public boolean getPxeDisable() {
+        return pxeDisable;
+    }
+
     @Override
     public String getUuid() {
         return uuid;
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
@@ -904,6 +904,9 @@ protected NicTO toNicTO(NicVO nic, NicProfile profile, NetworkVO config) {
         } else {
             to.setGateway(config.getGateway());
         }
+        if (nic.getVmType() != VirtualMachine.Type.User) {
+            to.setPxeDisable(true);
+        }
         to.setDefaultNic(nic.isDefaultNic());
         to.setBroadcastUri(nic.getBroadcastUri());
         to.setIsolationuri(nic.getIsolationUri());
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
@@ -142,6 +142,9 @@ public LibvirtVMDef.InterfaceDef plug(NicTO nic, String guestOsType, String nicA
             String storageBrName = nic.getName() == null ? _bridges.get("private") : nic.getName();
             intf.defBridgeNet(storageBrName, null, nic.getMac(), getGuestNicModel(guestOsType, nicAdapter));
         }
+        if (nic.getPxeDisable() == true) {
+            intf.setPxeDisable(true);
+        }
         return intf;
     }
 
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -3793,6 +3793,14 @@ protected StartAnswer execute(StartCommand cmd) {
                 _vms.put(vmName, State.Starting);
             }
 
+            NicTO[] nics = vmSpec.getNics();
+
+            for (NicTO nic : nics) {
+                if (vmSpec.getType() != VirtualMachine.Type.User) {
+                    nic.setPxeDisable(true);
+                }
+            }
+
             vm = createVMFromSpec(vmSpec);
 
             conn = LibvirtConnection.getConnectionByType(vm.getHvsType());
@@ -3808,7 +3816,6 @@ protected StartAnswer execute(StartCommand cmd) {
             s_logger.debug("starting " + vmName + ": " + vm.toString());
             startVM(conn, vmName, vm.toString());
 
-            NicTO[] nics = vmSpec.getNics();
             for (NicTO nic : nics) {
                 if (nic.isSecurityGroupEnabled() || (nic.getIsolationUri() != null && nic.getIsolationUri().getScheme().equalsIgnoreCase(IsolationType.Ec2.toString()))) {
                     if (vmSpec.getType() != VirtualMachine.Type.User) {
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
@@ -765,6 +765,7 @@ enum hostNicType {
         private String _virtualPortType;
         private String _virtualPortInterfaceId;
         private int _vlanTag = -1;
+        private boolean _pxeDisable = false;
 
         public void defBridgeNet(String brName, String targetBrName, String macAddr, nicModel model) {
             defBridgeNet(brName, targetBrName, macAddr, model, 0);
@@ -832,6 +833,10 @@ public hostNicType getHostNetType() {
             return _hostNetType;
         }
 
+        public void setPxeDisable(boolean pxeDisable) {
+            _pxeDisable = pxeDisable;
+        }
+
         public String getBrName() {
             return _sourceName;
         }
@@ -909,6 +914,9 @@ public String toString() {
             if (_scriptPath != null) {
                 netBuilder.append("<script path='" + _scriptPath + "'/>\n");
             }
+            if (_pxeDisable) {
+                netBuilder.append("<rom bar='off' file='dummy'/>");
+            }
             if (_virtualPortType != null) {
                 netBuilder.append("<virtualport type='" + _virtualPortType + "'>\n");
                 if (_virtualPortInterfaceId != null) {
diff --git a/server/src/com/cloud/hypervisor/HypervisorGuruBase.java b/server/src/com/cloud/hypervisor/HypervisorGuruBase.java
@@ -97,6 +97,10 @@ public NicTO toNicTO(NicProfile profile) {
         // Workaround to make sure the TO has the UUID we need for Niciri integration
         NicVO nicVO = _nicDao.findById(profile.getId());
         to.setUuid(nicVO.getUuid());
+        // disable pxe on system vm nics to speed up boot time
+        if(nicVO != null && nicVO.getVmType() != VirtualMachine.Type.User){
+            to.setPxeDisable(true);
+        }
         //check whether the this nic has secondary ip addresses set
         //set nic secondary ip address in NicTO which are used for security group
         // configuration. Use full when vm stop/start

Original file line number	Diff line number	Diff line change
`@@ -142,6 +142,9 @@ public LibvirtVMDef.InterfaceDef plug(NicTO nic, String guestOsType, String nicA`
`142`	`142`	`String storageBrName = nic.getName() == null ? _bridges.get("private") : nic.getName();`
`143`	`143`	`intf.defBridgeNet(storageBrName, null, nic.getMac(), getGuestNicModel(guestOsType, nicAdapter));`
`144`	`144`	`}`
	`145`	`+ if (nic.getPxeDisable() == true) {`
	`146`	`+ intf.setPxeDisable(true);`
	`147`	`+ }`
`145`	`148`	`return intf;`
`146`	`149`	`}`
`147`	`150`