On 01/07/2013 11:29 AM, Daniel P. Berrange wrote: > On Mon, Jan 07, 2013 at 12:09:34PM -0500, John Ferlan wrote: >> Don't dereference 'model' in PowerPCBaseline when there's no outputModel >> --- >> src/cpu/cpu_powerpc.c | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/src/cpu/cpu_powerpc.c b/src/cpu/cpu_powerpc.c >> index 8bef627..5e1a7b9 100644 >> --- a/src/cpu/cpu_powerpc.c >> +++ b/src/cpu/cpu_powerpc.c >> @@ -605,7 +605,8 @@ PowerPCBaseline(virCPUDefPtr *cpus, >> goto error; >> } >> >> - base_model->data->ppc.pvr = model->data->ppc.pvr; >> + if (outputModel) >> + base_model->data->ppc.pvr = model->data->ppc.pvr; >> if (PowerPCDecode(cpu, base_model->data, models, nmodels, NULL) < 0) >> goto error; > > ACK
I've pushed 1-3 and 5-6; waiting for a v2 of patch 4. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
-- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
