From: "Marc-André Lureau" <marcandre.lureau@gmail.com>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: Thomas Huth <thuth@redhat.com>, QEMU <qemu-devel@nongnu.org>,
Markus Armbruster <armbru@redhat.com>
Subject: Re: [PATCH 10/16] accel: pass object to accel_init_machine
Date: Thu, 14 Nov 2019 14:48:45 +0400 [thread overview]
Message-ID: <CAJ+F1CJf_uu0g2T+OYbdv=Yme6Ca_ZGPMM365rp_i2rrk51cuw@mail.gmail.com> (raw)
In-Reply-To: <1573655945-14912-11-git-send-email-pbonzini@redhat.com>
On Wed, Nov 13, 2019 at 6:45 PM Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> We will have to set QOM properties before accel_init_machine, based on the
> options provided to -accel. Construct the object outside it so that it
> will be possible to insert the iteration between object_new_with_class
> and accel_init_machine.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> accel/accel.c | 6 ++----
> include/sysemu/accel.h | 2 +-
> vl.c | 4 +++-
> 3 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/accel/accel.c b/accel/accel.c
> index 74eda68..822e945 100644
> --- a/accel/accel.c
> +++ b/accel/accel.c
> @@ -52,11 +52,9 @@ AccelClass *accel_find(const char *opt_name)
> return ac;
> }
>
> -int accel_init_machine(AccelClass *acc, MachineState *ms)
> +int accel_init_machine(AccelState *accel, MachineState *ms)
> {
> - ObjectClass *oc = OBJECT_CLASS(acc);
> - const char *cname = object_class_get_name(oc);
> - AccelState *accel = ACCEL(object_new(cname));
> + AccelClass *acc = ACCEL_GET_CLASS(accel);
> int ret;
> ms->accelerator = accel;
> *(acc->allowed) = true;
> diff --git a/include/sysemu/accel.h b/include/sysemu/accel.h
> index 90b6213..22cac0f 100644
> --- a/include/sysemu/accel.h
> +++ b/include/sysemu/accel.h
> @@ -67,7 +67,7 @@ typedef struct AccelClass {
> extern unsigned long tcg_tb_size;
>
> AccelClass *accel_find(const char *opt_name);
> -int accel_init_machine(AccelClass *acc, MachineState *ms);
> +int accel_init_machine(AccelState *accel, MachineState *ms);
>
> /* Called just before os_setup_post (ie just before drop OS privs) */
> void accel_setup_post(MachineState *ms);
> diff --git a/vl.c b/vl.c
> index 6e406d4..c8ec906 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -2846,6 +2846,7 @@ static int do_configure_accelerator(void *opaque, QemuOpts *opts, Error **errp)
> bool *p_init_failed = opaque;
> const char *acc = qemu_opt_get(opts, "accel");
> AccelClass *ac = accel_find(acc);
> + AccelState *accel;
> int ret;
>
> if (!ac) {
> @@ -2853,7 +2854,8 @@ static int do_configure_accelerator(void *opaque, QemuOpts *opts, Error **errp)
> error_report("invalid accelerator %s", acc);
> return 0;
> }
> - ret = accel_init_machine(ac, current_machine);
> + accel = ACCEL(object_new_with_class(OBJECT_CLASS(ac)));
> + ret = accel_init_machine(accel, current_machine);
> if (ret < 0) {
> *p_init_failed = true;
> error_report("failed to initialize %s: %s",
> --
> 1.8.3.1
>
>
>
--
Marc-André Lureau
next prev parent reply other threads:[~2019-11-14 10:50 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-13 14:38 [PATCH for-5.0 00/16] Complete the implementation of -accel Paolo Bonzini
2019-11-13 14:38 ` [PATCH 01/16] memory: do not look at current_machine->accel Paolo Bonzini
2019-11-14 8:56 ` Marc-André Lureau
2019-11-14 9:27 ` Paolo Bonzini
2019-11-14 9:31 ` Marc-André Lureau
2019-11-14 9:10 ` Thomas Huth
2019-11-14 9:35 ` Paolo Bonzini
2019-11-14 9:46 ` Thomas Huth
2019-11-14 10:21 ` Peter Maydell
2019-11-14 10:32 ` Paolo Bonzini
2019-11-14 10:40 ` Peter Maydell
2019-11-14 10:47 ` Paolo Bonzini
2019-11-13 14:38 ` [PATCH 02/16] vl: extract accelerator option processing to a separate function Paolo Bonzini
2019-11-14 7:55 ` Marc-André Lureau
2019-11-14 9:29 ` Paolo Bonzini
2019-11-18 10:58 ` Thomas Huth
2019-11-18 11:39 ` Paolo Bonzini
2019-11-13 14:38 ` [PATCH 03/16] vl: merge -accel processing into configure_accelerators Paolo Bonzini
2019-11-14 8:13 ` Marc-André Lureau
2019-11-18 11:27 ` Thomas Huth
2019-11-18 11:39 ` Paolo Bonzini
2019-11-18 15:12 ` Wainer dos Santos Moschetta
2019-11-13 14:38 ` [PATCH 04/16] vl: move icount configuration earlier Paolo Bonzini
2019-11-14 8:24 ` Marc-André Lureau
2019-11-18 11:53 ` Thomas Huth
2019-11-13 14:38 ` [PATCH 05/16] vl: introduce object_parse_property_opt Paolo Bonzini
2019-11-14 8:23 ` Marc-André Lureau
2019-11-14 9:46 ` Paolo Bonzini
2019-11-13 14:38 ` [PATCH 06/16] vl: configure accelerators from -accel options Paolo Bonzini
2019-11-18 17:59 ` Wainer dos Santos Moschetta
2019-11-13 14:38 ` [PATCH 07/16] vl: warn for unavailable accelerators, clarify messages Paolo Bonzini
2019-11-14 9:28 ` Marc-André Lureau
2019-11-13 14:38 ` [PATCH 08/16] qom: introduce object_register_sugar_prop Paolo Bonzini
2019-11-14 9:53 ` Marc-André Lureau
2019-11-14 10:03 ` Paolo Bonzini
2019-11-13 14:38 ` [PATCH 09/16] qom: add object_new_with_class Paolo Bonzini
2019-11-14 9:56 ` Marc-André Lureau
2019-11-13 14:38 ` [PATCH 10/16] accel: pass object to accel_init_machine Paolo Bonzini
2019-11-14 10:48 ` Marc-André Lureau [this message]
2019-11-13 14:39 ` [PATCH 11/16] tcg: convert "-accel threads" to a QOM property Paolo Bonzini
2019-11-14 11:08 ` Marc-André Lureau
2019-11-13 14:39 ` [PATCH 12/16] tcg: add "-accel tcg,tb-size" and deprecate "-tb-size" Paolo Bonzini
2019-11-19 10:44 ` Thomas Huth
2019-11-13 14:39 ` [PATCH 13/16] xen: convert "-machine igd-passthru" to an accelerator property Paolo Bonzini
2019-11-14 9:39 ` Paul Durrant
2019-11-14 9:47 ` Paolo Bonzini
2019-11-14 9:52 ` Paul Durrant
2019-11-19 11:02 ` Thomas Huth
2019-11-13 14:39 ` [PATCH 14/16] kvm: convert "-machine kvm_shadow_mem" " Paolo Bonzini
2019-11-19 11:33 ` Thomas Huth
2019-11-13 14:39 ` [PATCH 15/16] kvm: introduce kvm_kernel_irqchip_* functions Paolo Bonzini
2019-11-19 11:56 ` Thomas Huth
2019-11-19 12:13 ` Paolo Bonzini
2019-11-19 12:22 ` Thomas Huth
2019-11-13 14:39 ` [PATCH 16/16] kvm: convert "-machine kernel_irqchip" to an accelerator property Paolo Bonzini
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='CAJ+F1CJf_uu0g2T+OYbdv=Yme6Ca_ZGPMM365rp_i2rrk51cuw@mail.gmail.com' \
--to=marcandre.lureau@gmail.com \
--cc=armbru@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--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).