From patchwork Mon Dec 23 15:42:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Aneesh Kumar K.V" X-Patchwork-Id: 304791 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id CADE22C0094 for ; Tue, 24 Dec 2013 02:42:57 +1100 (EST) Received: from localhost ([::1]:34169 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vv7eh-0008Fm-1Q for incoming@patchwork.ozlabs.org; Mon, 23 Dec 2013 10:42:55 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35892) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vv7eJ-0008BR-By for qemu-devel@nongnu.org; Mon, 23 Dec 2013 10:42:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vv7e5-0001GY-Md for qemu-devel@nongnu.org; Mon, 23 Dec 2013 10:42:31 -0500 Received: from e23smtp09.au.ibm.com ([202.81.31.142]:57690) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vv7e4-0001BM-TL for qemu-devel@nongnu.org; Mon, 23 Dec 2013 10:42:17 -0500 Received: from /spool/local by e23smtp09.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 24 Dec 2013 01:42:14 +1000 Received: from d23dlp03.au.ibm.com (202.81.31.214) by e23smtp09.au.ibm.com (202.81.31.206) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 24 Dec 2013 01:42:11 +1000 Received: from d23relay03.au.ibm.com (d23relay03.au.ibm.com [9.190.235.21]) by d23dlp03.au.ibm.com (Postfix) with ESMTP id 436FB3578052; Tue, 24 Dec 2013 02:42:10 +1100 (EST) Received: from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.234.97]) by d23relay03.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id rBNFfv6d64946210; Tue, 24 Dec 2013 02:41:57 +1100 Received: from d23av03.au.ibm.com (localhost [127.0.0.1]) by d23av03.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id rBNFg9Ma031346; Tue, 24 Dec 2013 02:42:09 +1100 Received: from skywalker.linux.vnet.ibm.com ([9.79.213.241]) by d23av03.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id rBNFg5xK031276 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Tue, 24 Dec 2013 02:42:07 +1100 From: "Aneesh Kumar K.V" To: Alexander Graf In-Reply-To: References: <1387469084-17116-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> <17DB5D62-E80A-4774-A8F9-DBB47AC3523C@suse.de> User-Agent: Notmuch/0.16+99~g10596a5 (http://notmuchmail.org) Emacs/24.3.1 (x86_64-pc-linux-gnu) Date: Mon, 23 Dec 2013 21:12:04 +0530 Message-ID: <87a9frzi9f.fsf@linux.vnet.ibm.com> MIME-Version: 1.0 X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13122315-3568-0000-0000-000004B95A20 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 202.81.31.142 Cc: Paolo Bonzini , qemu-ppc , Markus Armbruster , Paul Mackerras , QEMU Developers Subject: Re: [Qemu-devel] [Qemu-ppc] [PATCH V4] kvm: Add a new machine property kvm-type X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Alexander Graf writes: > On Dec 20, 2013, at 11:55 AM, Alexander Graf wrote: > >> >> On 19.12.2013, at 17:04, Aneesh Kumar K.V wrote: >> >>> From: "Aneesh Kumar K.V" >>> >>> Targets like ppc64 support different typed of KVM, one which use >>> hypervisor mode and the other which doesn't. Add a new machine >>> property kvm-type that helps in selecting the respective ones >>> We also add a new QEMUMachine callback get_vm_type that helps >>> in mapping the string representation of kvm type specified. >>> >>> Signed-off-by: Aneesh Kumar K.V >> >> Thanks, applied to ppc-next. > > This breaks compilation for ppc{,64}-linux-user. Please fix that up > and submit a v5. I've taken this patch from my tree for now :). Sent v5 with the below fix folded diff --git a/kvm-stub.c b/kvm-stub.c index c27b69076572..6dd4454a640c 100644 --- a/kvm-stub.c +++ b/kvm-stub.c @@ -19,8 +19,6 @@ #include "hw/pci/msi.h" #endif -#include "hw/boards.h" - KVMState *kvm_state; bool kvm_kernel_irqchip; bool kvm_async_interrupts_allowed; @@ -30,6 +28,7 @@ bool kvm_gsi_routing_allowed; bool kvm_gsi_direct_mapping; bool kvm_allowed; bool kvm_readonly_mem_allowed; +typedef struct QEMUMachine QEMUMachine; int kvm_init_vcpu(CPUState *cpu) {