error: Move ERRP_GUARD() to the beginning of the function
include/qapi/error.h advises to put ERRP_GUARD() right at the beginning of the function, because only then can it guard the whole function. Clean up the few spots disregarding the advice. Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <20221121085054.683122-4-armbru@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
This commit is contained in:
parent
740d6c4eba
commit
05e385d2a9
@ -900,6 +900,7 @@ static qemu_irq armsse_get_common_irq_in(ARMSSE *s, int irqno)
|
||||
|
||||
static void armsse_realize(DeviceState *dev, Error **errp)
|
||||
{
|
||||
ERRP_GUARD();
|
||||
ARMSSE *s = ARM_SSE(dev);
|
||||
ARMSSEClass *asc = ARM_SSE_GET_CLASS(dev);
|
||||
const ARMSSEInfo *info = asc->info;
|
||||
@ -914,8 +915,6 @@ static void armsse_realize(DeviceState *dev, Error **errp)
|
||||
DeviceState *dev_splitter;
|
||||
uint32_t addr_width_max;
|
||||
|
||||
ERRP_GUARD();
|
||||
|
||||
if (!s->board_memory) {
|
||||
error_setg(errp, "memory property was not set");
|
||||
return;
|
||||
|
@ -554,12 +554,11 @@ static void machine_get_mem(Object *obj, Visitor *v, const char *name,
|
||||
static void machine_set_mem(Object *obj, Visitor *v, const char *name,
|
||||
void *opaque, Error **errp)
|
||||
{
|
||||
ERRP_GUARD();
|
||||
MachineState *ms = MACHINE(obj);
|
||||
MachineClass *mc = MACHINE_GET_CLASS(obj);
|
||||
MemorySizeConfiguration *mem;
|
||||
|
||||
ERRP_GUARD();
|
||||
|
||||
if (!visit_type_MemorySizeConfiguration(v, name, &mem, errp)) {
|
||||
return;
|
||||
}
|
||||
|
@ -963,6 +963,7 @@ static bool vhost_vdpa_svq_map_rings(struct vhost_dev *dev,
|
||||
struct vhost_vring_addr *addr,
|
||||
Error **errp)
|
||||
{
|
||||
ERRP_GUARD();
|
||||
DMAMap device_region, driver_region;
|
||||
struct vhost_vring_addr svq_addr;
|
||||
struct vhost_vdpa *v = dev->opaque;
|
||||
@ -971,7 +972,6 @@ static bool vhost_vdpa_svq_map_rings(struct vhost_dev *dev,
|
||||
size_t avail_offset;
|
||||
bool ok;
|
||||
|
||||
ERRP_GUARD();
|
||||
vhost_svq_get_vring_addr(svq, &svq_addr);
|
||||
|
||||
driver_region = (DMAMap) {
|
||||
|
@ -155,8 +155,8 @@ static void iothread_init_gcontext(IOThread *iothread)
|
||||
|
||||
static void iothread_set_aio_context_params(EventLoopBase *base, Error **errp)
|
||||
{
|
||||
IOThread *iothread = IOTHREAD(base);
|
||||
ERRP_GUARD();
|
||||
IOThread *iothread = IOTHREAD(base);
|
||||
|
||||
if (!iothread->ctx) {
|
||||
return;
|
||||
|
@ -474,9 +474,9 @@ static bool invoke_stats_cb(StatsCallbacks *entry,
|
||||
StatsFilter *filter, StatsRequest *request,
|
||||
Error **errp)
|
||||
{
|
||||
ERRP_GUARD();
|
||||
strList *targets = NULL;
|
||||
strList *names = NULL;
|
||||
ERRP_GUARD();
|
||||
|
||||
if (request) {
|
||||
if (request->provider != entry->provider) {
|
||||
@ -541,9 +541,9 @@ StatsSchemaList *qmp_query_stats_schemas(bool has_provider,
|
||||
StatsProvider provider,
|
||||
Error **errp)
|
||||
{
|
||||
ERRP_GUARD();
|
||||
StatsSchemaList *stats_results = NULL;
|
||||
StatsCallbacks *entry;
|
||||
ERRP_GUARD();
|
||||
|
||||
QTAILQ_FOREACH(entry, &stats_callbacks, next) {
|
||||
if (!has_provider || provider == entry->provider) {
|
||||
|
Loading…
Reference in New Issue
Block a user