Commit 3974c9d8 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/pull-fw_cfg-20150610-1' into staging 



fw_cfg: drop write support, qemu cmdline support, bugfixes.
bios-tables-test: fix smbios test.

# gpg: Signature made Wed Jun 10 07:29:53 2015 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* remotes/kraxel/tags/pull-fw_cfg-20150610-1:
  bios-tables-test: handle false-positive smbios signature matches
  fw_cfg: insert fw_cfg file blobs via qemu cmdline
  fw_cfg: prohibit insertion of duplicate fw_cfg file names
  fw_cfg: prevent selector key conflict
  fw_cfg: remove support for guest-side data writes
  fw_cfg: fix FW_CFG_BOOT_DEVICE update on ppc and sparc
  fw_cfg: add fw_cfg_modify_i16 (update) method
  QemuOpts: increase number of vm_config_groups

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents eed8a8f5 5efed5a1

docs/specs/fw_cfg.txt

+21 −0
Original line number Diff line number Diff line
@@ -203,3 +203,24 @@ completes fully overwriting the item's data. 


NOTE: This function is deprecated, and will be completely removed

starting with QEMU v2.4.



== Externally Provided Items ==



As of v2.4, "file" fw_cfg items (i.e., items with selector keys above

FW_CFG_FILE_FIRST, and with a corresponding entry in the fw_cfg file

directory structure) may be inserted via the QEMU command line, using

the following syntax:



    -fw_cfg [name=]<item_name>,file=<path>



where <item_name> is the fw_cfg item name, and <path> is the location

on the host file system of a file containing the data to be inserted.



NOTE: Users *SHOULD* choose item names beginning with the prefix "opt/"

when using the "-fw_cfg" command line option, to avoid conflicting with

item names used internally by QEMU. For instance:



    -fw_cfg name=opt/my_item_name,file=./my_blob.bin



Similarly, QEMU developers *SHOULD NOT* use item names prefixed with

"opt/" when inserting items programmatically, e.g. via fw_cfg_add_file().

hw/nvram/fw_cfg.c

+18 −37
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ typedef struct FWCfgEntry { 
    uint32_t len;

    uint8_t *data;

    void *callback_opaque;

    FWCfgCallback callback;

    FWCfgReadCallback read_callback;

} FWCfgEntry;
@@ -232,19 +231,7 @@ static void fw_cfg_reboot(FWCfgState *s) 


static void fw_cfg_write(FWCfgState *s, uint8_t value)

{

    int arch = !!(s->cur_entry & FW_CFG_ARCH_LOCAL);

    FWCfgEntry *e = &s->entries[arch][s->cur_entry & FW_CFG_ENTRY_MASK];



    trace_fw_cfg_write(s, value);



    if (s->cur_entry & FW_CFG_WRITE_CHANNEL && e->callback &&

        s->cur_offset < e->len) {

        e->data[s->cur_offset++] = value;

        if (s->cur_offset == e->len) {

            e->callback(e->callback_opaque, e->data);

            s->cur_offset = 0;

        }

    }

    /* nothing, write support removed in QEMU v2.4+ */

}



static int fw_cfg_select(FWCfgState *s, uint16_t key)
@@ -436,6 +423,7 @@ static void fw_cfg_add_bytes_read_callback(FWCfgState *s, uint16_t key, 
    key &= FW_CFG_ENTRY_MASK;



    assert(key < FW_CFG_MAX_ENTRY && len < UINT32_MAX);

    assert(s->entries[arch][key].data == NULL); /* avoid key conflict */



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

    s->entries[arch][key].len = (uint32_t)len;
@@ -458,7 +446,6 @@ static void *fw_cfg_modify_bytes_read(FWCfgState *s, uint16_t key, 
    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;

}
@@ -484,6 +471,16 @@ void fw_cfg_add_i16(FWCfgState *s, uint16_t key, uint16_t value) 
    fw_cfg_add_bytes(s, key, copy, sizeof(value));

}



void fw_cfg_modify_i16(FWCfgState *s, uint16_t key, uint16_t value)

{

    uint16_t *copy, *old;



    copy = g_malloc(sizeof(value));

    *copy = cpu_to_le16(value);

    old = fw_cfg_modify_bytes_read(s, key, copy, sizeof(value));

    g_free(old);

}



void fw_cfg_add_i32(FWCfgState *s, uint16_t key, uint32_t value)

{

    uint32_t *copy;
@@ -502,23 +499,6 @@ void fw_cfg_add_i64(FWCfgState *s, uint16_t key, uint64_t value) 
    fw_cfg_add_bytes(s, key, copy, sizeof(value));

}



void fw_cfg_add_callback(FWCfgState *s, uint16_t key, FWCfgCallback callback,

                         void *callback_opaque, void *data, size_t len)

{

    int arch = !!(key & FW_CFG_ARCH_LOCAL);



    assert(key & FW_CFG_WRITE_CHANNEL);



    key &= FW_CFG_ENTRY_MASK;



    assert(key < FW_CFG_MAX_ENTRY && len <= UINT32_MAX);



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

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

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

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

}



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

                              FWCfgReadCallback callback, void *callback_opaque,

                              void *data, size_t len)
@@ -535,18 +515,19 @@ void fw_cfg_add_file_callback(FWCfgState *s, const char *filename, 
    index = be32_to_cpu(s->files->count);

    assert(index < FW_CFG_FILE_SLOTS);



    fw_cfg_add_bytes_read_callback(s, FW_CFG_FILE_FIRST + index,

                                   callback, callback_opaque, data, len);



    pstrcpy(s->files->f[index].name, sizeof(s->files->f[index].name),

            filename);

    for (i = 0; i < index; i++) {

        if (strcmp(s->files->f[index].name, s->files->f[i].name) == 0) {

            trace_fw_cfg_add_file_dupe(s, s->files->f[index].name);

            return;

            error_report("duplicate fw_cfg file name: %s",

                         s->files->f[index].name);

            exit(1);

        }

    }



    fw_cfg_add_bytes_read_callback(s, FW_CFG_FILE_FIRST + index,

                                   callback, callback_opaque, data, len);



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

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

    trace_fw_cfg_add_file(s, index, s->files->f[index].name, len);

hw/ppc/mac_newworld.c

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static const MemoryRegionOps unin_ops = { 
static void fw_cfg_boot_set(void *opaque, const char *boot_device,

                            Error **errp)

{

    fw_cfg_add_i16(opaque, FW_CFG_BOOT_DEVICE, boot_device[0]);

    fw_cfg_modify_i16(opaque, FW_CFG_BOOT_DEVICE, boot_device[0]);

}



static uint64_t translate_kernel_address(void *opaque, uint64_t addr)

hw/ppc/mac_oldworld.c

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 
static void fw_cfg_boot_set(void *opaque, const char *boot_device,

                            Error **errp)

{

    fw_cfg_add_i16(opaque, FW_CFG_BOOT_DEVICE, boot_device[0]);

    fw_cfg_modify_i16(opaque, FW_CFG_BOOT_DEVICE, boot_device[0]);

}



static uint64_t translate_kernel_address(void *opaque, uint64_t addr)

hw/sparc/sun4m.c

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ void DMA_register_channel (int nchan, 
static void fw_cfg_boot_set(void *opaque, const char *boot_device,

                            Error **errp)

{

    fw_cfg_add_i16(opaque, FW_CFG_BOOT_DEVICE, boot_device[0]);

    fw_cfg_modify_i16(opaque, FW_CFG_BOOT_DEVICE, boot_device[0]);

}



static void nvram_init(Nvram *nvram, uint8_t *macaddr,