From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35025) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c4CZ6-0001fk-CD for qemu-devel@nongnu.org; Tue, 08 Nov 2016 15:00:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c4CZ3-0005A5-M5 for qemu-devel@nongnu.org; Tue, 08 Nov 2016 15:00:16 -0500 Received: from mail.kernel.org ([198.145.29.136]:51196) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c4CZ3-00059T-Gr for qemu-devel@nongnu.org; Tue, 08 Nov 2016 15:00:13 -0500 From: Stefano Stabellini Date: Tue, 8 Nov 2016 12:00:08 -0800 Message-Id: <1478635208-23948-1-git-send-email-sstabellini@kernel.org> In-Reply-To: References: Subject: [Qemu-devel] [PULL] xen: Fix xenpv machine initialisation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: peter.maydell@linaro.org Cc: sstabellini@kernel.org, stefanha@gmail.com, anthony.perard@citrix.com, qemu-devel@nongnu.org, xen-devel@lists.xenproject.org From: Anthony PERARD When using QEMU for Xen PV guest, QEMU abort with: xen-common.c:118:xen_init: Object 0x7f2b8325dcb0 is not an instance of type generic-pc-machine This is because the machine 'xenpv' also use accel=xen. Moving the code to xen_hvm_init() fix the issue. This fix 021746c131cdfeab9d82ff918795a9f18d20d7ae. Signed-off-by: Anthony PERARD Signed-off-by: Stefano Stabellini Reviewed-by: Eduardo Habkost Reviewed-by: Stefano Stabellini --- xen-common.c | 6 ------ xen-hvm.c | 4 ++++ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/xen-common.c b/xen-common.c index bacf962..9099760 100644 --- a/xen-common.c +++ b/xen-common.c @@ -9,7 +9,6 @@ */ #include "qemu/osdep.h" -#include "hw/i386/pc.h" #include "hw/xen/xen_backend.h" #include "qmp-commands.h" #include "sysemu/char.h" @@ -115,11 +114,6 @@ static void xen_change_state_handler(void *opaque, int running, static int xen_init(MachineState *ms) { - PCMachineState *pcms = PC_MACHINE(ms); - - /* Disable ACPI build because Xen handles it */ - pcms->acpi_build_enabled = false; - xen_xc = xc_interface_open(0, 0, 0); if (xen_xc == NULL) { xen_pv_printf(NULL, 0, "can't open xen interface\n"); diff --git a/xen-hvm.c b/xen-hvm.c index 2f348ed..150c7e7 100644 --- a/xen-hvm.c +++ b/xen-hvm.c @@ -1316,6 +1316,10 @@ void xen_hvm_init(PCMachineState *pcms, MemoryRegion **ram_memory) } xen_be_register_common(); xen_read_physmap(state); + + /* Disable ACPI build because Xen handles it */ + pcms->acpi_build_enabled = false; + return; err: -- 1.9.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Stabellini Subject: [PULL] xen: Fix xenpv machine initialisation Date: Tue, 8 Nov 2016 12:00:08 -0800 Message-ID: <1478635208-23948-1-git-send-email-sstabellini@kernel.org> References: Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1c4CZ6-0003U7-F9 for xen-devel@lists.xenproject.org; Tue, 08 Nov 2016 20:00:16 +0000 In-Reply-To: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: peter.maydell@linaro.org Cc: anthony.perard@citrix.com, stefanha@gmail.com, sstabellini@kernel.org, qemu-devel@nongnu.org, xen-devel@lists.xenproject.org List-Id: xen-devel@lists.xenproject.org RnJvbTogQW50aG9ueSBQRVJBUkQgPGFudGhvbnkucGVyYXJkQGNpdHJpeC5jb20+CgpXaGVuIHVz aW5nIFFFTVUgZm9yIFhlbiBQViBndWVzdCwgUUVNVSBhYm9ydCB3aXRoOgp4ZW4tY29tbW9uLmM6 MTE4Onhlbl9pbml0OiBPYmplY3QgMHg3ZjJiODMyNWRjYjAgaXMgbm90IGFuIGluc3RhbmNlIG9m IHR5cGUgZ2VuZXJpYy1wYy1tYWNoaW5lCgpUaGlzIGlzIGJlY2F1c2UgdGhlIG1hY2hpbmUgJ3hl bnB2JyBhbHNvIHVzZSBhY2NlbD14ZW4uIE1vdmluZyB0aGUgY29kZQp0byB4ZW5faHZtX2luaXQo KSBmaXggdGhlIGlzc3VlLgoKVGhpcyBmaXggMDIxNzQ2YzEzMWNkZmVhYjlkODJmZjkxODc5NWE5 ZjE4ZDIwZDdhZS4KClNpZ25lZC1vZmYtYnk6IEFudGhvbnkgUEVSQVJEIDxhbnRob255LnBlcmFy ZEBjaXRyaXguY29tPgpTaWduZWQtb2ZmLWJ5OiBTdGVmYW5vIFN0YWJlbGxpbmkgPHNzdGFiZWxs aW5pQGtlcm5lbC5vcmc+ClJldmlld2VkLWJ5OiBFZHVhcmRvIEhhYmtvc3QgPGVoYWJrb3N0QHJl ZGhhdC5jb20+ClJldmlld2VkLWJ5OiBTdGVmYW5vIFN0YWJlbGxpbmkgPHNzdGFiZWxsaW5pQGtl cm5lbC5vcmc+Ci0tLQogeGVuLWNvbW1vbi5jIHwgNiAtLS0tLS0KIHhlbi1odm0uYyAgICB8IDQg KysrKwogMiBmaWxlcyBjaGFuZ2VkLCA0IGluc2VydGlvbnMoKyksIDYgZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEveGVuLWNvbW1vbi5jIGIveGVuLWNvbW1vbi5jCmluZGV4IGJhY2Y5NjIuLjkw OTk3NjAgMTAwNjQ0Ci0tLSBhL3hlbi1jb21tb24uYworKysgYi94ZW4tY29tbW9uLmMKQEAgLTks NyArOSw2IEBACiAgKi8KIAogI2luY2x1ZGUgInFlbXUvb3NkZXAuaCIKLSNpbmNsdWRlICJody9p Mzg2L3BjLmgiCiAjaW5jbHVkZSAiaHcveGVuL3hlbl9iYWNrZW5kLmgiCiAjaW5jbHVkZSAicW1w LWNvbW1hbmRzLmgiCiAjaW5jbHVkZSAic3lzZW11L2NoYXIuaCIKQEAgLTExNSwxMSArMTE0LDYg QEAgc3RhdGljIHZvaWQgeGVuX2NoYW5nZV9zdGF0ZV9oYW5kbGVyKHZvaWQgKm9wYXF1ZSwgaW50 IHJ1bm5pbmcsCiAKIHN0YXRpYyBpbnQgeGVuX2luaXQoTWFjaGluZVN0YXRlICptcykKIHsKLSAg ICBQQ01hY2hpbmVTdGF0ZSAqcGNtcyA9IFBDX01BQ0hJTkUobXMpOwotCi0gICAgLyogRGlzYWJs ZSBBQ1BJIGJ1aWxkIGJlY2F1c2UgWGVuIGhhbmRsZXMgaXQgKi8KLSAgICBwY21zLT5hY3BpX2J1 aWxkX2VuYWJsZWQgPSBmYWxzZTsKLQogICAgIHhlbl94YyA9IHhjX2ludGVyZmFjZV9vcGVuKDAs IDAsIDApOwogICAgIGlmICh4ZW5feGMgPT0gTlVMTCkgewogICAgICAgICB4ZW5fcHZfcHJpbnRm KE5VTEwsIDAsICJjYW4ndCBvcGVuIHhlbiBpbnRlcmZhY2VcbiIpOwpkaWZmIC0tZ2l0IGEveGVu LWh2bS5jIGIveGVuLWh2bS5jCmluZGV4IDJmMzQ4ZWQuLjE1MGM3ZTcgMTAwNjQ0Ci0tLSBhL3hl bi1odm0uYworKysgYi94ZW4taHZtLmMKQEAgLTEzMTYsNiArMTMxNiwxMCBAQCB2b2lkIHhlbl9o dm1faW5pdChQQ01hY2hpbmVTdGF0ZSAqcGNtcywgTWVtb3J5UmVnaW9uICoqcmFtX21lbW9yeSkK ICAgICB9CiAgICAgeGVuX2JlX3JlZ2lzdGVyX2NvbW1vbigpOwogICAgIHhlbl9yZWFkX3BoeXNt YXAoc3RhdGUpOworCisgICAgLyogRGlzYWJsZSBBQ1BJIGJ1aWxkIGJlY2F1c2UgWGVuIGhhbmRs ZXMgaXQgKi8KKyAgICBwY21zLT5hY3BpX2J1aWxkX2VuYWJsZWQgPSBmYWxzZTsKKwogICAgIHJl dHVybjsKIAogZXJyOgotLSAKMS45LjEKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54 ZW4ub3JnCmh0dHBzOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK