From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Marcel Apfelbaum <marcel@redhat.com>,
Peter Maydell <peter.maydell@linaro.org>,
Cao jin <caoj.fnst@cn.fujitsu.com>,
Eduardo Habkost <ehabkost@redhat.com>
Subject: [Qemu-devel] [PULL v2 31/51] pxb: cleanup
Date: Tue, 15 Mar 2016 17:02:03 +0200 [thread overview]
Message-ID: <1458053975-2410-32-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1458053975-2410-1-git-send-email-mst@redhat.com>
From: Cao jin <caoj.fnst@cn.fujitsu.com>
Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
---
hw/pci-bridge/pci_expander_bridge.c | 2 +-
docs/pci_expander_bridge.txt | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/pci-bridge/pci_expander_bridge.c b/hw/pci-bridge/pci_expander_bridge.c
index d23b8da..5e7e546 100644
--- a/hw/pci-bridge/pci_expander_bridge.c
+++ b/hw/pci-bridge/pci_expander_bridge.c
@@ -283,7 +283,7 @@ static void pxb_dev_exitfn(PCIDevice *pci_dev)
}
static Property pxb_dev_properties[] = {
- /* Note: 0 is not a legal a PXB bus number. */
+ /* Note: 0 is not a legal PXB bus number. */
DEFINE_PROP_UINT8("bus_nr", PXBDev, bus_nr, 0),
DEFINE_PROP_UINT16("numa_node", PXBDev, numa_node, NUMA_NODE_UNASSIGNED),
DEFINE_PROP_END_OF_LIST(),
diff --git a/docs/pci_expander_bridge.txt b/docs/pci_expander_bridge.txt
index e7c8fe9..3675027 100644
--- a/docs/pci_expander_bridge.txt
+++ b/docs/pci_expander_bridge.txt
@@ -24,8 +24,8 @@ A detailed command line would be:
-object memory-backend-ram,size=1024M,policy=bind,host-nodes=0,id=ram-node0 -numa node,nodeid=0,cpus=0,memdev=ram-node0
-object memory-backend-ram,size=1024M,policy=bind,host-nodes=1,id=ram-node1 -numa node,nodeid=1,cpus=1,memdev=ram-node1
-device pxb,id=bridge1,bus=pci.0,numa_node=1,bus_nr=4 -netdev user,id=nd -device e1000,bus=bridge1,addr=0x4,netdev=nd
--device pxb,id=bridge2,bus=pci.0,numa_node=0,bus_nr=8, -device e1000,bus=bridge2,addr=0x3
--device pxb,id=bridge3,bus=pci.0,bus_nr=40, -drive if=none,id=drive0,file=[img] -device virtio-blk-pci,drive=drive0,scsi=off,bus=bridge3,addr=1
+-device pxb,id=bridge2,bus=pci.0,numa_node=0,bus_nr=8 -device e1000,bus=bridge2,addr=0x3
+-device pxb,id=bridge3,bus=pci.0,bus_nr=40 -drive if=none,id=drive0,file=[img] -device virtio-blk-pci,drive=drive0,scsi=off,bus=bridge3,addr=1
Here you have:
- 2 NUMA nodes for the guest, 0 and 1. (both mapped to the same NUMA node in host, but you can and should put it in different host NUMA nodes)
@@ -43,7 +43,7 @@ Implementation
==============
The PXB is composed by:
- HostBridge (TYPE_PXB_HOST)
- The host bridge allows to register and query the PXB's rPCI root bus in QEMU.
+ The host bridge allows to register and query the PXB's PCI root bus in QEMU.
- PXBDev(TYPE_PXB_DEVICE)
It is a regular PCI Device that resides on the piix host-bridge bus and its bus uses the same PCI domain.
However, the bus behind is exposed through ACPI as a primary PCI bus and starts a new PCI hierarchy.
--
MST
next prev parent reply other threads:[~2016-03-15 15:02 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-15 15:00 [Qemu-devel] [PULL v2 00/51] vhost, virtio, pci, pc, acpi Michael S. Tsirkin
2016-03-15 15:00 ` [Qemu-devel] [PULL v2 01/51] acpi: add aml_create_field() Michael S. Tsirkin
2016-03-15 15:00 ` [Qemu-devel] [PULL v2 02/51] acpi: add aml_concatenate() Michael S. Tsirkin
2016-03-15 15:00 ` [Qemu-devel] [PULL v2 03/51] acpi: allow using object as offset for OperationRegion Michael S. Tsirkin
2016-03-15 15:00 ` [Qemu-devel] [PULL v2 04/51] acpi: add build_append_named_dword, returning an offset in buffer Michael S. Tsirkin
2016-03-15 15:00 ` [Qemu-devel] [PULL v2 05/51] balloon: fix segfault and harden the stats queue Michael S. Tsirkin
2016-03-15 15:00 ` [Qemu-devel] [PULL v2 06/51] hw/virtio: fix double use of a virtio flag Michael S. Tsirkin
2016-03-15 15:00 ` [Qemu-devel] [PULL v2 07/51] hw/virtio: group virtio flags into an enum Michael S. Tsirkin
2016-03-15 15:00 ` [Qemu-devel] [PULL v2 08/51] virtio-balloon: add 'available' counter Michael S. Tsirkin
2016-03-15 15:00 ` [Qemu-devel] [PULL v2 09/51] vhost-user: verify that number of queues is less than MAX_QUEUE_NUM Michael S. Tsirkin
2016-03-15 15:00 ` [Qemu-devel] [PULL v2 10/51] pc-dimm: fix error handling in pc_dimm_check_memdev_is_busy() Michael S. Tsirkin
2016-03-15 15:00 ` [Qemu-devel] [PULL v2 11/51] i386/acpi: make floppy controller object dynamic Michael S. Tsirkin
2016-03-15 15:00 ` [Qemu-devel] [PULL v2 12/51] i386: expose floppy drive CMOS type Michael S. Tsirkin
2016-03-15 15:00 ` [Qemu-devel] [PULL v2 13/51] fdc: add function to determine drive chs limits Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 14/51] i386: populate floppy drive information in DSDT Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 15/51] i386: update expected DSDT Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 16/51] virtio-pci: call pci reset variant when guest requests reset Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 17/51] msi_supported -> msi_nonbroken Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 18/51] ich9lpc: fix typo Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 19/51] hw/acpi: fix Q35 support for legacy Windows OS Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 20/51] acpi-test-data: add _DIS methods Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 21/51] pci-ids: add virtio 1.0 ids to spec Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 22/51] nvdimm acpi: initialize the resource used by NVDIMM ACPI Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 23/51] nvdimm acpi: introduce patched dsm memory Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 24/51] nvdimm acpi: let qemu handle _DSM method Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 25/51] nvdimm acpi: emulate dsm method Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 26/51] vhost-user: fix use after free Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 27/51] vhost-user: remove useless is_server field Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 28/51] qemu-char: avoid potential double-free Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 29/51] qemu-char: remove all msgfds on disconnect Michael S. Tsirkin
2016-03-15 15:01 ` [Qemu-devel] [PULL v2 30/51] qemu-char: make tcp_chr_disconnect() reentrant-safe Michael S. Tsirkin
2016-03-15 15:02 ` Michael S. Tsirkin [this message]
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 32/51] pc: acpi: remove NOP assignment Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 33/51] pc: init pcms->apic_id_limit once and use it throughout pc.c Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 34/51] machine: introduce MachineClass.possible_cpu_arch_ids() hook Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 35/51] pc: acpi: cleanup qdev_get_machine() calls Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 36/51] pc: acpi: SRAT: create only valid processor lapic entries Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 37/51] pc: acpi: create MADT.lapic entries only for valid lapics Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 38/51] pc: acpi: create Processor and Notify objects " Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 39/51] pc: acpi: drop cpu->found_cpus bitmap Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 40/51] pc: acpi: clarify why possible LAPIC entries must be present in MADT Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 41/51] MAINTAINERS: Add an entry for virtio header files Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 42/51] MAINTAINERS: machine core Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 43/51] ipmi: remove IPMI_CHECK_CMD_LEN() macro Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 44/51] ipmi: replace IPMI_ADD_RSP_DATA() macro with inline helpers Michael S. Tsirkin
2016-03-15 15:02 ` [Qemu-devel] [PULL v2 45/51] ipmi: remove IPMI_CHECK_RESERVATION() macro Michael S. Tsirkin
2016-03-15 15:03 ` [Qemu-devel] [PULL v2 46/51] ipmi: add rsp_buffer_set_error() helper Michael S. Tsirkin
2016-03-15 15:03 ` [Qemu-devel] [PULL v2 47/51] ipmi: add a realize function to the device class Michael S. Tsirkin
2016-03-15 15:03 ` [Qemu-devel] [PULL v2 48/51] ipmi: use a function to initialize the SDR table Michael S. Tsirkin
2016-03-15 15:03 ` [Qemu-devel] [PULL v2 49/51] ipmi: remove the need of an ending record in " Michael S. Tsirkin
2016-03-15 15:03 ` [Qemu-devel] [PULL v2 50/51] ipmi: add some local variables in ipmi_sdr_init Michael S. Tsirkin
2016-03-15 15:03 ` [Qemu-devel] [PULL v2 51/51] hw/acpi: fix GSI links UID Michael S. Tsirkin
2016-03-15 17:09 ` [Qemu-devel] [PULL v2 00/51] vhost, virtio, pci, pc, acpi 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=1458053975-2410-32-git-send-email-mst@redhat.com \
--to=mst@redhat.com \
--cc=caoj.fnst@cn.fujitsu.com \
--cc=ehabkost@redhat.com \
--cc=marcel@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).