[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] qemu/virtio: move features to an inline function
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PATCH] qemu/virtio: move features to an inline function |
Date: |
Mon, 10 Aug 2009 22:28:09 +0300 |
User-agent: |
Mutt/1.5.19 (2009-01-05) |
devices should have the final say over which virtio features they
support. E.g. indirect entries may or may not make sense in the context
of virtio-console. Move the common bits from virtio-pci to an inline
function and let each device call it.
No functional changes.
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
This is part of my vhost work, but IMO the patch makes sense separately
as well: the common features are not related to pci at all.
hw/virtio-balloon.c | 2 +-
hw/virtio-blk.c | 2 +-
hw/virtio-console.c | 2 +-
hw/virtio-net.c | 2 +-
hw/virtio-pci.c | 3 ---
hw/virtio.h | 10 ++++++++++
6 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/hw/virtio-balloon.c b/hw/virtio-balloon.c
index 7ca783e..15b50bb 100644
--- a/hw/virtio-balloon.c
+++ b/hw/virtio-balloon.c
@@ -127,7 +127,7 @@ static void virtio_balloon_set_config(VirtIODevice *vdev,
static uint32_t virtio_balloon_get_features(VirtIODevice *vdev)
{
- return 0;
+ return virtio_common_features();
}
static ram_addr_t virtio_balloon_to_target(void *opaque, ram_addr_t target)
diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c
index 2beff52..7d33fee 100644
--- a/hw/virtio-blk.c
+++ b/hw/virtio-blk.c
@@ -364,7 +364,7 @@ static uint32_t virtio_blk_get_features(VirtIODevice *vdev)
if (strcmp(s->serial_str, "0"))
features |= 1 << VIRTIO_BLK_F_IDENTIFY;
- return features;
+ return features | virtio_common_features();
}
static void virtio_blk_save(QEMUFile *f, void *opaque)
diff --git a/hw/virtio-console.c b/hw/virtio-console.c
index 663c8b9..ac25499 100644
--- a/hw/virtio-console.c
+++ b/hw/virtio-console.c
@@ -53,7 +53,7 @@ static void virtio_console_handle_input(VirtIODevice *vdev,
VirtQueue *vq)
static uint32_t virtio_console_get_features(VirtIODevice *vdev)
{
- return 0;
+ return virtio_common_features();
}
static int vcon_can_read(void *opaque)
diff --git a/hw/virtio-net.c b/hw/virtio-net.c
index ef9e7ff..2e51a6a 100644
--- a/hw/virtio-net.c
+++ b/hw/virtio-net.c
@@ -154,7 +154,7 @@ static uint32_t virtio_net_get_features(VirtIODevice *vdev)
}
#endif
- return features;
+ return features | virtio_common_features();
}
static uint32_t virtio_net_bad_features(VirtIODevice *vdev)
diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c
index 3b9bfd1..90f51be 100644
--- a/hw/virtio-pci.c
+++ b/hw/virtio-pci.c
@@ -232,9 +232,6 @@ static uint32_t virtio_ioport_read(VirtIOPCIProxy *proxy,
uint32_t addr)
switch (addr) {
case VIRTIO_PCI_HOST_FEATURES:
ret = vdev->get_features(vdev);
- ret |= (1 << VIRTIO_F_NOTIFY_ON_EMPTY);
- ret |= (1 << VIRTIO_RING_F_INDIRECT_DESC);
- ret |= (1 << VIRTIO_F_BAD_FEATURE);
break;
case VIRTIO_PCI_GUEST_FEATURES:
ret = vdev->features;
diff --git a/hw/virtio.h b/hw/virtio.h
index aa55677..de620a7 100644
--- a/hw/virtio.h
+++ b/hw/virtio.h
@@ -166,4 +166,14 @@ VirtIODevice *virtio_net_init(DeviceState *dev);
VirtIODevice *virtio_console_init(DeviceState *dev);
VirtIODevice *virtio_balloon_init(DeviceState *dev);
+static inline uint32_t virtio_common_features(void)
+{
+ uint32_t features = 0;
+ features |= (1 << VIRTIO_F_NOTIFY_ON_EMPTY);
+ features |= (1 << VIRTIO_RING_F_INDIRECT_DESC);
+ features |= (1 << VIRTIO_F_BAD_FEATURE);
+
+ return features;
+}
+
#endif
--
1.6.2.5
- [Qemu-devel] [PATCH] qemu/virtio: move features to an inline function,
Michael S. Tsirkin <=
- [Qemu-devel] Re: [PATCH] qemu/virtio: move features to an inline function, Anthony Liguori, 2009/08/10
- Re: [Qemu-devel] Re: [PATCH] qemu/virtio: move features to an inline function, Michael S. Tsirkin, 2009/08/10
- Re: [Qemu-devel] Re: [PATCH] qemu/virtio: move features to an inline function, Anthony Liguori, 2009/08/10
- Re: [Qemu-devel] Re: [PATCH] qemu/virtio: move features to an inline function, Michael S. Tsirkin, 2009/08/10
- Re: [Qemu-devel] Re: [PATCH] qemu/virtio: move features to an inline function, Anthony Liguori, 2009/08/10
- Re: [Qemu-devel] Re: [PATCH] qemu/virtio: move features to an inline function, Michael S. Tsirkin, 2009/08/11
- Re: [Qemu-devel] Re: [PATCH] qemu/virtio: move features to an inline function, Anthony Liguori, 2009/08/11
- Re: [Qemu-devel] Re: [PATCH] qemu/virtio: move features to an inline function, Michael S. Tsirkin, 2009/08/11
- Re: [Qemu-devel] Re: [PATCH] qemu/virtio: move features to an inline function, Anthony Liguori, 2009/08/11
- Re: [Qemu-devel] Re: [PATCH] qemu/virtio: move features to an inline function, Michael S. Tsirkin, 2009/08/11