Commit a6d3c238 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-pull-request' into staging 



fw_cfg and thunk code clean up

# gpg: Signature made Mon 11 Mar 2019 19:11:03 GMT
# gpg:                using RSA key F30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier2/tags/trivial-branch-pull-request:
  hw/nvram/fw_cfg: Use the ldst API
  hw/arm/virt: Remove null-check in virt_build_smbios()
  hw/i386: Remove unused include
  hw/nvram/fw_cfg: Remove the unnecessary boot_splash_filedata_size
  thunk: improve readability of allocation loop

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents eda1df03 3b777a79

hw/acpi/piix4.c

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
#include "sysemu/sysemu.h"

#include "qapi/error.h"

#include "qemu/range.h"

#include "hw/nvram/fw_cfg.h"

#include "exec/address-spaces.h"

#include "hw/acpi/piix4.h"

#include "hw/acpi/pcihp.h"

hw/arm/virt.c

+0 −4
Original line number Diff line number Diff line
@@ -1282,10 +1282,6 @@ static void virt_build_smbios(VirtMachineState *vms) 
    size_t smbios_tables_len, smbios_anchor_len;

    const char *product = "QEMU Virtual Machine";



    if (!vms->fw_cfg) {

        return;

    }



    if (kvm_enabled()) {

        product = "KVM Virtual Machine";

    }

hw/nvram/fw_cfg.c

+4 −5
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static char *read_splashfile(char *filename, gsize *file_sizep, 
    }



    /* check magic ID */

    filehead = ((content[0] & 0xff) + (content[1] << 8)) & 0xffff;

    filehead = lduw_le_p(content);

    if (filehead == 0xd8ff) {

        file_type = JPG_FILE;

    } else if (filehead == 0x4d42) {
@@ -96,7 +96,7 @@ static char *read_splashfile(char *filename, gsize *file_sizep, 


    /* check BMP bpp */

    if (file_type == BMP_FILE) {

        bmp_bpp = (content[28] + (content[29] << 8)) & 0xffff;

        bmp_bpp = lduw_le_p(&content[28]);

        if (bmp_bpp != 24) {

            goto error;

        }
@@ -161,15 +161,14 @@ static void fw_cfg_bootsplash(FWCfgState *s) 
        }

        g_free(boot_splash_filedata);

        boot_splash_filedata = (uint8_t *)file_data;

        boot_splash_filedata_size = file_size;



        /* insert data */

        if (file_type == JPG_FILE) {

            fw_cfg_add_file(s, "bootsplash.jpg",

                    boot_splash_filedata, boot_splash_filedata_size);

                            boot_splash_filedata, file_size);

        } else {

            fw_cfg_add_file(s, "bootsplash.bmp",

                    boot_splash_filedata, boot_splash_filedata_size);

                            boot_splash_filedata, file_size);

        }

        g_free(filename);

    }

include/sysemu/sysemu.h

+0 −1
Original line number Diff line number Diff line
@@ -110,7 +110,6 @@ extern int old_param; 
extern int boot_menu;

extern bool boot_strict;

extern uint8_t *boot_splash_filedata;

extern size_t boot_splash_filedata_size;

extern bool enable_mlock;

extern bool enable_cpu_pm;

extern QEMUClockType rtc_clock;

thunk.c

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ void thunk_register_struct(int id, const char *name, const argtype *types) 
#endif

    /* now we can alloc the data */



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

    for (i = 0; i < ARRAY_SIZE(se->field_offsets); i++) {

        offset = 0;

        max_align = 1;

        se->field_offsets[i] = g_new(int, nb_fields);