From patchwork Fri Mar 9 12:07:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 10270487 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C653060236 for ; Fri, 9 Mar 2018 12:08:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A944E28705 for ; Fri, 9 Mar 2018 12:08:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9D93E29AE5; Fri, 9 Mar 2018 12:08:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7EBA2287E3 for ; Fri, 9 Mar 2018 12:08:29 +0000 (UTC) Received: from localhost ([::1]:44731 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1euGp2-0000w7-9s for patchwork-qemu-devel@patchwork.kernel.org; Fri, 09 Mar 2018 07:08:28 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57993) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1euGoK-0000X8-Fp for qemu-devel@nongnu.org; Fri, 09 Mar 2018 07:07:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1euGoH-0002JP-8A for qemu-devel@nongnu.org; Fri, 09 Mar 2018 07:07:44 -0500 Received: from smtp.citrix.com ([66.165.176.89]:11756) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1euGoH-0002HP-0z for qemu-devel@nongnu.org; Fri, 09 Mar 2018 07:07:41 -0500 X-IronPort-AV: E=Sophos;i="5.47,445,1515456000"; d="scan'208";a="467236391" From: Ian Jackson MIME-Version: 1.0 Message-ID: <23202.30969.590920.764930@mariner.uk.xensource.com> Date: Fri, 9 Mar 2018 12:07:21 +0000 To: Eduardo Habkost , , , Ross Lagerwall , Anthony PERARD , Juergen Gross , Stefano Stabellini , Paolo Bonzini , Richard Henderson , "Michael S. Tsirkin" In-Reply-To: <23202.28943.344150.512881@mariner.uk.xensource.com> References: <1520530757-4477-1-git-send-email-ian.jackson@eu.citrix.com> <1520530757-4477-4-git-send-email-ian.jackson@eu.citrix.com> <20180308200345.GD3417@localhost.localdomain> <23202.28943.344150.512881@mariner.uk.xensource.com> X-Mailer: VM 8.2.0b under 24.4.1 (i586-pc-linux-gnu) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 66.165.176.89 Subject: Re: [Qemu-devel] [PATCH 03/11] xen: defer call to xen_restrict until just before os_setup_post X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Ian Jackson writes ("Re: [PATCH 03/11] xen: defer call to xen_restrict until just before os_setup_post"): > Eduardo Habkost writes ("Re: [PATCH 03/11] xen: defer call to xen_restrict until just before os_setup_post"): > > I don't think we should have accelerator-specific code in main(), > > if we already have accelerator classes that can abstract that > > out. I suggest adding a AccelClass;:setup_post() method that can > > be called here. > > I think I can do that. How about this ? From 61f11221afaa29e10021599420238e03836ba413 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 9 Mar 2018 12:02:50 +0000 Subject: [PATCH v6.2 12/11] AccelClass: Introduce accel_setup_post This is called just before os_setup_post. Currently none of the accelerators provide this hook, but the Xen one is going to provide one in a moment. Signed-off-by: Ian Jackson Reviewed-by: Eduardo Habkost --- accel/accel.c | 9 +++++++++ include/sysemu/accel.h | 3 +++ vl.c | 1 + 3 files changed, 13 insertions(+) diff --git a/accel/accel.c b/accel/accel.c index 93e2434..9cfab11 100644 --- a/accel/accel.c +++ b/accel/accel.c @@ -126,6 +126,15 @@ void accel_register_compat_props(AccelState *accel) register_compat_props_array(class->global_props); } +void accel_setup_post(MachineState *ms) +{ + AccelState *accel = ms->accelerator; + AccelClass *acc = ACCEL_GET_CLASS(accel); + if (acc->setup_post) { + acc->setup_post(ms, accel); + } +} + static void register_accel_types(void) { type_register_static(&accel_type); diff --git a/include/sysemu/accel.h b/include/sysemu/accel.h index 5a632ce..637358f 100644 --- a/include/sysemu/accel.h +++ b/include/sysemu/accel.h @@ -40,6 +40,7 @@ typedef struct AccelClass { const char *name; int (*available)(void); int (*init_machine)(MachineState *ms); + void (*setup_post)(MachineState *ms, AccelState *accel); bool *allowed; /* * Array of global properties that would be applied when specific @@ -68,5 +69,7 @@ extern unsigned long tcg_tb_size; void configure_accelerator(MachineState *ms); /* Register accelerator specific global properties */ void accel_register_compat_props(AccelState *accel); +/* Called just before os_setup_post (ie just before drop OS privs) */ +void accel_setup_post(MachineState *ms); #endif diff --git a/vl.c b/vl.c index e6e8e1e..3fd6401 100644 --- a/vl.c +++ b/vl.c @@ -4719,6 +4719,7 @@ int main(int argc, char **argv, char **envp) vm_start(); } + accel_setup_post(current_machine); xen_setup_post(); os_setup_post();