|
 |
d81766 |
From d832249687955a37538098ea2c18d14c49011b02 Mon Sep 17 00:00:00 2001
|
|
|
d81766 |
From: Markus Armbruster <armbru@redhat.com>
|
|
|
d81766 |
Date: Mon, 11 Aug 2014 07:54:35 +0200
|
|
|
d81766 |
Subject: [PATCH 01/24] exit when -no-kvm and vcpu count > 160
|
|
|
d81766 |
|
|
|
d81766 |
Message-id: <1407743689-13553-2-git-send-email-armbru@redhat.com>
|
|
|
d81766 |
Patchwork-id: 60504
|
|
|
d81766 |
O-Subject: [PATCH RHEV-7.1 qemu-kvm-rhev 01/15] exit when -no-kvm and vcpu count > 160
|
|
|
d81766 |
Bugzilla: 1118665
|
|
|
d81766 |
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
d81766 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
d81766 |
RH-Acked-by: Dr. David Alan Gilbert (git) <dgilbert@redhat.com>
|
|
|
d81766 |
|
|
|
d81766 |
From: Marcelo Tosatti <mtosatti@redhat.com>
|
|
|
d81766 |
|
|
|
d81766 |
Message-id: <20140506072044.GA25261@amt.cnet>
|
|
|
d81766 |
Patchwork-id: 58695
|
|
|
d81766 |
O-Subject: [RHEL7 qemu-kvm PATCH] exit when -no-kvm and vcpu count > 160
|
|
|
d81766 |
Bugzilla: 1076326
|
|
|
d81766 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
d81766 |
RH-Acked-by: Andrew Jones <drjones@redhat.com>
|
|
|
d81766 |
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
|
|
|
d81766 |
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
d81766 |
|
|
|
d81766 |
Exit when booting with -no-kvm and number of vcpus is
|
|
|
d81766 |
larger than 160.
|
|
|
d81766 |
|
|
|
d81766 |
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
|
|
|
d81766 |
BZ: 1076326
|
|
|
d81766 |
(cherry picked from commit bc949bc00c11f49ba6be7be5b4f1bfc7df93aad5)
|
|
|
d81766 |
|
|
|
d81766 |
Conflicts:
|
|
|
d81766 |
hw/i386/pc_piix.c
|
|
|
d81766 |
hw/i386/pc_q35.c
|
|
|
d81766 |
|
|
|
d81766 |
Conflicts because we ported upstream commit a0dba64 "pc: reduce
|
|
|
d81766 |
duplication, fix PIIX descriptions" to the RHEL machine types in
|
|
|
d81766 |
commit 04a7c6a "set model in PC_RHEL6_5_COMPAT for qemu32 VCPU
|
|
|
d81766 |
(RHEV-7.1 only)".
|
|
|
d81766 |
|
|
|
d81766 |
Original subject has become misleading. Since commit 9ba3cf5
|
|
|
d81766 |
"kvm-all: exit in case max vcpus exceeded", we exit just fine without
|
|
|
d81766 |
this patch. We still need it anyway, so that QMP command
|
|
|
d81766 |
query-machines returns the correct value 160 for member cpu-max,
|
|
|
d81766 |
instead of 255.
|
|
|
d81766 |
|
|
|
d81766 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
|
|
|
d81766 |
---
|
|
|
d81766 |
include/hw/i386/pc.h | 2 +-
|
|
|
d81766 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
d81766 |
|
|
|
d81766 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
d81766 |
---
|
|
|
d81766 |
include/hw/i386/pc.h | 2 +-
|
|
|
d81766 |
1 files changed, 1 insertions(+), 1 deletions(-)
|
|
|
d81766 |
|
|
|
d81766 |
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
|
|
|
d81766 |
index f4b9b2b..de46485 100644
|
|
|
d81766 |
--- a/include/hw/i386/pc.h
|
|
|
d81766 |
+++ b/include/hw/i386/pc.h
|
|
|
d81766 |
@@ -506,6 +506,6 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *);
|
|
|
d81766 |
#define PC_DEFAULT_MACHINE_OPTIONS \
|
|
|
d81766 |
PC_COMMON_MACHINE_OPTIONS, \
|
|
|
d81766 |
.hot_add_cpu = pc_hot_add_cpu, \
|
|
|
d81766 |
- .max_cpus = 255
|
|
|
d81766 |
+ .max_cpus = 160
|
|
|
d81766 |
|
|
|
d81766 |
#endif
|
|
|
d81766 |
--
|
|
|
d81766 |
1.7.1
|
|
|
d81766 |
|