diff options
| author | Paolo Bonzini | 2021-06-17 17:53:05 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2021-06-25 16:13:50 +0200 |
| commit | abc2f51144242e819fd7af69d3e7c199cc9d7004 (patch) | |
| tree | 25e547677cbc4c8e93dcbcc43d2bf729dfa91381 /include | |
| parent | machine: move common smp_parse code to caller (diff) | |
| download | qemu-abc2f51144242e819fd7af69d3e7c199cc9d7004.tar.gz qemu-abc2f51144242e819fd7af69d3e7c199cc9d7004.tar.xz qemu-abc2f51144242e819fd7af69d3e7c199cc9d7004.zip | |
machine: add error propagation to mc->smp_parse
Clean up the smp_parse functions to use Error** instead of exiting.
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20210617155308.928754-9-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/boards.h | 2 | ||||
| -rw-r--r-- | include/hw/i386/pc.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/include/hw/boards.h b/include/hw/boards.h index 87ae5cc300..0483d6af86 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -210,7 +210,7 @@ struct MachineClass { void (*reset)(MachineState *state); void (*wakeup)(MachineState *state); int (*kvm_type)(MachineState *machine, const char *arg); - void (*smp_parse)(MachineState *ms, QemuOpts *opts); + void (*smp_parse)(MachineState *ms, QemuOpts *opts, Error **errp); BlockInterfaceType block_default_type; int units_per_default_bus; diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 4c2ca6d36a..87294f2632 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -138,8 +138,6 @@ extern int fd_bootchk; void pc_acpi_smi_interrupt(void *opaque, int irq, int level); -void pc_smp_parse(MachineState *ms, QemuOpts *opts); - void pc_guest_info_init(PCMachineState *pcms); #define PCI_HOST_PROP_PCI_HOLE_START "pci-hole-start" |