Merge branch 'master' into master-3.0

# Conflicts:
#	yarn.lock
This commit is contained in:
grossmj 2023-10-29 15:52:13 +10:00
commit d705d81cd0

View File

@ -63,6 +63,7 @@ export class QemuConfigurationService {
{ value: 'i82559er', name: 'Intel i82559ER Ethernet' },
{ value: 'i82562', name: 'Intel i82562 Ethernet' },
{ value: 'i82801', name: 'Intel i82801 Ethernet' },
{ value: 'igb', name: 'Intel 82576 Gigabit Ethernet' },
{ value: 'ne2k_pci', name: 'NE2000 Ethernet' },
{ value: 'pcnet', name: 'AMD PCNet Ethernet' },
{ value: 'rocker', name: 'Rocker L2 switch device' },