Re: [Xen-devel] [Qemu-devel] [PATCH] pci-assign: Remove

[Philippe Mathieu-Daudé <f4bug@xxxxxxxxx>]

> 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 <sstabellini@xxxxxxxxxx>
>> Cc: Anthony Perard <anthony.perard@xxxxxxxxxx>
>> Cc: xen-devel@xxxxxxxxxxxxxxxxxxxx
>> Signed-off-by: Paolo Bonzini <pbonzini@xxxxxxxxxx>
>> ---
>>         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 
>> --------------------

nice cleanup <3

>>  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@xxxxxxxxxx>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@xxxxxxxxx>


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
https://lists.xen.org/xen-devel