[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/34] fw_cfg: add fw_cfg_machine_reset function
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 04/34] fw_cfg: add fw_cfg_machine_reset function |
Date: |
Wed, 15 Oct 2014 11:05:37 +0200 |
From: Gonglei <address@hidden>
We must assure that the changed bootindex can take effect
when guest is rebooted. So we introduce fw_cfg_machine_reset(),
which change the fw_cfg file's bootindex data using the new
global fw_boot_order list.
Signed-off-by: Chenliang <address@hidden>
Signed-off-by: Gonglei <address@hidden>
Reviewed-by: Gerd Hoffmann <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/nvram/fw_cfg.c | 55 ++++++++++++++++++++++++++++++++++++++++++++---
include/hw/nvram/fw_cfg.h | 2 ++
2 files changed, 54 insertions(+), 3 deletions(-)
diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
index b71d251..e7ed27e 100644
--- a/hw/nvram/fw_cfg.c
+++ b/hw/nvram/fw_cfg.c
@@ -402,6 +402,26 @@ static void fw_cfg_add_bytes_read_callback(FWCfgState *s,
uint16_t key,
s->entries[arch][key].callback_opaque = callback_opaque;
}
+static void *fw_cfg_modify_bytes_read(FWCfgState *s, uint16_t key,
+ void *data, size_t len)
+{
+ void *ptr;
+ int arch = !!(key & FW_CFG_ARCH_LOCAL);
+
+ key &= FW_CFG_ENTRY_MASK;
+
+ assert(key < FW_CFG_MAX_ENTRY && len < UINT32_MAX);
+
+ /* return the old data to the function caller, avoid memory leak */
+ ptr = s->entries[arch][key].data;
+ s->entries[arch][key].data = data;
+ s->entries[arch][key].len = len;
+ s->entries[arch][key].callback_opaque = NULL;
+ s->entries[arch][key].callback = NULL;
+
+ return ptr;
+}
+
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);
@@ -499,13 +519,42 @@ void fw_cfg_add_file(FWCfgState *s, const char *filename,
fw_cfg_add_file_callback(s, filename, NULL, NULL, data, len);
}
-static void fw_cfg_machine_ready(struct Notifier *n, void *data)
+void *fw_cfg_modify_file(FWCfgState *s, const char *filename,
+ void *data, size_t len)
+{
+ int i, index;
+
+ assert(s->files);
+
+ index = be32_to_cpu(s->files->count);
+ assert(index < FW_CFG_FILE_SLOTS);
+
+ for (i = 0; i < index; i++) {
+ if (strcmp(filename, s->files->f[i].name) == 0) {
+ return fw_cfg_modify_bytes_read(s, FW_CFG_FILE_FIRST + i,
+ data, len);
+ }
+ }
+ /* add new one */
+ fw_cfg_add_file_callback(s, filename, NULL, NULL, data, len);
+ return NULL;
+}
+
+static void fw_cfg_machine_reset(void *opaque)
{
+ void *ptr;
size_t len;
- FWCfgState *s = container_of(n, FWCfgState, machine_ready);
+ FWCfgState *s = opaque;
char *bootindex = get_boot_devices_list(&len, false);
- fw_cfg_add_file(s, "bootorder", (uint8_t*)bootindex, len);
+ ptr = fw_cfg_modify_file(s, "bootorder", (uint8_t *)bootindex, len);
+ g_free(ptr);
+}
+
+static void fw_cfg_machine_ready(struct Notifier *n, void *data)
+{
+ FWCfgState *s = container_of(n, FWCfgState, machine_ready);
+ qemu_register_reset(fw_cfg_machine_reset, s);
}
FWCfgState *fw_cfg_init(uint32_t ctl_port, uint32_t data_port,
diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h
index 72b1549..56e1ed7 100644
--- a/include/hw/nvram/fw_cfg.h
+++ b/include/hw/nvram/fw_cfg.h
@@ -76,6 +76,8 @@ void fw_cfg_add_file(FWCfgState *s, const char *filename,
void *data,
void fw_cfg_add_file_callback(FWCfgState *s, const char *filename,
FWCfgReadCallback callback, void
*callback_opaque,
void *data, size_t len);
+void *fw_cfg_modify_file(FWCfgState *s, const char *filename, void *data,
+ size_t len);
FWCfgState *fw_cfg_init(uint32_t ctl_port, uint32_t data_port,
hwaddr crl_addr, hwaddr data_addr);
--
1.8.3.1
- [Qemu-devel] [PULL 17/34] net: remove bootindex property from qdev to qom, (continued)
- [Qemu-devel] [PULL 17/34] net: remove bootindex property from qdev to qom, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 08/34] virtio-net: add bootindex to qom property, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 11/34] ne2000: add bootindex to qom property, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 15/34] vmxnet3: add bootindex to qom property, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 31/34] ide: add calling add_boot_device_patch in bootindex setter function, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 18/34] virtio-net: alias bootindex property explicitly for virt-net-pci/ccw/s390, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 14/34] spapr_lian: add bootindex to qom property, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 09/34] e1000: add bootindex to qom property, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 07/34] bootindex: add a setter/getter functions wrapper for bootindex property, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 12/34] pcnet: add bootindex to qom property, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 04/34] fw_cfg: add fw_cfg_machine_reset function,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 22/34] redirect: remove bootindex property from qdev to qom, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 30/34] nvma: ide: add bootindex to qom property, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 32/34] bootindex: move calling add_boot_device_patch to bootindex setter function, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 34/34] bootindex: change fprintf to error_report, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 05/34] bootindex: rework add_boot_device_path function, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 28/34] virtio-blk: alias bootindex property explicitly for virt-blk-pci/ccw/s390, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 10/34] eepro100: add bootindex to qom property, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 16/34] usb-net: add bootindex to qom property, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 20/34] pci-assign: remove bootindex property from qdev to qom, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 19/34] host-libusb: remove bootindex property from qdev to qom, Gerd Hoffmann, 2014/10/15