diff options
| author | Peter Maydell | 2016-10-31 13:35:39 +0100 |
|---|---|---|
| committer | Peter Maydell | 2016-10-31 13:35:39 +0100 |
| commit | 5ff06787d4921579192e1becfedb9b1954f9bc0d (patch) | |
| tree | 1bdfad68ddf6ee9d8d008b1f0678590f2c59adf7 /hw/xen/xen_devconfig.c | |
| parent | Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-fetch' into st... (diff) | |
| parent | xen: Rename xen_be_del_xendev (diff) | |
| download | qemu-5ff06787d4921579192e1becfedb9b1954f9bc0d.tar.gz qemu-5ff06787d4921579192e1becfedb9b1954f9bc0d.tar.xz qemu-5ff06787d4921579192e1becfedb9b1954f9bc0d.zip | |
Merge remote-tracking branch 'remotes/sstabellini/tags/xen-20161028-tag' into staging
Xen 2016/10/28
# gpg: Signature made Sat 29 Oct 2016 02:03:42 BST
# gpg: using RSA key 0x894F8F4870E1AE90
# gpg: Good signature from "Stefano Stabellini <sstabellini@kernel.org>"
# gpg: aka "Stefano Stabellini <stefano.stabellini@eu.citrix.com>"
# Primary key fingerprint: D04E 33AB A51F 67BA 07D3 0AEA 894F 8F48 70E1 AE90
* remotes/sstabellini/tags/xen-20161028-tag:
xen: Rename xen_be_del_xendev
xen: Rename xen_be_find_xendev
xen: Rename xen_be_evtchn_event
xen: Rename xen_be_send_notify
xen: Rename xen_be_unbind_evtchn
xen: Rename xen_be_printf to xen_pv_printf
xen: Move xenstore cleanup and mkdir functions
xen: Prepare xendev qtail to be shared with frontends
xen: Move evtchn functions to xen_pvdev.c
xen: Move xenstore_update to xen_pvdev.c
xen: Create a new file xen_pvdev.c
xen: Fix coding style warnings
xen: Fix coding style errors
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/xen/xen_devconfig.c')
| -rw-r--r-- | hw/xen/xen_devconfig.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/xen/xen_devconfig.c b/hw/xen/xen_devconfig.c index b7d290df6c..a80e78c0dc 100644 --- a/hw/xen/xen_devconfig.c +++ b/hw/xen/xen_devconfig.c @@ -55,7 +55,7 @@ int xen_config_dev_blk(DriveInfo *disk) const char *filename = qemu_opt_get(disk->opts, "file"); snprintf(device_name, sizeof(device_name), "xvd%c", 'a' + disk->unit); - xen_be_printf(NULL, 1, "config disk %d [%s]: %s\n", + xen_pv_printf(NULL, 1, "config disk %d [%s]: %s\n", disk->unit, device_name, filename); xen_config_dev_dirs("vbd", "qdisk", vdev, fe, be, sizeof(fe)); @@ -83,7 +83,7 @@ int xen_config_dev_nic(NICInfo *nic) snprintf(mac, sizeof(mac), "%02x:%02x:%02x:%02x:%02x:%02x", nic->macaddr.a[0], nic->macaddr.a[1], nic->macaddr.a[2], nic->macaddr.a[3], nic->macaddr.a[4], nic->macaddr.a[5]); - xen_be_printf(NULL, 1, "config nic %d: mac=\"%s\"\n", vlan_id, mac); + xen_pv_printf(NULL, 1, "config nic %d: mac=\"%s\"\n", vlan_id, mac); xen_config_dev_dirs("vif", "qnic", vlan_id, fe, be, sizeof(fe)); /* frontend */ |