Also update PowerMac family docs with some more recent info. Signed-off-by: BALATON Zoltan <bala...@eik.bme.hu> --- docs/about/deprecated.rst | 7 +++++++ docs/system/ppc/powermac.rst | 12 ++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 93affe3669..07661af7fe 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -248,6 +248,13 @@ These old machine types are quite neglected nowadays and thus might have various pitfalls with regards to live migration. Use a newer machine type instead. +``mac99`` variants other than the default qemu-system-ppc version (since 7.2) +''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +The ``mac99`` machine emulates different hardware depending on using +qemu-system-ppc64 or ``via`` property. To avoid confusion new machine +types has been added for these variants which are now preferred over +``mac99``. Backend options --------------- diff --git a/docs/system/ppc/powermac.rst b/docs/system/ppc/powermac.rst index 04334ba210..d4a47a6881 100644 --- a/docs/system/ppc/powermac.rst +++ b/docs/system/ppc/powermac.rst @@ -4,8 +4,12 @@ PowerMac family boards (``g3beige``, ``mac99``) Use the executable ``qemu-system-ppc`` to simulate a complete PowerMac PowerPC system. -- ``g3beige`` Heathrow based PowerMAC -- ``mac99`` Mac99 based PowerMAC +- ``g3beige`` Heathrow based old world Power Macintosh G3 +- ``mac99`` Core99 based generic PowerMac +- ``powermac3_1`` Power Mac G4 AGP (Sawtooth) +- ``powerbook3_2`` PowerBook G4 Titanium (Mercury) +- ``powermac7_3`` Power Mac G5 (Niagara) (only in ``qemu-system-ppc64``) + Supported devices ----------------- @@ -15,9 +19,9 @@ QEMU emulates the following PowerMac peripherals: * UniNorth or Grackle PCI Bridge * PCI VGA compatible card with VESA Bochs Extensions * 2 PMAC IDE interfaces with hard disk and CD-ROM support - * NE2000 PCI adapters + * Sungem PCI network adapter * Non Volatile RAM - * VIA-CUDA with ADB keyboard and mouse. + * VIA-CUDA or VIA-PMU99 with or without ADB or USB keyboard and mouse. Missing devices -- 2.30.6