hw: Convert various reset() handler to DeviceReset
v3 cover hw: Convert various reset() handler to DeviceReset
Only patch 3/8 is missing review:
- hw/ide/piix: Convert reset handler to DeviceReset
Since v2:
- Fixed PIIX_IDE conversion (Li)
- Added more R-b tag.
Since v1:
- Removed the pci-host devices
- Removed the vmcoreinfo conversion (elmarco) but add a comment.
- Added Igor's R-b tag.
Following the thread discussion between Peter/Markus/Damien about reset handlers:
https://www.mail-archive.com/[email protected]/msg617103.html
I started to remove qemu_register_reset() calls from few qdevified devices (the trivial ones).
Regards,
Phil.
v2: https://lists.gnu.org/archive/html/qemu-devel/2019-10/msg01677.html
v1: https://lists.gnu.org/archive/html/qemu-devel/2019-09/msg06367.html
Philippe Mathieu-Daudé (8):
hw/acpi/piix4: Convert reset handler to DeviceReset hw/isa/piix4: Convert reset handler to DeviceReset hw/ide/piix: Convert reset handler to DeviceReset hw/ide/sii3112: Convert reset handler to DeviceReset hw/ide/via82c: Convert reset handler to DeviceReset hw/isa/vt82c686: Convert reset handler to DeviceReset hw/input/lm832x: Convert reset handler to DeviceReset hw/misc/vmcoreinfo: Add comment about reset handler
hw/acpi/piix4.c | 7 +++---- hw/ide/piix.c | 9 ++++----- hw/ide/sii3112.c | 7 +++---- hw/ide/via.c | 10 ++++------ hw/input/lm832x.c | 12 +++++------- hw/isa/piix4.c | 7 +++---- hw/isa/vt82c686.c | 11 ++++------- hw/misc/vmcoreinfo.c | 4 ++++ 8 files changed, 30 insertions(+), 37 deletions(-)
Signature · 1 line
2.21.0
PATCH v3 1/8 hw/acpi/piix4: Convert reset handler to DeviceReset
The PIIX4/PM is a PCI device within the PIIX4 chipset, it will be reset when the PCI bus it stands on is reset.
Convert its reset handler into a proper Device reset method.
--- hw/acpi/piix4.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
hw/acpi/piix4.c +3 -4
@@ -27,7 +27,6 @@#include "hw/pci/pci.h" #include "hw/qdev-properties.h" #include "hw/acpi/acpi.h" -#include "sysemu/reset.h" #include "sysemu/runstate.h" #include "sysemu/sysemu.h" #include "qapi/error.h"
@@ -344,9 +343,9 @@ static const VMStateDescription vmstate_acpi = { } }; -static void piix4_reset (void *opaque) +static void piix4_pm_reset (DeviceState *dev) { -PIIX4PMState *s = opaque; +PIIX4PMState *s =PIIX4_PM (dev);PCIDevice *d =PCI_DEVICE (s);uint8_t *pci_conf = d->config;
@@ -542,7 +541,6 @@ static void piix4_pm_realize(PCIDevice *dev, Error **errp) s->machine_ready.notify = piix4_pm_machine_ready;qemu_add_machine_init_done_notifier (&s->machine_ready); -qemu_register_reset (piix4_reset, s);piix4_acpi_system_hot_add_init (pci_address_space_io (dev),pci_get_bus (dev), s);
@@ -692,6 +690,7 @@ static void piix4_pm_class_init(ObjectClass *klass, void *data) k->device_id =PCI_DEVICE_ID_INTEL_82371AB_3 ; k->revision =0x03 ; k->class_id =PCI_CLASS_BRIDGE_OTHER ; + dc->reset = piix4_pm_reset; dc->desc ="PM" ; dc->vmsd = &vmstate_acpi; dc->props = piix4_pm_properties;
Signature · 1 line
2.21.0
PATCH v3 2/8 hw/isa/piix4: Convert reset handler to DeviceReset
In reply to Philippe Mathieu-DaudéThe PIIX4/ISA is a PCI device within the PIIX4 chipset, it will be reset when the PCI bus it stands on is reset.
Convert its reset handler into a proper Device reset method.
--- hw/isa/piix4.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
hw/isa/piix4.c +3 -4
@@ -28,7 +28,6 @@#include "hw/isa/isa.h" #include "hw/sysbus.h" #include "migration/vmstate.h" -#include "sysemu/reset.h" PCIDevice *piix4_dev;
@@ -40,9 +39,9 @@ typedef struct PIIX4State {#define PIIX4_PCI_DEVICE (obj) \ OBJECT_CHECK(PIIX4State, (obj), TYPE_PIIX4_PCI_DEVICE) -static void piix4_reset (void *opaque) +static void piix4_isa_reset (DeviceState *dev) { -PIIX4State *d = opaque; +PIIX4State *d =PIIX4_PCI_DEVICE (dev);uint8_t *pci_conf = d->dev.config; pci_conf[0x04 ] =0x07 ;// master, memory and I/O
@@ -97,7 +96,6 @@ static void piix4_realize(PCIDevice *dev, Error **errp)return ; } piix4_dev = &d->dev; -qemu_register_reset (piix4_reset, d); }int piix4_init (PCIBus *bus,ISABus **isa_bus,int devfn)
@@ -118,6 +116,7 @@ static void piix4_class_init(ObjectClass *klass, void *data) k->vendor_id =PCI_VENDOR_ID_INTEL ; k->device_id =PCI_DEVICE_ID_INTEL_82371AB_0 ; k->class_id =PCI_CLASS_BRIDGE_ISA ; + dc->reset = piix4_isa_reset; dc->desc ="ISA bridge" ; dc->vmsd = &vmstate_piix4;/*
Signature · 1 line
2.21.0
PATCH v3 3/8 hw/ide/piix: Convert reset handler to DeviceReset
In reply to Philippe Mathieu-DaudéThe PIIX/IDE is a PCI device within a PIIX chipset, it will be reset when the PCI bus it stands on is reset.
Convert its reset handler into a proper Device reset method.
---
v3: Also convert PIIX4 (Li Qiang)
--- hw/ide/piix.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
hw/ide/piix.c +4 -5
@@ -30,7 +30,6 @@#include "sysemu/block-backend.h" #include "sysemu/blockdev.h" #include "sysemu/dma.h" -#include "sysemu/reset.h" #include "hw/ide/pci.h" #include "trace.h"
@@ -103,9 +102,9 @@ static void bmdma_setup_bar(PCIIDEState *d) } } -static void piix3_reset (void *opaque) +static void piix_ide_reset (DeviceState *dev) { -PCIIDEState *d = opaque; +PCIIDEState *d =PCI_IDE (dev);PCIDevice *pd =PCI_DEVICE (d);uint8_t *pci_conf = pd->config;int i;
@@ -154,8 +153,6 @@ static void pci_piix_ide_realize(PCIDevice *dev, Error **errp) pci_conf[PCI_CLASS_PROG ] =0x80 ;// legacy ATA mode -qemu_register_reset (piix3_reset, d); -bmdma_setup_bar (d);pci_register_bar (dev,4 ,PCI_BASE_ADDRESS_SPACE_IO , &d->bmdma_bar);
@@ -247,6 +244,7 @@ static void piix3_ide_class_init(ObjectClass *klass, void *data)DeviceClass *dc =DEVICE_CLASS (klass);PCIDeviceClass *k =PCI_DEVICE_CLASS (klass); + dc->reset = piix_ide_reset; k->realize = pci_piix_ide_realize; k->exit = pci_piix_ide_exitfn; k->vendor_id =PCI_VENDOR_ID_INTEL ;
@@ -273,6 +271,7 @@ static void piix4_ide_class_init(ObjectClass *klass, void *data)DeviceClass *dc =DEVICE_CLASS (klass);PCIDeviceClass *k =PCI_DEVICE_CLASS (klass); + dc->reset = piix_ide_reset; k->realize = pci_piix_ide_realize; k->exit = pci_piix_ide_exitfn; k->vendor_id =PCI_VENDOR_ID_INTEL ;
Signature · 1 line
2.21.0
Re: [PATCH v3 3/8] hw/ide/piix: Convert reset handler to DeviceReset
Quoted 7 lines · Philippe Mathieu-Daudé <[email protected]> 于2019年10月10日周四 下午9:16写道:
The PIIX/IDE is a PCI device within a PIIX chipset, it will be reset when the PCI bus it stands on is reset.
Convert its reset handler into a proper Device reset method.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Quoted 62 lines
---
v3: Also convert PIIX4 (Li Qiang)--- hw/ide/piix.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)hw/ide/piix.c +3
-5@@ -30,7 +30,6 @@#include "sysemu/block-backend.h" #include "sysemu/blockdev.h" #include "sysemu/dma.h" -#include "sysemu/reset.h" #include "hw/ide/pci.h" #include "trace.h" @@ -103,9 +102,9 @@ static void bmdma_setup_bar(PCIIDEState *d) } } -static void piix3_reset (void *opaque) +static void piix_ide_reset (DeviceState *dev) { -PCIIDEState *d = opaque; +PCIIDEState *d =PCI_IDE (dev);PCIDevice *pd =PCI_DEVICE (d);uint8_t *pci_conf = pd->config;int i;@@ -154,8 +153,6 @@ static void pci_piix_ide_realize(PCIDevice *dev, Error **errp) pci_conf[PCI_CLASS_PROG ] =0x80 ;// legacy ATA mode -qemu_register_reset (piix3_reset, d); -bmdma_setup_bar (d);pci_register_bar (dev,4 ,PCI_BASE_ADDRESS_SPACE_IO , &d->bmdma_bar);@@ -247,6 +244,7 @@ static void piix3_ide_class_init(ObjectClass *klass, void *data) DeviceClass *dc = DEVICE_CLASS(klass);PCIDeviceClass *k =PCI_DEVICE_CLASS (klass); + dc->reset = piix_ide_reset; k->realize = pci_piix_ide_realize; k->exit = pci_piix_ide_exitfn;k->vendor_id = PCI_VENDOR_ID_INTEL;hw/ide/piix.c +1
-0@@ -273,6 +271,7 @@ static void piix4_ide_class_init(ObjectClass *klass, void *data) DeviceClass *dc = DEVICE_CLASS(klass);PCIDeviceClass *k =PCI_DEVICE_CLASS (klass); + dc->reset = piix_ide_reset; k->realize = pci_piix_ide_realize; k->exit = pci_piix_ide_exitfn;k->vendor_id = PCI_VENDOR_ID_INTEL;--
2.21.0
PATCH v3 4/8 hw/ide/sii3112: Convert reset handler to DeviceReset
In reply to Philippe Mathieu-DaudéThe SiI3112A SATA controller is a PCI device, it will be reset when the PCI bus it stands on is reset.
Convert its reset handler into a proper Device reset method.
--- hw/ide/sii3112.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
hw/ide/sii3112.c +3 -4
@@ -15,7 +15,6 @@#include "qemu/osdep.h" #include "hw/ide/pci.h" #include "qemu/module.h" -#include "sysemu/reset.h" #include "trace.h" #define TYPE_SII3112_PCI "sii3112"
@@ -237,9 +236,9 @@ static void sii3112_set_irq(void *opaque, int channel, int level)sii3112_update_irq (s); } -static void sii3112_reset (void *opaque) +static void sii3112_reset (DeviceState *dev) { -SiI3112PCIState *s = opaque; +SiI3112PCIState *s =SII3112_PCI (dev);int i;for (i =0 ; i <2 ; i++) {
@@ -290,7 +289,6 @@ static void sii3112_pci_realize(PCIDevice *dev, Error **errp) s->bmdma[i].bus = &s->bus[i];ide_register_restart_cb (&s->bus[i]); } -qemu_register_reset (sii3112_reset, s); }static void sii3112_pci_class_init (ObjectClass *klass,void *data)
@@ -303,6 +301,7 @@ static void sii3112_pci_class_init(ObjectClass *klass, void *data) pd->class_id =PCI_CLASS_STORAGE_RAID ; pd->revision =1 ; pd->realize = sii3112_pci_realize; + dc->reset = sii3112_reset; dc->desc ="SiI3112A SATA controller" ;set_bit (DEVICE_CATEGORY_STORAGE , dc->categories); }
Signature · 1 line
2.21.0
PATCH v3 5/8 hw/ide/via82c: Convert reset handler to DeviceReset
In reply to Philippe Mathieu-DaudéThe VIA82C686B IDE controller is a PCI device, it will be reset when the PCI bus it stands on is reset.
Convert its reset handler into a proper Device reset method.
--- hw/ide/via.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
hw/ide/via.c +4 -6
@@ -29,7 +29,6 @@#include "migration/vmstate.h" #include "qemu/module.h" #include "sysemu/dma.h" -#include "sysemu/reset.h" #include "hw/ide/pci.h" #include "trace.h"
@@ -120,10 +119,10 @@ static void via_ide_set_irq(void *opaque, int n, int level) } } -static void via_ide_reset (void *opaque) +static void via_ide_reset (DeviceState *dev) { -PCIIDEState *d = opaque; -PCIDevice *pd =PCI_DEVICE (d); +PCIIDEState *d =PCI_IDE (dev); +PCIDevice *pd =PCI_DEVICE (dev);uint8_t *pci_conf = pd->config;int i;
@@ -172,8 +171,6 @@ static void via_ide_realize(PCIDevice *dev, Error **errp)pci_set_long (pci_conf +PCI_CAPABILITY_LIST ,0x000000c0 ); dev->wmask[PCI_INTERRUPT_LINE ] =0xf ; -qemu_register_reset (via_ide_reset, d); -memory_region_init_io (&d->data_bar[0 ],OBJECT (d), &pci_ide_data_le_ops, &d->bus[0 ],"via-ide0-data" ,8 );pci_register_bar (dev,0 ,PCI_BASE_ADDRESS_SPACE_IO , &d->data_bar[0 ]);
@@ -229,6 +226,7 @@ static void via_ide_class_init(ObjectClass *klass, void *data)DeviceClass *dc =DEVICE_CLASS (klass);PCIDeviceClass *k =PCI_DEVICE_CLASS (klass); + dc->reset = via_ide_reset; k->realize = via_ide_realize; k->exit = via_ide_exitfn; k->vendor_id =PCI_VENDOR_ID_VIA ;
Signature · 1 line
2.21.0
PATCH v3 6/8 hw/isa/vt82c686: Convert reset handler to DeviceReset
In reply to Philippe Mathieu-DaudéThe VIA VT82C686 Southbridge is a PCI device, it will be reset when the PCI bus it stands on is reset.
Convert its reset handler into a proper Device reset method.
--- hw/isa/vt82c686.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
hw/isa/vt82c686.c +4 -7
@@ -23,7 +23,6 @@#include "hw/isa/apm.h" #include "hw/acpi/acpi.h" #include "hw/i2c/pm_smbus.h" -#include "sysemu/reset.h" #include "qemu/module.h" #include "qemu/timer.h" #include "exec/address-spaces.h"
@@ -116,11 +115,10 @@ static const MemoryRegionOps superio_ops = { }, }; -static void vt82c686b_reset (void * opaque) +static void vt82c686b_isa_reset (DeviceState *dev) { -PCIDevice *d = opaque; -uint8_t *pci_conf = d->config; -VT82C686BState *vt82c =VT82C686B_DEVICE (d); +VT82C686BState *vt82c =VT82C686B_DEVICE (dev); +uint8_t *pci_conf = vt82c->dev.config;pci_set_long (pci_conf +PCI_CAPABILITY_LIST ,0x000000c0 ); pci_set_word(pci_conf + PCI_COMMAND, PCI_COMMAND_IO | PCI_COMMAND_MEMORY |
@@ -476,8 +474,6 @@ static void vt82c686b_realize(PCIDevice *d, Error **errp)* But we do not emulate a floppy, so just set it here. */ memory_region_add_subregion (isa_bus->address_space_io,0x3f0 , &vt82c->superio); - -qemu_register_reset (vt82c686b_reset, d); }ISABus *vt82c686b_isa_init (PCIBus *bus,int devfn)
@@ -501,6 +497,7 @@ static void via_class_init(ObjectClass *klass, void *data) k->device_id =PCI_DEVICE_ID_VIA_ISA_BRIDGE ; k->class_id =PCI_CLASS_BRIDGE_ISA ; k->revision =0x40 ; + dc->reset = vt82c686b_isa_reset; dc->desc ="ISA bridge" ; dc->vmsd = &vmstate_via;/*
Signature · 1 line
2.21.0
PATCH v3 7/8 hw/input/lm832x: Convert reset handler to DeviceReset
In reply to Philippe Mathieu-DaudéThe LM8323 key-scan controller is a I2C device, it will be reset when the I2C bus it stands on is reset.
Convert its reset handler into a proper Device reset method.
--- hw/input/lm832x.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
hw/input/lm832x.c +5 -7
@@ -24,7 +24,6 @@#include "migration/vmstate.h" #include "qemu/module.h" #include "qemu/timer.h" -#include "sysemu/reset.h" #include "ui/console.h" #define TYPE_LM8323 "lm8323"
@@ -94,8 +93,10 @@ static void lm_kbd_gpio_update(LM823KbdState *s) { } -static void lm_kbd_reset (LM823KbdState *s) +static void lm_kbd_reset (DeviceState *dev) { +LM823KbdState *s =LM8323 (dev); + s->config =0x80 ; s->status =INT_NOINIT ; s->acttime =125 ;
@@ -273,7 +274,7 @@ static void lm_kbd_write(LM823KbdState *s, int reg, int byte, uint8_t value)case LM832x_CMD_RESET:if (value ==0xaa ) -lm_kbd_reset (s); +lm_kbd_reset (DEVICE (s));else lm_kbd_error (s,ERR_BADPAR ); s->reg = LM832x_GENERAL_ERROR;
@@ -476,10 +477,6 @@ static void lm8323_realize(DeviceState *dev, Error **errp) s->pwm.tm[1 ] =timer_new_ns (QEMU_CLOCK_VIRTUAL , lm_kbd_pwm1_tick, s); s->pwm.tm[2 ] =timer_new_ns (QEMU_CLOCK_VIRTUAL , lm_kbd_pwm2_tick, s);qdev_init_gpio_out (dev, &s->nirq,1 ); - -lm_kbd_reset (s); - -qemu_register_reset ((void *) lm_kbd_reset, s); }void lm832x_key_event (DeviceState *dev,int key,int state)
@@ -507,6 +504,7 @@ static void lm8323_class_init(ObjectClass *klass, void *data)DeviceClass *dc =DEVICE_CLASS (klass);I2CSlaveClass *k =I2C_SLAVE_CLASS (klass); + dc->reset = lm_kbd_reset; dc->realize = lm8323_realize; k->event = lm_i2c_event; k->recv = lm_i2c_rx;
Signature · 1 line
2.21.0
PATCH v3 8/8 hw/misc/vmcoreinfo: Add comment about reset handler
In reply to Philippe Mathieu-DaudéThe VM coreinfo device does not sit on a bus, so it won't be reset automatically. This is why it calls qemu_register_reset().
Add a comment about it, so we don't convert its reset handler to a DeviceReset method.
--- hw/misc/vmcoreinfo.c | 4 ++++ 1 file changed, 4 insertions(+)
hw/misc/vmcoreinfo.c +4 -0
@@ -61,6 +61,10 @@ static void vmcoreinfo_realize(DeviceState *dev, Error **errp)NULL , fw_cfg_vmci_write, s, &s->vmcoreinfo, sizeof(s->vmcoreinfo), false); +/* +* This device requires to register a global reset because it is +* not plugged to a bus (which, as its QOM parent, would reset it). +*/ qemu_register_reset (vmcoreinfo_reset, dev); vmcoreinfo_state = s; }
Signature · 1 line
2.21.0
Queueing on machine-next. Thanks!
Quoted 48 lines · Philippe Mathieu-Daudé
Only patch 3/8 is missing review:
- hw/ide/piix: Convert reset handler to DeviceResetSince v2:
- FixedPIIX_IDEconversion (Li)
- Added more R-b tag.Since v1:
- Removed the pci-host devices
- Removed the vmcoreinfo conversion (elmarco) but add a comment.
- Added Igor's R-b tag.Following the thread discussion between Peter/Markus/Damien about reset handlers:
https://www.mail-archive.com/[email protected]/msg617103.html
I started to removeqemu_register_reset()calls from few qdevified devices (the trivial ones).Regards,
Phil.
v2: https://lists.gnu.org/archive/html/qemu-devel/2019-10/msg01677.html
v1: https://lists.gnu.org/archive/html/qemu-devel/2019-09/msg06367.htmlPhilippe Mathieu-Daudé (8):
hw/acpi/piix4: Convert reset handler to DeviceReset hw/isa/piix4: Convert reset handler to DeviceReset hw/ide/piix: Convert reset handler to DeviceReset hw/ide/sii3112: Convert reset handler to DeviceReset hw/ide/via82c: Convert reset handler to DeviceReset hw/isa/vt82c686: Convert reset handler to DeviceReset hw/input/lm832x: Convert reset handler to DeviceReset hw/misc/vmcoreinfo: Add comment about reset handlerhw/acpi/piix4.c | 7 +++---- hw/ide/piix.c | 9 ++++----- hw/ide/sii3112.c | 7 +++---- hw/ide/via.c | 10 ++++------ hw/input/lm832x.c | 12 +++++------- hw/isa/piix4.c | 7 +++---- hw/isa/vt82c686.c | 11 ++++------- hw/misc/vmcoreinfo.c | 4 ++++ 8 files changed, 30 insertions(+), 37 deletions(-)Signature · 1 line
2.21.0
Signature · 1 line
Eduardo