[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/15] vl: Avoid unnecessary 'if' nesting
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 04/15] vl: Avoid unnecessary 'if' nesting |
Date: |
Wed, 14 Jan 2015 10:41:21 +0100 |
From: Eduardo Habkost <address@hidden>
Just a coding style change, to make other changes easier to review.
Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Andrew Jones <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
vl.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/vl.c b/vl.c
index 1a2da2b..56a17dd 100644
--- a/vl.c
+++ b/vl.c
@@ -1170,13 +1170,11 @@ static void smp_parse(QemuOpts *opts)
if (cpus == 0) {
cpus = cores * threads * sockets;
}
+ } else if (cores == 0) {
+ threads = threads > 0 ? threads : 1;
+ cores = cpus / (sockets * threads);
} else {
- if (cores == 0) {
- threads = threads > 0 ? threads : 1;
- cores = cpus / (sockets * threads);
- } else {
- threads = cpus / (cores * sockets);
- }
+ threads = cpus / (cores * sockets);
}
max_cpus = qemu_opt_get_number(opts, "maxcpus", 0);
--
1.8.3.1
- [Qemu-devel] [PULL 00/15] Misc patches for 2015-01-14, Paolo Bonzini, 2015/01/14
- [Qemu-devel] [PULL 02/15] vl.c: fix regression when reading machine type from config file, Paolo Bonzini, 2015/01/14
- [Qemu-devel] [PULL 03/15] 9pfs: changed to use event_notifier instead of qemu_pipe, Paolo Bonzini, 2015/01/14
- [Qemu-devel] [PULL 05/15] vl: fix max_cpus check, Paolo Bonzini, 2015/01/14
- [Qemu-devel] [PULL 08/15] target-i386: fix movntsd on big-endian hosts, Paolo Bonzini, 2015/01/14
- [Qemu-devel] [PULL 07/15] vl.c: fix regression when reading memory size from config file, Paolo Bonzini, 2015/01/14
- [Qemu-devel] [PULL 04/15] vl: Avoid unnecessary 'if' nesting,
Paolo Bonzini <=
- [Qemu-devel] [PULL 01/15] char: restore stdio echo on resume from suspend., Paolo Bonzini, 2015/01/14
- [Qemu-devel] [PULL 09/15] target-i386: do not memcpy in and out of xmm_regs, Paolo Bonzini, 2015/01/14
- [Qemu-devel] [PULL 10/15] qemu-common.h: optimise muldiv64 if int128 is available, Paolo Bonzini, 2015/01/14
- [Qemu-devel] [PULL 14/15] qemu-timer: rename timer_init to timer_init_tl, Paolo Bonzini, 2015/01/14
- [Qemu-devel] [PULL 15/15] cpus: consistently use QEMU_CLOCK_VIRTUAL_RT for icount_warp_rt timer, Paolo Bonzini, 2015/01/14
- [Qemu-devel] [PULL 13/15] scsi: fix cancellation when I/O was completed but DMA was not., Paolo Bonzini, 2015/01/14
- [Qemu-devel] [PULL 06/15] vl: Don't silently change topology when all -smp options were set, Paolo Bonzini, 2015/01/14
- [Qemu-devel] [PULL 11/15] hw/scsi/lsi53c895a: add support for additional diag / debug registers, Paolo Bonzini, 2015/01/14
- [Qemu-devel] [PULL 12/15] rules.mak: Fix module build, Paolo Bonzini, 2015/01/14
- Re: [Qemu-devel] [PULL 00/15] Misc patches for 2015-01-14, Peter Maydell, 2015/01/14