From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58197) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1euGpM-00016N-Po for qemu-devel@nongnu.org; Fri, 09 Mar 2018 07:08:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1euGpJ-0002dK-IJ for qemu-devel@nongnu.org; Fri, 09 Mar 2018 07:08:48 -0500 Received: from smtp.citrix.com ([66.165.176.89]:34152) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1euGpJ-0002cz-A6 for qemu-devel@nongnu.org; Fri, 09 Mar 2018 07:08:45 -0500 From: Ian Jackson MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Message-ID: <23202.31050.607695.817387@mariner.uk.xensource.com> Date: Fri, 9 Mar 2018 12:08:42 +0000 In-Reply-To: <23202.30969.590920.764930@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> <23202.30969.590920.764930@mariner.uk.xensource.com> Subject: Re: [Qemu-devel] [PATCH 03/11] xen: defer call to xen_restrict until just before os_setup_post List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduardo Habkost Cc: qemu-devel@nongnu.org, xen-devel@lists.xenproject.org, Ross Lagerwall , Anthony PERARD , Juergen Gross , Stefano Stabellini , Paolo Bonzini , Richard Henderson , "Michael S. Tsirkin" Ian Jackson writes ("Re: [PATCH 03/11] xen: defer call to xen_restrict until just before os_setup_post"): > How about this ? And here's the corresponding change to the Xen-specific patch. >>From d6140681a877c4d468c4fcf5cac075cdffbea22c Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 9 Mar 2018 12:04:25 +0000 Subject: [PATCH v6.2 13/11] squash! xen: defer call to xen_restrict until just before os_setup_post v7: Use new AccelClass setup_post hook, rather than ad-hoc call in vl.c. Signed-off-by: Ian Jackson --- hw/xen/xen-common.c | 3 ++- include/sysemu/sysemu.h | 2 -- stubs/xen-hvm.c | 4 ---- vl.c | 1 - 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/hw/xen/xen-common.c b/hw/xen/xen-common.c index 8ede246..6ec14c7 100644 --- a/hw/xen/xen-common.c +++ b/hw/xen/xen-common.c @@ -122,7 +122,7 @@ static void xen_change_state_handler(void *opaque, int running, } } -void xen_setup_post(void) +static void xen_setup_post(MachineState *ms, AccelState *accel) { int rc; @@ -183,6 +183,7 @@ static void xen_accel_class_init(ObjectClass *oc, void *data) AccelClass *ac = ACCEL_CLASS(oc); ac->name = "Xen"; ac->init_machine = xen_init; + ac->setup_post = xen_setup_post; ac->allowed = &xen_allowed; ac->global_props = xen_compat_props; } diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 6b785a4..d24ad09 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -92,8 +92,6 @@ void qemu_remove_machine_init_done_notifier(Notifier *notify); void qemu_announce_self(void); -void xen_setup_post(void); - extern int autostart; typedef enum { diff --git a/stubs/xen-hvm.c b/stubs/xen-hvm.c index 48ca8da..7787ea2 100644 --- a/stubs/xen-hvm.c +++ b/stubs/xen-hvm.c @@ -62,7 +62,3 @@ void xen_hvm_init(PCMachineState *pcms, MemoryRegion **ram_memory) void qmp_xen_set_global_dirty_log(bool enable, Error **errp) { } - -void xen_setup_post(void) -{ -} diff --git a/vl.c b/vl.c index 3fd6401..f52a9f4 100644 --- a/vl.c +++ b/vl.c @@ -4720,7 +4720,6 @@ int main(int argc, char **argv, char **envp) } accel_setup_post(current_machine); - xen_setup_post(); os_setup_post(); main_loop(); -- 2.1.4 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Jackson Subject: Re: [PATCH 03/11] xen: defer call to xen_restrict until just before os_setup_post Date: Fri, 9 Mar 2018 12:08:42 +0000 Message-ID: <23202.31050.607695.817387@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> <23202.30969.590920.764930@mariner.uk.xensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from all-amaz-eas1.inumbo.com ([34.197.232.57]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1euGpO-0003fV-T2 for xen-devel@lists.xenproject.org; Fri, 09 Mar 2018 12:08:50 +0000 In-Reply-To: <23202.30969.590920.764930@mariner.uk.xensource.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: Eduardo Habkost Cc: Juergen Gross , Stefano Stabellini , "Michael S. Tsirkin" , qemu-devel@nongnu.org, Ross Lagerwall , Paolo Bonzini , Anthony PERARD , xen-devel@lists.xenproject.org, Richard Henderson List-Id: xen-devel@lists.xenproject.org SWFuIEphY2tzb24gd3JpdGVzICgiUmU6IFtQQVRDSCAwMy8xMV0geGVuOiBkZWZlciBjYWxsIHRv IHhlbl9yZXN0cmljdCB1bnRpbCBqdXN0IGJlZm9yZSBvc19zZXR1cF9wb3N0Iik6Cj4gSG93IGFi b3V0IHRoaXMgPwoKQW5kIGhlcmUncyB0aGUgY29ycmVzcG9uZGluZyBjaGFuZ2UgdG8gdGhlIFhl bi1zcGVjaWZpYyBwYXRjaC4KCkZyb20gZDYxNDA2ODFhODc3YzRkNDY4YzRmY2Y1Y2FjMDc1Y2Rm ZmJlYTIyYyBNb24gU2VwIDE3IDAwOjAwOjAwIDIwMDEKRnJvbTogSWFuIEphY2tzb24gPGlhbi5q YWNrc29uQGV1LmNpdHJpeC5jb20+CkRhdGU6IEZyaSwgOSBNYXIgMjAxOCAxMjowNDoyNSArMDAw MApTdWJqZWN0OiBbUEFUQ0ggdjYuMiAxMy8xMV0gc3F1YXNoISB4ZW46IGRlZmVyIGNhbGwgdG8g eGVuX3Jlc3RyaWN0IHVudGlsIGp1c3QgYmVmb3JlCiBvc19zZXR1cF9wb3N0Cgp2NzogVXNlIG5l dyBBY2NlbENsYXNzIHNldHVwX3Bvc3QgaG9vaywgcmF0aGVyIHRoYW4gYWQtaG9jIGNhbGwKICAg IGluIHZsLmMuCgpTaWduZWQtb2ZmLWJ5OiBJYW4gSmFja3NvbiA8SWFuLkphY2tzb25AZXUuY2l0 cml4LmNvbT4KLS0tCiBody94ZW4veGVuLWNvbW1vbi5jICAgICB8IDMgKystCiBpbmNsdWRlL3N5 c2VtdS9zeXNlbXUuaCB8IDIgLS0KIHN0dWJzL3hlbi1odm0uYyAgICAgICAgIHwgNCAtLS0tCiB2 bC5jICAgICAgICAgICAgICAgICAgICB8IDEgLQogNCBmaWxlcyBjaGFuZ2VkLCAyIGluc2VydGlv bnMoKyksIDggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvaHcveGVuL3hlbi1jb21tb24uYyBi L2h3L3hlbi94ZW4tY29tbW9uLmMKaW5kZXggOGVkZTI0Ni4uNmVjMTRjNyAxMDA2NDQKLS0tIGEv aHcveGVuL3hlbi1jb21tb24uYworKysgYi9ody94ZW4veGVuLWNvbW1vbi5jCkBAIC0xMjIsNyAr MTIyLDcgQEAgc3RhdGljIHZvaWQgeGVuX2NoYW5nZV9zdGF0ZV9oYW5kbGVyKHZvaWQgKm9wYXF1 ZSwgaW50IHJ1bm5pbmcsCiAgICAgfQogfQogCi12b2lkIHhlbl9zZXR1cF9wb3N0KHZvaWQpCitz dGF0aWMgdm9pZCB4ZW5fc2V0dXBfcG9zdChNYWNoaW5lU3RhdGUgKm1zLCBBY2NlbFN0YXRlICph Y2NlbCkKIHsKICAgICBpbnQgcmM7CiAKQEAgLTE4Myw2ICsxODMsNyBAQCBzdGF0aWMgdm9pZCB4 ZW5fYWNjZWxfY2xhc3NfaW5pdChPYmplY3RDbGFzcyAqb2MsIHZvaWQgKmRhdGEpCiAgICAgQWNj ZWxDbGFzcyAqYWMgPSBBQ0NFTF9DTEFTUyhvYyk7CiAgICAgYWMtPm5hbWUgPSAiWGVuIjsKICAg ICBhYy0+aW5pdF9tYWNoaW5lID0geGVuX2luaXQ7CisgICAgYWMtPnNldHVwX3Bvc3QgPSB4ZW5f c2V0dXBfcG9zdDsKICAgICBhYy0+YWxsb3dlZCA9ICZ4ZW5fYWxsb3dlZDsKICAgICBhYy0+Z2xv YmFsX3Byb3BzID0geGVuX2NvbXBhdF9wcm9wczsKIH0KZGlmZiAtLWdpdCBhL2luY2x1ZGUvc3lz ZW11L3N5c2VtdS5oIGIvaW5jbHVkZS9zeXNlbXUvc3lzZW11LmgKaW5kZXggNmI3ODVhNC4uZDI0 YWQwOSAxMDA2NDQKLS0tIGEvaW5jbHVkZS9zeXNlbXUvc3lzZW11LmgKKysrIGIvaW5jbHVkZS9z eXNlbXUvc3lzZW11LmgKQEAgLTkyLDggKzkyLDYgQEAgdm9pZCBxZW11X3JlbW92ZV9tYWNoaW5l X2luaXRfZG9uZV9ub3RpZmllcihOb3RpZmllciAqbm90aWZ5KTsKIAogdm9pZCBxZW11X2Fubm91 bmNlX3NlbGYodm9pZCk7CiAKLXZvaWQgeGVuX3NldHVwX3Bvc3Qodm9pZCk7Ci0KIGV4dGVybiBp bnQgYXV0b3N0YXJ0OwogCiB0eXBlZGVmIGVudW0gewpkaWZmIC0tZ2l0IGEvc3R1YnMveGVuLWh2 bS5jIGIvc3R1YnMveGVuLWh2bS5jCmluZGV4IDQ4Y2E4ZGEuLjc3ODdlYTIgMTAwNjQ0Ci0tLSBh L3N0dWJzL3hlbi1odm0uYworKysgYi9zdHVicy94ZW4taHZtLmMKQEAgLTYyLDcgKzYyLDMgQEAg dm9pZCB4ZW5faHZtX2luaXQoUENNYWNoaW5lU3RhdGUgKnBjbXMsIE1lbW9yeVJlZ2lvbiAqKnJh bV9tZW1vcnkpCiB2b2lkIHFtcF94ZW5fc2V0X2dsb2JhbF9kaXJ0eV9sb2coYm9vbCBlbmFibGUs IEVycm9yICoqZXJycCkKIHsKIH0KLQotdm9pZCB4ZW5fc2V0dXBfcG9zdCh2b2lkKQotewotfQpk aWZmIC0tZ2l0IGEvdmwuYyBiL3ZsLmMKaW5kZXggM2ZkNjQwMS4uZjUyYTlmNCAxMDA2NDQKLS0t IGEvdmwuYworKysgYi92bC5jCkBAIC00NzIwLDcgKzQ3MjAsNiBAQCBpbnQgbWFpbihpbnQgYXJn YywgY2hhciAqKmFyZ3YsIGNoYXIgKiplbnZwKQogICAgIH0KIAogICAgIGFjY2VsX3NldHVwX3Bv c3QoY3VycmVudF9tYWNoaW5lKTsKLSAgICB4ZW5fc2V0dXBfcG9zdCgpOwogICAgIG9zX3NldHVw X3Bvc3QoKTsKIAogICAgIG1haW5fbG9vcCgpOwotLSAKMi4xLjQKCgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhl bi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qub3Jn L21haWxtYW4vbGlzdGluZm8veGVuLWRldmVs