Commit 5f4c9760 authored Dec 08, 2014 by Michael S. Tsirkin

virtio_pci: rename virtio_pci -> virtio_pci_common



kbuild does not seem to like it when we name source
files same as the module.
Let's rename virtio_pci -> virtio_pci_common,
and get rid of #include-ing c files.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

parent a90fdce9

drivers/virtio/Makefile

+1 −0

Original line number	Diff line number	Diff line
		obj-$(CONFIG_VIRTIO) += virtio.o virtio_ring.o
		obj-$(CONFIG_VIRTIO_MMIO) += virtio_mmio.o
		obj-$(CONFIG_VIRTIO_PCI) += virtio_pci.o
		virtio_pci-y := virtio_pci_legacy.o virtio_pci_common.o
		obj-$(CONFIG_VIRTIO_BALLOON) += virtio_balloon.o

drivers/virtio/virtio_pci.c→drivers/virtio/virtio_pci_common.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@
		*
		*/

		#include "virtio_pci_legacy.c"
		#include "virtio_pci_common.h"

		/* wait for pending irq handlers */
		void vp_synchronize_vectors(struct virtio_device *vdev)

drivers/virtio/virtio_pci.h→drivers/virtio/virtio_pci_common.h

+2 −2

Original line number	Diff line number	Diff line
		#ifndef _DRIVERS_VIRTIO_VIRTIO_PCI_H
		#define _DRIVERS_VIRTIO_VIRTIO_PCI_H
		#ifndef _DRIVERS_VIRTIO_VIRTIO_PCI_COMMON_H
		#define _DRIVERS_VIRTIO_VIRTIO_PCI_COMMON_H
		/*
		* Virtio PCI driver - APIs for common functionality for all device versions
		*

drivers/virtio/virtio_pci_legacy.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@
		*
		*/

		#include "virtio_pci.h"
		#include "virtio_pci_common.h"

		/* Qumranet donated their vendor ID for devices 0x1000 thru 0x10FF. */
		static const struct pci_device_id virtio_pci_id_table[] = {