1:42 p.m.
This part of code primarily compares host and guest CPUs of a given
architecture for feature compatibility. x86 makes this choice based on
CPUID comparison.
Presently the PowerPC code has stubs to just get a 'pseries' guest to
boot. It would be augmented going forward, to do a detailed feature
comparison between guest and host CPUs on powerpc.
This part of code is presently well-classified into different
architectures, and consequently does not need reorganizing.
---
src/Makefile.am | 3 +-
src/cpu/cpu.c | 2 +
src/cpu/cpu_powerpc.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++++
src/cpu/cpu_powerpc.h | 32 +++++++++++++++++++
4 files changed, 117 insertions(+), 1 deletions(-)
create mode 100644 src/cpu/cpu_powerpc.c
create mode 100644 src/cpu/cpu_powerpc.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 738ee91..4f990fd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -511,7 +511,8 @@ CPU_SOURCES = \
cpu/cpu.h cpu/cpu.c \
cpu/cpu_generic.h cpu/cpu_generic.c \
cpu/cpu_x86.h cpu/cpu_x86.c cpu/cpu_x86_data.h \
- cpu/cpu_map.h cpu/cpu_map.c
+ cpu/cpu_map.h cpu/cpu_map.c cpu/cpu_powerpc.h \
+ cpu/cpu_powerpc.c
VMX_SOURCES = \
vmx/vmx.c vmx/vmx.h
diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c
index 2906be9..e8a65f0 100644
--- a/src/cpu/cpu.c
+++ b/src/cpu/cpu.c
@@ -28,6 +28,7 @@
#include "xml.h"
#include "cpu.h"
#include "cpu_x86.h"
+#include "cpu_powerpc.h"
#include "cpu_generic.h"
@@ -36,6 +37,7 @@
static struct cpuArchDriver *drivers[] = {
&cpuDriverX86,
+ &cpuDriverPowerPC,
/* generic driver must always be the last one */
&cpuDriverGeneric
};
diff --git a/src/cpu/cpu_powerpc.c b/src/cpu/cpu_powerpc.c
new file mode 100644
index 0000000..6ceedc3
--- /dev/null
+++ b/src/cpu/cpu_powerpc.c
@@ -0,0 +1,81 @@
+/*
+ * cpu_powerpc.h: CPU driver for PowerPC CPUs
+ *
+ * Copyright (C) Copyright (C) IBM Corporation, 2010
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Authors:
+ * Anton Blanchard <anton(a)au.ibm.com>
+ * Prerna Saxena <prerna(a)linux.vnet.ibm.com>
+ */
+
+#include <config.h>
+
+#include "memory.h"
+#include "cpu.h"
+
+
+#define VIR_FROM_THIS VIR_FROM_CPU
+
+static const char *archs[] = { "ppc64" };
+
+static union cpuData *
+PowerPCNodeData(void)
+{
+ union cpuData *data;
+
+ if (VIR_ALLOC(data) < 0) {
+ virReportOOMError();
+ return NULL;
+ }
+
+ return data;
+}
+
+
+static int
+PowerPCDecode(virCPUDefPtr cpu,
+ const union cpuData *data,
+ const char **models,
+ unsigned int nmodels,
+ const char *preferred)
+{
+ return 0;
+}
+
+static int
+PowerPCDataFree(union cpuData *data)
+{
+ if (data == NULL)
+ return 0;
+
+ VIR_FREE(data);
+}
+
+struct cpuArchDriver cpuDriverPowerPC = {
+ .name = "ppc64",
+ .arch = archs,
+ .narch = ARRAY_CARDINALITY(archs),
+ .compare = NULL,
+ .decode = PowerPCDecode,
+ .encode = NULL,
+ .free = PowerPCDataFree,
+ .nodeData = PowerPCNodeData,
+ .guestData = NULL,
+ .baseline = NULL,
+ .update = NULL,
+ .hasFeature = NULL,
+};
diff --git a/src/cpu/cpu_powerpc.h b/src/cpu/cpu_powerpc.h
new file mode 100644
index 0000000..2e0c1a5
--- /dev/null
+++ b/src/cpu/cpu_powerpc.h
@@ -0,0 +1,32 @@
+/*
+ * cpu_powerpc.h: CPU driver for PowerPC CPUs
+ *
+ * Copyright (C) Copyright (C) IBM Corporation, 2010
+ *
+ * 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, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Authors:
+ * Anton Blanchard <anton(a)au.ibm.com>
+ * Prerna Saxena <prerna(a)linux.vnet.ibm.com>
+ */
+
+#ifndef __VIR_CPU_POWERPC_H__
+# define __VIR_CPU_POWERPC_H__
+
+# include "cpu.h"
+
+extern struct cpuArchDriver cpuDriverPowerPC;
+
+#endif /* __VIR_CPU_POWERPC_H__ */
--
1.7.0.4
--
Prerna Saxena
Linux Technology Centre,
IBM Systems and Technology Lab,
Bangalore, India