diff options
| author | Daniel P. Berrangé | 2020-07-21 14:25:21 +0200 |
|---|---|---|
| committer | Daniel P. Berrangé | 2020-09-16 11:33:48 +0200 |
| commit | 448058aa99aaf30e7b8978508e575284a19fcfc9 (patch) | |
| tree | f656a519ced58db3846b3e0118b027da94cebf2b /hw/usb | |
| parent | util: split off a helper for dealing with O_CLOEXEC flag (diff) | |
| download | qemu-448058aa99aaf30e7b8978508e575284a19fcfc9.tar.gz qemu-448058aa99aaf30e7b8978508e575284a19fcfc9.tar.xz qemu-448058aa99aaf30e7b8978508e575284a19fcfc9.zip | |
util: rename qemu_open() to qemu_open_old()
We want to introduce a new version of qemu_open() that uses an Error
object for reporting problems and make this it the preferred interface.
Rename the existing method to release the namespace for the new impl.
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Diffstat (limited to 'hw/usb')
| -rw-r--r-- | hw/usb/host-libusb.c | 2 | ||||
| -rw-r--r-- | hw/usb/u2f-passthru.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c index 43c93504a2..8b02bee547 100644 --- a/hw/usb/host-libusb.c +++ b/hw/usb/host-libusb.c @@ -1147,7 +1147,7 @@ static void usb_host_realize(USBDevice *udev, Error **errp) if (s->hostdevice) { int fd; s->needs_autoscan = false; - fd = qemu_open(s->hostdevice, O_RDWR); + fd = qemu_open_old(s->hostdevice, O_RDWR); if (fd < 0) { error_setg_errno(errp, errno, "failed to open %s", s->hostdevice); return; diff --git a/hw/usb/u2f-passthru.c b/hw/usb/u2f-passthru.c index e9c8aa4595..ae00e93f35 100644 --- a/hw/usb/u2f-passthru.c +++ b/hw/usb/u2f-passthru.c @@ -383,7 +383,7 @@ static int u2f_passthru_open_from_device(struct udev_device *device) { const char *devnode = udev_device_get_devnode(device); - int fd = qemu_open(devnode, O_RDWR); + int fd = qemu_open_old(devnode, O_RDWR); if (fd < 0) { return -1; } else if (!u2f_passthru_is_u2f_device(fd)) { @@ -482,7 +482,7 @@ static void u2f_passthru_realize(U2FKeyState *base, Error **errp) return; #endif } else { - fd = qemu_open(key->hidraw, O_RDWR); + fd = qemu_open_old(key->hidraw, O_RDWR); if (fd < 0) { error_setg(errp, "%s: Failed to open %s", TYPE_U2F_PASSTHRU, key->hidraw); |