david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

apic: move MAX_APICS check to 'apic' class

Browse Source 
MAX_APICS is only used by child 'apic' class and not
by its parent TYPE_APIC_COMMON or any other derived
class.

Move check into end user 'apic' class so it won't
get in the way of other APIC implementations
if they support more then MAX_APICS.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Radim Krčmář <rkrcmar@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Igor Mammedov 2016-05-05 17:14:37 +02:00 committed by Eduardo Habkost
parent 4d952914a0
commit 889211b18b
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/intc/apic.c
View File

@ -28,7 +28,9 @@
#include "trace.h" #include "trace.h"
#include "hw/i386/pc.h" #include "hw/i386/pc.h"
#include "hw/i386/apic-msidef.h" #include "hw/i386/apic-msidef.h"
#include "qapi/error.h"
#define MAX_APICS 255
#define MAX_APIC_WORDS 8 #define MAX_APIC_WORDS 8
#define SYNC_FROM_VAPIC 0x1 #define SYNC_FROM_VAPIC 0x1
@ -869,6 +871,14 @@ static const MemoryRegionOps apic_io_ops = {
static void apic_realize(DeviceState *dev, Error **errp) static void apic_realize(DeviceState *dev, Error **errp)
{ {
APICCommonState *s = APIC_COMMON(dev); APICCommonState *s = APIC_COMMON(dev);
static int apic_no;
if (apic_no >= MAX_APICS) {
error_setg(errp, "%s initialization failed.",
object_get_typename(OBJECT(dev)));
return;
}
s->idx = apic_no++;
memory_region_init_io(&s->io_memory, OBJECT(s), &apic_io_ops, s, "apic-msi", memory_region_init_io(&s->io_memory, OBJECT(s), &apic_io_ops, s, "apic-msi",
APIC_SPACE_SIZE); APIC_SPACE_SIZE);

8
hw/intc/apic_common.c
View File

@ -299,14 +299,6 @@ static void apic_common_realize(DeviceState *dev, Error **errp)
APICCommonState *s = APIC_COMMON(dev); APICCommonState *s = APIC_COMMON(dev);
APICCommonClass *info; APICCommonClass *info;
static DeviceState *vapic; static DeviceState *vapic;
static int apic_no;
if (apic_no >= MAX_APICS) {
error_setg(errp, "%s initialization failed.",
object_get_typename(OBJECT(dev)));
return;
}
s->idx = apic_no++;
info = APIC_COMMON_GET_CLASS(s); info = APIC_COMMON_GET_CLASS(s);
info->realize(dev, errp); info->realize(dev, errp);

4
include/hw/i386/apic_internal.h
View File

@ -121,8 +121,6 @@
#define VAPIC_ENABLE_BIT 0 #define VAPIC_ENABLE_BIT 0
#define VAPIC_ENABLE_MASK (1 << VAPIC_ENABLE_BIT) #define VAPIC_ENABLE_MASK (1 << VAPIC_ENABLE_BIT)
#define MAX_APICS 255
typedef struct APICCommonState APICCommonState; typedef struct APICCommonState APICCommonState;
#define TYPE_APIC_COMMON "apic-common" #define TYPE_APIC_COMMON "apic-common"
@ -176,7 +174,7 @@ struct APICCommonState {
uint32_t initial_count; uint32_t initial_count;
int64_t initial_count_load_time; int64_t initial_count_load_time;
int64_t next_time; int64_t next_time;
int idx; int idx; /* not actually common, used only by 'apic' derived class */
QEMUTimer *timer; QEMUTimer *timer;
int64_t timer_expiry; int64_t timer_expiry;
int sipi_vector; int sipi_vector;