* [Qemu-devel] [PATCH for-2.7 0/2] 9p: cleanup in #include directives @ 2016-04-13 13:15 Greg Kurz 2016-04-13 13:15 ` [Qemu-devel] [PATCH for-2.7 1/2] 9p: don't include <sys/uio.h> Greg Kurz 2016-04-13 13:15 ` [Qemu-devel] [PATCH for-2.7 2/2] 9p: some more cleanup in #include directives Greg Kurz 0 siblings, 2 replies; 8+ messages in thread From: Greg Kurz @ 2016-04-13 13:15 UTC (permalink / raw) To: Aneesh Kumar K.V; +Cc: qemu-devel, Michael Fritscher The recent RFC patch to bring 9p support to Windows hosts unveiled some nits. These two patches are preliminary cleanup. Michael, I'd like you to carry these patches in your patchset. Please rebase your current work on top of them. Thanks. --- Greg Kurz (2): 9p: don't include <sys/uio.h> 9p: some more cleanup in #include directives fsdev/9p-iov-marshal.c | 1 - fsdev/9p-marshal.c | 1 - fsdev/file-op-9p.h | 2 +- hw/9pfs/9p-synth.c | 4 +--- hw/9pfs/virtio-9p-device.c | 1 - 5 files changed, 2 insertions(+), 7 deletions(-) -- Greg ^ permalink raw reply [flat|nested] 8+ messages in thread
* [Qemu-devel] [PATCH for-2.7 1/2] 9p: don't include <sys/uio.h> 2016-04-13 13:15 [Qemu-devel] [PATCH for-2.7 0/2] 9p: cleanup in #include directives Greg Kurz @ 2016-04-13 13:15 ` Greg Kurz 2016-06-30 11:40 ` Cédric Le Goater 2016-06-30 12:57 ` Markus Armbruster 2016-04-13 13:15 ` [Qemu-devel] [PATCH for-2.7 2/2] 9p: some more cleanup in #include directives Greg Kurz 1 sibling, 2 replies; 8+ messages in thread From: Greg Kurz @ 2016-04-13 13:15 UTC (permalink / raw) To: Aneesh Kumar K.V; +Cc: qemu-devel, Michael Fritscher The <sys/uio.h> system header doesn't exist on all host platforms. Code should include "qemu/osdep.h" instead to avoid build breaks on plafforms that don't define CONFIG_IOVEC (like win32, if it is to support 9p one day). Signed-off-by: Greg Kurz <gkurz@linux.vnet.ibm.com> --- fsdev/9p-iov-marshal.c | 1 - fsdev/9p-marshal.c | 1 - fsdev/file-op-9p.h | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/fsdev/9p-iov-marshal.c b/fsdev/9p-iov-marshal.c index fb40bdf0d5f6..a564637b73c1 100644 --- a/fsdev/9p-iov-marshal.c +++ b/fsdev/9p-iov-marshal.c @@ -15,7 +15,6 @@ #include <glib.h> #include <glib/gprintf.h> #include <utime.h> -#include <sys/uio.h> #include "9p-iov-marshal.h" #include "qemu/bswap.h" diff --git a/fsdev/9p-marshal.c b/fsdev/9p-marshal.c index 183d3667c681..df9d4f8e23c9 100644 --- a/fsdev/9p-marshal.c +++ b/fsdev/9p-marshal.c @@ -16,7 +16,6 @@ #include <glib/gprintf.h> #include <dirent.h> #include <utime.h> -#include <sys/uio.h> #include "9p-marshal.h" diff --git a/fsdev/file-op-9p.h b/fsdev/file-op-9p.h index b8c26024a955..8736d1fa6d52 100644 --- a/fsdev/file-op-9p.h +++ b/fsdev/file-op-9p.h @@ -12,9 +12,9 @@ */ #ifndef _FILEOP_H #define _FILEOP_H +#include "qemu/osdep.h" #include <dirent.h> #include <utime.h> -#include <sys/uio.h> #include <sys/vfs.h> #define SM_LOCAL_MODE_BITS 0600 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.7 1/2] 9p: don't include <sys/uio.h> 2016-04-13 13:15 ` [Qemu-devel] [PATCH for-2.7 1/2] 9p: don't include <sys/uio.h> Greg Kurz @ 2016-06-30 11:40 ` Cédric Le Goater 2016-06-30 12:42 ` Michael Fritscher 2016-06-30 12:57 ` Markus Armbruster 1 sibling, 1 reply; 8+ messages in thread From: Cédric Le Goater @ 2016-06-30 11:40 UTC (permalink / raw) To: Greg Kurz, Aneesh Kumar K.V; +Cc: qemu-devel, Michael Fritscher, Greg Kurz On 04/13/2016 03:15 PM, Greg Kurz wrote: > The <sys/uio.h> system header doesn't exist on all host platforms. Code should > include "qemu/osdep.h" instead to avoid build breaks on plafforms that don't > define CONFIG_IOVEC (like win32, if it is to support 9p one day). > > Signed-off-by: Greg Kurz <gkurz@linux.vnet.ibm.com> Acked-by: Cédric Le Goater <clg@kaod.org> > --- > fsdev/9p-iov-marshal.c | 1 - > fsdev/9p-marshal.c | 1 - > fsdev/file-op-9p.h | 2 +- > 3 files changed, 1 insertion(+), 3 deletions(-) > > diff --git a/fsdev/9p-iov-marshal.c b/fsdev/9p-iov-marshal.c > index fb40bdf0d5f6..a564637b73c1 100644 > --- a/fsdev/9p-iov-marshal.c > +++ b/fsdev/9p-iov-marshal.c > @@ -15,7 +15,6 @@ > #include <glib.h> > #include <glib/gprintf.h> > #include <utime.h> > -#include <sys/uio.h> > > #include "9p-iov-marshal.h" > #include "qemu/bswap.h" > diff --git a/fsdev/9p-marshal.c b/fsdev/9p-marshal.c > index 183d3667c681..df9d4f8e23c9 100644 > --- a/fsdev/9p-marshal.c > +++ b/fsdev/9p-marshal.c > @@ -16,7 +16,6 @@ > #include <glib/gprintf.h> > #include <dirent.h> > #include <utime.h> > -#include <sys/uio.h> > > #include "9p-marshal.h" > > diff --git a/fsdev/file-op-9p.h b/fsdev/file-op-9p.h > index b8c26024a955..8736d1fa6d52 100644 > --- a/fsdev/file-op-9p.h > +++ b/fsdev/file-op-9p.h > @@ -12,9 +12,9 @@ > */ > #ifndef _FILEOP_H > #define _FILEOP_H > +#include "qemu/osdep.h" > #include <dirent.h> > #include <utime.h> > -#include <sys/uio.h> > #include <sys/vfs.h> > > #define SM_LOCAL_MODE_BITS 0600 > > ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.7 1/2] 9p: don't include <sys/uio.h> 2016-06-30 11:40 ` Cédric Le Goater @ 2016-06-30 12:42 ` Michael Fritscher 2016-06-30 12:54 ` Greg Kurz 0 siblings, 1 reply; 8+ messages in thread From: Michael Fritscher @ 2016-06-30 12:42 UTC (permalink / raw) To: "Cédric Le Goater" Cc: Greg Kurz, Aneesh Kumar K.V, qemu-devel, Michael Fritscher, Greg Kurz > On 04/13/2016 03:15 PM, Greg Kurz wrote: >> The <sys/uio.h> system header doesn't exist on all host platforms. Code >> should >> include "qemu/osdep.h" instead to avoid build breaks on plafforms that >> don't >> define CONFIG_IOVEC (like win32, if it is to support 9p one day). >> >> Signed-off-by: Greg Kurz <gkurz@linux.vnet.ibm.com> > > Acked-by: Cédric Le Goater <clg@kaod.org> Acked-by: Michael Fritscher <michael@fritscher.net> Yes, I still plan to upstream the win32 9p support in the next weeks, when my stress level goes down a bit ;-) Best regards, Michael Fritscher >> --- >> fsdev/9p-iov-marshal.c | 1 - >> fsdev/9p-marshal.c | 1 - >> fsdev/file-op-9p.h | 2 +- >> 3 files changed, 1 insertion(+), 3 deletions(-) >> >> diff --git a/fsdev/9p-iov-marshal.c b/fsdev/9p-iov-marshal.c >> index fb40bdf0d5f6..a564637b73c1 100644 >> --- a/fsdev/9p-iov-marshal.c >> +++ b/fsdev/9p-iov-marshal.c >> @@ -15,7 +15,6 @@ >> #include <glib.h> >> #include <glib/gprintf.h> >> #include <utime.h> >> -#include <sys/uio.h> >> >> #include "9p-iov-marshal.h" >> #include "qemu/bswap.h" >> diff --git a/fsdev/9p-marshal.c b/fsdev/9p-marshal.c >> index 183d3667c681..df9d4f8e23c9 100644 >> --- a/fsdev/9p-marshal.c >> +++ b/fsdev/9p-marshal.c >> @@ -16,7 +16,6 @@ >> #include <glib/gprintf.h> >> #include <dirent.h> >> #include <utime.h> >> -#include <sys/uio.h> >> >> #include "9p-marshal.h" >> >> diff --git a/fsdev/file-op-9p.h b/fsdev/file-op-9p.h >> index b8c26024a955..8736d1fa6d52 100644 >> --- a/fsdev/file-op-9p.h >> +++ b/fsdev/file-op-9p.h >> @@ -12,9 +12,9 @@ >> */ >> #ifndef _FILEOP_H >> #define _FILEOP_H >> +#include "qemu/osdep.h" >> #include <dirent.h> >> #include <utime.h> >> -#include <sys/uio.h> >> #include <sys/vfs.h> >> >> #define SM_LOCAL_MODE_BITS 0600 >> >> > > ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.7 1/2] 9p: don't include <sys/uio.h> 2016-06-30 12:42 ` Michael Fritscher @ 2016-06-30 12:54 ` Greg Kurz 0 siblings, 0 replies; 8+ messages in thread From: Greg Kurz @ 2016-06-30 12:54 UTC (permalink / raw) To: Michael Fritscher Cc: Cédric Le Goater, Aneesh Kumar K.V, qemu-devel, Greg Kurz On Thu, 30 Jun 2016 14:42:05 +0200 "Michael Fritscher" <michael@fritscher.net> wrote: > > On 04/13/2016 03:15 PM, Greg Kurz wrote: > >> The <sys/uio.h> system header doesn't exist on all host platforms. Code > >> should > >> include "qemu/osdep.h" instead to avoid build breaks on plafforms that > >> don't > >> define CONFIG_IOVEC (like win32, if it is to support 9p one day). > >> > >> Signed-off-by: Greg Kurz <gkurz@linux.vnet.ibm.com> > > > > Acked-by: Cédric Le Goater <clg@kaod.org> > Acked-by: Michael Fritscher <michael@fritscher.net> > > Yes, I still plan to upstream the win32 9p support in the next weeks, when > my stress level goes down a bit ;-) > Hi Michael ! FYI I'll be on a 1-month leave, starting 25th of July, during which I'm likely to be fully disconnected... Cheers. -- Greg > Best regards, > Michael Fritscher > > >> --- > >> fsdev/9p-iov-marshal.c | 1 - > >> fsdev/9p-marshal.c | 1 - > >> fsdev/file-op-9p.h | 2 +- > >> 3 files changed, 1 insertion(+), 3 deletions(-) > >> > >> diff --git a/fsdev/9p-iov-marshal.c b/fsdev/9p-iov-marshal.c > >> index fb40bdf0d5f6..a564637b73c1 100644 > >> --- a/fsdev/9p-iov-marshal.c > >> +++ b/fsdev/9p-iov-marshal.c > >> @@ -15,7 +15,6 @@ > >> #include <glib.h> > >> #include <glib/gprintf.h> > >> #include <utime.h> > >> -#include <sys/uio.h> > >> > >> #include "9p-iov-marshal.h" > >> #include "qemu/bswap.h" > >> diff --git a/fsdev/9p-marshal.c b/fsdev/9p-marshal.c > >> index 183d3667c681..df9d4f8e23c9 100644 > >> --- a/fsdev/9p-marshal.c > >> +++ b/fsdev/9p-marshal.c > >> @@ -16,7 +16,6 @@ > >> #include <glib/gprintf.h> > >> #include <dirent.h> > >> #include <utime.h> > >> -#include <sys/uio.h> > >> > >> #include "9p-marshal.h" > >> > >> diff --git a/fsdev/file-op-9p.h b/fsdev/file-op-9p.h > >> index b8c26024a955..8736d1fa6d52 100644 > >> --- a/fsdev/file-op-9p.h > >> +++ b/fsdev/file-op-9p.h > >> @@ -12,9 +12,9 @@ > >> */ > >> #ifndef _FILEOP_H > >> #define _FILEOP_H > >> +#include "qemu/osdep.h" > >> #include <dirent.h> > >> #include <utime.h> > >> -#include <sys/uio.h> > >> #include <sys/vfs.h> > >> > >> #define SM_LOCAL_MODE_BITS 0600 > >> > >> > > > > > > ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.7 1/2] 9p: don't include <sys/uio.h> 2016-04-13 13:15 ` [Qemu-devel] [PATCH for-2.7 1/2] 9p: don't include <sys/uio.h> Greg Kurz 2016-06-30 11:40 ` Cédric Le Goater @ 2016-06-30 12:57 ` Markus Armbruster 2016-06-30 13:07 ` Greg Kurz 1 sibling, 1 reply; 8+ messages in thread From: Markus Armbruster @ 2016-06-30 12:57 UTC (permalink / raw) To: Greg Kurz; +Cc: Aneesh Kumar K.V, qemu-devel, Michael Fritscher Greg Kurz <gkurz@linux.vnet.ibm.com> writes: > The <sys/uio.h> system header doesn't exist on all host platforms. Code should > include "qemu/osdep.h" instead to avoid build breaks on plafforms that don't > define CONFIG_IOVEC (like win32, if it is to support 9p one day). > > Signed-off-by: Greg Kurz <gkurz@linux.vnet.ibm.com> > --- > fsdev/9p-iov-marshal.c | 1 - > fsdev/9p-marshal.c | 1 - > fsdev/file-op-9p.h | 2 +- > 3 files changed, 1 insertion(+), 3 deletions(-) > > diff --git a/fsdev/9p-iov-marshal.c b/fsdev/9p-iov-marshal.c > index fb40bdf0d5f6..a564637b73c1 100644 > --- a/fsdev/9p-iov-marshal.c > +++ b/fsdev/9p-iov-marshal.c > @@ -15,7 +15,6 @@ > #include <glib.h> > #include <glib/gprintf.h> > #include <utime.h> > -#include <sys/uio.h> > > #include "9p-iov-marshal.h" > #include "qemu/bswap.h" > diff --git a/fsdev/9p-marshal.c b/fsdev/9p-marshal.c > index 183d3667c681..df9d4f8e23c9 100644 > --- a/fsdev/9p-marshal.c > +++ b/fsdev/9p-marshal.c > @@ -16,7 +16,6 @@ > #include <glib/gprintf.h> > #include <dirent.h> > #include <utime.h> > -#include <sys/uio.h> > > #include "9p-marshal.h" > > diff --git a/fsdev/file-op-9p.h b/fsdev/file-op-9p.h > index b8c26024a955..8736d1fa6d52 100644 > --- a/fsdev/file-op-9p.h > +++ b/fsdev/file-op-9p.h > @@ -12,9 +12,9 @@ > */ > #ifndef _FILEOP_H > #define _FILEOP_H > +#include "qemu/osdep.h" Every .c file must include qemu/osdep.h first. You can and should rely on that in headers. Please drop this include. > #include <dirent.h> > #include <utime.h> > -#include <sys/uio.h> > #include <sys/vfs.h> > > #define SM_LOCAL_MODE_BITS 0600 ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.7 1/2] 9p: don't include <sys/uio.h> 2016-06-30 12:57 ` Markus Armbruster @ 2016-06-30 13:07 ` Greg Kurz 0 siblings, 0 replies; 8+ messages in thread From: Greg Kurz @ 2016-06-30 13:07 UTC (permalink / raw) To: Markus Armbruster; +Cc: Michael Fritscher, Aneesh Kumar K.V, qemu-devel On Thu, 30 Jun 2016 14:57:58 +0200 Markus Armbruster <armbru@redhat.com> wrote: > Greg Kurz <gkurz@linux.vnet.ibm.com> writes: > > > The <sys/uio.h> system header doesn't exist on all host platforms. Code should > > include "qemu/osdep.h" instead to avoid build breaks on plafforms that don't > > define CONFIG_IOVEC (like win32, if it is to support 9p one day). > > > > Signed-off-by: Greg Kurz <gkurz@linux.vnet.ibm.com> > > --- > > fsdev/9p-iov-marshal.c | 1 - > > fsdev/9p-marshal.c | 1 - > > fsdev/file-op-9p.h | 2 +- > > 3 files changed, 1 insertion(+), 3 deletions(-) > > > > diff --git a/fsdev/9p-iov-marshal.c b/fsdev/9p-iov-marshal.c > > index fb40bdf0d5f6..a564637b73c1 100644 > > --- a/fsdev/9p-iov-marshal.c > > +++ b/fsdev/9p-iov-marshal.c > > @@ -15,7 +15,6 @@ > > #include <glib.h> > > #include <glib/gprintf.h> > > #include <utime.h> > > -#include <sys/uio.h> > > > > #include "9p-iov-marshal.h" > > #include "qemu/bswap.h" > > diff --git a/fsdev/9p-marshal.c b/fsdev/9p-marshal.c > > index 183d3667c681..df9d4f8e23c9 100644 > > --- a/fsdev/9p-marshal.c > > +++ b/fsdev/9p-marshal.c > > @@ -16,7 +16,6 @@ > > #include <glib/gprintf.h> > > #include <dirent.h> > > #include <utime.h> > > -#include <sys/uio.h> > > > > #include "9p-marshal.h" > > > > diff --git a/fsdev/file-op-9p.h b/fsdev/file-op-9p.h > > index b8c26024a955..8736d1fa6d52 100644 > > --- a/fsdev/file-op-9p.h > > +++ b/fsdev/file-op-9p.h > > @@ -12,9 +12,9 @@ > > */ > > #ifndef _FILEOP_H > > #define _FILEOP_H > > +#include "qemu/osdep.h" > > Every .c file must include qemu/osdep.h first. You can and should rely > on that in headers. Please drop this include. > Yeah I discovered that recently... I'll drop this include a fix .c files that need it. Thanks ! -- Greg > > #include <dirent.h> > > #include <utime.h> > > -#include <sys/uio.h> > > #include <sys/vfs.h> > > > > #define SM_LOCAL_MODE_BITS 0600 > ^ permalink raw reply [flat|nested] 8+ messages in thread
* [Qemu-devel] [PATCH for-2.7 2/2] 9p: some more cleanup in #include directives 2016-04-13 13:15 [Qemu-devel] [PATCH for-2.7 0/2] 9p: cleanup in #include directives Greg Kurz 2016-04-13 13:15 ` [Qemu-devel] [PATCH for-2.7 1/2] 9p: don't include <sys/uio.h> Greg Kurz @ 2016-04-13 13:15 ` Greg Kurz 1 sibling, 0 replies; 8+ messages in thread From: Greg Kurz @ 2016-04-13 13:15 UTC (permalink / raw) To: Aneesh Kumar K.V; +Cc: qemu-devel, Michael Fritscher The "9p-attr.h" header isn't needed by 9p synth and virtio 9p. While here, also drop last references to virtio from 9p synth since it is now transport agnostic code. Signed-off-by: Greg Kurz <gkurz@linux.vnet.ibm.com> --- hw/9pfs/9p-synth.c | 4 +--- hw/9pfs/virtio-9p-device.c | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/hw/9pfs/9p-synth.c b/hw/9pfs/9p-synth.c index f1475dfd6def..8e504130d94b 100644 --- a/hw/9pfs/9p-synth.c +++ b/hw/9pfs/9p-synth.c @@ -1,5 +1,5 @@ /* - * Virtio 9p synthetic file system support + * 9p synthetic file system support * * Copyright IBM, Corp. 2011 * @@ -13,9 +13,7 @@ */ #include "qemu/osdep.h" -#include "hw/virtio/virtio.h" #include "9p.h" -#include "9p-xattr.h" #include "fsdev/qemu-fsdev.h" #include "9p-synth.h" #include "qemu/rcu.h" diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c index a38850ee89da..74a3ccbcd1c5 100644 --- a/hw/9pfs/virtio-9p-device.c +++ b/hw/9pfs/virtio-9p-device.c @@ -17,7 +17,6 @@ #include "qemu/sockets.h" #include "virtio-9p.h" #include "fsdev/qemu-fsdev.h" -#include "9p-xattr.h" #include "coth.h" #include "hw/virtio/virtio-access.h" #include "qemu/iov.h" ^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2016-06-30 13:08 UTC | newest] Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2016-04-13 13:15 [Qemu-devel] [PATCH for-2.7 0/2] 9p: cleanup in #include directives Greg Kurz 2016-04-13 13:15 ` [Qemu-devel] [PATCH for-2.7 1/2] 9p: don't include <sys/uio.h> Greg Kurz 2016-06-30 11:40 ` Cédric Le Goater 2016-06-30 12:42 ` Michael Fritscher 2016-06-30 12:54 ` Greg Kurz 2016-06-30 12:57 ` Markus Armbruster 2016-06-30 13:07 ` Greg Kurz 2016-04-13 13:15 ` [Qemu-devel] [PATCH for-2.7 2/2] 9p: some more cleanup in #include directives Greg Kurz
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.