Hi :) Have these patches been applied? How can I easily check it without manually checking if they are there in a git pullup? Am I notified normally when patches are applied?
With regards, Reinoud On Sun, Jul 18, 2021 at 03:46:48PM +0200, Reinoud Zandijk wrote: > This patchset fixes small NVMM accelerator compilation issues due to > changes made in the rest of Qemu since its import. > > Signed-off-by: Reinoud Zandijk <rein...@netbsd.org> > --- > > Reinoud Zandijk (2): > Only check CONFIG_NVMM when NEED_CPU_H is defined > Fix nvmm_ram_block_added() function arguments > > include/sysemu/nvmm.h | 7 ++++--- > target/i386/nvmm/nvmm-all.c | 5 +++-- > 2 files changed, 7 insertions(+), 5 deletions(-) > > -- > 2.31.1 On Sun, Jul 18, 2021 at 03:46:49PM +0200, Reinoud Zandijk wrote: > Userland targers will otherwise use a poisoned CONFIG_NVMM > > Signed-off-by: Reinoud Zandijk <rein...@netbsd.org> > --- > include/sysemu/nvmm.h | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/include/sysemu/nvmm.h b/include/sysemu/nvmm.h > index 6d216599b0..833670fccb 100644 > --- a/include/sysemu/nvmm.h > +++ b/include/sysemu/nvmm.h > @@ -10,8 +10,7 @@ > #ifndef QEMU_NVMM_H > #define QEMU_NVMM_H > > -#include "config-host.h" > -#include "qemu-common.h" > +#ifdef NEED_CPU_H > > #ifdef CONFIG_NVMM > > @@ -23,4 +22,6 @@ int nvmm_enabled(void); > > #endif /* CONFIG_NVMM */ > > -#endif /* CONFIG_NVMM */ > +#endif /* NEED_CPU_H */ > + > +#endif /* QEMU_NVMM_H */ > -- > 2.31.1 On Sun, Jul 18, 2021 at 03:46:50PM +0200, Reinoud Zandijk wrote: > A parameter max_size was added to the RAMBlockNotifier > ram_block_added function. Use the max_size for pre allocation > of hva space. > > Signed-off-by: Reinoud Zandijk <rein...@netbsd.org> > --- > target/i386/nvmm/nvmm-all.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/target/i386/nvmm/nvmm-all.c b/target/i386/nvmm/nvmm-all.c > index dfa690d65d..fdcd37ed3e 100644 > --- a/target/i386/nvmm/nvmm-all.c > +++ b/target/i386/nvmm/nvmm-all.c > @@ -1134,13 +1134,14 @@ static MemoryListener nvmm_memory_listener = { > }; > > static void > -nvmm_ram_block_added(RAMBlockNotifier *n, void *host, size_t size) > +nvmm_ram_block_added(RAMBlockNotifier *n, void *host, size_t size, > + size_t max_size) > { > struct nvmm_machine *mach = get_nvmm_mach(); > uintptr_t hva = (uintptr_t)host; > int ret; > > - ret = nvmm_hva_map(mach, hva, size); > + ret = nvmm_hva_map(mach, hva, max_size); > > if (ret == -1) { > error_report("NVMM: Failed to map HVA, HostVA:%p " > -- > 2.31.1