From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47940) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e7JIq-000402-6s for qemu-devel@nongnu.org; Wed, 25 Oct 2017 06:52:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e7JIn-0003k5-5G for qemu-devel@nongnu.org; Wed, 25 Oct 2017 06:52:52 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:44176) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1e7JIm-0003jA-T6 for qemu-devel@nongnu.org; Wed, 25 Oct 2017 06:52:49 -0400 Date: Wed, 25 Oct 2017 11:52:35 +0100 From: Anthony PERARD Message-ID: <20171025105235.GI1885@perard.uk.xensource.com> References: <20171020082538.17124-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: <20171020082538.17124-1-pbonzini@redhat.com> Subject: Re: [Qemu-devel] [PATCH] pci-assign: Remove List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: qemu-devel@nongnu.org, Stefano Stabellini , xen-devel@lists.xenproject.org On Fri, Oct 20, 2017 at 10:25:38AM +0200, Paolo Bonzini wrote: > Legacy PCI device assignment has been removed from Linux in 4.12, > and had been deprecated 2 years ago there. We can remove it from > QEMU as well. > > The ROM loading code was shared with Xen PCI passthrough, so move > it to hw/xen. > > Cc: Stefano Stabellini > Cc: Anthony Perard > Cc: xen-devel@lists.xenproject.org > Signed-off-by: Paolo Bonzini > --- > Xen parts only compile-tested. > > docs/qdev-device-use.txt | 12 +- > hw/i386/Makefile.objs | 1 - > hw/i386/kvm/Makefile.objs | 2 +- > hw/i386/kvm/pci-assign.c | 1883 -------------------- > hw/xen/Makefile.objs | 1 + > .../xen_pt_load_rom.c} | 4 +- > include/hw/pci/pci-assign.h | 27 - > qdev-monitor.c | 1 - > scripts/device-crash-test | 2 - > 9 files changed, 6 insertions(+), 1927 deletions(-) > delete mode 100644 hw/i386/kvm/pci-assign.c > rename hw/{i386/pci-assign-load-rom.c => xen/xen_pt_load_rom.c} (96%) > delete mode 100644 include/hw/pci/pci-assign.h > > diff --git a/hw/i386/pci-assign-load-rom.c b/hw/xen/xen_pt_load_rom.c > similarity index 96% > rename from hw/i386/pci-assign-load-rom.c > rename to hw/xen/xen_pt_load_rom.c > index 43429b66be..2bc3b6c092 100644 > --- a/hw/i386/pci-assign-load-rom.c > +++ b/hw/xen/xen_pt_load_rom.c > @@ -12,7 +12,7 @@ > #include "qemu/range.h" > #include "sysemu/sysemu.h" > #include "hw/pci/pci.h" > -#include "hw/pci/pci-assign.h" > +#include "xen_pt.h" > > /* > * Scan the assigned devices for the devices that have an option ROM, and then > @@ -80,7 +80,7 @@ close_rom: > fseek(fp, 0, SEEK_SET); > val = 0; > if (!fwrite(&val, 1, 1, fp)) { > - DEBUG("%s\n", "Failed to disable pci-sysfs rom file"); > + XEN_PT_WARN("%s\n", "Failed to disable pci-sysfs rom file"); XEN_PT_WARN takes an extra argument, it should read: XEN_PT_WARN(dev, "%s\n", "Failed to disable pci-sysfs rom file"); With that fixed: Acked-by: Anthony PERARD -- Anthony PERARD