[Qemu-devel] [PATCH v6 00/10] hw/m68k: add Apple Machintosh Quadra 800 machine

Mark Cave-Ayland posted 10 patches 5 years, 5 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20181102152257.20637-1-mark.cave-ayland@ilande.co.uk
Test docker-clang@ubuntu passed
Test checkpatch failed
Test asan passed
Test docker-mingw@fedora passed
Test docker-quick@centos7 passed
There is a newer version of this series
MAINTAINERS                         |  16 +
arch_init.c                         |   4 +
default-configs/m68k-softmmu.mak    |  14 +
hw/Makefile.objs                    |   1 +
hw/block/Makefile.objs              |   1 +
hw/block/swim.c                     | 415 +++++++++++++++++
hw/char/escc.c                      |  30 +-
hw/display/Makefile.objs            |   1 +
hw/display/macfb.c                  | 475 ++++++++++++++++++++
hw/intc/Makefile.objs               |   1 +
hw/intc/q800_irq.c                  |  73 +++
hw/m68k/Makefile.objs               |   5 +-
hw/m68k/bootinfo.h                  | 100 +++++
hw/m68k/q800.c                      | 345 +++++++++++++++
hw/misc/Makefile.objs               |   1 +
hw/misc/mac_via.c                   | 856 ++++++++++++++++++++++++++++++++++++
hw/net/dp8393x.c                    |  88 ++--
hw/nubus/Makefile.objs              |   4 +
hw/nubus/mac-nubus-bridge.c         |  45 ++
hw/nubus/nubus-bridge.c             |  34 ++
hw/nubus/nubus-bus.c                | 111 +++++
hw/nubus/nubus-device.c             | 215 +++++++++
hw/scsi/esp.c                       | 291 ++++++++++--
include/hw/block/swim.h             |  76 ++++
include/hw/char/escc.h              |   1 +
include/hw/display/macfb.h          |  64 +++
include/hw/intc/q800_irq.h          |  39 ++
include/hw/misc/mac_via.h           | 114 +++++
include/hw/nubus/mac-nubus-bridge.h |  24 +
include/hw/nubus/nubus.h            |  69 +++
include/hw/scsi/esp.h               |   7 +
qemu-options.hx                     |   2 +-
vl.c                                |   3 +-
33 files changed, 3455 insertions(+), 70 deletions(-)
create mode 100644 hw/block/swim.c
create mode 100644 hw/display/macfb.c
create mode 100644 hw/intc/q800_irq.c
create mode 100644 hw/m68k/bootinfo.h
create mode 100644 hw/m68k/q800.c
create mode 100644 hw/misc/mac_via.c
create mode 100644 hw/nubus/Makefile.objs
create mode 100644 hw/nubus/mac-nubus-bridge.c
create mode 100644 hw/nubus/nubus-bridge.c
create mode 100644 hw/nubus/nubus-bus.c
create mode 100644 hw/nubus/nubus-device.c
create mode 100644 include/hw/block/swim.h
create mode 100644 include/hw/display/macfb.h
create mode 100644 include/hw/intc/q800_irq.h
create mode 100644 include/hw/misc/mac_via.h
create mode 100644 include/hw/nubus/mac-nubus-bridge.h
create mode 100644 include/hw/nubus/nubus.h
[Qemu-devel] [PATCH v6 00/10] hw/m68k: add Apple Machintosh Quadra 800 machine
Posted by Mark Cave-Ayland 5 years, 5 months ago
(MCA: here's the latest version of the q800 patchset. I've hope that I've
addressed most of the comments, plus this will now boot into the Debian
installer correctly when applied to git master.

Outstanding comments:

  1) Should the comment blocks copied from the Linux headers be removed
     from patch 1?

  2) Are there meaningful constants that can be defined for Q800 interrupt
     "controller" in patch 10?

Note that I've also pushed the branch to github:
  https://github.com/mcayland/qemu/tree/q800-dev-part1-mca)


I'm rebasing some of these patches for seven years now,
too many years...

if you want to test the machine, I'm sorry, it doesn't boot
a MacROM, but you can boot a linux kernel from the command line.

You can install your own disk using debian-installer, with:

    ...
    -M q800 \
    -serial none -serial mon:stdio \
    -m 1000M -drive file=m68k.qcow2,format=qcow2 \
    -net nic,model=dp83932,addr=09:00:07:12:34:57 \
    -append "console=ttyS0 vga=off" \
    -kernel vmlinux-4.15.0-2-m68k \
    -initrd initrd.gz \
    -drive file=debian-9.0-m68k-NETINST-1.iso \
    -drive file=m68k.qcow2,format=qcow2 \
    -nographic

If you use a graphic adapter instead of "-nographic", you can use "-g" to set the
size of the display (I use "-g 1600x800x24").

You can get the ISO from:

https://cdimage.debian.org/mirror/cdimage/ports/9.0/m68k/iso-cd/debian-9.0-m68k-NETINST-1.iso

and extract the kernel and initrd.gz:

guestfish --add debian-9.0-m68k-NETINST-1.iso --ro \
          --mount /dev/sda:/ <<_EOF_
copy-out /install/cdrom/initrd.gz .
copy-out /install/kernels/vmlinux-4.15.0-2-m68k .
_EOF_

The mirror to use is: http://ftp.ports.debian.org/debian-ports/
when it fails, continue without boot loader.

In the same way, you can extract the kernel and the initramfs from the qcow2
image to use it with "-kernel" and "-initrd":

guestfish --add m68k.qcow2 --mount /dev/sda2:/ <<_EOF_
copy-out /boot/vmlinux-4.15.0-2-m68k .
copy-out /boot/initrd.img-4.15.0-2-m68k .
_EOF_

and boot with:

   ...
   -append "root=/dev/sda2 rw console=ttyS0 console=tty \
   -kernel vmlinux-4.15.0-2-m68k \
   -initrd initrd.img-4.15.0-2-m68k


v6: Rebase onto git master (this now includes the m68k EXCP_ILLEGAL fix required
      for this patchset to boot)
    Add Hervé's R-B tags
    Drop ASC (Apple Sound Chip) device since the Linux driver is broken and
      it is not required for a successful boot
    Remove extra esp_raise_irq() from ESP pseudo-DMA patch (Hervé)
    Remove "return" from unimplemented write functions and instead add a
      "read only" comment (Hervé)
    Rename MAX_FD to SWIM_MAX_FD in SWIM floppy controller patch to prevent
      potential conflicts with other files (Hervé)

v5: Rebase onto git master
    Add Philippe's R-B to patch 10
    Include the command line to boot a Linux kernel under the q800 machine in the
    commit message for patch 11 (Philippe)
    Fix up comments in hw/misc/mac_via.c (Thomas)
    Add asserts to VIA ADB support to prevent potential buffer overflows (Thomas)
    Move macfb surface/resolution checks to realise and remove hw_error (Thomas)
    Move macfb draw_line functions inline and remove macfb-template.h (Mark)
    Use guest address rather than source pointer in draw_line functions - this brings
      macfb in line with the VGA device and can prevent a potential buffer overflow
    Use g_strdup_printf() for memory region names in NuBus devices instead of
      hardcoded length char arrays (Thomas)
    Move NuBus QOM types from patch 7 to patch 8 (spotted by Thomas)
    Move CONFIG_COLDFIRE sections together in hw/m68k/Makefile.objs (Thomas)
    Remove obsolete comment from q800.c in patch 11 (Thomas)

v4: Drop RFC from subject prefix as this is getting close to final
    Rebased onto master (fixing ESP, rom_ptr() conflicts)
    Reworked q800.c based upon Thomas' comments about cpu_init() and
      qemu_check_nic_model()
    Address Thomas' comments on using error_report() instead of hw_error()
    Change the NuBus memory regions from DEVICE_NATIVE_ENDIAN to
      DEVICE_BIG_ENDIAN
    Split macfb Nubus support into separate commit
    Change VMSTATE_BUFFER_UNSAFE() to VMSTATE_UINT8_ARRAY() in macfb.c as
      suggested by David
    Remove dummy Apple Sound Chip migration state as pointed out by David
    Keep VIA ADB state and buffers in the mac_via device rather than adding
      to existing ADBState (this matches the pattern used in the PPC CUDA/PMU
      VIAs)
    Remove blacklisting for q800 machine from "make check" as requested by
      Thomas with the following fixes:
        - Fix incorrect MemoryRegion owner in ASC device
        - Add qtest_enabled() check in q800_init() to allow testing when no
          kernel is specified
        - Move some Mac VIA initialisation from init to realize
    Remove legacy drive properties from SWIM floppy controller and instead
      expose separate floppy bus and drive devices as requested by Kevin
        
v3: fix subject prefix "C" -> "RFC"

v2: remove the dp8393x fixes, because one of the patch breaks something
    Update "dp8393x: manage big endian bus" with idea from Thomas
    Mark has reworked most of the patches:
    - use mos6522
    - some code move, renamings and cleanup


Laurent Vivier (9):
  hw/m68k: add via support
  hw/m68k: implement ADB bus support for via
  escc: introduce a selector for the register bit
  hw/m68k: add macfb video card
  esp: add pseudo-DMA as used by Macintosh
  hw/m68k: add Nubus support
  hw/m68k: add a dummy SWIM floppy controller
  dp8393x: manage big endian bus
  hw/m68k: define Macintosh Quadra 800

Mark Cave-Ayland (1):
  hw/m68k: add Nubus support for macfb video card

 MAINTAINERS                         |  16 +
 arch_init.c                         |   4 +
 default-configs/m68k-softmmu.mak    |  14 +
 hw/Makefile.objs                    |   1 +
 hw/block/Makefile.objs              |   1 +
 hw/block/swim.c                     | 415 +++++++++++++++++
 hw/char/escc.c                      |  30 +-
 hw/display/Makefile.objs            |   1 +
 hw/display/macfb.c                  | 475 ++++++++++++++++++++
 hw/intc/Makefile.objs               |   1 +
 hw/intc/q800_irq.c                  |  73 +++
 hw/m68k/Makefile.objs               |   5 +-
 hw/m68k/bootinfo.h                  | 100 +++++
 hw/m68k/q800.c                      | 345 +++++++++++++++
 hw/misc/Makefile.objs               |   1 +
 hw/misc/mac_via.c                   | 856 ++++++++++++++++++++++++++++++++++++
 hw/net/dp8393x.c                    |  88 ++--
 hw/nubus/Makefile.objs              |   4 +
 hw/nubus/mac-nubus-bridge.c         |  45 ++
 hw/nubus/nubus-bridge.c             |  34 ++
 hw/nubus/nubus-bus.c                | 111 +++++
 hw/nubus/nubus-device.c             | 215 +++++++++
 hw/scsi/esp.c                       | 291 ++++++++++--
 include/hw/block/swim.h             |  76 ++++
 include/hw/char/escc.h              |   1 +
 include/hw/display/macfb.h          |  64 +++
 include/hw/intc/q800_irq.h          |  39 ++
 include/hw/misc/mac_via.h           | 114 +++++
 include/hw/nubus/mac-nubus-bridge.h |  24 +
 include/hw/nubus/nubus.h            |  69 +++
 include/hw/scsi/esp.h               |   7 +
 qemu-options.hx                     |   2 +-
 vl.c                                |   3 +-
 33 files changed, 3455 insertions(+), 70 deletions(-)
 create mode 100644 hw/block/swim.c
 create mode 100644 hw/display/macfb.c
 create mode 100644 hw/intc/q800_irq.c
 create mode 100644 hw/m68k/bootinfo.h
 create mode 100644 hw/m68k/q800.c
 create mode 100644 hw/misc/mac_via.c
 create mode 100644 hw/nubus/Makefile.objs
 create mode 100644 hw/nubus/mac-nubus-bridge.c
 create mode 100644 hw/nubus/nubus-bridge.c
 create mode 100644 hw/nubus/nubus-bus.c
 create mode 100644 hw/nubus/nubus-device.c
 create mode 100644 include/hw/block/swim.h
 create mode 100644 include/hw/display/macfb.h
 create mode 100644 include/hw/intc/q800_irq.h
 create mode 100644 include/hw/misc/mac_via.h
 create mode 100644 include/hw/nubus/mac-nubus-bridge.h
 create mode 100644 include/hw/nubus/nubus.h

-- 
2.11.0


Re: [Qemu-devel] [PATCH v6 00/10] hw/m68k: add Apple Machintosh Quadra 800 machine
Posted by no-reply@patchew.org 5 years, 5 months ago
Hi,

This series seems to have some coding style problems. See output below for
more information:

Type: series
Message-id: 20181102152257.20637-1-mark.cave-ayland@ilande.co.uk
Subject: [Qemu-devel] [PATCH v6 00/10] hw/m68k: add Apple Machintosh Quadra 800 machine

=== TEST SCRIPT BEGIN ===
#!/bin/bash

BASE=base
n=1
total=$(git log --oneline $BASE.. | wc -l)
failed=0

git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram

commits="$(git log --format=%H --reverse $BASE..)"
for c in $commits; do
    echo "Checking PATCH $n/$total: $(git log -n 1 --format=%s $c)..."
    if ! git show $c --format=email | ./scripts/checkpatch.pl --mailback -; then
        failed=1
        echo
    fi
    n=$((n+1))
done

exit $failed
=== TEST SCRIPT END ===

Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
Switched to a new branch 'test'
9245542a6d hw/m68k: define Macintosh Quadra 800
4b2499b92a dp8393x: manage big endian bus
9a13b06b9f hw/m68k: add a dummy SWIM floppy controller
bdf5c3725c hw/m68k: add Nubus support for macfb video card
6feff81d33 hw/m68k: add Nubus support
b24a39f653 esp: add pseudo-DMA as used by Macintosh
970394cb59 hw/m68k: add macfb video card
30013c1b4b escc: introduce a selector for the register bit
3274bd6559 hw/m68k: implement ADB bus support for via
b78fd7f12a hw/m68k: add via support

=== OUTPUT BEGIN ===
Checking PATCH 1/10: hw/m68k: add via support...
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#26: 
new file mode 100644

ERROR: space prohibited after that '&&' (ctx:WxW)
#348: FILE: hw/misc/mac_via.c:318:
+        if (!(v1s->last_b & VIA1B_vRTCClk) && (s->b & VIA1B_vRTCClk)) {
                                            ^

total: 1 errors, 1 warnings, 778 lines checked

Your patch has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.

Checking PATCH 2/10: hw/m68k: implement ADB bus support for via...
Checking PATCH 3/10: escc: introduce a selector for the register bit...
Checking PATCH 4/10: hw/m68k: add macfb video card...
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#43: 
new file mode 100644

total: 0 errors, 1 warnings, 496 lines checked

Your patch has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
Checking PATCH 5/10: esp: add pseudo-DMA as used by Macintosh...
Checking PATCH 6/10: hw/m68k: add Nubus support...
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#24: 
new file mode 100644

total: 0 errors, 1 warnings, 509 lines checked

Your patch has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
Checking PATCH 7/10: hw/m68k: add Nubus support for macfb video card...
Checking PATCH 8/10: hw/m68k: add a dummy SWIM floppy controller...
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#28: 
new file mode 100644

total: 0 errors, 1 warnings, 498 lines checked

Your patch has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
Checking PATCH 9/10: dp8393x: manage big endian bus...
Checking PATCH 10/10: hw/m68k: define Macintosh Quadra 800...
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#90: 
new file mode 100644

total: 0 errors, 1 warnings, 605 lines checked

Your patch has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
=== OUTPUT END ===

Test command exited with code: 1


---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
Re: [Qemu-devel] [PATCH v6 00/10] hw/m68k: add Apple Machintosh Quadra 800 machine
Posted by Mark Cave-Ayland 5 years, 5 months ago
On 04/11/2018 06:53, no-reply@patchew.org wrote:

> Hi,
> 
> This series seems to have some coding style problems. See output below for
> more information:
> 
> Type: series
> Message-id: 20181102152257.20637-1-mark.cave-ayland@ilande.co.uk
> Subject: [Qemu-devel] [PATCH v6 00/10] hw/m68k: add Apple Machintosh Quadra 800 machine
> 
> === TEST SCRIPT BEGIN ===
> #!/bin/bash
> 
> BASE=base
> n=1
> total=$(git log --oneline $BASE.. | wc -l)
> failed=0
> 
> git config --local diff.renamelimit 0
> git config --local diff.renames True
> git config --local diff.algorithm histogram
> 
> commits="$(git log --format=%H --reverse $BASE..)"
> for c in $commits; do
>     echo "Checking PATCH $n/$total: $(git log -n 1 --format=%s $c)..."
>     if ! git show $c --format=email | ./scripts/checkpatch.pl --mailback -; then
>         failed=1
>         echo
>     fi
>     n=$((n+1))
> done
> 
> exit $failed
> === TEST SCRIPT END ===
> 
> Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
> Switched to a new branch 'test'
> 9245542a6d hw/m68k: define Macintosh Quadra 800
> 4b2499b92a dp8393x: manage big endian bus
> 9a13b06b9f hw/m68k: add a dummy SWIM floppy controller
> bdf5c3725c hw/m68k: add Nubus support for macfb video card
> 6feff81d33 hw/m68k: add Nubus support
> b24a39f653 esp: add pseudo-DMA as used by Macintosh
> 970394cb59 hw/m68k: add macfb video card
> 30013c1b4b escc: introduce a selector for the register bit
> 3274bd6559 hw/m68k: implement ADB bus support for via
> b78fd7f12a hw/m68k: add via support
> 
> === OUTPUT BEGIN ===
> Checking PATCH 1/10: hw/m68k: add via support...
> WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
> #26: 
> new file mode 100644
> 
> ERROR: space prohibited after that '&&' (ctx:WxW)
> #348: FILE: hw/misc/mac_via.c:318:
> +        if (!(v1s->last_b & VIA1B_vRTCClk) && (s->b & VIA1B_vRTCClk)) {
>                                             ^

False positive from checkpatch?

> total: 1 errors, 1 warnings, 778 lines checked
> 
> Your patch has style problems, please review.  If any of these errors
> are false positives report them to the maintainer, see
> CHECKPATCH in MAINTAINERS.
> 
> Checking PATCH 2/10: hw/m68k: implement ADB bus support for via...
> Checking PATCH 3/10: escc: introduce a selector for the register bit...
> Checking PATCH 4/10: hw/m68k: add macfb video card...
> WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
> #43: 
> new file mode 100644
> 
> total: 0 errors, 1 warnings, 496 lines checked
> 
> Your patch has style problems, please review.  If any of these errors
> are false positives report them to the maintainer, see
> CHECKPATCH in MAINTAINERS.
> Checking PATCH 5/10: esp: add pseudo-DMA as used by Macintosh...
> Checking PATCH 6/10: hw/m68k: add Nubus support...
> WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
> #24: 
> new file mode 100644
> 
> total: 0 errors, 1 warnings, 509 lines checked
> 
> Your patch has style problems, please review.  If any of these errors
> are false positives report them to the maintainer, see
> CHECKPATCH in MAINTAINERS.
> Checking PATCH 7/10: hw/m68k: add Nubus support for macfb video card...
> Checking PATCH 8/10: hw/m68k: add a dummy SWIM floppy controller...
> WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
> #28: 
> new file mode 100644
> 
> total: 0 errors, 1 warnings, 498 lines checked
> 
> Your patch has style problems, please review.  If any of these errors
> are false positives report them to the maintainer, see
> CHECKPATCH in MAINTAINERS.
> Checking PATCH 9/10: dp8393x: manage big endian bus...
> Checking PATCH 10/10: hw/m68k: define Macintosh Quadra 800...
> WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
> #90: 
> new file mode 100644
> 
> total: 0 errors, 1 warnings, 605 lines checked
> 
> Your patch has style problems, please review.  If any of these errors
> are false positives report them to the maintainer, see
> CHECKPATCH in MAINTAINERS.
> === OUTPUT END ===
> 
> Test command exited with code: 1


ATB,

Mark.

Re: [Qemu-devel] [PATCH v6 00/10] hw/m68k: add Apple Machintosh Quadra 800 machine
Posted by Thomas Huth 5 years, 5 months ago
On 2018-11-04 14:41, Mark Cave-Ayland wrote:
> On 04/11/2018 06:53, no-reply@patchew.org wrote:
> 
>> Hi,
>>
>> This series seems to have some coding style problems. See output below for
>> more information:
>>
>> Type: series
>> Message-id: 20181102152257.20637-1-mark.cave-ayland@ilande.co.uk
>> Subject: [Qemu-devel] [PATCH v6 00/10] hw/m68k: add Apple Machintosh Quadra 800 machine
>>
>> === TEST SCRIPT BEGIN ===
>> #!/bin/bash
>>
>> BASE=base
>> n=1
>> total=$(git log --oneline $BASE.. | wc -l)
>> failed=0
>>
>> git config --local diff.renamelimit 0
>> git config --local diff.renames True
>> git config --local diff.algorithm histogram
>>
>> commits="$(git log --format=%H --reverse $BASE..)"
>> for c in $commits; do
>>     echo "Checking PATCH $n/$total: $(git log -n 1 --format=%s $c)..."
>>     if ! git show $c --format=email | ./scripts/checkpatch.pl --mailback -; then
>>         failed=1
>>         echo
>>     fi
>>     n=$((n+1))
>> done
>>
>> exit $failed
>> === TEST SCRIPT END ===
>>
>> Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
>> Switched to a new branch 'test'
>> 9245542a6d hw/m68k: define Macintosh Quadra 800
>> 4b2499b92a dp8393x: manage big endian bus
>> 9a13b06b9f hw/m68k: add a dummy SWIM floppy controller
>> bdf5c3725c hw/m68k: add Nubus support for macfb video card
>> 6feff81d33 hw/m68k: add Nubus support
>> b24a39f653 esp: add pseudo-DMA as used by Macintosh
>> 970394cb59 hw/m68k: add macfb video card
>> 30013c1b4b escc: introduce a selector for the register bit
>> 3274bd6559 hw/m68k: implement ADB bus support for via
>> b78fd7f12a hw/m68k: add via support
>>
>> === OUTPUT BEGIN ===
>> Checking PATCH 1/10: hw/m68k: add via support...
>> WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
>> #26: 
>> new file mode 100644
>>
>> ERROR: space prohibited after that '&&' (ctx:WxW)
>> #348: FILE: hw/misc/mac_via.c:318:
>> +        if (!(v1s->last_b & VIA1B_vRTCClk) && (s->b & VIA1B_vRTCClk)) {
>>                                             ^
> 
> False positive from checkpatch?

Looks like a false positive, indeed.

 Thomas

Re: [Qemu-devel] [PATCH v6 00/10] hw/m68k: add Apple Machintosh Quadra 800 machine
Posted by Thomas Huth 5 years, 2 months ago
On 2018-11-02 16:22, Mark Cave-Ayland wrote:
> (MCA: here's the latest version of the q800 patchset. I've hope that I've
> addressed most of the comments, plus this will now boot into the Debian
> installer correctly when applied to git master.

Any update on this series? Why did it get stalled again?

 Thomas


Re: [Qemu-devel] [PATCH v6 00/10] hw/m68k: add Apple Machintosh Quadra 800 machine
Posted by Laurent Vivier 5 years, 2 months ago
On 24/01/2019 18:02, Thomas Huth wrote:
> On 2018-11-02 16:22, Mark Cave-Ayland wrote:
>> (MCA: here's the latest version of the q800 patchset. I've hope that I've
>> addressed most of the comments, plus this will now boot into the Debian
>> installer correctly when applied to git master.
> 
> Any update on this series? Why did it get stalled again?
> 

I was thinking about this today.

Mark, perhaps you can send a rebased version of the series?

I think we need reviews for "esp: add pseudo-DMA as used by Macintosh".

Thanks,
Laurent

Re: [Qemu-devel] [PATCH v6 00/10] hw/m68k: add Apple Machintosh Quadra 800 machine
Posted by Mark Cave-Ayland 5 years, 2 months ago
On 24/01/2019 17:15, Laurent Vivier wrote:

> On 24/01/2019 18:02, Thomas Huth wrote:
>> On 2018-11-02 16:22, Mark Cave-Ayland wrote:
>>> (MCA: here's the latest version of the q800 patchset. I've hope that I've
>>> addressed most of the comments, plus this will now boot into the Debian
>>> installer correctly when applied to git master.
>>
>> Any update on this series? Why did it get stalled again?
>>
> 
> I was thinking about this today.
> 
> Mark, perhaps you can send a rebased version of the series?
> 
> I think we need reviews for "esp: add pseudo-DMA as used by Macintosh".

I've just done a quick rebase and push of my latest branch to
https://github.com/mcayland/qemu/tree/q800-dev-part1-mca and from what I can tell it
still boots using the test command line in both graphic and -nographic mode.

Unfortuantely I have a lot less time this dev cycle than normal, so I'm going to hand
this back over to Laurent for now while I focus back on SPARC/PPC. From my notes the
outstanding things to look at are:


1) Do we mind some of the more verbose comments that were taken from the Linux
headers in some of the files? (I can also see that updates to the comment checking in
checkpatch.pl now cause the series to fail with style issues, so these will need to
be touched up regardless)

2) Do we need to add migration support for the ESP pseudo-DMA?

3) Is there a Linux test docker image available?


Other than these points I think the series is about good to go.


ATB,

Mark.

Re: [Qemu-devel] [PATCH v6 00/10] hw/m68k: add Apple Machintosh Quadra 800 machine
Posted by Thomas Huth 5 years, 2 months ago
On 2019-01-24 18:37, Mark Cave-Ayland wrote:
> On 24/01/2019 17:15, Laurent Vivier wrote:
> 
>> On 24/01/2019 18:02, Thomas Huth wrote:
>>> On 2018-11-02 16:22, Mark Cave-Ayland wrote:
>>>> (MCA: here's the latest version of the q800 patchset. I've hope that I've
>>>> addressed most of the comments, plus this will now boot into the Debian
>>>> installer correctly when applied to git master.
>>>
>>> Any update on this series? Why did it get stalled again?
>>>
>>
>> I was thinking about this today.
>>
>> Mark, perhaps you can send a rebased version of the series?
>>
>> I think we need reviews for "esp: add pseudo-DMA as used by Macintosh".

I just gave it a quick review (see my separate mail) ... some few nits,
but all in all, it looks quite good to me.

> 1) Do we mind some of the more verbose comments that were taken from the Linux
> headers in some of the files? (I can also see that updates to the comment checking in
> checkpatch.pl now cause the series to fail with style issues, so these will need to
> be touched up regardless)

I personally would clean them up, but that's just a matter of taste. I
think that's nothing that should hold up this series. It can also be
done with a patch on top afterwards.

> 2) Do we need to add migration support for the ESP pseudo-DMA?

That would be cleaner, of course. But since the q800 likely can't be
migrated anyway, it's not that important. So if it is too much of a
hassle to add it, maybe simply add a comment next to the vmstate section
saying "/* TODO: Add migration support for the pdma data */" ?

 Thomas

Re: [Qemu-devel] [PATCH v6 00/10] hw/m68k: add Apple Machintosh Quadra 800 machine
Posted by no-reply@patchew.org 5 years, 5 months ago
Hi,

This series seems to have some coding style problems. See output below for
more information:

Type: series
Message-id: 20181102152257.20637-1-mark.cave-ayland@ilande.co.uk
Subject: [Qemu-devel] [PATCH v6 00/10] hw/m68k: add Apple Machintosh Quadra 800 machine

=== TEST SCRIPT BEGIN ===
#!/bin/bash

BASE=base
n=1
total=$(git log --oneline $BASE.. | wc -l)
failed=0

git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram

commits="$(git log --format=%H --reverse $BASE..)"
for c in $commits; do
    echo "Checking PATCH $n/$total: $(git log -n 1 --format=%s $c)..."
    if ! git show $c --format=email | ./scripts/checkpatch.pl --mailback -; then
        failed=1
        echo
    fi
    n=$((n+1))
done

exit $failed
=== TEST SCRIPT END ===

Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
Switched to a new branch 'test'
f411b4e279 hw/m68k: define Macintosh Quadra 800
45ed15b61e dp8393x: manage big endian bus
720eeb4748 hw/m68k: add a dummy SWIM floppy controller
3e83c22b31 hw/m68k: add Nubus support for macfb video card
28c7e4c0ab hw/m68k: add Nubus support
83574a525d esp: add pseudo-DMA as used by Macintosh
b9ebf41148 hw/m68k: add macfb video card
c374c97795 escc: introduce a selector for the register bit
f169706c12 hw/m68k: implement ADB bus support for via
a09662d340 hw/m68k: add via support

=== OUTPUT BEGIN ===
Checking PATCH 1/10: hw/m68k: add via support...
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#26: 
new file mode 100644

ERROR: space prohibited after that '&&' (ctx:WxW)
#348: FILE: hw/misc/mac_via.c:318:
+        if (!(v1s->last_b & VIA1B_vRTCClk) && (s->b & VIA1B_vRTCClk)) {
                                            ^

total: 1 errors, 1 warnings, 778 lines checked

Your patch has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.

Checking PATCH 2/10: hw/m68k: implement ADB bus support for via...
Checking PATCH 3/10: escc: introduce a selector for the register bit...
Checking PATCH 4/10: hw/m68k: add macfb video card...
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#44: 
new file mode 100644

total: 0 errors, 1 warnings, 496 lines checked

Your patch has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
Checking PATCH 5/10: esp: add pseudo-DMA as used by Macintosh...
Checking PATCH 6/10: hw/m68k: add Nubus support...
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#25: 
new file mode 100644

total: 0 errors, 1 warnings, 509 lines checked

Your patch has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
Checking PATCH 7/10: hw/m68k: add Nubus support for macfb video card...
Checking PATCH 8/10: hw/m68k: add a dummy SWIM floppy controller...
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#28: 
new file mode 100644

total: 0 errors, 1 warnings, 498 lines checked

Your patch has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
Checking PATCH 9/10: dp8393x: manage big endian bus...
Checking PATCH 10/10: hw/m68k: define Macintosh Quadra 800...
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#90: 
new file mode 100644

total: 0 errors, 1 warnings, 605 lines checked

Your patch has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
=== OUTPUT END ===

Test command exited with code: 1


---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to patchew-devel@redhat.com