usb-msc: rename INQUIRY types

They are generic SCSI constants, rename them as such.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/src/blockcmd.h b/src/blockcmd.h
index 84ab65988af26183df9acdf51724b3ea7afb6251..6923e4c9f2620a765e0e039489049f607f9340d6 100644 (file)
--- a/src/blockcmd.h
+++ b/src/blockcmd.h
@@ -57,6 +57,9 @@ struct cdbres_request_sense {
     u32 reserved_0e;
 } PACKED;
 
+#define SCSI_TYPE_DISK  0x00
+#define SCSI_TYPE_CDROM 0x05
+
 struct cdbres_inquiry {
     u8 pdt;
     u8 removable;

diff --git a/src/usb-msc.c b/src/usb-msc.c
index efcb9c6ad2d233f561e78286c19215992b110a95..bed6495fd3b579efe5bd8789d0a265b1fc1a997f 100644 (file)
--- a/src/usb-msc.c
+++ b/src/usb-msc.c
@@ -238,7 +238,7 @@ usb_msc_init(struct usb_pipe *pipe
             , vendor, product, rev, pdt, removable);
     udrive_g->drive.removable = removable;
 
-    if (pdt == USB_MSC_TYPE_CDROM) {
+    if (pdt == SCSI_TYPE_CDROM) {
         char *desc = znprintf(MAXDESCSIZE, "DVD/CD [USB Drive %s %s %s]"
                               , vendor, product, rev);
         ret = setup_drive_cdrom(&udrive_g->drive, desc);

diff --git a/src/usb-msc.h b/src/usb-msc.h
index 71adb20797bacb01d4eceefc67393318a91295d9..a8686a39d4b1f9c4bf3e76d1068bdd0362df9241 100644 (file)
--- a/src/usb-msc.h
+++ b/src/usb-msc.h
@@ -21,7 +21,4 @@ int process_usb_op(struct disk_op_s *op);
 
 #define US_PR_BULK         0x50
 
-#define USB_MSC_TYPE_DISK  0x00
-#define USB_MSC_TYPE_CDROM 0x05
-
 #endif // ush-msc.h