pyrox.dev
Merge pull request #160542 from danielfullmer/aarch64-boot-test
nixos/test-driver: fix regression when using legacy start command
authored by Jacek Galowicz and committed by GitHub a8b2c90f f5ecba3e
+8
-1
nixos/lib/test-driver/test_driver/machine.py
+8
-1
nixos/lib/test-driver/test_driver/machine.py
···
241
cdrom: Optional[str] = None,
242
usb: Optional[str] = None,
243
bios: Optional[str] = None,
244
qemuFlags: Optional[str] = None,
245
):
246
-
self._cmd = "qemu-kvm -m 384"
247
248
# networking
249
net_backend = "-netdev user,id=net0"
···
381
cdrom=args.get("cdrom"),
382
usb=args.get("usb"),
383
bios=args.get("bios"),
384
qemuFlags=args.get("qemuFlags"),
385
)
386
···
241
cdrom: Optional[str] = None,
242
usb: Optional[str] = None,
243
bios: Optional[str] = None,
244
+
qemuBinary: Optional[str] = None,
245
qemuFlags: Optional[str] = None,
246
):
247
+
if qemuBinary is not None:
248
+
self._cmd = qemuBinary
249
+
else:
250
+
self._cmd = "qemu-kvm"
251
+
252
+
self._cmd += " -m 384"
253
254
# networking
255
net_backend = "-netdev user,id=net0"
···
387
cdrom=args.get("cdrom"),
388
usb=args.get("usb"),
389
bios=args.get("bios"),
390
+
qemuBinary=args.get("qemuBinary"),
391
qemuFlags=args.get("qemuFlags"),
392
)
393