From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56211) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bBQQv-0006vl-EZ for qemu-devel@nongnu.org; Fri, 10 Jun 2016 13:41:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bBQQt-0000ZI-Fm for qemu-devel@nongnu.org; Fri, 10 Jun 2016 13:41:24 -0400 From: Andrew Jones Date: Fri, 10 Jun 2016 19:40:27 +0200 Message-Id: <1465580427-13596-17-git-send-email-drjones@redhat.com> In-Reply-To: <1465580427-13596-1-git-send-email-drjones@redhat.com> References: <1465580427-13596-1-git-send-email-drjones@redhat.com> Subject: [Qemu-devel] [PATCH RFC 16/16] sysemu/cpus: bye, bye smp_cores, smp_threads List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, qemu-ppc@nongnu.org, qemu-arm@nongnu.org Cc: imammedo@redhat.com, ehabkost@redhat.com, pbonzini@redhat.com, peter.maydell@linaro.org, david@gibson.dropbear.id.au, dgibson@redhat.com, agraf@suse.de The smp_cores and smp_threads globals are no longer used. Vanish them. Signed-off-by: Andrew Jones --- hw/core/machine.c | 2 -- include/sysemu/cpus.h | 10 ---------- vl.c | 2 -- 3 files changed, 14 deletions(-) diff --git a/hw/core/machine.c b/hw/core/machine.c index 5427924d4c911..fdd28e5786685 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -529,8 +529,6 @@ static void machine_pre_init(MachineState *ms) }; machine_set_smp_parameters(ms); - smp_cores = ms->cores; - smp_threads = ms->threads; max_cpus = ms->maxcpus; smp_cpus = ms->cpus; diff --git a/include/sysemu/cpus.h b/include/sysemu/cpus.h index fe992a8946ed5..d3e19ca214564 100644 --- a/include/sysemu/cpus.h +++ b/include/sysemu/cpus.h @@ -27,16 +27,6 @@ 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 list_cpus(FILE *f, fprintf_function cpu_fprintf, const char *optarg); #endif diff --git a/vl.c b/vl.c index 843b7a9dff753..e73c66364932c 100644 --- a/vl.c +++ b/vl.c @@ -155,8 +155,6 @@ int win2k_install_hack = 0; int singlestep = 0; int smp_cpus = 1; int max_cpus = 1; -int smp_cores = 1; -int smp_threads = 1; int acpi_enabled = 1; int no_hpet = 0; int fd_bootchk = 1; -- 2.4.11