Introduce virCPUarmData to virCPUData
Signed-off-by: Zhenyu Zheng <zhengzhenyulixi@gmail.com>
---
src/cpu/Makefile.inc.am | 1 +
src/cpu/cpu.h | 2 ++
src/cpu/cpu_arm_data.h | 31 +++++++++++++++++++++++++++++++
3 files changed, 34 insertions(+)
create mode 100644 src/cpu/cpu_arm_data.h
diff --git a/src/cpu/Makefile.inc.am b/src/cpu/Makefile.inc.am
index 0abeee87b6..bea203fb5c 100644
--- a/src/cpu/Makefile.inc.am
+++ b/src/cpu/Makefile.inc.am
@@ -10,6 +10,7 @@ CPU_SOURCES = \
cpu/cpu_s390.c \
cpu/cpu_arm.h \
cpu/cpu_arm.c \
+ cpu/cpu_arm_data.h \
cpu/cpu_ppc64.h \
cpu/cpu_ppc64.c \
cpu/cpu_ppc64_data.h \
diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h
index f779d2be17..ec22a183a1 100644
--- a/src/cpu/cpu.h
+++ b/src/cpu/cpu.h
@@ -27,6 +27,7 @@
#include "cpu_conf.h"
#include "cpu_x86_data.h"
#include "cpu_ppc64_data.h"
+#include "cpu_arm_data.h"
typedef struct _virCPUData virCPUData;
@@ -36,6 +37,7 @@ struct _virCPUData {
union {
virCPUx86Data x86;
virCPUppc64Data ppc64;
+ virCPUarmData arm;
/* generic driver needs no data */
} data;
};
diff --git a/src/cpu/cpu_arm_data.h b/src/cpu/cpu_arm_data.h
new file mode 100644
index 0000000000..cf12ca8c2e
--- /dev/null
+++ b/src/cpu/cpu_arm_data.h
@@ -0,0 +1,31 @@
+/*
+ * cpu_arm_data.h: 64-bit arm CPU specific data
+ *
+ * Copyright (C) 2020 Huawei Technologies Co., Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#pragma once
+
+#define VIR_CPU_ARM_DATA_INIT { 0 }
+
+typedef struct _virCPUarmData virCPUarmData;
+struct _virCPUarmData {
+ unsigned long vendor_id;
+ unsigned long pvr;
+ char *features;
+};
--
2.26.0.windows.1
ping for reviews
On Wed, Apr 22, 2020 at 3:12 PM ZhengZhenyu <zheng.zhenyu@foxmail.com>
wrote:
> Introduce virCPUarmData to virCPUData
>
> Signed-off-by: Zhenyu Zheng <zhengzhenyulixi@gmail.com>
> ---
> src/cpu/Makefile.inc.am | 1 +
> src/cpu/cpu.h | 2 ++
> src/cpu/cpu_arm_data.h | 31 +++++++++++++++++++++++++++++++
> 3 files changed, 34 insertions(+)
> create mode 100644 src/cpu/cpu_arm_data.h
>
> diff --git a/src/cpu/Makefile.inc.am b/src/cpu/Makefile.inc.am
> index 0abeee87b6..bea203fb5c 100644
> --- a/src/cpu/Makefile.inc.am
> +++ b/src/cpu/Makefile.inc.am
> @@ -10,6 +10,7 @@ CPU_SOURCES = \
> cpu/cpu_s390.c \
> cpu/cpu_arm.h \
> cpu/cpu_arm.c \
> + cpu/cpu_arm_data.h \
> cpu/cpu_ppc64.h \
> cpu/cpu_ppc64.c \
> cpu/cpu_ppc64_data.h \
> diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h
> index f779d2be17..ec22a183a1 100644
> --- a/src/cpu/cpu.h
> +++ b/src/cpu/cpu.h
> @@ -27,6 +27,7 @@
> #include "cpu_conf.h"
> #include "cpu_x86_data.h"
> #include "cpu_ppc64_data.h"
> +#include "cpu_arm_data.h"
>
>
> typedef struct _virCPUData virCPUData;
> @@ -36,6 +37,7 @@ struct _virCPUData {
> union {
> virCPUx86Data x86;
> virCPUppc64Data ppc64;
> + virCPUarmData arm;
> /* generic driver needs no data */
> } data;
> };
> diff --git a/src/cpu/cpu_arm_data.h b/src/cpu/cpu_arm_data.h
> new file mode 100644
> index 0000000000..cf12ca8c2e
> --- /dev/null
> +++ b/src/cpu/cpu_arm_data.h
> @@ -0,0 +1,31 @@
> +/*
> + * cpu_arm_data.h: 64-bit arm CPU specific data
> + *
> + * Copyright (C) 2020 Huawei Technologies Co., Ltd.
> + *
> + * This library is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU Lesser General Public
> + * License as published by the Free Software Foundation; either
> + * version 2.1 of the License, or (at your option) any later version.
> + *
> + * This library is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + * Lesser General Public License for more details.
> + *
> + * You should have received a copy of the GNU Lesser General Public
> + * License along with this library; If not, see
> + * <http://www.gnu.org/licenses/>.
> + *
> + */
> +
> +#pragma once
> +
> +#define VIR_CPU_ARM_DATA_INIT { 0 }
> +
> +typedef struct _virCPUarmData virCPUarmData;
> +struct _virCPUarmData {
> + unsigned long vendor_id;
> + unsigned long pvr;
> + char *features;
> +};
> --
> 2.26.0.windows.1
>
>
>
On Wed, Apr 22, 2020 at 15:11:18 +0800, ZhengZhenyu wrote:
> Introduce virCPUarmData to virCPUData
>
> Signed-off-by: Zhenyu Zheng <zhengzhenyulixi@gmail.com>
> ---
> src/cpu/Makefile.inc.am | 1 +
> src/cpu/cpu.h | 2 ++
> src/cpu/cpu_arm_data.h | 31 +++++++++++++++++++++++++++++++
> 3 files changed, 34 insertions(+)
> create mode 100644 src/cpu/cpu_arm_data.h
This patch needs to be the first one in the series and either the
corresponding hunks from the following patch should be squashed here or
the this and the following patch could be squashed into a single one.
...
> diff --git a/src/cpu/cpu_arm_data.h b/src/cpu/cpu_arm_data.h
> new file mode 100644
> index 0000000000..cf12ca8c2e
> --- /dev/null
> +++ b/src/cpu/cpu_arm_data.h
> @@ -0,0 +1,31 @@
> +/*
> + * cpu_arm_data.h: 64-bit arm CPU specific data
> + *
> + * Copyright (C) 2020 Huawei Technologies Co., Ltd.
> + *
> + * This library is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU Lesser General Public
> + * License as published by the Free Software Foundation; either
> + * version 2.1 of the License, or (at your option) any later version.
> + *
> + * This library is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + * Lesser General Public License for more details.
> + *
> + * You should have received a copy of the GNU Lesser General Public
> + * License along with this library; If not, see
> + * <http://www.gnu.org/licenses/>.
> + *
> + */
> +
> +#pragma once
> +
> +#define VIR_CPU_ARM_DATA_INIT { 0 }
> +
> +typedef struct _virCPUarmData virCPUarmData;
> +struct _virCPUarmData {
> + unsigned long vendor_id;
> + unsigned long pvr;
> + char *features;
Make this a list of strings:
char **features;
> +};
Jirka
© 2016 - 2026 Red Hat, Inc.