From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=39125 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PoO9e-0005Hy-Hd for qemu-devel@nongnu.org; Sat, 12 Feb 2011 17:41:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PoO9d-00087X-10 for qemu-devel@nongnu.org; Sat, 12 Feb 2011 17:41:26 -0500 Received: from mail-vw0-f45.google.com ([209.85.212.45]:35542) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PoO9c-00087T-Ri for qemu-devel@nongnu.org; Sat, 12 Feb 2011 17:41:24 -0500 Received: by vws12 with SMTP id 12so2377505vws.4 for ; Sat, 12 Feb 2011 14:41:24 -0800 (PST) MIME-Version: 1.0 From: Blue Swirl Date: Sun, 13 Feb 2011 00:41:03 +0200 Message-ID: Content-Type: multipart/mixed; boundary=90e6ba53a2faa1a2a1049c1d8392 Subject: [Qemu-devel] [PATCH 03/10] ne2000_isa: refactor device creation List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel --90e6ba53a2faa1a2a1049c1d8392 Content-Type: text/plain; charset=UTF-8 Turn isa_ne2000_init into an inline function. Signed-off-by: Blue Swirl --- hw/ne2000-isa.c | 13 ------------- hw/pc.h | 12 +++++++++++- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/hw/ne2000-isa.c b/hw/ne2000-isa.c index 3ff0d89..e41dbba 100644 --- a/hw/ne2000-isa.c +++ b/hw/ne2000-isa.c @@ -92,19 +92,6 @@ static int isa_ne2000_initfn(ISADevice *dev) return 0; } -void isa_ne2000_init(int base, int irq, NICInfo *nd) -{ - ISADevice *dev; - - qemu_check_nic_model(nd, "ne2k_isa"); - - dev = isa_create("ne2k_isa"); - qdev_prop_set_uint32(&dev->qdev, "iobase", base); - qdev_prop_set_uint32(&dev->qdev, "irq", irq); - qdev_set_nic_properties(&dev->qdev, nd); - qdev_init_nofail(&dev->qdev); -} - static ISADeviceInfo ne2000_isa_info = { .qdev.name = "ne2k_isa", .qdev.size = sizeof(ISANE2000State), diff --git a/hw/pc.h b/hw/pc.h index f823b7d..abdf307 100644 --- a/hw/pc.h +++ b/hw/pc.h @@ -176,8 +176,18 @@ void pci_cirrus_vga_init(PCIBus *bus); void isa_cirrus_vga_init(void); /* ne2000.c */ +static inline void isa_ne2000_init(int base, int irq, NICInfo *nd) +{ + ISADevice *dev; -void isa_ne2000_init(int base, int irq, NICInfo *nd); + qemu_check_nic_model(nd, "ne2k_isa"); + + dev = isa_create("ne2k_isa"); + qdev_prop_set_uint32(&dev->qdev, "iobase", base); + qdev_prop_set_uint32(&dev->qdev, "irq", irq); + qdev_set_nic_properties(&dev->qdev, nd); + qdev_init_nofail(&dev->qdev); +} /* e820 types */ #define E820_RAM 1 -- 1.6.2.4 --90e6ba53a2faa1a2a1049c1d8392 Content-Type: application/mbox; name="0003-ne2000_isa-refactor-device-creation.patch" Content-Disposition: attachment; filename="0003-ne2000_isa-refactor-device-creation.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_gk340rs90 RnJvbSBlNzU3NzE5MDM0MGVlMGE0MmM0Yjg4ZTFmYzQ3OTIwMmFiODQ2MDM4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpNZXNzYWdlLUlkOiA8ZTc1NzcxOTAzNDBlZTBhNDJjNGI4OGUxZmM0Nzky MDJhYjg0NjAzOC4xMjk3NTUwMjI4LmdpdC5ibGF1d2lyYmVsQGdtYWlsLmNvbT4KSW4tUmVwbHkt VG86IDw1MzNmNThkNTEyZDZhNGM0ZTAwNGU5ZWZkZmI4MDdiMWJhODRhNWRlLjEyOTc1NTAyMjgu Z2l0LmJsYXV3aXJiZWxAZ21haWwuY29tPgpSZWZlcmVuY2VzOiA8NTMzZjU4ZDUxMmQ2YTRjNGUw MDRlOWVmZGZiODA3YjFiYTg0YTVkZS4xMjk3NTUwMjI4LmdpdC5ibGF1d2lyYmVsQGdtYWlsLmNv bT4KRnJvbTogQmx1ZSBTd2lybCA8YmxhdXdpcmJlbEBnbWFpbC5jb20+CkRhdGU6IFNhdCwgNSBG ZWIgMjAxMSAxNTozOTo1NyArMDAwMApTdWJqZWN0OiBbUEFUQ0ggMDMvMTBdIG5lMjAwMF9pc2E6 IHJlZmFjdG9yIGRldmljZSBjcmVhdGlvbgoKVHVybiBpc2FfbmUyMDAwX2luaXQgaW50byBhbiBp bmxpbmUgZnVuY3Rpb24uCgpTaWduZWQtb2ZmLWJ5OiBCbHVlIFN3aXJsIDxibGF1d2lyYmVsQGdt YWlsLmNvbT4KLS0tCiBody9uZTIwMDAtaXNhLmMgfCAgIDEzIC0tLS0tLS0tLS0tLS0KIGh3L3Bj LmggICAgICAgICB8ICAgMTIgKysrKysrKysrKystCiAyIGZpbGVzIGNoYW5nZWQsIDExIGluc2Vy dGlvbnMoKyksIDE0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2h3L25lMjAwMC1pc2EuYyBi L2h3L25lMjAwMC1pc2EuYwppbmRleCAzZmYwZDg5Li5lNDFkYmJhIDEwMDY0NAotLS0gYS9ody9u ZTIwMDAtaXNhLmMKKysrIGIvaHcvbmUyMDAwLWlzYS5jCkBAIC05MiwxOSArOTIsNiBAQCBzdGF0 aWMgaW50IGlzYV9uZTIwMDBfaW5pdGZuKElTQURldmljZSAqZGV2KQogICAgIHJldHVybiAwOwog fQogCi12b2lkIGlzYV9uZTIwMDBfaW5pdChpbnQgYmFzZSwgaW50IGlycSwgTklDSW5mbyAqbmQp Ci17Ci0gICAgSVNBRGV2aWNlICpkZXY7Ci0KLSAgICBxZW11X2NoZWNrX25pY19tb2RlbChuZCwg Im5lMmtfaXNhIik7Ci0KLSAgICBkZXYgPSBpc2FfY3JlYXRlKCJuZTJrX2lzYSIpOwotICAgIHFk ZXZfcHJvcF9zZXRfdWludDMyKCZkZXYtPnFkZXYsICJpb2Jhc2UiLCBiYXNlKTsKLSAgICBxZGV2 X3Byb3Bfc2V0X3VpbnQzMigmZGV2LT5xZGV2LCAiaXJxIiwgICAgaXJxKTsKLSAgICBxZGV2X3Nl dF9uaWNfcHJvcGVydGllcygmZGV2LT5xZGV2LCBuZCk7Ci0gICAgcWRldl9pbml0X25vZmFpbCgm ZGV2LT5xZGV2KTsKLX0KLQogc3RhdGljIElTQURldmljZUluZm8gbmUyMDAwX2lzYV9pbmZvID0g ewogICAgIC5xZGV2Lm5hbWUgID0gIm5lMmtfaXNhIiwKICAgICAucWRldi5zaXplICA9IHNpemVv ZihJU0FORTIwMDBTdGF0ZSksCmRpZmYgLS1naXQgYS9ody9wYy5oIGIvaHcvcGMuaAppbmRleCBm ODIzYjdkLi5hYmRmMzA3IDEwMDY0NAotLS0gYS9ody9wYy5oCisrKyBiL2h3L3BjLmgKQEAgLTE3 Niw4ICsxNzYsMTggQEAgdm9pZCBwY2lfY2lycnVzX3ZnYV9pbml0KFBDSUJ1cyAqYnVzKTsKIHZv aWQgaXNhX2NpcnJ1c192Z2FfaW5pdCh2b2lkKTsKIAogLyogbmUyMDAwLmMgKi8KK3N0YXRpYyBp bmxpbmUgdm9pZCBpc2FfbmUyMDAwX2luaXQoaW50IGJhc2UsIGludCBpcnEsIE5JQ0luZm8gKm5k KQoreworICAgIElTQURldmljZSAqZGV2OwogCi12b2lkIGlzYV9uZTIwMDBfaW5pdChpbnQgYmFz ZSwgaW50IGlycSwgTklDSW5mbyAqbmQpOworICAgIHFlbXVfY2hlY2tfbmljX21vZGVsKG5kLCAi bmUya19pc2EiKTsKKworICAgIGRldiA9IGlzYV9jcmVhdGUoIm5lMmtfaXNhIik7CisgICAgcWRl dl9wcm9wX3NldF91aW50MzIoJmRldi0+cWRldiwgImlvYmFzZSIsIGJhc2UpOworICAgIHFkZXZf cHJvcF9zZXRfdWludDMyKCZkZXYtPnFkZXYsICJpcnEiLCAgICBpcnEpOworICAgIHFkZXZfc2V0 X25pY19wcm9wZXJ0aWVzKCZkZXYtPnFkZXYsIG5kKTsKKyAgICBxZGV2X2luaXRfbm9mYWlsKCZk ZXYtPnFkZXYpOworfQogCiAvKiBlODIwIHR5cGVzICovCiAjZGVmaW5lIEU4MjBfUkFNICAgICAg ICAxCi0tIAoxLjcuMi4zCgo= --90e6ba53a2faa1a2a1049c1d8392--