* [PATCH] Fix compilation when UFFDIO_REGISTER is not set.
@ 2023-09-28 12:56 Pierre Labatut
2023-10-02 11:56 ` Michael Tokarev
0 siblings, 1 reply; 3+ messages in thread
From: Pierre Labatut @ 2023-09-28 12:56 UTC (permalink / raw)
To: qemu-trivial
Cc: Pierre Labatut, Michael S. Tsirkin, open list:All patches CC here
Signed-off-by: Pierre Labatut <plabatut@google.com>
---
subprojects/libvhost-user/libvhost-user.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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;
/*
--
2.42.0.515.g380fc7ccd1-goog
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] Fix compilation when UFFDIO_REGISTER is not set.
2023-09-28 12:56 [PATCH] Fix compilation when UFFDIO_REGISTER is not set Pierre Labatut
@ 2023-10-02 11:56 ` Michael Tokarev
2023-10-02 16:56 ` Paolo Bonzini
0 siblings, 1 reply; 3+ messages in thread
From: Michael Tokarev @ 2023-10-02 11:56 UTC (permalink / raw)
To: Pierre Labatut, qemu-trivial
Cc: Michael S. Tsirkin, open list:All patches CC here
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
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] Fix compilation when UFFDIO_REGISTER is not set.
2023-10-02 11:56 ` Michael Tokarev
@ 2023-10-02 16:56 ` Paolo Bonzini
0 siblings, 0 replies; 3+ messages in thread
From: Paolo Bonzini @ 2023-10-02 16:56 UTC (permalink / raw)
To: Michael Tokarev, Pierre Labatut, qemu-trivial
Cc: Michael S. Tsirkin, open list:All patches CC here
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-10-02 16:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-28 12:56 [PATCH] Fix compilation when UFFDIO_REGISTER is not set Pierre Labatut
2023-10-02 11:56 ` Michael Tokarev
2023-10-02 16:56 ` Paolo Bonzini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).