From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:41249) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvwXW-0004vd-5q for qemu-devel@nongnu.org; Thu, 17 Jan 2013 15:58:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TvwXN-00076B-8N for qemu-devel@nongnu.org; Thu, 17 Jan 2013 15:58:22 -0500 Received: from mx1.redhat.com ([209.132.183.28]:9893) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvwXN-00075V-0T for qemu-devel@nongnu.org; Thu, 17 Jan 2013 15:58:13 -0500 From: Eduardo Habkost Date: Thu, 17 Jan 2013 18:59:34 -0200 Message-Id: <1358456378-29248-9-git-send-email-ehabkost@redhat.com> In-Reply-To: <1358456378-29248-1-git-send-email-ehabkost@redhat.com> References: <1358456378-29248-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH for-1.4 08/12] cpus.h: Make constant smp_cores/smp_threads available on *-user List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, Anthony Liguori Cc: Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= The code that calculates the APIC ID will use smp_cores/smp_threads, so just define them as 1 on *-user to avoid #ifdefs in the code. Signed-off-by: Eduardo Habkost --- include/sysemu/cpus.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/sysemu/cpus.h b/include/sysemu/cpus.h index 81bd817..f7f6854 100644 --- a/include/sysemu/cpus.h +++ b/include/sysemu/cpus.h @@ -13,9 +13,16 @@ void cpu_synchronize_all_post_init(void); void qtest_clock_warp(int64_t dest); +#ifndef CONFIG_USER_ONLY /* vl.c */ extern int smp_cores; extern int smp_threads; +#else +/* *-user doesn't have configurable SMP topology */ +#define smp_cores 1 +#define smp_threads 1 +#endif + void set_numa_modes(void); void set_cpu_log(const char *optarg); void set_cpu_log_filename(const char *optarg); -- 1.7.11.7