Commit b60a7726 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:
  Add HMP command "info memory-devices"
  qemu-socket: Eliminate silly QERR_ macros
  qemu-socket: Polish errors for connect() and listen() failure
  qemu-iotests: Test missing "driver" key for blockdev-add
  tests: add QMP input visitor test for unions with no discriminator
  qapi: dealloc visitor, implement visit_start_union
  qapi: add visit_start_union and visit_end_union
  virtio-balloon: fix integer overflow in memory stats feature
  monitor: Reset HMP mon->rs in CHR_EVENT_OPEN

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 70556264 a631892f

hmp-commands.hx

+2 −0
Original line number Diff line number Diff line
@@ -1778,6 +1778,8 @@ show qdev device model list 
show roms

@item info tpm

show the TPM device

@item info memory-devices

show the memory devices

@end table

ETEXI

hmp.c

+38 −0
Original line number Diff line number Diff line
@@ -1720,3 +1720,41 @@ void hmp_info_memdev(Monitor *mon, const QDict *qdict) 


    qapi_free_MemdevList(memdev_list);

}



void hmp_info_memory_devices(Monitor *mon, const QDict *qdict)

{

    Error *err = NULL;

    MemoryDeviceInfoList *info_list = qmp_query_memory_devices(&err);

    MemoryDeviceInfoList *info;

    MemoryDeviceInfo *value;

    PCDIMMDeviceInfo *di;



    for (info = info_list; info; info = info->next) {

        value = info->value;



        if (value) {

            switch (value->kind) {

            case MEMORY_DEVICE_INFO_KIND_DIMM:

                di = value->dimm;



                monitor_printf(mon, "Memory device [%s]: \"%s\"\n",

                               MemoryDeviceInfoKind_lookup[value->kind],

                               di->id ? di->id : "");

                monitor_printf(mon, "  addr: 0x%" PRIx64 "\n", di->addr);

                monitor_printf(mon, "  slot: %" PRId64 "\n", di->slot);

                monitor_printf(mon, "  node: %" PRId64 "\n", di->node);

                monitor_printf(mon, "  size: %" PRIu64 "\n", di->size);

                monitor_printf(mon, "  memdev: %s\n", di->memdev);

                monitor_printf(mon, "  hotplugged: %s\n",

                               di->hotplugged ? "true" : "false");

                monitor_printf(mon, "  hotpluggable: %s\n",

                               di->hotpluggable ? "true" : "false");

                break;

            default:

                break;

            }

        }

    }



    qapi_free_MemoryDeviceInfoList(info_list);

}

hmp.h

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ void hmp_cpu_add(Monitor *mon, const QDict *qdict); 
void hmp_object_add(Monitor *mon, const QDict *qdict);

void hmp_object_del(Monitor *mon, const QDict *qdict);

void hmp_info_memdev(Monitor *mon, const QDict *qdict);

void hmp_info_memory_devices(Monitor *mon, const QDict *qdict);

void object_add_completion(ReadLineState *rs, int nb_args, const char *str);

void object_del_completion(ReadLineState *rs, int nb_args, const char *str);

void device_add_completion(ReadLineState *rs, int nb_args, const char *str);

hw/virtio/virtio-balloon.c

+6 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ static void balloon_stats_destroy_timer(VirtIOBalloon *s) 
    }

}



static void balloon_stats_change_timer(VirtIOBalloon *s, int secs)

static void balloon_stats_change_timer(VirtIOBalloon *s, int64_t secs)

{

    timer_mod(s->stats_timer, qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + secs * 1000);

}
@@ -170,6 +170,11 @@ static void balloon_stats_set_poll_interval(Object *obj, struct Visitor *v, 
        return;

    }



    if (value > UINT_MAX) {

        error_setg(errp, "timer value is too big");

        return;

    }



    if (value == s->stats_poll_interval) {

        return;

    }

include/qapi/qmp/qerror.h

+0 −12
Original line number Diff line number Diff line
@@ -154,16 +154,4 @@ void qerror_report_err(Error *err); 
#define QERR_UNSUPPORTED \

    ERROR_CLASS_GENERIC_ERROR, "this feature or command is not currently supported"



#define QERR_SOCKET_CONNECT_FAILED \

    ERROR_CLASS_GENERIC_ERROR, "Failed to connect to socket"



#define QERR_SOCKET_LISTEN_FAILED \

    ERROR_CLASS_GENERIC_ERROR, "Failed to set socket to listening mode"



#define QERR_SOCKET_BIND_FAILED \

    ERROR_CLASS_GENERIC_ERROR, "Failed to bind socket"



#define QERR_SOCKET_CREATE_FAILED \

    ERROR_CLASS_GENERIC_ERROR, "Failed to create socket"



#endif /* QERROR_H */