From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:55684) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TrEq9-0008HV-Rm for qemu-devel@nongnu.org; Fri, 04 Jan 2013 16:30:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TrEq8-0005T9-HH for qemu-devel@nongnu.org; Fri, 04 Jan 2013 16:30:09 -0500 Received: from smtp1-g21.free.fr ([2a01:e0c:1:1599::10]:33973) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TrEq8-0005Pw-03 for qemu-devel@nongnu.org; Fri, 04 Jan 2013 16:30:08 -0500 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Fri, 4 Jan 2013 22:29:40 +0100 Message-Id: <1357334986-13941-6-git-send-email-hpoussin@reactos.org> In-Reply-To: <1357334986-13941-1-git-send-email-hpoussin@reactos.org> References: <1357334986-13941-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 05/10] xen_platform: do not use old_portio-style callbacks List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , "open list:X86" , =?UTF-8?q?Herv=C3=A9=20Poussineau?= Signed-off-by: Herv=C3=A9 Poussineau --- hw/xen_platform.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/hw/xen_platform.c b/hw/xen_platform.c index e7611bb..02e0146 100644 --- a/hw/xen_platform.c +++ b/hw/xen_platform.c @@ -279,7 +279,8 @@ static void platform_fixed_ioport_init(PCIXenPlatform= State* s) =20 /* Xen Platform PCI Device */ =20 -static uint32_t xen_platform_ioport_readb(void *opaque, uint32_t addr) +static uint64_t xen_platform_ioport_readb(void *opaque, hwaddr addr, + unsigned int size) { if (addr =3D=3D 0) { return platform_fixed_ioport_readb(opaque, 0); @@ -288,30 +289,28 @@ static uint32_t xen_platform_ioport_readb(void *opa= que, uint32_t addr) } } =20 -static void xen_platform_ioport_writeb(void *opaque, uint32_t addr, uint= 32_t val) +static void xen_platform_ioport_writeb(void *opaque, hwaddr addr, + uint64_t val, unsigned int size) { PCIXenPlatformState *s =3D opaque; =20 switch (addr) { case 0: /* Platform flags */ - platform_fixed_ioport_writeb(opaque, 0, val); + platform_fixed_ioport_writeb(opaque, 0, (uint32_t)val); break; case 8: - log_writeb(s, val); + log_writeb(s, (uint32_t)val); break; default: break; } } =20 -static MemoryRegionPortio xen_pci_portio[] =3D { - { 0, 0x100, 1, .read =3D xen_platform_ioport_readb, }, - { 0, 0x100, 1, .write =3D xen_platform_ioport_writeb, }, - PORTIO_END_OF_LIST() -}; - static const MemoryRegionOps xen_pci_io_ops =3D { - .old_portio =3D xen_pci_portio, + .read =3D xen_platform_ioport_readb, + .write =3D xen_platform_ioport_writeb, + .impl.min_access_size =3D 1, + .impl.max_access_size =3D 1, }; =20 static void platform_ioport_bar_setup(PCIXenPlatformState *d) --=20 1.7.10.4 From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Subject: [PATCH 05/10] xen_platform: do not use old_portio-style callbacks Date: Fri, 4 Jan 2013 22:29:40 +0100 Message-ID: <1357334986-13941-6-git-send-email-hpoussin@reactos.org> References: <1357334986-13941-1-git-send-email-hpoussin@reactos.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1357334986-13941-1-git-send-email-hpoussin@reactos.org> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , "open list:X86" , =?UTF-8?q?Herv=C3=A9=20Poussineau?= List-Id: xen-devel@lists.xenproject.org U2lnbmVkLW9mZi1ieTogSGVydsOpIFBvdXNzaW5lYXUgPGhwb3Vzc2luQHJlYWN0b3Mub3JnPgot LS0KIGh3L3hlbl9wbGF0Zm9ybS5jIHwgICAyMSArKysrKysrKysrLS0tLS0tLS0tLS0KIDEgZmls ZSBjaGFuZ2VkLCAxMCBpbnNlcnRpb25zKCspLCAxMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9ody94ZW5fcGxhdGZvcm0uYyBiL2h3L3hlbl9wbGF0Zm9ybS5jCmluZGV4IGU3NjExYmIuLjAy ZTAxNDYgMTAwNjQ0Ci0tLSBhL2h3L3hlbl9wbGF0Zm9ybS5jCisrKyBiL2h3L3hlbl9wbGF0Zm9y bS5jCkBAIC0yNzksNyArMjc5LDggQEAgc3RhdGljIHZvaWQgcGxhdGZvcm1fZml4ZWRfaW9wb3J0 X2luaXQoUENJWGVuUGxhdGZvcm1TdGF0ZSogcykKIAogLyogWGVuIFBsYXRmb3JtIFBDSSBEZXZp Y2UgKi8KIAotc3RhdGljIHVpbnQzMl90IHhlbl9wbGF0Zm9ybV9pb3BvcnRfcmVhZGIodm9pZCAq b3BhcXVlLCB1aW50MzJfdCBhZGRyKQorc3RhdGljIHVpbnQ2NF90IHhlbl9wbGF0Zm9ybV9pb3Bv cnRfcmVhZGIodm9pZCAqb3BhcXVlLCBod2FkZHIgYWRkciwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGludCBzaXplKQogewogICAgIGlmIChhZGRy ID09IDApIHsKICAgICAgICAgcmV0dXJuIHBsYXRmb3JtX2ZpeGVkX2lvcG9ydF9yZWFkYihvcGFx dWUsIDApOwpAQCAtMjg4LDMwICsyODksMjggQEAgc3RhdGljIHVpbnQzMl90IHhlbl9wbGF0Zm9y bV9pb3BvcnRfcmVhZGIodm9pZCAqb3BhcXVlLCB1aW50MzJfdCBhZGRyKQogICAgIH0KIH0KIAot c3RhdGljIHZvaWQgeGVuX3BsYXRmb3JtX2lvcG9ydF93cml0ZWIodm9pZCAqb3BhcXVlLCB1aW50 MzJfdCBhZGRyLCB1aW50MzJfdCB2YWwpCitzdGF0aWMgdm9pZCB4ZW5fcGxhdGZvcm1faW9wb3J0 X3dyaXRlYih2b2lkICpvcGFxdWUsIGh3YWRkciBhZGRyLAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgdWludDY0X3QgdmFsLCB1bnNpZ25lZCBpbnQgc2l6ZSkKIHsKICAg ICBQQ0lYZW5QbGF0Zm9ybVN0YXRlICpzID0gb3BhcXVlOwogCiAgICAgc3dpdGNoIChhZGRyKSB7 CiAgICAgY2FzZSAwOiAvKiBQbGF0Zm9ybSBmbGFncyAqLwotICAgICAgICBwbGF0Zm9ybV9maXhl ZF9pb3BvcnRfd3JpdGViKG9wYXF1ZSwgMCwgdmFsKTsKKyAgICAgICAgcGxhdGZvcm1fZml4ZWRf aW9wb3J0X3dyaXRlYihvcGFxdWUsIDAsICh1aW50MzJfdCl2YWwpOwogICAgICAgICBicmVhazsK ICAgICBjYXNlIDg6Ci0gICAgICAgIGxvZ193cml0ZWIocywgdmFsKTsKKyAgICAgICAgbG9nX3dy aXRlYihzLCAodWludDMyX3QpdmFsKTsKICAgICAgICAgYnJlYWs7CiAgICAgZGVmYXVsdDoKICAg ICAgICAgYnJlYWs7CiAgICAgfQogfQogCi1zdGF0aWMgTWVtb3J5UmVnaW9uUG9ydGlvIHhlbl9w Y2lfcG9ydGlvW10gPSB7Ci0gICAgeyAwLCAweDEwMCwgMSwgLnJlYWQgPSB4ZW5fcGxhdGZvcm1f aW9wb3J0X3JlYWRiLCB9LAotICAgIHsgMCwgMHgxMDAsIDEsIC53cml0ZSA9IHhlbl9wbGF0Zm9y bV9pb3BvcnRfd3JpdGViLCB9LAotICAgIFBPUlRJT19FTkRfT0ZfTElTVCgpCi19OwotCiBzdGF0 aWMgY29uc3QgTWVtb3J5UmVnaW9uT3BzIHhlbl9wY2lfaW9fb3BzID0gewotICAgIC5vbGRfcG9y dGlvID0geGVuX3BjaV9wb3J0aW8sCisgICAgLnJlYWQgID0geGVuX3BsYXRmb3JtX2lvcG9ydF9y ZWFkYiwKKyAgICAud3JpdGUgPSB4ZW5fcGxhdGZvcm1faW9wb3J0X3dyaXRlYiwKKyAgICAuaW1w bC5taW5fYWNjZXNzX3NpemUgPSAxLAorICAgIC5pbXBsLm1heF9hY2Nlc3Nfc2l6ZSA9IDEsCiB9 OwogCiBzdGF0aWMgdm9pZCBwbGF0Zm9ybV9pb3BvcnRfYmFyX3NldHVwKFBDSVhlblBsYXRmb3Jt U3RhdGUgKmQpCi0tIAoxLjcuMTAuNAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhl bi5vcmcKaHR0cDovL2xpc3RzLnhlbi5vcmcveGVuLWRldmVsCg==