atapi-pass-through: added cdrom-pt to the option parser

diff --git a/master/atapi-pass-through b/master/atapi-pass-through
index 08dd3dee15f997422a7de41780443155911a55d1..604e7547b7a608beb4e3bf3275233081a535bc62 100644 (file)
--- a/master/atapi-pass-through
+++ b/master/atapi-pass-through
@@ -97,7 +97,7 @@ index 0000000..f9bdee9
 +#endif /* !BLOCK_RAW_POSIX_H */
 diff --git a/hw/atapi-pt.c b/hw/atapi-pt.c
 new file mode 100644
-index 0000000..24358ac
+index 0000000..b1c380f
 --- /dev/null
 +++ b/hw/atapi-pt.c
 @@ -0,0 +1,964 @@
@@ -419,8 +419,8 @@ index 0000000..24358ac
 +    s->atapi_pt.cmd_sent(s);
 +}
 +
-+#define ATAPI_PT_SEND_PACKET                                         \
-+    do {                                                                \
++#define ATAPI_PT_SEND_PACKET                                            \
++  do {                                                                  \
 +        BDRVRawState *raw_state = s->bs->opaque;                        \
 +        DEBUG_PRINTF("[ATAPI:%d] sending command: 0x%02x (\e[0;32m%s\e[m)\n", \
 +                     raw_state->fd, s->atapi_pt.request[0],             \
@@ -1650,7 +1650,7 @@ index e8d676e..fa75de7 100644
          s->drive_serial = drive_serial++;
          strncpy(s->drive_serial_str, drive_get_serial(s->bs),
 diff --git a/vl.c b/vl.c
-index 7b925eb..42c9b66 100644
+index 7b925eb..f7b696d 100644
 --- a/vl.c
 +++ b/vl.c
 @@ -2193,8 +2193,10 @@ static int bt_parse(const char *opt)
@@ -1700,7 +1700,15 @@ index 7b925eb..42c9b66 100644
      QEMU_OPTION_drive,
      QEMU_OPTION_mtdblock,
      QEMU_OPTION_sd,
-@@ -5036,13 +5044,16 @@ int main(int argc, char **argv, char **envp)
+@@ -4366,6 +4374,7 @@ static const QEMUOption qemu_options[] = {
+     { "hdc", HAS_ARG, QEMU_OPTION_hdc },
+     { "hdd", HAS_ARG, QEMU_OPTION_hdd },
+     { "cdrom", HAS_ARG, QEMU_OPTION_cdrom },
++    { "cdrom-pt", HAS_ARG, QEMU_OPTION_cdrom_pt },
+     { "drive", HAS_ARG, QEMU_OPTION_drive },
+     { "mtdblock", HAS_ARG, QEMU_OPTION_mtdblock },
+     { "sd", HAS_ARG, QEMU_OPTION_sd },
+@@ -5036,13 +5045,16 @@ int main(int argc, char **argv, char **envp)
              case QEMU_OPTION_cdrom:
                  drive_add(optarg, CDROM_ALIAS);
                  break;