Commit ddc01bf1 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'luiz/queue/qmp' into staging 

# By Wenchao Xia
# Via Luiz Capitulino
* luiz/queue/qmp:
  HMP: add sub command table to info
  HMP: move define of mon_cmds
  HMP: add infrastructure for sub command
  HMP: delete info handler
  HMP: add QDict to info callback handler
parents e387f99e 84c44613

hmp-commands.hx

+2 −1
Original line number Diff line number Diff line
@@ -1521,7 +1521,8 @@ ETEXI 
        .args_type  = "item:s?",

        .params     = "[subcommand]",

        .help       = "show various information about the system state",

        .mhandler.cmd = do_info,

        .mhandler.cmd = do_info_help,

        .sub_table = info_cmds,

    },



STEXI

hmp.c

+18 −18
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ static void hmp_handle_error(Monitor *mon, Error **errp) 
    }

}



void hmp_info_name(Monitor *mon)

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

{

    NameInfo *info;
@@ -42,7 +42,7 @@ void hmp_info_name(Monitor *mon) 
    qapi_free_NameInfo(info);

}



void hmp_info_version(Monitor *mon)

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

{

    VersionInfo *info;
@@ -55,7 +55,7 @@ void hmp_info_version(Monitor *mon) 
    qapi_free_VersionInfo(info);

}



void hmp_info_kvm(Monitor *mon)

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

{

    KvmInfo *info;
@@ -70,7 +70,7 @@ void hmp_info_kvm(Monitor *mon) 
    qapi_free_KvmInfo(info);

}



void hmp_info_status(Monitor *mon)

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

{

    StatusInfo *info;
@@ -89,7 +89,7 @@ void hmp_info_status(Monitor *mon) 
    qapi_free_StatusInfo(info);

}



void hmp_info_uuid(Monitor *mon)

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

{

    UuidInfo *info;
@@ -98,7 +98,7 @@ void hmp_info_uuid(Monitor *mon) 
    qapi_free_UuidInfo(info);

}



void hmp_info_chardev(Monitor *mon)

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

{

    ChardevInfoList *char_info, *info;
@@ -111,7 +111,7 @@ void hmp_info_chardev(Monitor *mon) 
    qapi_free_ChardevInfoList(char_info);

}



void hmp_info_mice(Monitor *mon)

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

{

    MouseInfoList *mice_list, *mouse;
@@ -131,7 +131,7 @@ void hmp_info_mice(Monitor *mon) 
    qapi_free_MouseInfoList(mice_list);

}



void hmp_info_migrate(Monitor *mon)

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

{

    MigrationInfo *info;

    MigrationCapabilityStatusList *caps, *cap;
@@ -209,7 +209,7 @@ void hmp_info_migrate(Monitor *mon) 
    qapi_free_MigrationCapabilityStatusList(caps);

}



void hmp_info_migrate_capabilities(Monitor *mon)

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

{

    MigrationCapabilityStatusList *caps, *cap;
@@ -228,13 +228,13 @@ void hmp_info_migrate_capabilities(Monitor *mon) 
    qapi_free_MigrationCapabilityStatusList(caps);

}



void hmp_info_migrate_cache_size(Monitor *mon)

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

{

    monitor_printf(mon, "xbzrel cache size: %" PRId64 " kbytes\n",

                   qmp_query_migrate_cache_size(NULL) >> 10);

}



void hmp_info_cpus(Monitor *mon)

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

{

    CpuInfoList *cpu_list, *cpu;
@@ -272,7 +272,7 @@ void hmp_info_cpus(Monitor *mon) 
    qapi_free_CpuInfoList(cpu_list);

}



void hmp_info_block(Monitor *mon)

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

{

    BlockInfoList *block_list, *info;
@@ -326,7 +326,7 @@ void hmp_info_block(Monitor *mon) 
    qapi_free_BlockInfoList(block_list);

}



void hmp_info_blockstats(Monitor *mon)

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

{

    BlockStatsList *stats_list, *stats;
@@ -360,7 +360,7 @@ void hmp_info_blockstats(Monitor *mon) 
    qapi_free_BlockStatsList(stats_list);

}



void hmp_info_vnc(Monitor *mon)

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

{

    VncInfo *info;

    Error *err = NULL;
@@ -406,7 +406,7 @@ out: 
    qapi_free_VncInfo(info);

}



void hmp_info_spice(Monitor *mon)

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

{

    SpiceChannelList *chan;

    SpiceInfo *info;
@@ -453,7 +453,7 @@ out: 
    qapi_free_SpiceInfo(info);

}



void hmp_info_balloon(Monitor *mon)

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

{

    BalloonInfo *info;

    Error *err = NULL;
@@ -570,7 +570,7 @@ static void hmp_info_pci_device(Monitor *mon, const PciDeviceInfo *dev) 
    }

}



void hmp_info_pci(Monitor *mon)

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

{

    PciInfoList *info_list, *info;

    Error *err = NULL;
@@ -593,7 +593,7 @@ void hmp_info_pci(Monitor *mon) 
    qapi_free_PciInfoList(info_list);

}



void hmp_info_block_jobs(Monitor *mon)

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

{

    BlockJobInfoList *list;

    Error *err = NULL;

hmp.h

+18 −18
Original line number Diff line number Diff line
@@ -18,24 +18,24 @@ 
#include "qapi-types.h"

#include "qapi/qmp/qdict.h"



void hmp_info_name(Monitor *mon);

void hmp_info_version(Monitor *mon);

void hmp_info_kvm(Monitor *mon);

void hmp_info_status(Monitor *mon);

void hmp_info_uuid(Monitor *mon);

void hmp_info_chardev(Monitor *mon);

void hmp_info_mice(Monitor *mon);

void hmp_info_migrate(Monitor *mon);

void hmp_info_migrate_capabilities(Monitor *mon);

void hmp_info_migrate_cache_size(Monitor *mon);

void hmp_info_cpus(Monitor *mon);

void hmp_info_block(Monitor *mon);

void hmp_info_blockstats(Monitor *mon);

void hmp_info_vnc(Monitor *mon);

void hmp_info_spice(Monitor *mon);

void hmp_info_balloon(Monitor *mon);

void hmp_info_pci(Monitor *mon);

void hmp_info_block_jobs(Monitor *mon);

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

hw/i8259.c

+2 −2
Original line number Diff line number Diff line
@@ -407,7 +407,7 @@ static void pic_init(PICCommonState *s) 
    qdev_init_gpio_in(&s->dev.qdev, pic_set_irq, 8);

}



void pic_info(Monitor *mon)

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

{

    int i;

    PICCommonState *s;
@@ -425,7 +425,7 @@ void pic_info(Monitor *mon) 
    }

}



void irq_info(Monitor *mon)

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

{

#ifndef DEBUG_IRQ_COUNT

    monitor_printf(mon, "irq statistic code not compiled.\n");

hw/lm32_pic.c

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ struct LM32PicState { 
typedef struct LM32PicState LM32PicState;



static LM32PicState *pic;

void lm32_do_pic_info(Monitor *mon)

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

{

    if (pic == NULL) {

        return;
@@ -49,7 +49,7 @@ void lm32_do_pic_info(Monitor *mon) 
            pic->im, pic->ip, pic->irq_state);

}



void lm32_irq_info(Monitor *mon)

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

{

    int i;

    uint32_t count;