Seabios: seperate qemu_cfg from smbios
PATCH 1/1 Seabios: seperate qemu_cfg from smbios
Hi,
I am trying to seperate the QEMU_CFG code from smbios.c in Seabios, in order to add the remaining QEMU_CFG stuff.
This patch seems to boot fine for me, there should be no changes to the actual code. If you're happy with this, I will start moving over the other bits.
Cheers,
Jes
Move QEMU_CFG related code out of smbios.c and into seperate files.
--- Makefile | 4 ++-- src/qemu-cfg.c | 29 +++++++++++++++++++++++++++++ src/qemu-cfg.h | 14 ++++++++++++++ src/smbios.c | 22 +--------------------- 4 files changed, 46 insertions(+), 23 deletions(-)
Makefile +2 -2
@@ -13,8 +13,8 @@ SRCBOTH=output.c util.c floppy.c ata.c m pnpbios.c pirtable.c SRC16=$(SRCBOTH) system.c disk.c apm.c pcibios.c vgahooks.c font.c SRC32=$(SRCBOTH) post.c shadow.c memmap.c coreboot.c boot.c \ - acpi.c smm.c mptable.c smbios.c pciinit.c optionroms.c mtrr.c \ - lzmadecode.c + acpi.c smm.c mptable.c qemu-cfg.c smbios.c pciinit.c optionroms.c \ + mtrr.c lzmadecode.c cc-option = $(shell if test -z "`$(1) $(2) -S -o /dev/null -xc \ /dev/null 2>&1`"; then echo "$(2)"; else echo "$(3)"; fi ;)
src/qemu-cfg.c new file +29 -0
@@ -0,0 +1,29 @@ +// qemu-cfg.c: QEMU_CFG related code +// +// Copyright (C) 2009 Jes Sorensen, SGI <[email protected]> +// Copyright (C) 2008 Kevin O'Connor <[email protected]> +// Copyright (C) 2006 Fabrice Bellard +// +// This file may be distributed under the terms of the GNU LGPLv3 license. + +#include "types.h" +#include "ioport.h" +#include "qemu-cfg.h" + +void +qemu_cfg_read (u8 *buf,u16 f,int len) +{ +outw (f,PORT_QEMU_CFG_CTL ); +while (len--) + *(buf++) =inb (PORT_QEMU_CFG_DATA ); +} + +int +qemu_cfg_port_probe () +{ +u8 sig[4 ] ="QEMU" ; +u8 buf[4 ]; +qemu_cfg_read (buf,QEMU_CFG_SIGNATURE ,4 ); +return *(u32 *)buf == *(u32 *)sig; +} +
src/qemu-cfg.h new file +14 -0
@@ -0,0 +1,14 @@ +// qemu-cfg.h: QEMU_CFG related definitions +// +// Copyright (C) 2009 Jes Sorensen, SGI <[email protected]> +// Copyright (C) 2008 Kevin O'Connor <[email protected]> +// Copyright (C) 2006 Fabrice Bellard +// +// This file may be distributed under the terms of the GNU LGPLv3 license. + +#define QEMU_CFG_SIGNATURE 0x00 +#define QEMU_CFG_ID 0x01 +#define QEMU_CFG_UUID 0x02 + +void qemu_cfg_read (u8 *buf,u16 f,int len); +int qemu_cfg_port_probe ();
src/smbios.c +1 -21
@@ -8,33 +8,13 @@#include "util.h" // dprintf #include "memmap.h" // bios_table_cur_addr #include "biosvar.h" // GET_EBDA +#include "qemu-cfg.h" // QEMU_CFG_UUID /**************************************************************** * UUID probe ****************************************************************/ -#define QEMU_CFG_SIGNATURE 0x00 -#define QEMU_CFG_ID 0x01 -#define QEMU_CFG_UUID 0x02 - -static void -qemu_cfg_read (u8 *buf,u16 f,int len) -{ -outw (f,PORT_QEMU_CFG_CTL ); -while (len--) - *(buf++) =inb (PORT_QEMU_CFG_DATA ); -} - -static int -qemu_cfg_port_probe () -{ -u8 sig[4 ] ="QEMU" ; -u8 buf[4 ]; -qemu_cfg_read (buf,QEMU_CFG_SIGNATURE ,4 ); -return *(u32 *)buf == *(u32 *)sig; -} -static void uuid_probe (u8 *bios_uuid) {
Quoted 6 lines · Jes Sorensen
I am trying to seperate the
QEMU_CFGcode fromsmbios.cin Seabios, in order to add the remainingQEMU_CFGstuff.This patch seems to boot fine for me, there should be no changes to the actual code. If you're happy with this, I will start moving over the other bits.
Thanks Jes.
The patch looks fine to me. I'd like to see the followup patches before committing this preliminary patch though.
One note - all header files need header guards due to some bugs in various gcc implementations of -fwhole-program.
-Kevin
Quoted 5 lines · Kevin O'Connor
The patch looks fine to me. I'd like to see the followup patches before committing this preliminary patch though.
One note - all header files need header guards due to some bugs in various gcc implementations of -fwhole-program.
Hi Kevin,
DOH, stupid me for forgetting that. Here's an updated version of the patch with that fixed.
I'll send you the seabioa patch for maxcpus using QEMU_CFG next. It's similar to what I pushed into qemu/bochs already.
Cheers,
Jes
Move QEMU_CFG related code out of smbios.c and into seperate files.
--- Makefile | 4 ++-- src/qemu-cfg.c | 29 +++++++++++++++++++++++++++++ src/qemu-cfg.h | 19 +++++++++++++++++++ src/smbios.c | 22 +--------------------- 4 files changed, 51 insertions(+), 23 deletions(-)
Makefile +2 -2
@@ -13,8 +13,8 @@ SRCBOTH=output.c util.c floppy.c ata.c m pnpbios.c pirtable.c SRC16=$(SRCBOTH) system.c disk.c apm.c pcibios.c vgahooks.c font.c SRC32=$(SRCBOTH) post.c shadow.c memmap.c coreboot.c boot.c \ - acpi.c smm.c mptable.c smbios.c pciinit.c optionroms.c mtrr.c \ - lzmadecode.c + acpi.c smm.c mptable.c qemu-cfg.c smbios.c pciinit.c optionroms.c \ + mtrr.c lzmadecode.c cc-option = $(shell if test -z "`$(1) $(2) -S -o /dev/null -xc \ /dev/null 2>&1`"; then echo "$(2)"; else echo "$(3)"; fi ;)
src/qemu-cfg.c new file +29 -0
@@ -0,0 +1,29 @@ +// qemu-cfg.c: QEMU_CFG related code +// +// Copyright (C) 2009 Jes Sorensen, SGI <[email protected]> +// Copyright (C) 2008 Kevin O'Connor <[email protected]> +// Copyright (C) 2006 Fabrice Bellard +// +// This file may be distributed under the terms of the GNU LGPLv3 license. + +#include "types.h" +#include "ioport.h" +#include "qemu-cfg.h" + +void +qemu_cfg_read (u8 *buf,u16 f,int len) +{ +outw (f,PORT_QEMU_CFG_CTL ); +while (len--) + *(buf++) =inb (PORT_QEMU_CFG_DATA ); +} + +int +qemu_cfg_port_probe () +{ +u8 sig[4 ] ="QEMU" ; +u8 buf[4 ]; +qemu_cfg_read (buf,QEMU_CFG_SIGNATURE ,4 ); +return *(u32 *)buf == *(u32 *)sig; +} +
src/qemu-cfg.h new file +19 -0
@@ -0,0 +1,19 @@ +// qemu-cfg.h: QEMU_CFG related definitions +// +// Copyright (C) 2009 Jes Sorensen, SGI <[email protected]> +// Copyright (C) 2008 Kevin O'Connor <[email protected]> +// Copyright (C) 2006 Fabrice Bellard +// +// This file may be distributed under the terms of the GNU LGPLv3 license. + +#ifndef __QEMU_CFG_H +#define __QEMU_CFG_H + +#define QEMU_CFG_SIGNATURE 0x00 +#define QEMU_CFG_ID 0x01 +#define QEMU_CFG_UUID 0x02 + +void qemu_cfg_read (u8 *buf,u16 f,int len); +int qemu_cfg_port_probe (); + +#endif
src/smbios.c +1 -21
@@ -8,33 +8,13 @@#include "util.h" // dprintf #include "memmap.h" // bios_table_cur_addr #include "biosvar.h" // GET_EBDA +#include "qemu-cfg.h" // QEMU_CFG_UUID /**************************************************************** * UUID probe ****************************************************************/ -#define QEMU_CFG_SIGNATURE 0x00 -#define QEMU_CFG_ID 0x01 -#define QEMU_CFG_UUID 0x02 - -static void -qemu_cfg_read (u8 *buf,u16 f,int len) -{ -outw (f,PORT_QEMU_CFG_CTL ); -while (len--) - *(buf++) =inb (PORT_QEMU_CFG_DATA ); -} - -static int -qemu_cfg_port_probe () -{ -u8 sig[4 ] ="QEMU" ; -u8 buf[4 ]; -qemu_cfg_read (buf,QEMU_CFG_SIGNATURE ,4 ); -return *(u32 *)buf == *(u32 *)sig; -} -static void uuid_probe (u8 *bios_uuid) {
Quoted 11 lines · Jes Sorensen
Quoted 5 lines · Kevin O'Connor
The patch looks fine to me. I'd like to see the followup patches before committing this preliminary patch though.
One note - all header files need header guards due to some bugs in various gcc implementations of -fwhole-program.
Hi Kevin,
DOH, stupid me for forgetting that. Here's an updated version of the patch with that fixed.
Please drop the underscores in front of QEMU.
Quoted 7 lines
I'll send you the seabioa patch for maxcpus using
QEMU_CFGnext. It's similar to what I pushed into qemu/bochs already.Cheers,
Jes
Signature · 1 line
mailto:[email protected]