mirror of https://github.com/xemu-project/xemu.git
HMP pull 2017-12-14
-----BEGIN PGP SIGNATURE----- iQIcBAABAgAGBQJaMnKxAAoJEAUWMx68W/3nY/wP/0ZT+neT7ZBrXegUG9bratWP Wr11+nGJHDigudoqjshZy7yoVrcmd0v/qcRuQxF1TUaYPc23FgP9sTB6D3zGTZnT dHqVEvhvyeunUl+FDXG1mBdAPKdnnWrWmADX8AL6gJKvxK7VcYvyNrtR0ihMnb/e GZxh1J4o4mxWGuvoKutsOKv1Lv+nr3SZ/Wr/EUuxgXChFpTaUJu9f3apdDJWue4B s/9X6Ek1AykhSKbfT2fJHfNb/rufDAd2lZI5T0TEsiaBxI2VUN/sAUwhUh1kD8e9 iIScxa22CiECkVqG+YjcEy5tDHLxCrFJbDtDDlyC29T4Y6YL8zX/8+g3XEIH9+yC J+ev4MRDhZMd3QUbzZkxFicC40Gi9nRl2EXCPIhq41n7gv70Kf95v4YU5kddSytK ylyy+VgcyvDQbJGGS6d07bZuWq8+wTiw/Dtb6VpWfXL7jwudhAfKySLe0qiKCe6L saSKRJMy9hcg9lbpuMUneal35stLyfTr6FfS++ceiW7d1chIgL17HcTaSu9NjYlG bdelzrel97TS/KtuBW+o0gHqO4jmE6Ptw/7kl1UFCuNpwQHW7zE+df5s3opyp0yR H8iAaQlBTjMpZiQVinnLlZy6DpHTORtaRGQfqaz78gHNSLIsZMHoraLl5fcZ4oPf FRFKK+UL5kOdkbhgwZfR =yi0v -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/dgilbert/tags/pull-hmp-20171214' into staging HMP pull 2017-12-14 # gpg: Signature made Thu 14 Dec 2017 12:46:41 GMT # gpg: using RSA key 0x0516331EBC5BFDE7 # gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@redhat.com>" # Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A 9FA9 0516 331E BC5B FDE7 * remotes/dgilbert/tags/pull-hmp-20171214: tests: test-hmp: print command execution result hmp-commands: Remove the deprecated usb_add and usb_del Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
0ef0583d5a
|
@ -663,39 +663,6 @@ STEXI
|
|||
@item sum @var{addr} @var{size}
|
||||
@findex sum
|
||||
Compute the checksum of a memory region.
|
||||
ETEXI
|
||||
|
||||
{
|
||||
.name = "usb_add",
|
||||
.args_type = "devname:s",
|
||||
.params = "device",
|
||||
.help = "add USB device (e.g. 'host:bus.addr' or 'host:vendor_id:product_id')",
|
||||
.cmd = hmp_usb_add,
|
||||
},
|
||||
|
||||
STEXI
|
||||
@item usb_add @var{devname}
|
||||
@findex usb_add
|
||||
Add the USB device @var{devname}. This command is deprecated, please
|
||||
use @code{device_add} instead. For details of available devices see
|
||||
@ref{usb_devices}
|
||||
ETEXI
|
||||
|
||||
{
|
||||
.name = "usb_del",
|
||||
.args_type = "devname:s",
|
||||
.params = "device",
|
||||
.help = "remove USB device 'bus.addr'",
|
||||
.cmd = hmp_usb_del,
|
||||
},
|
||||
|
||||
STEXI
|
||||
@item usb_del @var{devname}
|
||||
@findex usb_del
|
||||
Remove the USB device @var{devname} from the QEMU virtual USB
|
||||
hub. @var{devname} has the syntax @code{bus.addr}. Use the monitor
|
||||
command @code{info usb} to see the devices you can remove. This
|
||||
command is deprecated, please use @code{device_del} instead.
|
||||
ETEXI
|
||||
|
||||
{
|
||||
|
|
22
hw/usb/bus.c
22
hw/usb/bus.c
|
@ -559,28 +559,6 @@ int usb_device_detach(USBDevice *dev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
int usb_device_delete_addr(int busnr, int addr)
|
||||
{
|
||||
USBBus *bus;
|
||||
USBPort *port;
|
||||
USBDevice *dev;
|
||||
|
||||
bus = usb_bus_find(busnr);
|
||||
if (!bus)
|
||||
return -1;
|
||||
|
||||
QTAILQ_FOREACH(port, &bus->used, next) {
|
||||
if (port->dev->addr == addr)
|
||||
break;
|
||||
}
|
||||
if (!port)
|
||||
return -1;
|
||||
dev = port->dev;
|
||||
|
||||
object_unparent(OBJECT(dev));
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const char *usb_speed(unsigned int speed)
|
||||
{
|
||||
static const char *txt[] = {
|
||||
|
|
|
@ -549,7 +549,6 @@ void usb_claim_port(USBDevice *dev, Error **errp);
|
|||
void usb_release_port(USBDevice *dev);
|
||||
void usb_device_attach(USBDevice *dev, Error **errp);
|
||||
int usb_device_detach(USBDevice *dev);
|
||||
int usb_device_delete_addr(int busnr, int addr);
|
||||
void usb_check_attach(USBDevice *dev, Error **errp);
|
||||
|
||||
static inline USBBus *usb_bus_from_device(USBDevice *d)
|
||||
|
|
|
@ -166,8 +166,6 @@ extern Chardev *serial_hds[MAX_SERIAL_PORTS];
|
|||
|
||||
extern Chardev *parallel_hds[MAX_PARALLEL_PORTS];
|
||||
|
||||
void hmp_usb_add(Monitor *mon, const QDict *qdict);
|
||||
void hmp_usb_del(Monitor *mon, const QDict *qdict);
|
||||
void hmp_info_usb(Monitor *mon, const QDict *qdict);
|
||||
|
||||
void add_boot_device_path(int32_t bootindex, DeviceState *dev,
|
||||
|
|
|
@ -2518,14 +2518,6 @@ The ``host_net_add'' command is replaced by the ``netdev_add'' command.
|
|||
|
||||
The ``host_net_remove'' command is replaced by the ``netdev_del'' command.
|
||||
|
||||
@subsection usb_add (since 2.10.0)
|
||||
|
||||
The ``usb_add'' command is replaced by the ``device_add'' command.
|
||||
|
||||
@subsection usb_del (since 2.10.0)
|
||||
|
||||
The ``usb_del'' command is replaced by the ``device_del'' command.
|
||||
|
||||
@section System emulator devices
|
||||
|
||||
@subsection ivshmem (since 2.6.0)
|
||||
|
|
|
@ -78,10 +78,13 @@ static void test_commands(void)
|
|||
int i;
|
||||
|
||||
for (i = 0; hmp_cmds[i] != NULL; i++) {
|
||||
if (verbose) {
|
||||
fprintf(stderr, "\t%s\n", hmp_cmds[i]);
|
||||
}
|
||||
response = hmp("%s", hmp_cmds[i]);
|
||||
if (verbose) {
|
||||
fprintf(stderr,
|
||||
"\texecute HMP command: %s\n"
|
||||
"\tresult : %s\n",
|
||||
hmp_cmds[i], response);
|
||||
}
|
||||
g_free(response);
|
||||
}
|
||||
|
||||
|
|
44
vl.c
44
vl.c
|
@ -1479,28 +1479,6 @@ done:
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int usb_device_del(const char *devname)
|
||||
{
|
||||
int bus_num, addr;
|
||||
const char *p;
|
||||
|
||||
if (strstart(devname, "host:", &p)) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (!machine_usb(current_machine)) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
p = strchr(devname, '.');
|
||||
if (!p)
|
||||
return -1;
|
||||
bus_num = strtoul(devname, NULL, 0);
|
||||
addr = strtoul(p + 1, NULL, 0);
|
||||
|
||||
return usb_device_delete_addr(bus_num, addr);
|
||||
}
|
||||
|
||||
static int usb_parse(const char *cmdline)
|
||||
{
|
||||
int r;
|
||||
|
@ -1511,28 +1489,6 @@ static int usb_parse(const char *cmdline)
|
|||
return r;
|
||||
}
|
||||
|
||||
void hmp_usb_add(Monitor *mon, const QDict *qdict)
|
||||
{
|
||||
const char *devname = qdict_get_str(qdict, "devname");
|
||||
|
||||
error_report("usb_add is deprecated, please use device_add instead");
|
||||
|
||||
if (usb_device_add(devname) < 0) {
|
||||
error_report("could not add USB device '%s'", devname);
|
||||
}
|
||||
}
|
||||
|
||||
void hmp_usb_del(Monitor *mon, const QDict *qdict)
|
||||
{
|
||||
const char *devname = qdict_get_str(qdict, "devname");
|
||||
|
||||
error_report("usb_del is deprecated, please use device_del instead");
|
||||
|
||||
if (usb_device_del(devname) < 0) {
|
||||
error_report("could not delete USB device '%s'", devname);
|
||||
}
|
||||
}
|
||||
|
||||
/***********************************************************/
|
||||
/* machine registration */
|
||||
|
||||
|
|
Loading…
Reference in New Issue