This type is currently only used when working with pflash firmware builds, so the name is accurate, but we are about to extend its usage to ROM builds as well.
Signed-off-by: Andrea Bolognani <[email protected]> --- src/qemu/qemu_firmware.c | 47 ++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index 52205b72f8..e3471d9adb 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -61,6 +61,13 @@ VIR_ENUM_IMPL(qemuFirmwareOSInterface, ); +typedef struct _qemuFirmwareFile qemuFirmwareFile; +struct _qemuFirmwareFile { + char *filename; + char *format; +}; + + typedef enum { QEMU_FIRMWARE_FLASH_MODE_SPLIT, QEMU_FIRMWARE_FLASH_MODE_COMBINED, @@ -77,18 +84,12 @@ VIR_ENUM_IMPL(qemuFirmwareFlashMode, "stateless", ); -typedef struct _qemuFirmwareFlashFile qemuFirmwareFlashFile; -struct _qemuFirmwareFlashFile { - char *filename; - char *format; -}; - typedef struct _qemuFirmwareMappingFlash qemuFirmwareMappingFlash; struct _qemuFirmwareMappingFlash { qemuFirmwareFlashMode mode; - qemuFirmwareFlashFile executable; - qemuFirmwareFlashFile nvram_template; + qemuFirmwareFile executable; + qemuFirmwareFile nvram_template; }; @@ -198,7 +199,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuFirmwareOSInterface, qemuFirmwareOSInterfaceFr static void -qemuFirmwareFlashFileFreeContent(qemuFirmwareFlashFile *flash) +qemuFirmwareFileFreeContent(qemuFirmwareFile *flash) { g_free(flash->filename); g_free(flash->format); @@ -208,8 +209,8 @@ qemuFirmwareFlashFileFreeContent(qemuFirmwareFlashFile *flash) static void qemuFirmwareMappingFlashFreeContent(qemuFirmwareMappingFlash *flash) { - qemuFirmwareFlashFileFreeContent(&flash->executable); - qemuFirmwareFlashFileFreeContent(&flash->nvram_template); + qemuFirmwareFileFreeContent(&flash->executable); + qemuFirmwareFileFreeContent(&flash->nvram_template); } @@ -325,9 +326,9 @@ qemuFirmwareInterfaceParse(const char *path, static int -qemuFirmwareFlashFileParse(const char *path, - virJSONValue *doc, - qemuFirmwareFlashFile *flash) +qemuFirmwareFileParse(const char *path, + virJSONValue *doc, + qemuFirmwareFile *fwfile) { const char *filename; const char *format; @@ -337,14 +338,14 @@ qemuFirmwareFlashFileParse(const char *path, return -1; } - flash->filename = g_strdup(filename); + fwfile->filename = g_strdup(filename); if (!(format = virJSONValueObjectGetString(doc, "format"))) { VIR_DEBUG("missing 'format' in '%s'", path); return -1; } - flash->format = g_strdup(format); + fwfile->format = g_strdup(format); return 0; } @@ -382,7 +383,7 @@ qemuFirmwareMappingFlashParse(const char *path, return -1; } - if (qemuFirmwareFlashFileParse(path, executable, &flash->executable) < 0) + if (qemuFirmwareFileParse(path, executable, &flash->executable) < 0) return -1; if (flash->mode == QEMU_FIRMWARE_FLASH_MODE_SPLIT) { @@ -391,7 +392,7 @@ qemuFirmwareMappingFlashParse(const char *path, return -1; } - if (qemuFirmwareFlashFileParse(path, nvram_template, &flash->nvram_template) < 0) + if (qemuFirmwareFileParse(path, nvram_template, &flash->nvram_template) < 0) return -1; } @@ -637,19 +638,19 @@ qemuFirmwareInterfaceFormat(virJSONValue *doc, static virJSONValue * -qemuFirmwareFlashFileFormat(qemuFirmwareFlashFile flash) +qemuFirmwareFileFormat(qemuFirmwareFile fwfile) { g_autoptr(virJSONValue) json = virJSONValueNewObject(); virJSONValue *ret; if (virJSONValueObjectAppendString(json, "filename", - flash.filename) < 0) + fwfile.filename) < 0) return NULL; if (virJSONValueObjectAppendString(json, "format", - flash.format) < 0) + fwfile.format) < 0) return NULL; ret = g_steal_pointer(&json); @@ -669,7 +670,7 @@ qemuFirmwareMappingFlashFormat(virJSONValue *mapping, qemuFirmwareFlashModeTypeToString(flash->mode)) < 0) return -1; - if (!(executable = qemuFirmwareFlashFileFormat(flash->executable))) + if (!(executable = qemuFirmwareFileFormat(flash->executable))) return -1; if (virJSONValueObjectAppend(mapping, @@ -678,7 +679,7 @@ qemuFirmwareMappingFlashFormat(virJSONValue *mapping, return -1; if (flash->mode == QEMU_FIRMWARE_FLASH_MODE_SPLIT) { - if (!(nvram_template = qemuFirmwareFlashFileFormat(flash->nvram_template))) + if (!(nvram_template = qemuFirmwareFileFormat(flash->nvram_template))) return -1; if (virJSONValueObjectAppend(mapping, -- 2.52.0
