Skip to contentSkip to conversation

nseries: Don't use qemu_hw_version()

PATCH In review Eduardo Habkost 3 participants 4 messages Nov 11, 2015 – Nov 20, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 nseries: Don't use qemu_hw_version()

nseries doesn't use qemu_set_hw_version() and doesn't need the compatibility magic of qemu_hw_version(). Use QEMU_VERSION directly.

---
 hw/arm/nseries.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/arm/nseries.c +1 -1
index 2a8835e..f1eab73 100644
@@ -1275,7 +1275,7 @@ static int n8x0_atag_setup(void *p, int model)
     strcpy((void *) w, "hw-build");		/* char component[12] */
     w += 6;
     strcpy((void *) w, "QEMU ");
-    pstrcat((void *) w, 12, qemu_hw_version()); /* char version[12] */
+    pstrcat((void *) w, 12, QEMU_VERSION); /* char version[12] */
     w += 6;
 
     tag = (model == 810) ? "1.1.10-qemu" : "1.1.6-qemu";
Signature · 1 line
2.1.0
#1 lore raw
Quoted 5 lines · Eduardo Habkost

nseries doesn't use qemu_set_hw_version() and doesn't need the compatibility magic of qemu_hw_version(). Use QEMU_VERSION directly.

This looks very wrong.
We should be reducing the users of QEMU_VERSION,
not adding more.

Quoted 19 lines
---
 hw/arm/nseries.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/arm/nseries.c +1 -1
index 2a8835e..f1eab73 100644
@@ -1275,7 +1275,7 @@ static int n8x0_atag_setup(void *p, int model)
     strcpy((void *) w, "hw-build");		/* char component[12] */
     w += 6;
     strcpy((void *) w, "QEMU ");
-    pstrcat((void *) w, 12, qemu_hw_version()); /* char version[12] */
+    pstrcat((void *) w, 12, QEMU_VERSION); /* char version[12] */
     w += 6;
 
     tag = (model == 810) ? "1.1.10-qemu" : "1.1.6-qemu";
Signature · 1 line
2.1.0
#2 lore raw
Quoted 10 lines · Michael S. Tsirkin
Quoted 5 lines · Eduardo Habkost

nseries doesn't use qemu_set_hw_version() and doesn't need the compatibility magic of qemu_hw_version(). Use QEMU_VERSION directly.

This looks very wrong.
We should be reducing the users of QEMU_VERSION,
not adding more.

I would like to hear from the users and maintainers of the nseries machines, to judge this. I assume they don't need ABI compatibility betweeen QEMU versions, and maybe they want to know the QEMU version they are running.

Signature · 1 line
Eduardo
#3 lore raw
Quoted 8 lines · Eduardo Habkost
Quoted 7 lines · Michael S. Tsirkin
Quoted 5 lines · Eduardo Habkost

nseries doesn't use qemu_set_hw_version() and doesn't need the compatibility magic of qemu_hw_version(). Use QEMU_VERSION directly.

Quoted 8 lines
Quoted 3 lines

This looks very wrong.
We should be reducing the users of QEMU_VERSION,
not adding more.

I would like to hear from the users and maintainers of the nseries machines, to judge this. I assume they don't need ABI compatibility betweeen QEMU versions, and maybe they want to know the QEMU version they are running.

I suspect you won't find many users or maintainers on this list (or anywhere else). My guess is that this was useful for when Nokia were actively shipping an SDK that used QEMU (because then they could surface the QEMU and other component version information to SDK end-users and get better bug reports and so on as a result), but that anybody still using upstream QEMU to emulate an n-series device is capable of reporting what QEMU version they're using without having to have it reported via a dialog box inside the guest :-)

thanks
-- PMM