commit 2e5b09fd0e766434962327db4678ce1cda0c7241
author Markus Armbruster <armbru@redhat.com> Tue Jul 09 17:20:52 2019 +0200
committer Markus Armbruster <armbru@redhat.com> Wed Aug 21 13:24:01 2019 +0200
tree 1c2e0a2e81925cbde794a98194f3683044660dd6
parent 17dc57990320edaad52ac9ea808be9719c91cea6

hw/core: Move cpu.c, cpu.h from qom/ to hw/core/

Suggested-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20190709152053.16670-2-armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
[Rebased onto merge commit 95a9457fd44; missed instances of qom/cpu.h
in comments replaced]

ui/cocoa.m

diff --git a/ui/cocoa.m b/ui/cocoa.m
index f023d51..f12e21d 100644
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -40,7 +40,7 @@
 #include "qemu/main-loop.h"
 #include "qemu/module.h"
 #include <Carbon/Carbon.h>
-#include "qom/cpu.h"
+#include "hw/core/cpu.h"
 
 #ifndef MAC_OS_X_VERSION_10_5
 #define MAC_OS_X_VERSION_10_5 1050