| Message ID | 20170922160111.31885-5-f4bug@amsat.org |
|---|---|
| State | New |
| Headers | show |
| Series | remove i386/pc dependency from non-PC world (part 1) | expand |
On Fri, Sep 22, 2017 at 01:01:04PM -0300, Philippe Mathieu-Daudé wrote: > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> ppc portions Acked-by: David Gibson <david@gibson.dropbear.id.au> > --- > hw/pci/pci_internal.h | 16 +++++++++++ > include/hw/net/pci.h | 20 +++++++++++++ > include/hw/pci/pci.h | 4 --- > hw/arm/virt.c | 1 + > hw/mips/mips_malta.c | 1 + > hw/pci/pci.c | 67 ++------------------------------------------ > hw/pci/pci_nic.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++ > hw/ppc/e500.c | 1 + > hw/ppc/spapr.c | 1 + > hw/pci/Makefile.objs | 1 + > 10 files changed, 120 insertions(+), 69 deletions(-) > create mode 100644 hw/pci/pci_internal.h > create mode 100644 include/hw/net/pci.h > create mode 100644 hw/pci/pci_nic.c > > diff --git a/hw/pci/pci_internal.h b/hw/pci/pci_internal.h > new file mode 100644 > index 0000000000..d967468767 > --- /dev/null > +++ b/hw/pci/pci_internal.h > @@ -0,0 +1,16 @@ > +/* > + * QEMU PCI internal > + * > + * Copyright (c) 2005 Fabrice Bellard > + * > + * This work is licensed under the terms of the GNU GPL, version 2 or later. > + * See the COPYING file in the top-level directory. > + */ > +#ifndef QEMU_HW_PCI_INTERNAL_H > +#define QEMU_HW_PCI_INTERNAL_H > + > +#include "hw/pci/pci_bus.h" > + > +PCIBus *pci_get_bus_devfn(int *devfnp, PCIBus *root, const char *devaddr); > + > +#endif > diff --git a/include/hw/net/pci.h b/include/hw/net/pci.h > new file mode 100644 > index 0000000000..529591b7f3 > --- /dev/null > +++ b/include/hw/net/pci.h > @@ -0,0 +1,20 @@ > +/* > + * QEMU network devices > + * > + * Copyright (c) 2005 Fabrice Bellard > + * > + * This work is licensed under the terms of the GNU GPL, version 2 or later. > + * See the COPYING file in the top-level directory. > + */ > +#ifndef QEMU_HW_NET_PCI_H > +#define QEMU_HW_NET_PCI_H > + > +#include "net/net.h" > +#include "hw/pci/pci.h" > +#include "hw/pci/pci_bus.h" > + > +PCIDevice *pci_nic_init_nofail(NICInfo *nd, PCIBus *rootbus, > + const char *default_model, > + const char *default_devaddr); > + > +#endif > diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h > index aa7ef9cf69..6a0f7b5472 100644 > --- a/include/hw/pci/pci.h > +++ b/include/hw/pci/pci.h > @@ -422,10 +422,6 @@ void pci_device_set_intx_routing_notifier(PCIDevice *dev, > PCIINTxRoutingNotifier notifier); > void pci_device_reset(PCIDevice *dev); > > -PCIDevice *pci_nic_init_nofail(NICInfo *nd, PCIBus *rootbus, > - const char *default_model, > - const char *default_devaddr); > - > PCIDevice *pci_vga_init(PCIBus *bus); > > int pci_bus_num(PCIBus *s); > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index 9e18b410d7..39fab3acb9 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -35,6 +35,7 @@ > #include "hw/arm/primecell.h" > #include "hw/arm/virt.h" > #include "hw/devices.h" > +#include "hw/net/pci.h" > #include "net/net.h" > #include "sysemu/block-backend.h" > #include "sysemu/device_tree.h" > diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c > index 6945fa47c3..fb6a2f9363 100644 > --- a/hw/mips/mips_malta.c > +++ b/hw/mips/mips_malta.c > @@ -48,6 +48,7 @@ > #include "hw/timer/mc146818rtc.h" > #include "hw/input/i8042.h" > #include "hw/timer/i8254.h" > +#include "hw/net/pci.h" > #include "sysemu/blockdev.h" > #include "exec/address-spaces.h" > #include "hw/sysbus.h" /* SysBusDevice */ > diff --git a/hw/pci/pci.c b/hw/pci/pci.c > index 1e6fb88eba..9b678c8fd0 100644 > --- a/hw/pci/pci.c > +++ b/hw/pci/pci.c > @@ -28,7 +28,6 @@ > #include "hw/pci/pci_bus.h" > #include "hw/pci/pci_host.h" > #include "monitor/monitor.h" > -#include "net/net.h" > #include "sysemu/sysemu.h" > #include "hw/loader.h" > #include "qemu/error-report.h" > @@ -41,6 +40,7 @@ > #include "hw/hotplug.h" > #include "hw/boards.h" > #include "qemu/cutils.h" > +#include "pci_internal.h" > > //#define DEBUG_PCI > #ifdef DEBUG_PCI > @@ -671,8 +671,7 @@ static int pci_parse_devaddr(const char *addr, int *domp, int *busp, > return 0; > } > > -static PCIBus *pci_get_bus_devfn(int *devfnp, PCIBus *root, > - const char *devaddr) > +PCIBus *pci_get_bus_devfn(int *devfnp, PCIBus *root, const char *devaddr) > { > int dom, bus; > unsigned slot; > @@ -1812,68 +1811,6 @@ PciInfoList *qmp_query_pci(Error **errp) > return head; > } > > -static const char * const pci_nic_models[] = { > - "ne2k_pci", > - "i82551", > - "i82557b", > - "i82559er", > - "rtl8139", > - "e1000", > - "pcnet", > - "virtio", > - "sungem", > - NULL > -}; > - > -static const char * const pci_nic_names[] = { > - "ne2k_pci", > - "i82551", > - "i82557b", > - "i82559er", > - "rtl8139", > - "e1000", > - "pcnet", > - "virtio-net-pci", > - "sungem", > - NULL > -}; > - > -/* Initialize a PCI NIC. */ > -PCIDevice *pci_nic_init_nofail(NICInfo *nd, PCIBus *rootbus, > - const char *default_model, > - const char *default_devaddr) > -{ > - const char *devaddr = nd->devaddr ? nd->devaddr : default_devaddr; > - PCIBus *bus; > - PCIDevice *pci_dev; > - DeviceState *dev; > - int devfn; > - int i; > - > - if (qemu_show_nic_models(nd->model, pci_nic_models)) { > - exit(0); > - } > - > - i = qemu_find_nic_model(nd, pci_nic_models, default_model); > - if (i < 0) { > - exit(1); > - } > - > - bus = pci_get_bus_devfn(&devfn, rootbus, devaddr); > - if (!bus) { > - error_report("Invalid PCI device address %s for device %s", > - devaddr, pci_nic_names[i]); > - exit(1); > - } > - > - pci_dev = pci_create(bus, devfn, pci_nic_names[i]); > - dev = &pci_dev->qdev; > - qdev_set_nic_properties(dev, nd); > - qdev_init_nofail(dev); > - > - return pci_dev; > -} > - > PCIDevice *pci_vga_init(PCIBus *bus) > { > switch (vga_interface_type) { > diff --git a/hw/pci/pci_nic.c b/hw/pci/pci_nic.c > new file mode 100644 > index 0000000000..fb1a10ff12 > --- /dev/null > +++ b/hw/pci/pci_nic.c > @@ -0,0 +1,77 @@ > +/* > + * QEMU PCI network interface > + * > + * Copyright (c) 2004 Fabrice Bellard > + * > + * This work is licensed under the terms of the GNU GPL, version 2 or later. > + * See the COPYING file in the top-level directory. > + */ > +#include "qemu/osdep.h" > +#include "qemu/error-report.h" > +#include "hw/pci/pci.h" > +#include "hw/pci/pci_bus.h" > +#include "hw/net/pci.h" > +#include "net/net.h" > +#include "pci_internal.h" > + > +static const char *const pci_nic_models[] = { > + "ne2k_pci", > + "i82551", > + "i82557b", > + "i82559er", > + "rtl8139", > + "e1000", > + "pcnet", > + "virtio", > + "sungem", > + NULL > +}; > + > +static const char *const pci_nic_names[] = { > + "ne2k_pci", > + "i82551", > + "i82557b", > + "i82559er", > + "rtl8139", > + "e1000", > + "pcnet", > + "virtio-net-pci", > + "sungem", > + NULL > +}; > + > +/* Initialize a PCI NIC. */ > +PCIDevice *pci_nic_init_nofail(NICInfo *nd, PCIBus *rootbus, > + const char *default_model, > + const char *default_devaddr) > +{ > + const char *devaddr = nd->devaddr ? nd->devaddr : default_devaddr; > + PCIBus *bus; > + PCIDevice *pci_dev; > + DeviceState *dev; > + int devfn; > + int i; > + > + if (qemu_show_nic_models(nd->model, pci_nic_models)) { > + exit(0); > + } > + > + i = qemu_find_nic_model(nd, pci_nic_models, default_model); > + if (i < 0) { > + exit(1); > + } > + > + bus = pci_get_bus_devfn(&devfn, rootbus, devaddr); > + if (!bus) { > + error_report("Invalid PCI device address %s for device %s", > + devaddr, pci_nic_names[i]); > + exit(1); > + } > + > + pci_dev = pci_create(bus, devfn, pci_nic_names[i]); > + dev = &pci_dev->qdev; > + qdev_set_nic_properties(dev, nd); > + qdev_init_nofail(dev); > + > + return pci_dev; > +} > diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c > index db0e49ab8f..482757ca7b 100644 > --- a/hw/ppc/e500.c > +++ b/hw/ppc/e500.c > @@ -24,6 +24,7 @@ > #include "hw/hw.h" > #include "hw/char/serial.h" > #include "hw/pci/pci.h" > +#include "hw/net/pci.h" > #include "hw/boards.h" > #include "sysemu/sysemu.h" > #include "sysemu/kvm.h" > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 17ea77618c..96007051e2 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -56,6 +56,7 @@ > #include "hw/pci-host/spapr.h" > #include "hw/ppc/xics.h" > #include "hw/pci/msi.h" > +#include "hw/net/pci.h" > > #include "hw/pci/pci.h" > #include "hw/scsi/scsi.h" > diff --git a/hw/pci/Makefile.objs b/hw/pci/Makefile.objs > index 9f905e6344..125428fd54 100644 > --- a/hw/pci/Makefile.objs > +++ b/hw/pci/Makefile.objs > @@ -1,4 +1,5 @@ > common-obj-$(CONFIG_PCI) += pci.o pci_bridge.o > +common-obj-$(CONFIG_PCI) += pci_nic.o > common-obj-$(CONFIG_PCI) += msix.o msi.o > common-obj-$(CONFIG_PCI) += shpc.o > common-obj-$(CONFIG_PCI) += slotid_cap.o
Hi Philippe, It seems the patch is doing much more than what is mentioned in the subject. On 22/09/2017 19:01, Philippe Mathieu-Daudé wrote: > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/pci/pci_internal.h | 16 +++++++++++ > include/hw/net/pci.h | 20 +++++++++++++ > include/hw/pci/pci.h | 4 --- > hw/arm/virt.c | 1 + > hw/mips/mips_malta.c | 1 + > hw/pci/pci.c | 67 ++------------------------------------------ > hw/pci/pci_nic.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++ > hw/ppc/e500.c | 1 + > hw/ppc/spapr.c | 1 + > hw/pci/Makefile.objs | 1 + > 10 files changed, 120 insertions(+), 69 deletions(-) > create mode 100644 hw/pci/pci_internal.h > create mode 100644 include/hw/net/pci.h > create mode 100644 hw/pci/pci_nic.c > > diff --git a/hw/pci/pci_internal.h b/hw/pci/pci_internal.h > new file mode 100644 > index 0000000000..d967468767 > --- /dev/null > +++ b/hw/pci/pci_internal.h > @@ -0,0 +1,16 @@ > +/* > + * QEMU PCI internal > + * > + * Copyright (c) 2005 Fabrice Bellard > + * > + * This work is licensed under the terms of the GNU GPL, version 2 or later. > + * See the COPYING file in the top-level directory. > + */ > +#ifndef QEMU_HW_PCI_INTERNAL_H > +#define QEMU_HW_PCI_INTERNAL_H > + > +#include "hw/pci/pci_bus.h" > + > +PCIBus *pci_get_bus_devfn(int *devfnp, PCIBus *root, const char *devaddr); > + > +#endif Why don't add the function directly to hw/pci/pci_nic.c ? We have only one calling site anyway. I have nothing against adding an internal H file, but then we would need to add there *all* the functions used only by the pci sub-system. And that may be out of the scope of your series. > diff --git a/include/hw/net/pci.h b/include/hw/net/pci.h > new file mode 100644 > index 0000000000..529591b7f3 > --- /dev/null > +++ b/include/hw/net/pci.h > @@ -0,0 +1,20 @@ > +/* > + * QEMU network devices > + * > + * Copyright (c) 2005 Fabrice Bellard > + * > + * This work is licensed under the terms of the GNU GPL, version 2 or later. > + * See the COPYING file in the top-level directory. > + */ > +#ifndef QEMU_HW_NET_PCI_H > +#define QEMU_HW_NET_PCI_H > + > +#include "net/net.h" > +#include "hw/pci/pci.h" > +#include "hw/pci/pci_bus.h" > + > +PCIDevice *pci_nic_init_nofail(NICInfo *nd, PCIBus *rootbus, > + const char *default_model, > + const char *default_devaddr); > + Can you add a short explanation on how the split helps removing i386/pc dependency from non-PC world? - it is not straight forward, at least for me. Thanks, Marcel > +#endif > diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h > index aa7ef9cf69..6a0f7b5472 100644 > --- a/include/hw/pci/pci.h > +++ b/include/hw/pci/pci.h > @@ -422,10 +422,6 @@ void pci_device_set_intx_routing_notifier(PCIDevice *dev, > PCIINTxRoutingNotifier notifier); > void pci_device_reset(PCIDevice *dev); > > -PCIDevice *pci_nic_init_nofail(NICInfo *nd, PCIBus *rootbus, > - const char *default_model, > - const char *default_devaddr); > - > PCIDevice *pci_vga_init(PCIBus *bus); > > int pci_bus_num(PCIBus *s); > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index 9e18b410d7..39fab3acb9 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -35,6 +35,7 @@ > #include "hw/arm/primecell.h" > #include "hw/arm/virt.h" > #include "hw/devices.h" > +#include "hw/net/pci.h" > #include "net/net.h" > #include "sysemu/block-backend.h" > #include "sysemu/device_tree.h" > diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c > index 6945fa47c3..fb6a2f9363 100644 > --- a/hw/mips/mips_malta.c > +++ b/hw/mips/mips_malta.c > @@ -48,6 +48,7 @@ > #include "hw/timer/mc146818rtc.h" > #include "hw/input/i8042.h" > #include "hw/timer/i8254.h" > +#include "hw/net/pci.h" > #include "sysemu/blockdev.h" > #include "exec/address-spaces.h" > #include "hw/sysbus.h" /* SysBusDevice */ > diff --git a/hw/pci/pci.c b/hw/pci/pci.c > index 1e6fb88eba..9b678c8fd0 100644 > --- a/hw/pci/pci.c > +++ b/hw/pci/pci.c > @@ -28,7 +28,6 @@ > #include "hw/pci/pci_bus.h" > #include "hw/pci/pci_host.h" > #include "monitor/monitor.h" > -#include "net/net.h" > #include "sysemu/sysemu.h" > #include "hw/loader.h" > #include "qemu/error-report.h" > @@ -41,6 +40,7 @@ > #include "hw/hotplug.h" > #include "hw/boards.h" > #include "qemu/cutils.h" > +#include "pci_internal.h" > > //#define DEBUG_PCI > #ifdef DEBUG_PCI > @@ -671,8 +671,7 @@ static int pci_parse_devaddr(const char *addr, int *domp, int *busp, > return 0; > } > > -static PCIBus *pci_get_bus_devfn(int *devfnp, PCIBus *root, > - const char *devaddr) > +PCIBus *pci_get_bus_devfn(int *devfnp, PCIBus *root, const char *devaddr) > { > int dom, bus; > unsigned slot; > @@ -1812,68 +1811,6 @@ PciInfoList *qmp_query_pci(Error **errp) > return head; > } > > -static const char * const pci_nic_models[] = { > - "ne2k_pci", > - "i82551", > - "i82557b", > - "i82559er", > - "rtl8139", > - "e1000", > - "pcnet", > - "virtio", > - "sungem", > - NULL > -}; > - > -static const char * const pci_nic_names[] = { > - "ne2k_pci", > - "i82551", > - "i82557b", > - "i82559er", > - "rtl8139", > - "e1000", > - "pcnet", > - "virtio-net-pci", > - "sungem", > - NULL > -}; > - > -/* Initialize a PCI NIC. */ > -PCIDevice *pci_nic_init_nofail(NICInfo *nd, PCIBus *rootbus, > - const char *default_model, > - const char *default_devaddr) > -{ > - const char *devaddr = nd->devaddr ? nd->devaddr : default_devaddr; > - PCIBus *bus; > - PCIDevice *pci_dev; > - DeviceState *dev; > - int devfn; > - int i; > - > - if (qemu_show_nic_models(nd->model, pci_nic_models)) { > - exit(0); > - } > - > - i = qemu_find_nic_model(nd, pci_nic_models, default_model); > - if (i < 0) { > - exit(1); > - } > - > - bus = pci_get_bus_devfn(&devfn, rootbus, devaddr); > - if (!bus) { > - error_report("Invalid PCI device address %s for device %s", > - devaddr, pci_nic_names[i]); > - exit(1); > - } > - > - pci_dev = pci_create(bus, devfn, pci_nic_names[i]); > - dev = &pci_dev->qdev; > - qdev_set_nic_properties(dev, nd); > - qdev_init_nofail(dev); > - > - return pci_dev; > -} > - > PCIDevice *pci_vga_init(PCIBus *bus) > { > switch (vga_interface_type) { > diff --git a/hw/pci/pci_nic.c b/hw/pci/pci_nic.c > new file mode 100644 > index 0000000000..fb1a10ff12 > --- /dev/null > +++ b/hw/pci/pci_nic.c > @@ -0,0 +1,77 @@ > +/* > + * QEMU PCI network interface > + * > + * Copyright (c) 2004 Fabrice Bellard > + * > + * This work is licensed under the terms of the GNU GPL, version 2 or later. > + * See the COPYING file in the top-level directory. > + */ > +#include "qemu/osdep.h" > +#include "qemu/error-report.h" > +#include "hw/pci/pci.h" > +#include "hw/pci/pci_bus.h" > +#include "hw/net/pci.h" > +#include "net/net.h" > +#include "pci_internal.h" > + > +static const char *const pci_nic_models[] = { > + "ne2k_pci", > + "i82551", > + "i82557b", > + "i82559er", > + "rtl8139", > + "e1000", > + "pcnet", > + "virtio", > + "sungem", > + NULL > +}; > + > +static const char *const pci_nic_names[] = { > + "ne2k_pci", > + "i82551", > + "i82557b", > + "i82559er", > + "rtl8139", > + "e1000", > + "pcnet", > + "virtio-net-pci", > + "sungem", > + NULL > +}; > + > +/* Initialize a PCI NIC. */ > +PCIDevice *pci_nic_init_nofail(NICInfo *nd, PCIBus *rootbus, > + const char *default_model, > + const char *default_devaddr) > +{ > + const char *devaddr = nd->devaddr ? nd->devaddr : default_devaddr; > + PCIBus *bus; > + PCIDevice *pci_dev; > + DeviceState *dev; > + int devfn; > + int i; > + > + if (qemu_show_nic_models(nd->model, pci_nic_models)) { > + exit(0); > + } > + > + i = qemu_find_nic_model(nd, pci_nic_models, default_model); > + if (i < 0) { > + exit(1); > + } > + > + bus = pci_get_bus_devfn(&devfn, rootbus, devaddr); > + if (!bus) { > + error_report("Invalid PCI device address %s for device %s", > + devaddr, pci_nic_names[i]); > + exit(1); > + } > + > + pci_dev = pci_create(bus, devfn, pci_nic_names[i]); > + dev = &pci_dev->qdev; > + qdev_set_nic_properties(dev, nd); > + qdev_init_nofail(dev); > + > + return pci_dev; > +} > diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c > index db0e49ab8f..482757ca7b 100644 > --- a/hw/ppc/e500.c > +++ b/hw/ppc/e500.c > @@ -24,6 +24,7 @@ > #include "hw/hw.h" > #include "hw/char/serial.h" > #include "hw/pci/pci.h" > +#include "hw/net/pci.h" > #include "hw/boards.h" > #include "sysemu/sysemu.h" > #include "sysemu/kvm.h" > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 17ea77618c..96007051e2 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -56,6 +56,7 @@ > #include "hw/pci-host/spapr.h" > #include "hw/ppc/xics.h" > #include "hw/pci/msi.h" > +#include "hw/net/pci.h" > > #include "hw/pci/pci.h" > #include "hw/scsi/scsi.h" > diff --git a/hw/pci/Makefile.objs b/hw/pci/Makefile.objs > index 9f905e6344..125428fd54 100644 > --- a/hw/pci/Makefile.objs > +++ b/hw/pci/Makefile.objs > @@ -1,4 +1,5 @@ > common-obj-$(CONFIG_PCI) += pci.o pci_bridge.o > +common-obj-$(CONFIG_PCI) += pci_nic.o > common-obj-$(CONFIG_PCI) += msix.o msi.o > common-obj-$(CONFIG_PCI) += shpc.o > common-obj-$(CONFIG_PCI) += slotid_cap.o >
Hi Marcel, On 09/25/2017 11:30 AM, Marcel Apfelbaum wrote: > Hi Philippe, > > It seems the patch is doing much more than > what is mentioned in the subject. > > On 22/09/2017 19:01, Philippe Mathieu-Daudé wrote: >> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> >> --- >> hw/pci/pci_internal.h | 16 +++++++++++ >> include/hw/net/pci.h | 20 +++++++++++++ >> include/hw/pci/pci.h | 4 --- >> hw/arm/virt.c | 1 + >> hw/mips/mips_malta.c | 1 + >> hw/pci/pci.c | 67 ++------------------------------------------ >> hw/pci/pci_nic.c | 77 >> +++++++++++++++++++++++++++++++++++++++++++++++++++ >> hw/ppc/e500.c | 1 + >> hw/ppc/spapr.c | 1 + >> hw/pci/Makefile.objs | 1 + >> 10 files changed, 120 insertions(+), 69 deletions(-) >> create mode 100644 hw/pci/pci_internal.h >> create mode 100644 include/hw/net/pci.h >> create mode 100644 hw/pci/pci_nic.c >> >> diff --git a/hw/pci/pci_internal.h b/hw/pci/pci_internal.h >> new file mode 100644 >> index 0000000000..d967468767 >> --- /dev/null >> +++ b/hw/pci/pci_internal.h >> @@ -0,0 +1,16 @@ >> +/* >> + * QEMU PCI internal >> + * >> + * Copyright (c) 2005 Fabrice Bellard >> + * > + * This work is licensed under the terms of the GNU GPL, version 2 > or later. >> + * See the COPYING file in the top-level directory. >> + */ >> +#ifndef QEMU_HW_PCI_INTERNAL_H >> +#define QEMU_HW_PCI_INTERNAL_H >> + >> +#include "hw/pci/pci_bus.h" >> + >> +PCIBus *pci_get_bus_devfn(int *devfnp, PCIBus *root, const char >> *devaddr); >> + >> +#endif > > Why don't add the function directly to hw/pci/pci_nic.c ? > We have only one calling site anyway. You right! > > I have nothing against adding an internal H file, but then > we would need to add there *all* the functions used > only by the pci sub-system. And that may be out of the scope > of your series. > > > > >> diff --git a/include/hw/net/pci.h b/include/hw/net/pci.h >> new file mode 100644 >> index 0000000000..529591b7f3 >> --- /dev/null >> +++ b/include/hw/net/pci.h >> @@ -0,0 +1,20 @@ >> +/* >> + * QEMU network devices >> + * >> + * Copyright (c) 2005 Fabrice Bellard >> + * >> + * This work is licensed under the terms of the GNU GPL, version 2 or >> later. >> + * See the COPYING file in the top-level directory. >> + */ >> +#ifndef QEMU_HW_NET_PCI_H >> +#define QEMU_HW_NET_PCI_H >> + >> +#include "net/net.h" >> +#include "hw/pci/pci.h" >> +#include "hw/pci/pci_bus.h" >> + >> +PCIDevice *pci_nic_init_nofail(NICInfo *nd, PCIBus *rootbus, >> + const char *default_model, >> + const char *default_devaddr); >> + > > Can you add a short explanation on how the split > helps removing i386/pc dependency from non-PC world? > - it is not straight forward, at least for me. I thought there was an old dependency on "hw/pci/pci.h" to something from i386/pc, so every machine using a PCI NIC would have this dependency. Extracting the NIC part as "hw/net/pci.h" would solve this issue. I didn't check attentively but it seems I was wrong, so I'll either drop this patch or reword it. Regards, Phil. > > > Thanks, > Marcel > >> +#endif >> diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h >> index aa7ef9cf69..6a0f7b5472 100644 >> --- a/include/hw/pci/pci.h >> +++ b/include/hw/pci/pci.h >> @@ -422,10 +422,6 @@ void >> pci_device_set_intx_routing_notifier(PCIDevice *dev, >> PCIINTxRoutingNotifier >> notifier); >> void pci_device_reset(PCIDevice *dev); >> -PCIDevice *pci_nic_init_nofail(NICInfo *nd, PCIBus *rootbus, >> - const char *default_model, >> - const char *default_devaddr); >> - >> PCIDevice *pci_vga_init(PCIBus *bus); >> int pci_bus_num(PCIBus *s); >> diff --git a/hw/arm/virt.c b/hw/arm/virt.c >> index 9e18b410d7..39fab3acb9 100644 >> --- a/hw/arm/virt.c >> +++ b/hw/arm/virt.c >> @@ -35,6 +35,7 @@ >> #include "hw/arm/primecell.h" >> #include "hw/arm/virt.h" >> #include "hw/devices.h" >> +#include "hw/net/pci.h" >> #include "net/net.h" >> #include "sysemu/block-backend.h" >> #include "sysemu/device_tree.h" >> diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c >> index 6945fa47c3..fb6a2f9363 100644 >> --- a/hw/mips/mips_malta.c >> +++ b/hw/mips/mips_malta.c >> @@ -48,6 +48,7 @@ >> #include "hw/timer/mc146818rtc.h" >> #include "hw/input/i8042.h" >> #include "hw/timer/i8254.h" >> +#include "hw/net/pci.h" >> #include "sysemu/blockdev.h" >> #include "exec/address-spaces.h" >> #include "hw/sysbus.h" /* SysBusDevice */ >> diff --git a/hw/pci/pci.c b/hw/pci/pci.c >> index 1e6fb88eba..9b678c8fd0 100644 >> --- a/hw/pci/pci.c >> +++ b/hw/pci/pci.c >> @@ -28,7 +28,6 @@ >> #include "hw/pci/pci_bus.h" >> #include "hw/pci/pci_host.h" >> #include "monitor/monitor.h" >> -#include "net/net.h" >> #include "sysemu/sysemu.h" >> #include "hw/loader.h" >> #include "qemu/error-report.h" >> @@ -41,6 +40,7 @@ >> #include "hw/hotplug.h" >> #include "hw/boards.h" >> #include "qemu/cutils.h" >> +#include "pci_internal.h" >> //#define DEBUG_PCI >> #ifdef DEBUG_PCI >> @@ -671,8 +671,7 @@ static int pci_parse_devaddr(const char *addr, int >> *domp, int *busp, >> return 0; >> } >> -static PCIBus *pci_get_bus_devfn(int *devfnp, PCIBus *root, >> - const char *devaddr) >> +PCIBus *pci_get_bus_devfn(int *devfnp, PCIBus *root, const char >> *devaddr) >> { >> int dom, bus; >> unsigned slot; >> @@ -1812,68 +1811,6 @@ PciInfoList *qmp_query_pci(Error **errp) >> return head; >> } >> -static const char * const pci_nic_models[] = { >> - "ne2k_pci", >> - "i82551", >> - "i82557b", >> - "i82559er", >> - "rtl8139", >> - "e1000", >> - "pcnet", >> - "virtio", >> - "sungem", >> - NULL >> -}; >> - >> -static const char * const pci_nic_names[] = { >> - "ne2k_pci", >> - "i82551", >> - "i82557b", >> - "i82559er", >> - "rtl8139", >> - "e1000", >> - "pcnet", >> - "virtio-net-pci", >> - "sungem", >> - NULL >> -}; >> - >> -/* Initialize a PCI NIC. */ >> -PCIDevice *pci_nic_init_nofail(NICInfo *nd, PCIBus *rootbus, >> - const char *default_model, >> - const char *default_devaddr) >> -{ >> - const char *devaddr = nd->devaddr ? nd->devaddr : default_devaddr; >> - PCIBus *bus; >> - PCIDevice *pci_dev; >> - DeviceState *dev; >> - int devfn; >> - int i; >> - >> - if (qemu_show_nic_models(nd->model, pci_nic_models)) { >> - exit(0); >> - } >> - >> - i = qemu_find_nic_model(nd, pci_nic_models, default_model); >> - if (i < 0) { >> - exit(1); >> - } >> - >> - bus = pci_get_bus_devfn(&devfn, rootbus, devaddr); >> - if (!bus) { >> - error_report("Invalid PCI device address %s for device %s", >> - devaddr, pci_nic_names[i]); >> - exit(1); >> - } >> - >> - pci_dev = pci_create(bus, devfn, pci_nic_names[i]); >> - dev = &pci_dev->qdev; >> - qdev_set_nic_properties(dev, nd); >> - qdev_init_nofail(dev); >> - >> - return pci_dev; >> -} >> - >> PCIDevice *pci_vga_init(PCIBus *bus) >> { >> switch (vga_interface_type) { >> diff --git a/hw/pci/pci_nic.c b/hw/pci/pci_nic.c >> new file mode 100644 >> index 0000000000..fb1a10ff12 >> --- /dev/null >> +++ b/hw/pci/pci_nic.c >> @@ -0,0 +1,77 @@ >> +/* >> + * QEMU PCI network interface >> + * >> + * Copyright (c) 2004 Fabrice Bellard >> + * >> + * This work is licensed under the terms of the GNU GPL, version 2 or >> later. >> + * See the COPYING file in the top-level directory. >> + */ >> +#include "qemu/osdep.h" >> +#include "qemu/error-report.h" >> +#include "hw/pci/pci.h" >> +#include "hw/pci/pci_bus.h" >> +#include "hw/net/pci.h" >> +#include "net/net.h" >> +#include "pci_internal.h" >> + >> +static const char *const pci_nic_models[] = { >> + "ne2k_pci", >> + "i82551", >> + "i82557b", >> + "i82559er", >> + "rtl8139", >> + "e1000", >> + "pcnet", >> + "virtio", >> + "sungem", >> + NULL >> +}; >> + >> +static const char *const pci_nic_names[] = { >> + "ne2k_pci", >> + "i82551", >> + "i82557b", >> + "i82559er", >> + "rtl8139", >> + "e1000", >> + "pcnet", >> + "virtio-net-pci", >> + "sungem", >> + NULL >> +}; >> + >> +/* Initialize a PCI NIC. */ >> +PCIDevice *pci_nic_init_nofail(NICInfo *nd, PCIBus *rootbus, >> + const char *default_model, >> + const char *default_devaddr) >> +{ >> + const char *devaddr = nd->devaddr ? nd->devaddr : default_devaddr; >> + PCIBus *bus; >> + PCIDevice *pci_dev; >> + DeviceState *dev; >> + int devfn; >> + int i; >> + >> + if (qemu_show_nic_models(nd->model, pci_nic_models)) { >> + exit(0); >> + } >> + >> + i = qemu_find_nic_model(nd, pci_nic_models, default_model); >> + if (i < 0) { >> + exit(1); >> + } >> + >> + bus = pci_get_bus_devfn(&devfn, rootbus, devaddr); >> + if (!bus) { >> + error_report("Invalid PCI device address %s for device %s", >> + devaddr, pci_nic_names[i]); >> + exit(1); >> + } >> + >> + pci_dev = pci_create(bus, devfn, pci_nic_names[i]); >> + dev = &pci_dev->qdev; >> + qdev_set_nic_properties(dev, nd); >> + qdev_init_nofail(dev); >> + >> + return pci_dev; >> +} >> diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c >> index db0e49ab8f..482757ca7b 100644 >> --- a/hw/ppc/e500.c >> +++ b/hw/ppc/e500.c >> @@ -24,6 +24,7 @@ >> #include "hw/hw.h" >> #include "hw/char/serial.h" >> #include "hw/pci/pci.h" >> +#include "hw/net/pci.h" >> #include "hw/boards.h" >> #include "sysemu/sysemu.h" >> #include "sysemu/kvm.h" >> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c >> index 17ea77618c..96007051e2 100644 >> --- a/hw/ppc/spapr.c >> +++ b/hw/ppc/spapr.c >> @@ -56,6 +56,7 @@ >> #include "hw/pci-host/spapr.h" >> #include "hw/ppc/xics.h" >> #include "hw/pci/msi.h" >> +#include "hw/net/pci.h" >> #include "hw/pci/pci.h" >> #include "hw/scsi/scsi.h" >> diff --git a/hw/pci/Makefile.objs b/hw/pci/Makefile.objs >> index 9f905e6344..125428fd54 100644 >> --- a/hw/pci/Makefile.objs >> +++ b/hw/pci/Makefile.objs >> @@ -1,4 +1,5 @@ >> common-obj-$(CONFIG_PCI) += pci.o pci_bridge.o >> +common-obj-$(CONFIG_PCI) += pci_nic.o >> common-obj-$(CONFIG_PCI) += msix.o msi.o >> common-obj-$(CONFIG_PCI) += shpc.o >> common-obj-$(CONFIG_PCI) += slotid_cap.o >> >
Hi Marcel, >> It seems the patch is doing much more than >> what is mentioned in the subject. >> [...] >> Can you add a short explanation on how the split >> helps removing i386/pc dependency from non-PC world? >> - it is not straight forward, at least for me. > > I thought there was an old dependency on "hw/pci/pci.h" to something > from i386/pc, so every machine using a PCI NIC would have this > dependency. Extracting the NIC part as "hw/net/pci.h" would solve this > issue. I didn't check attentively but it seems I was wrong, so I'll > either drop this patch or reword it. I finally opted to drop it for this series and include it reworded in part 2 which include more PCI-related patches. Regards, Phil.
diff --git a/hw/pci/pci_internal.h b/hw/pci/pci_internal.h new file mode 100644 index 0000000000..d967468767 --- /dev/null +++ b/hw/pci/pci_internal.h @@ -0,0 +1,16 @@ +/* + * QEMU PCI internal + * + * Copyright (c) 2005 Fabrice Bellard + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ +#ifndef QEMU_HW_PCI_INTERNAL_H +#define QEMU_HW_PCI_INTERNAL_H + +#include "hw/pci/pci_bus.h" + +PCIBus *pci_get_bus_devfn(int *devfnp, PCIBus *root, const char *devaddr); + +#endif diff --git a/include/hw/net/pci.h b/include/hw/net/pci.h new file mode 100644 index 0000000000..529591b7f3 --- /dev/null +++ b/include/hw/net/pci.h @@ -0,0 +1,20 @@ +/* + * QEMU network devices + * + * Copyright (c) 2005 Fabrice Bellard + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ +#ifndef QEMU_HW_NET_PCI_H +#define QEMU_HW_NET_PCI_H + +#include "net/net.h" +#include "hw/pci/pci.h" +#include "hw/pci/pci_bus.h" + +PCIDevice *pci_nic_init_nofail(NICInfo *nd, PCIBus *rootbus, + const char *default_model, + const char *default_devaddr); + +#endif diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index aa7ef9cf69..6a0f7b5472 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -422,10 +422,6 @@ void pci_device_set_intx_routing_notifier(PCIDevice *dev, PCIINTxRoutingNotifier notifier); void pci_device_reset(PCIDevice *dev); -PCIDevice *pci_nic_init_nofail(NICInfo *nd, PCIBus *rootbus, - const char *default_model, - const char *default_devaddr); - PCIDevice *pci_vga_init(PCIBus *bus); int pci_bus_num(PCIBus *s); diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 9e18b410d7..39fab3acb9 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -35,6 +35,7 @@ #include "hw/arm/primecell.h" #include "hw/arm/virt.h" #include "hw/devices.h" +#include "hw/net/pci.h" #include "net/net.h" #include "sysemu/block-backend.h" #include "sysemu/device_tree.h" diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 6945fa47c3..fb6a2f9363 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -48,6 +48,7 @@ #include "hw/timer/mc146818rtc.h" #include "hw/input/i8042.h" #include "hw/timer/i8254.h" +#include "hw/net/pci.h" #include "sysemu/blockdev.h" #include "exec/address-spaces.h" #include "hw/sysbus.h" /* SysBusDevice */ diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 1e6fb88eba..9b678c8fd0 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -28,7 +28,6 @@ #include "hw/pci/pci_bus.h" #include "hw/pci/pci_host.h" #include "monitor/monitor.h" -#include "net/net.h" #include "sysemu/sysemu.h" #include "hw/loader.h" #include "qemu/error-report.h" @@ -41,6 +40,7 @@ #include "hw/hotplug.h" #include "hw/boards.h" #include "qemu/cutils.h" +#include "pci_internal.h" //#define DEBUG_PCI #ifdef DEBUG_PCI @@ -671,8 +671,7 @@ static int pci_parse_devaddr(const char *addr, int *domp, int *busp, return 0; } -static PCIBus *pci_get_bus_devfn(int *devfnp, PCIBus *root, - const char *devaddr) +PCIBus *pci_get_bus_devfn(int *devfnp, PCIBus *root, const char *devaddr) { int dom, bus; unsigned slot; @@ -1812,68 +1811,6 @@ PciInfoList *qmp_query_pci(Error **errp) return head; } -static const char * const pci_nic_models[] = { - "ne2k_pci", - "i82551", - "i82557b", - "i82559er", - "rtl8139", - "e1000", - "pcnet", - "virtio", - "sungem", - NULL -}; - -static const char * const pci_nic_names[] = { - "ne2k_pci", - "i82551", - "i82557b", - "i82559er", - "rtl8139", - "e1000", - "pcnet", - "virtio-net-pci", - "sungem", - NULL -}; - -/* Initialize a PCI NIC. */ -PCIDevice *pci_nic_init_nofail(NICInfo *nd, PCIBus *rootbus, - const char *default_model, - const char *default_devaddr) -{ - const char *devaddr = nd->devaddr ? nd->devaddr : default_devaddr; - PCIBus *bus; - PCIDevice *pci_dev; - DeviceState *dev; - int devfn; - int i; - - if (qemu_show_nic_models(nd->model, pci_nic_models)) { - exit(0); - } - - i = qemu_find_nic_model(nd, pci_nic_models, default_model); - if (i < 0) { - exit(1); - } - - bus = pci_get_bus_devfn(&devfn, rootbus, devaddr); - if (!bus) { - error_report("Invalid PCI device address %s for device %s", - devaddr, pci_nic_names[i]); - exit(1); - } - - pci_dev = pci_create(bus, devfn, pci_nic_names[i]); - dev = &pci_dev->qdev; - qdev_set_nic_properties(dev, nd); - qdev_init_nofail(dev); - - return pci_dev; -} - PCIDevice *pci_vga_init(PCIBus *bus) { switch (vga_interface_type) { diff --git a/hw/pci/pci_nic.c b/hw/pci/pci_nic.c new file mode 100644 index 0000000000..fb1a10ff12 --- /dev/null +++ b/hw/pci/pci_nic.c @@ -0,0 +1,77 @@ +/* + * QEMU PCI network interface + * + * Copyright (c) 2004 Fabrice Bellard + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ +#include "qemu/osdep.h" +#include "qemu/error-report.h" +#include "hw/pci/pci.h" +#include "hw/pci/pci_bus.h" +#include "hw/net/pci.h" +#include "net/net.h" +#include "pci_internal.h" + +static const char *const pci_nic_models[] = { + "ne2k_pci", + "i82551", + "i82557b", + "i82559er", + "rtl8139", + "e1000", + "pcnet", + "virtio", + "sungem", + NULL +}; + +static const char *const pci_nic_names[] = { + "ne2k_pci", + "i82551", + "i82557b", + "i82559er", + "rtl8139", + "e1000", + "pcnet", + "virtio-net-pci", + "sungem", + NULL +}; + +/* Initialize a PCI NIC. */ +PCIDevice *pci_nic_init_nofail(NICInfo *nd, PCIBus *rootbus, + const char *default_model, + const char *default_devaddr) +{ + const char *devaddr = nd->devaddr ? nd->devaddr : default_devaddr; + PCIBus *bus; + PCIDevice *pci_dev; + DeviceState *dev; + int devfn; + int i; + + if (qemu_show_nic_models(nd->model, pci_nic_models)) { + exit(0); + } + + i = qemu_find_nic_model(nd, pci_nic_models, default_model); + if (i < 0) { + exit(1); + } + + bus = pci_get_bus_devfn(&devfn, rootbus, devaddr); + if (!bus) { + error_report("Invalid PCI device address %s for device %s", + devaddr, pci_nic_names[i]); + exit(1); + } + + pci_dev = pci_create(bus, devfn, pci_nic_names[i]); + dev = &pci_dev->qdev; + qdev_set_nic_properties(dev, nd); + qdev_init_nofail(dev); + + return pci_dev; +} diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index db0e49ab8f..482757ca7b 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -24,6 +24,7 @@ #include "hw/hw.h" #include "hw/char/serial.h" #include "hw/pci/pci.h" +#include "hw/net/pci.h" #include "hw/boards.h" #include "sysemu/sysemu.h" #include "sysemu/kvm.h" diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 17ea77618c..96007051e2 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -56,6 +56,7 @@ #include "hw/pci-host/spapr.h" #include "hw/ppc/xics.h" #include "hw/pci/msi.h" +#include "hw/net/pci.h" #include "hw/pci/pci.h" #include "hw/scsi/scsi.h" diff --git a/hw/pci/Makefile.objs b/hw/pci/Makefile.objs index 9f905e6344..125428fd54 100644 --- a/hw/pci/Makefile.objs +++ b/hw/pci/Makefile.objs @@ -1,4 +1,5 @@ common-obj-$(CONFIG_PCI) += pci.o pci_bridge.o +common-obj-$(CONFIG_PCI) += pci_nic.o common-obj-$(CONFIG_PCI) += msix.o msi.o common-obj-$(CONFIG_PCI) += shpc.o common-obj-$(CONFIG_PCI) += slotid_cap.o
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- hw/pci/pci_internal.h | 16 +++++++++++ include/hw/net/pci.h | 20 +++++++++++++ include/hw/pci/pci.h | 4 --- hw/arm/virt.c | 1 + hw/mips/mips_malta.c | 1 + hw/pci/pci.c | 67 ++------------------------------------------ hw/pci/pci_nic.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++ hw/ppc/e500.c | 1 + hw/ppc/spapr.c | 1 + hw/pci/Makefile.objs | 1 + 10 files changed, 120 insertions(+), 69 deletions(-) create mode 100644 hw/pci/pci_internal.h create mode 100644 include/hw/net/pci.h create mode 100644 hw/pci/pci_nic.c