dan/Cosmos
1
0
Fork 0
mirror of https://github.com/danbulant/Cosmos synced 2026-05-27 05:52:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Qemu

Browse source
This commit is contained in:
Charles Betros 2020-10-19 13:41:49 -05:00
parent f3dbded749
commit a28e982d9f
7 changed files with 182 additions and 150 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Tests/Cosmos.TestRunner.Core/Engine.Run.cs
View file

@ -54,15 +54,15 @@ namespace Cosmos.TestRunner.Core
case RunTargetEnum.Bochs: case RunTargetEnum.Bochs:
RunTask("RunISO", () => RunIsoInBochs(xIsoFile, xHarddiskPath, workingDirectory)); RunTask("RunISO", () => RunIsoInBochs(xIsoFile, xHarddiskPath, workingDirectory));
break; break;
case RunTargetEnum.Qemu:
RunTask("RunISO", () => RunIsoInQemu(xIsoFile, xHarddiskPath, workingDirectory));
break;
case RunTargetEnum.VMware: case RunTargetEnum.VMware:
RunTask("RunISO", () => RunIsoInVMware(xIsoFile, xHarddiskPath)); RunTask("RunISO", () => RunIsoInVMware(xIsoFile, xHarddiskPath));
break; break;
case RunTargetEnum.HyperV: case RunTargetEnum.HyperV:
RunTask("RunISO", () => RunIsoInHyperV(xIsoFile, xHarddiskPath)); RunTask("RunISO", () => RunIsoInHyperV(xIsoFile, xHarddiskPath));
break; break;
case RunTargetEnum.Qemu:
RunTask("RunISO", () => RunIsoInQemu(xIsoFile, xHarddiskPath, workingDirectory));
break;
default: default:
throw new ArgumentOutOfRangeException("RunTarget " + configuration.RunTarget + " not implemented!"); throw new ArgumentOutOfRangeException("RunTarget " + configuration.RunTarget + " not implemented!");
} }

4
source/Cosmos.Debug.Hosts/Qemu.cs
View file

@ -35,9 +35,9 @@ namespace Cosmos.Debug.Hosts
_harddiskFile = aHarddisk; _harddiskFile = aHarddisk;
} }
if (aParams.ContainsKey(BuildPropertyNames.IsoFileString)) if (aParams.ContainsKey("ISOFile"))
{ {
_isoFile = aParams[BuildPropertyNames.IsoFileString]; _isoFile = aParams["IOSFile"];
} }
_debugPortString = "Cosmos\\Serial"; _debugPortString = "Cosmos\\Serial";

12
source/Cosmos.VS.DebugEngine/AD7.Impl/AD7Process.cs
View file

@ -557,12 +557,6 @@ namespace Cosmos.VS.DebugEngine.AD7.Impl
//((Host.Bochs)mHost).FixBochsConfiguration(new KeyValuePair<string, string>[] { new KeyValuePair<string, string>("IsoFileName", mISO) }); //((Host.Bochs)mHost).FixBochsConfiguration(new KeyValuePair<string, string>[] { new KeyValuePair<string, string>("IsoFileName", mISO) });
break; break;
case LaunchType.IntelEdison:
mHost = new IntelEdison(mDebugInfo, false);
break;
case LaunchType.HyperV:
mHost = new HyperV(mDebugInfo, false);
break;
case LaunchType.Qemu: case LaunchType.Qemu:
if (!QemuSupport.QemuEnabled) if (!QemuSupport.QemuEnabled)
{ {
@ -570,6 +564,12 @@ namespace Cosmos.VS.DebugEngine.AD7.Impl
} }
mHost = new Qemu(mDebugInfo, xUseGDB); mHost = new Qemu(mDebugInfo, xUseGDB);
break; break;
case LaunchType.IntelEdison:
mHost = new IntelEdison(mDebugInfo, false);
break;
case LaunchType.HyperV:
mHost = new HyperV(mDebugInfo, false);
break;
default: default:
throw new Exception("Invalid Launch value: '" + mLaunch + "'."); throw new Exception("Invalid Launch value: '" + mLaunch + "'.");
} }

1
source/Cosmos.VS.ProjectSystem/BuildSystem/Rules/LaunchConfiguration.xaml
View file

@ -28,6 +28,7 @@
<EnumValue Name="VMware" DisplayName="VMware" /> <EnumValue Name="VMware" DisplayName="VMware" />
<EnumValue Name="Slave" DisplayName="Attached Slave (CanaKit)" /> <EnumValue Name="Slave" DisplayName="Attached Slave (CanaKit)" />
<EnumValue Name="Bochs" DisplayName="Bochs" /> <EnumValue Name="Bochs" DisplayName="Bochs" />
<EnumValue Name="Qemu" DisplayName="Qemu" />
<EnumValue Name="IntelEdison" DisplayName="Intel Edison" /> <EnumValue Name="IntelEdison" DisplayName="Intel Edison" />
<EnumValue Name="HyperV" DisplayName="Hyper-V" /> <EnumValue Name="HyperV" DisplayName="Hyper-V" />
</EnumProperty> </EnumProperty>

15
source/Cosmos.VS.ProjectSystem/ProjectSystem/VS/PropertyPages/OldCosmosPropertyPageControl.Designer.cs generated
View file

@ -82,6 +82,7 @@
this.tabBochs = new System.Windows.Forms.TabPage(); this.tabBochs = new System.Windows.Forms.TabPage();
this.checkStartBochsDebugGui = new System.Windows.Forms.CheckBox(); this.checkStartBochsDebugGui = new System.Windows.Forms.CheckBox();
this.checkEnableBochsDebug = new System.Windows.Forms.CheckBox(); this.checkEnableBochsDebug = new System.Windows.Forms.CheckBox();
this.tabQemu = new System.Windows.Forms.TabPage();
this.tabPXE = new System.Windows.Forms.TabPage(); this.tabPXE = new System.Windows.Forms.TabPage();
this.butnPxeRefresh = new System.Windows.Forms.Button(); this.butnPxeRefresh = new System.Windows.Forms.Button();
this.comboPxeInterface = new System.Windows.Forms.ComboBox(); this.comboPxeInterface = new System.Windows.Forms.ComboBox();
@ -111,6 +112,7 @@
this.tabLaunch.SuspendLayout(); this.tabLaunch.SuspendLayout();
this.tabVMware.SuspendLayout(); this.tabVMware.SuspendLayout();
this.tabBochs.SuspendLayout(); this.tabBochs.SuspendLayout();
this.tabQemu.SuspendLayout();
this.tabPXE.SuspendLayout(); this.tabPXE.SuspendLayout();
this.tabUSB.SuspendLayout(); this.tabUSB.SuspendLayout();
this.tabISO.SuspendLayout(); this.tabISO.SuspendLayout();
@ -156,6 +158,7 @@
this.TabControl1.Controls.Add(this.tabVMware); this.TabControl1.Controls.Add(this.tabVMware);
this.TabControl1.Controls.Add(this.tabHyperV); this.TabControl1.Controls.Add(this.tabHyperV);
this.TabControl1.Controls.Add(this.tabBochs); this.TabControl1.Controls.Add(this.tabBochs);
this.TabControl1.Controls.Add(this.tabQemu);
this.TabControl1.Controls.Add(this.tabPXE); this.TabControl1.Controls.Add(this.tabPXE);
this.TabControl1.Controls.Add(this.tabUSB); this.TabControl1.Controls.Add(this.tabUSB);
this.TabControl1.Controls.Add(this.tabISO); this.TabControl1.Controls.Add(this.tabISO);
@ -704,6 +707,16 @@
this.checkEnableBochsDebug.Text = "Enable Bochs Debugger"; this.checkEnableBochsDebug.Text = "Enable Bochs Debugger";
this.checkEnableBochsDebug.UseVisualStyleBackColor = true; this.checkEnableBochsDebug.UseVisualStyleBackColor = true;
// //
// tabQemu
//
this.tabQemu.Location = new System.Drawing.Point(4, 22);
this.tabQemu.Name = "tabQemu";
this.tabQemu.Padding = new System.Windows.Forms.Padding(3);
this.tabQemu.Size = new System.Drawing.Size(627, 486);
this.tabQemu.TabIndex = 5;
this.tabQemu.Text = "Qemu";
this.tabQemu.UseVisualStyleBackColor = true;
//
// tabPXE // tabPXE
// //
this.tabPXE.Controls.Add(this.butnPxeRefresh); this.tabPXE.Controls.Add(this.butnPxeRefresh);
@ -865,6 +878,7 @@
this.tabVMware.ResumeLayout(false); this.tabVMware.ResumeLayout(false);
this.tabVMware.PerformLayout(); this.tabVMware.PerformLayout();
this.tabBochs.ResumeLayout(false); this.tabBochs.ResumeLayout(false);
this.tabQemu.ResumeLayout(false);
this.tabPXE.ResumeLayout(false); this.tabPXE.ResumeLayout(false);
this.tabPXE.PerformLayout(); this.tabPXE.PerformLayout();
this.tabUSB.ResumeLayout(false); this.tabUSB.ResumeLayout(false);
@ -909,6 +923,7 @@
private System.Windows.Forms.CheckBox checkIgnoreDebugStubAttribute; private System.Windows.Forms.CheckBox checkIgnoreDebugStubAttribute;
private System.Windows.Forms.TabPage tabBochs; private System.Windows.Forms.TabPage tabBochs;
private System.Windows.Forms.CheckBox checkEnableBochsDebug; private System.Windows.Forms.CheckBox checkEnableBochsDebug;
private System.Windows.Forms.TabPage tabQemu;
private System.Windows.Forms.TabPage tabVMware; private System.Windows.Forms.TabPage tabVMware;
private System.Windows.Forms.CheckBox checkEnableGDB; private System.Windows.Forms.CheckBox checkEnableGDB;
private System.Windows.Forms.CheckBox checkStartCosmosGDB; private System.Windows.Forms.CheckBox checkStartCosmosGDB;

22
source/Cosmos.VS.ProjectSystem/ProjectSystem/VS/PropertyPages/OldCosmosPropertyPageControl.cs
View file

@ -36,6 +36,7 @@ namespace Cosmos.VS.ProjectSystem.VS.PropertyPages
protected int mHyperVDebugPipe; protected int mHyperVDebugPipe;
protected bool mShowTabBochs; protected bool mShowTabBochs;
protected bool mShowTabQemu;
protected bool mShowTabDebug; protected bool mShowTabDebug;
protected bool mShowTabDeployment; protected bool mShowTabDeployment;
protected bool mShowTabLaunch; protected bool mShowTabLaunch;
@ -98,8 +99,8 @@ namespace Cosmos.VS.ProjectSystem.VS.PropertyPages
if (xValue != mViewModel.BuildProperties.Launch) if (xValue != mViewModel.BuildProperties.Launch)
{ {
mViewModel.BuildProperties.Launch = xValue; mViewModel.BuildProperties.Launch = xValue;
// Bochs requires an ISO. Force Deployment property. // Bochs and Qemu requires an ISO. Force Deployment property.
if (LaunchType.Bochs == xValue) if (xValue == LaunchType.Bochs)
{ {
if (DeploymentType.ISO != mViewModel.BuildProperties.Deployment) if (DeploymentType.ISO != mViewModel.BuildProperties.Deployment)
{ {
@ -329,6 +330,7 @@ namespace Cosmos.VS.ProjectSystem.VS.PropertyPages
RemoveTab(tabISO); RemoveTab(tabISO);
RemoveTab(tabSlave); RemoveTab(tabSlave);
RemoveTab(tabBochs); RemoveTab(tabBochs);
RemoveTab(tabQemu);
if (mShowTabDebug) if (mShowTabDebug)
{ {
@ -372,6 +374,10 @@ namespace Cosmos.VS.ProjectSystem.VS.PropertyPages
{ {
TabControl1.TabPages.Add(tabBochs); TabControl1.TabPages.Add(tabBochs);
} }
if (mShowTabQemu)
{
TabControl1.TabPages.Add(tabQemu);
}
if (TabControl1.TabPages.Contains(xTab)) if (TabControl1.TabPages.Contains(xTab))
{ {
@ -435,6 +441,15 @@ namespace Cosmos.VS.ProjectSystem.VS.PropertyPages
cmboVisualStudioDebugPort.Enabled = false; cmboVisualStudioDebugPort.Enabled = false;
cmboVisualStudioDebugPort.SelectedIndex = mVMwareAndBochsDebugPipe; cmboVisualStudioDebugPort.SelectedIndex = mVMwareAndBochsDebugPipe;
} }
else if (mViewModel.BuildProperties.Profile == "Qemu")
{
mShowTabQemu = true;
chckEnableDebugStub.Checked = true;
chkEnableStackCorruptionDetection.Checked = true;
cmboCosmosDebugPort.Enabled = false;
cmboVisualStudioDebugPort.Enabled = false;
cmboVisualStudioDebugPort.SelectedIndex = mVMwareAndBochsDebugPipe;
}
else if (mViewModel.BuildProperties.Profile == "IntelEdison") else if (mViewModel.BuildProperties.Profile == "IntelEdison")
{ {
mShowTabBochs = false; mShowTabBochs = false;
@ -513,7 +528,8 @@ namespace Cosmos.VS.ProjectSystem.VS.PropertyPages
mShowTabVMware = mViewModel.BuildProperties.Launch == LaunchType.VMware; mShowTabVMware = mViewModel.BuildProperties.Launch == LaunchType.VMware;
mShowTabHyperV = mViewModel.BuildProperties.Launch == LaunchType.HyperV; mShowTabHyperV = mViewModel.BuildProperties.Launch == LaunchType.HyperV;
mShowTabSlave = mViewModel.BuildProperties.Launch == LaunchType.Slave; mShowTabSlave = mViewModel.BuildProperties.Launch == LaunchType.Slave;
mShowTabBochs = (LaunchType.Bochs == mViewModel.BuildProperties.Launch); mShowTabBochs = mViewModel.BuildProperties.Launch == LaunchType.Bochs;
mShowTabQemu = mViewModel.BuildProperties.Launch == LaunchType.Qemu;
// //
UpdateTabs(); UpdateTabs();
} }

4
source/Cosmos.VS.ProjectSystem/ProjectSystem/VS/PropertyPages/ProfilePresets.cs
View file

@ -15,12 +15,12 @@ namespace Cosmos.VS.ProjectSystem.VS.PropertyPages
{ {
Add("Bochs", "Bochs"); Add("Bochs", "Bochs");
} }
Add("IntelEdison", "Intel Edison Serial boot");
Add("HyperV", "Hyper-V");
if (QemuSupport.QemuEnabled) if (QemuSupport.QemuEnabled)
{ {
Add("Qemu", "Qemu"); Add("Qemu", "Qemu");
} }
Add("IntelEdison", "Intel Edison Serial boot");
Add("HyperV", "Hyper-V");
} }
} }
} }