mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-07 17:53:56 -06:00
* KVM run_on_cpu fix (Alex)
* atomic usage fixes (Emilio, me)
* hugetlbfs alignment fix (Haozhong)
* CharBackend refactoring (Marc-André)
* test-i386 fixes (me)
* MemoryListener optimizations (me)
* Miscellaneous bugfixes (me)
* iSER support (Roy)
* --version formatting (Thomas)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
iQEcBAABAgAGBQJYDhCrAAoJEL/70l94x66DBbMH/iM6Z8Kp9tXImqdnVBLCIFW9
MhxeiaEJ5erILHpOajK8kHTg9Uuqj2Z3sY7n04IU0uvRhvOtwKd28m8AoC2El1j6
JAHLk2IAfoepfYPVl0s9quQJhxQXlGjMojdbVP4GD3GzIN27x9IrWUSv14gcjf11
sJr049KXoIphckXBq9JOCEXRSz9Bn9nAc4KzUAbLpH7p8P02Tiox5eW8W6Bn7E3F
z1J+3XdFl29afjDFvtVLwU5lPM8KR6XC6qyZmD4PO7dzdYMmXxSSL0E/d746x9sp
4fVmLpoPSSMvmssMz45WZLiMNJQp0HB44rsYVaTjWdn1xprS8cj8JDfvNUQxwr0=
=/2n2
-----END PGP SIGNATURE-----
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
* KVM run_on_cpu fix (Alex)
* atomic usage fixes (Emilio, me)
* hugetlbfs alignment fix (Haozhong)
* CharBackend refactoring (Marc-André)
* test-i386 fixes (me)
* MemoryListener optimizations (me)
* Miscellaneous bugfixes (me)
* iSER support (Roy)
* --version formatting (Thomas)
# gpg: Signature made Mon 24 Oct 2016 14:46:19 BST
# gpg: using RSA key 0xBFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg: aka "Paolo Bonzini <pbonzini@redhat.com>"
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1
# Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83
* remotes/bonzini/tags/for-upstream: (50 commits)
exec.c: workaround regression caused by alignment change in d2f39ad
char: remove explicit_be_open from CharDriverState
char: use common error path in qmp_chardev_add
char: replace avail_connections
char: remove unused qemu_chr_fe_event
char: use an enum for CHR_EVENT
char: remove unused CHR_EVENT_FOCUS
char: move fe_open in CharBackend
char: remove explicit_fe_open, use a set_handlers argument
char: rename chr_close/chr_free
char: move front end handlers in CharBackend
tests: start chardev unit tests
char: make some qemu_chr_fe skip if no driver
char: replace qemu_chr_claim/release with qemu_chr_fe_init/deinit
vhost-user: only initialize queue 0 CharBackend
char: fold qemu_chr_set_handlers in qemu_chr_fe_set_handlers
char: use qemu_chr_fe* functions with CharBackend argument
colo: claim in find_and_check_chardev
char: rename some frontend functions
char: remaining switch to CharBackend in frontend
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
commit
a3ae21ec3f
96 changed files with 1738 additions and 1229 deletions
|
|
@ -48,7 +48,7 @@ typedef struct PassthruState PassthruState;
|
|||
|
||||
struct PassthruState {
|
||||
CCIDCardState base;
|
||||
CharDriverState *cs;
|
||||
CharBackend cs;
|
||||
uint8_t vscard_in_data[VSCARD_IN_SIZE];
|
||||
uint32_t vscard_in_pos;
|
||||
uint32_t vscard_in_hdr;
|
||||
|
|
@ -77,9 +77,9 @@ static void ccid_card_vscard_send_msg(PassthruState *s,
|
|||
scr_msg_header.length = htonl(length);
|
||||
/* XXX this blocks entire thread. Rewrite to use
|
||||
* qemu_chr_fe_write and background I/O callbacks */
|
||||
qemu_chr_fe_write_all(s->cs, (uint8_t *)&scr_msg_header,
|
||||
qemu_chr_fe_write_all(&s->cs, (uint8_t *)&scr_msg_header,
|
||||
sizeof(VSCMsgHeader));
|
||||
qemu_chr_fe_write_all(s->cs, payload, length);
|
||||
qemu_chr_fe_write_all(&s->cs, payload, length);
|
||||
}
|
||||
|
||||
static void ccid_card_vscard_send_apdu(PassthruState *s,
|
||||
|
|
@ -264,7 +264,10 @@ static void ccid_card_vscard_handle_message(PassthruState *card,
|
|||
|
||||
static void ccid_card_vscard_drop_connection(PassthruState *card)
|
||||
{
|
||||
qemu_chr_delete(card->cs);
|
||||
CharDriverState *chr = qemu_chr_fe_get_driver(&card->cs);
|
||||
|
||||
qemu_chr_fe_deinit(&card->cs);
|
||||
qemu_chr_delete(chr);
|
||||
card->vscard_in_pos = card->vscard_in_hdr = 0;
|
||||
}
|
||||
|
||||
|
|
@ -309,8 +312,6 @@ static void ccid_card_vscard_event(void *opaque, int event)
|
|||
case CHR_EVENT_BREAK:
|
||||
card->vscard_in_pos = card->vscard_in_hdr = 0;
|
||||
break;
|
||||
case CHR_EVENT_FOCUS:
|
||||
break;
|
||||
case CHR_EVENT_OPENED:
|
||||
DPRINTF(card, D_INFO, "%s: CHR_EVENT_OPENED\n", __func__);
|
||||
break;
|
||||
|
|
@ -324,7 +325,7 @@ static void passthru_apdu_from_guest(
|
|||
{
|
||||
PassthruState *card = PASSTHRU_CCID_CARD(base);
|
||||
|
||||
if (!card->cs) {
|
||||
if (!qemu_chr_fe_get_driver(&card->cs)) {
|
||||
printf("ccid-passthru: no chardev, discarding apdu length %d\n", len);
|
||||
return;
|
||||
}
|
||||
|
|
@ -345,12 +346,12 @@ static int passthru_initfn(CCIDCardState *base)
|
|||
|
||||
card->vscard_in_pos = 0;
|
||||
card->vscard_in_hdr = 0;
|
||||
if (card->cs) {
|
||||
if (qemu_chr_fe_get_driver(&card->cs)) {
|
||||
DPRINTF(card, D_INFO, "initing chardev\n");
|
||||
qemu_chr_add_handlers(card->cs,
|
||||
qemu_chr_fe_set_handlers(&card->cs,
|
||||
ccid_card_vscard_can_read,
|
||||
ccid_card_vscard_read,
|
||||
ccid_card_vscard_event, card);
|
||||
ccid_card_vscard_event, card, NULL, true);
|
||||
ccid_card_vscard_send_init(card);
|
||||
} else {
|
||||
error_report("missing chardev");
|
||||
|
|
|
|||
|
|
@ -103,7 +103,7 @@ typedef struct {
|
|||
uint8_t event_trigger;
|
||||
QEMUSerialSetParams params;
|
||||
int latency; /* ms */
|
||||
CharDriverState *cs;
|
||||
CharBackend cs;
|
||||
} USBSerialState;
|
||||
|
||||
#define TYPE_USB_SERIAL "usb-serial-dev"
|
||||
|
|
@ -209,8 +209,10 @@ static uint8_t usb_get_modem_lines(USBSerialState *s)
|
|||
int flags;
|
||||
uint8_t ret;
|
||||
|
||||
if (qemu_chr_fe_ioctl(s->cs, CHR_IOCTL_SERIAL_GET_TIOCM, &flags) == -ENOTSUP)
|
||||
if (qemu_chr_fe_ioctl(&s->cs,
|
||||
CHR_IOCTL_SERIAL_GET_TIOCM, &flags) == -ENOTSUP) {
|
||||
return FTDI_CTS|FTDI_DSR|FTDI_RLSD;
|
||||
}
|
||||
|
||||
ret = 0;
|
||||
if (flags & CHR_TIOCM_CTS)
|
||||
|
|
@ -260,7 +262,7 @@ static void usb_serial_handle_control(USBDevice *dev, USBPacket *p,
|
|||
case DeviceOutVendor | FTDI_SET_MDM_CTRL:
|
||||
{
|
||||
static int flags;
|
||||
qemu_chr_fe_ioctl(s->cs,CHR_IOCTL_SERIAL_GET_TIOCM, &flags);
|
||||
qemu_chr_fe_ioctl(&s->cs, CHR_IOCTL_SERIAL_GET_TIOCM, &flags);
|
||||
if (value & FTDI_SET_RTS) {
|
||||
if (value & FTDI_RTS)
|
||||
flags |= CHR_TIOCM_RTS;
|
||||
|
|
@ -273,7 +275,7 @@ static void usb_serial_handle_control(USBDevice *dev, USBPacket *p,
|
|||
else
|
||||
flags &= ~CHR_TIOCM_DTR;
|
||||
}
|
||||
qemu_chr_fe_ioctl(s->cs,CHR_IOCTL_SERIAL_SET_TIOCM, &flags);
|
||||
qemu_chr_fe_ioctl(&s->cs, CHR_IOCTL_SERIAL_SET_TIOCM, &flags);
|
||||
break;
|
||||
}
|
||||
case DeviceOutVendor | FTDI_SET_FLOW_CTRL:
|
||||
|
|
@ -292,7 +294,7 @@ static void usb_serial_handle_control(USBDevice *dev, USBPacket *p,
|
|||
divisor = 1;
|
||||
|
||||
s->params.speed = (48000000 / 2) / (8 * divisor + subdivisor8);
|
||||
qemu_chr_fe_ioctl(s->cs, CHR_IOCTL_SERIAL_SET_PARAMS, &s->params);
|
||||
qemu_chr_fe_ioctl(&s->cs, CHR_IOCTL_SERIAL_SET_PARAMS, &s->params);
|
||||
break;
|
||||
}
|
||||
case DeviceOutVendor | FTDI_SET_DATA:
|
||||
|
|
@ -321,7 +323,7 @@ static void usb_serial_handle_control(USBDevice *dev, USBPacket *p,
|
|||
DPRINTF("unsupported stop bits %d\n", value & FTDI_STOP);
|
||||
goto fail;
|
||||
}
|
||||
qemu_chr_fe_ioctl(s->cs, CHR_IOCTL_SERIAL_SET_PARAMS, &s->params);
|
||||
qemu_chr_fe_ioctl(&s->cs, CHR_IOCTL_SERIAL_SET_PARAMS, &s->params);
|
||||
/* TODO: TX ON/OFF */
|
||||
break;
|
||||
case DeviceInVendor | FTDI_GET_MDM_ST:
|
||||
|
|
@ -368,7 +370,7 @@ static void usb_serial_handle_data(USBDevice *dev, USBPacket *p)
|
|||
iov = p->iov.iov + i;
|
||||
/* XXX this blocks entire thread. Rewrite to use
|
||||
* qemu_chr_fe_write and background I/O callbacks */
|
||||
qemu_chr_fe_write_all(s->cs, iov->iov_base, iov->iov_len);
|
||||
qemu_chr_fe_write_all(&s->cs, iov->iov_base, iov->iov_len);
|
||||
}
|
||||
p->actual_length = p->iov.size;
|
||||
break;
|
||||
|
|
@ -464,8 +466,6 @@ static void usb_serial_event(void *opaque, int event)
|
|||
case CHR_EVENT_BREAK:
|
||||
s->event_trigger |= FTDI_BI;
|
||||
break;
|
||||
case CHR_EVENT_FOCUS:
|
||||
break;
|
||||
case CHR_EVENT_OPENED:
|
||||
if (!s->dev.attached) {
|
||||
usb_device_attach(&s->dev, &error_abort);
|
||||
|
|
@ -483,12 +483,13 @@ static void usb_serial_realize(USBDevice *dev, Error **errp)
|
|||
{
|
||||
USBSerialState *s = USB_SERIAL_DEV(dev);
|
||||
Error *local_err = NULL;
|
||||
CharDriverState *chr = qemu_chr_fe_get_driver(&s->cs);
|
||||
|
||||
usb_desc_create_serial(dev);
|
||||
usb_desc_init(dev);
|
||||
dev->auto_attach = 0;
|
||||
|
||||
if (!s->cs) {
|
||||
if (!chr) {
|
||||
error_setg(errp, "Property chardev is required");
|
||||
return;
|
||||
}
|
||||
|
|
@ -499,11 +500,11 @@ static void usb_serial_realize(USBDevice *dev, Error **errp)
|
|||
return;
|
||||
}
|
||||
|
||||
qemu_chr_add_handlers(s->cs, usb_serial_can_read, usb_serial_read,
|
||||
usb_serial_event, s);
|
||||
qemu_chr_fe_set_handlers(&s->cs, usb_serial_can_read, usb_serial_read,
|
||||
usb_serial_event, s, NULL, true);
|
||||
usb_serial_handle_reset(dev);
|
||||
|
||||
if (s->cs->be_open && !dev->attached) {
|
||||
if (chr->be_open && !dev->attached) {
|
||||
usb_device_attach(dev, &error_abort);
|
||||
}
|
||||
}
|
||||
|
|
@ -547,7 +548,7 @@ static USBDevice *usb_serial_init(USBBus *bus, const char *filename)
|
|||
filename++;
|
||||
|
||||
snprintf(label, sizeof(label), "usbserial%d", index++);
|
||||
cdrv = qemu_chr_new(label, filename, NULL);
|
||||
cdrv = qemu_chr_new(label, filename);
|
||||
if (!cdrv)
|
||||
return NULL;
|
||||
|
||||
|
|
@ -565,7 +566,7 @@ static USBDevice *usb_braille_init(USBBus *bus, const char *unused)
|
|||
USBDevice *dev;
|
||||
CharDriverState *cdrv;
|
||||
|
||||
cdrv = qemu_chr_new("braille", "braille", NULL);
|
||||
cdrv = qemu_chr_new("braille", "braille");
|
||||
if (!cdrv)
|
||||
return NULL;
|
||||
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ struct PacketIdQueue {
|
|||
struct USBRedirDevice {
|
||||
USBDevice dev;
|
||||
/* Properties */
|
||||
CharDriverState *cs;
|
||||
CharBackend cs;
|
||||
uint8_t debug;
|
||||
char *filter_str;
|
||||
int32_t bootindex;
|
||||
|
|
@ -283,9 +283,10 @@ static gboolean usbredir_write_unblocked(GIOChannel *chan, GIOCondition cond,
|
|||
static int usbredir_write(void *priv, uint8_t *data, int count)
|
||||
{
|
||||
USBRedirDevice *dev = priv;
|
||||
CharDriverState *chr = qemu_chr_fe_get_driver(&dev->cs);
|
||||
int r;
|
||||
|
||||
if (!dev->cs->be_open) {
|
||||
if (!chr->be_open) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -294,10 +295,10 @@ static int usbredir_write(void *priv, uint8_t *data, int count)
|
|||
return 0;
|
||||
}
|
||||
|
||||
r = qemu_chr_fe_write(dev->cs, data, count);
|
||||
r = qemu_chr_fe_write(&dev->cs, data, count);
|
||||
if (r < count) {
|
||||
if (!dev->watch) {
|
||||
dev->watch = qemu_chr_fe_add_watch(dev->cs, G_IO_OUT|G_IO_HUP,
|
||||
dev->watch = qemu_chr_fe_add_watch(&dev->cs, G_IO_OUT | G_IO_HUP,
|
||||
usbredir_write_unblocked, dev);
|
||||
}
|
||||
if (r < 0) {
|
||||
|
|
@ -1375,7 +1376,7 @@ static void usbredir_realize(USBDevice *udev, Error **errp)
|
|||
USBRedirDevice *dev = USB_REDIRECT(udev);
|
||||
int i;
|
||||
|
||||
if (dev->cs == NULL) {
|
||||
if (!qemu_chr_fe_get_driver(&dev->cs)) {
|
||||
error_setg(errp, QERR_MISSING_PARAMETER, "chardev");
|
||||
return;
|
||||
}
|
||||
|
|
@ -1406,8 +1407,9 @@ static void usbredir_realize(USBDevice *udev, Error **errp)
|
|||
dev->compatible_speedmask = USB_SPEED_MASK_FULL | USB_SPEED_MASK_HIGH;
|
||||
|
||||
/* Let the backend know we are ready */
|
||||
qemu_chr_add_handlers(dev->cs, usbredir_chardev_can_read,
|
||||
usbredir_chardev_read, usbredir_chardev_event, dev);
|
||||
qemu_chr_fe_set_handlers(&dev->cs, usbredir_chardev_can_read,
|
||||
usbredir_chardev_read, usbredir_chardev_event,
|
||||
dev, NULL, true);
|
||||
|
||||
qemu_add_vm_change_state_handler(usbredir_vm_state_change, dev);
|
||||
}
|
||||
|
|
@ -1426,9 +1428,11 @@ static void usbredir_cleanup_device_queues(USBRedirDevice *dev)
|
|||
static void usbredir_handle_destroy(USBDevice *udev)
|
||||
{
|
||||
USBRedirDevice *dev = USB_REDIRECT(udev);
|
||||
CharDriverState *chr = qemu_chr_fe_get_driver(&dev->cs);
|
||||
|
||||
qemu_chr_fe_deinit(&dev->cs);
|
||||
qemu_chr_delete(chr);
|
||||
|
||||
qemu_chr_delete(dev->cs);
|
||||
dev->cs = NULL;
|
||||
/* Note must be done after qemu_chr_close, as that causes a close event */
|
||||
qemu_bh_delete(dev->chardev_close_bh);
|
||||
qemu_bh_delete(dev->device_reject_bh);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue