lguest and virtio: cleanup struct definitions to Linux style.

I've been doing this for years, and akpm picked me up on it about 12
months ago.  lguest partly serves as example code, so let's do it Right.

Also, remove two unused fields in struct vblk_info in the example launcher.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Cc: Ingo Molnar <mingo@redhat.com>

diff --git a/Documentation/lguest/lguest.c b/Documentation/lguest/lguest.c
index 45163651b5196cfff8140b1763b7762e7ef5cc3b..950cde6d6e58384083202b40af0921ef31e0e0ca 100644 (file)
--- a/Documentation/lguest/lguest.c
+++ b/Documentation/lguest/lguest.c
@@ -93,8 +93,7 @@ static int lguest_fd;
 static unsigned int __thread cpu_id;
 
 /* This is our list of devices. */
-struct device_list
-{
+struct device_list {
        /* Counter to assign interrupt numbers. */
        unsigned int next_irq;
 
@@ -114,8 +113,7 @@ struct device_list
 static struct device_list devices;
 
 /* The device structure describes a single device. */
-struct device
-{
+struct device {
        /* The linked-list pointer. */
        struct device *next;
 
@@ -140,8 +138,7 @@ struct device
 };
 
 /* The virtqueue structure describes a queue attached to a device. */
-struct virtqueue
-{
+struct virtqueue {
        struct virtqueue *next;
 
        /* Which device owns me. */
@@ -779,8 +776,7 @@ static void add_used_and_trigger(struct virtqueue *vq, unsigned head, int len)
  *
  * We associate some data with the console for our exit hack.
  */
-struct console_abort
-{
+struct console_abort {
        /* How many times have they hit ^C? */
        int count;
        /* When did they start? */
@@ -1570,20 +1566,13 @@ static void setup_tun_net(char *arg)
 /*:*/
 
 /* This hangs off device->priv. */
-struct vblk_info
-{
+struct vblk_info {
        /* The size of the file. */
        off64_t len;
 
        /* The file descriptor for the file. */
        int fd;
 
-       /* IO thread listens on this file descriptor [0]. */
-       int workpipe[2];
-
-       /* IO thread writes to this file descriptor to mark it done, then
-        * Launcher triggers interrupt to Guest. */
-       int done_fd;
 };
 
 /*L:210

diff --git a/drivers/lguest/lg.h b/drivers/lguest/lg.h
index 74c0db691b5375c5d353819fdea8f74f1851a440..bc28745d05af9794f756a5a29e64bb0b51a230ff 100644 (file)
--- a/drivers/lguest/lg.h
+++ b/drivers/lguest/lg.h
@@ -16,15 +16,13 @@
 void free_pagetables(void);
 int init_pagetables(struct page **switcher_page, unsigned int pages);
 
-struct pgdir
-{
+struct pgdir {
        unsigned long gpgdir;
        pgd_t *pgdir;
 };
 
 /* We have two pages shared with guests, per cpu.  */
-struct lguest_pages
-{
+struct lguest_pages {
        /* This is the stack page mapped rw in guest */
        char spare[PAGE_SIZE - sizeof(struct lguest_regs)];
        struct lguest_regs regs;
@@ -89,8 +87,7 @@ struct lg_eventfd_map {
 };
 
 /* The private info the thread maintains about the guest. */
-struct lguest
-{
+struct lguest {
        struct lguest_data __user *lguest_data;
        struct lg_cpu cpus[NR_CPUS];
        unsigned int nr_cpus;

diff --git a/drivers/lguest/lguest_device.c b/drivers/lguest/lguest_device.c
index 1401c1ace1ec0226fd176c9e72873a813f43d273..b6200bc39b5814460c4a7e451d63c680e593e1f7 100644 (file)
--- a/drivers/lguest/lguest_device.c
+++ b/drivers/lguest/lguest_device.c
@@ -207,8 +207,7 @@ static void lg_reset(struct virtio_device *vdev)
  */
 
 /*D:140 This is the information we remember about each virtqueue. */
-struct lguest_vq_info
-{
+struct lguest_vq_info {
        /* A copy of the information contained in the device config. */
        struct lguest_vqconfig config;
 

diff --git a/include/linux/lguest.h b/include/linux/lguest.h
index 0a3a11afd64b3a8d8bfe1b4a6b314ce18bffc971..2fb1dcbcb5aa8fbdbbd05d8d071aac9b650334b8 100644 (file)
--- a/include/linux/lguest.h
+++ b/include/linux/lguest.h
@@ -18,8 +18,7 @@
  * lguest_data".  Once the Guest's initialization hypercall tells the Host where
  * this is, the Guest and Host both publish information in it.
 :*/
-struct lguest_data
-{
+struct lguest_data {
        /*
         * 512 == enabled (same as eflags in normal hardware).  The Guest
         * changes interrupts so often that a hypercall is too slow.

diff --git a/include/linux/virtio_blk.h b/include/linux/virtio_blk.h
index be7d255fc7cfbfc644fc5381fac0aaf9ee3e59e3..8dab9f2b8832db74569f668a70edfd853274414c 100644 (file)
--- a/include/linux/virtio_blk.h
+++ b/include/linux/virtio_blk.h
@@ -20,8 +20,7 @@
 
 #define VIRTIO_BLK_ID_BYTES    (sizeof(__u16[256]))    /* IDENTIFY DATA */
 
-struct virtio_blk_config
-{
+struct virtio_blk_config {
        /* The capacity (in 512-byte sectors). */
        __u64 capacity;
        /* The maximum segment size (if VIRTIO_BLK_F_SIZE_MAX) */
@@ -50,8 +49,7 @@ struct virtio_blk_config
 #define VIRTIO_BLK_T_BARRIER   0x80000000
 
 /* This is the first element of the read scatter-gather list. */
-struct virtio_blk_outhdr
-{
+struct virtio_blk_outhdr {
        /* VIRTIO_BLK_T* */
        __u32 type;
        /* io priority. */

diff --git a/include/linux/virtio_config.h b/include/linux/virtio_config.h
index 99f514575f6afa1fe0e6ceeb4c50c7fb4e6520a5..e547e3c8ee9a55412e52dabaa9ddc67a423b01ab 100644 (file)
--- a/include/linux/virtio_config.h
+++ b/include/linux/virtio_config.h
@@ -79,8 +79,7 @@
  *     the dev->feature bits if it wants.
  */
 typedef void vq_callback_t(struct virtqueue *);
-struct virtio_config_ops
-{
+struct virtio_config_ops {
        void (*get)(struct virtio_device *vdev, unsigned offset,
                    void *buf, unsigned len);
        void (*set)(struct virtio_device *vdev, unsigned offset,

diff --git a/include/linux/virtio_net.h b/include/linux/virtio_net.h
index 9c543d6ac535699cf8bab7a4c7209a997cc8e8d1..d8dd539c9f48e602019c0b184087635c042e3b3d 100644 (file)
--- a/include/linux/virtio_net.h
+++ b/include/linux/virtio_net.h
@@ -31,8 +31,7 @@
 
 #define VIRTIO_NET_S_LINK_UP   1       /* Link is up */
 
-struct virtio_net_config
-{
+struct virtio_net_config {
        /* The config defining mac address (if VIRTIO_NET_F_MAC) */
        __u8 mac[6];
        /* See VIRTIO_NET_F_STATUS and VIRTIO_NET_S_* above */
@@ -41,8 +40,7 @@ struct virtio_net_config
 
 /* This is the first element of the scatter-gather list.  If you don't
  * specify GSO or CSUM features, you can simply ignore the header. */
-struct virtio_net_hdr
-{
+struct virtio_net_hdr {
 #define VIRTIO_NET_HDR_F_NEEDS_CSUM    1       // Use csum_start, csum_offset
        __u8 flags;
 #define VIRTIO_NET_HDR_GSO_NONE                0       // Not a GSO frame

diff --git a/include/linux/virtio_ring.h b/include/linux/virtio_ring.h
index 693e0ec5afa67f9ec2c18d48563cccdba3261409..e4d144b132b5e27d3c4713738acfc63ce6262781 100644 (file)
--- a/include/linux/virtio_ring.h
+++ b/include/linux/virtio_ring.h
@@ -30,8 +30,7 @@
 #define VIRTIO_RING_F_INDIRECT_DESC    28
 
 /* Virtio ring descriptors: 16 bytes.  These can chain together via "next". */
-struct vring_desc
-{
+struct vring_desc {
        /* Address (guest-physical). */
        __u64 addr;
        /* Length. */
@@ -42,24 +41,21 @@ struct vring_desc
        __u16 next;
 };
 
-struct vring_avail
-{
+struct vring_avail {
        __u16 flags;
        __u16 idx;
        __u16 ring[];
 };
 
 /* u32 is used here for ids for padding reasons. */
-struct vring_used_elem
-{
+struct vring_used_elem {
        /* Index of start of used descriptor chain. */
        __u32 id;
        /* Total length of the descriptor chain which was used (written to) */
        __u32 len;
 };
 
-struct vring_used
-{
+struct vring_used {
        __u16 flags;
        __u16 idx;
        struct vring_used_elem ring[];