geofft / qemu Goto Github PK

I have attached a diff created with git format-patch that with this repo rebased on top of 2.7.0.

Here are the changes I had to make:

• Monitor.c has been restructured a bit in QEMU, so that the changes in the first two commits now belong in i386-target/monitor.c. This required declaring pg_info in include/monitor/hmp-target.h and making it non-static.
• The data structure that define monitor commands, their help text, etc. has been moved to hmp-commands-info.hx which uses some sort of macro language. It was not hard to port the changes.

IIRC, everything else remained the same.

It compiles and runs for me, and info pg seems to work, but I am not super familiar with the QEMU codebase or these patches, so please look them over.

I think the original committer info got clobbered in the patch file. My git-foo is not quite strong enough to know what to do about that.

6.828-2.7.0.patch.txt

Hi，we build a docker with Ubuntu 20.04 and try to make the newest version qemu in this docker，but it meet an error：
util/memfd.c:40:12: error: static declaration of 'memfd_create' follows non-static declaration 40 | static int memfd_create(const char *name, unsigned int flags) | ^~~~~~~~~~~~ In file included from /usr/include/x86_64-linux-gnu/bits/mman-linux.h:113, from /usr/include/x86_64-linux-gnu/bits/mman.h:34, from /usr/include/x86_64-linux-gnu/sys/mman.h:41, from /root/qemu/qemu/include/sysemu/os-posix.h:29, from /root/qemu/qemu/include/qemu/osdep.h:104, from util/memfd.c:28: /usr/include/x86_64-linux-gnu/bits/mman-shared.h:50:5: note: previous declaration of 'memfd_create' was here 50 | int memfd_create (const char *__name, unsigned int __flags) __THROW; | ^~~~~~~~~~~~ make: *** [/root/qemu/qemu/rules.mak:69: util/memfd.o] Error 1 make: *** Waiting for unfinished jobs....

While compiling the '6.828-2.4.0' branch on an updated Archlinux installation, I encountered the following error:

vl.c: In function ‘main’:
vl.c:2989:5: error: ‘g_mem_set_vtable’ is deprecated [-Werror=deprecated-declarations]
     g_mem_set_vtable(&mem_trace);
     ^
In file included from /usr/include/glib-2.0/glib/glist.h:32:0,
                 from /usr/include/glib-2.0/glib/ghash.h:33,
                 from /usr/include/glib-2.0/glib.h:50,
                 from vl.c:59:
/usr/include/glib-2.0/glib/gmem.h:357:7: note: declared here
 void  g_mem_set_vtable (GMemVTable *vtable);
       ^
cc1: all warnings being treated as errors
/home/xkx/workspace/qemu/rules.mak:57: recipe for target 'vl.o' failed
make: *** [vl.o] Error 1

gcc -v gives:

gcc -v
Using built-in specs.
COLLECT_GCC=gcc
COLLECT_LTO_WRAPPER=/usr/lib/gcc/x86_64-unknown-linux-gnu/5.3.0/lto-wrapper
Target: x86_64-unknown-linux-gnu
Configured with: /build/gcc-multilib/src/gcc-5.3.0/configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --mandir=/usr/share/man --infodir=/usr/share/info --with-bugurl=https://bugs.archlinux.org/ --enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ --enable-shared --enable-threads=posix --enable-libmpx --with-system-zlib --with-isl --enable-__cxa_atexit --disable-libunwind-exceptions --enable-clocale=gnu --disable-libstdcxx-pch --disable-libssp --enable-gnu-unique-object --enable-linker-build-id --enable-lto --enable-plugin --enable-install-libiberty --with-linker-hash-style=gnu --enable-gnu-indirect-function --enable-multilib --disable-werror --enable-checking=release
Thread model: posix
gcc version 5.3.0 (GCC)

Any ideas as to how to fix it?

Regards,

xkxx