From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>,
Greg Kurz <groug@kaod.org>,
David Gibson <david@gibson.dropbear.id.au>
Subject: [PULL 20/34] ppc: make Error **errp const where it is appropriate
Date: Tue, 17 Dec 2019 07:26:37 +0100 [thread overview]
Message-ID: <20191217062651.9687-21-armbru@redhat.com> (raw)
In-Reply-To: <20191217062651.9687-1-armbru@redhat.com>
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Mostly, Error ** is for returning error from the function, so the
callee sets it. However kvmppc_hint_smt_possible gets already filled
errp parameter. It doesn't change the pointer itself, only change the
internal state of referenced Error object. So we can make it Error
*const * errp, to stress the behavior. It will also help coccinelle
script (in future) to distinguish such cases from common errp usage.
While there, rename the function to
kvmppc_error_append_smt_possible_hint().
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Greg Kurz <groug@kaod.org>
Message-Id: <20191205174635.18758-8-vsementsov@virtuozzo.com>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[Commit message replaced]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
target/ppc/kvm_ppc.h | 4 ++--
hw/ppc/spapr.c | 2 +-
target/ppc/kvm.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/target/ppc/kvm_ppc.h b/target/ppc/kvm_ppc.h
index 98bd7d5da6..f22daabf51 100644
--- a/target/ppc/kvm_ppc.h
+++ b/target/ppc/kvm_ppc.h
@@ -28,7 +28,7 @@ void kvmppc_set_papr(PowerPCCPU *cpu);
int kvmppc_set_compat(PowerPCCPU *cpu, uint32_t compat_pvr);
void kvmppc_set_mpic_proxy(PowerPCCPU *cpu, int mpic_proxy);
int kvmppc_smt_threads(void);
-void kvmppc_hint_smt_possible(Error **errp);
+void kvmppc_error_append_smt_possible_hint(Error *const *errp);
int kvmppc_set_smt_threads(int smt);
int kvmppc_clear_tsr_bits(PowerPCCPU *cpu, uint32_t tsr_bits);
int kvmppc_or_tsr_bits(PowerPCCPU *cpu, uint32_t tsr_bits);
@@ -164,7 +164,7 @@ static inline int kvmppc_smt_threads(void)
return 1;
}
-static inline void kvmppc_hint_smt_possible(Error **errp)
+static inline void kvmppc_error_append_smt_possible_hint(Error *const *errp)
{
return;
}
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 3ae7db1563..c5d8f0afb6 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -2564,7 +2564,7 @@ static void spapr_set_vsmt_mode(SpaprMachineState *spapr, Error **errp)
" requires the use of VSMT mode %d.\n",
smp_threads, kvm_smt, spapr->vsmt);
}
- kvmppc_hint_smt_possible(&local_err);
+ kvmppc_error_append_smt_possible_hint(&local_err);
goto out;
}
}
diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
index c77f9848ec..27ea3ce535 100644
--- a/target/ppc/kvm.c
+++ b/target/ppc/kvm.c
@@ -2076,7 +2076,7 @@ int kvmppc_set_smt_threads(int smt)
return ret;
}
-void kvmppc_hint_smt_possible(Error **errp)
+void kvmppc_error_append_smt_possible_hint(Error *const *errp)
{
int i;
GString *g;
--
2.21.0
next prev parent reply other threads:[~2019-12-17 6:48 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-17 6:26 [PULL 00/34] Error reporting patches for 2019-12-16 Markus Armbruster
2019-12-17 6:26 ` [PULL 01/34] error: Fix -msg timestamp default Markus Armbruster
2019-12-17 6:26 ` [PULL 02/34] crypto: Fix certificate file error handling crash bug Markus Armbruster
2019-12-17 6:26 ` [PULL 03/34] crypto: Fix typo in QCryptoTLSSession's <example> comment Markus Armbruster
2019-12-17 6:26 ` [PULL 04/34] io: Fix Error usage in a comment <example> Markus Armbruster
2019-12-17 6:26 ` [PULL 05/34] tests: Clean up initialization of Error *err variables Markus Armbruster
2019-12-17 6:26 ` [PULL 06/34] exec: Fix file_ram_alloc() error API violations Markus Armbruster
2019-12-17 6:26 ` [PULL 07/34] hw/acpi: Fix legacy CPU plug " Markus Armbruster
2019-12-17 6:26 ` [PULL 08/34] hw/core: Fix fit_load_fdt() " Markus Armbruster
2019-12-17 6:26 ` [PULL 09/34] hw/ipmi: Fix realize() " Markus Armbruster
2019-12-17 6:26 ` [PULL 10/34] qga: Fix guest-get-fsinfo " Markus Armbruster
2019-12-17 6:26 ` [PULL 11/34] memory-device: Fix memory pre-plug " Markus Armbruster
2019-12-17 6:26 ` [PULL 12/34] error: Clean up unusual names of Error * variables Markus Armbruster
2019-12-17 6:26 ` [PULL 13/34] hw/intc/s390: Simplify error handling in kvm_s390_flic_realize() Markus Armbruster
2019-12-17 6:26 ` [PULL 14/34] tests-blockjob: Use error_free_or_abort() Markus Armbruster
2019-12-17 6:26 ` [PULL 15/34] net/net: Clean up variable shadowing in net_client_init() Markus Armbruster
2019-12-17 6:26 ` [PULL 16/34] error: make Error **errp const where it is appropriate Markus Armbruster
2019-12-17 6:26 ` [PULL 17/34] hmp: drop Error pointer indirection in hmp_handle_error Markus Armbruster
2019-12-17 6:26 ` [PULL 18/34] vnc: drop Error pointer indirection in vnc_client_io_error Markus Armbruster
2019-12-17 6:26 ` [PULL 19/34] qdev-monitor: make Error **errp const where it is appropriate Markus Armbruster
2019-12-17 6:26 ` Markus Armbruster [this message]
2019-12-17 6:26 ` [PULL 21/34] 9pfs: " Markus Armbruster
2019-12-17 6:26 ` [PULL 22/34] hw/core/qdev: cleanup Error ** variables Markus Armbruster
2019-12-17 6:26 ` [PULL 23/34] block/snapshot: rename Error ** parameter to more common errp Markus Armbruster
2019-12-17 6:26 ` [PULL 24/34] hw/i386/amd_iommu: " Markus Armbruster
2019-12-17 6:26 ` [PULL 25/34] qga: " Markus Armbruster
2019-12-17 6:26 ` [PULL 26/34] monitor/qmp-cmds: " Markus Armbruster
2019-12-17 6:26 ` [PULL 27/34] hw/s390x: " Markus Armbruster
2019-12-17 6:26 ` [PULL 28/34] hw/sd: drop extra whitespace in sdhci_sysbus_realize() header Markus Armbruster
2019-12-17 6:26 ` [PULL 29/34] hw/tpm: rename Error ** parameter to more common errp Markus Armbruster
2019-12-17 6:26 ` [PULL 30/34] hw/usb: " Markus Armbruster
2019-12-17 6:26 ` [PULL 31/34] include/qom/object.h: " Markus Armbruster
2019-12-17 6:26 ` [PULL 32/34] backends/cryptodev: drop local_err from cryptodev_backend_complete() Markus Armbruster
2019-12-17 6:26 ` [PULL 33/34] hw/vfio/ap: drop local_err from vfio_ap_realize Markus Armbruster
2019-12-17 6:26 ` [PULL 34/34] nbd: assert that Error** is not NULL in nbd_iter_channel_error Markus Armbruster
2019-12-17 13:09 ` Eric Blake
2019-12-18 7:31 ` Markus Armbruster
2019-12-18 8:46 ` Markus Armbruster
2019-12-17 15:49 ` [PULL 00/34] Error reporting patches for 2019-12-16 Peter Maydell
2019-12-18 7:35 ` Markus Armbruster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191217062651.9687-21-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=david@gibson.dropbear.id.au \
--cc=groug@kaod.org \
--cc=qemu-devel@nongnu.org \
--cc=vsementsov@virtuozzo.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).