starred/qemu-qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2026-02-04 02:24:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

error: Consistently name Error * objects err, and not errp

Browse Source 
This touches code in xen_enable_tpm() that is obviously wrong.  Since
I don't know how to fix it properly, I'm adding a FIXME there.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-ID: <20251119130855.105479-6-armbru@redhat.com>
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
This commit is contained in:
Markus Armbruster
2025-11-19 14:08:55 +01:00
parent a4cda04107
commit 19552884e4
5 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
block/crypto.c
View File

@@ -938,14 +938,14 @@ static void GRAPH_RDLOCK
block_crypto_amend_cleanup(BlockDriverState *bs)
{
BlockCrypto *crypto = bs->opaque;
Error *errp = NULL;
Error *err = NULL;
/* release exclusive read/write permissions to the underlying file */
crypto->updating_keys = false;
bdrv_child_refresh_perms(bs, bs->file, &errp);
bdrv_child_refresh_perms(bs, bs->file, &err);
if (errp) {
error_report_err(errp);
if (err) {
error_report_err(err);
}
}

8
hw/acpi/ghes.c
View File

@@ -564,7 +564,7 @@ int acpi_ghes_memory_errors(AcpiGhesState *ags, uint16_t source_id,
const uint8_t guid[] =
UUID_LE(0xA5BC1114, 0x6F64, 0x4EDE, 0xB8, 0x63, 0x3E, 0x83, \
0xED, 0x7C, 0x83, 0xB1);
Error *errp = NULL;
Error *err = NULL;
int data_length;
GArray *block;
@@ -584,12 +584,12 @@ int acpi_ghes_memory_errors(AcpiGhesState *ags, uint16_t source_id,
acpi_ghes_build_append_mem_cper(block, physical_address);
/* Report the error */
ghes_record_cper_errors(ags, block->data, block->len, source_id, &errp);
ghes_record_cper_errors(ags, block->data, block->len, source_id, &err);
g_array_free(block, true);
if (errp) {
error_report_err(errp);
if (err) {
error_report_err(err);
return -1;
}

16
hw/ppc/spapr.c
View File

@@ -2848,7 +2848,7 @@ static void spapr_machine_init(MachineState *machine)
int i;
MemoryRegion *sysmem = get_system_memory();
long load_limit, fw_size;
Error *errp = NULL;
Error *err = NULL;
NICInfo *nd;
if (!filename) {
@@ -2872,7 +2872,7 @@ static void spapr_machine_init(MachineState *machine)
/* Determine capabilities to run with */
spapr_caps_init(spapr);
kvmppc_check_papr_resize_hpt(&errp);
kvmppc_check_papr_resize_hpt(&err);
if (spapr->resize_hpt == SPAPR_RESIZE_HPT_DEFAULT) {
/*
* If the user explicitly requested a mode we should either
@@ -2880,10 +2880,10 @@ static void spapr_machine_init(MachineState *machine)
* it's not set explicitly, we reset our mode to something
* that works
*/
if (errp) {
if (err) {
spapr->resize_hpt = SPAPR_RESIZE_HPT_DISABLED;
error_free(errp);
errp = NULL;
error_free(err);
err = NULL;
} else {
spapr->resize_hpt = smc->resize_hpt_default;
}
@@ -2891,14 +2891,14 @@ static void spapr_machine_init(MachineState *machine)
assert(spapr->resize_hpt != SPAPR_RESIZE_HPT_DEFAULT);
if ((spapr->resize_hpt != SPAPR_RESIZE_HPT_DISABLED) && errp) {
if ((spapr->resize_hpt != SPAPR_RESIZE_HPT_DISABLED) && err) {
/*
* User requested HPT resize, but this host can't supply it. Bail out
*/
error_report_err(errp);
error_report_err(err);
exit(1);
}
error_free(errp);
error_free(err);
spapr->rma_size = spapr_rma_size(spapr, &error_fatal);

13
hw/xen/xen-pvh-common.c
View File

@@ -101,7 +101,7 @@ static void xen_create_virtio_mmio_devices(XenPVHMachineState *s)
#ifdef CONFIG_TPM
static void xen_enable_tpm(XenPVHMachineState *s)
{
Error *errp = NULL;
Error *err = NULL;
DeviceState *dev;
SysBusDevice *busdev;
@@ -111,8 +111,15 @@ static void xen_enable_tpm(XenPVHMachineState *s)
return;
}
dev = qdev_new(TYPE_TPM_TIS_SYSBUS);
object_property_set_link(OBJECT(dev), "tpmdev", OBJECT(be), &errp);
object_property_set_str(OBJECT(dev), "tpmdev", be->id, &errp);
/*
* FIXME This use of &err is is wrong. If both calls fail, the
* second will trip error_setv()'s assertion. If just one call
* fails, we leak an Error object. Setting the same property
* twice (first to a QOM path, then to an ID string) is almost
* certainly wrong, too.
*/
object_property_set_link(OBJECT(dev), "tpmdev", OBJECT(be), &err);
object_property_set_str(OBJECT(dev), "tpmdev", be->id, &err);
busdev = SYS_BUS_DEVICE(dev);
sysbus_realize_and_unref(busdev, &error_fatal);
sysbus_mmio_map(busdev, 0, s->cfg.tpm.base);

6
nbd/common.c
View File

@@ -282,10 +282,10 @@ void nbd_set_socket_send_buffer(QIOChannelSocket *sioc)
#ifdef UNIX_STREAM_SOCKET_SEND_BUFFER_SIZE
if (sioc->localAddr.ss_family == AF_UNIX) {
size_t size = UNIX_STREAM_SOCKET_SEND_BUFFER_SIZE;
Error *errp = NULL;
Error *err = NULL;
if (qio_channel_socket_set_send_buffer(sioc, size, &errp) < 0) {
warn_report_err(errp);
if (qio_channel_socket_set_send_buffer(sioc, size, &err) < 0) {
warn_report_err(err);
}
}
#endif /* UNIX_STREAM_SOCKET_SEND_BUFFER_SIZE */