From 2122cd12101fcf8d3289ae516ec4612d986a00d8 Mon Sep 17 00:00:00 2001

Message-Id: <2122cd12101fcf8d3289ae516ec4612d986a00d8.1387276076.git.minovotn@redhat.com>

In-Reply-To: <e610718166120379517e80d1a7aa12d60294209b.1387276076.git.minovotn@redhat.com>

References: <e610718166120379517e80d1a7aa12d60294209b.1387276076.git.minovotn@redhat.com>

From: Markus Armbruster <armbru@redhat.com>

Date: Tue, 10 Dec 2013 15:12:56 +0100

Subject: [PATCH 15/16] trace-events: Clean up after removal of old usb-host

 code

RH-Author: Markus Armbruster <armbru@redhat.com>

Message-id: <1386688376-29521-8-git-send-email-armbru@redhat.com>

Patchwork-id: 56117

O-Subject: [PATCH 7.0 qemu-kvm 7/7] trace-events: Clean up after removal of old usb-host code

Bugzilla: 997832

RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>

RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>

RH-Acked-by: Laszlo Ersek <lersek@redhat.com>

From: Markus Armbruster <armbru@redhat.com>

Commit b5613fd neglected to drop the trace events along with the code.

Signed-off-by: Markus Armbruster <armbru@redhat.com>

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

(cherry picked from commit 904c063039f5923a07ce35fc40ed78ec6f7dee1a)

---

 trace-events | 13 -------------

 1 file changed, 13 deletions(-)

Signed-off-by: Michal Novotny <minovotn@redhat.com>

---

 trace-events | 13 -------------

 1 file changed, 13 deletions(-)

diff --git a/trace-events b/trace-events

index 2336943..b72a72f 100644

--- a/trace-events

+++ b/trace-events

@@ -417,45 +417,32 @@ usb_uas_tmf_abort_task(int addr, uint16_t tag, uint16_t task_tag) "dev %d, tag 0

 usb_uas_tmf_logical_unit_reset(int addr, uint16_t tag, int lun) "dev %d, tag 0x%x, lun %d"

 usb_uas_tmf_unsupported(int addr, uint16_t tag, uint32_t function) "dev %d, tag 0x%x, function 0x%x"

-# hw/usb/host-linux.c

 # hw/usb/host-libusb.c

 usb_host_open_started(int bus, int addr) "dev %d:%d"

 usb_host_open_success(int bus, int addr) "dev %d:%d"

 usb_host_open_failure(int bus, int addr) "dev %d:%d"

-usb_host_disconnect(int bus, int addr) "dev %d:%d"

 usb_host_close(int bus, int addr) "dev %d:%d"

 usb_host_attach_kernel(int bus, int addr, int interface) "dev %d:%d, if %d"

 usb_host_detach_kernel(int bus, int addr, int interface) "dev %d:%d, if %d"

 usb_host_set_address(int bus, int addr, int config) "dev %d:%d, address %d"

 usb_host_set_config(int bus, int addr, int config) "dev %d:%d, config %d"

 usb_host_set_interface(int bus, int addr, int interface, int alt) "dev %d:%d, interface %d, alt %d"

-usb_host_claim_interfaces(int bus, int addr, int config, int nif) "dev %d:%d, config %d, nif %d"

 usb_host_claim_interface(int bus, int addr, int config, int interface) "dev %d:%d, config %d, if %d"

-usb_host_release_interfaces(int bus, int addr) "dev %d:%d"

 usb_host_release_interface(int bus, int addr, int interface) "dev %d:%d, if %d"

 usb_host_req_control(int bus, int addr, void *p, int req, int value, int index) "dev %d:%d, packet %p, req 0x%x, value %d, index %d"

 usb_host_req_data(int bus, int addr, void *p, int in, int ep, int size) "dev %d:%d, packet %p, in %d, ep %d, size %d"

 usb_host_req_complete(int bus, int addr, void *p, int status, int length) "dev %d:%d, packet %p, status %d, length %d"

 usb_host_req_emulated(int bus, int addr, void *p, int status) "dev %d:%d, packet %p, status %d"

 usb_host_req_canceled(int bus, int addr, void *p) "dev %d:%d, packet %p"

-usb_host_urb_submit(int bus, int addr, void *aurb, int length, int more) "dev %d:%d, aurb %p, length %d, more %d"

-usb_host_urb_complete(int bus, int addr, void *aurb, int status, int length, int more) "dev %d:%d, aurb %p, status %d, length %d, more %d"

-usb_host_urb_canceled(int bus, int addr, void *aurb) "dev %d:%d, aurb %p"

-usb_host_ep_set_halt(int bus, int addr, int ep) "dev %d:%d, ep %d"

-usb_host_ep_clear_halt(int bus, int addr, int ep) "dev %d:%d, ep %d"

 usb_host_iso_start(int bus, int addr, int ep) "dev %d:%d, ep %d"

 usb_host_iso_stop(int bus, int addr, int ep) "dev %d:%d, ep %d"

 usb_host_iso_out_of_bufs(int bus, int addr, int ep) "dev %d:%d, ep %d"

-usb_host_iso_many_urbs(int bus, int addr, int count) "dev %d:%d, count %d"

 usb_host_reset(int bus, int addr) "dev %d:%d"

 usb_host_auto_scan_enabled(void)

 usb_host_auto_scan_disabled(void)

-usb_host_claim_port(int bus, int hub, int port) "bus %d, hub addr %d, port %d"

-usb_host_parse_device(int bus, int addr, int vendor, int product) "dev %d:%d, id %04x:%04x"

 usb_host_parse_config(int bus, int addr, int value, int active) "dev %d:%d, value %d, active %d"

 usb_host_parse_interface(int bus, int addr, int num, int alt, int active) "dev %d:%d, num %d, alt %d, active %d"

 usb_host_parse_endpoint(int bus, int addr, int ep, const char *dir, const char *type, int active) "dev %d:%d, ep %d, %s, %s, active %d"

-usb_host_parse_unknown(int bus, int addr, int len, int type) "dev %d:%d, len %d, type %d"

 usb_host_parse_error(int bus, int addr, const char *errmsg) "dev %d:%d, msg %s"

 # hw/scsi/scsi-bus.c

-- 

1.7.11.7