Message ID | 69936381-a99e-adc4-5de0-0f9bdf85323b@weilnetz.de (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 01/28/2017 09:36 AM, Stefan Weil wrote: > Returning NULL from get_max_cpu_model results in a SIGSEGV runtime error. > > Signed-off-by: Stefan Weil <sw@weilnetz.de> > --- > > This is also broken in Debian. > > In addition, there is no default CPU ("any"), so binfmt and related > actions currently don't work. I hacked my local installation by > duplicating the "qemu" cpu definition for "any", but maybe there is > a better solution. > > Regards > Stefan > > target/s390x/cpu_models.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c > index 2a894ee..6e34763 100644 > --- a/target/s390x/cpu_models.c > +++ b/target/s390x/cpu_models.c > @@ -660,7 +660,6 @@ static void check_compatibility(const S390CPUModel *max_model, > static S390CPUModel *get_max_cpu_model(Error **errp) > { I have for whatever reasons problems with this patch. Looks like you pasted it into thunderbird or something like that and the whitespaces look mangled, e.g. look at the indentation of static vs {. > -#ifndef CONFIG_USER_ONLY > static S390CPUModel max_model; > static bool cached; > @@ -680,7 +679,6 @@ static S390CPUModel *get_max_cpu_model(Error **errp) > cached = true; > return &max_model; > } > -#endif > return NULL; > } > -- 2.1.4 > >
Am 30.01.2017 um 11:01 schrieb Christian Borntraeger: > I have for whatever reasons problems with this patch. Looks like you > pasted > it into thunderbird or something like that and the whitespaces look mangled, > e.g. look at the indentation of static vs {. The original e-mail was not delivered by my mail server. Therefore I had sent it as "new" with Thunderbird, which wrapped some lines. I'm sorry for that and have sent a v2 which should be fine. Stefan
diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c index 2a894ee..6e34763 100644 --- a/target/s390x/cpu_models.c +++ b/target/s390x/cpu_models.c @@ -660,7 +660,6 @@ static void check_compatibility(const S390CPUModel *max_model, static S390CPUModel *get_max_cpu_model(Error **errp) { -#ifndef CONFIG_USER_ONLY static S390CPUModel max_model; static bool cached; @@ -680,7 +679,6 @@ static S390CPUModel *get_max_cpu_model(Error **errp)
Returning NULL from get_max_cpu_model results in a SIGSEGV runtime error. Signed-off-by: Stefan Weil <sw@weilnetz.de> --- This is also broken in Debian. In addition, there is no default CPU ("any"), so binfmt and related actions currently don't work. I hacked my local installation by duplicating the "qemu" cpu definition for "any", but maybe there is a better solution. Regards Stefan target/s390x/cpu_models.c | 2 -- 1 file changed, 2 deletions(-) cached = true; return &max_model; } -#endif return NULL; } -- 2.1.4