From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58856) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMDDk-00065S-LD for qemu-devel@nongnu.org; Sun, 10 Jul 2016 07:48:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bMDDh-0001h7-EL for qemu-devel@nongnu.org; Sun, 10 Jul 2016 07:48:24 -0400 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:35733) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMDDh-0001gS-5u for qemu-devel@nongnu.org; Sun, 10 Jul 2016 07:48:21 -0400 Received: by mail-wm0-x241.google.com with SMTP id k123so13138508wme.2 for ; Sun, 10 Jul 2016 04:48:21 -0700 (PDT) From: Emil Condrea Date: Sun, 10 Jul 2016 14:47:38 +0300 Message-Id: <1468151270-12984-8-git-send-email-emilcondrea@gmail.com> In-Reply-To: <1468151270-12984-1-git-send-email-emilcondrea@gmail.com> References: <1468151270-12984-1-git-send-email-emilcondrea@gmail.com> Subject: [Qemu-devel] [PATCH 07/19] xen: Rename xen_be_unbind_evtchn List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: xen-devel@lists.xen.org, quan.xu@intel.com, dgdegra@tycho.nsa.gov, stefano.stabellini@eu.citrix.com, wei.liu2@citrix.com, stefanb@linux.vnet.ibm.com, eblake@redhat.com, emilcondrea@gmail.com Prepare xen_be_unbind_evtchn to be shared with frontends: * xen_be_unbind_evtchn -> xen_pv_unbind_evtchn Signed-off-by: Emil Condrea --- hw/block/xen_disk.c | 2 +- hw/char/xen_console.c | 2 +- hw/display/xenfb.c | 2 +- hw/net/xen_nic.c | 2 +- hw/xen/xen_pvdev.c | 2 +- include/hw/xen/xen_pvdev.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/block/xen_disk.c b/hw/block/xen_disk.c index ad3f519..0716ca2 100644 --- a/hw/block/xen_disk.c +++ b/hw/block/xen_disk.c @@ -1048,7 +1048,7 @@ static void blk_disconnect(struct XenDevice *xendev) blk_unref(blkdev->blk); blkdev->blk = NULL; } - xen_be_unbind_evtchn(&blkdev->xendev); + xen_pv_unbind_evtchn(&blkdev->xendev); if (blkdev->sring) { xengnttab_unmap(blkdev->xendev.gnttabdev, blkdev->sring, 1); diff --git a/hw/char/xen_console.c b/hw/char/xen_console.c index e6bae67..889f7b2 100644 --- a/hw/char/xen_console.c +++ b/hw/char/xen_console.c @@ -263,7 +263,7 @@ static void con_disconnect(struct XenDevice *xendev) qemu_chr_add_handlers(con->chr, NULL, NULL, NULL, NULL); qemu_chr_fe_release(con->chr); } - xen_be_unbind_evtchn(&con->xendev); + xen_pv_unbind_evtchn(&con->xendev); if (con->sring) { if (!xendev->dev) { diff --git a/hw/display/xenfb.c b/hw/display/xenfb.c index b1e8b3b..250dbc2 100644 --- a/hw/display/xenfb.c +++ b/hw/display/xenfb.c @@ -112,7 +112,7 @@ static int common_bind(struct common *c) static void common_unbind(struct common *c) { - xen_be_unbind_evtchn(&c->xendev); + xen_pv_unbind_evtchn(&c->xendev); if (c->page) { xenforeignmemory_unmap(xen_fmem, c->page, 1); c->page = NULL; diff --git a/hw/net/xen_nic.c b/hw/net/xen_nic.c index 91126b5..1fc6a22 100644 --- a/hw/net/xen_nic.c +++ b/hw/net/xen_nic.c @@ -367,7 +367,7 @@ static void net_disconnect(struct XenDevice *xendev) { struct XenNetDev *netdev = container_of(xendev, struct XenNetDev, xendev); - xen_be_unbind_evtchn(&netdev->xendev); + xen_pv_unbind_evtchn(&netdev->xendev); if (netdev->txs) { xengnttab_unmap(netdev->xendev.gnttabdev, netdev->txs, 1); diff --git a/hw/xen/xen_pvdev.c b/hw/xen/xen_pvdev.c index 7375b43..6bf1ae4 100644 --- a/hw/xen/xen_pvdev.c +++ b/hw/xen/xen_pvdev.c @@ -193,7 +193,7 @@ void xen_be_evtchn_event(void *opaque) } } -void xen_be_unbind_evtchn(struct XenDevice *xendev) +void xen_pv_unbind_evtchn(struct XenDevice *xendev) { if (xendev->local_port == -1) { return; diff --git a/include/hw/xen/xen_pvdev.h b/include/hw/xen/xen_pvdev.h index 3e2dfd8..5c27184 100644 --- a/include/hw/xen/xen_pvdev.h +++ b/include/hw/xen/xen_pvdev.h @@ -71,7 +71,7 @@ void xen_pv_insert_xendev(struct XenDevice *xendev); struct XenDevice *xen_be_del_xendev(int dom, int dev); struct XenDevice *xen_be_find_xendev(const char *type, int dom, int dev); -void xen_be_unbind_evtchn(struct XenDevice *xendev); +void xen_pv_unbind_evtchn(struct XenDevice *xendev); int xen_be_send_notify(struct XenDevice *xendev); void xen_pv_printf(struct XenDevice *xendev, int msg_level, const char *fmt, ...) -- 1.9.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Emil Condrea Subject: [PATCH 07/19] xen: Rename xen_be_unbind_evtchn Date: Sun, 10 Jul 2016 14:47:38 +0300 Message-ID: <1468151270-12984-8-git-send-email-emilcondrea@gmail.com> References: <1468151270-12984-1-git-send-email-emilcondrea@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1468151270-12984-1-git-send-email-emilcondrea@gmail.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: qemu-devel@nongnu.org Cc: wei.liu2@citrix.com, stefanb@linux.vnet.ibm.com, stefano.stabellini@eu.citrix.com, xen-devel@lists.xen.org, quan.xu@intel.com, dgdegra@tycho.nsa.gov, eblake@redhat.com, emilcondrea@gmail.com List-Id: xen-devel@lists.xenproject.org UHJlcGFyZSB4ZW5fYmVfdW5iaW5kX2V2dGNobiB0byBiZSBzaGFyZWQgd2l0aCBmcm9udGVuZHM6 CiAqIHhlbl9iZV91bmJpbmRfZXZ0Y2huIC0+IHhlbl9wdl91bmJpbmRfZXZ0Y2huCgpTaWduZWQt b2ZmLWJ5OiBFbWlsIENvbmRyZWEgPGVtaWxjb25kcmVhQGdtYWlsLmNvbT4KLS0tCiBody9ibG9j ay94ZW5fZGlzay5jICAgICAgICB8IDIgKy0KIGh3L2NoYXIveGVuX2NvbnNvbGUuYyAgICAgIHwg MiArLQogaHcvZGlzcGxheS94ZW5mYi5jICAgICAgICAgfCAyICstCiBody9uZXQveGVuX25pYy5j ICAgICAgICAgICB8IDIgKy0KIGh3L3hlbi94ZW5fcHZkZXYuYyAgICAgICAgIHwgMiArLQogaW5j bHVkZS9ody94ZW4veGVuX3B2ZGV2LmggfCAyICstCiA2IGZpbGVzIGNoYW5nZWQsIDYgaW5zZXJ0 aW9ucygrKSwgNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9ody9ibG9jay94ZW5fZGlzay5j IGIvaHcvYmxvY2sveGVuX2Rpc2suYwppbmRleCBhZDNmNTE5Li4wNzE2Y2EyIDEwMDY0NAotLS0g YS9ody9ibG9jay94ZW5fZGlzay5jCisrKyBiL2h3L2Jsb2NrL3hlbl9kaXNrLmMKQEAgLTEwNDgs NyArMTA0OCw3IEBAIHN0YXRpYyB2b2lkIGJsa19kaXNjb25uZWN0KHN0cnVjdCBYZW5EZXZpY2Ug KnhlbmRldikKICAgICAgICAgYmxrX3VucmVmKGJsa2Rldi0+YmxrKTsKICAgICAgICAgYmxrZGV2 LT5ibGsgPSBOVUxMOwogICAgIH0KLSAgICB4ZW5fYmVfdW5iaW5kX2V2dGNobigmYmxrZGV2LT54 ZW5kZXYpOworICAgIHhlbl9wdl91bmJpbmRfZXZ0Y2huKCZibGtkZXYtPnhlbmRldik7CiAKICAg ICBpZiAoYmxrZGV2LT5zcmluZykgewogICAgICAgICB4ZW5nbnR0YWJfdW5tYXAoYmxrZGV2LT54 ZW5kZXYuZ250dGFiZGV2LCBibGtkZXYtPnNyaW5nLCAxKTsKZGlmZiAtLWdpdCBhL2h3L2NoYXIv eGVuX2NvbnNvbGUuYyBiL2h3L2NoYXIveGVuX2NvbnNvbGUuYwppbmRleCBlNmJhZTY3Li44ODlm N2IyIDEwMDY0NAotLS0gYS9ody9jaGFyL3hlbl9jb25zb2xlLmMKKysrIGIvaHcvY2hhci94ZW5f Y29uc29sZS5jCkBAIC0yNjMsNyArMjYzLDcgQEAgc3RhdGljIHZvaWQgY29uX2Rpc2Nvbm5lY3Qo c3RydWN0IFhlbkRldmljZSAqeGVuZGV2KQogICAgICAgICBxZW11X2Nocl9hZGRfaGFuZGxlcnMo Y29uLT5jaHIsIE5VTEwsIE5VTEwsIE5VTEwsIE5VTEwpOwogICAgICAgICBxZW11X2Nocl9mZV9y ZWxlYXNlKGNvbi0+Y2hyKTsKICAgICB9Ci0gICAgeGVuX2JlX3VuYmluZF9ldnRjaG4oJmNvbi0+ eGVuZGV2KTsKKyAgICB4ZW5fcHZfdW5iaW5kX2V2dGNobigmY29uLT54ZW5kZXYpOwogCiAgICAg aWYgKGNvbi0+c3JpbmcpIHsKICAgICAgICAgaWYgKCF4ZW5kZXYtPmRldikgewpkaWZmIC0tZ2l0 IGEvaHcvZGlzcGxheS94ZW5mYi5jIGIvaHcvZGlzcGxheS94ZW5mYi5jCmluZGV4IGIxZThiM2Iu LjI1MGRiYzIgMTAwNjQ0Ci0tLSBhL2h3L2Rpc3BsYXkveGVuZmIuYworKysgYi9ody9kaXNwbGF5 L3hlbmZiLmMKQEAgLTExMiw3ICsxMTIsNyBAQCBzdGF0aWMgaW50IGNvbW1vbl9iaW5kKHN0cnVj dCBjb21tb24gKmMpCiAKIHN0YXRpYyB2b2lkIGNvbW1vbl91bmJpbmQoc3RydWN0IGNvbW1vbiAq YykKIHsKLSAgICB4ZW5fYmVfdW5iaW5kX2V2dGNobigmYy0+eGVuZGV2KTsKKyAgICB4ZW5fcHZf dW5iaW5kX2V2dGNobigmYy0+eGVuZGV2KTsKICAgICBpZiAoYy0+cGFnZSkgewogICAgICAgICB4 ZW5mb3JlaWdubWVtb3J5X3VubWFwKHhlbl9mbWVtLCBjLT5wYWdlLCAxKTsKIAljLT5wYWdlID0g TlVMTDsKZGlmZiAtLWdpdCBhL2h3L25ldC94ZW5fbmljLmMgYi9ody9uZXQveGVuX25pYy5jCmlu ZGV4IDkxMTI2YjUuLjFmYzZhMjIgMTAwNjQ0Ci0tLSBhL2h3L25ldC94ZW5fbmljLmMKKysrIGIv aHcvbmV0L3hlbl9uaWMuYwpAQCAtMzY3LDcgKzM2Nyw3IEBAIHN0YXRpYyB2b2lkIG5ldF9kaXNj b25uZWN0KHN0cnVjdCBYZW5EZXZpY2UgKnhlbmRldikKIHsKICAgICBzdHJ1Y3QgWGVuTmV0RGV2 ICpuZXRkZXYgPSBjb250YWluZXJfb2YoeGVuZGV2LCBzdHJ1Y3QgWGVuTmV0RGV2LCB4ZW5kZXYp OwogCi0gICAgeGVuX2JlX3VuYmluZF9ldnRjaG4oJm5ldGRldi0+eGVuZGV2KTsKKyAgICB4ZW5f cHZfdW5iaW5kX2V2dGNobigmbmV0ZGV2LT54ZW5kZXYpOwogCiAgICAgaWYgKG5ldGRldi0+dHhz KSB7CiAgICAgICAgIHhlbmdudHRhYl91bm1hcChuZXRkZXYtPnhlbmRldi5nbnR0YWJkZXYsIG5l dGRldi0+dHhzLCAxKTsKZGlmZiAtLWdpdCBhL2h3L3hlbi94ZW5fcHZkZXYuYyBiL2h3L3hlbi94 ZW5fcHZkZXYuYwppbmRleCA3Mzc1YjQzLi42YmYxYWU0IDEwMDY0NAotLS0gYS9ody94ZW4veGVu X3B2ZGV2LmMKKysrIGIvaHcveGVuL3hlbl9wdmRldi5jCkBAIC0xOTMsNyArMTkzLDcgQEAgdm9p ZCB4ZW5fYmVfZXZ0Y2huX2V2ZW50KHZvaWQgKm9wYXF1ZSkKICAgICB9CiB9CiAKLXZvaWQgeGVu X2JlX3VuYmluZF9ldnRjaG4oc3RydWN0IFhlbkRldmljZSAqeGVuZGV2KQordm9pZCB4ZW5fcHZf dW5iaW5kX2V2dGNobihzdHJ1Y3QgWGVuRGV2aWNlICp4ZW5kZXYpCiB7CiAgICAgaWYgKHhlbmRl di0+bG9jYWxfcG9ydCA9PSAtMSkgewogICAgICAgICByZXR1cm47CmRpZmYgLS1naXQgYS9pbmNs dWRlL2h3L3hlbi94ZW5fcHZkZXYuaCBiL2luY2x1ZGUvaHcveGVuL3hlbl9wdmRldi5oCmluZGV4 IDNlMmRmZDguLjVjMjcxODQgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUvaHcveGVuL3hlbl9wdmRldi5o CisrKyBiL2luY2x1ZGUvaHcveGVuL3hlbl9wdmRldi5oCkBAIC03MSw3ICs3MSw3IEBAIHZvaWQg eGVuX3B2X2luc2VydF94ZW5kZXYoc3RydWN0IFhlbkRldmljZSAqeGVuZGV2KTsKIHN0cnVjdCBY ZW5EZXZpY2UgKnhlbl9iZV9kZWxfeGVuZGV2KGludCBkb20sIGludCBkZXYpOwogc3RydWN0IFhl bkRldmljZSAqeGVuX2JlX2ZpbmRfeGVuZGV2KGNvbnN0IGNoYXIgKnR5cGUsIGludCBkb20sIGlu dCBkZXYpOwogCi12b2lkIHhlbl9iZV91bmJpbmRfZXZ0Y2huKHN0cnVjdCBYZW5EZXZpY2UgKnhl bmRldik7Cit2b2lkIHhlbl9wdl91bmJpbmRfZXZ0Y2huKHN0cnVjdCBYZW5EZXZpY2UgKnhlbmRl dik7CiBpbnQgeGVuX2JlX3NlbmRfbm90aWZ5KHN0cnVjdCBYZW5EZXZpY2UgKnhlbmRldik7CiAK IHZvaWQgeGVuX3B2X3ByaW50ZihzdHJ1Y3QgWGVuRGV2aWNlICp4ZW5kZXYsIGludCBtc2dfbGV2 ZWwsIGNvbnN0IGNoYXIgKmZtdCwgLi4uKQotLSAKMS45LjEKCgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1k ZXZlbEBsaXN0cy54ZW4ub3JnCmh0dHBzOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK