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

hmp: obsolete "info ioapic"

Browse Source 
Let's start to use "info pic" just like other platforms.  For now we
keep the command for a while so that old users can know what is the new
command to use.

Signed-off-by: Peter Xu <peterx@redhat.com>
Message-Id: <20171229073104.3810-6-peterx@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Peter Xu 2017-12-29 15:31:04 +08:00 committed by Paolo Bonzini
parent cce5405e0e
commit 0c8465440d
4 changed files with 2 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/i386/kvm/ioapic.c
View File

@ -112,15 +112,6 @@ static void kvm_ioapic_put(IOAPICCommonState *s)
} }
} }
void kvm_ioapic_dump_state(Monitor *mon, const QDict *qdict)
{
IOAPICCommonState *s = IOAPIC_COMMON(object_resolve_path("ioapic", NULL));
assert(s);
kvm_ioapic_get(s);
ioapic_print_redtbl(mon, s);
}
static void kvm_ioapic_reset(DeviceState *dev) static void kvm_ioapic_reset(DeviceState *dev)
{ {
IOAPICCommonState *s = IOAPIC_COMMON(dev); IOAPICCommonState *s = IOAPIC_COMMON(dev);

11
hw/intc/ioapic.c
View File

@ -234,17 +234,6 @@ void ioapic_eoi_broadcast(int vector)
} }
} }
void ioapic_dump_state(Monitor *mon, const QDict *qdict)
{
int i;
for (i = 0; i < MAX_IOAPICS; i++) {
if (ioapics[i] != 0) {
ioapic_print_redtbl(mon, ioapics[i]);
}
}
}
static uint64_t static uint64_t
ioapic_mem_read(void *opaque, hwaddr addr, unsigned int size) ioapic_mem_read(void *opaque, hwaddr addr, unsigned int size)
{ {

3
include/hw/i386/pc.h
View File

@ -154,9 +154,6 @@ int pic_get_output(DeviceState *d);
/* ioapic.c */ /* ioapic.c */
void kvm_ioapic_dump_state(Monitor *mon, const QDict *qdict);
void ioapic_dump_state(Monitor *mon, const QDict *qdict);
/* Global System Interrupts */ /* Global System Interrupts */
#define GSI_NUM_PINS IOAPIC_NUM_PINS #define GSI_NUM_PINS IOAPIC_NUM_PINS

8
target/i386/monitor.c
View File

@ -658,12 +658,8 @@ void hmp_info_local_apic(Monitor *mon, const QDict *qdict)
void hmp_info_io_apic(Monitor *mon, const QDict *qdict) void hmp_info_io_apic(Monitor *mon, const QDict *qdict)
{ {
if (kvm_irqchip_in_kernel() && monitor_printf(mon, "This command is obsolete and will be "
!kvm_irqchip_is_split()) { "removed soon. Please use 'info pic' instead.\n");
kvm_ioapic_dump_state(mon, qdict);
} else {
ioapic_dump_state(mon, qdict);
}
} }
SevInfo *qmp_query_sev(Error **errp) SevInfo *qmp_query_sev(Error **errp)