diff options
| author | Peter Maydell | 2015-06-23 19:25:55 +0200 |
|---|---|---|
| committer | Peter Maydell | 2015-06-23 19:25:55 +0200 |
| commit | 355df30554445c043a12168e9c5f912742050548 (patch) | |
| tree | 1b523d3807c70c30d219d48053db0d56c15cd207 /hw/isa/piix4.c | |
| parent | Merge remote-tracking branch 'remotes/sstabellini/tags/xen-220615-3' into sta... (diff) | |
| parent | util/qemu-sockets: improve ai_flag hints for ipv6 hosts (diff) | |
| download | qemu-355df30554445c043a12168e9c5f912742050548.tar.gz qemu-355df30554445c043a12168e9c5f912742050548.tar.xz qemu-355df30554445c043a12168e9c5f912742050548.zip | |
Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2015-06-23' into staging
trivial patches for 2015-06-23
# gpg: Signature made Tue Jun 23 18:23:45 2015 BST using RSA key ID A4C3D7DB
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg: aka "Michael Tokarev <mjt@corpit.ru>"
# gpg: aka "Michael Tokarev <mjt@debian.org>"
* remotes/mjt/tags/pull-trivial-patches-2015-06-23: (21 commits)
util/qemu-sockets: improve ai_flag hints for ipv6 hosts
hw/display/tcx.c: Fix memory leak
hw/display/cg3.c: Fix memory leak
Makefile: Add "make ctags"
Makefile: Fix "make cscope TAGS"
qemu-options: Use @itemx where appropriate
qemu-options: Improve -global documentation
throttle: Fix typo in the documentation of block_set_io_throttle
hw/display/qxl-logger.c: Constify some variable
configure: rearrange --help and consolidate enable/disable together
libcacard: pkgconfig: tidy dependent libs
vt82c686: QOMify
xen_pt: QOMify
wdt_i6300esb: QOMify
piix4: QOMify
piix: piix3 QOMify
pci-assign: QOMify
Print error when failing to load PCI config data
Grammar: 'as to'->'as for'
remove libdecnumber/dpd/decimal128Local.h
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/isa/piix4.c')
| -rw-r--r-- | hw/isa/piix4.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c index d9522b1f45..2c59e91fff 100644 --- a/hw/isa/piix4.c +++ b/hw/isa/piix4.c @@ -34,6 +34,10 @@ typedef struct PIIX4State { PCIDevice dev; } PIIX4State; +#define TYPE_PIIX4_PCI_DEVICE "PIIX4" +#define PIIX4_PCI_DEVICE(obj) \ + OBJECT_CHECK(PIIX4State, (obj), TYPE_PIIX4_PCI_DEVICE) + static void piix4_reset(void *opaque) { PIIX4State *d = opaque; @@ -84,7 +88,7 @@ static const VMStateDescription vmstate_piix4 = { static void piix4_realize(PCIDevice *dev, Error **errp) { - PIIX4State *d = DO_UPCAST(PIIX4State, dev, dev); + PIIX4State *d = PIIX4_PCI_DEVICE(dev); isa_bus_new(DEVICE(d), pci_address_space(dev), pci_address_space_io(dev)); @@ -121,7 +125,7 @@ static void piix4_class_init(ObjectClass *klass, void *data) } static const TypeInfo piix4_info = { - .name = "PIIX4", + .name = TYPE_PIIX4_PCI_DEVICE, .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(PIIX4State), .class_init = piix4_class_init, |