* [Qemu-devel] [PATCH 1/2] update-linux-headers.sh: add qemu_fw_cfg.h
@ 2018-08-17 15:59 Marc-André Lureau
2018-08-17 15:59 ` [Qemu-devel] [PATCH 2/2] fw_cfg: import & use linux/qemu_fw_cfg.h Marc-André Lureau
0 siblings, 1 reply; 3+ messages in thread
From: Marc-André Lureau @ 2018-08-17 15:59 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, pbonzini, Marc-André Lureau
The fw_cfg header was added during 4.17 cycle.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
scripts/update-linux-headers.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
index feb75390aa..0a964fe240 100755
--- a/scripts/update-linux-headers.sh
+++ b/scripts/update-linux-headers.sh
@@ -165,7 +165,9 @@ EOF
rm -rf "$output/include/standard-headers/linux"
mkdir -p "$output/include/standard-headers/linux"
-for i in "$tmpdir"/include/linux/*virtio*.h "$tmpdir/include/linux/input.h" \
+for i in "$tmpdir"/include/linux/*virtio*.h \
+ "$tmpdir/include/linux/qemu_fw_cfg.h" \
+ "$tmpdir/include/linux/input.h" \
"$tmpdir/include/linux/input-event-codes.h" \
"$tmpdir/include/linux/pci_regs.h" \
"$tmpdir/include/linux/ethtool.h" "$tmpdir/include/linux/kernel.h" \
--
2.18.0.547.g1d89318c48
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Qemu-devel] [PATCH 2/2] fw_cfg: import & use linux/qemu_fw_cfg.h
2018-08-17 15:59 [Qemu-devel] [PATCH 1/2] update-linux-headers.sh: add qemu_fw_cfg.h Marc-André Lureau
@ 2018-08-17 15:59 ` Marc-André Lureau
2018-08-17 17:34 ` Paolo Bonzini
0 siblings, 1 reply; 3+ messages in thread
From: Marc-André Lureau @ 2018-08-17 15:59 UTC (permalink / raw)
To: qemu-devel; +Cc: mst, pbonzini, Marc-André Lureau
Use kernel common header for fw_cfg.
(unfortunately, optionrom.h must have its own define, since it's
actually an assembler header)
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
include/hw/misc/vmcoreinfo.h | 12 +--
include/hw/nvram/fw_cfg.h | 18 +---
include/hw/nvram/fw_cfg_keys.h | 45 ---------
include/standard-headers/linux/qemu_fw_cfg.h | 97 ++++++++++++++++++++
pc-bios/optionrom/optionrom.h | 15 ++-
dump.c | 2 +-
hw/misc/vmcoreinfo.c | 6 +-
pc-bios/optionrom/linuxboot_dma.c | 4 +-
tests/boot-order-test.c | 2 +-
tests/fw_cfg-test.c | 2 +-
tests/libqos/malloc-pc.c | 2 +-
11 files changed, 125 insertions(+), 80 deletions(-)
delete mode 100644 include/hw/nvram/fw_cfg_keys.h
create mode 100644 include/standard-headers/linux/qemu_fw_cfg.h
diff --git a/include/hw/misc/vmcoreinfo.h b/include/hw/misc/vmcoreinfo.h
index c3aa856545..0d11578059 100644
--- a/include/hw/misc/vmcoreinfo.h
+++ b/include/hw/misc/vmcoreinfo.h
@@ -13,20 +13,12 @@
#define VMCOREINFO_H
#include "hw/qdev.h"
+#include "standard-headers/linux/qemu_fw_cfg.h"
#define VMCOREINFO_DEVICE "vmcoreinfo"
#define VMCOREINFO(obj) OBJECT_CHECK(VMCoreInfoState, (obj), VMCOREINFO_DEVICE)
-#define VMCOREINFO_FORMAT_NONE 0x0
-#define VMCOREINFO_FORMAT_ELF 0x1
-
-/* all fields are little-endian */
-typedef struct FWCfgVMCoreInfo {
- uint16_t host_format; /* set on reset */
- uint16_t guest_format;
- uint32_t size;
- uint64_t paddr;
-} QEMU_PACKED FWCfgVMCoreInfo;
+typedef struct fw_cfg_vmcoreinfo FWCfgVMCoreInfo;
typedef struct VMCoreInfoState {
DeviceClass parent_obj;
diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h
index b2259cc4a3..f5a6895a74 100644
--- a/include/hw/nvram/fw_cfg.h
+++ b/include/hw/nvram/fw_cfg.h
@@ -2,7 +2,7 @@
#define FW_CFG_H
#include "exec/hwaddr.h"
-#include "hw/nvram/fw_cfg_keys.h"
+#include "standard-headers/linux/qemu_fw_cfg.h"
#include "hw/sysbus.h"
#include "sysemu/dma.h"
@@ -14,12 +14,7 @@
#define FW_CFG_IO(obj) OBJECT_CHECK(FWCfgIoState, (obj), TYPE_FW_CFG_IO)
#define FW_CFG_MEM(obj) OBJECT_CHECK(FWCfgMemState, (obj), TYPE_FW_CFG_MEM)
-typedef struct FWCfgFile {
- uint32_t size; /* file size */
- uint16_t select; /* write this to 0x510 to read it */
- uint16_t reserved;
- char name[FW_CFG_MAX_FILE_PATH];
-} FWCfgFile;
+typedef struct fw_cfg_file FWCfgFile;
#define FW_CFG_ORDER_OVERRIDE_VGA 70
#define FW_CFG_ORDER_OVERRIDE_NIC 80
@@ -34,14 +29,7 @@ typedef struct FWCfgFiles {
FWCfgFile f[];
} FWCfgFiles;
-/* Control as first field allows for different structures selected by this
- * field, which might be useful in the future
- */
-typedef struct FWCfgDmaAccess {
- uint32_t control;
- uint32_t length;
- uint64_t address;
-} QEMU_PACKED FWCfgDmaAccess;
+typedef struct fw_cfg_dma_access FWCfgDmaAccess;
typedef void (*FWCfgCallback)(void *opaque);
typedef void (*FWCfgWriteCallback)(void *opaque, off_t start, size_t len);
diff --git a/include/hw/nvram/fw_cfg_keys.h b/include/hw/nvram/fw_cfg_keys.h
deleted file mode 100644
index b6919451f5..0000000000
--- a/include/hw/nvram/fw_cfg_keys.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef FW_CFG_KEYS_H
-#define FW_CFG_KEYS_H
-
-#define FW_CFG_SIGNATURE 0x00
-#define FW_CFG_ID 0x01
-#define FW_CFG_UUID 0x02
-#define FW_CFG_RAM_SIZE 0x03
-#define FW_CFG_NOGRAPHIC 0x04
-#define FW_CFG_NB_CPUS 0x05
-#define FW_CFG_MACHINE_ID 0x06
-#define FW_CFG_KERNEL_ADDR 0x07
-#define FW_CFG_KERNEL_SIZE 0x08
-#define FW_CFG_KERNEL_CMDLINE 0x09
-#define FW_CFG_INITRD_ADDR 0x0a
-#define FW_CFG_INITRD_SIZE 0x0b
-#define FW_CFG_BOOT_DEVICE 0x0c
-#define FW_CFG_NUMA 0x0d
-#define FW_CFG_BOOT_MENU 0x0e
-#define FW_CFG_MAX_CPUS 0x0f
-#define FW_CFG_KERNEL_ENTRY 0x10
-#define FW_CFG_KERNEL_DATA 0x11
-#define FW_CFG_INITRD_DATA 0x12
-#define FW_CFG_CMDLINE_ADDR 0x13
-#define FW_CFG_CMDLINE_SIZE 0x14
-#define FW_CFG_CMDLINE_DATA 0x15
-#define FW_CFG_SETUP_ADDR 0x16
-#define FW_CFG_SETUP_SIZE 0x17
-#define FW_CFG_SETUP_DATA 0x18
-#define FW_CFG_FILE_DIR 0x19
-
-#define FW_CFG_FILE_FIRST 0x20
-#define FW_CFG_FILE_SLOTS_MIN 0x10
-
-#define FW_CFG_WRITE_CHANNEL 0x4000
-#define FW_CFG_ARCH_LOCAL 0x8000
-#define FW_CFG_ENTRY_MASK (~(FW_CFG_WRITE_CHANNEL | FW_CFG_ARCH_LOCAL))
-
-#define FW_CFG_INVALID 0xffff
-
-/* width in bytes of fw_cfg control register */
-#define FW_CFG_CTL_SIZE 0x02
-
-#define FW_CFG_MAX_FILE_PATH 56
-
-#endif
diff --git a/include/standard-headers/linux/qemu_fw_cfg.h b/include/standard-headers/linux/qemu_fw_cfg.h
new file mode 100644
index 0000000000..cb93f6678d
--- /dev/null
+++ b/include/standard-headers/linux/qemu_fw_cfg.h
@@ -0,0 +1,97 @@
+/* SPDX-License-Identifier: BSD-3-Clause */
+#ifndef _LINUX_FW_CFG_H
+#define _LINUX_FW_CFG_H
+
+#include "standard-headers/linux/types.h"
+
+#define FW_CFG_ACPI_DEVICE_ID "QEMU0002"
+
+/* selector key values for "well-known" fw_cfg entries */
+#define FW_CFG_SIGNATURE 0x00
+#define FW_CFG_ID 0x01
+#define FW_CFG_UUID 0x02
+#define FW_CFG_RAM_SIZE 0x03
+#define FW_CFG_NOGRAPHIC 0x04
+#define FW_CFG_NB_CPUS 0x05
+#define FW_CFG_MACHINE_ID 0x06
+#define FW_CFG_KERNEL_ADDR 0x07
+#define FW_CFG_KERNEL_SIZE 0x08
+#define FW_CFG_KERNEL_CMDLINE 0x09
+#define FW_CFG_INITRD_ADDR 0x0a
+#define FW_CFG_INITRD_SIZE 0x0b
+#define FW_CFG_BOOT_DEVICE 0x0c
+#define FW_CFG_NUMA 0x0d
+#define FW_CFG_BOOT_MENU 0x0e
+#define FW_CFG_MAX_CPUS 0x0f
+#define FW_CFG_KERNEL_ENTRY 0x10
+#define FW_CFG_KERNEL_DATA 0x11
+#define FW_CFG_INITRD_DATA 0x12
+#define FW_CFG_CMDLINE_ADDR 0x13
+#define FW_CFG_CMDLINE_SIZE 0x14
+#define FW_CFG_CMDLINE_DATA 0x15
+#define FW_CFG_SETUP_ADDR 0x16
+#define FW_CFG_SETUP_SIZE 0x17
+#define FW_CFG_SETUP_DATA 0x18
+#define FW_CFG_FILE_DIR 0x19
+
+#define FW_CFG_FILE_FIRST 0x20
+#define FW_CFG_FILE_SLOTS_MIN 0x10
+
+#define FW_CFG_WRITE_CHANNEL 0x4000
+#define FW_CFG_ARCH_LOCAL 0x8000
+#define FW_CFG_ENTRY_MASK (~(FW_CFG_WRITE_CHANNEL | FW_CFG_ARCH_LOCAL))
+
+#define FW_CFG_INVALID 0xffff
+
+/* width in bytes of fw_cfg control register */
+#define FW_CFG_CTL_SIZE 0x02
+
+/* fw_cfg "file name" is up to 56 characters (including terminating nul) */
+#define FW_CFG_MAX_FILE_PATH 56
+
+/* size in bytes of fw_cfg signature */
+#define FW_CFG_SIG_SIZE 4
+
+/* FW_CFG_ID bits */
+#define FW_CFG_VERSION 0x01
+#define FW_CFG_VERSION_DMA 0x02
+
+/* fw_cfg file directory entry type */
+struct fw_cfg_file {
+ uint32_t size;
+ uint16_t select;
+ uint16_t reserved;
+ char name[FW_CFG_MAX_FILE_PATH];
+};
+
+/* FW_CFG_DMA_CONTROL bits */
+#define FW_CFG_DMA_CTL_ERROR 0x01
+#define FW_CFG_DMA_CTL_READ 0x02
+#define FW_CFG_DMA_CTL_SKIP 0x04
+#define FW_CFG_DMA_CTL_SELECT 0x08
+#define FW_CFG_DMA_CTL_WRITE 0x10
+
+#define FW_CFG_DMA_SIGNATURE 0x51454d5520434647ULL /* "QEMU CFG" */
+
+/* Control as first field allows for different structures selected by this
+ * field, which might be useful in the future
+ */
+struct fw_cfg_dma_access {
+ uint32_t control;
+ uint32_t length;
+ uint64_t address;
+};
+
+#define FW_CFG_VMCOREINFO_FILENAME "etc/vmcoreinfo"
+
+#define FW_CFG_VMCOREINFO_FORMAT_NONE 0x0
+#define FW_CFG_VMCOREINFO_FORMAT_ELF 0x1
+
+struct fw_cfg_vmcoreinfo {
+ uint16_t host_format;
+ uint16_t guest_format;
+ uint32_t size;
+ uint64_t paddr;
+};
+
+#endif
diff --git a/pc-bios/optionrom/optionrom.h b/pc-bios/optionrom/optionrom.h
index 6c4c2c82f4..a2b612f1a7 100644
--- a/pc-bios/optionrom/optionrom.h
+++ b/pc-bios/optionrom/optionrom.h
@@ -19,7 +19,20 @@
*/
-#include "../../include/hw/nvram/fw_cfg_keys.h"
+#define FW_CFG_KERNEL_ADDR 0x07
+#define FW_CFG_KERNEL_SIZE 0x08
+#define FW_CFG_KERNEL_CMDLINE 0x09
+#define FW_CFG_INITRD_ADDR 0x0a
+#define FW_CFG_INITRD_SIZE 0x0b
+#define FW_CFG_KERNEL_ENTRY 0x10
+#define FW_CFG_KERNEL_DATA 0x11
+#define FW_CFG_INITRD_DATA 0x12
+#define FW_CFG_CMDLINE_ADDR 0x13
+#define FW_CFG_CMDLINE_SIZE 0x14
+#define FW_CFG_CMDLINE_DATA 0x15
+#define FW_CFG_SETUP_ADDR 0x16
+#define FW_CFG_SETUP_SIZE 0x17
+#define FW_CFG_SETUP_DATA 0x18
#define BIOS_CFG_IOPORT_CFG 0x510
#define BIOS_CFG_IOPORT_DATA 0x511
diff --git a/dump.c b/dump.c
index 04467b353e..500b554523 100644
--- a/dump.c
+++ b/dump.c
@@ -1742,7 +1742,7 @@ static void dump_init(DumpState *s, int fd, bool has_format,
warn_report("guest note is not present");
} else if (size < note_head_size || size > MAX_GUEST_NOTE_SIZE) {
warn_report("guest note size is invalid: %" PRIu32, size);
- } else if (format != VMCOREINFO_FORMAT_ELF) {
+ } else if (format != FW_CFG_VMCOREINFO_FORMAT_ELF) {
warn_report("guest note format is unsupported: %" PRIu16, format);
} else {
s->guest_note = g_malloc(size + 1); /* +1 for adding \0 */
diff --git a/hw/misc/vmcoreinfo.c b/hw/misc/vmcoreinfo.c
index a2805527cb..304c6287c7 100644
--- a/hw/misc/vmcoreinfo.c
+++ b/hw/misc/vmcoreinfo.c
@@ -19,7 +19,7 @@ static void fw_cfg_vmci_write(void *dev, off_t offset, size_t len)
VMCoreInfoState *s = VMCOREINFO(dev);
s->has_vmcoreinfo = offset == 0 && len == sizeof(s->vmcoreinfo)
- && s->vmcoreinfo.guest_format != VMCOREINFO_FORMAT_NONE;
+ && s->vmcoreinfo.guest_format != FW_CFG_VMCOREINFO_FORMAT_NONE;
}
static void vmcoreinfo_reset(void *dev)
@@ -28,7 +28,7 @@ static void vmcoreinfo_reset(void *dev)
s->has_vmcoreinfo = false;
memset(&s->vmcoreinfo, 0, sizeof(s->vmcoreinfo));
- s->vmcoreinfo.host_format = cpu_to_le16(VMCOREINFO_FORMAT_ELF);
+ s->vmcoreinfo.host_format = cpu_to_le16(FW_CFG_VMCOREINFO_FORMAT_ELF);
}
static void vmcoreinfo_realize(DeviceState *dev, Error **errp)
@@ -53,7 +53,7 @@ static void vmcoreinfo_realize(DeviceState *dev, Error **errp)
return;
}
- fw_cfg_add_file_callback(fw_cfg, "etc/vmcoreinfo",
+ fw_cfg_add_file_callback(fw_cfg, FW_CFG_VMCOREINFO_FILENAME,
NULL, fw_cfg_vmci_write, s,
&s->vmcoreinfo, sizeof(s->vmcoreinfo), false);
diff --git a/pc-bios/optionrom/linuxboot_dma.c b/pc-bios/optionrom/linuxboot_dma.c
index 4754282ad7..d856d41b55 100644
--- a/pc-bios/optionrom/linuxboot_dma.c
+++ b/pc-bios/optionrom/linuxboot_dma.c
@@ -58,8 +58,6 @@ asm(
" jmp load_kernel\n"
);
-#include "../../include/hw/nvram/fw_cfg_keys.h"
-
/* QEMU_CFG_DMA_CONTROL bits */
#define BIOS_CFG_DMA_CTL_ERROR 0x01
#define BIOS_CFG_DMA_CTL_READ 0x02
@@ -73,6 +71,8 @@ asm(
#define uint32_t unsigned int
#define uint16_t unsigned short
+#include "../../include/standard-headers/linux/qemu_fw_cfg.h"
+
#define barrier() asm("" : : : "memory")
typedef struct FWCfgDmaAccess {
diff --git a/tests/boot-order-test.c b/tests/boot-order-test.c
index 9d98c48a3d..c60ebcf9d9 100644
--- a/tests/boot-order-test.c
+++ b/tests/boot-order-test.c
@@ -14,7 +14,7 @@
#include "libqos/fw_cfg.h"
#include "libqtest.h"
#include "qapi/qmp/qdict.h"
-#include "hw/nvram/fw_cfg_keys.h"
+#include "standard-headers/linux/qemu_fw_cfg.h"
/* TODO actually test the results and get rid of this */
#define qmp_discard_response(...) qobject_unref(qmp(__VA_ARGS__))
diff --git a/tests/fw_cfg-test.c b/tests/fw_cfg-test.c
index 1548bf14b2..1c5103fe1c 100644
--- a/tests/fw_cfg-test.c
+++ b/tests/fw_cfg-test.c
@@ -13,7 +13,7 @@
#include "qemu/osdep.h"
#include "libqtest.h"
-#include "hw/nvram/fw_cfg_keys.h"
+#include "standard-headers/linux/qemu_fw_cfg.h"
#include "libqos/fw_cfg.h"
static uint64_t ram_size = 128 << 20;
diff --git a/tests/libqos/malloc-pc.c b/tests/libqos/malloc-pc.c
index 634b9c288a..b83cb8f0af 100644
--- a/tests/libqos/malloc-pc.c
+++ b/tests/libqos/malloc-pc.c
@@ -14,7 +14,7 @@
#include "libqos/malloc-pc.h"
#include "libqos/fw_cfg.h"
-#include "hw/nvram/fw_cfg_keys.h"
+#include "standard-headers/linux/qemu_fw_cfg.h"
#include "qemu-common.h"
--
2.18.0.547.g1d89318c48
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH 2/2] fw_cfg: import & use linux/qemu_fw_cfg.h
2018-08-17 15:59 ` [Qemu-devel] [PATCH 2/2] fw_cfg: import & use linux/qemu_fw_cfg.h Marc-André Lureau
@ 2018-08-17 17:34 ` Paolo Bonzini
0 siblings, 0 replies; 3+ messages in thread
From: Paolo Bonzini @ 2018-08-17 17:34 UTC (permalink / raw)
To: Marc-André Lureau, qemu-devel; +Cc: mst
On 17/08/2018 17:59, Marc-André Lureau wrote:
> Use kernel common header for fw_cfg.
>
> (unfortunately, optionrom.h must have its own define, since it's
> actually an assembler header)
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> include/hw/misc/vmcoreinfo.h | 12 +--
> include/hw/nvram/fw_cfg.h | 18 +---
> include/hw/nvram/fw_cfg_keys.h | 45 ---------
> include/standard-headers/linux/qemu_fw_cfg.h | 97 ++++++++++++++++++++
> pc-bios/optionrom/optionrom.h | 15 ++-
> dump.c | 2 +-
> hw/misc/vmcoreinfo.c | 6 +-
> pc-bios/optionrom/linuxboot_dma.c | 4 +-
> tests/boot-order-test.c | 2 +-
> tests/fw_cfg-test.c | 2 +-
> tests/libqos/malloc-pc.c | 2 +-
> 11 files changed, 125 insertions(+), 80 deletions(-)
> delete mode 100644 include/hw/nvram/fw_cfg_keys.h
> create mode 100644 include/standard-headers/linux/qemu_fw_cfg.h
>
> diff --git a/include/hw/misc/vmcoreinfo.h b/include/hw/misc/vmcoreinfo.h
> index c3aa856545..0d11578059 100644
> --- a/include/hw/misc/vmcoreinfo.h
> +++ b/include/hw/misc/vmcoreinfo.h
> @@ -13,20 +13,12 @@
> #define VMCOREINFO_H
>
> #include "hw/qdev.h"
> +#include "standard-headers/linux/qemu_fw_cfg.h"
>
> #define VMCOREINFO_DEVICE "vmcoreinfo"
> #define VMCOREINFO(obj) OBJECT_CHECK(VMCoreInfoState, (obj), VMCOREINFO_DEVICE)
>
> -#define VMCOREINFO_FORMAT_NONE 0x0
> -#define VMCOREINFO_FORMAT_ELF 0x1
> -
> -/* all fields are little-endian */
> -typedef struct FWCfgVMCoreInfo {
> - uint16_t host_format; /* set on reset */
> - uint16_t guest_format;
> - uint32_t size;
> - uint64_t paddr;
> -} QEMU_PACKED FWCfgVMCoreInfo;
> +typedef struct fw_cfg_vmcoreinfo FWCfgVMCoreInfo;
>
> typedef struct VMCoreInfoState {
> DeviceClass parent_obj;
> diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h
> index b2259cc4a3..f5a6895a74 100644
> --- a/include/hw/nvram/fw_cfg.h
> +++ b/include/hw/nvram/fw_cfg.h
> @@ -2,7 +2,7 @@
> #define FW_CFG_H
>
> #include "exec/hwaddr.h"
> -#include "hw/nvram/fw_cfg_keys.h"
> +#include "standard-headers/linux/qemu_fw_cfg.h"
> #include "hw/sysbus.h"
> #include "sysemu/dma.h"
>
> @@ -14,12 +14,7 @@
> #define FW_CFG_IO(obj) OBJECT_CHECK(FWCfgIoState, (obj), TYPE_FW_CFG_IO)
> #define FW_CFG_MEM(obj) OBJECT_CHECK(FWCfgMemState, (obj), TYPE_FW_CFG_MEM)
>
> -typedef struct FWCfgFile {
> - uint32_t size; /* file size */
> - uint16_t select; /* write this to 0x510 to read it */
> - uint16_t reserved;
> - char name[FW_CFG_MAX_FILE_PATH];
> -} FWCfgFile;
> +typedef struct fw_cfg_file FWCfgFile;
>
> #define FW_CFG_ORDER_OVERRIDE_VGA 70
> #define FW_CFG_ORDER_OVERRIDE_NIC 80
> @@ -34,14 +29,7 @@ typedef struct FWCfgFiles {
> FWCfgFile f[];
> } FWCfgFiles;
>
> -/* Control as first field allows for different structures selected by this
> - * field, which might be useful in the future
> - */
> -typedef struct FWCfgDmaAccess {
> - uint32_t control;
> - uint32_t length;
> - uint64_t address;
> -} QEMU_PACKED FWCfgDmaAccess;
> +typedef struct fw_cfg_dma_access FWCfgDmaAccess;
>
> typedef void (*FWCfgCallback)(void *opaque);
> typedef void (*FWCfgWriteCallback)(void *opaque, off_t start, size_t len);
> diff --git a/include/hw/nvram/fw_cfg_keys.h b/include/hw/nvram/fw_cfg_keys.h
> deleted file mode 100644
> index b6919451f5..0000000000
> --- a/include/hw/nvram/fw_cfg_keys.h
> +++ /dev/null
> @@ -1,45 +0,0 @@
> -#ifndef FW_CFG_KEYS_H
> -#define FW_CFG_KEYS_H
> -
> -#define FW_CFG_SIGNATURE 0x00
> -#define FW_CFG_ID 0x01
> -#define FW_CFG_UUID 0x02
> -#define FW_CFG_RAM_SIZE 0x03
> -#define FW_CFG_NOGRAPHIC 0x04
> -#define FW_CFG_NB_CPUS 0x05
> -#define FW_CFG_MACHINE_ID 0x06
> -#define FW_CFG_KERNEL_ADDR 0x07
> -#define FW_CFG_KERNEL_SIZE 0x08
> -#define FW_CFG_KERNEL_CMDLINE 0x09
> -#define FW_CFG_INITRD_ADDR 0x0a
> -#define FW_CFG_INITRD_SIZE 0x0b
> -#define FW_CFG_BOOT_DEVICE 0x0c
> -#define FW_CFG_NUMA 0x0d
> -#define FW_CFG_BOOT_MENU 0x0e
> -#define FW_CFG_MAX_CPUS 0x0f
> -#define FW_CFG_KERNEL_ENTRY 0x10
> -#define FW_CFG_KERNEL_DATA 0x11
> -#define FW_CFG_INITRD_DATA 0x12
> -#define FW_CFG_CMDLINE_ADDR 0x13
> -#define FW_CFG_CMDLINE_SIZE 0x14
> -#define FW_CFG_CMDLINE_DATA 0x15
> -#define FW_CFG_SETUP_ADDR 0x16
> -#define FW_CFG_SETUP_SIZE 0x17
> -#define FW_CFG_SETUP_DATA 0x18
> -#define FW_CFG_FILE_DIR 0x19
> -
> -#define FW_CFG_FILE_FIRST 0x20
> -#define FW_CFG_FILE_SLOTS_MIN 0x10
> -
> -#define FW_CFG_WRITE_CHANNEL 0x4000
> -#define FW_CFG_ARCH_LOCAL 0x8000
> -#define FW_CFG_ENTRY_MASK (~(FW_CFG_WRITE_CHANNEL | FW_CFG_ARCH_LOCAL))
> -
> -#define FW_CFG_INVALID 0xffff
> -
> -/* width in bytes of fw_cfg control register */
> -#define FW_CFG_CTL_SIZE 0x02
> -
> -#define FW_CFG_MAX_FILE_PATH 56
> -
> -#endif
> diff --git a/include/standard-headers/linux/qemu_fw_cfg.h b/include/standard-headers/linux/qemu_fw_cfg.h
> new file mode 100644
> index 0000000000..cb93f6678d
> --- /dev/null
> +++ b/include/standard-headers/linux/qemu_fw_cfg.h
> @@ -0,0 +1,97 @@
> +/* SPDX-License-Identifier: BSD-3-Clause */
> +#ifndef _LINUX_FW_CFG_H
> +#define _LINUX_FW_CFG_H
> +
> +#include "standard-headers/linux/types.h"
> +
> +#define FW_CFG_ACPI_DEVICE_ID "QEMU0002"
> +
> +/* selector key values for "well-known" fw_cfg entries */
> +#define FW_CFG_SIGNATURE 0x00
> +#define FW_CFG_ID 0x01
> +#define FW_CFG_UUID 0x02
> +#define FW_CFG_RAM_SIZE 0x03
> +#define FW_CFG_NOGRAPHIC 0x04
> +#define FW_CFG_NB_CPUS 0x05
> +#define FW_CFG_MACHINE_ID 0x06
> +#define FW_CFG_KERNEL_ADDR 0x07
> +#define FW_CFG_KERNEL_SIZE 0x08
> +#define FW_CFG_KERNEL_CMDLINE 0x09
> +#define FW_CFG_INITRD_ADDR 0x0a
> +#define FW_CFG_INITRD_SIZE 0x0b
> +#define FW_CFG_BOOT_DEVICE 0x0c
> +#define FW_CFG_NUMA 0x0d
> +#define FW_CFG_BOOT_MENU 0x0e
> +#define FW_CFG_MAX_CPUS 0x0f
> +#define FW_CFG_KERNEL_ENTRY 0x10
> +#define FW_CFG_KERNEL_DATA 0x11
> +#define FW_CFG_INITRD_DATA 0x12
> +#define FW_CFG_CMDLINE_ADDR 0x13
> +#define FW_CFG_CMDLINE_SIZE 0x14
> +#define FW_CFG_CMDLINE_DATA 0x15
> +#define FW_CFG_SETUP_ADDR 0x16
> +#define FW_CFG_SETUP_SIZE 0x17
> +#define FW_CFG_SETUP_DATA 0x18
> +#define FW_CFG_FILE_DIR 0x19
> +
> +#define FW_CFG_FILE_FIRST 0x20
> +#define FW_CFG_FILE_SLOTS_MIN 0x10
> +
> +#define FW_CFG_WRITE_CHANNEL 0x4000
> +#define FW_CFG_ARCH_LOCAL 0x8000
> +#define FW_CFG_ENTRY_MASK (~(FW_CFG_WRITE_CHANNEL | FW_CFG_ARCH_LOCAL))
> +
> +#define FW_CFG_INVALID 0xffff
> +
> +/* width in bytes of fw_cfg control register */
> +#define FW_CFG_CTL_SIZE 0x02
> +
> +/* fw_cfg "file name" is up to 56 characters (including terminating nul) */
> +#define FW_CFG_MAX_FILE_PATH 56
> +
> +/* size in bytes of fw_cfg signature */
> +#define FW_CFG_SIG_SIZE 4
> +
> +/* FW_CFG_ID bits */
> +#define FW_CFG_VERSION 0x01
> +#define FW_CFG_VERSION_DMA 0x02
> +
> +/* fw_cfg file directory entry type */
> +struct fw_cfg_file {
> + uint32_t size;
> + uint16_t select;
> + uint16_t reserved;
> + char name[FW_CFG_MAX_FILE_PATH];
> +};
> +
> +/* FW_CFG_DMA_CONTROL bits */
> +#define FW_CFG_DMA_CTL_ERROR 0x01
> +#define FW_CFG_DMA_CTL_READ 0x02
> +#define FW_CFG_DMA_CTL_SKIP 0x04
> +#define FW_CFG_DMA_CTL_SELECT 0x08
> +#define FW_CFG_DMA_CTL_WRITE 0x10
> +
> +#define FW_CFG_DMA_SIGNATURE 0x51454d5520434647ULL /* "QEMU CFG" */
> +
> +/* Control as first field allows for different structures selected by this
> + * field, which might be useful in the future
> + */
> +struct fw_cfg_dma_access {
> + uint32_t control;
> + uint32_t length;
> + uint64_t address;
> +};
> +
> +#define FW_CFG_VMCOREINFO_FILENAME "etc/vmcoreinfo"
> +
> +#define FW_CFG_VMCOREINFO_FORMAT_NONE 0x0
> +#define FW_CFG_VMCOREINFO_FORMAT_ELF 0x1
> +
> +struct fw_cfg_vmcoreinfo {
> + uint16_t host_format;
> + uint16_t guest_format;
> + uint32_t size;
> + uint64_t paddr;
> +};
> +
> +#endif
> diff --git a/pc-bios/optionrom/optionrom.h b/pc-bios/optionrom/optionrom.h
> index 6c4c2c82f4..a2b612f1a7 100644
> --- a/pc-bios/optionrom/optionrom.h
> +++ b/pc-bios/optionrom/optionrom.h
> @@ -19,7 +19,20 @@
> */
>
>
> -#include "../../include/hw/nvram/fw_cfg_keys.h"
> +#define FW_CFG_KERNEL_ADDR 0x07
> +#define FW_CFG_KERNEL_SIZE 0x08
> +#define FW_CFG_KERNEL_CMDLINE 0x09
> +#define FW_CFG_INITRD_ADDR 0x0a
> +#define FW_CFG_INITRD_SIZE 0x0b
> +#define FW_CFG_KERNEL_ENTRY 0x10
> +#define FW_CFG_KERNEL_DATA 0x11
> +#define FW_CFG_INITRD_DATA 0x12
> +#define FW_CFG_CMDLINE_ADDR 0x13
> +#define FW_CFG_CMDLINE_SIZE 0x14
> +#define FW_CFG_CMDLINE_DATA 0x15
> +#define FW_CFG_SETUP_ADDR 0x16
> +#define FW_CFG_SETUP_SIZE 0x17
> +#define FW_CFG_SETUP_DATA 0x18
>
> #define BIOS_CFG_IOPORT_CFG 0x510
> #define BIOS_CFG_IOPORT_DATA 0x511
> diff --git a/dump.c b/dump.c
> index 04467b353e..500b554523 100644
> --- a/dump.c
> +++ b/dump.c
> @@ -1742,7 +1742,7 @@ static void dump_init(DumpState *s, int fd, bool has_format,
> warn_report("guest note is not present");
> } else if (size < note_head_size || size > MAX_GUEST_NOTE_SIZE) {
> warn_report("guest note size is invalid: %" PRIu32, size);
> - } else if (format != VMCOREINFO_FORMAT_ELF) {
> + } else if (format != FW_CFG_VMCOREINFO_FORMAT_ELF) {
> warn_report("guest note format is unsupported: %" PRIu16, format);
> } else {
> s->guest_note = g_malloc(size + 1); /* +1 for adding \0 */
> diff --git a/hw/misc/vmcoreinfo.c b/hw/misc/vmcoreinfo.c
> index a2805527cb..304c6287c7 100644
> --- a/hw/misc/vmcoreinfo.c
> +++ b/hw/misc/vmcoreinfo.c
> @@ -19,7 +19,7 @@ static void fw_cfg_vmci_write(void *dev, off_t offset, size_t len)
> VMCoreInfoState *s = VMCOREINFO(dev);
>
> s->has_vmcoreinfo = offset == 0 && len == sizeof(s->vmcoreinfo)
> - && s->vmcoreinfo.guest_format != VMCOREINFO_FORMAT_NONE;
> + && s->vmcoreinfo.guest_format != FW_CFG_VMCOREINFO_FORMAT_NONE;
> }
>
> static void vmcoreinfo_reset(void *dev)
> @@ -28,7 +28,7 @@ static void vmcoreinfo_reset(void *dev)
>
> s->has_vmcoreinfo = false;
> memset(&s->vmcoreinfo, 0, sizeof(s->vmcoreinfo));
> - s->vmcoreinfo.host_format = cpu_to_le16(VMCOREINFO_FORMAT_ELF);
> + s->vmcoreinfo.host_format = cpu_to_le16(FW_CFG_VMCOREINFO_FORMAT_ELF);
> }
>
> static void vmcoreinfo_realize(DeviceState *dev, Error **errp)
> @@ -53,7 +53,7 @@ static void vmcoreinfo_realize(DeviceState *dev, Error **errp)
> return;
> }
>
> - fw_cfg_add_file_callback(fw_cfg, "etc/vmcoreinfo",
> + fw_cfg_add_file_callback(fw_cfg, FW_CFG_VMCOREINFO_FILENAME,
> NULL, fw_cfg_vmci_write, s,
> &s->vmcoreinfo, sizeof(s->vmcoreinfo), false);
>
> diff --git a/pc-bios/optionrom/linuxboot_dma.c b/pc-bios/optionrom/linuxboot_dma.c
> index 4754282ad7..d856d41b55 100644
> --- a/pc-bios/optionrom/linuxboot_dma.c
> +++ b/pc-bios/optionrom/linuxboot_dma.c
> @@ -58,8 +58,6 @@ asm(
> " jmp load_kernel\n"
> );
>
> -#include "../../include/hw/nvram/fw_cfg_keys.h"
> -
> /* QEMU_CFG_DMA_CONTROL bits */
> #define BIOS_CFG_DMA_CTL_ERROR 0x01
> #define BIOS_CFG_DMA_CTL_READ 0x02
> @@ -73,6 +71,8 @@ asm(
> #define uint32_t unsigned int
> #define uint16_t unsigned short
>
> +#include "../../include/standard-headers/linux/qemu_fw_cfg.h"
> +
> #define barrier() asm("" : : : "memory")
>
> typedef struct FWCfgDmaAccess {
> diff --git a/tests/boot-order-test.c b/tests/boot-order-test.c
> index 9d98c48a3d..c60ebcf9d9 100644
> --- a/tests/boot-order-test.c
> +++ b/tests/boot-order-test.c
> @@ -14,7 +14,7 @@
> #include "libqos/fw_cfg.h"
> #include "libqtest.h"
> #include "qapi/qmp/qdict.h"
> -#include "hw/nvram/fw_cfg_keys.h"
> +#include "standard-headers/linux/qemu_fw_cfg.h"
>
> /* TODO actually test the results and get rid of this */
> #define qmp_discard_response(...) qobject_unref(qmp(__VA_ARGS__))
> diff --git a/tests/fw_cfg-test.c b/tests/fw_cfg-test.c
> index 1548bf14b2..1c5103fe1c 100644
> --- a/tests/fw_cfg-test.c
> +++ b/tests/fw_cfg-test.c
> @@ -13,7 +13,7 @@
> #include "qemu/osdep.h"
>
> #include "libqtest.h"
> -#include "hw/nvram/fw_cfg_keys.h"
> +#include "standard-headers/linux/qemu_fw_cfg.h"
> #include "libqos/fw_cfg.h"
>
> static uint64_t ram_size = 128 << 20;
> diff --git a/tests/libqos/malloc-pc.c b/tests/libqos/malloc-pc.c
> index 634b9c288a..b83cb8f0af 100644
> --- a/tests/libqos/malloc-pc.c
> +++ b/tests/libqos/malloc-pc.c
> @@ -14,7 +14,7 @@
> #include "libqos/malloc-pc.h"
> #include "libqos/fw_cfg.h"
>
> -#include "hw/nvram/fw_cfg_keys.h"
> +#include "standard-headers/linux/qemu_fw_cfg.h"
>
> #include "qemu-common.h"
>
>
Queued both, thanks.
Paolo
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-08-17 17:34 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-08-17 15:59 [Qemu-devel] [PATCH 1/2] update-linux-headers.sh: add qemu_fw_cfg.h Marc-André Lureau
2018-08-17 15:59 ` [Qemu-devel] [PATCH 2/2] fw_cfg: import & use linux/qemu_fw_cfg.h Marc-André Lureau
2018-08-17 17:34 ` Paolo Bonzini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).