From patchwork Wed Aug 11 17:05:16 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 61490 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id DF391B70E4 for ; Thu, 12 Aug 2010 03:10:37 +1000 (EST) Received: from localhost ([127.0.0.1]:47817 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OjEow-0001Sy-8Z for incoming@patchwork.ozlabs.org; Wed, 11 Aug 2010 13:10:30 -0400 Received: from [140.186.70.92] (port=47047 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OjEjx-0006vh-9v for qemu-devel@nongnu.org; Wed, 11 Aug 2010 13:05:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OjEjw-0002ZY-48 for qemu-devel@nongnu.org; Wed, 11 Aug 2010 13:05:21 -0400 Received: from mail-qy0-f173.google.com ([209.85.216.173]:60387) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OjEjw-0002ZP-26 for qemu-devel@nongnu.org; Wed, 11 Aug 2010 13:05:20 -0400 Received: by qyk33 with SMTP id 33so382453qyk.4 for ; Wed, 11 Aug 2010 10:05:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:message-id:date:from :user-agent:mime-version:newsgroups:to:cc:subject:references :in-reply-to:content-type:content-transfer-encoding; bh=m0IKgiTI9/6sXlfdDt7LswkdDYqv1RWNDQlN6a/yMYA=; b=NwgcRy4m+vqPWeaqxGZXNSdgQyF3hoBm9goeMsjyPDBvUNEPl81IDfhr2OD075cFgN Q3kzPsBkOqJh6Yo+bmoYuloMtd0UBp7iuaecw+gCGTna9WwiB0b3p+mQxBy55WYTbeht uxVD7kH1D9I5w+CgICePNhoucR5Dnuca5Fa3I= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:message-id:date:from:user-agent:mime-version:newsgroups:to :cc:subject:references:in-reply-to:content-type :content-transfer-encoding; b=aZQBmWHxCuuqKBd3GQOWhw+gWr8iSDflaCVvZH1/rq6692UlBaQW4gP49Pp5OlBs4/ Vf0SNNmD0HIDC9wsvRzI4zn58+cGubcLrU9h7yUww0gCyRAO5NOq+wJP804tPjLMhrUM eTL/326/LWC60OT0LmBYnphLeLY7Gndxen8eE= Received: by 10.224.89.11 with SMTP id c11mr11057838qam.268.1281546319394; Wed, 11 Aug 2010 10:05:19 -0700 (PDT) Received: from yakj.usersys.redhat.com ([12.198.177.3]) by mx.google.com with ESMTPS id l8sm408280qck.18.2010.08.11.10.05.17 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 11 Aug 2010 10:05:18 -0700 (PDT) Message-ID: <4C62D84C.5020405@redhat.com> Date: Wed, 11 Aug 2010 13:05:16 -0400 From: Paolo Bonzini User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.10) Gecko/20100621 Fedora/3.0.5-1.fc13 Lightning/1.0b2pre Thunderbird/3.0.5 MIME-Version: 1.0 Newsgroups: gmane.comp.emulators.qemu To: Stefan Weil References: <1281512334-4268-1-git-send-email-weil@mail.berlios.de> <1281512334-4268-2-git-send-email-weil@mail.berlios.de> In-Reply-To: <1281512334-4268-2-git-send-email-weil@mail.berlios.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: Anthony Liguori , Cam Macdonell , QEMU Developers Subject: [Qemu-devel] Re: [PATCH 2/2] ivshmem: Fix compilation without kvm X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org On 08/11/2010 03:38 AM, Stefan Weil wrote: > kvm_set_ioeventfd_mmio_long is only available with CONFIG_KVM. We should just disable ivshmem for non-KVM because it is also breaking Windows builds. Alternatively, the right way to do what this patch does, is to add kvm_set_ioeventfd_mmio_long to kvm-stub.c, and to use "obj-$(CONFIG_POSIX) += ivshmem.o" in the makefile to work around the Windows build problems. Paolo diff --git a/Makefile.target b/Makefile.target index b791492..c8281e9 100644 --- a/Makefile.target +++ b/Makefile.target @@ -191,7 +191,7 @@ obj-y += rtl8139.o obj-y += e1000.o # Inter-VM PCI shared memory -obj-y += ivshmem.o +obj-$(CONFIG_KVM) += ivshmem.o # Hardware support obj-i386-y += vga.o