February 2013 - SeaBIOS - mail.coreboot.org

Re: [SeaBIOS] [PATCH 2/5] Introduce framework for detecting what platform SeaBIOS is running on.
by Fred . Feb. 8, 2013

Feb. 8, 2013

Maybe would be nice with a: int get_platform(); 0 = QEMU 1 = Xen 2 = Coreboot 3 = CSM Then you have one get_platform() function, instead of four separate startedOnQEMU(), startedOnCoreboot, startedOnCSM, etc functions. On Fri, Feb 8, 2013 at 6:07 AM, Kevin O'Connor <kevin(a)koconnor.net> wrote: > Introduce startedOnQEMU()/startedOnCoreboot()/etc. calls to enable > code to determine what platform invoked the initial SeaBIOS startup. > Also introduce runningOnQEMU()/etc. calls for cases where SeaBIOS can > detect it is running on a platform even though it wasn't directly > launched by that platform (eg, Xen may have started SeaBIOS, but Xen > may be running under qemu). > > Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> > --- > src/coreboot.c | 3 ++ > src/csm.c | 2 ++ > src/paravirt.c | 10 +++++-- > src/paravirt.h | 93 > ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- > src/xen.c | 1 + > 5 files changed, 104 insertions(+), 5 deletions(-) > > diff --git a/src/coreboot.c b/src/coreboot.c > index 57c9737..40a7e72 100644 > --- a/src/coreboot.c > +++ b/src/coreboot.c > @@ -12,6 +12,7 @@ > #include "boot.h" // boot_add_cbfs > #include "disk.h" // MAXDESCSIZE > #include "config.h" // CONFIG_* > +#include "paravirt.h" // PlatformStartedOn > > > /**************************************************************** > @@ -145,6 +146,8 @@ coreboot_preinit(void) > if (!cbm) > goto fail; > > + PlatformStartedOn = PlatformRunningOn = PF_COREBOOT; > + > u64 maxram = 0, maxram_over4G = 0; > int i, count = MEM_RANGE_COUNT(cbm); > for (i=0; i<count; i++) { > diff --git a/src/csm.c b/src/csm.c > index 169b608..c8069d2 100644 > --- a/src/csm.c > +++ b/src/csm.c > @@ -17,6 +17,7 @@ > #include "boot.h" > #include "smbios.h" > #include "pic.h" > +#include "paravirt.h" // PlatformStartedOn > > struct rsdp_descriptor VAR32FLATVISIBLE __aligned(16) csm_rsdp; > > @@ -74,6 +75,7 @@ handle_csm_0000(struct bregs *regs) > dprintf(3, "LoPmmMemory %08x\n", csm_init_table->LowPmmMemory); > dprintf(3, "LoPmmMemorySize %08x\n", > csm_init_table->LowPmmMemorySizeInBytes); > > + PlatformStartedOn = PlatformRunningOn = PF_CSM; > csm_malloc_preinit(csm_init_table->LowPmmMemory, > csm_init_table->LowPmmMemorySizeInBytes, > csm_init_table->HiPmmMemory, > diff --git a/src/paravirt.c b/src/paravirt.c > index ebab256..35b7c11 100644 > --- a/src/paravirt.c > +++ b/src/paravirt.c > @@ -19,6 +19,8 @@ > #include "mptable.h" // mptable_setup > #include "pci.h" // create_pirtable > > +int PlatformStartedOn, PlatformRunningOn; > + > int qemu_cfg_present; > > void > @@ -27,6 +29,7 @@ qemu_preinit(void) > if (!CONFIG_QEMU) > return; > > + PlatformStartedOn = PlatformRunningOn = PF_QEMU; > qemu_cfg_preinit(); > > // On emulators, get memory size from nvram. > @@ -108,12 +111,13 @@ qemu_cfg_read_entry(void *buf, int e, int len) > > void qemu_cfg_preinit(void) > { > + if (!CONFIG_QEMU) > + return; > + PlatformRunningOn |= PF_QEMU; > + > char *sig = "QEMU"; > int i; > > - if (CONFIG_COREBOOT) > - return; > - > qemu_cfg_present = 1; > > qemu_cfg_select(QEMU_CFG_SIGNATURE); > diff --git a/src/paravirt.h b/src/paravirt.h > index 2448993..3b00697 100644 > --- a/src/paravirt.h > +++ b/src/paravirt.h > @@ -1,8 +1,97 @@ > #ifndef __PV_H > #define __PV_H > > -#include "config.h" // CONFIG_COREBOOT > -#include "util.h" > +#include "config.h" // CONFIG_* > +#include "util.h" // memcpy > + > + > +/**************************************************************** > + * Current platform detection > + ****************************************************************/ > + > +#define PF_QEMU (1<<0) > +#define PF_COREBOOT (1<<1) > +#define PF_XEN (1<<2) > +#define PF_CSM (1<<3) > + > +extern int PlatformStartedOn, PlatformRunningOn; > + > +static inline int startedOnQEMU(void) > +{ > + if (!CONFIG_QEMU) > + return 0; > + if (!CONFIG_COREBOOT && !CONFIG_XEN && !CONFIG_CSM) > + return 1; > + return PlatformStartedOn == PF_QEMU; > +} > + > +static inline int startedOnCoreboot(void) > +{ > + if (!CONFIG_COREBOOT) > + return 0; > + if (!CONFIG_QEMU && !CONFIG_XEN && !CONFIG_CSM) > + return 1; > + return PlatformStartedOn == PF_COREBOOT; > +} > + > +static inline int startedOnXen(void) > +{ > + if (!CONFIG_XEN) > + return 0; > + if (!CONFIG_QEMU && !CONFIG_COREBOOT && !CONFIG_CSM) > + return 1; > + return PlatformStartedOn == PF_XEN; > +} > + > +static inline int startedOnCSM(void) > +{ > + if (!CONFIG_CSM) > + return 0; > + if (!CONFIG_QEMU && !CONFIG_COREBOOT && !CONFIG_XEN) > + return 1; > + return PlatformStartedOn == PF_CSM; > +} > + > +static inline int runningOnQEMU(void) > +{ > + if (!CONFIG_QEMU) > + return 0; > + if (!CONFIG_COREBOOT && !CONFIG_XEN && !CONFIG_CSM) > + return 1; > + return PlatformRunningOn & PF_QEMU; > +} > + > +static inline int runningOnCoreboot(void) > +{ > + if (!CONFIG_COREBOOT) > + return 0; > + if (!CONFIG_QEMU && !CONFIG_XEN && !CONFIG_CSM) > + return 1; > + return PlatformRunningOn & PF_COREBOOT; > +} > + > +static inline int runningOnXen(void) > +{ > + if (!CONFIG_XEN) > + return 0; > + if (!CONFIG_QEMU && !CONFIG_COREBOOT && !CONFIG_CSM) > + return 1; > + return PlatformRunningOn & PF_XEN; > +} > + > +static inline int runningOnCSM(void) > +{ > + if (!CONFIG_CSM) > + return 0; > + if (!CONFIG_QEMU && !CONFIG_COREBOOT && !CONFIG_XEN) > + return 1; > + return PlatformRunningOn & PF_CSM; > +} > + > + > +/**************************************************************** > + * KVM/QEMU firmware > + ****************************************************************/ > > /* This CPUID returns the signature 'KVMKVMKVM' in ebx, ecx, and edx. It > * should be used to determine that a VM is running under KVM. > diff --git a/src/xen.c b/src/xen.c > index a506b42..5122a3c 100644 > --- a/src/xen.c > +++ b/src/xen.c > @@ -81,6 +81,7 @@ void xen_preinit(void) > return; > } > > + PlatformStartedOn = PlatformRunningOn = PF_XEN; > qemu_cfg_preinit(); > > u64 maxram = 0, maxram_over4G = 0; > -- > 1.7.11.7 > > > _______________________________________________ > SeaBIOS mailing list > SeaBIOS(a)seabios.org > http://www.seabios.org/mailman/listinfo/seabios >

1 0

[PATCH 00/13] SeaBIOS as Compatibility Support Module for UEFI/OVMF
by David Woodhouse Feb. 5, 2013

Feb. 5, 2013

This patch series adds support for using SeaBIOS as a Compatibility Support Module (CSM) to provide "Legacy" BIOS services under UEFI/OVMF. With a version of OVMF suitably patched to stop it from marking our stack in the 0xE0000 segment as read-only (see README.CSM), it has been tested with various Linux systems, Windows 7, OpenBSD 5.2, FreeBSD 8/9, NetBSD, DragonflyBSD, Solaris 10/11. It also fixes issues with Windows 2008r2 which rather stupidly invokes INT 10h for video setup even when booted in EFI mode! I haven't quite finished going through the corporate bureaucracy for releasing this, so it's for review only. Git tree at git://git.infradead.org/users/dwmw2/seabios.git or gitweb at http://git.infradead.org/users/dwmw2/seabios.git -- David Woodhouse Open Source Technology Centre David.Woodhouse(a)intel.com Intel Corporation

3 23

Re: [SeaBIOS] [Qemu-devel] [PATCH 5/6] load_linux: report open kernel file & its size error
by li guang Feb. 5, 2013

Feb. 5, 2013

OK, will fix. Thanks! 在 2013-02-04一的 18:20 +0000，Blue Swirl写道： > On Mon, Feb 4, 2013 at 2:27 AM, liguang <lig.fnst(a)cn.fujitsu.com> wrote: > > Signed-off-by: liguang <lig.fnst(a)cn.fujitsu.com> > > --- > > hw/pc.c | 14 +++++++++++--- > > 1 files changed, 11 insertions(+), 3 deletions(-) > > > > diff --git a/hw/pc.c b/hw/pc.c > > index 01d00f6..0ccd775 100644 > > --- a/hw/pc.c > > +++ b/hw/pc.c > > @@ -652,12 +652,20 @@ static void load_linux(void *fw_cfg, > > char *vmode; > > > > /* Align to 16 bytes as a paranoia measure */ > > - cmdline_size = (strlen(kernel_cmdline)+16) & ~15; > > + cmdline_size = (strlen(kernel_cmdline)+16) & ~0xf; > > Here 15 is 16 - 1, so 0xf seems out of place. I'd use QEMU_ALIGN_UP(). > > If you touch the line, please add spaces around '+'. > > > > > /* load the kernel header */ > > f = fopen(kernel_filename, "rb"); > > - if (!f || !(kernel_size = get_file_size(f)) || > > - fread(header, 1, MIN(ARRAY_SIZE(header), kernel_size), f) != > > + if (!f) { > > + fprintf(stderr, "can't open kernel image file\n"); > > The error message from strerror(errno) would be interesting. > > > + exit(1); > > + } > > + kernel_size = get_file_size(f); > > + if (kernel_size <= 0) { > > + fprintf(stderr, "can't get size of kernel image file\n"); > > + exit(1); > > + } > > + if (fread(header, 1, MIN(ARRAY_SIZE(header), kernel_size), f) != > > MIN(ARRAY_SIZE(header), kernel_size)) { > > fprintf(stderr, "qemu: could not load kernel '%s': %s\n", > > kernel_filename, strerror(errno)); > > -- > > 1.7.2.5 > > > >

1 0