[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/5] Move QEMU_CFG related code out of smbios.c
From: |
Jes Sorensen |
Subject: |
[Qemu-devel] [PATCH 1/5] Move QEMU_CFG related code out of smbios.c |
Date: |
Mon, 03 Aug 2009 15:32:37 +0200 |
User-agent: |
quilt/0.47-1 |
This patch moves QEMU_CFG infrastructure out of smbios.c and puts it
into seperate files.
Signed-off-by: Jes Sorensen <address@hidden>
---
Makefile | 4 ++--
src/qemu-cfg.c | 29 +++++++++++++++++++++++++++++
src/qemu-cfg.h | 19 +++++++++++++++++++
src/smbios.c | 22 +---------------------
4 files changed, 51 insertions(+), 23 deletions(-)
Index: seabios/Makefile
===================================================================
--- seabios.orig/Makefile
+++ seabios/Makefile
@@ -16,8 +16,8 @@ SRCBOTH=output.c util.c floppy.c ata.c m
pnpbios.c pirtable.c vgahooks.c pmm.c
SRC16=$(SRCBOTH) system.c disk.c apm.c pcibios.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 ;)
Index: seabios/src/qemu-cfg.c
===================================================================
--- /dev/null
+++ seabios/src/qemu-cfg.c
@@ -0,0 +1,29 @@
+// qemu-cfg.c: QEMU_CFG related code
+//
+// Copyright (C) 2009 Jes Sorensen, SGI <address@hidden>
+// Copyright (C) 2008 Kevin O'Connor <address@hidden>
+// 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;
+}
+
Index: seabios/src/qemu-cfg.h
===================================================================
--- /dev/null
+++ seabios/src/qemu-cfg.h
@@ -0,0 +1,19 @@
+// qemu-cfg.h: QEMU_CFG related definitions
+//
+// Copyright (C) 2009 Jes Sorensen, SGI <address@hidden>
+// Copyright (C) 2008 Kevin O'Connor <address@hidden>
+// 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
Index: seabios/src/smbios.c
===================================================================
--- seabios.orig/src/smbios.c
+++ seabios/src/smbios.c
@@ -8,33 +8,13 @@
#include "util.h" // dprintf
#include "memmap.h" // malloc_fseg
#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)
{
- [Qemu-devel] [PATCH 0/5] Seabios qemu detect, Jes Sorensen, 2009/08/04
- [Qemu-devel] [PATCH 1/5] Move QEMU_CFG related code out of smbios.c,
Jes Sorensen <=
- [Qemu-devel] [PATCH 4/5] Set irq0override based on emu_ver., Jes Sorensen, 2009/08/04
- [Qemu-devel] [PATCH 2/5] Reorder call for qemu-cfg probing., Jes Sorensen, 2009/08/04
- [Qemu-devel] [PATCH 5/5] Remove CONFIG_KVM and use emu_ver to runtime detect QEMU & KVM., Jes Sorensen, 2009/08/04
- [Qemu-devel] [PATCH 3/5] Set emu_ver based on information provided by qemu_cfg., Jes Sorensen, 2009/08/04
- [Qemu-devel] Re: [PATCH 0/5] Seabios qemu detect, Kevin O'Connor, 2009/08/04