diff options
| author | Frediano Ziglio <freddy77@gmail.com> | 2022-03-04 21:23:51 -0800 |
|---|---|---|
| committer | Frediano Ziglio <freddy77@gmail.com> | 2022-11-20 17:49:30 +0000 |
| commit | 2ed5f940f6ce559ce483a83d7c36bcce2886dee9 (patch) | |
| tree | 3b1cec5d7ab3f3e4d48df08e4e9953f0eeb6ebeb | |
| parent | 4dbe0da23f0f4d581f61798ec2a8eee92afd1779 (diff) | |
usb-device-cd: Detect Apple H/W CD support better
Hardware support for Apple iOS is not available, check correctly
and not try to use it.
Signed-off-by: osy <osy@turing.llc>
Signed-off-by: Frediano Ziglio <freddy77@gmail.com>
Tested-by: osy <osy@turing.llc>
| -rw-r--r-- | meson.build | 3 | ||||
| -rw-r--r-- | src/usb-device-cd.c | 26 |
2 files changed, 25 insertions, 4 deletions
diff --git a/meson.build b/meson.build index c163a44..596f33f 100644 --- a/meson.build +++ b/meson.build @@ -64,7 +64,8 @@ headers = [ 'sys/types.h', 'netinet/in.h', 'arpa/inet.h', - 'valgrind/valgrind.h' + 'valgrind/valgrind.h', + 'sys/disk.h' ] foreach header : headers diff --git a/src/usb-device-cd.c b/src/usb-device-cd.c index 2bfeb3a..cc7bab9 100644 --- a/src/usb-device-cd.c +++ b/src/usb-device-cd.c @@ -30,6 +30,7 @@ #include <libusb.h> #include <fcntl.h> +#define HAVE_PHYSICAL_CD 1 #ifdef G_OS_WIN32 #include <windows.h> #include <ntddcdrm.h> @@ -37,12 +38,14 @@ #else #include <sys/stat.h> #include <sys/ioctl.h> -#ifdef __APPLE__ +#if defined(__APPLE__) && defined(HAVE_SYS_DISK_H) #include <sys/disk.h> #include <fcntl.h> -#else +#elif defined(__linux__) #include <linux/fs.h> #include <linux/cdrom.h> +#else +#undef HAVE_PHYSICAL_CD #endif #endif @@ -56,7 +59,9 @@ typedef struct SpiceCdLU { uint64_t size; uint32_t blockSize; uint32_t loaded : 1; +#ifdef HAVE_PHYSICAL_CD uint32_t device : 1; +#endif } SpiceCdLU; #define MAX_LUN_PER_DEVICE 1 @@ -99,7 +104,9 @@ typedef struct SpiceUsbEmulatedDevice UsbCd; static int cd_device_open_stream(SpiceCdLU *unit, const char *filename) { +#ifdef HAVE_PHYSICAL_CD unit->device = 0; +#endif if (!unit->filename && !filename) { SPICE_DEBUG("%s: file name not provided", __FUNCTION__); @@ -120,6 +127,7 @@ static int cd_device_open_stream(SpiceCdLU *unit, const char *filename) } struct stat file_stat = { 0 }; +#ifdef HAVE_PHYSICAL_CD if (fstat(fd, &file_stat) || file_stat.st_size == 0) { file_stat.st_size = 0; unit->device = 1; @@ -138,6 +146,12 @@ static int cd_device_open_stream(SpiceCdLU *unit, const char *filename) } #endif } +#else // HAVE_PHYSICAL_CD + if (fstat(fd, &file_stat) != 0) { + SPICE_DEBUG("%s: can't run stat on %s", __FUNCTION__, unit->filename); + return -1; + } +#endif unit->size = file_stat.st_size; close(fd); if (unit->size) { @@ -153,6 +167,8 @@ static int cd_device_open_stream(SpiceCdLU *unit, const char *filename) return 0; } +#ifdef HAVE_PHYSICAL_CD + static int cd_device_load(SpiceCdLU *unit, gboolean load) { int error; @@ -214,7 +230,9 @@ static int cd_device_check(SpiceCdLU *unit) return error; } -#else +#endif // HAVE_PHYSICAL_CD + +#else // G_OS_WIN32 static gboolean is_device_name(const char *filename) { @@ -380,6 +398,7 @@ static void close_stream(SpiceCdLU *unit) static gboolean load_lun(UsbCd *d, int unit, gboolean load) { gboolean b = TRUE; +#ifdef HAVE_PHYSICAL_CD if (load && d->units[unit].device) { // there is one possible problem in case our backend is the // local CD device and it is ejected @@ -389,6 +408,7 @@ static gboolean load_lun(UsbCd *d, int unit, gboolean load) return FALSE; } } +#endif if (load) { CdScsiMediaParameters media_params = { 0 }; |