Signed-off-by: Sasha Levin <[email protected]>
---
tools/kvm/include/kvm/ioport.h | 3 ---
tools/kvm/virtio/net.c | 12 ++++++++----
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/tools/kvm/include/kvm/ioport.h b/tools/kvm/include/kvm/ioport.h
index 0c68e8c..396928b 100644
--- a/tools/kvm/include/kvm/ioport.h
+++ b/tools/kvm/include/kvm/ioport.h
@@ -10,9 +10,6 @@
#define IOPORT_START 0x6200
#define IOPORT_SIZE 0x400
-#define IOPORT_VIRTIO_NET 0xe200 /* Virtio network device */
-#define IOPORT_VIRTIO_NET_SIZE 256
-
#define IOPORT_EMPTY USHRT_MAX
struct kvm;
diff --git a/tools/kvm/virtio/net.c b/tools/kvm/virtio/net.c
index 649bc0f..7e4400a 100644
--- a/tools/kvm/virtio/net.c
+++ b/tools/kvm/virtio/net.c
@@ -37,7 +37,6 @@ static struct pci_device_header pci_header = {
.class = 0x020000,
.subsys_vendor_id =
PCI_SUBSYSTEM_VENDOR_ID_REDHAT_QUMRANET,
.subsys_id = VIRTIO_ID_NET,
- .bar[0] = IOPORT_VIRTIO_NET |
PCI_BASE_ADDRESS_SPACE_IO,
};
struct net_device {
@@ -51,6 +50,7 @@ struct net_device {
u8 status;
u8 isr;
u16 queue_selector;
+ u16 base_addr;
pthread_t io_rx_thread;
pthread_mutex_t io_rx_lock;
@@ -166,7 +166,7 @@ static bool virtio_net_pci_io_device_specific_in(void
*data, unsigned long offse
static bool virtio_net_pci_io_in(struct kvm *kvm, u16 port, void *data, int
size, u32 count)
{
- unsigned long offset = port - IOPORT_VIRTIO_NET;
+ unsigned long offset = port - ndev.base_addr;
bool ret = true;
mutex_lock(&ndev.mutex);
@@ -230,7 +230,7 @@ static void virtio_net_handle_callback(struct kvm *kvm, u16
queue_index)
static bool virtio_net_pci_io_out(struct kvm *kvm, u16 port, void *data, int
size, u32 count)
{
- unsigned long offset = port - IOPORT_VIRTIO_NET;
+ unsigned long offset = port - ndev.base_addr;
bool ret = true;
mutex_lock(&ndev.mutex);
@@ -387,14 +387,18 @@ void virtio_net__init(const struct virtio_net_parameters
*params)
{
if (virtio_net__tap_init(params)) {
u8 dev, line, pin;
+ u16 net_base_addr;
if (irq__register_device(VIRTIO_ID_NET, &dev, &pin, &line) < 0)
return;
pci_header.irq_pin = pin;
pci_header.irq_line = line;
+ net_base_addr = ioport__register(IOPORT_EMPTY,
&virtio_net_io_ops, IOPORT_SIZE);
+ pci_header.bar[0] = net_base_addr |
PCI_BASE_ADDRESS_SPACE_IO;
+ ndev.base_addr = net_base_addr;
+
pci__register(&pci_header, dev);
- ioport__register(IOPORT_VIRTIO_NET, &virtio_net_io_ops,
IOPORT_VIRTIO_NET_SIZE);
virtio_net__io_thread_init(params->kvm);
}
--
1.7.5.rc3
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
