Commit 5be5df72 authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Paolo Bonzini
Browse files

fw_cfg: import & use linux/qemu_fw_cfg.h 



Use kernel common header for fw_cfg.

(unfortunately, optionrom.h must have its own define, since it's
actually an assembler header)

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20180817155910.5722-2-marcandre.lureau@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
parent 039d7c4d

dump.c

+1 −1
Original line number Diff line number Diff line
@@ -1742,7 +1742,7 @@ static void dump_init(DumpState *s, int fd, bool has_format, 
            warn_report("guest note is not present");

        } else if (size < note_head_size || size > MAX_GUEST_NOTE_SIZE) {

            warn_report("guest note size is invalid: %" PRIu32, size);

        } else if (format != VMCOREINFO_FORMAT_ELF) {

        } else if (format != FW_CFG_VMCOREINFO_FORMAT_ELF) {

            warn_report("guest note format is unsupported: %" PRIu16, format);

        } else {

            s->guest_note = g_malloc(size + 1); /* +1 for adding \0 */

hw/misc/vmcoreinfo.c

+3 −3
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ static void fw_cfg_vmci_write(void *dev, off_t offset, size_t len) 
    VMCoreInfoState *s = VMCOREINFO(dev);



    s->has_vmcoreinfo = offset == 0 && len == sizeof(s->vmcoreinfo)

        && s->vmcoreinfo.guest_format != VMCOREINFO_FORMAT_NONE;

        && s->vmcoreinfo.guest_format != FW_CFG_VMCOREINFO_FORMAT_NONE;

}



static void vmcoreinfo_reset(void *dev)
@@ -28,7 +28,7 @@ static void vmcoreinfo_reset(void *dev) 


    s->has_vmcoreinfo = false;

    memset(&s->vmcoreinfo, 0, sizeof(s->vmcoreinfo));

    s->vmcoreinfo.host_format = cpu_to_le16(VMCOREINFO_FORMAT_ELF);

    s->vmcoreinfo.host_format = cpu_to_le16(FW_CFG_VMCOREINFO_FORMAT_ELF);

}



static void vmcoreinfo_realize(DeviceState *dev, Error **errp)
@@ -53,7 +53,7 @@ static void vmcoreinfo_realize(DeviceState *dev, Error **errp) 
        return;

    }



    fw_cfg_add_file_callback(fw_cfg, "etc/vmcoreinfo",

    fw_cfg_add_file_callback(fw_cfg, FW_CFG_VMCOREINFO_FILENAME,

                             NULL, fw_cfg_vmci_write, s,

                             &s->vmcoreinfo, sizeof(s->vmcoreinfo), false);

include/hw/misc/vmcoreinfo.h

+2 −10
Original line number Diff line number Diff line
@@ -13,20 +13,12 @@ 
#define VMCOREINFO_H



#include "hw/qdev.h"

#include "standard-headers/linux/qemu_fw_cfg.h"



#define VMCOREINFO_DEVICE "vmcoreinfo"

#define VMCOREINFO(obj) OBJECT_CHECK(VMCoreInfoState, (obj), VMCOREINFO_DEVICE)



#define VMCOREINFO_FORMAT_NONE 0x0

#define VMCOREINFO_FORMAT_ELF 0x1



/* all fields are little-endian */

typedef struct FWCfgVMCoreInfo {

    uint16_t host_format; /* set on reset */

    uint16_t guest_format;

    uint32_t size;

    uint64_t paddr;

} QEMU_PACKED FWCfgVMCoreInfo;

typedef struct fw_cfg_vmcoreinfo FWCfgVMCoreInfo;



typedef struct VMCoreInfoState {

    DeviceClass parent_obj;

include/hw/nvram/fw_cfg.h

+3 −15
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
#define FW_CFG_H



#include "exec/hwaddr.h"

#include "hw/nvram/fw_cfg_keys.h"

#include "standard-headers/linux/qemu_fw_cfg.h"

#include "hw/sysbus.h"

#include "sysemu/dma.h"
@@ -14,12 +14,7 @@ 
#define FW_CFG_IO(obj)  OBJECT_CHECK(FWCfgIoState,  (obj), TYPE_FW_CFG_IO)

#define FW_CFG_MEM(obj) OBJECT_CHECK(FWCfgMemState, (obj), TYPE_FW_CFG_MEM)



typedef struct FWCfgFile {

    uint32_t  size;        /* file size */

    uint16_t  select;      /* write this to 0x510 to read it */

    uint16_t  reserved;

    char      name[FW_CFG_MAX_FILE_PATH];

} FWCfgFile;

typedef struct fw_cfg_file FWCfgFile;



#define FW_CFG_ORDER_OVERRIDE_VGA    70

#define FW_CFG_ORDER_OVERRIDE_NIC    80
@@ -34,14 +29,7 @@ typedef struct FWCfgFiles { 
    FWCfgFile f[];

} FWCfgFiles;



/* Control as first field allows for different structures selected by this

 * field, which might be useful in the future

 */

typedef struct FWCfgDmaAccess {

    uint32_t control;

    uint32_t length;

    uint64_t address;

} QEMU_PACKED FWCfgDmaAccess;

typedef struct fw_cfg_dma_access FWCfgDmaAccess;



typedef void (*FWCfgCallback)(void *opaque);

typedef void (*FWCfgWriteCallback)(void *opaque, off_t start, size_t len);

include/hw/nvram/fw_cfg_keys.h

deleted100644 → 0
+0 −45
Original line number Diff line number Diff line 
#ifndef FW_CFG_KEYS_H

#define FW_CFG_KEYS_H



#define FW_CFG_SIGNATURE        0x00

#define FW_CFG_ID               0x01

#define FW_CFG_UUID             0x02

#define FW_CFG_RAM_SIZE         0x03

#define FW_CFG_NOGRAPHIC        0x04

#define FW_CFG_NB_CPUS          0x05

#define FW_CFG_MACHINE_ID       0x06

#define FW_CFG_KERNEL_ADDR      0x07

#define FW_CFG_KERNEL_SIZE      0x08

#define FW_CFG_KERNEL_CMDLINE   0x09

#define FW_CFG_INITRD_ADDR      0x0a

#define FW_CFG_INITRD_SIZE      0x0b

#define FW_CFG_BOOT_DEVICE      0x0c

#define FW_CFG_NUMA             0x0d

#define FW_CFG_BOOT_MENU        0x0e

#define FW_CFG_MAX_CPUS         0x0f

#define FW_CFG_KERNEL_ENTRY     0x10

#define FW_CFG_KERNEL_DATA      0x11

#define FW_CFG_INITRD_DATA      0x12

#define FW_CFG_CMDLINE_ADDR     0x13

#define FW_CFG_CMDLINE_SIZE     0x14

#define FW_CFG_CMDLINE_DATA     0x15

#define FW_CFG_SETUP_ADDR       0x16

#define FW_CFG_SETUP_SIZE       0x17

#define FW_CFG_SETUP_DATA       0x18

#define FW_CFG_FILE_DIR         0x19



#define FW_CFG_FILE_FIRST       0x20

#define FW_CFG_FILE_SLOTS_MIN   0x10



#define FW_CFG_WRITE_CHANNEL    0x4000

#define FW_CFG_ARCH_LOCAL       0x8000

#define FW_CFG_ENTRY_MASK       (~(FW_CFG_WRITE_CHANNEL | FW_CFG_ARCH_LOCAL))



#define FW_CFG_INVALID          0xffff



/* width in bytes of fw_cfg control register */

#define FW_CFG_CTL_SIZE         0x02



#define FW_CFG_MAX_FILE_PATH    56



#endif