Le 24/01/2021 à 01:18, Philippe Mathieu-Daudé a écrit : > On 12/20/20 12:26 PM, Laurent Vivier wrote: >> The machine is based on Goldfish interfaces defined by Google >> for Android simulator. It uses Goldfish-rtc (timer and RTC), >> Goldfish-pic (PIC) and Goldfish-tty (for serial port and early tty). >> >> The machine is created with 128 virtio-mmio bus, and they can >> be used to use serial console, GPU, disk, NIC, HID, ... >> >> Signed-off-by: Laurent Vivier <laur...@vivier.eu> >> --- >> default-configs/devices/m68k-softmmu.mak | 1 + >> .../standard-headers/asm-m68k/bootinfo-virt.h | 18 + >> hw/m68k/virt.c | 312 ++++++++++++++++++ >> MAINTAINERS | 9 + >> hw/m68k/Kconfig | 10 + >> hw/m68k/meson.build | 1 + >> 6 files changed, 351 insertions(+) >> create mode 100644 include/standard-headers/asm-m68k/bootinfo-virt.h >> create mode 100644 hw/m68k/virt.c > ... > >> diff --git a/include/standard-headers/asm-m68k/bootinfo-virt.h >> b/include/standard-headers/asm-m68k/bootinfo-virt.h >> new file mode 100644 >> index 000000000000..81be1e092497 >> --- /dev/null >> +++ b/include/standard-headers/asm-m68k/bootinfo-virt.h >> @@ -0,0 +1,18 @@ >> +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ >> +/* >> +** asm/bootinfo-virt.h -- Virtual-m68k-specific boot information definitions >> +*/ >> + >> +#ifndef _UAPI_ASM_M68K_BOOTINFO_VIRT_H >> +#define _UAPI_ASM_M68K_BOOTINFO_VIRT_H >> + >> +#define BI_VIRT_QEMU_VERSION 0x8000 >> +#define BI_VIRT_GF_PIC_BASE 0x8001 >> +#define BI_VIRT_GF_RTC_BASE 0x8002 >> +#define BI_VIRT_GF_TTY_BASE 0x8003 >> +#define BI_VIRT_VIRTIO_BASE 0x8004 >> +#define BI_VIRT_CTRL_BASE 0x8005 >> + >> +#define VIRT_BOOTI_VERSION MK_BI_VERSION(2, 0) >> + >> +#endif /* _UAPI_ASM_M68K_BOOTINFO_MAC_H */ > > Doesn't this belong to patch #1? >
No, because in PATCH #1 the m68k-virt machine doesn't exist. PATCH #1 can be merged outside of this series, it's a generic patch. Thanks, Laurent
