Re: [PULL 04/24] hw/uefi: add include/hw/uefi/var-service.h

["Philippe Mathieu-Daudé" <philmd@linaro.org>]

Hi,

On 4/3/25 13:47, Gerd Hoffmann wrote:
> Add state structs and function declarations for the uefi-vars device.
> 
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> Message-ID: <20250225163031.1409078-5-kraxel@redhat.com>
> ---
>   include/hw/uefi/var-service.h | 191 ++++++++++++++++++++++++++++++++++
>   1 file changed, 191 insertions(+)
>   create mode 100644 include/hw/uefi/var-service.h
> 
> diff --git a/include/hw/uefi/var-service.h b/include/hw/uefi/var-service.h
> new file mode 100644
> index 000000000000..f7ceac4ce243
> --- /dev/null
> +++ b/include/hw/uefi/var-service.h
> @@ -0,0 +1,191 @@
> +/*
> + * SPDX-License-Identifier: GPL-2.0-or-later
> + *
> + * uefi-vars device - state struct and function prototypes
> + */
> +#ifndef QEMU_UEFI_VAR_SERVICE_H
> +#define QEMU_UEFI_VAR_SERVICE_H
> +
> +#include "qemu/uuid.h"
> +#include "qemu/queue.h"
> +
> +#include "hw/uefi/var-service-edk2.h"
> +
> +#define MAX_BUFFER_SIZE (64 * 1024)
> +
> +typedef struct uefi_variable uefi_variable;
> +typedef struct uefi_var_policy uefi_var_policy;
> +typedef struct uefi_vars_state uefi_vars_state;
> +
> +typedef struct uefi_vars_cert uefi_vars_cert;
> +typedef struct uefi_vars_hash uefi_vars_hash;
> +typedef struct uefi_vars_siglist uefi_vars_siglist;
> +
> +struct uefi_variable {
> +    QemuUUID                          guid;
> +    uint16_t                          *name;
> +    uint32_t                          name_size;
> +    uint32_t                          attributes;
> +    void                              *data;
> +    uint32_t                          data_size;
> +    efi_time                          time;
> +    void                              *digest;
> +    uint32_t                          digest_size;
> +    QTAILQ_ENTRY(uefi_variable)       next;
> +};
> +
> +struct uefi_var_policy {
> +    variable_policy_entry             *entry;
> +    uint32_t                          entry_size;
> +    uint16_t                          *name;
> +    uint32_t                          name_size;
> +
> +    /* number of hashmarks (wildcard character) in name */
> +    uint32_t                          hashmarks;
> +
> +    QTAILQ_ENTRY(uefi_var_policy)     next;
> +};
> +
> +struct uefi_vars_state {
> +    MemoryRegion                      mr;

FYI this is missing "system/memory.h" which is indirectly included,
otherwise when refactoring unrelated generic headers I get:

include/hw/uefi/var-service.h:50:39: error: field has incomplete type 
'MemoryRegion' (aka 'struct MemoryRegion')
    50 |     MemoryRegion                      mr;
       |                                       ^
include/qemu/typedefs.h:68:16: note: forward declaration of 'struct 
MemoryRegion'
    68 | typedef struct MemoryRegion MemoryRegion;
       |                ^

No need to post a fix, I'll with my refactor.

> +    uint16_t                          sts;
> +    uint32_t                          buf_size;
> +    uint32_t                          buf_addr_lo;
> +    uint32_t                          buf_addr_hi;
> +    uint8_t                           *buffer;
> +    QTAILQ_HEAD(, uefi_variable)      variables;
> +    QTAILQ_HEAD(, uefi_var_policy)    var_policies;
> +
> +    /* pio transfer buffer */
> +    uint32_t                          pio_xfer_offset;
> +    uint8_t                           *pio_xfer_buffer;
> +
> +    /* boot phases */
> +    bool                              end_of_dxe;
> +    bool                              ready_to_boot;
> +    bool                              exit_boot_service;
> +    bool                              policy_locked;
> +
> +    /* storage accounting */
> +    uint64_t                          max_storage;
> +    uint64_t                          used_storage;
> +
> +    /* config options */
> +    char                              *jsonfile;
> +    int                               jsonfd;
> +    bool                              force_secure_boot;
> +    bool                              disable_custom_mode;
> +    bool                              use_pio;
> +};