From b285bbb683775f82c75756ea80dfc82fcb4f6092 Mon Sep 17 00:00:00 2001 From: Kelven Yang Date: Wed, 8 Dec 2010 17:06:28 -0800 Subject: [PATCH] new networking change integration --- api/src/com/cloud/template/VirtualMachineTemplate.java | 2 ++ server/src/com/cloud/hypervisor/HypervisorGuruBase.java | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/api/src/com/cloud/template/VirtualMachineTemplate.java b/api/src/com/cloud/template/VirtualMachineTemplate.java index d94a4a21cea..6228f95ac3e 100755 --- a/api/src/com/cloud/template/VirtualMachineTemplate.java +++ b/api/src/com/cloud/template/VirtualMachineTemplate.java @@ -75,4 +75,6 @@ public interface VirtualMachineTemplate extends ControlledEntity { TemplateType getTemplateType(); HypervisorType getHypervisorType(); + + int getBits(); } diff --git a/server/src/com/cloud/hypervisor/HypervisorGuruBase.java b/server/src/com/cloud/hypervisor/HypervisorGuruBase.java index 1498cb17996..d033e2e60a2 100644 --- a/server/src/com/cloud/hypervisor/HypervisorGuruBase.java +++ b/server/src/com/cloud/hypervisor/HypervisorGuruBase.java @@ -70,6 +70,11 @@ public abstract class HypervisorGuruBase extends AdapterBase implements Hypervis to.setNics(nics); to.setDisks(vmProfile.getDisks().toArray(new VolumeTO[vmProfile.getDisks().size()])); + if(vmProfile.getTemplate().getBits() == 32) + to.setArch("i686"); + else + to.setArch("x86_64"); + return to; }