From 334ab475d2f27dbf6fbf836c2d4fb86dbb02a15c Mon Sep 17 00:00:00 2001 From: Jun Nakajima Date: Wed, 2 Feb 2011 23:49:59 -0800 Subject: x86: Add x86 support. Rebase the change (20906/1) due to a minor conflict. Change-Id: Ic73cca0fc6c6e5cf74f63daa6080d00aa7c392bb Signed-off-by: Xiaohui Xin Signed-off-by: Yunhong Jiang Signed-off-by: Jun Nakajima --- sysemu.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'sysemu.h') diff --git a/sysemu.h b/sysemu.h index 66414a3..0180dc0 100644 --- a/sysemu.h +++ b/sysemu.h @@ -52,7 +52,7 @@ int qemu_shutdown_requested(void); int qemu_reset_requested(void); int qemu_powerdown_requested(void); #ifdef NEED_CPU_H -#if !defined(TARGET_SPARC) && !defined(TARGET_I386) +#if !defined(TARGET_SPARC) // Please implement a power failure function to signal the OS #define qemu_system_powerdown() do{}while(0) #else @@ -216,12 +216,14 @@ typedef int (dev_match_fn)(void *dev_private, void *arg); void destroy_nic(dev_match_fn *match_fn, void *arg); void destroy_bdrvs(dev_match_fn *match_fn, void *arg); +#ifndef CONFIG_ANDROID /* pci-hotplug */ void pci_device_hot_add(Monitor *mon, const char *pci_addr, const char *type, const char *opts); void drive_hot_add(Monitor *mon, const char *pci_addr, const char *opts); void pci_device_hot_remove(Monitor *mon, const char *pci_addr); void pci_device_hot_remove_success(int pcibus, int slot); +#endif /* serial ports */ -- cgit v1.1