Subject: [PATCH] fw-cfg: QEMU_FW_CFG Targets VMAware check: QEMU_FW_CFG The fw_cfg device signature, which names QEMU literally. Applies to QEMU v11.1.1. Apply from the source root with: patch -p1 < 04-fw-cfg.patch --- diff --git a/hw/i386/fw_cfg.c b/hw/i386/fw_cfg.c index 5903994..e5fddbc 100644 --- a/hw/i386/fw_cfg.c +++ b/hw/i386/fw_cfg.c @@ -77,7 +77,7 @@ void fw_cfg_build_smbios(PCMachineState *pcms, FWCfgState *fw_cfg, if (pcmc->smbios_defaults) { /* These values are guest ABI, do not change */ - smbios_set_defaults("QEMU", mc->desc, mc->name); + smbios_set_defaults("Unknown", mc->desc, mc->name); } /* tell smbios about cpuid version and features */ diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index b057d87..a253fe8 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -56,7 +56,7 @@ #define FW_CFG_DMA_CTL_SELECT 0x08 #define FW_CFG_DMA_CTL_WRITE 0x10 -#define FW_CFG_DMA_SIGNATURE 0x51454d5520434647ULL /* "QEMU CFG" */ +#define FW_CFG_DMA_SIGNATURE 0x51434f4d20434647ULL /* "QCOM CFG" */ struct FWCfgEntry { uint32_t len; @@ -1002,7 +1002,7 @@ static void fw_cfg_common_realize(DeviceState *dev, Error **errp) return; } - fw_cfg_add_bytes(s, FW_CFG_SIGNATURE, (char *)"QEMU", 4); + fw_cfg_add_bytes(s, FW_CFG_SIGNATURE, (char *)"QEMU", 4); // "QEMU" fw_cfg_add_bytes(s, FW_CFG_UUID, &qemu_uuid, 16); fw_cfg_add_i16(s, FW_CFG_NOGRAPHIC, (uint16_t)!machine->enable_graphics); fw_cfg_add_i16(s, FW_CFG_BOOT_MENU, (uint16_t)(machine->boot_config.has_menu && machine->boot_config.menu)); diff --git a/include/standard-headers/linux/qemu_fw_cfg.h b/include/standard-headers/linux/qemu_fw_cfg.h index cb93f66..0527126 100644 --- a/include/standard-headers/linux/qemu_fw_cfg.h +++ b/include/standard-headers/linux/qemu_fw_cfg.h @@ -71,7 +71,7 @@ struct fw_cfg_file { #define FW_CFG_DMA_CTL_SELECT 0x08 #define FW_CFG_DMA_CTL_WRITE 0x10 -#define FW_CFG_DMA_SIGNATURE 0x51454d5520434647ULL /* "QEMU CFG" */ +#define FW_CFG_DMA_SIGNATURE 0x51434f4d20434647ULL /* "QCOM CFG" */ /* Control as first field allows for different structures selected by this * field, which might be useful in the future