Commit 6f6f4aec authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Michael S. Tsirkin
Browse files

fw_cfg: rename read callback 



The callback is called on select.

Furthermore, the next patch introduced a new callback, so rename the
function type with a generic name.

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 8b884984

hw/core/loader.c

+1 −1
Original line number Diff line number Diff line
@@ -989,7 +989,7 @@ err: 


MemoryRegion *rom_add_blob(const char *name, const void *blob, size_t len,

                   size_t max_len, hwaddr addr, const char *fw_file_name,

                   FWCfgReadCallback fw_callback, void *callback_opaque,

                   FWCfgCallback fw_callback, void *callback_opaque,

                   AddressSpace *as, bool read_only)

{

    MachineClass *mc = MACHINE_GET_CLASS(qdev_get_machine());

hw/nvram/fw_cfg.c

+16 −14
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ struct FWCfgEntry { 
    bool allow_write;

    uint8_t *data;

    void *callback_opaque;

    FWCfgReadCallback read_callback;

    FWCfgCallback select_cb;

};



#define JPG_FILE 0
@@ -236,8 +236,8 @@ static int fw_cfg_select(FWCfgState *s, uint16_t key) 
        /* entry successfully selected, now run callback if present */

        arch = !!(key & FW_CFG_ARCH_LOCAL);

        e = &s->entries[arch][key & FW_CFG_ENTRY_MASK];

        if (e->read_callback) {

            e->read_callback(e->callback_opaque);

        if (e->select_cb) {

            e->select_cb(e->callback_opaque);

        }

    }
@@ -568,8 +568,8 @@ static const VMStateDescription vmstate_fw_cfg = { 
    }

};



static void fw_cfg_add_bytes_read_callback(FWCfgState *s, uint16_t key,

                                           FWCfgReadCallback callback,

static void fw_cfg_add_bytes_callback(FWCfgState *s, uint16_t key,

                                      FWCfgCallback select_cb,

                                      void *callback_opaque,

                                      void *data, size_t len,

                                      bool read_only)
@@ -583,7 +583,7 @@ static void fw_cfg_add_bytes_read_callback(FWCfgState *s, uint16_t key, 


    s->entries[arch][key].data = data;

    s->entries[arch][key].len = (uint32_t)len;

    s->entries[arch][key].read_callback = callback;

    s->entries[arch][key].select_cb = select_cb;

    s->entries[arch][key].callback_opaque = callback_opaque;

    s->entries[arch][key].allow_write = !read_only;

}
@@ -610,7 +610,7 @@ static void *fw_cfg_modify_bytes_read(FWCfgState *s, uint16_t key, 


void fw_cfg_add_bytes(FWCfgState *s, uint16_t key, void *data, size_t len)

{

    fw_cfg_add_bytes_read_callback(s, key, NULL, NULL, data, len, true);

    fw_cfg_add_bytes_callback(s, key, NULL, NULL, data, len, true);

}



void fw_cfg_add_string(FWCfgState *s, uint16_t key, const char *value)
@@ -736,7 +736,8 @@ static int get_fw_cfg_order(FWCfgState *s, const char *name) 
}



void fw_cfg_add_file_callback(FWCfgState *s,  const char *filename,

                              FWCfgReadCallback callback, void *callback_opaque,

                              FWCfgCallback select_cb,

                              void *callback_opaque,

                              void *data, size_t len, bool read_only)

{

    int i, index, count;
@@ -798,8 +799,9 @@ void fw_cfg_add_file_callback(FWCfgState *s, const char *filename, 
        }

    }



    fw_cfg_add_bytes_read_callback(s, FW_CFG_FILE_FIRST + index,

                                   callback, callback_opaque, data, len,

    fw_cfg_add_bytes_callback(s, FW_CFG_FILE_FIRST + index,

                              select_cb,

                              callback_opaque, data, len,

                              read_only);



    s->files->f[index].size   = cpu_to_be32(len);

include/hw/loader.h

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ int rom_add_file(const char *file, const char *fw_dir, 
MemoryRegion *rom_add_blob(const char *name, const void *blob, size_t len,

                           size_t max_len, hwaddr addr,

                           const char *fw_file_name,

                           FWCfgReadCallback fw_callback,

                           FWCfgCallback fw_callback,

                           void *callback_opaque, AddressSpace *as,

                           bool read_only);

int rom_add_elf_program(const char *name, void *data, size_t datasize,

include/hw/nvram/fw_cfg.h

+4 −3
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ typedef struct FWCfgDmaAccess { 
    uint64_t address;

} QEMU_PACKED FWCfgDmaAccess;



typedef void (*FWCfgReadCallback)(void *opaque);

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



struct FWCfgState {

    /*< private >*/
@@ -182,7 +182,7 @@ void fw_cfg_add_file(FWCfgState *s, const char *filename, void *data, 
 * fw_cfg_add_file_callback:

 * @s: fw_cfg device being modified

 * @filename: name of new fw_cfg file item

 * @callback: callback function

 * @select_cb: callback function when selecting

 * @callback_opaque: argument to be passed into callback function

 * @data: pointer to start of item data

 * @len: size of item data
@@ -201,7 +201,8 @@ void fw_cfg_add_file(FWCfgState *s, const char *filename, void *data, 
 * with FW_CFG_DMA_CTL_SELECT).

 */

void fw_cfg_add_file_callback(FWCfgState *s, const char *filename,

                              FWCfgReadCallback callback, void *callback_opaque,

                              FWCfgCallback select_cb,

                              void *callback_opaque,

                              void *data, size_t len, bool read_only);



/**