提交 a8f15a27 编写于 作者: D Daniel P. Berrange 提交者: Michael Tokarev

maint: remove double semicolons in many files

A number of source files have statements accidentally
terminated by a double semicolon - eg 'foo = bar;;'.
This is harmless but a mistake none the less.

The tcg/ia64/tcg-target.c file is whitelisted because
it has valid use of ';;' in a comment containing assembly
code.
Signed-off-by: NDaniel P. Berrange <berrange@redhat.com>
Reviewed-by: NMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: NMarkus Armbruster <armbru@redhat.com>
Signed-off-by: NMichael Tokarev <mjt@tls.msk.ru>
上级 fee562e9
...@@ -1454,7 +1454,7 @@ static int vhdx_create_new_metadata(BlockDriverState *bs, ...@@ -1454,7 +1454,7 @@ static int vhdx_create_new_metadata(BlockDriverState *bs,
uint32_t offset = 0; uint32_t offset = 0;
void *buffer = NULL; void *buffer = NULL;
void *entry_buffer; void *entry_buffer;
VHDXMetadataTableHeader *md_table;; VHDXMetadataTableHeader *md_table;
VHDXMetadataTableEntry *md_table_entry; VHDXMetadataTableEntry *md_table_entry;
/* Metadata entries */ /* Metadata entries */
......
...@@ -541,7 +541,7 @@ static void vexpress_common_init(MachineState *machine) ...@@ -541,7 +541,7 @@ static void vexpress_common_init(MachineState *machine)
{ {
VexpressMachineState *vms = VEXPRESS_MACHINE(machine); VexpressMachineState *vms = VEXPRESS_MACHINE(machine);
VexpressMachineClass *vmc = VEXPRESS_MACHINE_GET_CLASS(machine); VexpressMachineClass *vmc = VEXPRESS_MACHINE_GET_CLASS(machine);
VEDBoardInfo *daughterboard = vmc->daughterboard;; VEDBoardInfo *daughterboard = vmc->daughterboard;
DeviceState *dev, *sysctl, *pl041; DeviceState *dev, *sysctl, *pl041;
qemu_irq pic[64]; qemu_irq pic[64];
uint32_t sys_id; uint32_t sys_id;
...@@ -762,7 +762,7 @@ static void vexpress_a9_class_init(ObjectClass *oc, void *data) ...@@ -762,7 +762,7 @@ static void vexpress_a9_class_init(ObjectClass *oc, void *data)
mc->name = TYPE_VEXPRESS_A9_MACHINE; mc->name = TYPE_VEXPRESS_A9_MACHINE;
mc->desc = "ARM Versatile Express for Cortex-A9"; mc->desc = "ARM Versatile Express for Cortex-A9";
vmc->daughterboard = &a9_daughterboard;; vmc->daughterboard = &a9_daughterboard;
} }
static void vexpress_a15_class_init(ObjectClass *oc, void *data) static void vexpress_a15_class_init(ObjectClass *oc, void *data)
......
...@@ -323,7 +323,7 @@ uint32_t gic_acknowledge_irq(GICState *s, int cpu, MemTxAttrs attrs) ...@@ -323,7 +323,7 @@ uint32_t gic_acknowledge_irq(GICState *s, int cpu, MemTxAttrs attrs)
* for the case where this GIC supports grouping and the pending interrupt * for the case where this GIC supports grouping and the pending interrupt
* is in the wrong group. * is in the wrong group.
*/ */
irq = gic_get_current_pending_irq(s, cpu, attrs);; irq = gic_get_current_pending_irq(s, cpu, attrs);
if (irq >= GIC_MAXIRQ) { if (irq >= GIC_MAXIRQ) {
DPRINTF("ACK, no pending interrupt or it is hidden: %d\n", irq); DPRINTF("ACK, no pending interrupt or it is hidden: %d\n", irq);
......
...@@ -280,7 +280,7 @@ static void validate_numa_cpus(void) ...@@ -280,7 +280,7 @@ static void validate_numa_cpus(void)
bitmap_and(seen_cpus, seen_cpus, bitmap_and(seen_cpus, seen_cpus,
numa_info[i].node_cpu, MAX_CPUMASK_BITS); numa_info[i].node_cpu, MAX_CPUMASK_BITS);
error_report("CPU(s) present in multiple NUMA nodes: %s", error_report("CPU(s) present in multiple NUMA nodes: %s",
enumerate_cpus(seen_cpus, max_cpus));; enumerate_cpus(seen_cpus, max_cpus));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
bitmap_or(seen_cpus, seen_cpus, bitmap_or(seen_cpus, seen_cpus,
......
...@@ -659,7 +659,7 @@ static GuestFilesystemInfo *build_guest_fsinfo(char *guid, Error **errp) ...@@ -659,7 +659,7 @@ static GuestFilesystemInfo *build_guest_fsinfo(char *guid, Error **errp)
fs->mountpoint = g_strndup(mnt_point, len); fs->mountpoint = g_strndup(mnt_point, len);
} }
fs->type = g_strdup(fs_name); fs->type = g_strdup(fs_name);
fs->disk = build_guest_disk_info(guid, errp);; fs->disk = build_guest_disk_info(guid, errp);
free: free:
g_free(mnt_point); g_free(mnt_point);
return fs; return fs;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册