aboutsummaryrefslogtreecommitdiff
path: root/ui
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2019-08-22 10:31:21 +0100
committerPeter Maydell <peter.maydell@linaro.org>2019-08-22 10:31:21 +0100
commitf3b8f18ebf344ab359e8f79f6ed777e740dae77c (patch)
tree3d85ef8664cbca8be4026ed953ddfd59b8d50687 /ui
parentfe066b4848bab4f9365a419f3c8ba59ccecf67c0 (diff)
parenteb707eac58dfc2d17281f67dde40cab3b8b26cc0 (diff)
downloadqemu-f3b8f18ebf344ab359e8f79f6ed777e740dae77c.zip
qemu-f3b8f18ebf344ab359e8f79f6ed777e740dae77c.tar.gz
qemu-f3b8f18ebf344ab359e8f79f6ed777e740dae77c.tar.bz2
Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2019-08-21' into staging
Monitor patches for 2019-08-21 # gpg: Signature made Wed 21 Aug 2019 16:35:07 BST # gpg: using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653 # gpg: issuer "armbru@redhat.com" # gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full] # gpg: aka "Markus Armbruster <armbru@pond.sub.org>" [full] # Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653 * remotes/armbru/tags/pull-monitor-2019-08-21: monitor/qmp: Update comment for commit 4eaca8de268 qdev: Collect HMP handlers command handlers in qdev-monitor.c qapi: Move query-target from misc.json to machine.json hw/core: Move cpu.c, cpu.h from qom/ to hw/core/ Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui')
-rw-r--r--ui/cocoa.m2
1 files changed, 1 insertions, 1 deletions
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