All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org
Cc: Jiri Pirko <jiri@resnulli.us>,
	Peter Maydell <peter.maydell@linaro.org>,
	Scott Feldman <sfeldma@gmail.com>,
	Stefan Hajnoczi <stefanha@redhat.com>
Subject: [Qemu-devel] [PULL v4 06/11] pci: add rocker device ID
Date: Thu, 12 Mar 2015 14:33:23 +0000	[thread overview]
Message-ID: <1426170808-6343-7-git-send-email-stefanha@redhat.com> (raw)
In-Reply-To: <1426170808-6343-1-git-send-email-stefanha@redhat.com>

From: Scott Feldman <sfeldma@gmail.com>

Signed-off-by: Scott Feldman <sfeldma@gmail.com>
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Message-id: 1424123271-7656-5-git-send-email-sfeldma@gmail.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 docs/specs/pci-ids.txt | 1 +
 include/hw/pci/pci.h   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/docs/specs/pci-ids.txt b/docs/specs/pci-ids.txt
index c6732fe..e4a4490 100644
--- a/docs/specs/pci-ids.txt
+++ b/docs/specs/pci-ids.txt
@@ -45,6 +45,7 @@ PCI devices (other than virtio):
 1b36:0003  PCI Dual-port 16550A adapter (docs/specs/pci-serial.txt)
 1b36:0004  PCI Quad-port 16550A adapter (docs/specs/pci-serial.txt)
 1b36:0005  PCI test device (docs/specs/pci-testdev.txt)
+1b36:0006  PCI Rocker Ethernet switch device
 1b36:0007  PCI SD Card Host Controller Interface (SDHCI)
 
 All these devices are documented in docs/specs.
diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
index be2d9b8..d2c53c4 100644
--- a/include/hw/pci/pci.h
+++ b/include/hw/pci/pci.h
@@ -88,6 +88,7 @@
 #define PCI_DEVICE_ID_REDHAT_SERIAL2     0x0003
 #define PCI_DEVICE_ID_REDHAT_SERIAL4     0x0004
 #define PCI_DEVICE_ID_REDHAT_TEST        0x0005
+#define PCI_DEVICE_ID_REDHAT_ROCKER      0x0006
 #define PCI_DEVICE_ID_REDHAT_SDHCI       0x0007
 #define PCI_DEVICE_ID_REDHAT_PCIE_HOST   0x0008
 #define PCI_DEVICE_ID_REDHAT_QXL         0x0100
-- 
2.1.0

  parent reply	other threads:[~2015-03-12 14:34 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-12 14:33 [Qemu-devel] [PULL v4 00/11] Net patches Stefan Hajnoczi
2015-03-12 14:33 ` [Qemu-devel] [PULL v4 01/11] net: synchronize net_host_device_remove with host_net_remove_completion Stefan Hajnoczi
2015-03-12 14:33 ` [Qemu-devel] [PULL v4 02/11] tests: rtl8139: test timers and interrupt Stefan Hajnoczi
2015-03-12 14:33 ` [Qemu-devel] [PULL v4 03/11] net: add MAC address string printer Stefan Hajnoczi
2015-03-12 14:33 ` [Qemu-devel] [PULL v4 04/11] virtio-net: use qemu_mac_strdup_printf Stefan Hajnoczi
2015-03-12 14:33 ` [Qemu-devel] [PULL v4 05/11] rocker: add register programming guide Stefan Hajnoczi
2015-03-12 14:33 ` Stefan Hajnoczi [this message]
2015-03-12 14:33 ` [Qemu-devel] [PULL v4 07/11] pci: add network device class 'other' for network switches Stefan Hajnoczi
2015-03-12 14:33 ` [Qemu-devel] [PULL v4 08/11] rocker: add new rocker switch device Stefan Hajnoczi
2015-03-12 14:33 ` [Qemu-devel] [PULL v4 09/11] rocker: add tests Stefan Hajnoczi
2015-03-12 14:33 ` [Qemu-devel] [PULL v4 10/11] MAINTAINERS: add rocker Stefan Hajnoczi
2015-03-12 14:33 ` [Qemu-devel] [PULL v4 11/11] rocker: timestamp on the debug logs helps correlate with events in the VM Stefan Hajnoczi
2015-03-12 14:43 ` [Qemu-devel] [PULL v4 00/11] Net patches Peter Maydell
2015-03-12 15:03   ` Peter Maydell
2015-03-12 17:50     ` Stefan Hajnoczi
2015-03-12 20:17       ` Peter Maydell
2015-03-13  2:32       ` Fam Zheng
2015-03-13 10:16         ` Peter Maydell
2015-03-12 19:58     ` Stefan Hajnoczi
2015-03-12 20:48       ` Paolo Bonzini
2015-03-14  4:19       ` Scott Feldman
2015-03-16  9:41         ` Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1426170808-6343-7-git-send-email-stefanha@redhat.com \
    --to=stefanha@redhat.com \
    --cc=jiri@resnulli.us \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=sfeldma@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.