[Spice-commits] 2 commits - src/cd-scsi.c src/cd-scsi.h src/cd-usb-bulk-msd.c src/usb-device-cd.c subprojects/spice-common
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Fri Aug 20 07:19:28 UTC 2021
src/cd-scsi.c | 4 ++--
src/cd-scsi.h | 9 ---------
src/cd-usb-bulk-msd.c | 20 ++++++++++----------
src/usb-device-cd.c | 31 +++++++++++++++++++++++++++++++
subprojects/spice-common | 2 +-
5 files changed, 44 insertions(+), 22 deletions(-)
New commits:
commit 151d9204189a375c0fb823d86f07ce65e3948963
Author: Frediano Ziglio <freddy77 at gmail.com>
Date: Tue Aug 17 19:40:00 2021 +0100
Support USB emulation for MacOS
Use proper ioctls for MacOS.
Import new spice-common to solve an issue detecting Python3.
Signed-off-by: Frediano Ziglio <freddy77 at gmail.com>
Acked-by: Victor Toso <victortoso at redhat.com>
diff --git a/src/usb-device-cd.c b/src/usb-device-cd.c
index b9fa317..2bfeb3a 100644
--- a/src/usb-device-cd.c
+++ b/src/usb-device-cd.c
@@ -37,9 +37,14 @@
#else
#include <sys/stat.h>
#include <sys/ioctl.h>
+#ifdef __APPLE__
+#include <sys/disk.h>
+#include <fcntl.h>
+#else
#include <linux/fs.h>
#include <linux/cdrom.h>
#endif
+#endif
#include "usb-emulation.h"
#include "usb-device-cd.h"
@@ -118,9 +123,20 @@ static int cd_device_open_stream(SpiceCdLU *unit, const char *filename)
if (fstat(fd, &file_stat) || file_stat.st_size == 0) {
file_stat.st_size = 0;
unit->device = 1;
+#ifdef __APPLE__
+ uint64_t sector_count = 0;
+ uint32_t sector_size = 0;
+
+ if (!ioctl(fd, DKIOCGETBLOCKCOUNT, §or_count) &&
+ !ioctl(fd, DKIOCGETBLOCKSIZE, §or_size)) {
+ file_stat.st_size = sector_count;
+ unit->blockSize = sector_size;
+ }
+#else
if (!ioctl(fd, BLKGETSIZE64, &file_stat.st_size) &&
!ioctl(fd, BLKSSZGET, &unit->blockSize)) {
}
+#endif
}
unit->size = file_stat.st_size;
close(fd);
@@ -147,12 +163,22 @@ static int cd_device_load(SpiceCdLU *unit, gboolean load)
if (fd < 0) {
return -1;
}
+#ifdef __APPLE__
+ if (load) {
+ // MacOS has no load command, device is created when there's a CD/DVD
+ error = -1;
+ errno = ENOSYS;
+ } else {
+ error = ioctl(fd, DKIOCEJECT, NULL);
+ }
+#else
if (load) {
error = ioctl(fd, CDROMCLOSETRAY, 0);
} else {
ioctl(fd, CDROM_LOCKDOOR, 0);
error = ioctl(fd, CDROMEJECT, 0);
}
+#endif
if (error) {
// note that ejecting might be available only for root
// loading might be available also for regular user
@@ -173,12 +199,17 @@ static int cd_device_check(SpiceCdLU *unit)
if (fd < 0) {
return -1;
}
+#ifdef __APPLE__
+ // in MacOS device is not created if not present
+ error = 0;
+#else
error = ioctl(fd, CDROM_DRIVE_STATUS, 0);
error = (error == CDS_DISC_OK) ? 0 : -1;
if (!error) {
error = ioctl(fd, CDROM_DISC_STATUS, 0);
error = (error == CDS_DATA_1) ? 0 : -1;
}
+#endif
close(fd);
return error;
}
diff --git a/subprojects/spice-common b/subprojects/spice-common
index d589542..96dd787 160000
--- a/subprojects/spice-common
+++ b/subprojects/spice-common
@@ -1 +1 @@
-Subproject commit d589542e0492888ac1b300200c7c6cb4eaf88cb0
+Subproject commit 96dd7873777583820a19c8261f5adb5807960c4d
commit dbdb46b505b7c073f6daba94849a3a038daa2a12
Author: Frediano Ziglio <freddy77 at gmail.com>
Date: Tue Aug 17 19:27:53 2021 +0100
Use Glib macros for endian management
Resolve some portability issue, like MacOS.
Macros from <endian.h> were used but not all systems have
this header.
Signed-off-by: Frediano Ziglio <freddy77 at gmail.com>
Acked-by: Victor Toso <victortoso at redhat.com>
diff --git a/src/cd-scsi.c b/src/cd-scsi.c
index 604b34c..a782670 100644
--- a/src/cd-scsi.c
+++ b/src/cd-scsi.c
@@ -1143,8 +1143,8 @@ static void cd_scsi_cmd_read_capacity(CdScsiLU *dev, CdScsiRequest *req)
req->xfer_dir = SCSI_XFER_FROM_DEV;
req->req_len = 8;
- *last_blk_out = htobe32(last_blk);
- *blk_size_out = htobe32(blk_size);
+ *last_blk_out = GUINT32_TO_BE(last_blk);
+ *blk_size_out = GUINT32_TO_BE(blk_size);
SPICE_DEBUG("Read capacity, lun:%u last_blk: %u blk_sz: %u",
req->lun, last_blk, blk_size);
diff --git a/src/cd-scsi.h b/src/cd-scsi.h
index 6351f4a..6065b03 100644
--- a/src/cd-scsi.h
+++ b/src/cd-scsi.h
@@ -26,15 +26,6 @@
#include "cd-usb-bulk-msd.h"
#include "scsi-constants.h"
-#if defined(G_OS_WIN32)
-#include <winsock2.h>
-#include <windows.h>
-/* Windows is always LE at the moment */
-#define le32toh(x) (x)
-#define htole32(x) (x)
-#define htobe32(x) htonl(x)
-#endif
-
typedef enum ScsiXferDir {
SCSI_XFER_NONE = 0, /* TEST_UNIT_READY, ... */
SCSI_XFER_FROM_DEV, /* READ, INQUIRY, MODE_SENSE, ... */
diff --git a/src/cd-usb-bulk-msd.c b/src/cd-usb-bulk-msd.c
index 8d0c254..cc4db2b 100644
--- a/src/cd-usb-bulk-msd.c
+++ b/src/cd-usb-bulk-msd.c
@@ -266,8 +266,8 @@ static int parse_usb_msd_cmd(UsbCdBulkMsdDevice *cd, uint8_t *buf, uint32_t cbw_
SPICE_ERROR("CMD: Bad CBW size:%u", cbw_len);
return -1;
}
- if (le32toh(cbw->sig) != 0x43425355) { /* MSD command signature */
- SPICE_ERROR("CMD: Bad CBW signature:%08x", le32toh(cbw->sig));
+ if (GUINT32_FROM_LE(cbw->sig) != 0x43425355) { /* MSD command signature */
+ SPICE_ERROR("CMD: Bad CBW signature:%08x", GUINT32_FROM_LE(cbw->sig));
return -1;
}
const uint8_t cmd_len = cbw->cmd_len & 0x1F;
@@ -277,7 +277,7 @@ static int parse_usb_msd_cmd(UsbCdBulkMsdDevice *cd, uint8_t *buf, uint32_t cbw_
}
usb_req->lun = cbw->lun;
- usb_req->usb_req_len = le32toh(cbw->exp_data_len);
+ usb_req->usb_req_len = GUINT32_FROM_LE(cbw->exp_data_len);
usb_req->scsi_in_len = 0; /* no data from scsi yet */
usb_req->xfer_len = 0; /* no bulks transfered yet */
@@ -305,11 +305,11 @@ static int parse_usb_msd_cmd(UsbCdBulkMsdDevice *cd, uint8_t *buf, uint32_t cbw_
SPICE_DEBUG("CMD lun:%u tag:%#x flags:%08x "
"cdb_len:%u req_len:%u",
- usb_req->lun, le32toh(cbw->tag), cbw->flags,
+ usb_req->lun, GUINT32_FROM_LE(cbw->tag), cbw->flags,
scsi_req->cdb_len, usb_req->usb_req_len);
/* prepare status - CSW */
- usb_req->csw.sig = htole32(0x53425355);
+ usb_req->csw.sig = GUINT32_TO_LE(0x53425355);
usb_req->csw.tag = cbw->tag;
usb_req->csw.residue = 0;
usb_req->csw.status = (uint8_t)USB_MSD_STATUS_GOOD;
@@ -331,11 +331,11 @@ static void usb_cd_send_status(UsbCdBulkMsdDevice *cd)
UsbCdBulkMsdRequest *usb_req = &cd->usb_req;
SPICE_DEBUG("Command CSW tag:0x%x msd_status:%d len:%" G_GUINT64_FORMAT,
- le32toh(usb_req->csw.tag), (int)usb_req->csw.status, sizeof(usb_req->csw));
+ GUINT32_FROM_LE(usb_req->csw.tag), (int)usb_req->csw.status, sizeof(usb_req->csw));
usb_cd_cmd_done(cd);
- g_assert(usb_req->csw.sig == htole32(0x53425355));
+ g_assert(usb_req->csw.sig == GUINT32_TO_LE(0x53425355));
cd_usb_bulk_msd_read_complete(cd->usb_user_data,
(uint8_t *)&usb_req->csw, sizeof(usb_req->csw),
BULK_STATUS_GOOD);
@@ -346,7 +346,7 @@ static void usb_cd_send_canceled(UsbCdBulkMsdDevice *cd)
UsbCdBulkMsdRequest *usb_req = &cd->usb_req;
SPICE_DEBUG("Canceled cmd tag:0x%x, len:%" G_GUINT64_FORMAT,
- le32toh(usb_req->csw.tag), sizeof(usb_req->csw));
+ GUINT32_FROM_LE(usb_req->csw.tag), sizeof(usb_req->csw));
usb_cd_cmd_done(cd);
@@ -455,7 +455,7 @@ void cd_scsi_dev_request_complete(void *target_user_data, CdScsiRequest *scsi_re
/* prepare CSW */
if (usb_req->usb_req_len > usb_req->scsi_in_len) {
- usb_req->csw.residue = htole32(usb_req->usb_req_len - usb_req->scsi_in_len);
+ usb_req->csw.residue = GUINT32_TO_LE(usb_req->usb_req_len - usb_req->scsi_in_len);
}
if (scsi_req->status != GOOD) {
usb_req->csw.status = (uint8_t)USB_MSD_STATUS_FAILED;
@@ -475,7 +475,7 @@ void cd_scsi_dev_request_complete(void *target_user_data, CdScsiRequest *scsi_re
} else {
g_assert(scsi_req->req_state == SCSI_REQ_DISPOSED);
SPICE_DEBUG("Disposed cmd tag:0x%x, len:%" G_GUINT64_FORMAT,
- le32toh(usb_req->csw.tag), sizeof(usb_req->csw));
+ GUINT32_FROM_LE(usb_req->csw.tag), sizeof(usb_req->csw));
usb_cd_cmd_done(cd);
}
}
More information about the Spice-commits
mailing list