motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-06 01:03:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge commit 'df84f17' into HEAD

Browse source 
This merge fixes a semantic conflict with the trivial tree.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2019-10-26 15:36:22 +02:00
commit 673652a785
46 changed files with 2224 additions and 1034 deletions
Download patch file Download diff file Expand all files Collapse all files

4
hw/misc/tmp421.c
View file

@ -120,7 +120,7 @@ static void tmp421_get_temperature(Object *obj, Visitor *v, const char *name,
int tempid;
if (sscanf(name, "temperature%d", &tempid) != 1) {
error_setg(errp, "error reading %s: %m", name);
error_setg(errp, "error reading %s: %s", name, g_strerror(errno));
return;
}
@ -160,7 +160,7 @@ static void tmp421_set_temperature(Object *obj, Visitor *v, const char *name,
}
if (sscanf(name, "temperature%d", &tempid) != 1) {
error_setg(errp, "error reading %s: %m", name);
error_setg(errp, "error reading %s: %s", name, g_strerror(errno));
return;
}