From 5b009e400809523e71f1b72bdaa2b681e2a5b1c7 Mon Sep 17 00:00:00 2001 From: zhanghailiang Date: Tue, 4 Nov 2014 19:49:30 +0800 Subject: numa: make 'info numa' take into account hotplugged memory When do memory hotplug, if there is numa node, we should add the memory size to the corresponding node memory size. It affects the result of hmp command "info numa". Reviewed-by: Igor Mammedov Signed-off-by: zhanghailiang Signed-off-by: Michael Tokarev --- include/sysemu/sysemu.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 0037a695c1..50de1d36b1 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -161,6 +161,7 @@ typedef struct node_info { extern NodeInfo numa_info[MAX_NODES]; void set_numa_nodes(void); void set_numa_modes(void); +void query_numa_node_mem(uint64_t node_mem[]); extern QemuOptsList qemu_numa_opts; int numa_init_func(QemuOpts *opts, void *opaque); -- cgit v1.2.3-55-g7522 From 00c2275c95edb3c355fce7e1128bdef845b9fe34 Mon Sep 17 00:00:00 2001 From: Gonglei Date: Tue, 11 Nov 2014 17:37:59 +0800 Subject: sysbus: Correct SYSTEM_BUS(obj) defines Signed-off-by: Gonglei Reviewed-by: Markus Armbruster Signed-off-by: Michael Tokarev --- include/hw/sysbus.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/hw/sysbus.h b/include/hw/sysbus.h index 9fb1782d7b..9bddfdec42 100644 --- a/include/hw/sysbus.h +++ b/include/hw/sysbus.h @@ -10,7 +10,7 @@ #define QDEV_MAX_PIO 32 #define TYPE_SYSTEM_BUS "System" -#define SYSTEM_BUS(obj) OBJECT_CHECK(IDEBus, (obj), TYPE_IDE_BUS) +#define SYSTEM_BUS(obj) OBJECT_CHECK(BusState, (obj), TYPE_SYSTEM_BUS) typedef struct SysBusDevice SysBusDevice; -- cgit v1.2.3-55-g7522 From 705be728c0b5546da10d8ef4239a112d1616bb97 Mon Sep 17 00:00:00 2001 From: Fam Zheng Date: Mon, 10 Nov 2014 17:10:38 +0800 Subject: block: Fix comment for bdrv_co_get_block_status It returns more information than binary, fix the comment. Signed-off-by: Fam Zheng Reviewed-by: Max Reitz Reviewed-by: Markus Armbruster Signed-off-by: Michael Tokarev --- block.c | 6 +++--- include/block/block.h | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/block.c b/block.c index 88f6d9b236..5f5b244a98 100644 --- a/block.c +++ b/block.c @@ -3877,9 +3877,9 @@ typedef struct BdrvCoGetBlockStatusData { } BdrvCoGetBlockStatusData; /* - * Returns true iff the specified sector is present in the disk image. Drivers - * not implementing the functionality are assumed to not support backing files, - * hence all their sectors are reported as allocated. + * Returns the allocation status of the specified sectors. + * Drivers not implementing the functionality are assumed to not support + * backing files, hence all their sectors are reported as allocated. * * If 'sector_num' is beyond the end of the disk image the return value is 0 * and 'pnum' is set to 0. diff --git a/include/block/block.h b/include/block/block.h index 341054dcf7..603d4b4392 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -83,7 +83,9 @@ typedef enum { #define BDRV_SECTOR_SIZE (1ULL << BDRV_SECTOR_BITS) #define BDRV_SECTOR_MASK ~(BDRV_SECTOR_SIZE - 1) -/* BDRV_BLOCK_DATA: data is read from bs->file or another file +/* + * Allocation status flags + * BDRV_BLOCK_DATA: data is read from bs->file or another file * BDRV_BLOCK_ZERO: sectors read as zero * BDRV_BLOCK_OFFSET_VALID: sector stored in bs->file as raw data * BDRV_BLOCK_ALLOCATED: the content of the block is determined by this -- cgit v1.2.3-55-g7522