virtio: uniform virtio device IDs
RFC PATCH v2 1/1 virtio: uniform virtio device IDs
Actually we define these device IDs in virtio standard, so we'd better put them into one common place to manage conveniently. Here I also add VIRTIO_ID_RESERVE according to virtio spec.
--- hw/9pfs/virtio-9p.h | 2 -- include/hw/virtio/virtio-balloon.h | 3 --- include/hw/virtio/virtio-blk.h | 3 --- include/hw/virtio/virtio-rng.h | 3 --- include/hw/virtio/virtio-scsi.h | 3 --- include/hw/virtio/virtio-serial.h | 3 --- include/hw/virtio/virtio.h | 16 ++++++++++++++++ pc-bios/s390-ccw/virtio.h | 8 +------- 8 files changed, 17 insertions(+), 24 deletions(-)
hw/9pfs/virtio-9p.h +0 -2
@@ -146,8 +146,6 @@ struct V9fsPDU/* from Linux's linux/virtio_9p.h */ -/* The ID for virtio console */ -#define VIRTIO_ID_9P 9#define MAX_REQ 128#define MAX_TAG_LEN 32
include/hw/virtio/virtio-balloon.h +0 -3
@@ -24,9 +24,6 @@/* from Linux's linux/virtio_balloon.h */ -/* The ID for virtio_balloon */ -#define VIRTIO_ID_BALLOON 5 -/* The feature bitmap for virtio balloon */ #define VIRTIO_BALLOON_F_MUST_TELL_HOST 0/* Tell before reclaiming pages */ #define VIRTIO_BALLOON_F_STATS_VQ 1/* Memory stats virtqueue */
include/hw/virtio/virtio-blk.h +0 -3
@@ -25,9 +25,6 @@/* from Linux's linux/virtio_blk.h */ -/* The ID for virtio_block */ -#define VIRTIO_ID_BLOCK 2 -/* Feature bits */ #define VIRTIO_BLK_F_BARRIER 0/* Does host support barriers? */ #define VIRTIO_BLK_F_SIZE_MAX 1/* Indicates maximum segment size */
include/hw/virtio/virtio-rng.h +0 -3
@@ -21,9 +21,6 @@#define VIRTIO_RNG_GET_PARENT_CLASS (obj) \ OBJECT_GET_PARENT_CLASS(obj, TYPE_VIRTIO_RNG) -/* The Virtio ID for the virtio rng device */ -#define VIRTIO_ID_RNG 4 -struct VirtIORNGConf {RngBackend *rng;uint64_t max_bytes;
include/hw/virtio/virtio-scsi.h +0 -3
@@ -29,9 +29,6 @@OBJECT_CHECK (VirtIOSCSI, (obj),TYPE_VIRTIO_SCSI ) -/* The ID for virtio_scsi */ -#define VIRTIO_ID_SCSI 8 - /* Feature Bits */#define VIRTIO_SCSI_F_INOUT 0#define VIRTIO_SCSI_F_HOTPLUG 1
include/hw/virtio/virtio-serial.h +0 -3
@@ -20,9 +20,6 @@/* == Interface shared between the guest kernel and qemu == */ -/* The Virtio ID for virtio console / serial ports */ -#define VIRTIO_ID_CONSOLE 3 -/* Features supported */ #define VIRTIO_CONSOLE_F_MULTIPORT 1
include/hw/virtio/virtio.h +16 -0
@@ -23,6 +23,22 @@#include "hw/virtio/virtio-9p.h" #endif +/* Refer to Linux's linux/virtio_ids.h */ + +enum virtio_dev_type { +VIRTIO_ID_RESERVED =0 ,/* invalid virtio device */ +VIRTIO_ID_NET =1 ,/* virtio net */ +VIRTIO_ID_BLOCK =2 ,/* virtio block */ +VIRTIO_ID_CONSOLE =3 ,/* virtio console */ +VIRTIO_ID_RNG =4 ,/* virtio rng */ +VIRTIO_ID_BALLOON =5 ,/* virtio balloon */ +VIRTIO_ID_RPMSG =7 ,/* virtio remote processor messaging */ +VIRTIO_ID_SCSI =8 ,/* virtio scsi */ +VIRTIO_ID_9P =9 ,/* 9p virtio console */ +VIRTIO_ID_RPROC_SERIAL =11 ,/* virtio remoteproc serial link */ +VIRTIO_ID_CAIF =12 ,/* Virtio caif */ +}; +/* from Linux's linux/virtio_config.h */ /* Status byte for guest to report progress, and synchronize features. */
pc-bios/s390-ccw/virtio.h +1 -7
@@ -11,6 +11,7 @@#ifndef VIRTIO_H #define VIRTIO_H +#include "hw/virtio/virtio.h" #include "s390-ccw.h" /* Status byte for guest to report progress, and synchronize features. */
@@ -23,13 +24,6 @@/* We've given up on this device. */ #define VIRTIO_CONFIG_S_FAILED 0x80 -enum virtio_dev_type { -VIRTIO_ID_NET =1 , -VIRTIO_ID_BLOCK =2 , -VIRTIO_ID_CONSOLE =3 , -VIRTIO_ID_BALLOON =5 , -}; -struct virtio_dev_header {enum virtio_dev_type type :8 ;u8 num_vq;
Signature · 1 line
1.9.1
Quoted 22 lines · On Fri, 6 Feb 2015 13:41:26 +0800 Tiejun Chen <[email protected]> wrote:
Actually we define these device IDs in virtio standard, so we'd better put them into one common place to manage conveniently. Here I also add
VIRTIO_ID_RESERVEaccording to virtio spec.Signed-off-by Tiejun Chen <[email protected]>--- hw/9pfs/virtio-9p.h | 2 -- include/hw/virtio/virtio-balloon.h | 3 --- include/hw/virtio/virtio-blk.h | 3 --- include/hw/virtio/virtio-rng.h | 3 --- include/hw/virtio/virtio-scsi.h | 3 --- include/hw/virtio/virtio-serial.h | 3 --- include/hw/virtio/virtio.h | 16 ++++++++++++++++ pc-bios/s390-ccw/virtio.h | 8 +------- 8 files changed, 17 insertions(+), 24 deletions(-)include/hw/virtio/virtio.h +0
-0
include/hw/virtio/virtio.h line 26
Quoted 4 lines
include/hw/virtio/virtio.h +1
-0@@ -23,6 +23,22 @@#include "hw/virtio/virtio-9p.h" #endif +/* Refer to Linux's linux/virtio_ids.h */
Why not refer to the virtio spec instead? :) And maybe add in the ids that already have been reserved.
include/hw/virtio/virtio.h line 34
Quoted 8 lines
include/hw/virtio/virtio.h +8
-0+ +enum virtio_dev_type { +VIRTIO_ID_RESERVED =0 ,/* invalid virtio device */ +VIRTIO_ID_NET =1 ,/* virtio net */ +VIRTIO_ID_BLOCK =2 ,/* virtio block */ +VIRTIO_ID_CONSOLE =3 ,/* virtio console */ +VIRTIO_ID_RNG =4 ,/* virtio rng */ +VIRTIO_ID_BALLOON =5 ,/* virtio balloon */
/* virtio balloon (legacy) */
Quoted 15 lines
include/hw/virtio/virtio.h +7
-0+VIRTIO_ID_RPMSG =7 ,/* virtio remote processor messaging */ +VIRTIO_ID_SCSI =8 ,/* virtio scsi */ +VIRTIO_ID_9P =9 ,/* 9p virtio console */ +VIRTIO_ID_RPROC_SERIAL =11 ,/* virtio remoteproc serial link */ + VIRTIO_ID_CAIF = 12, /* Virtio caif */ +}; +/* from Linux's linux/virtio_config.h */ /* Status byte for guest to report progress, and synchronize features. */ pc-bios/s390-ccw/virtio.h +0
-0
pc-bios/s390-ccw/virtio.h line 14
Quoted 4 lines
pc-bios/s390-ccw/virtio.h +1
-0@@ -11,6 +11,7 @@#ifndef VIRTIO_H #define VIRTIO_H +#include "hw/virtio/virtio.h"
This won't work, the bios can't use the common headers.
pc-bios/s390-ccw/virtio.h line 31
Quoted 13 lines
pc-bios/s390-ccw/virtio.h +0
-6#include "s390-ccw.h" /* Status byte for guest to report progress, and synchronize features. */ @@ -23,13 +24,6 @@/* We've given up on this device. */ #define VIRTIO_CONFIG_S_FAILED 0x80 -enum virtio_dev_type { -VIRTIO_ID_NET =1 , -VIRTIO_ID_BLOCK =2 , -VIRTIO_ID_CONSOLE =3 , -VIRTIO_ID_BALLOON =5 , -};
Even though this one is incomplete; but we don't need anything but the block id anyway.
Quoted 4 lines
pc-bios/s390-ccw/virtio.h +0
-1-struct virtio_dev_header {enum virtio_dev_type type :8 ;u8 num_vq;
Quoted 5 lines · Tiejun Chen
Actually we define these device IDs in virtio standard, so we'd better put them into one common place to manage conveniently. Here I also add
VIRTIO_ID_RESERVEaccording to virtio spec.Signed-off-by Tiejun Chen <[email protected]>
Quoted 10 lines
--- hw/9pfs/virtio-9p.h | 2 -- include/hw/virtio/virtio-balloon.h | 3 --- include/hw/virtio/virtio-blk.h | 3 --- include/hw/virtio/virtio-rng.h | 3 --- include/hw/virtio/virtio-scsi.h | 3 --- include/hw/virtio/virtio-serial.h | 3 --- include/hw/virtio/virtio.h | 16 ++++++++++++++++ pc-bios/s390-ccw/virtio.h | 8 +------- 8 files changed, 17 insertions(+), 24 deletions(-)
Quoted 8 lines · Cornelia Huck
Quoted 5 lines · On Fri, 6 Feb 2015 13:41:26 +0800 Tiejun Chen <[email protected]> wrote:
Actually we define these device IDs in virtio standard, so we'd better put them into one common place to manage conveniently. Here I also add
VIRTIO_ID_RESERVEaccording to virtio spec.Signed-off-by Tiejun Chen <[email protected]>
We really should just write a script to import the headers from the linux kernel.
They will need some tweaks to avoid dependencies on linux/types, but this seems easy to do - better than trying to keep things in sync manually.
Signature · 1 line
MST
Quoted 28 lines · Cornelia Huck
Quoted 25 lines · On Fri, 6 Feb 2015 13:41:26 +0800 Tiejun Chen <[email protected]> wrote:
Actually we define these device IDs in virtio standard, so we'd better put them into one common place to manage conveniently. Here I also add
VIRTIO_ID_RESERVEaccording to virtio spec.Signed-off-by Tiejun Chen <[email protected]>--- hw/9pfs/virtio-9p.h | 2 -- include/hw/virtio/virtio-balloon.h | 3 --- include/hw/virtio/virtio-blk.h | 3 --- include/hw/virtio/virtio-rng.h | 3 --- include/hw/virtio/virtio-scsi.h | 3 --- include/hw/virtio/virtio-serial.h | 3 --- include/hw/virtio/virtio.h | 16 ++++++++++++++++ pc-bios/s390-ccw/virtio.h | 8 +------- 8 files changed, 17 insertions(+), 24 deletions(-)include/hw/virtio/virtio.h +0
-0@@ -23,6 +23,22 @@#include "hw/virtio/virtio-9p.h" #endif
Quoted 3 lines
include/hw/virtio/virtio.h line 26
Quoted 1 line
include/hw/virtio/virtio.h +1
-0+/* Refer to Linux's linux/virtio_ids.h */ Why not refer to the virtio spec instead? :) And maybe add in the ids
Actually they're same now but this really is a potential risk.
Quoted 1 line
that already have been reserved.
So what about this?
@@ -23,6 +23,22 @@
#include "hw/virtio/virtio-9p.h"
#endif
+/* Refer to VirtIO Spec 1.0. */
+
+#define VIRTIO_ID_RESERVED 0 /* reserved (invalid)*/ +#define VIRTIO_ID_NET 1 /* network card */ +#define VIRTIO_ID_BLOCK 2 /* block device */ +#define VIRTIO_ID_CONSOLE 3 /* console */ +#define VIRTIO_ID_RNG 4 /* entropy source */ +#define VIRTIO_ID_BALLOON 5 /* memory ballooning */ +#define VIRTIO_ID_IOMEMORY 6 /* ioMemory */ +#define VIRTIO_ID_RPMSG 7 /* rpmsg */ +#define VIRTIO_ID_SCSI 8 /* SCSI host */ +#define VIRTIO_ID_9P 9 /* 9P transport */ +#define VIRTIO_ID_MAC80211_WALN 10 /* mac80211 wlan */ +#define VIRTIO_ID_RPROC_SERIAL 11 /* rproc seria */ +#define VIRTIO_ID_CAIF 12 /* virtio CAIF */
+
/* from Linux's linux/virtio_config.h */
/* Status byte for guest to report progress, and synchronize features. */
Quoted 30 lines
include/hw/virtio/virtio.h line 34
Quoted 9 lines
include/hw/virtio/virtio.h +8
-0+ +enum virtio_dev_type { +VIRTIO_ID_RESERVED =0 ,/* invalid virtio device */ +VIRTIO_ID_NET =1 ,/* virtio net */ +VIRTIO_ID_BLOCK =2 ,/* virtio block */ +VIRTIO_ID_CONSOLE =3 ,/* virtio console */ +VIRTIO_ID_RNG =4 ,/* virtio rng */ +VIRTIO_ID_BALLOON =5 ,/* virtio balloon */ /* virtio balloon (legacy) */
Quoted 18 lines
include/hw/virtio/virtio.h +7
-0+VIRTIO_ID_RPMSG =7 ,/* virtio remote processor messaging */ +VIRTIO_ID_SCSI =8 ,/* virtio scsi */ +VIRTIO_ID_9P =9 ,/* 9p virtio console */ +VIRTIO_ID_RPROC_SERIAL =11 ,/* virtio remoteproc serial link */ + VIRTIO_ID_CAIF = 12, /* Virtio caif */ +}; +/* from Linux's linux/virtio_config.h */ /* Status byte for guest to report progress, and synchronize features. */ pc-bios/s390-ccw/virtio.h +0
-0@@ -11,6 +11,7 @@#ifndef VIRTIO_H #define VIRTIO_H
Quoted 3 lines
pc-bios/s390-ccw/virtio.h line 14
Quoted 1 line
pc-bios/s390-ccw/virtio.h +1
-0+#include "hw/virtio/virtio.h" This won't work, the bios can't use the common headers.
Thanks for your caught.
Quoted 8 lines
Quoted 8 lines
pc-bios/s390-ccw/virtio.h +0
-0#include "s390-ccw.h" /* Status byte for guest to report progress, and synchronize features. */ @@ -23,13 +24,6 @@/* We've given up on this device. */ #define VIRTIO_CONFIG_S_FAILED 0x80
Quoted 16 lines
pc-bios/s390-ccw/virtio.h line 31
Quoted 6 lines
pc-bios/s390-ccw/virtio.h +0
-6-enum virtio_dev_type { -VIRTIO_ID_NET =1 , -VIRTIO_ID_BLOCK =2 , -VIRTIO_ID_CONSOLE =3 , -VIRTIO_ID_BALLOON =5 , -};Even though this one is incomplete; but we don't need anything but the block id anyway.
Quoted 4 lines
pc-bios/s390-ccw/virtio.h +0
-1-struct virtio_dev_header {enum virtio_dev_type type :8 ;u8 num_vq;
I will remove all s390 stuff in this patch.
Thanks
Tiejun
Quoted 17 lines · Stefan Hajnoczi
Quoted 5 lines · Tiejun Chen
Actually we define these device IDs in virtio standard, so we'd better put them into one common place to manage conveniently. Here I also add
VIRTIO_ID_RESERVEaccording to virtio spec.Signed-off-by Tiejun Chen <[email protected]>Quoted 10 lines
--- hw/9pfs/virtio-9p.h | 2 -- include/hw/virtio/virtio-balloon.h | 3 --- include/hw/virtio/virtio-blk.h | 3 --- include/hw/virtio/virtio-rng.h | 3 --- include/hw/virtio/virtio-scsi.h | 3 --- include/hw/virtio/virtio-serial.h | 3 --- include/hw/virtio/virtio.h | 16 ++++++++++++++++ pc-bios/s390-ccw/virtio.h | 8 +------- 8 files changed, 17 insertions(+), 24 deletions(-)
Quoted 1 line
Reviewed-by Stefan Hajnoczi <[email protected]>
Thanks for you review.
Just a little change will be introduced in next revision.
Tiejun
Quoted 8 lines · Michael S. Tsirkin
Quoted 7 lines · Cornelia Huck
Quoted 4 lines · On Fri, 6 Feb 2015 13:41:26 +0800 Tiejun Chen <[email protected]> wrote:
Actually we define these device IDs in virtio standard, so we'd better put them into one common place to manage conveniently. Here I also add
VIRTIO_ID_RESERVEaccording to virtio spec.
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Signed-off-by Tiejun Chen <[email protected]>We really should just write a script to import the headers from the linux kernel.
They will need some tweaks to avoid dependencies on linux/types, but this seems easy to do - better than trying to keep things in sync manually.
I prefer Cornelia's comment since actually we're trying to define a little bit according to a spec, so the following may be enough?
include/hw/virtio/virtio.h +16 -0
@@ -23,6 +23,22 @@#include "hw/virtio/virtio-9p.h" #endif +/* Refer to VirtIO Spec 1.0. */ + +#define VIRTIO_ID_RESERVED 0/* reserved (invalid)*/ +#define VIRTIO_ID_NET 1/* network card */ +#define VIRTIO_ID_BLOCK 2/* block device */ +#define VIRTIO_ID_CONSOLE 3/* console */ +#define VIRTIO_ID_RNG 4/* entropy source */ +#define VIRTIO_ID_BALLOON 5/* memory ballooning */ +#define VIRTIO_ID_IOMEMORY 6/* ioMemory */ +#define VIRTIO_ID_RPMSG 7/* rpmsg */ +#define VIRTIO_ID_SCSI 8/* SCSI host */ +#define VIRTIO_ID_9P 9/* 9P transport */ +#define VIRTIO_ID_MAC80211_WALN 10/* mac80211 wlan */ +#define VIRTIO_ID_RPROC_SERIAL 11/* rproc seria */ +#define VIRTIO_ID_CAIF 12/* virtio CAIF */ +/* from Linux's linux/virtio_config.h */ /* Status byte for guest to report progress, and synchronize features. */
Thanks
Tiejun
Quoted 48 lines · Tiejun
Quoted 8 lines · Michael S. Tsirkin
Quoted 7 lines · Cornelia Huck
Quoted 4 lines · On Fri, 6 Feb 2015 13:41:26 +0800 Tiejun Chen <[email protected]> wrote:
Actually we define these device IDs in virtio standard, so we'd better put them into one common place to manage conveniently. Here I also add
VIRTIO_ID_RESERVEaccording to virtio spec.Quoted 7 lines
Quoted 1 line
Quoted 1 line
Signed-off-by Tiejun Chen <[email protected]>We really should just write a script to import the headers from the linux kernel.
They will need some tweaks to avoid dependencies on linux/types, but this seems easy to do - better than trying to keep things in sync manually.I prefer Cornelia's comment since actually we're trying to define a little bit according to a spec, so the following may be enough?
include/hw/virtio/virtio.h +16
-0@@ -23,6 +23,22 @@#include "hw/virtio/virtio-9p.h" #endif +/* Refer to VirtIO Spec 1.0. */ + +#define VIRTIO_ID_RESERVED 0/* reserved (invalid)*/ +#define VIRTIO_ID_NET 1/* network card */ +#define VIRTIO_ID_BLOCK 2/* block device */ +#define VIRTIO_ID_CONSOLE 3/* console */ +#define VIRTIO_ID_RNG 4/* entropy source */ +#define VIRTIO_ID_BALLOON 5/* memory ballooning */ +#define VIRTIO_ID_IOMEMORY 6/* ioMemory */ +#define VIRTIO_ID_RPMSG 7/* rpmsg */ +#define VIRTIO_ID_SCSI 8/* SCSI host */ +#define VIRTIO_ID_9P 9/* 9P transport */ +#define VIRTIO_ID_MAC80211_WALN 10/* mac80211 wlan */ +#define VIRTIO_ID_RPROC_SERIAL 11/* rproc seria */ +#define VIRTIO_ID_CAIF 12/* virtio CAIF */ +/* from Linux's linux/virtio_config.h */ /* Status byte for guest to report progress, and synchronize features. */
Quoted 2 lines
Thanks
Tiejun
This still means each change has to be done in two places. An automated script for copying headers would be much better IMHO.
Signature · 1 line
MST
Quoted 47 lines · Michael S. Tsirkin
Quoted 46 lines · Tiejun
Quoted 8 lines · Michael S. Tsirkin
Quoted 7 lines · Cornelia Huck
Quoted 4 lines · On Fri, 6 Feb 2015 13:41:26 +0800 Tiejun Chen <[email protected]> wrote:
Actually we define these device IDs in virtio standard, so we'd better put them into one common place to manage conveniently. Here I also add
VIRTIO_ID_RESERVEaccording to virtio spec.Quoted 7 lines
Quoted 1 line
Quoted 1 line
Signed-off-by Tiejun Chen <[email protected]>We really should just write a script to import the headers from the linux kernel.
They will need some tweaks to avoid dependencies on linux/types, but this seems easy to do - better than trying to keep things in sync manually.I prefer Cornelia's comment since actually we're trying to define a little bit according to a spec, so the following may be enough?
include/hw/virtio/virtio.h +16
-0@@ -23,6 +23,22 @@#include "hw/virtio/virtio-9p.h" #endif +/* Refer to VirtIO Spec 1.0. */ + +#define VIRTIO_ID_RESERVED 0/* reserved (invalid)*/ +#define VIRTIO_ID_NET 1/* network card */ +#define VIRTIO_ID_BLOCK 2/* block device */ +#define VIRTIO_ID_CONSOLE 3/* console */ +#define VIRTIO_ID_RNG 4/* entropy source */ +#define VIRTIO_ID_BALLOON 5/* memory ballooning */ +#define VIRTIO_ID_IOMEMORY 6/* ioMemory */ +#define VIRTIO_ID_RPMSG 7/* rpmsg */ +#define VIRTIO_ID_SCSI 8/* SCSI host */ +#define VIRTIO_ID_9P 9/* 9P transport */ +#define VIRTIO_ID_MAC80211_WALN 10/* mac80211 wlan */ +#define VIRTIO_ID_RPROC_SERIAL 11/* rproc seria */ +#define VIRTIO_ID_CAIF 12/* virtio CAIF */ +/* from Linux's linux/virtio_config.h */
Quoted 6 lines
Quoted 4 lines
include/hw/virtio/virtio.h +0
-0/* Status byte for guest to report progress, and synchronize features. */ Thanks
TiejunThis still means each change has to be done in two places.
Are you saying another head file, pc-bios/s390-ccw/virtio.h?
But seems Cornelia thought in case of s390-ccw, -quote-
"Even though this one is incomplete; but we don't need anything but the block id anyway."
So I'm not sure we really should do this :)
Thanks
Tiejun
Quoted 30 lines · Tiejun
Quoted 29 lines · Michael S. Tsirkin
Quoted 28 lines · Tiejun
Quoted 8 lines · Michael S. Tsirkin
Quoted 7 lines · Cornelia Huck
Quoted 4 lines · On Fri, 6 Feb 2015 13:41:26 +0800 Tiejun Chen <[email protected]> wrote:
Actually we define these device IDs in virtio standard, so we'd better put them into one common place to manage conveniently. Here I also add
VIRTIO_ID_RESERVEaccording to virtio spec.Quoted 7 lines
Quoted 1 line
Quoted 1 line
Signed-off-by Tiejun Chen <[email protected]>We really should just write a script to import the headers from the linux kernel.
They will need some tweaks to avoid dependencies on linux/types, but this seems easy to do - better than trying to keep things in sync manually.I prefer Cornelia's comment since actually we're trying to define a little bit according to a spec, so the following may be enough?
include/hw/virtio/virtio.h +0
-0@@ -23,6 +23,22 @@#include "hw/virtio/virtio-9p.h" #endif
Quoted 15 lines
Quoted 7 lines
Quoted 7 lines
include/hw/virtio/virtio.h +7
-0+/* Refer to VirtIO Spec 1.0. */ + +#define VIRTIO_ID_RESERVED 0/* reserved (invalid)*/ +#define VIRTIO_ID_NET 1/* network card */ +#define VIRTIO_ID_BLOCK 2/* block device */ +#define VIRTIO_ID_CONSOLE 3/* console */ +#define VIRTIO_ID_RNG 4/* entropy source */ Quoted 8 lines
include/hw/virtio/virtio.h line 40
Quoted 8 lines
include/hw/virtio/virtio.h +8
-0+#define VIRTIO_ID_BALLOON 5/* memory ballooning */ +#define VIRTIO_ID_IOMEMORY 6/* ioMemory */ +#define VIRTIO_ID_RPMSG 7/* rpmsg */ +#define VIRTIO_ID_SCSI 8/* SCSI host */ +#define VIRTIO_ID_9P 9/* 9P transport */ +#define VIRTIO_ID_MAC80211_WALN 10/* mac80211 wlan */ +#define VIRTIO_ID_RPROC_SERIAL 11/* rproc seria */ +#define VIRTIO_ID_CAIF 12/* virtio CAIF */
I like that.
Quoted 9 lines
Quoted 9 lines
Quoted 7 lines
include/hw/virtio/virtio.h +1
-0+/* from Linux's linux/virtio_config.h */ /* Status byte for guest to report progress, and synchronize features. */ Thanks
TiejunThis still means each change has to be done in two places.
Well, we do need the changes in way more than two places, as every host or guest has to collect the definitions on its own, no? (Granted, with Linux and qemu you get most of the users; but it feels a bit strange for a host implementation to collect information from one of its guests. I really think that we should go back to the common root. Didn't we have a BSD-licenced header in the spec?)
Quoted 7 lines
Are you saying another head file,
pc-bios/s390-ccw/virtio.h?But seems Cornelia thought in case of s390-ccw, -quote-
"Even though this one is incomplete; but we don't need anything but the block id anyway."
Note that this is the s390-ccw _bios_, which is a very incomplete implementation only containing the bare minimum needed to access a virtio-blk root device for booting.
Quoted 5 lines · Tiejun Chen
Actually we define these device IDs in virtio standard, so we'd better put them into one common place to manage conveniently. Here I also add
VIRTIO_ID_RESERVEaccording to virtio spec.Signed-off-by Tiejun Chen <[email protected]>
So I just posted a script that pulls in headers from a linux tree, doing minor changes required to make the headers portable, such as linux/types.h -> inttypes.h
I think it's a better idea, a virtio 1.0 work will benefit from this too.
Quoted 149 lines
--- hw/9pfs/virtio-9p.h | 2 -- include/hw/virtio/virtio-balloon.h | 3 --- include/hw/virtio/virtio-blk.h | 3 --- include/hw/virtio/virtio-rng.h | 3 --- include/hw/virtio/virtio-scsi.h | 3 --- include/hw/virtio/virtio-serial.h | 3 --- include/hw/virtio/virtio.h | 16 ++++++++++++++++ pc-bios/s390-ccw/virtio.h | 8 +------- 8 files changed, 17 insertions(+), 24 deletions(-)hw/9pfs/virtio-9p.h +0
-2@@ -146,8 +146,6 @@ struct V9fsPDU/* from Linux's linux/virtio_9p.h */ -/* The ID for virtio console */ -#define VIRTIO_ID_9P 9#define MAX_REQ 128#define MAX_TAG_LEN 32include/hw/virtio/virtio-balloon.h +0
-3@@ -24,9 +24,6 @@/* from Linux's linux/virtio_balloon.h */ -/* The ID for virtio_balloon */ -#define VIRTIO_ID_BALLOON 5 -/* The feature bitmap for virtio balloon */ #define VIRTIO_BALLOON_F_MUST_TELL_HOST 0/* Tell before reclaiming pages */ #define VIRTIO_BALLOON_F_STATS_VQ 1/* Memory stats virtqueue */ include/hw/virtio/virtio-blk.h +0
-3@@ -25,9 +25,6 @@/* from Linux's linux/virtio_blk.h */ -/* The ID for virtio_block */ -#define VIRTIO_ID_BLOCK 2 -/* Feature bits */ #define VIRTIO_BLK_F_BARRIER 0/* Does host support barriers? */ #define VIRTIO_BLK_F_SIZE_MAX 1/* Indicates maximum segment size */ include/hw/virtio/virtio-rng.h +0
-3@@ -21,9 +21,6 @@#define VIRTIO_RNG_GET_PARENT_CLASS (obj) \ OBJECT_GET_PARENT_CLASS(obj, TYPE_VIRTIO_RNG) -/* The Virtio ID for the virtio rng device */ -#define VIRTIO_ID_RNG 4 -struct VirtIORNGConf {RngBackend *rng;uint64_t max_bytes;include/hw/virtio/virtio-scsi.h +0
-3@@ -29,9 +29,6 @@OBJECT_CHECK (VirtIOSCSI, (obj),TYPE_VIRTIO_SCSI ) -/* The ID for virtio_scsi */ -#define VIRTIO_ID_SCSI 8 - /* Feature Bits */#define VIRTIO_SCSI_F_INOUT 0#define VIRTIO_SCSI_F_HOTPLUG 1include/hw/virtio/virtio-serial.h +0
-3@@ -20,9 +20,6 @@/* == Interface shared between the guest kernel and qemu == */ -/* The Virtio ID for virtio console / serial ports */ -#define VIRTIO_ID_CONSOLE 3 -/* Features supported */ #define VIRTIO_CONSOLE_F_MULTIPORT 1include/hw/virtio/virtio.h +16
-0@@ -23,6 +23,22 @@#include "hw/virtio/virtio-9p.h" #endif +/* Refer to Linux's linux/virtio_ids.h */ + +enum virtio_dev_type { +VIRTIO_ID_RESERVED =0 ,/* invalid virtio device */ +VIRTIO_ID_NET =1 ,/* virtio net */ +VIRTIO_ID_BLOCK =2 ,/* virtio block */ +VIRTIO_ID_CONSOLE =3 ,/* virtio console */ +VIRTIO_ID_RNG =4 ,/* virtio rng */ +VIRTIO_ID_BALLOON =5 ,/* virtio balloon */ +VIRTIO_ID_RPMSG =7 ,/* virtio remote processor messaging */ +VIRTIO_ID_SCSI =8 ,/* virtio scsi */ +VIRTIO_ID_9P =9 ,/* 9p virtio console */ +VIRTIO_ID_RPROC_SERIAL =11 ,/* virtio remoteproc serial link */ +VIRTIO_ID_CAIF =12 ,/* Virtio caif */ +}; +/* from Linux's linux/virtio_config.h */ /* Status byte for guest to report progress, and synchronize features. */ pc-bios/s390-ccw/virtio.h +1
-7@@ -11,6 +11,7 @@#ifndef VIRTIO_H #define VIRTIO_H +#include "hw/virtio/virtio.h" #include "s390-ccw.h" /* Status byte for guest to report progress, and synchronize features. */ @@ -23,13 +24,6 @@/* We've given up on this device. */ #define VIRTIO_CONFIG_S_FAILED 0x80 -enum virtio_dev_type { -VIRTIO_ID_NET =1 , -VIRTIO_ID_BLOCK =2 , -VIRTIO_ID_CONSOLE =3 , -VIRTIO_ID_BALLOON =5 , -}; -struct virtio_dev_header {enum virtio_dev_type type :8 ;u8 num_vq;Signature · 1 line
1.9.1
Quoted 5 lines · Tiejun Chen
Actually we define these device IDs in virtio standard, so we'd better put them into one common place to manage conveniently. Here I also add
VIRTIO_ID_RESERVEaccording to virtio spec.Signed-off-by Tiejun Chen <[email protected]>
Amit
Quoted 11 lines · Michael S. Tsirkin
Quoted 5 lines · Tiejun Chen
Actually we define these device IDs in virtio standard, so we'd better put them into one common place to manage conveniently. Here I also add
VIRTIO_ID_RESERVEaccording to virtio spec.Signed-off-by Tiejun Chen <[email protected]>So I just posted a script that pulls in headers from a linux tree, doing minor changes required to make the headers portable, such as
linux/types.h->inttypes.h
We used to do this for kvm headers earlier..
Anyway I don't feel strongly about it. Cornelia's objection that it doesn't work on non-Linux hosts also holds..
Amit
Quoted 13 lines · Amit Shah
Quoted 11 lines · Michael S. Tsirkin
Quoted 5 lines · Tiejun Chen
Actually we define these device IDs in virtio standard, so we'd better put them into one common place to manage conveniently. Here I also add
VIRTIO_ID_RESERVEaccording to virtio spec.Signed-off-by Tiejun Chen <[email protected]>So I just posted a script that pulls in headers from a linux tree, doing minor changes required to make the headers portable, such as
linux/types.h->inttypes.h
Quoted 6 lines
We used to do this for kvm headers earlier..
Anyway I don't feel strongly about it. Cornelia's objection that it doesn't work on non-Linux hosts also holds..
Amit
Imported headers clearly can work on non linux hosts.
Signature · 1 line
MST
Quoted 56 lines · Cornelia Huck
Quoted 30 lines · Tiejun
Quoted 29 lines · Michael S. Tsirkin
Quoted 28 lines · Tiejun
Quoted 8 lines · Michael S. Tsirkin
Quoted 7 lines · Cornelia Huck
Quoted 4 lines · On Fri, 6 Feb 2015 13:41:26 +0800 Tiejun Chen <[email protected]> wrote:
Actually we define these device IDs in virtio standard, so we'd better put them into one common place to manage conveniently. Here I also add
VIRTIO_ID_RESERVEaccording to virtio spec.Quoted 7 lines
Quoted 1 line
Quoted 1 line
Signed-off-by Tiejun Chen <[email protected]>We really should just write a script to import the headers from the linux kernel.
They will need some tweaks to avoid dependencies on linux/types, but this seems easy to do - better than trying to keep things in sync manually.I prefer Cornelia's comment since actually we're trying to define a little bit according to a spec, so the following may be enough?
include/hw/virtio/virtio.h +0
-0@@ -23,6 +23,22 @@#include "hw/virtio/virtio-9p.h" #endif Quoted 15 lines
Quoted 7 lines
Quoted 7 lines
include/hw/virtio/virtio.h +7
-0+/* Refer to VirtIO Spec 1.0. */ + +#define VIRTIO_ID_RESERVED 0/* reserved (invalid)*/ +#define VIRTIO_ID_NET 1/* network card */ +#define VIRTIO_ID_BLOCK 2/* block device */ +#define VIRTIO_ID_CONSOLE 3/* console */ +#define VIRTIO_ID_RNG 4/* entropy source */ Quoted 8 lines
include/hw/virtio/virtio.h line 40
Quoted 8 lines
include/hw/virtio/virtio.h +8
-0+#define VIRTIO_ID_BALLOON 5/* memory ballooning */ +#define VIRTIO_ID_IOMEMORY 6/* ioMemory */ +#define VIRTIO_ID_RPMSG 7/* rpmsg */ +#define VIRTIO_ID_SCSI 8/* SCSI host */ +#define VIRTIO_ID_9P 9/* 9P transport */ +#define VIRTIO_ID_MAC80211_WALN 10/* mac80211 wlan */ +#define VIRTIO_ID_RPROC_SERIAL 11/* rproc seria */ +#define VIRTIO_ID_CAIF 12/* virtio CAIF */ I like that.
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
include/hw/virtio/virtio.h +1
-0+/* from Linux's linux/virtio_config.h */ /* Status byte for guest to report progress, and synchronize features. */
Quoted 7 lines
Quoted 4 lines
Quoted 4 lines
Quoted 2 lines
Thanks
TiejunThis still means each change has to be done in two places.
Well, we do need the changes in way more than two places, as every host or guest has to collect the definitions on its own, no?
This has nothing to do with host.
It's just using linux source as main basis for the file simply because linux is a higher visibility project than qemu, they won't borrow code from us but we can borrow from them.
Quoted 5 lines
(Granted, with
Linux and qemu you get most of the users; but it feels a bit strange for a host implementation to collect information from one of its guests. I really think that we should go back to the common root. Didn't we have a BSD-licenced header in the spec?)
virtio linux headers are also BSD licensed intentionally for this purpose.
* This header is BSD licensed so anyone can use the definitions to
* implement compatible drivers/servers.
Quoted 11 lines
Quoted 7 lines
Are you saying another head file,
pc-bios/s390-ccw/virtio.h?But seems Cornelia thought in case of s390-ccw, -quote-
"Even though this one is incomplete; but we don't need anything but the block id anyway."
Note that this is the s390-ccw _bios_, which is a very incomplete implementation only containing the bare minimum needed to access a virtio-blk root device for booting.
Let's worry about this one once we have fixed the duplication for the others.
Quoted 6 lines · On Wed, 11 Feb 2015 13:41:29 +0100 "Michael S. Tsirkin" <[email protected]> wrote:
Quoted 2 lines · Cornelia Huck
Well, we do need the changes in way more than two places, as every host or guest has to collect the definitions on its own, no?
This has nothing to do with host.
Hm, but all hosts and all guests need the ids, no?
Quoted 3 lines
It's just using linux source as main basis for the file simply because linux is a higher visibility project than qemu, they won't borrow code from us but we can borrow from them.
It still seems restricting to use Linux as the ultimate source - and that has nothing to do with visibililty. I'd say pulling from any project is restricting: Why shouldn't we want to implement something in qemu that Linux is not (yet) interested in, but other guests are?
Quoted 10 lines
Quoted 5 lines
(Granted, with
Linux and qemu you get most of the users; but it feels a bit strange for a host implementation to collect information from one of its guests. I really think that we should go back to the common root. Didn't we have a BSD-licenced header in the spec?)virtio linux headers are also BSD licensed intentionally for this purpose.
* This header is BSD licensed so anyone can use the definitions to
* implement compatibledrivers/servers.
Sure, but I always took this to mean "you can freely copy the definitions", not "this is the authorative source".
Quoted 12 lines · Cornelia Huck
Quoted 6 lines · On Wed, 11 Feb 2015 13:41:29 +0100 "Michael S. Tsirkin" <[email protected]> wrote:
Quoted 2 lines · Cornelia Huck
Well, we do need the changes in way more than two places, as every host or guest has to collect the definitions on its own, no?
This has nothing to do with host.
Hm, but all hosts and all guests need the ids, no?
Quoted 8 lines
Quoted 3 lines
It's just using linux source as main basis for the file simply because linux is a higher visibility project than qemu, they won't borrow code from us but we can borrow from them.
It still seems restricting to use Linux as the ultimate source - and that has nothing to do with visibililty. I'd say pulling from any project is restricting: Why shouldn't we want to implement something in qemu that Linux is not (yet) interested in, but other guests are?
We can always add such a hypothetical feature in a qemu specific headers.
But most things are shared, and manual duplication is bad.
Quoted 6 lines
Quoted 6 lines
Quoted 5 lines
(Granted, with
Linux and qemu you get most of the users; but it feels a bit strange for a host implementation to collect information from one of its guests. I really think that we should go back to the common root. Didn't we have a BSD-licenced header in the spec?)
Quoted 7 lines
Quoted 4 lines
virtio linux headers are also BSD licensed intentionally for this purpose.
* This header is BSD licensed so anyone can use the definitions to
* implement compatibledrivers/servers.Sure, but I always took this to mean "you can freely copy the definitions", not "this is the authorative source".
virtio spec only has a ring header.
We could get it from there but it's easier to
get everything from one place I think.
Signature · 1 line
MST