| Message ID | 20221220115709.18508-1-philmd@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | qom/object_interfaces: Fix QAPI headers included | expand |
On 12/20/22 03:57, Philippe Mathieu-Daudé wrote: > Since commit a0e61807a3 ("qapi: Remove QMP events and commands from > user-mode builds") we don't generate the "qapi-commands-qom.h" > header in a user-emulation-only build. > > Commit f375026606 ("qom: Factor out user_creatable_process_cmdline") > incorrectly added a dependency on this "qapi/qapi-commands-qom.h" > header (the QMP handlers are still defined in qom/qom-qmp-cmds.c). > Remove it, and add "qapi/qmp/qobject.h" which declares qobject_unref. > > Signed-off-by: Philippe Mathieu-Daudé<philmd@linaro.org> > --- > qom/object_interfaces.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c index f94b6c3193..7d31589b04 100644 --- a/qom/object_interfaces.c +++ b/qom/object_interfaces.c @@ -2,8 +2,8 @@ #include "qemu/cutils.h" #include "qapi/error.h" -#include "qapi/qapi-commands-qom.h" #include "qapi/qapi-visit-qom.h" +#include "qapi/qmp/qobject.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qerror.h" #include "qapi/qmp/qjson.h"
Since commit a0e61807a3 ("qapi: Remove QMP events and commands from user-mode builds") we don't generate the "qapi-commands-qom.h" header in a user-emulation-only build. Commit f375026606 ("qom: Factor out user_creatable_process_cmdline") incorrectly added a dependency on this "qapi/qapi-commands-qom.h" header (the QMP handlers are still defined in qom/qom-qmp-cmds.c). Remove it, and add "qapi/qmp/qobject.h" which declares qobject_unref. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- qom/object_interfaces.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)