Re: [Qemu-devel] [PATCH 10/19] libqos/ahci: Add ide cmd properties

2015-02-02 Thread Paolo Bonzini


On 30/01/2015 19:42, John Snow wrote:
 The Invalid Command Sentinel here that caps the property array is an
 invalid ATA command, namely 0x01. 0x00 is NOP and 0xFF is reserved for
 vendor usage, so I chose the first invalid one instead.

You can use ARRAY_SIZE instead.

Paolo



[Qemu-devel] [PATCH 10/19] libqos/ahci: Add ide cmd properties

2015-01-30 Thread John Snow
Add a structure that defines some properties of various IDE commands.
These will be used to simplify the interface to the libqos AHCI calls,
lessening the redundancy of specifying and respecifying properties of
commands to various helper functions.

The Invalid Command Sentinel here that caps the property array is an
invalid ATA command, namely 0x01. 0x00 is NOP and 0xFF is reserved for
vendor usage, so I chose the first invalid one instead.

Signed-off-by: John Snow js...@redhat.com
---
 tests/libqos/ahci.c | 42 ++
 1 file changed, 42 insertions(+)

diff --git a/tests/libqos/ahci.c b/tests/libqos/ahci.c
index 924b9f0..f0e2a27 100644
--- a/tests/libqos/ahci.c
+++ b/tests/libqos/ahci.c
@@ -34,6 +34,48 @@
 #include hw/pci/pci_ids.h
 #include hw/pci/pci_regs.h
 
+typedef struct AHCICommandProp {
+uint8_t  cmd;/* Command Code */
+bool data;   /* Data transfer command? */
+bool pio;
+bool dma;
+bool lba28;
+bool lba48;
+bool read;
+bool write;
+bool atapi;
+bool ncq;
+uint64_t size;   /* Static transfer size, for commands like IDENTIFY. 
*/
+uint32_t interrupts; /* Expected interrupts for this command. */
+} AHCICommandProp;
+
+#define CMD_INVALID_SENTINEL 0x01
+
+AHCICommandProp ahci_command_properties[] = {
+{ .cmd = CMD_READ_PIO,  .data = true,  .pio = true,
+.lba28 = true, .read = true },
+{ .cmd = CMD_WRITE_PIO, .data = true,  .pio = true,
+.lba28 = true, .write = true },
+{ .cmd = CMD_READ_PIO_EXT,  .data = true,  .pio = true,
+.lba48 = true, .read = true },
+{ .cmd = CMD_WRITE_PIO_EXT, .data = true,  .pio = true,
+.lba48 = true, .write = true },
+{ .cmd = CMD_READ_DMA,  .data = true,  .dma = true,
+.lba28 = true, .read = true },
+{ .cmd = CMD_WRITE_DMA, .data = true,  .dma = true,
+.lba28 = true, .write = true },
+{ .cmd = CMD_READ_DMA_EXT,  .data = true,  .dma = true,
+.lba48 = true, .read = true },
+{ .cmd = CMD_WRITE_DMA_EXT, .data = true,  .dma = true,
+.lba48 = true, .write = true },
+{ .cmd = CMD_IDENTIFY,  .data = true,  .pio = true,
+.size = 512,   .read = true },
+{ .cmd = CMD_READ_MAX,  .lba28 = true },
+{ .cmd = CMD_READ_MAX_EXT,  .lba48 = true },
+{ .cmd = CMD_FLUSH_CACHE,   .data = false },
+{ .cmd = CMD_INVALID_SENTINEL }
+};
+
 /**
  * Allocate space in the guest using information in the AHCIQState object.
  */
-- 
1.9.3