| Message ID | 20230928125700.1504442-1-plabatut@google.com |
|---|---|
| State | New |
| Headers | show |
| Series | Fix compilation when UFFDIO_REGISTER is not set. | expand |
28.09.2023 15:56, Pierre Labatut wrote: > Signed-off-by: Pierre Labatut <plabatut@google.com> > --- > subprojects/libvhost-user/libvhost-user.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) I'm not sure how subprojects are handled here. Should we commit things to a subproject directly? This one does not seem to be wrapped at least, and has been in contrib/ before moving to subprojects/, so seems to be ok. > diff --git a/subprojects/libvhost-user/libvhost-user.c b/subprojects/libvhost-user/libvhost-user.c > index 0469a50101..d4a2eab883 100644 > --- a/subprojects/libvhost-user/libvhost-user.c > +++ b/subprojects/libvhost-user/libvhost-user.c > @@ -629,9 +629,9 @@ static bool > generate_faults(VuDev *dev) { > unsigned int i; > for (i = 0; i < dev->nregions; i++) { > +#ifdef UFFDIO_REGISTER > VuDevRegion *dev_region = &dev->regions[i]; > int ret; > -#ifdef UFFDIO_REGISTER > struct uffdio_register reg_struct; > > /* Applied to my trivial-patches tree, thank you! /mjt
On 10/2/23 13:56, Michael Tokarev wrote: > 28.09.2023 15:56, Pierre Labatut wrote: >> Signed-off-by: Pierre Labatut <plabatut@google.com> >> --- >> subprojects/libvhost-user/libvhost-user.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) > > I'm not sure how subprojects are handled here. Should we commit things > to a subproject directly? This one does not seem to be wrapped at least, > and has been in contrib/ before moving to subprojects/, so seems to be > ok. Yes, subprojects either are hosted directly in qemu.git (they're just a nested build system), or they replace a submodule and have a .wrap file (and then the patch won't apply). libvhost-user is of the former kind. Paolo
diff --git a/subprojects/libvhost-user/libvhost-user.c b/subprojects/libvhost-user/libvhost-user.c index 0469a50101..d4a2eab883 100644 --- a/subprojects/libvhost-user/libvhost-user.c +++ b/subprojects/libvhost-user/libvhost-user.c @@ -629,9 +629,9 @@ static bool generate_faults(VuDev *dev) { unsigned int i; for (i = 0; i < dev->nregions; i++) { +#ifdef UFFDIO_REGISTER VuDevRegion *dev_region = &dev->regions[i]; int ret; -#ifdef UFFDIO_REGISTER struct uffdio_register reg_struct; /*
Signed-off-by: Pierre Labatut <plabatut@google.com> --- subprojects/libvhost-user/libvhost-user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)