diff mbox

[0/3,v17] megasas: LSI Megaraid SAS HBA emulation

Message ID 4FD1D23C.6040704@suse.de
State New
Headers show

Commit Message

Andreas Färber June 8, 2012, 10:21 a.m. UTC 
Am 08.06.2012 01:24, schrieb Paolo Bonzini:
> Il 29/05/2012 14:22, Paolo Bonzini ha scritto:
>> Il 29/05/2012 13:51, Hannes Reinecke ha scritto:
>>> This is an updated patchset for megasas. Upon popular demand
>>> I've split it into three parts, the header file, the emulation
>>> itself, and a patch adding trace events to the emulation.
>>>
>>> Paolo, can you merge it via your tree? Or should I ask
>>> someone else?
>>
>> Yes, of course.  I'll wait for an Acked-by or a couple of weeks,
>> whatever comes first.
> 
>> Acked-by: Alexander Graf <agraf@suse.de>
>> Tested-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
> 
> Ok, pull request coming. :)

Paolo, could you please squash the following fixups? Namely:
* Drop semicolon after type_init() - unresolved comment from v14
* Make TypeInfo const
* Revert unrelated whitespace change in pci_ids.h

I told Hannes I'd send this to spare him another resend.

It would also be good if someone could review my dependency patch,
prompted by an earlier megasas submission:
http://patchwork.ozlabs.org/patch/163647/
Maybe prepend it to this series' pci.mak change on scsi-next?


Thanks,
Andreas
diff mbox

Patch

diff --git a/hw/megasas.c b/hw/megasas.c
index bf5f8cd..25e5c71 100644
--- a/hw/megasas.c
+++ b/hw/megasas.c
@@ -1935,7 +1935,7 @@  static void megasas_class_init(ObjectClass *oc,
void *data)
     dc->desc = "LSI MegaRAID SAS 1078";
 }

-static TypeInfo megasas_info = {
+static const TypeInfo megasas_info = {
     .name  = "megasas",
     .parent = TYPE_PCI_DEVICE,
     .instance_size = sizeof(MegasasState),
@@ -1947,4 +1947,4 @@  static void megasas_register_types(void)
     type_register_static(&megasas_info);
 }

-type_init(megasas_register_types);
+type_init(megasas_register_types)
diff --git a/hw/pci_ids.h b/hw/pci_ids.h
index 0306255..c2986aa 100644
--- a/hw/pci_ids.h
+++ b/hw/pci_ids.h
@@ -12,6 +12,7 @@ 

 #define PCI_BASE_CLASS_STORAGE           0x01
 #define PCI_BASE_CLASS_NETWORK           0x02
+
 #define PCI_CLASS_STORAGE_SCSI           0x0100
 #define PCI_CLASS_STORAGE_IDE            0x0101
 #define PCI_CLASS_STORAGE_RAID           0x0104