From 571cf340ae415185ab21a1af146cb3df7b489286 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>

Date: Mon, 27 Nov 2017 22:51:03 +0100

Subject: [PATCH 05/21] fw_cfg: rename read callback

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

RH-Author: Marc-André Lureau <marcandre.lureau@redhat.com>

Message-id: <20171127225111.24518-2-marcandre.lureau@redhat.com>

Patchwork-id: 77921

O-Subject: [RHV7.5 qemu-kvm-rhev PATCH 1/9] fw_cfg: rename read callback

Bugzilla: 1398633

RH-Acked-by: Laszlo Ersek <lersek@redhat.com>

RH-Acked-by: Andrew Jones <drjones@redhat.com>

RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>

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: Marc-André Lureau <marcandre.lureau@redhat.com>

Reviewed-by: Michael S. Tsirkin <mst@redhat.com>

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

(cherry picked from commit 6f6f4aec749ba9a4fb58c7c20536a61b0381ff35)

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 hw/core/loader.c          |  2 +-

 hw/nvram/fw_cfg.c         | 30 ++++++++++++++++--------------

 include/hw/loader.h       |  2 +-

 include/hw/nvram/fw_cfg.h |  7 ++++---

 4 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/hw/core/loader.c b/hw/core/loader.c

index ebe574c..4593061 100644

--- a/hw/core/loader.c

+++ b/hw/core/loader.c

@@ -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());

diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c

index 5bd9044..e3bd626 100644

--- a/hw/nvram/fw_cfg.c

+++ b/hw/nvram/fw_cfg.c

@@ -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,11 +568,11 @@ static const VMStateDescription vmstate_fw_cfg = {

     }

 };

-static void fw_cfg_add_bytes_read_callback(FWCfgState *s, uint16_t key,

-                                           FWCfgReadCallback callback,

-                                           void *callback_opaque,

-                                           void *data, size_t len,

-                                           bool read_only)

+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)

 {

     int arch = !!(key & FW_CFG_ARCH_LOCAL);

@@ -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,9 +799,10 @@ 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,

-                                   read_only);

+    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);

     s->files->f[index].select = cpu_to_be16(FW_CFG_FILE_FIRST + index);

diff --git a/include/hw/loader.h b/include/hw/loader.h

index 490c9ff..355fe0f 100644

--- a/include/hw/loader.h

+++ b/include/hw/loader.h

@@ -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,

diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h

index b77ea48..f50d068 100644

--- a/include/hw/nvram/fw_cfg.h

+++ b/include/hw/nvram/fw_cfg.h

@@ -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);

 /**

-- 

1.8.3.1