Am 7. Januar 2023 23:48:52 UTC schrieb Mark Cave-Ayland
<mark.cave-ayl...@ilande.co.uk>:
>On 05/01/2023 14:32, Bernhard Beschow wrote:
>
>> Now that PIIX4 also uses the "proxy-pic", both implementations
>
>Should "proxy-pic" be replaced with "isa-pic" (or even TYPE_ISA_PIC) here?
Yes, indeed.
Best regards,
Bernhard
>> can share the same struct.
>>
>> Signed-off-by: Bernhard Beschow <shen...@gmail.com>
>> Reviewed-by: Michael S. Tsirkin <m...@redhat.com>
>> Message-Id: <20221022150508.26830-34-shen...@gmail.com>
>> ---
>> hw/isa/piix4.c | 51 +++++++++++++++-----------------------------------
>> 1 file changed, 15 insertions(+), 36 deletions(-)
>>
>> diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c
>> index eae4db0182..ce88377630 100644
>> --- a/hw/isa/piix4.c
>> +++ b/hw/isa/piix4.c
>> @@ -42,32 +42,10 @@
>> #include "sysemu/runstate.h"
>> #include "qom/object.h"
>> -struct PIIX4State {
>> - PCIDevice dev;
>> -
>> - ISAPICState pic;
>> - RTCState rtc;
>> - PCIIDEState ide;
>> - UHCIState uhci;
>> - PIIX4PMState pm;
>> -
>> - uint32_t smb_io_base;
>> -
>> - /* Reset Control Register */
>> - MemoryRegion rcr_mem;
>> - uint8_t rcr;
>> -
>> - bool has_acpi;
>> - bool has_usb;
>> - bool smm_enabled;
>> -};
>> -
>> -OBJECT_DECLARE_SIMPLE_TYPE(PIIX4State, PIIX4_PCI_DEVICE)
>> -
>> static void piix4_set_irq(void *opaque, int irq_num, int level)
>> {
>> int i, pic_irq, pic_level;
>> - PIIX4State *s = opaque;
>> + PIIXState *s = opaque;
>> PCIBus *bus = pci_get_bus(&s->dev);
>> /* now we change the pic irq level according to the piix irq
>> mappings */
>> @@ -87,7 +65,7 @@ static void piix4_set_irq(void *opaque, int irq_num, int
>> level)
>> static void piix4_isa_reset(DeviceState *dev)
>> {
>> - PIIX4State *d = PIIX4_PCI_DEVICE(dev);
>> + PIIXState *d = PIIX_PCI_DEVICE(dev);
>> uint8_t *pci_conf = d->dev.config;
>> pci_conf[0x04] = 0x07; // master, memory and I/O
>> @@ -122,12 +100,13 @@ static void piix4_isa_reset(DeviceState *dev)
>> pci_conf[0xac] = 0x00;
>> pci_conf[0xae] = 0x00;
>> + d->pic_levels = 0; /* not used in PIIX4 */
>> d->rcr = 0;
>> }
>> static int piix4_post_load(void *opaque, int version_id)
>> {
>> - PIIX4State *s = opaque;
>> + PIIXState *s = opaque;
>> if (version_id == 2) {
>> s->rcr = 0;
>> @@ -142,8 +121,8 @@ static const VMStateDescription vmstate_piix4 = {
>> .minimum_version_id = 2,
>> .post_load = piix4_post_load,
>> .fields = (VMStateField[]) {
>> - VMSTATE_PCI_DEVICE(dev, PIIX4State),
>> - VMSTATE_UINT8_V(rcr, PIIX4State, 3),
>> + VMSTATE_PCI_DEVICE(dev, PIIXState),
>> + VMSTATE_UINT8_V(rcr, PIIXState, 3),
>> VMSTATE_END_OF_LIST()
>> }
>> };
>> @@ -151,7 +130,7 @@ static const VMStateDescription vmstate_piix4 = {
>> static void piix4_rcr_write(void *opaque, hwaddr addr, uint64_t val,
>> unsigned int len)
>> {
>> - PIIX4State *s = opaque;
>> + PIIXState *s = opaque;
>> if (val & 4) {
>> qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);
>> @@ -163,7 +142,7 @@ static void piix4_rcr_write(void *opaque, hwaddr addr,
>> uint64_t val,
>> static uint64_t piix4_rcr_read(void *opaque, hwaddr addr, unsigned int
>> len)
>> {
>> - PIIX4State *s = opaque;
>> + PIIXState *s = opaque;
>> return s->rcr;
>> }
>> @@ -180,7 +159,7 @@ static const MemoryRegionOps piix4_rcr_ops = {
>> static void piix4_realize(PCIDevice *dev, Error **errp)
>> {
>> - PIIX4State *s = PIIX4_PCI_DEVICE(dev);
>> + PIIXState *s = PIIX_PCI_DEVICE(dev);
>> PCIBus *pci_bus = pci_get_bus(dev);
>> ISABus *isa_bus;
>> @@ -250,7 +229,7 @@ static void piix4_realize(PCIDevice *dev, Error **errp)
>> static void piix4_init(Object *obj)
>> {
>> - PIIX4State *s = PIIX4_PCI_DEVICE(obj);
>> + PIIXState *s = PIIX_PCI_DEVICE(obj);
>> object_initialize_child(obj, "pic", &s->pic, TYPE_ISA_PIC);
>> object_initialize_child(obj, "rtc", &s->rtc, TYPE_MC146818_RTC);
>> @@ -258,10 +237,10 @@ static void piix4_init(Object *obj)
>> }
>> static Property piix4_props[] = {
>> - DEFINE_PROP_UINT32("smb_io_base", PIIX4State, smb_io_base, 0),
>> - DEFINE_PROP_BOOL("has-acpi", PIIX4State, has_acpi, true),
>> - DEFINE_PROP_BOOL("has-usb", PIIX4State, has_usb, true),
>> - DEFINE_PROP_BOOL("smm-enabled", PIIX4State, smm_enabled, false),
>> + DEFINE_PROP_UINT32("smb_io_base", PIIXState, smb_io_base, 0),
>> + DEFINE_PROP_BOOL("has-acpi", PIIXState, has_acpi, true),
>> + DEFINE_PROP_BOOL("has-usb", PIIXState, has_usb, true),
>> + DEFINE_PROP_BOOL("smm-enabled", PIIXState, smm_enabled, false),
>> DEFINE_PROP_END_OF_LIST(),
>> };
>> @@ -289,7 +268,7 @@ static void piix4_class_init(ObjectClass *klass, void
>> *data)
>> static const TypeInfo piix4_info = {
>> .name = TYPE_PIIX4_PCI_DEVICE,
>> .parent = TYPE_PCI_DEVICE,
>> - .instance_size = sizeof(PIIX4State),
>> + .instance_size = sizeof(PIIXState),
>> .instance_init = piix4_init,
>> .class_init = piix4_class_init,
>> .interfaces = (InterfaceInfo[]) {
>
>
>ATB,
>
>Mark.