Eliminate kbdfront union member in struct file

Replace the kbdfront specific union member in struct file with the
common dev pointer.

Signed-off-by: Juergen Gross <jgross@suse.com>
Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org>

diff --git a/fbfront.c b/fbfront.c
index c8410af9ca8bd2cbdb0db1611f7b64392010abaa..1e055fb068cdf9fbfd6db6c77513b419f45b7244 100644 (file)
--- a/fbfront.c
+++ b/fbfront.c
@@ -302,7 +302,7 @@ int kbdfront_open(struct kbdfront_dev *dev)
 {
     dev->fd = alloc_fd(FTYPE_KBD);
     printk("kbd_open(%s) -> %d\n", dev->nodename, dev->fd);
-    files[dev->fd].kbd.dev = dev;
+    files[dev->fd].dev = dev;
     return dev->fd;
 }
 #endif

diff --git a/include/lib.h b/include/lib.h
index 2a9a01c1fed835b47172d8f051fe7393f045ad69..5201ed7c637a57c3f97c9626e2778266c611a16a 100644 (file)
--- a/include/lib.h
+++ b/include/lib.h
@@ -196,9 +196,6 @@ struct file {
        struct {
            struct netfront_dev *dev;
        } tap;
-       struct {
-           struct kbdfront_dev *dev;
-       } kbd;
 #ifdef CONFIG_TPMFRONT
        struct {
           struct tpmfront_dev *dev;

diff --git a/lib/sys.c b/lib/sys.c
index 2d4865760a8636cfe249d2e4158e2b1f2ae73d3a..8c7ea3cecaa51e4060c7b1eea96bc0e594efa477 100644 (file)
--- a/lib/sys.c
+++ b/lib/sys.c
@@ -275,7 +275,7 @@ int read(int fd, void *buf, size_t nbytes)
         case FTYPE_KBD: {
             int ret, n;
             n = nbytes / sizeof(union xenkbd_in_event);
-            ret = kbdfront_receive(files[fd].kbd.dev, buf, n);
+            ret = kbdfront_receive(files[fd].dev, buf, n);
            if (ret <= 0) {
                errno = EAGAIN;
                return -1;
@@ -474,7 +474,7 @@ int close(int fd)
 #endif
 #ifdef CONFIG_KBDFRONT
        case FTYPE_KBD:
-            shutdown_kbdfront(files[fd].kbd.dev);
+            shutdown_kbdfront(files[fd].dev);
             files[fd].type = FTYPE_NONE;
             return 0;
 #endif