pci hotplug v2 (for real)
cover pci hotplug v2 (for real)
The patches on the first email didnt go through, bad connection, sorry.
PATCH 1/2 PCI: full device address parsing
From: Markus Armbruster <[email protected]>
This code parses full PCI device addresses. It then rejects domains other than zero, because these are not supported in QEMU.
hw/pci.c +84 -0
@@ -26,6 +26,7 @@#include "console.h" #include "net.h" #include "virtio-net.h" +#include "sysemu.h" //#define DEBUG_PCI
@@ -158,6 +159,89 @@ static int pci_set_default_subsystem_id(return 0 ; } +/* +* Parse [[<domain>:]<bus>:]<slot>, return -1 on error +*/ +static int pci_parse_devaddr (const char *addr,int *domp,int *busp,unsigned *slotp) +{ +const char *p; +char *e; +unsigned long val; +unsigned long dom =0 , bus =0 ; +unsigned slot =0 ; + + p = addr; + val =strtoul (p, &e,16 ); +if (e == p) +return -1 ; +if (*e ==':' ) { + bus = val; + p = e +1 ; + val =strtoul (p, &e,16 ); +if (e == p) +return -1 ; +if (*e ==':' ) { + dom = bus; + bus = val; + p = e +1 ; + val =strtoul (p, &e,16 ); +if (e == p) +return -1 ; + } + } + +if (dom >0xffff || bus >0xff || val >0x1f ) { +fprintf (stderr,"PCI device address %s out of range" , addr); +return -1 ; + } + slot = val; + +if (*e) +return -1 ; + +/* Note: QEMU doesn't implement domains other than 0 */ +if (dom !=0 ||pci_find_bus (bus) ==NULL ) { +fprintf (stderr,"PCI device address %s not supported" , addr); +return -1 ; + } + + *domp = dom; + *busp = bus; + *slotp = slot; +return 0 ; +} + +int pci_read_devaddr (const char *addr,int *domp,int *busp,unsigned *slotp) +{ +char devaddr[32 ]; + +if (!get_param_value (devaddr,sizeof (devaddr),"pci_addr" , addr)) { +term_printf ("Missing pci_addr=\n" ); +return -1 ; + } + +return pci_parse_devaddr (devaddr, domp, busp, slotp); +} + +int pci_assign_devaddr (const char *addr,int *domp,int *busp,unsigned *slotp) +{ +char devaddr[32 ]; + +if (!get_param_value (devaddr,sizeof (devaddr),"pci_addr" , addr)) { +term_printf ("Missing pci_addr=\n" ); +return -1 ; + } + +if (!strcmp (devaddr,"auto" )) { + *domp = *busp =0 ; + *slotp =-1 ; +/* want to support dom/bus auto-assign at some point */ +return 0 ; + } + +return pci_parse_devaddr (devaddr, domp, busp, slotp); +} +/* -1 for devfn means auto assign */ PCIDevice *pci_register_device(PCIBus *bus, const char *name, int instance_size, int devfn,
hw/pci.h +3 -0
@@ -232,6 +232,9 @@ void pci_for_each_device(int bus_num, voPCIBus *pci_find_bus (int bus_num);PCIDevice *pci_find_device (int bus_num,int slot,int function); +int pci_read_devaddr (const char *addr,int *domp,int *busp,unsigned *slotp); +int pci_assign_devaddr (const char *addr,int *domp,int *busp,unsigned *slotp); +void pci_info (void );PCIBus *pci_bridge_init (PCIBus *bus,int devfn,uint16_t vid,uint16_t did,pci_map_irq_fn map_irq,const char *name);
Re: [Qemu-devel] [patch 1/2] PCI: full device address parsing
Quoted 6 lines · Marcelo Tosatti
From: Markus Armbruster <[email protected]>
This code parses full PCI device addresses. It then rejects domains other than zero, because these are not supported in QEMU.
Signed-off-by Marcelo Tosatti <[email protected]>
Patch has issues with reporting errors.
Quoted 40 lines
Index:
trunk/hw/pci.c
===================================================================hw/pci.c +25
-0@@ -26,6 +26,7 @@#include "console.h" #include "net.h" #include "virtio-net.h" +#include "sysemu.h" //#define DEBUG_PCI @@ -158,6 +159,89 @@ static int pci_set_default_subsystem_id(return 0 ; } +/* +* Parse [[<domain>:]<bus>:]<slot>, return -1 on error +*/ +static int pci_parse_devaddr (const char *addr,int *domp,int *busp,unsigned *slotp) +{ +const char *p; +char *e; +unsigned long val; +unsigned long dom =0 , bus =0 ; +unsigned slot =0 ; + + p = addr; + val =strtoul (p, &e,16 ); +if (e == p) +return -1 ; +if (*e ==':' ) { + bus = val; + p = e +1 ; + val =strtoul (p, &e,16 ); +if (e == p) +return -1 ; +if (*e ==':' ) { + dom = bus; + bus = val;
hw/pci.c static int pci_set_default_subsystem_id( · line 195
Quoted 10 lines
hw/pci.c +10
-0+ p = e +1 ; + val =strtoul (p, &e,16 ); +if (e == p) +return -1 ; + } + } + +if (dom >0xffff || bus >0xff || val >0x1f ) { +fprintf (stderr,"PCI device address %s out of range" , addr); +return -1 ;
Funny indentation.
Quoted 7 lines
hw/pci.c +7
-0+ } + slot = val; + +if (*e) +return -1 ; + +/* Note: QEMU doesn't implement domains other than 0 */
hw/pci.c static int pci_set_default_subsystem_id( · line 212
Quoted 10 lines
hw/pci.c +10
-0+if (dom !=0 ||pci_find_bus (bus) ==NULL ) { +fprintf (stderr,"PCI device address %s not supported" , addr); +return -1 ; + } + + *domp = dom; + *busp = bus; + *slotp = slot; +return 0 ; +}
Some failures print to stderr, some are silent.
hw/pci.c static int pci_set_default_subsystem_id( · line 224
Quoted 12 lines
hw/pci.c +12
-0+ +int pci_read_devaddr (const char *addr,int *domp,int *busp,unsigned *slotp) +{ +char devaddr[32 ]; + +if (!get_param_value (devaddr,sizeof (devaddr),"pci_addr" , addr)) { +term_printf ("Missing pci_addr=\n" ); +return -1 ; + } + +return pci_parse_devaddr (devaddr, domp, busp, slotp); +}
Some failures print to stderr, some are silent, and some print to the monitor.
Quoted 10 lines
hw/pci.c +10
-0+ +int pci_assign_devaddr (const char *addr,int *domp,int *busp,unsigned *slotp) +{ +char devaddr[32 ]; + +if (!get_param_value (devaddr,sizeof (devaddr),"pci_addr" , addr)) { +term_printf ("Missing pci_addr=\n" ); +return -1 ; + } +
hw/pci.c static int pci_set_default_subsystem_id( · line 244
Quoted 10 lines
hw/pci.c +10
-0+if (!strcmp (devaddr,"auto" )) { + *domp = *busp =0 ; + *slotp =-1 ; +/* want to support dom/bus auto-assign at some point */ +return 0 ; + } + +return pci_parse_devaddr (devaddr, domp, busp, slotp); +} +
Same here.
Quoted 17 lines
hw/pci.c +0
-0/* -1 for devfn means auto assign */ PCIDevice *pci_register_device(PCIBus *bus, const char *name, int instance_size, int devfn,Index:
trunk/hw/pci.h
===================================================================hw/pci.h +3
-0@@ -232,6 +232,9 @@ void pci_for_each_device(int bus_num, voPCIBus *pci_find_bus (int bus_num);PCIDevice *pci_find_device (int bus_num,int slot,int function); +int pci_read_devaddr (const char *addr,int *domp,int *busp,unsigned *slotp); +int pci_assign_devaddr (const char *addr,int *domp,int *busp,unsigned *slotp); +void pci_info (void );PCIBus *pci_bridge_init (PCIBus *bus,int devfn,uint16_t vid,uint16_t did,pci_map_irq_fn map_irq,const char *name);
PATCH 2/2 qemu: PCI device, disk and host network hot-add / hot-remove
In reply to Marcelo TosattiAdd monitor command to hot-add PCI devices (nic and storage).
Syntax is:
pci_add pci_addr=[[<domain>:]<bus>:]<slot> nic|storage params
It returns the domain, bus and slot for the newly added device on success.
It is possible to attach a disk to a device after PCI initialization via the drive_add command. If so, a manual scan of the SCSI bus on the guest is necessary.
Save QEMUMachine necessary for drive_init.
Add monitor command to hot-remove devices, remove device data on _EJ0 notification.
Makefile.target +1 -0
@@ -580,6 +580,7 @@ OBJS+= ide.o pckbd.o ps2.o vga.o $(SOUND OBJS+= fdc.o mc146818rtc.o serial.o i8259.o i8254.o pcspk.o pc.o OBJS+= cirrus_vga.o apic.o parallel.o acpi.o piix_pci.o OBJS+= usb-uhci.o vmmouse.o vmport.o vmware_vga.o hpet.o +OBJS += device-hotplug.o pci-hotplug.o CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE endif ifeq ($(TARGET_BASE_ARCH), ppc)
hw/boards.h +2 -0
@@ -25,6 +25,8 @@ typedef struct QEMUMachine {int qemu_register_machine (QEMUMachine *m);void register_machines (void ); +extern QEMUMachine *current_machine; +/* Axis ETRAX. */ extern QEMUMachine bareetraxfs_machine;extern QEMUMachine axisdev88_machine;
hw/device-hotplug.c new file +61 -0
61 lines not on this page · raw message
monitor.c +14 -0
@@ -1515,6 +1515,20 @@ static const term_cmd_t term_cmds[] = { "", "cancel the current VM migration" }, { "migrate_set_speed", "s", do_migrate_set_speed, "value", "set maximum speed (in bytes) for migrations" }, +#if defined(TARGET_I386) + { "drive_add", "ss", drive_hot_add, "pci_addr=[[<domain>:]<bus>:]<slot>\n" + "[file=file][,if=type][,bus=n]\n" + "[,unit=m][,media=d][index=i]\n" + "[,cyls=c,heads=h,secs=s[,trans=t]]\n" + "[snapshot=on|off][,cache=on|off]", + "add drive to PCI storage controller" }, + { "pci_add", "sss", pci_device_hot_add, "pci_addr=auto|[[<domain>:]<bus>:]<slot> nic|storage [[vlan=n][,macaddr=addr][,model=type]] [file=file][,if=type][,bus=nr]...", "hot-add PCI device" }, + { "pci_del", "s", pci_device_hot_remove, "pci_addr=[[<domain>:]<bus>:]<slot>", "hot remove PCI device" }, + { "host_net_add", "ss", net_host_device_add, + "[tap,user,socket,vde] options", "add host VLAN client" }, + { "host_net_remove", "is", net_host_device_remove, + "vlan_id name", "remove host VLAN client" }, +#endif { "balloon", "i", do_balloon, "target", "request VM to change it's memory allocation (in MB)" }, { "set_link", "ss", do_set_link, "name [up|down]" },
sysemu.h +14 -0
@@ -170,6 +170,20 @@ extern int drive_init(struct drive_opt *void qemu_system_hot_add_init (void );void qemu_system_device_hot_add (int pcibus,int slot,int state); +/* device-hotplug */ + +typedef int (dev_match_fn )(void *dev_private,void *arg); + +int add_init_drive (const char *opts); +void destroy_nic (dev_match_fn *match_fn,void *arg); +void destroy_bdrvs (dev_match_fn *match_fn,void *arg); + +/* pci-hotplug */ +void pci_device_hot_add (const char *pci_addr,const char *type,const char *opts); +void drive_hot_add (const char *pci_addr,const char *opts); +void pci_device_hot_remove (const char *pci_addr); +void pci_device_hot_remove_success (int pcibus,int slot); +/* serial ports */ #define MAX_SERIAL_PORTS 4
vl.c +3 -0
@@ -3419,6 +3419,7 @@ static void qemu_bh_update_timeout(int */* machine registration */ static QEMUMachine *first_machine =NULL ; +QEMUMachine *current_machine =NULL ;int qemu_register_machine (QEMUMachine *m) {
@@ -5603,6 +5604,8 @@ int main(int argc, char **argv, char **e machine->init (ram_size, vga_ram_size, boot_devices, kernel_filename, kernel_cmdline, initrd_filename, cpu_model); + current_machine = machine; +/* Set KVM's vcpu state to qemu's initial CPUState. */ if (kvm_enabled ()) {int ret;
hw/acpi.c +4 -0
@@ -679,8 +679,12 @@ static uint32_t pciej_read(void *opaque,static void pciej_write (void *opaque,uint32_t addr,uint32_t val) { +#if defined (TARGET_I386 )int slot =ffs (val) -1 ; +pci_device_hot_remove_success (0 , slot); +#endif +#if defined(DEBUG )printf ("pciej write %lx <== %d\n" , addr, val);#endif
net.c +56 -0
62 lines not on this page · raw message
net.h +2 -0
@@ -102,6 +102,8 @@ void net_slirp_redir(const char *redir_svoid net_cleanup (void );int slirp_is_inited (void );void net_client_check (void ); +void net_host_device_add (const char *device,const char *opts); +void net_host_device_remove (int vlan_id,const char *device);#define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup"#define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown"
hw/pci-hotplug.c new file +189 -0
189 lines not on this page · raw message
hw/pci.h +3 -0
@@ -14,6 +14,9 @@ extern target_phys_addr_t pci_mem_base;/* Device classes and subclasses */ +#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_OTHER 0x0180