diff options
| author | Peter Maydell | 2014-03-04 14:09:06 +0100 |
|---|---|---|
| committer | Peter Maydell | 2014-03-04 14:09:06 +0100 |
| commit | d47e95c0c86ea5d8d050bf201ee27bcec617c10e (patch) | |
| tree | e6d50e9845e1778153c176903e7aadaa7399f9c8 /include | |
| parent | Makefile: Add missing dependency for system emulation (fix build) (diff) | |
| parent | sun4m: Add Sun CG3 framebuffer initialisation function (diff) | |
| download | qemu-d47e95c0c86ea5d8d050bf201ee27bcec617c10e.tar.gz qemu-d47e95c0c86ea5d8d050bf201ee27bcec617c10e.tar.xz qemu-d47e95c0c86ea5d8d050bf201ee27bcec617c10e.zip | |
Merge remote-tracking branch 'remotes/mcayland/qemu-sparc' into staging
* remotes/mcayland/qemu-sparc:
sun4m: Add Sun CG3 framebuffer initialisation function
sun4m: Add Sun CG3 framebuffer and corresponding OpenBIOS FCode ROM
sun4m: fix slavio timer RUN/STOP bit
sun4m: Set HostID in NVRAM
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/nvram/openbios_firmware_abi.h | 2 | ||||
| -rw-r--r-- | include/sysemu/sysemu.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/hw/nvram/openbios_firmware_abi.h b/include/hw/nvram/openbios_firmware_abi.h index 5e6e5d4d34..c66ee22685 100644 --- a/include/hw/nvram/openbios_firmware_abi.h +++ b/include/hw/nvram/openbios_firmware_abi.h @@ -62,6 +62,8 @@ Sun_init_header(struct Sun_nvram *header, const uint8_t *macaddr, int machine_id header->type = 1; header->machine_id = machine_id & 0xff; memcpy(&header->macaddr, macaddr, 6); + memcpy(&header->hostid , &macaddr[3], 3); + /* Calculate checksum */ tmp = 0; tmpptr = (uint8_t *)header; diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 495dae8c39..b90df9ada1 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -104,6 +104,7 @@ extern int autostart; typedef enum { VGA_NONE, VGA_STD, VGA_CIRRUS, VGA_VMWARE, VGA_XENFB, VGA_QXL, + VGA_TCX, VGA_CG3, } VGAInterfaceType; extern int vga_interface_type; |