gwj / at91sam9263 · Commits

Commit 084a197a2026d3cc523c61c42d9425cadcddf81b

Authored by blueswir1
1 parent f1f23ad5

Add UUID to firmware configuration info (Gleb Natapov) 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5259 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 2 changed files with 3 additions and 0 deletions
hw/fw_cfg.c
  View file @084a197
@@ -22,6 +22,7 @@ @@ -22,6 +22,7 @@
22 * THE SOFTWARE. 22 * THE SOFTWARE.
23 */ 23 */
24 #include "hw.h" 24 #include "hw.h"
  25 +#include "sysemu.h"
25 #include "isa.h" 26 #include "isa.h"
26 #include "fw_cfg.h" 27 #include "fw_cfg.h"
27 28
@@ -281,6 +282,7 @@ void *fw_cfg_init(uint32_t ctl_port, uint32_t data_port, @@ -281,6 +282,7 @@ void *fw_cfg_init(uint32_t ctl_port, uint32_t data_port,
281 cpu_register_physical_memory(data_addr, FW_CFG_SIZE, io_data_memory); 282 cpu_register_physical_memory(data_addr, FW_CFG_SIZE, io_data_memory);
282 } 283 }
283 fw_cfg_add_bytes(s, FW_CFG_SIGNATURE, (uint8_t *)"QEMU", 4); 284 fw_cfg_add_bytes(s, FW_CFG_SIGNATURE, (uint8_t *)"QEMU", 4);
  285 + fw_cfg_add_bytes(s, FW_CFG_UUID, qemu_uuid, 16);
284 register_savevm("fw_cfg", -1, 1, fw_cfg_save, fw_cfg_load, s); 286 register_savevm("fw_cfg", -1, 1, fw_cfg_save, fw_cfg_load, s);
285 qemu_register_reset(fw_cfg_reset, s); 287 qemu_register_reset(fw_cfg_reset, s);
286 fw_cfg_reset(s); 288 fw_cfg_reset(s);
hw/fw_cfg.h
  View file @084a197
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
3 3
4 #define FW_CFG_SIGNATURE 0x00 4 #define FW_CFG_SIGNATURE 0x00
5 #define FW_CFG_ID 0x01 5 #define FW_CFG_ID 0x01
  6 +#define FW_CFG_UUID 0x02
6 #define FW_CFG_MAX_ENTRY 0x10 7 #define FW_CFG_MAX_ENTRY 0x10
7 8
8 #define FW_CFG_WRITE_CHANNEL 0x4000 9 #define FW_CFG_WRITE_CHANNEL 0x4000