Meta: Remove microvm machine type from run.py

Running in the microvm doesn't work anymore, since we removed IDE
support. Currently, we only support PCI(e)-attached storage devices,
which are not compatible with the microvm, as it doesn't support PCI(e)
at all.
This commit is contained in:
Sönke Holz 2024-08-07 21:32:38 +02:00 committed by Nico Weber
parent 4c307e9073
commit de3e864a80

View file

@ -62,7 +62,6 @@ class MachineType(Enum):
QEMUGrub = "qgrub"
CI = "ci"
Limine = "limine"
MicroVM = "microvm"
def uses_grub(self) -> bool:
return self in [MachineType.QEMU35Grub, MachineType.QEMUGrub]
@ -617,11 +616,6 @@ def set_up_boot_drive(config: Configuration):
if provided_virtio_block_enable is not None:
config.virtio_block_enable = provided_virtio_block_enable == "1"
if config.machine_type in [MachineType.MicroVM]:
if config.nvme_enable:
print("Warning: NVMe does not work under MicroVM, automatically disabling it.")
config.nvme_enable = False
if config.architecture == Arch.Aarch64:
config.boot_drive = f"file={config.disk_image},if=sd,format=raw,id=disk"
elif config.nvme_enable:
@ -765,16 +759,6 @@ def set_up_machine_devices(config: Configuration):
)
config.character_devices.append("stdio,id=stdout,mux=on")
config.enable_usb = True
elif config.machine_type in [MachineType.MicroVM]:
config.character_devices.append("stdio,id=stdout,mux=on")
config.qemu_cpu = "qemu64"
config.qemu_machine = "microvm,pit=on,rtc=on,pic=on"
config.cpu_count = None
config.display_device = None
config.network_default_device = None
config.audio_devices = []
config.add_devices(["isa-debugcon,chardev=stdout", "isa-vga", "ne2k_isa,netdev=breh"])
config.add_devices(["isa-ide", "ide-hd,drive=disk", "i8042"])
elif config.machine_type == MachineType.CI:
config.display_backend = "none"