From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org, Thomas Huth <thuth@redhat.com>
Cc: "Aurelien Jarno" <aurelien@aurel32.net>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Aleksandar Markovic" <amarkovic@wavecomp.com>,
"Aleksandar Rikalo" <arikalo@wavecomp.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [Qemu-devel] [PATCH for-4.1 1/4] hw/isa/superio: Rename a variable
Date: Fri, 5 Apr 2019 00:12:35 +0200 [thread overview]
Message-ID: <20190404221238.12468-2-philmd@redhat.com> (raw)
In-Reply-To: <20190404221238.12468-1-philmd@redhat.com>
This patch is purely cosmetic. No functional change.
This will ease the next patch where we re-indent an if() statement.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/isa/isa-superio.c | 69 ++++++++++++++++++++++----------------------
1 file changed, 34 insertions(+), 35 deletions(-)
diff --git a/hw/isa/isa-superio.c b/hw/isa/isa-superio.c
index d54463bf035..c6845eaf578 100644
--- a/hw/isa/isa-superio.c
+++ b/hw/isa/isa-superio.c
@@ -22,8 +22,8 @@
static void isa_superio_realize(DeviceState *dev, Error **errp)
{
- ISASuperIODevice *sio = ISA_SUPERIO(dev);
- ISASuperIOClass *k = ISA_SUPERIO_GET_CLASS(sio);
+ ISASuperIODevice *s = ISA_SUPERIO(dev);
+ ISASuperIOClass *k = ISA_SUPERIO_GET_CLASS(s);
ISABus *bus = isa_bus_from_device(ISA_DEVICE(dev));
ISADevice *isa;
DeviceState *d;
@@ -34,12 +34,12 @@ static void isa_superio_realize(DeviceState *dev, Error **errp)
/* Parallel port */
for (i = 0; i < k->parallel.count; i++) {
- if (i >= ARRAY_SIZE(sio->parallel)) {
+ if (i >= ARRAY_SIZE(s->parallel)) {
warn_report("superio: ignoring %td parallel controllers",
- k->parallel.count - ARRAY_SIZE(sio->parallel));
+ k->parallel.count - ARRAY_SIZE(s->parallel));
break;
}
- if (!k->parallel.is_enabled || k->parallel.is_enabled(sio, i)) {
+ if (!k->parallel.is_enabled || k->parallel.is_enabled(s, i)) {
/* FIXME use a qdev chardev prop instead of parallel_hds[] */
chr = parallel_hds[i];
if (chr == NULL) {
@@ -53,33 +53,33 @@ static void isa_superio_realize(DeviceState *dev, Error **errp)
qdev_prop_set_uint32(d, "index", i);
if (k->parallel.get_iobase) {
qdev_prop_set_uint32(d, "iobase",
- k->parallel.get_iobase(sio, i));
+ k->parallel.get_iobase(s, i));
}
if (k->parallel.get_irq) {
- qdev_prop_set_uint32(d, "irq", k->parallel.get_irq(sio, i));
+ qdev_prop_set_uint32(d, "irq", k->parallel.get_irq(s, i));
}
qdev_prop_set_chr(d, "chardev", chr);
qdev_init_nofail(d);
- sio->parallel[i] = isa;
+ s->parallel[i] = isa;
trace_superio_create_parallel(i,
k->parallel.get_iobase ?
- k->parallel.get_iobase(sio, i) : -1,
+ k->parallel.get_iobase(s, i) : -1,
k->parallel.get_irq ?
- k->parallel.get_irq(sio, i) : -1);
+ k->parallel.get_irq(s, i) : -1);
object_property_add_child(OBJECT(dev), name,
- OBJECT(sio->parallel[i]), NULL);
+ OBJECT(s->parallel[i]), NULL);
g_free(name);
}
}
/* Serial */
for (i = 0; i < k->serial.count; i++) {
- if (i >= ARRAY_SIZE(sio->serial)) {
+ if (i >= ARRAY_SIZE(s->serial)) {
warn_report("superio: ignoring %td serial controllers",
- k->serial.count - ARRAY_SIZE(sio->serial));
+ k->serial.count - ARRAY_SIZE(s->serial));
break;
}
- if (!k->serial.is_enabled || k->serial.is_enabled(sio, i)) {
+ if (!k->serial.is_enabled || k->serial.is_enabled(s, i)) {
/* FIXME use a qdev chardev prop instead of serial_hd() */
chr = serial_hd(i);
if (chr == NULL) {
@@ -92,35 +92,34 @@ static void isa_superio_realize(DeviceState *dev, Error **errp)
d = DEVICE(isa);
qdev_prop_set_uint32(d, "index", i);
if (k->serial.get_iobase) {
- qdev_prop_set_uint32(d, "iobase",
- k->serial.get_iobase(sio, i));
+ qdev_prop_set_uint32(d, "iobase", k->serial.get_iobase(s, i));
}
if (k->serial.get_irq) {
- qdev_prop_set_uint32(d, "irq", k->serial.get_irq(sio, i));
+ qdev_prop_set_uint32(d, "irq", k->serial.get_irq(s, i));
}
qdev_prop_set_chr(d, "chardev", chr);
qdev_init_nofail(d);
- sio->serial[i] = isa;
+ s->serial[i] = isa;
trace_superio_create_serial(i,
k->serial.get_iobase ?
- k->serial.get_iobase(sio, i) : -1,
+ k->serial.get_iobase(s, i) : -1,
k->serial.get_irq ?
- k->serial.get_irq(sio, i) : -1);
+ k->serial.get_irq(s, i) : -1);
object_property_add_child(OBJECT(dev), name,
- OBJECT(sio->serial[0]), NULL);
+ OBJECT(s->serial[0]), NULL);
g_free(name);
}
}
/* Floppy disc */
- if (!k->floppy.is_enabled || k->floppy.is_enabled(sio, 0)) {
+ if (!k->floppy.is_enabled || k->floppy.is_enabled(s, 0)) {
isa = isa_create(bus, "isa-fdc");
d = DEVICE(isa);
if (k->floppy.get_iobase) {
- qdev_prop_set_uint32(d, "iobase", k->floppy.get_iobase(sio, 0));
+ qdev_prop_set_uint32(d, "iobase", k->floppy.get_iobase(s, 0));
}
if (k->floppy.get_irq) {
- qdev_prop_set_uint32(d, "irq", k->floppy.get_irq(sio, 0));
+ qdev_prop_set_uint32(d, "irq", k->floppy.get_irq(s, 0));
}
/* FIXME use a qdev drive property instead of drive_get() */
drive = drive_get(IF_FLOPPY, 0, 0);
@@ -135,37 +134,37 @@ static void isa_superio_realize(DeviceState *dev, Error **errp)
&error_fatal);
}
qdev_init_nofail(d);
- sio->floppy = isa;
+ s->floppy = isa;
trace_superio_create_floppy(0,
k->floppy.get_iobase ?
- k->floppy.get_iobase(sio, 0) : -1,
+ k->floppy.get_iobase(s, 0) : -1,
k->floppy.get_irq ?
- k->floppy.get_irq(sio, 0) : -1);
+ k->floppy.get_irq(s, 0) : -1);
}
/* Keyboard, mouse */
- sio->kbc = isa_create_simple(bus, TYPE_I8042);
+ s->kbc = isa_create_simple(bus, TYPE_I8042);
/* IDE */
- if (k->ide.count && (!k->ide.is_enabled || k->ide.is_enabled(sio, 0))) {
+ if (k->ide.count && (!k->ide.is_enabled || k->ide.is_enabled(s, 0))) {
isa = isa_create(bus, "isa-ide");
d = DEVICE(isa);
if (k->ide.get_iobase) {
- qdev_prop_set_uint32(d, "iobase", k->ide.get_iobase(sio, 0));
+ qdev_prop_set_uint32(d, "iobase", k->ide.get_iobase(s, 0));
}
if (k->ide.get_iobase) {
- qdev_prop_set_uint32(d, "iobase2", k->ide.get_iobase(sio, 1));
+ qdev_prop_set_uint32(d, "iobase2", k->ide.get_iobase(s, 1));
}
if (k->ide.get_irq) {
- qdev_prop_set_uint32(d, "irq", k->ide.get_irq(sio, 0));
+ qdev_prop_set_uint32(d, "irq", k->ide.get_irq(s, 0));
}
qdev_init_nofail(d);
- sio->ide = isa;
+ s->ide = isa;
trace_superio_create_ide(0,
k->ide.get_iobase ?
- k->ide.get_iobase(sio, 0) : -1,
+ k->ide.get_iobase(s, 0) : -1,
k->ide.get_irq ?
- k->ide.get_irq(sio, 0) : -1);
+ k->ide.get_irq(s, 0) : -1);
}
}
--
2.20.1
next prev parent reply other threads:[~2019-04-04 22:12 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-04 22:12 [Qemu-devel] [PATCH for-4.1 0/4] hw/mips/r4k: Refactor the Super I/O chipset Philippe Mathieu-Daudé
2019-04-04 22:12 ` Philippe Mathieu-Daudé [this message]
2019-04-05 4:14 ` [Qemu-devel] [PATCH for-4.1 1/4] hw/isa/superio: Rename a variable Thomas Huth
2019-04-05 4:14 ` Thomas Huth
2019-04-05 9:32 ` Philippe Mathieu-Daudé
2019-04-05 9:32 ` Philippe Mathieu-Daudé
2019-04-04 22:12 ` [Qemu-devel] [PATCH for-4.1 2/4] hw/isa/superio: Support more than one IDE bus Philippe Mathieu-Daudé
2019-04-04 22:12 ` [Qemu-devel] [PATCH for-4.1 3/4] hw/isa/superio: Support chipsets with no Floppy Disk controller Philippe Mathieu-Daudé
2019-04-05 4:24 ` Thomas Huth
2019-04-05 4:24 ` Thomas Huth
2019-04-04 22:12 ` [Qemu-devel] [PATCH for-4.1 4/4] hw/mips/r4k: Refactor the Super I/O chipset Philippe Mathieu-Daudé
2019-04-05 4:51 ` Thomas Huth
2019-04-05 4:51 ` Thomas Huth
2019-04-05 9:49 ` Philippe Mathieu-Daudé
2019-04-05 9:49 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190404221238.12468-2-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=amarkovic@wavecomp.com \
--cc=arikalo@wavecomp.com \
--cc=aurelien@aurel32.net \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).