From patchwork Tue Sep 27 08:53:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 675440 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 ozlabs.org (Postfix) with ESMTPS id 3sjvmW5bG2z9ryn for ; Tue, 27 Sep 2016 18:55:07 +1000 (AEST) Received: from localhost ([::1]:48865 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1booAL-0001Qe-Q0 for incoming@patchwork.ozlabs.org; Tue, 27 Sep 2016 04:55:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34762) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1boo9L-0000o9-H9 for qemu-devel@nongnu.org; Tue, 27 Sep 2016 04:54:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1boo9I-0007Is-BK for qemu-devel@nongnu.org; Tue, 27 Sep 2016 04:54:03 -0400 Received: from mx6-phx2.redhat.com ([209.132.183.39]:47378) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1boo9I-0007IQ-1F for qemu-devel@nongnu.org; Tue, 27 Sep 2016 04:54:00 -0400 Received: from zmail13.collab.prod.int.phx2.redhat.com (zmail13.collab.prod.int.phx2.redhat.com [10.5.83.15]) by mx6-phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u8R8rvIo009696; Tue, 27 Sep 2016 04:53:57 -0400 Date: Tue, 27 Sep 2016 04:53:57 -0400 (EDT) From: Paolo Bonzini To: Peter Xu Message-ID: <1575153570.3027165.1474966437735.JavaMail.zimbra@redhat.com> In-Reply-To: <20160927021251.GA10363@pxdev.xzpeter.org> References: <1474897258-1205-1-git-send-email-pbonzini@redhat.com> <20160927021251.GA10363@pxdev.xzpeter.org> MIME-Version: 1.0 X-Originating-IP: [10.4.164.1, 10.5.101.130] X-Mailer: Zimbra 8.0.6_GA_5922 (ZimbraWebClient - FF48 (Linux)/8.0.6_GA_5922) Thread-Topic: Misc patches for 2016-09-26 Thread-Index: c3Bhj+KwhFBhb3v9L131G0Ckq+0hMQ== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.39 Subject: Re: [Qemu-devel] [PULL 00/28] Misc patches for 2016-09-26 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: , Cc: Peter Maydell , QEMU Developers Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" ----- Original Message ----- > From: "Peter Xu" > To: "Peter Maydell" , "Paolo Bonzini" > Cc: "QEMU Developers" > Sent: Tuesday, September 27, 2016 4:12:51 AM > Subject: Re: [Qemu-devel] [PULL 00/28] Misc patches for 2016-09-26 > > On Mon, Sep 26, 2016 at 02:19:08PM -0700, Peter Maydell wrote: > > [...] > > > I also see this compile failure: > > > > CC i386-softmmu/hw/i386/amd_iommu.o > > /home/petmay01/linaro/qemu-for-merges/hw/i386/amd_iommu.c: In function > > ‘amdvi_init’: > > /home/petmay01/linaro/qemu-for-merges/hw/i386/amd_iommu.c:1083:17: > > error: ‘MemoryRegionIOMMUOps {aka struct MemoryRegionIOMMUOps}’ has no > > member named ‘notify_started’ > > s->iommu_ops.notify_started = amdvi_iommu_notify_started; > > ^ > > /home/petmay01/linaro/qemu-for-merges/rules.mak:60: recipe for target > > 'hw/i386/amd_iommu.o' failed > > Paolo, > > Would you please help squash this into 02/28 of your PULL request to > solve above error? Shall I also redo patch 3/3 for AMD IOMMU, like this: ? Paolo diff --git a/hw/i386/amd_iommu.c b/hw/i386/amd_iommu.c index a868539..6365682 100644 --- a/hw/i386/amd_iommu.c +++ b/hw/i386/amd_iommu.c @@ -1072,9 +1072,12 @@ static void amdvi_iommu_notify_flag_changed(MemoryRegion *iommu, { AMDVIAddressSpace *as = container_of(iommu, AMDVIAddressSpace, iommu); - hw_error("device %02x.%02x.%x requires iommu notifier which is not " - "currently supported", as->bus_num, PCI_SLOT(as->devfn), - PCI_FUNC(as->devfn)); + if (new & IOMMU_NOTIFIER_MAP) { + error_report("device %02x.%02x.%x requires iommu notifier which is not " + "currently supported", as->bus_num, PCI_SLOT(as->devfn), + PCI_FUNC(as->devfn)); + exit(1); + } } static void amdvi_init(AMDVIState *s)