From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58882) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMDDp-00066z-4I for qemu-devel@nongnu.org; Sun, 10 Jul 2016 07:48:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bMDDn-0001iY-22 for qemu-devel@nongnu.org; Sun, 10 Jul 2016 07:48:28 -0400 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:34333) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMDDm-0001iU-Ro for qemu-devel@nongnu.org; Sun, 10 Jul 2016 07:48:26 -0400 Received: by mail-wm0-x243.google.com with SMTP id w75so13126975wmd.1 for ; Sun, 10 Jul 2016 04:48:26 -0700 (PDT) From: Emil Condrea Date: Sun, 10 Jul 2016 14:47:41 +0300 Message-Id: <1468151270-12984-11-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 10/19] xen: Rename xen_be_find_xendev 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_find_xendev to be shared with frontends: * xen_be_find_xendev -> xen_pv_find_xendev Signed-off-by: Emil Condrea --- hw/display/xenfb.c | 4 ++-- hw/xen/xen_backend.c | 2 +- hw/xen/xen_pvdev.c | 2 +- include/hw/xen/xen_pvdev.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/display/xenfb.c b/hw/display/xenfb.c index 01ae00f..df13912 100644 --- a/hw/display/xenfb.c +++ b/hw/display/xenfb.c @@ -978,8 +978,8 @@ void xen_init_display(int domid) wait_more: i++; main_loop_wait(true); - xfb = xen_be_find_xendev("vfb", domid, 0); - xin = xen_be_find_xendev("vkbd", domid, 0); + xfb = xen_pv_find_xendev("vfb", domid, 0); + xin = xen_pv_find_xendev("vkbd", domid, 0); if (!xfb || !xin) { if (i < 256) { usleep(10000); diff --git a/hw/xen/xen_backend.c b/hw/xen/xen_backend.c index d6c04c7..51afb1c 100644 --- a/hw/xen/xen_backend.c +++ b/hw/xen/xen_backend.c @@ -148,7 +148,7 @@ static struct XenDevice *xen_be_get_xendev(const char *type, int dom, int dev, { struct XenDevice *xendev; - xendev = xen_be_find_xendev(type, dom, dev); + xendev = xen_pv_find_xendev(type, dom, dev); if (xendev) { return xendev; } diff --git a/hw/xen/xen_pvdev.c b/hw/xen/xen_pvdev.c index 5482ab0..24266fa 100644 --- a/hw/xen/xen_pvdev.c +++ b/hw/xen/xen_pvdev.c @@ -211,7 +211,7 @@ int xen_pv_send_notify(struct XenDevice *xendev) /* ------------------------------------------------------------- */ -struct XenDevice *xen_be_find_xendev(const char *type, int dom, int dev) +struct XenDevice *xen_pv_find_xendev(const char *type, int dom, int dev) { struct XenDevice *xendev; diff --git a/include/hw/xen/xen_pvdev.h b/include/hw/xen/xen_pvdev.h index a06afb6..f26d82a 100644 --- a/include/hw/xen/xen_pvdev.h +++ b/include/hw/xen/xen_pvdev.h @@ -69,7 +69,7 @@ const char *xenbus_strstate(enum xenbus_state state); void xen_pv_evtchn_event(void *opaque); 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); +struct XenDevice *xen_pv_find_xendev(const char *type, int dom, int dev); void xen_pv_unbind_evtchn(struct XenDevice *xendev); int xen_pv_send_notify(struct XenDevice *xendev); -- 1.9.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Emil Condrea Subject: [PATCH 10/19] xen: Rename xen_be_find_xendev Date: Sun, 10 Jul 2016 14:47:41 +0300 Message-ID: <1468151270-12984-11-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 UHJlcGFyZSB4ZW5fYmVfZmluZF94ZW5kZXYgdG8gYmUgc2hhcmVkIHdpdGggZnJvbnRlbmRzOgog KiB4ZW5fYmVfZmluZF94ZW5kZXYgLT4geGVuX3B2X2ZpbmRfeGVuZGV2CgpTaWduZWQtb2ZmLWJ5 OiBFbWlsIENvbmRyZWEgPGVtaWxjb25kcmVhQGdtYWlsLmNvbT4KLS0tCiBody9kaXNwbGF5L3hl bmZiLmMgICAgICAgICB8IDQgKystLQogaHcveGVuL3hlbl9iYWNrZW5kLmMgICAgICAgfCAyICst CiBody94ZW4veGVuX3B2ZGV2LmMgICAgICAgICB8IDIgKy0KIGluY2x1ZGUvaHcveGVuL3hlbl9w dmRldi5oIHwgMiArLQogNCBmaWxlcyBjaGFuZ2VkLCA1IGluc2VydGlvbnMoKyksIDUgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvaHcvZGlzcGxheS94ZW5mYi5jIGIvaHcvZGlzcGxheS94ZW5m Yi5jCmluZGV4IDAxYWUwMGYuLmRmMTM5MTIgMTAwNjQ0Ci0tLSBhL2h3L2Rpc3BsYXkveGVuZmIu YworKysgYi9ody9kaXNwbGF5L3hlbmZiLmMKQEAgLTk3OCw4ICs5NzgsOCBAQCB2b2lkIHhlbl9p bml0X2Rpc3BsYXkoaW50IGRvbWlkKQogd2FpdF9tb3JlOgogICAgIGkrKzsKICAgICBtYWluX2xv b3Bfd2FpdCh0cnVlKTsKLSAgICB4ZmIgPSB4ZW5fYmVfZmluZF94ZW5kZXYoInZmYiIsIGRvbWlk LCAwKTsKLSAgICB4aW4gPSB4ZW5fYmVfZmluZF94ZW5kZXYoInZrYmQiLCBkb21pZCwgMCk7Cisg ICAgeGZiID0geGVuX3B2X2ZpbmRfeGVuZGV2KCJ2ZmIiLCBkb21pZCwgMCk7CisgICAgeGluID0g eGVuX3B2X2ZpbmRfeGVuZGV2KCJ2a2JkIiwgZG9taWQsIDApOwogICAgIGlmICgheGZiIHx8ICF4 aW4pIHsKICAgICAgICAgaWYgKGkgPCAyNTYpIHsKICAgICAgICAgICAgIHVzbGVlcCgxMDAwMCk7 CmRpZmYgLS1naXQgYS9ody94ZW4veGVuX2JhY2tlbmQuYyBiL2h3L3hlbi94ZW5fYmFja2VuZC5j CmluZGV4IGQ2YzA0YzcuLjUxYWZiMWMgMTAwNjQ0Ci0tLSBhL2h3L3hlbi94ZW5fYmFja2VuZC5j CisrKyBiL2h3L3hlbi94ZW5fYmFja2VuZC5jCkBAIC0xNDgsNyArMTQ4LDcgQEAgc3RhdGljIHN0 cnVjdCBYZW5EZXZpY2UgKnhlbl9iZV9nZXRfeGVuZGV2KGNvbnN0IGNoYXIgKnR5cGUsIGludCBk b20sIGludCBkZXYsCiB7CiAgICAgc3RydWN0IFhlbkRldmljZSAqeGVuZGV2OwogCi0gICAgeGVu ZGV2ID0geGVuX2JlX2ZpbmRfeGVuZGV2KHR5cGUsIGRvbSwgZGV2KTsKKyAgICB4ZW5kZXYgPSB4 ZW5fcHZfZmluZF94ZW5kZXYodHlwZSwgZG9tLCBkZXYpOwogICAgIGlmICh4ZW5kZXYpIHsKICAg ICAgICAgcmV0dXJuIHhlbmRldjsKICAgICB9CmRpZmYgLS1naXQgYS9ody94ZW4veGVuX3B2ZGV2 LmMgYi9ody94ZW4veGVuX3B2ZGV2LmMKaW5kZXggNTQ4MmFiMC4uMjQyNjZmYSAxMDA2NDQKLS0t IGEvaHcveGVuL3hlbl9wdmRldi5jCisrKyBiL2h3L3hlbi94ZW5fcHZkZXYuYwpAQCAtMjExLDcg KzIxMSw3IEBAIGludCB4ZW5fcHZfc2VuZF9ub3RpZnkoc3RydWN0IFhlbkRldmljZSAqeGVuZGV2 KQogCiAvKiAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tICovCiAKLXN0cnVjdCBYZW5EZXZpY2UgKnhlbl9iZV9maW5kX3hlbmRldihj b25zdCBjaGFyICp0eXBlLCBpbnQgZG9tLCBpbnQgZGV2KQorc3RydWN0IFhlbkRldmljZSAqeGVu X3B2X2ZpbmRfeGVuZGV2KGNvbnN0IGNoYXIgKnR5cGUsIGludCBkb20sIGludCBkZXYpCiB7CiAg ICAgc3RydWN0IFhlbkRldmljZSAqeGVuZGV2OwogCmRpZmYgLS1naXQgYS9pbmNsdWRlL2h3L3hl bi94ZW5fcHZkZXYuaCBiL2luY2x1ZGUvaHcveGVuL3hlbl9wdmRldi5oCmluZGV4IGEwNmFmYjYu LmYyNmQ4MmEgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUvaHcveGVuL3hlbl9wdmRldi5oCisrKyBiL2lu Y2x1ZGUvaHcveGVuL3hlbl9wdmRldi5oCkBAIC02OSw3ICs2OSw3IEBAIGNvbnN0IGNoYXIgKnhl bmJ1c19zdHJzdGF0ZShlbnVtIHhlbmJ1c19zdGF0ZSBzdGF0ZSk7CiB2b2lkIHhlbl9wdl9ldnRj aG5fZXZlbnQodm9pZCAqb3BhcXVlKTsKIHZvaWQgeGVuX3B2X2luc2VydF94ZW5kZXYoc3RydWN0 IFhlbkRldmljZSAqeGVuZGV2KTsKIHN0cnVjdCBYZW5EZXZpY2UgKnhlbl9iZV9kZWxfeGVuZGV2 KGludCBkb20sIGludCBkZXYpOwotc3RydWN0IFhlbkRldmljZSAqeGVuX2JlX2ZpbmRfeGVuZGV2 KGNvbnN0IGNoYXIgKnR5cGUsIGludCBkb20sIGludCBkZXYpOworc3RydWN0IFhlbkRldmljZSAq eGVuX3B2X2ZpbmRfeGVuZGV2KGNvbnN0IGNoYXIgKnR5cGUsIGludCBkb20sIGludCBkZXYpOwog CiB2b2lkIHhlbl9wdl91bmJpbmRfZXZ0Y2huKHN0cnVjdCBYZW5EZXZpY2UgKnhlbmRldik7CiBp bnQgeGVuX3B2X3NlbmRfbm90aWZ5KHN0cnVjdCBYZW5EZXZpY2UgKnhlbmRldik7Ci0tIAoxLjku MQoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1k ZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0cHM6Ly9saXN0cy54 ZW4ub3JnL3hlbi1kZXZlbAo=