Commit e00ef747 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging 



* remotes/qmp-unstable/queue/qmp: (32 commits)
  qapi: Add missing null check to opts_start_struct()
  qapi: Clean up superfluous null check in qapi_dealloc_type_str()
  qapi: Clean up null checking in generated visitors
  qapi: Drop unused code in qapi-commands.py
  qapi: Drop nonsensical header guard in generated qapi-visit.c
  qapi: Fix licensing of scripts
  tests/qapi-schema: Cover flat union types
  tests/qapi-schema: Cover union types with base
  tests/qapi-schema: Cover complex types with base
  tests/qapi-schema: Cover anonymous union types
  tests/qapi-schema: Cover simple argument types
  tests/qapi-schema: Cover optional command arguments
  tests/qapi-schema: Actually check successful QMP command response
  monitor: Remove left-over code in do_info_profile.
  qerror: Improve QERR_DEVICE_NOT_ACTIVE message
  qmp: Check for returned data from __json_read in get_events
  dump: add 'query-dump-guest-memory-capability' command
  Define the architecture for compressed dump format
  dump: make kdump-compressed format available for 'dump-guest-memory'
  dump: add API to write dump pages
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 4a29420e b7745397

MAINTAINERS

+3 −3
Original line number Diff line number Diff line
@@ -726,7 +726,7 @@ F: vl.c 


Human Monitor (HMP)

M: Luiz Capitulino <lcapitulino@redhat.com>

S: Supported

S: Maintained

F: monitor.c

F: hmp.c

F: hmp-commands.hx
@@ -758,7 +758,7 @@ T: git git://github.com/bonzini/qemu.git nbd-next 
QAPI

M: Luiz Capitulino <lcapitulino@redhat.com>

M: Michael Roth <mdroth@linux.vnet.ibm.com>

S: Supported

S: Maintained

F: qapi/

T: git git://repo.or.cz/qemu/qmp-unstable.git queue/qmp
@@ -772,7 +772,7 @@ T: git git://repo.or.cz/qemu/qmp-unstable.git queue/qmp 


QMP

M: Luiz Capitulino <lcapitulino@redhat.com>

S: Supported

S: Maintained

F: qmp.c

F: monitor.c

F: qmp-commands.hx

configure

+54 −0
Original line number Diff line number Diff line
@@ -283,6 +283,8 @@ libusb="" 
usb_redir=""

glx=""

zlib="yes"

lzo="no"

snappy="no"

guest_agent=""

guest_agent_with_vss="no"

vss_win32_sdk=""
@@ -995,6 +997,10 @@ for opt do 
  ;;

  --disable-zlib-test) zlib="no"

  ;;

  --enable-lzo) lzo="yes"

  ;;

  --enable-snappy) snappy="yes"

  ;;

  --enable-guest-agent) guest_agent="yes"

  ;;

  --disable-guest-agent) guest_agent="no"
@@ -1289,6 +1295,8 @@ Advanced options (experts only): 
  --enable-libusb          enable libusb (for usb passthrough)

  --disable-usb-redir      disable usb network redirection support

  --enable-usb-redir       enable usb network redirection support

  --enable-lzo             enable the support of lzo compression library

  --enable-snappy          enable the support of snappy compression library

  --disable-guest-agent    disable building of the QEMU Guest Agent

  --enable-guest-agent     enable building of the QEMU Guest Agent

  --with-vss-sdk=SDK-path  enable Windows VSS support in QEMU Guest Agent
@@ -1659,6 +1667,42 @@ EOF 
fi

LIBS="$LIBS -lz"



##########################################

# lzo check



if test "$lzo" != "no" ; then

    cat > $TMPC << EOF

#include <lzo/lzo1x.h>

int main(void) { lzo_version(); return 0; }

EOF

    if compile_prog "" "-llzo2" ; then

        :

    else

        error_exit "lzo check failed" \

            "Make sure to have the lzo libs and headers installed."

    fi



    libs_softmmu="$libs_softmmu -llzo2"

fi



##########################################

# snappy check



if test "$snappy" != "no" ; then

    cat > $TMPC << EOF

#include <snappy-c.h>

int main(void) { snappy_max_compressed_length(4096); return 0; }

EOF

    if compile_prog "" "-lsnappy" ; then

        :

    else

        error_exit "snappy check failed" \

            "Make sure to have the snappy libs and headers installed."

    fi



    libs_softmmu="$libs_softmmu -lsnappy"

fi



##########################################

# libseccomp check
@@ -4045,6 +4089,8 @@ echo "TPM passthrough $tpm_passthrough" 
echo "QOM debugging     $qom_cast_debug"

echo "vhdx              $vhdx"

echo "Quorum            $quorum"

echo "lzo support       $lzo"

echo "snappy support    $snappy"



if test "$sdl_too_old" = "yes"; then

echo "-> Your SDL version is too old - please upgrade to have SDL support"
@@ -4368,6 +4414,14 @@ if test "$glx" = "yes" ; then 
  echo "GLX_LIBS=$glx_libs" >> $config_host_mak

fi



if test "$lzo" = "yes" ; then

  echo "CONFIG_LZO=y" >> $config_host_mak

fi



if test "$snappy" = "yes" ; then

  echo "CONFIG_SNAPPY=y" >> $config_host_mak

fi



if test "$libiscsi" = "yes" ; then

  echo "CONFIG_LIBISCSI=m" >> $config_host_mak

  if test "$libiscsi_version" = "1.4.0"; then

dump.c

+945 −15

File changed.

Preview size limit exceeded, changes collapsed.

hmp.c

+4 −1
Original line number Diff line number Diff line
@@ -1311,8 +1311,11 @@ void hmp_dump_guest_memory(Monitor *mon, const QDict *qdict) 
    const char *file = qdict_get_str(qdict, "filename");

    bool has_begin = qdict_haskey(qdict, "begin");

    bool has_length = qdict_haskey(qdict, "length");

    /* kdump-compressed format is not supported for HMP */

    bool has_format = false;

    int64_t begin = 0;

    int64_t length = 0;

    enum DumpGuestMemoryFormat dump_format = DUMP_GUEST_MEMORY_FORMAT_ELF;

    char *prot;



    if (has_begin) {
@@ -1325,7 +1328,7 @@ void hmp_dump_guest_memory(Monitor *mon, const QDict *qdict) 
    prot = g_strconcat("file:", file, NULL);



    qmp_dump_guest_memory(paging, prot, has_begin, begin, has_length, length,

                          &errp);

                          has_format, dump_format, &errp);

    hmp_handle_error(mon, &errp);

    g_free(prot);

}

include/qapi/qmp/qerror.h

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ void qerror_report_err(Error *err); 
    ERROR_CLASS_GENERIC_ERROR, "Device '%s' does not support hotplugging"



#define QERR_DEVICE_NOT_ACTIVE \

    ERROR_CLASS_DEVICE_NOT_ACTIVE, "Device '%s' has not been activated"

    ERROR_CLASS_DEVICE_NOT_ACTIVE, "No %s device has been activated"



#define QERR_DEVICE_NOT_ENCRYPTED \

    ERROR_CLASS_GENERIC_ERROR, "Device '%s' is not encrypted"