From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35445) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZlcRr-0003Tf-6G for qemu-devel@nongnu.org; Mon, 12 Oct 2015 08:43:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZlcRm-0005Wy-0C for qemu-devel@nongnu.org; Mon, 12 Oct 2015 08:43:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38771) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZlcRl-0005Wn-Ov for qemu-devel@nongnu.org; Mon, 12 Oct 2015 08:43:21 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id 520A13DD42 for ; Mon, 12 Oct 2015 12:43:21 +0000 (UTC) References: <1444644577-24455-1-git-send-email-marcel@redhat.com> <20151012153745-mutt-send-email-mst@redhat.com> From: Marcel Apfelbaum Message-ID: <561BAAE6.4090407@redhat.com> Date: Mon, 12 Oct 2015 15:43:18 +0300 MIME-Version: 1.0 In-Reply-To: <20151012153745-mutt-send-email-mst@redhat.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH V2] hw/pxb: add chassis_nr property List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Michael S. Tsirkin" Cc: qemu-devel@nongnu.org On 10/12/2015 03:39 PM, Michael S. Tsirkin wrote: > On Mon, Oct 12, 2015 at 01:09:37PM +0300, Marcel Apfelbaum wrote: >> Add a chassis_nr property instead of using PXB bus number >> as internal bridge's chassis nr. >> >> Suggested-by: Michael S. Tsirkin >> Signed-off-by: Marcel Apfelbaum > > OK, but we need to be compatible with old systems. > So you need to use bus nr if chassis nr is 0. Sure, I'll add this. Thanks, Marcel > >> --- >> v1->v2: >> - Rebased on master >> >> docs/pci_expander_bridge.txt | 7 +++---- >> hw/pci-bridge/pci_expander_bridge.c | 5 ++++- >> 2 files changed, 7 insertions(+), 5 deletions(-) >> >> diff --git a/docs/pci_expander_bridge.txt b/docs/pci_expander_bridge.txt >> index d7913fb..fed2bbe 100644 >> --- a/docs/pci_expander_bridge.txt >> +++ b/docs/pci_expander_bridge.txt >> @@ -23,9 +23,9 @@ A detailed command line would be: >> -m 2G >> -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,bus=pci.0 -device e1000,bus=bridge2,addr=0x3 >> --device pxb,id=bridge3,bus=pci.0,bus_nr=40,bus=pci.0 -drive if=none,id=drive0,file=[img] -device virtio-blk-pci,drive=drive0,scsi=off,bus=bridge3,addr=1 >> +-device pxb,id=bridge1,bus=pci.0,numa_node=1,bus_nr=4,chassis_nr=1 -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,bus=pci.0,chassis_nr=2 -device e1000,bus=bridge2,addr=0x3 >> +-device pxb,id=bridge3,bus=pci.0,bus_nr=40,bus=pci.0,chassis_nr=3 -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) >> @@ -55,4 +55,3 @@ The PXB is composed by: >> - Using the bridge will enable hotplug support >> - All the devices behind the bridge will use bridge's IO/MEM windows compacting >> the PCI address space. >> - >> diff --git a/hw/pci-bridge/pci_expander_bridge.c b/hw/pci-bridge/pci_expander_bridge.c >> index 57f8a37..8645650 100644 >> --- a/hw/pci-bridge/pci_expander_bridge.c >> +++ b/hw/pci-bridge/pci_expander_bridge.c >> @@ -39,6 +39,7 @@ typedef struct PXBDev { >> PCIDevice parent_obj; >> /*< public >*/ >> >> + uint8_t chassis_nr; >> uint8_t bus_nr; >> uint16_t numa_node; >> } PXBDev; >> @@ -220,7 +221,7 @@ static int pxb_dev_initfn(PCIDevice *dev) >> >> bds = qdev_create(BUS(bus), "pci-bridge"); >> bds->id = dev_name; >> - qdev_prop_set_uint8(bds, PCI_BRIDGE_DEV_PROP_CHASSIS_NR, pxb->bus_nr); >> + qdev_prop_set_uint8(bds, PCI_BRIDGE_DEV_PROP_CHASSIS_NR, pxb->chassis_nr); >> qdev_prop_set_bit(bds, PCI_BRIDGE_DEV_PROP_SHPC, false); >> >> PCI_HOST_BRIDGE(ds)->bus = bus; >> @@ -248,6 +249,8 @@ static void pxb_dev_exitfn(PCIDevice *pci_dev) >> } >> >> static Property pxb_dev_properties[] = { >> + /* Note: 0 is not a legal chassis number. */ >> + DEFINE_PROP_UINT8("chassis_nr", PXBDev, chassis_nr, 0), >> /* Note: 0 is not a legal a PXB bus number. */ >> DEFINE_PROP_UINT8("bus_nr", PXBDev, bus_nr, 0), >> DEFINE_PROP_UINT16("numa_node", PXBDev, numa_node, NUMA_NODE_UNASSIGNED), >> -- >> 2.1.0