Commit 87abaa5d authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé
Browse files

hw/i386: Extract fw_cfg definitions to local "fw_cfg.h" 



Extract the architecture-specific fw_cfg definitions to "fw_cfg.h".

Reviewed-by: default avatarLaszlo Ersek <lersek@redhat.com>
Message-Id: <20190422195020.1494-4-philmd@redhat.com>
Signed-off-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
parent b15c0f7d

hw/i386/fw_cfg.h

0 → 100644
+20 −0
Original line number Diff line number Diff line 
/*

 * QEMU fw_cfg helpers (X86 specific)

 *

 * Copyright (c) 2003-2004 Fabrice Bellard

 *

 * SPDX-License-Identifier: MIT

 */



#ifndef HW_I386_FW_CFG_H

#define HW_I386_FW_CFG_H



#include "hw/nvram/fw_cfg.h"



#define FW_CFG_ACPI_TABLES      (FW_CFG_ARCH_LOCAL + 0)

#define FW_CFG_SMBIOS_ENTRIES   (FW_CFG_ARCH_LOCAL + 1)

#define FW_CFG_IRQ0_OVERRIDE    (FW_CFG_ARCH_LOCAL + 2)

#define FW_CFG_E820_TABLE       (FW_CFG_ARCH_LOCAL + 3)

#define FW_CFG_HPET             (FW_CFG_ARCH_LOCAL + 4)



#endif

hw/i386/pc.c

+1 −6
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include "hw/char/parallel.h"

#include "hw/i386/apic.h"

#include "hw/i386/topology.h"

#include "hw/i386/fw_cfg.h"

#include "sysemu/cpus.h"

#include "hw/block/fdc.h"

#include "hw/ide.h"
@@ -88,12 +89,6 @@ 
#define DPRINTF(fmt, ...)

#endif



#define FW_CFG_ACPI_TABLES (FW_CFG_ARCH_LOCAL + 0)

#define FW_CFG_SMBIOS_ENTRIES (FW_CFG_ARCH_LOCAL + 1)

#define FW_CFG_IRQ0_OVERRIDE (FW_CFG_ARCH_LOCAL + 2)

#define FW_CFG_E820_TABLE (FW_CFG_ARCH_LOCAL + 3)

#define FW_CFG_HPET (FW_CFG_ARCH_LOCAL + 4)



#define E820_NR_ENTRIES		16



struct e820_entry {