On Tue, Nov 29, 2011 at 08:28:55PM +0530, Prerna Saxena wrote: > From: Prerna Saxena <prerna@xxxxxxxxxxxxxxxxxx> > Date: Mon, 3 Oct 2011 05:56:20 -0700 > Subject: [PATCH 2/5] Add PPC cpu driver. > > To add support for running libvirt on PowerPC, a CPU driver for the > PowerPC platform must be added. > Most generic cpu driver routines such as CPU compare, decode, etc > are based on CPUID comparison and are not relevant for non-x86 > platforms. > Here, we introduce stubs for relevant PowerPC routines invoked by libvirt. > > Signed-off-by: Prerna Saxena <prerna@xxxxxxxxxxxxxxxxxx> > Signed-off-by: Anton Blanchard <anton@xxxxxxxxxx> > --- > 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 33a32a8..aea3ddd 100644 > --- a/src/Makefile.am > +++ b/src/Makefile.am > @@ -533,7 +533,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 b919b6e..e4149e2 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..ed81694 > --- /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@xxxxxxxxxx> > + * Prerna Saxena <prerna@xxxxxxxxxxxxxxxxxx> > + */ > + > +#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 ATTRIBUTE_UNUSED, > + const union cpuData *data ATTRIBUTE_UNUSED, > + const char **models ATTRIBUTE_UNUSED, > + unsigned int nmodels ATTRIBUTE_UNUSED, > + const char *preferred ATTRIBUTE_UNUSED) > +{ > + return 0; > +} > + > +static void > +PowerPCDataFree(union cpuData *data) > +{ > + if (data == NULL) > + return; > + > + 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@xxxxxxxxxx> > + * Prerna Saxena <prerna@xxxxxxxxxxxxxxxxxx> > + */ > + > +#ifndef __VIR_CPU_POWERPC_H__ > +# define __VIR_CPU_POWERPC_H__ > + > +# include "cpu.h" > + > +extern struct cpuArchDriver cpuDriverPowerPC; > + > +#endif /* __VIR_CPU_POWERPC_H__ */ ACK Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :| -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list