From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: Thiago Jung Bauermann <bauerman@linux.ibm.com>, qemu-ppc@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Aleksandar Rikalo" <aleksandar.rikalo@syrmia.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"Aleksandar Markovic" <aleksandar.qemu.devel@gmail.com>,
"Cornelia Huck" <cohuck@redhat.com>,
"Mark Cave-Ayland" <mark.cave-ayland@ilande.co.uk>,
qemu-devel@nongnu.org, "Greg Kurz" <groug@kaod.org>,
qemu-s390x@nongnu.org, qemu-arm@nongnu.org,
"Artyom Tarasenko" <atar4qemu@gmail.com>,
"Thomas Huth" <thuth@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"David Hildenbrand" <david@redhat.com>,
"Richard Henderson" <rth@twiddle.net>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Aurelien Jarno" <aurelien@aurel32.net>,
"David Gibson" <david@gibson.dropbear.id.au>
Subject: Re: [PATCH v4 5/8] mips/cps: Use start-powered-off CPUState property
Date: Tue, 18 Aug 2020 13:06:44 +0200 [thread overview]
Message-ID: <9d8fdd74-feaf-27e3-9f09-26bbf7ebd779@redhat.com> (raw)
In-Reply-To: <e2c48769-46e8-32ff-a83d-04b6993deee9@redhat.com>
On 8/18/20 1:03 PM, Philippe Mathieu-Daudé wrote:
> On 8/18/20 9:26 AM, Philippe Mathieu-Daudé wrote:
>> On 8/18/20 5:33 AM, Thiago Jung Bauermann wrote:
>>> Instead of setting CPUState::halted to 1 in main_cpu_reset(), use the
>>> start-powered-off property which makes cpu_common_reset() initialize it
>>> to 1 in common code.
>>>
>>> Also change creation of CPU object from cpu_create() to object_new() and
>>> qdev_realize() because cpu_create() realizes the CPU and it's not possible to
>>> set a property after the object is realized.
>>>
>>> Signed-off-by: Thiago Jung Bauermann <bauerman@linux.ibm.com>
>>> ---
>>> hw/mips/cps.c | 16 ++++++++++++----
>>> 1 file changed, 12 insertions(+), 4 deletions(-)
>>>
>>> diff --git a/hw/mips/cps.c b/hw/mips/cps.c
>>> index 615e1a1ad2..be85357dc0 100644
>>> --- a/hw/mips/cps.c
>>> +++ b/hw/mips/cps.c
>>> @@ -52,9 +52,6 @@ static void main_cpu_reset(void *opaque)
>>> CPUState *cs = CPU(cpu);
>>>
>>> cpu_reset(cs);
>>> -
>>> - /* All VPs are halted on reset. Leave powering up to CPC. */
>>> - cs->halted = 1;
>>> }
>>>
>>> static bool cpu_mips_itu_supported(CPUMIPSState *env)
>>> @@ -76,7 +73,9 @@ static void mips_cps_realize(DeviceState *dev, Error **errp)
>>> bool saar_present = false;
>>>
>>> for (i = 0; i < s->num_vp; i++) {
>>> - cpu = MIPS_CPU(cpu_create(s->cpu_type));
>>> + Error *err = NULL;
>>> +
>>> + cpu = MIPS_CPU(object_new(s->cpu_type));
>>>
>>> /* Init internal devices */
>>> cpu_mips_irq_init_cpu(cpu);
>>> @@ -89,7 +88,16 @@ static void mips_cps_realize(DeviceState *dev, Error **errp)
>>> env->itc_tag = mips_itu_get_tag_region(&s->itu);
>>> env->itu = &s->itu;
>>> }
>>> + /* All VPs are halted on reset. Leave powering up to CPC. */
>>> + object_property_set_bool(OBJECT(cpu), "start-powered-off", true,
>>> + &error_abort);
>>> qemu_register_reset(main_cpu_reset, cpu);
>>> +
>>> + if (!qdev_realize(DEVICE(cpu), NULL, &err)) {
>>> + error_report_err(err);
>>> + object_unref(OBJECT(cpu));
>>> + exit(EXIT_FAILURE);
>>> + }
>>
>> Here errp is available, so we can propagate the error to the caller:
>>
>> if (!qdev_realize(DEVICE(cpu), NULL, errp)) {
>
> Igor corrected me in the previous patch, to avoid leaking the
> reference this snippet misses:
>
> object_unref(OBJECT(cpu));
Well this is simply:
if (!qdev_realize_and_unref(DEVICE(cpu), NULL, errp)) {
>
>> return;
>> }
>>
>> For example in hw/mips/boston.c:
>>
>> object_initialize_child(OBJECT(machine), "cps", &s->cps, TYPE_MIPS_CPS);
>> object_property_set_str(OBJECT(&s->cps), "cpu-type", machine->cpu_type,
>> &error_fatal);
>> object_property_set_int(OBJECT(&s->cps), "num-vp", machine->smp.cpus,
>> &error_fatal);
>> sysbus_realize(SYS_BUS_DEVICE(&s->cps), &error_fatal);
>>
>> This will be propagated here ---------------^^^^^^^^^^^^^
>>
>>> }
>>>
>>> cpu = MIPS_CPU(first_cpu);
>>>
>
next prev parent reply other threads:[~2020-08-18 11:07 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-18 3:33 [PATCH v4 0/8] Generalize start-powered-off property from ARM Thiago Jung Bauermann
2020-08-18 3:33 ` [PATCH v4 1/8] target/arm: Move start-powered-off property to generic CPUState Thiago Jung Bauermann
2020-08-18 3:33 ` [PATCH v4 2/8] target/arm: Move setting of CPU halted state to generic code Thiago Jung Bauermann
2020-08-18 3:33 ` [PATCH v4 3/8] ppc/spapr: Use start-powered-off CPUState property Thiago Jung Bauermann
2020-08-18 3:33 ` [PATCH v4 4/8] ppc/e500: " Thiago Jung Bauermann
2020-08-18 7:22 ` Philippe Mathieu-Daudé
2020-08-18 7:28 ` Philippe Mathieu-Daudé
2020-08-18 23:06 ` Thiago Jung Bauermann
2020-08-18 23:14 ` Thiago Jung Bauermann
2020-08-18 10:26 ` Igor Mammedov
2020-08-18 11:02 ` Igor Mammedov
2020-08-18 22:40 ` Thiago Jung Bauermann
2020-08-18 3:33 ` [PATCH v4 5/8] mips/cps: " Thiago Jung Bauermann
2020-08-18 7:26 ` Philippe Mathieu-Daudé
2020-08-18 11:03 ` Philippe Mathieu-Daudé
2020-08-18 11:06 ` Philippe Mathieu-Daudé [this message]
2020-08-19 0:12 ` Thiago Jung Bauermann
2020-08-18 3:33 ` [PATCH v4 6/8] sparc/sun4m: Remove main_cpu_reset() Thiago Jung Bauermann
2020-08-18 3:33 ` [PATCH v4 7/8] sparc/sun4m: Use start-powered-off CPUState property Thiago Jung Bauermann
2020-08-18 7:27 ` Philippe Mathieu-Daudé
2020-08-18 3:33 ` [PATCH v4 8/8] target/s390x: " Thiago Jung Bauermann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9d8fdd74-feaf-27e3-9f09-26bbf7ebd779@redhat.com \
--to=philmd@redhat.com \
--cc=aleksandar.qemu.devel@gmail.com \
--cc=aleksandar.rikalo@syrmia.com \
--cc=alex.bennee@linaro.org \
--cc=atar4qemu@gmail.com \
--cc=aurelien@aurel32.net \
--cc=bauerman@linux.ibm.com \
--cc=cohuck@redhat.com \
--cc=david@gibson.dropbear.id.au \
--cc=david@redhat.com \
--cc=ehabkost@redhat.com \
--cc=groug@kaod.org \
--cc=mark.cave-ayland@ilande.co.uk \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=rth@twiddle.net \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).