| Message ID | 1484779123-18968-31-git-send-email-atar4qemu@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 18 January 2017 at 22:38, Artyom Tarasenko <atar4qemu@gmail.com> wrote: > Remove the Niagara stub implementation from sun4u.c and add a machine, > compatible with Legion simulator from the OpenSPARC T1 project. > > The machine uses the firmware supplied with the OpenSPARC T1 project, > http://download.oracle.com/technetwork/systems/opensparc/OpenSPARCT1_Arch.1.5.tar.bz2 > in the directory S10image/, and is able to boot the supplied Solaris 10 image. > > Note that for compatibility with the naming conventions for SPARC machines > the new machine name is lowercase niagara. > > Signed-off-by: Artyom Tarasenko <atar4qemu@gmail.com> > Reviewed-by: Richard Henderson <rth@twiddle.net> I see that 'make check' now warns: GTESTER check-qtest-sparc64 Could not open option rom 'nvram1': No such file or directory Could not open option rom '1up-md.bin': No such file or directory Could not open option rom '1up-hv.bin': No such file or directory Could not open option rom 'reset.bin': No such file or directory Could not open option rom 'q.bin': No such file or directory Could not open option rom 'openboot.bin': No such file or directory (though the tests still pass). Could we either ship these images in pc-bios if they're necessary, or not complain that they don't exist if they're not necessary, please? thanks -- PMM
On Mon, Jan 23, 2017 at 1:40 PM, Peter Maydell <peter.maydell@linaro.org> wrote: > On 18 January 2017 at 22:38, Artyom Tarasenko <atar4qemu@gmail.com> wrote: >> Remove the Niagara stub implementation from sun4u.c and add a machine, >> compatible with Legion simulator from the OpenSPARC T1 project. >> >> The machine uses the firmware supplied with the OpenSPARC T1 project, >> http://download.oracle.com/technetwork/systems/opensparc/OpenSPARCT1_Arch.1.5.tar.bz2 >> in the directory S10image/, and is able to boot the supplied Solaris 10 image. >> >> Note that for compatibility with the naming conventions for SPARC machines >> the new machine name is lowercase niagara. >> >> Signed-off-by: Artyom Tarasenko <atar4qemu@gmail.com> >> Reviewed-by: Richard Henderson <rth@twiddle.net> > > I see that 'make check' now warns: > GTESTER check-qtest-sparc64 > Could not open option rom 'nvram1': No such file or directory > Could not open option rom '1up-md.bin': No such file or directory > Could not open option rom '1up-hv.bin': No such file or directory > Could not open option rom 'reset.bin': No such file or directory > Could not open option rom 'q.bin': No such file or directory > Could not open option rom 'openboot.bin': No such file or directory > > (though the tests still pass). > > Could we either ship these images in pc-bios if they're > necessary, or not complain that they don't exist if they're > not necessary, please? I wonder what would be the best option here. The images are necessary, so the last option - not complaining - can be misleading for a user. Concerning shipping them. Pros: - the images are obviously freely distributable (the link above). - the corresponding source code was open-sourced by Sun under various licenses (GPL for hypervisor, BSD for openboot). Cons: - there is no exact tag the the OpenSPARC source tree which would correspond to the binaries. - building them is tricky, because it requires Solaris 9 / SPARC. What do you think would be a better option?
On 23 January 2017 at 14:10, Artyom Tarasenko <atar4qemu@gmail.com> wrote: > On Mon, Jan 23, 2017 at 1:40 PM, Peter Maydell <peter.maydell@linaro.org> wrote: >> I see that 'make check' now warns: >> GTESTER check-qtest-sparc64 >> Could not open option rom 'nvram1': No such file or directory >> Could not open option rom '1up-md.bin': No such file or directory >> Could not open option rom '1up-hv.bin': No such file or directory >> Could not open option rom 'reset.bin': No such file or directory >> Could not open option rom 'q.bin': No such file or directory >> Could not open option rom 'openboot.bin': No such file or directory >> >> (though the tests still pass). >> >> Could we either ship these images in pc-bios if they're >> necessary, or not complain that they don't exist if they're >> not necessary, please? > > I wonder what would be the best option here. The images are > necessary, so the last option - not complaining - can be misleading > for a user. If they're actually necessary then perhaps we should refuse to start entirely? > Concerning shipping them. > Pros: > - the images are obviously freely distributable (the link above). > - the corresponding source code was open-sourced by Sun under various > licenses (GPL for hypervisor, BSD for openboot). > Cons: > - there is no exact tag the the OpenSPARC source tree which would > correspond to the binaries. > - building them is tricky, because it requires Solaris 9 / SPARC. > > What do you think would be a better option? One thing we could do is only warn if !qtest_enabled(). We do this for some other boards that otherwise fail entirely when their BIOS image is not present. This is sufficient for the qtest checks which don't actually try to run code on the guest, but merely interact with it via the qtest protocol. We do ship some other ROMs that are only buildable on the right host hardware, so it's not impossible, but I don't know the details of our rules about what we put in pc-bios/. thanks -- PMM
On Mon, Jan 23, 2017 at 3:24 PM, Peter Maydell <peter.maydell@linaro.org> wrote: > On 23 January 2017 at 14:10, Artyom Tarasenko <atar4qemu@gmail.com> wrote: >> On Mon, Jan 23, 2017 at 1:40 PM, Peter Maydell <peter.maydell@linaro.org> wrote: >>> I see that 'make check' now warns: >>> GTESTER check-qtest-sparc64 >>> Could not open option rom 'nvram1': No such file or directory >>> Could not open option rom '1up-md.bin': No such file or directory >>> Could not open option rom '1up-hv.bin': No such file or directory >>> Could not open option rom 'reset.bin': No such file or directory >>> Could not open option rom 'q.bin': No such file or directory >>> Could not open option rom 'openboot.bin': No such file or directory >>> >>> (though the tests still pass). >>> >>> Could we either ship these images in pc-bios if they're >>> necessary, or not complain that they don't exist if they're >>> not necessary, please? >> >> I wonder what would be the best option here. The images are >> necessary, so the last option - not complaining - can be misleading >> for a user. > > If they're actually necessary then perhaps we should refuse > to start entirely? Yes, I think it's a best option. Don't load any images with the -nodefaults option and fail on missing ones wintout -nodefaults. Is there a failing variant of rom_add_file_fixed (I guess it's not uncommon, but I don't find it in include/hw/loader.h) or do I just check the return status? >> Concerning shipping them. >> Pros: >> - the images are obviously freely distributable (the link above). >> - the corresponding source code was open-sourced by Sun under various >> licenses (GPL for hypervisor, BSD for openboot). >> Cons: >> - there is no exact tag the the OpenSPARC source tree which would >> correspond to the binaries. >> - building them is tricky, because it requires Solaris 9 / SPARC. >> >> What do you think would be a better option? > > One thing we could do is only warn if !qtest_enabled(). > We do this for some other boards that otherwise fail entirely > when their BIOS image is not present. This is sufficient for > the qtest checks which don't actually try to run code on the > guest, but merely interact with it via the qtest protocol. > > We do ship some other ROMs that are only buildable on the > right host hardware, so it's not impossible, but I don't know > the details of our rules about what we put in pc-bios/. Who may know them? I see no general maintainer for the pc-bios directory as such in our MAINTAINERS file.
On 23 January 2017 at 14:59, Artyom Tarasenko <atar4qemu@gmail.com> wrote: > On Mon, Jan 23, 2017 at 3:24 PM, Peter Maydell <peter.maydell@linaro.org> wrote: >> If they're actually necessary then perhaps we should refuse >> to start entirely? > > Yes, I think it's a best option. Don't load any images with the > -nodefaults option and fail on missing ones wintout -nodefaults. > > Is there a failing variant of rom_add_file_fixed (I guess it's not > uncommon, but I don't find it in include/hw/loader.h) or do I just > check the return status? I think you just have to check the return status. thanks -- PMM
Hi Artyom, On 01/23/2017 03:10 PM, Artyom Tarasenko wrote: > On Mon, Jan 23, 2017 at 1:40 PM, Peter Maydell <peter.maydell@linaro.org> wrote: >> On 18 January 2017 at 22:38, Artyom Tarasenko <atar4qemu@gmail.com> wrote: >>> Remove the Niagara stub implementation from sun4u.c and add a machine, >>> compatible with Legion simulator from the OpenSPARC T1 project. >>> >>> The machine uses the firmware supplied with the OpenSPARC T1 project, >>> http://download.oracle.com/technetwork/systems/opensparc/OpenSPARCT1_Arch.1.5.tar.bz2 >>> in the directory S10image/, and is able to boot the supplied Solaris 10 image. >>> >>> Note that for compatibility with the naming conventions for SPARC machines >>> the new machine name is lowercase niagara. >>> >>> Signed-off-by: Artyom Tarasenko <atar4qemu@gmail.com> >>> Reviewed-by: Richard Henderson <rth@twiddle.net> >> >> I see that 'make check' now warns: >> GTESTER check-qtest-sparc64 >> Could not open option rom 'nvram1': No such file or directory >> Could not open option rom '1up-md.bin': No such file or directory >> Could not open option rom '1up-hv.bin': No such file or directory >> Could not open option rom 'reset.bin': No such file or directory >> Could not open option rom 'q.bin': No such file or directory >> Could not open option rom 'openboot.bin': No such file or directory >> >> (though the tests still pass). >> >> Could we either ship these images in pc-bios if they're >> necessary, or not complain that they don't exist if they're >> not necessary, please? > > I wonder what would be the best option here. The images are > necessary, so the last option - not complaining - can be misleading > for a user. > > Concerning shipping them. > Pros: > - the images are obviously freely distributable (the link above). > - the corresponding source code was open-sourced by Sun under various > licenses (GPL for hypervisor, BSD for openboot). > Cons: > - there is no exact tag the the OpenSPARC source tree which would > correspond to the binaries. > - building them is tricky, because it requires Solaris 9 / SPARC. > > What do you think would be a better option? I'd strongly prefer the option to build QEMU's own binaries and distribute them in pc-bios/. Downloading this 190M tarball is a nuisance and depending on their continued existence on the Oracle server is a risk. Where does the dependency on Solaris 9 come from? You should be able to run unmodified Solaris 9 binaries on eg. Solaris 10... Best, Jakub
On 23 January 2017 at 14:24, Peter Maydell <peter.maydell@linaro.org> wrote: > On 23 January 2017 at 14:10, Artyom Tarasenko <atar4qemu@gmail.com> wrote: >> On Mon, Jan 23, 2017 at 1:40 PM, Peter Maydell <peter.maydell@linaro.org> wrote: >>> I see that 'make check' now warns: >>> GTESTER check-qtest-sparc64 >>> Could not open option rom 'nvram1': No such file or directory >>> Could not open option rom '1up-md.bin': No such file or directory >>> Could not open option rom '1up-hv.bin': No such file or directory >>> Could not open option rom 'reset.bin': No such file or directory >>> Could not open option rom 'q.bin': No such file or directory >>> Could not open option rom 'openboot.bin': No such file or directory >>> >>> (though the tests still pass). > One thing we could do is only warn if !qtest_enabled(). I notice that 'make check' still warns about these missing option rom files...could somebody write a patch to silence it, please? thanks -- PMM
On Fri, Feb 24, 2017 at 12:50 PM, Peter Maydell <peter.maydell@linaro.org> wrote: > On 23 January 2017 at 14:24, Peter Maydell <peter.maydell@linaro.org> wrote: >> On 23 January 2017 at 14:10, Artyom Tarasenko <atar4qemu@gmail.com> wrote: >>> On Mon, Jan 23, 2017 at 1:40 PM, Peter Maydell <peter.maydell@linaro.org> wrote: >>>> I see that 'make check' now warns: >>>> GTESTER check-qtest-sparc64 >>>> Could not open option rom 'nvram1': No such file or directory >>>> Could not open option rom '1up-md.bin': No such file or directory >>>> Could not open option rom '1up-hv.bin': No such file or directory >>>> Could not open option rom 'reset.bin': No such file or directory >>>> Could not open option rom 'q.bin': No such file or directory >>>> Could not open option rom 'openboot.bin': No such file or directory >>>> >>>> (though the tests still pass). > >> One thing we could do is only warn if !qtest_enabled(). > > I notice that 'make check' still warns about these missing option > rom files...could somebody write a patch to silence it, please? Actually I sent a patch one month ago: http://lists.gnu.org/archive/html/qemu-devel/2017-01/msg05272.html I think I've waited long enough for nacks. Will send a pull request with it.
diff --git a/MAINTAINERS b/MAINTAINERS index 54588e5..b5ebfab 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -725,6 +725,13 @@ S: Maintained F: hw/sparc64/sun4u.c F: pc-bios/openbios-sparc64 +Sun4v +M: Artyom Tarasenko <atar4qemu@gmail.com> +S: Maintained +F: hw/sparc64/sun4v.c +F: hw/timer/sun4v-rtc.c +F: include/hw/timer/sun4v-rtc.h + Leon3 M: Fabien Chouteau <chouteau@adacore.com> S: Maintained @@ -1098,12 +1105,6 @@ F: hw/nvram/chrp_nvram.c F: include/hw/nvram/chrp_nvram.h F: tests/prom-env-test.c -sun4v RTC -M: Artyom Tarasenko <atar4qemu@gmail.com> -S: Maintained -F: hw/timer/sun4v-rtc.c -F: include/hw/timer/sun4v-rtc.h - Subsystems ---------- Audio diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-softmmu.mak index c0cdd64..c581e61 100644 --- a/default-configs/sparc64-softmmu.mak +++ b/default-configs/sparc64-softmmu.mak @@ -13,3 +13,5 @@ CONFIG_IDE_CMD646=y CONFIG_PCI_APB=y CONFIG_MC146818RTC=y CONFIG_ISA_TESTDEV=y +CONFIG_EMPTY_SLOT=y +CONFIG_SUN4V_RTC=y diff --git a/hw/sparc64/Makefile.objs b/hw/sparc64/Makefile.objs index a96b1f8..cf9de21 100644 --- a/hw/sparc64/Makefile.objs +++ b/hw/sparc64/Makefile.objs @@ -1,2 +1,3 @@ obj-y += sparc64.o obj-y += sun4u.o +obj-y += niagara.o \ No newline at end of file diff --git a/hw/sparc64/niagara.c b/hw/sparc64/niagara.c new file mode 100644 index 0000000..b55d4bb --- /dev/null +++ b/hw/sparc64/niagara.c @@ -0,0 +1,177 @@ +/* + * QEMU Sun4v/Niagara System Emulator + * + * Copyright (c) 2016 Artyom Tarasenko + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "qemu-common.h" +#include "cpu.h" +#include "hw/hw.h" +#include "hw/boards.h" +#include "hw/char/serial.h" +#include "hw/empty_slot.h" +#include "hw/loader.h" +#include "hw/sparc/sparc64.h" +#include "hw/timer/sun4v-rtc.h" +#include "exec/address-spaces.h" +#include "sysemu/block-backend.h" + + +typedef struct NiagaraBoardState { + MemoryRegion hv_ram; + MemoryRegion partition_ram; + MemoryRegion nvram; + MemoryRegion md_rom; + MemoryRegion hv_rom; + MemoryRegion vdisk_ram; + MemoryRegion prom; +} NiagaraBoardState; + +#define NIAGARA_HV_RAM_BASE 0x100000ULL +#define NIAGARA_HV_RAM_SIZE 0x3f00000ULL /* 63 MiB */ + +#define NIAGARA_PARTITION_RAM_BASE 0x80000000ULL + +#define NIAGARA_UART_BASE 0x1f10000000ULL + +#define NIAGARA_NVRAM_BASE 0x1f11000000ULL +#define NIAGARA_NVRAM_SIZE 0x2000 + +#define NIAGARA_MD_ROM_BASE 0x1f12000000ULL +#define NIAGARA_MD_ROM_SIZE 0x2000 + +#define NIAGARA_HV_ROM_BASE 0x1f12080000ULL +#define NIAGARA_HV_ROM_SIZE 0x2000 + +#define NIAGARA_IOBBASE 0x9800000000ULL +#define NIAGARA_IOBSIZE 0x0100000000ULL + +#define NIAGARA_VDISK_BASE 0x1f40000000ULL +#define NIAGARA_RTC_BASE 0xfff0c1fff8ULL +#define NIAGARA_UART_BASE 0x1f10000000ULL + +/* Firmware layout + * + * |------------------| + * | openboot.bin | + * |------------------| PROM_ADDR + OBP_OFFSET + * | q.bin | + * |------------------| PROM_ADDR + Q_OFFSET + * | reset.bin | + * |------------------| PROM_ADDR + */ +#define NIAGARA_PROM_BASE 0xfff0000000ULL +#define NIAGARA_Q_OFFSET 0x10000ULL +#define NIAGARA_OBP_OFFSET 0x80000ULL +#define PROM_SIZE_MAX (4 * 1024 * 1024) + +/* Niagara hardware initialisation */ +static void niagara_init(MachineState *machine) +{ + NiagaraBoardState *s = g_new(NiagaraBoardState, 1); + DriveInfo *dinfo = drive_get_next(IF_PFLASH); + MemoryRegion *sysmem = get_system_memory(); + + /* init CPUs */ + sparc64_cpu_devinit(machine->cpu_model, "Sun UltraSparc T1", + NIAGARA_PROM_BASE); + /* set up devices */ + memory_region_allocate_system_memory(&s->hv_ram, NULL, "sun4v-hv.ram", + NIAGARA_HV_RAM_SIZE); + memory_region_add_subregion(sysmem, NIAGARA_HV_RAM_BASE, &s->hv_ram); + + memory_region_allocate_system_memory(&s->partition_ram, NULL, + "sun4v-partition.ram", + machine->ram_size); + memory_region_add_subregion(sysmem, NIAGARA_PARTITION_RAM_BASE, + &s->partition_ram); + + memory_region_allocate_system_memory(&s->nvram, NULL, + "sun4v.nvram", NIAGARA_NVRAM_SIZE); + memory_region_add_subregion(sysmem, NIAGARA_NVRAM_BASE, &s->nvram); + memory_region_allocate_system_memory(&s->md_rom, NULL, + "sun4v-md.rom", NIAGARA_MD_ROM_SIZE); + memory_region_add_subregion(sysmem, NIAGARA_MD_ROM_BASE, &s->md_rom); + memory_region_allocate_system_memory(&s->hv_rom, NULL, + "sun4v-hv.rom", NIAGARA_HV_ROM_SIZE); + memory_region_add_subregion(sysmem, NIAGARA_HV_ROM_BASE, &s->hv_rom); + memory_region_allocate_system_memory(&s->prom, NULL, + "sun4v.prom", PROM_SIZE_MAX); + memory_region_add_subregion(sysmem, NIAGARA_PROM_BASE, &s->prom); + + rom_add_file_fixed("nvram1", NIAGARA_NVRAM_BASE, -1); + rom_add_file_fixed("1up-md.bin", NIAGARA_MD_ROM_BASE, -1); + rom_add_file_fixed("1up-hv.bin", NIAGARA_HV_ROM_BASE, -1); + + rom_add_file_fixed("reset.bin", NIAGARA_PROM_BASE, -1); + rom_add_file_fixed("q.bin", NIAGARA_PROM_BASE + NIAGARA_Q_OFFSET, -1); + rom_add_file_fixed("openboot.bin", NIAGARA_PROM_BASE + NIAGARA_OBP_OFFSET, + -1); + + /* the virtual ramdisk is kind of initrd, but it resides + outside of the partition RAM */ + if (dinfo) { + BlockBackend *blk = blk_by_legacy_dinfo(dinfo); + int size = blk_getlength(blk); + if (size > 0) { + memory_region_allocate_system_memory(&s->vdisk_ram, NULL, + "sun4v_vdisk.ram", size); + memory_region_add_subregion(get_system_memory(), + NIAGARA_VDISK_BASE, &s->vdisk_ram); + dinfo->is_default = 1; + rom_add_file_fixed(blk_bs(blk)->filename, NIAGARA_VDISK_BASE, -1); + } else { + fprintf(stderr, "qemu: could not load ram disk '%s'\n", + blk_bs(blk)->filename); + exit(1); + } + } + serial_mm_init(sysmem, NIAGARA_UART_BASE, 0, NULL, 115200, + serial_hds[0], DEVICE_BIG_ENDIAN); + + empty_slot_init(NIAGARA_IOBBASE, NIAGARA_IOBSIZE); + sun4v_rtc_init(NIAGARA_RTC_BASE); +} + +static void niagara_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc = MACHINE_CLASS(oc); + + mc->desc = "Sun4v platform, Niagara"; + mc->init = niagara_init; + mc->max_cpus = 1; /* XXX for now */ + mc->default_boot_order = "c"; +} + +static const TypeInfo niagara_type = { + .name = MACHINE_TYPE_NAME("niagara"), + .parent = TYPE_MACHINE, + .class_init = niagara_class_init, +}; + +static void niagara_register_types(void) +{ + type_register_static(&niagara_type); +} + +type_init(niagara_register_types) diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index 232d4a6..d1a6bca 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -542,7 +542,6 @@ static void sun4uv_init(MemoryRegion *address_space_mem, enum { sun4u_id = 0, sun4v_id = 64, - niagara_id, }; static const struct hwdef hwdefs[] = { @@ -560,13 +559,6 @@ static const struct hwdef hwdefs[] = { .prom_addr = 0x1fff0000000ULL, .console_serial_base = 0, }, - /* Sun4v generic Niagara machine */ - { - .default_cpu_model = "Sun UltraSparc T1", - .machine_id = niagara_id, - .prom_addr = 0xfff0000000ULL, - .console_serial_base = 0xfff0c2c000ULL, - }, }; /* Sun4u hardware initialisation */ @@ -581,12 +573,6 @@ static void sun4v_init(MachineState *machine) sun4uv_init(get_system_memory(), machine, &hwdefs[1]); } -/* Niagara hardware initialisation */ -static void niagara_init(MachineState *machine) -{ - sun4uv_init(get_system_memory(), machine, &hwdefs[2]); -} - static void sun4u_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); @@ -620,22 +606,6 @@ static const TypeInfo sun4v_type = { .class_init = sun4v_class_init, }; -static void niagara_class_init(ObjectClass *oc, void *data) -{ - MachineClass *mc = MACHINE_CLASS(oc); - - mc->desc = "Sun4v platform, Niagara"; - mc->init = niagara_init; - mc->max_cpus = 1; /* XXX for now */ - mc->default_boot_order = "c"; -} - -static const TypeInfo niagara_type = { - .name = MACHINE_TYPE_NAME("Niagara"), - .parent = TYPE_MACHINE, - .class_init = niagara_class_init, -}; - static void sun4u_register_types(void) { type_register_static(&ebus_info); @@ -644,7 +614,6 @@ static void sun4u_register_types(void) type_register_static(&sun4u_type); type_register_static(&sun4v_type); - type_register_static(&niagara_type); } type_init(sun4u_register_types) diff --git a/qemu-doc.texi b/qemu-doc.texi index 02cb39d..0b2746f 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -2138,7 +2138,17 @@ Use the executable @file{qemu-system-sparc64} to simulate a Sun4u (UltraSPARC PC-like machine), Sun4v (T1 PC-like machine), or generic Niagara (T1) machine. The Sun4u emulator is mostly complete, being able to run Linux, NetBSD and OpenBSD in headless (-nographic) mode. The -Sun4v and Niagara emulators are still a work in progress. +Sun4v emulator is still a work in progress. + +The Niagara T1 emulator makes use of firmware and OS binaries supplied in the S10image/ directory +of the OpenSPARC T1 project @url{http://download.oracle.com/technetwork/systems/opensparc/OpenSPARCT1_Arch.1.5.tar.bz2} +and is able to boot the disk.s10hw2 Solaris image. +@example +qemu-system-sparc64 -M niagara -L /path-to/S10image/ \ + -nographic -m 256 \ + -drive if=pflash,readonly=on,file=/S10image/disk.s10hw2 +@end example + QEMU emulates the following peripherals: @@ -2173,7 +2183,7 @@ Set OpenBIOS variables in NVRAM, for example: qemu-system-sparc64 -prom-env 'auto-boot?=false' @end example -@item -M [sun4u|sun4v|Niagara] +@item -M [sun4u|sun4v|niagara] Set the emulated machine type. The default is sun4u.