| Message ID | 20200121110349.25842-8-philmd@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Cleanups around the 'current_machine' global variable | expand |
Philippe Mathieu-Daudé <philmd@redhat.com> writes: > The QEMU device API (qdev) relies on having the '/machine' > container always available. > > If it is missing, QEMU will later crash dereferencing a NULL > pointer, we will get a SEGV, open a debugger, look at the > backtrace, and figure out we messed with QOM. > Or we can use g_assert() which abort, displaying the filename > and line number, so we can quickly open our favorite IDE. > Prefer the later, to save time to developers. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > v2: New patch > --- > hw/core/qdev.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/hw/core/qdev.c b/hw/core/qdev.c > index 58e87d336d..d30cf6320b 100644 > --- a/hw/core/qdev.c > +++ b/hw/core/qdev.c > @@ -1143,6 +1143,7 @@ Object *qdev_get_machine(void) > > if (dev == NULL) { > dev = container_get(object_get_root(), "/machine"); > + g_assert(dev != NULL); > } > > return dev; container_get()'s contract promises it won't return null. I think the assertion belongs there instead.
diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 58e87d336d..d30cf6320b 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -1143,6 +1143,7 @@ Object *qdev_get_machine(void) if (dev == NULL) { dev = container_get(object_get_root(), "/machine"); + g_assert(dev != NULL); } return dev;
The QEMU device API (qdev) relies on having the '/machine' container always available. If it is missing, QEMU will later crash dereferencing a NULL pointer, we will get a SEGV, open a debugger, look at the backtrace, and figure out we messed with QOM. Or we can use g_assert() which abort, displaying the filename and line number, so we can quickly open our favorite IDE. Prefer the later, to save time to developers. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- v2: New patch --- hw/core/qdev.c | 1 + 1 file changed, 1 insertion(+)