Re: [Qemu-devel] Re: [RFC] [PATCH] add ahci support into qemu

[Sebastian Herbszt]

乔崇 wrote:
> I add Sebastian Herbsz's patch,add WIN_WIN_STANDBYNOW1 support to fix
> hw_error on linux shut down etc.
>
> I am  not familiar with  git send-email,I am studying it now :).

[snip]

> >From e94912b03ed33080d550eb5764fc99911498101b Mon Sep 17 00:00:00 2001
> From: QiaoChong <address@hidden>
> Date: Tue, 4 May 2010 07:31:30 +0800
> Subject: [PATCH] ahci pci ids  into pci_ids.h,add warning messages.
>
> move ahci pci device id define into pci_ids.h,add warning messages for
> unsupported features.
>
> Signed-off-by: QiaoChong <address@hidden>
> ---
> hw/ahci.c    |   10 +++++-----
> hw/pci_ids.h |    1 +
> 2 files changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/hw/ahci.c b/hw/ahci.c
> index cb4a851..e1aed4a 100644
> --- a/hw/ahci.c
> +++ b/hw/ahci.c
> @@ -662,7 +662,9 @@ static void handle_cmd(AHCIState *s,int port,int slot)
>
>  if(fis[1]==0)
>  {
> -
> +#ifdef DEBUG_AHCI
> + printf("now,just ignore command fis[0]=%02x fis[1]=%02x 
> fis[2]=%02x\n",fis[0],fis[1],fis[2]);
> +#endif
>  }
>
>  if(fis[1]==(1<<7))
> @@ -755,15 +757,13 @@ static void ahci_pci_map(PCIDevice *pci_dev, int 
> region_num,
>  cpu_register_physical_memory(addr, size, s->mem);
> }
>
> -#define PCI_VENDOR_MYDEVICE  0x8086
> -#define PCI_PRODUCT_MYDEVICE 0x2652
>
> static int pci_ahci_init(PCIDevice *dev)
> {
>  struct ahci_pci_state *d;
>  d = DO_UPCAST(struct ahci_pci_state, card, dev);
> - pci_config_set_vendor_id(d->card.config,PCI_VENDOR_MYDEVICE);
> - pci_config_set_device_id(d->card.config,PCI_PRODUCT_MYDEVICE);
> + pci_config_set_vendor_id(d->card.config,PCI_VENDOR_ID_INTEL);
> + pci_config_set_device_id(d->card.config,PCI_DEVICE_ID_INTEL_ICH6R_AHCI);
>  d->card.config[PCI_COMMAND] = PCI_COMMAND_IO | PCI_COMMAND_MEMORY | 
> PCI_COMMAND_MASTER;
>  d->card.config[PCI_CLASS_DEVICE] = 0;
>  d->card.config[0x0b] = 1;//storage
> diff --git a/hw/pci_ids.h b/hw/pci_ids.h
> index fe7a121..4d4de93 100644
> --- a/hw/pci_ids.h
> +++ b/hw/pci_ids.h
> @@ -97,3 +97,4 @@
> #define PCI_DEVICE_ID_INTEL_82371AB      0x7111
> #define PCI_DEVICE_ID_INTEL_82371AB_2    0x7112
> #define PCI_DEVICE_ID_INTEL_82371AB_3    0x7113
> +#define PCI_DEVICE_ID_INTEL_ICH6R_AHCI    0x2652

The list is sorted by vendor and device id. This entry should go
after "PCI_DEVICE_ID_INTEL_ESB_9". The naming scheme seems
to be VENDOR_DEVICE_FUNCTION, so i suggest something like
PCI_DEVICE_ID_INTEL_ICH6R_2 or PCI_DEVICE_ID_INTEL_82801FR_2.

Sebastian