From: Mark McLoughlin <markmc@redhat.com>
To: Anthony Liguori <aliguori@us.ibm.com>
Cc: Jan Kiszka <jan.kiszka@siemens.com>,
qemu-devel@nongnu.org, Mark McLoughlin <markmc@redhat.com>
Subject: [Qemu-devel] [PATCH 8/9] Use NICInfo::model for eepro100 savevm ID string
Date: Wed, 15 Apr 2009 17:29:28 +0100 [thread overview]
Message-ID: <1239812969-8320-9-git-send-email-markmc@redhat.com> (raw)
In-Reply-To: <1239812969-8320-8-git-send-email-markmc@redhat.com>
NICInfo::model will always be identical to the device name strings
we're currently passing to nic_init(). Just re-use NICInfo::model.
This makes it clear why we use vc->model for unregister_savevm()
in a subsequent patch.
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
---
hw/eepro100.c | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/hw/eepro100.c b/hw/eepro100.c
index 0a343df..c72b990 100644
--- a/hw/eepro100.c
+++ b/hw/eepro100.c
@@ -1710,15 +1710,14 @@ static void nic_save(QEMUFile * f, void *opaque)
qemu_put_buffer(f, s->configuration, sizeof(s->configuration));
}
-static PCIDevice *nic_init(PCIBus * bus, NICInfo * nd,
- const char *name, uint32_t device)
+static PCIDevice *nic_init(PCIBus * bus, NICInfo * nd, uint32_t device)
{
PCIEEPRO100State *d;
EEPRO100State *s;
logout("\n");
- d = (PCIEEPRO100State *) pci_register_device(bus, name,
+ d = (PCIEEPRO100State *) pci_register_device(bus, nd->model,
sizeof(PCIEEPRO100State), -1,
NULL, NULL);
@@ -1757,24 +1756,23 @@ static PCIDevice *nic_init(PCIBus * bus, NICInfo * nd,
qemu_register_reset(nic_reset, s);
- register_savevm(name, -1, 3, nic_save, nic_load, s);
+ register_savevm(s->vc->model, -1, 3, nic_save, nic_load, s);
return (PCIDevice *)d;
}
PCIDevice *pci_i82551_init(PCIBus * bus, NICInfo * nd, int devfn)
{
- return nic_init(bus, nd, "i82551", i82551);
- //~ uint8_t *pci_conf = d->dev.config;
+ return nic_init(bus, nd, i82551);
}
PCIDevice *pci_i82557b_init(PCIBus * bus, NICInfo * nd, int devfn)
{
- return nic_init(bus, nd, "i82557b", i82557B);
+ return nic_init(bus, nd, i82557B);
}
PCIDevice *pci_i82559er_init(PCIBus * bus, NICInfo * nd, int devfn)
{
- return nic_init(bus, nd, "i82559er", i82559ER);
+ return nic_init(bus, nd, i82559ER);
}
/* eof */
--
1.6.0.6
next prev parent reply other threads:[~2009-04-15 16:29 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-15 16:29 [Qemu-devel] [PATCH 0/9] Misc networking fixes Mark McLoughlin
2009-04-15 16:29 ` [Qemu-devel] [PATCH 1/9] Remove stray GSO code from virtio_net Mark McLoughlin
2009-04-15 16:29 ` [Qemu-devel] [PATCH 2/9] struct iovec is now universally available Mark McLoughlin
2009-04-15 16:29 ` [Qemu-devel] [PATCH 3/9] Fix error handling in net_client_init() Mark McLoughlin
2009-04-15 16:29 ` [Qemu-devel] [PATCH 4/9] Don't fail PCI hotplug if no NIC model is supplied Mark McLoughlin
2009-04-15 16:29 ` [Qemu-devel] [PATCH 5/9] Remove some useless malloc() checking Mark McLoughlin
2009-04-15 16:29 ` [Qemu-devel] [PATCH 6/9] Remove NICInfo from e1000 and mipsnet state Mark McLoughlin
2009-04-15 16:29 ` [Qemu-devel] [PATCH 7/9] Add unregister_savevm() Mark McLoughlin
2009-04-15 16:29 ` Mark McLoughlin [this message]
2009-04-15 16:29 ` [Qemu-devel] [PATCH 9/9] Introduce VLANClientState::cleanup() Mark McLoughlin
2009-04-15 17:34 ` [Qemu-devel] " Jan Kiszka
2009-04-16 1:07 ` Marcelo Tosatti
2009-04-16 3:24 ` M. Warner Losh
2009-04-16 14:49 ` Mark McLoughlin
2009-04-16 14:52 ` [Qemu-devel] [PATCH 09/09 v2] " Mark McLoughlin
2009-04-16 14:53 ` [Qemu-devel] [PATCH 10/09] Free VLANClientState using qemu_free() Mark McLoughlin
2009-04-16 20:44 ` [Qemu-devel] Re: [PATCH 9/9] Introduce VLANClientState::cleanup() Marcelo Tosatti
2009-04-28 12:08 ` Paul Brook
2009-04-28 16:46 ` Anthony Liguori
2009-04-28 17:17 ` Paul Brook
2009-04-28 17:25 ` Anthony Liguori
2009-04-28 17:46 ` Paul Brook
2009-04-28 17:49 ` Anthony Liguori
2009-04-28 18:28 ` Paul Brook
2009-04-28 21:38 ` Anthony Liguori
2009-04-29 10:37 ` Paul Brook
2009-04-30 13:45 ` Avi Kivity
2009-04-30 16:02 ` Paul Brook
2009-04-30 16:20 ` Avi Kivity
2009-04-30 16:31 ` Paul Brook
2009-04-30 16:32 ` Avi Kivity
2009-04-30 16:37 ` Anthony Liguori
2009-04-30 16:41 ` Anthony Liguori
2009-04-30 16:58 ` Paul Brook
2009-04-30 17:51 ` Avi Kivity
2009-04-30 16:33 ` Anthony Liguori
2009-04-30 16:32 ` Anthony Liguori
2009-04-30 16:57 ` Blue Swirl
2009-04-30 17:11 ` Anthony Liguori
2009-04-30 17:45 ` Jan Kiszka
2009-04-30 17:48 ` Avi Kivity
2009-04-30 18:17 ` Jan Kiszka
2009-04-30 18:19 ` Avi Kivity
2009-04-30 18:22 ` Anthony Liguori
2009-04-30 17:59 ` Anthony Liguori
2009-04-30 18:10 ` Blue Swirl
2009-04-30 18:20 ` Jan Kiszka
2009-04-30 18:32 ` Anthony Liguori
2009-04-30 18:57 ` Blue Swirl
2009-04-30 18:16 ` Jan Kiszka
2009-04-29 7:36 ` Markus Armbruster
2009-04-16 14:49 ` Mark McLoughlin
2009-04-15 17:13 ` [Qemu-devel] Re: [PATCH 5/9] Remove some useless malloc() checking Jan Kiszka
2009-04-15 16:55 ` [Qemu-devel] [PATCH 2/9] struct iovec is now universally available Christoph Hellwig
2009-04-15 17:25 ` Mark McLoughlin
2009-04-15 17:27 ` Christoph Hellwig
2009-04-15 21:18 ` François Revol
2009-04-15 21:52 ` M. Warner Losh
2009-04-15 17:44 ` M. Warner Losh
2009-04-17 18:06 ` [Qemu-devel] [PATCH 1/9] Remove stray GSO code from virtio_net Anthony Liguori
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=1239812969-8320-9-git-send-email-markmc@redhat.com \
--to=markmc@redhat.com \
--cc=aliguori@us.ibm.com \
--cc=jan.kiszka@siemens.com \
--cc=qemu-devel@nongnu.org \
/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).